From 80704e1ba3c34ea021c534b79463f67157526b4f Mon Sep 17 00:00:00 2001 From: Antoine H Date: Fri, 4 Dec 2020 13:12:01 +0100 Subject: [PATCH] Add Client_controller and mug interaction --- Assets/Arts/Temporaires/Sprites/beer.png | Bin 0 -> 19279 bytes Assets/Arts/Temporaires/Sprites/beer.png.meta | 106 ++++++++++++++++++ Assets/Scripts/Client_controller.cs | 39 +++++++ Assets/Scripts/Client_controller.cs.meta | 11 ++ Assets/Scripts/Mug.cs | 19 +++- Assets/Scripts/Tavernkeeper_controller.cs | 54 +++++---- 6 files changed, 205 insertions(+), 24 deletions(-) create mode 100644 Assets/Arts/Temporaires/Sprites/beer.png create mode 100644 Assets/Arts/Temporaires/Sprites/beer.png.meta create mode 100644 Assets/Scripts/Client_controller.cs create mode 100644 Assets/Scripts/Client_controller.cs.meta diff --git a/Assets/Arts/Temporaires/Sprites/beer.png b/Assets/Arts/Temporaires/Sprites/beer.png new file mode 100644 index 0000000000000000000000000000000000000000..cea1e74d73851040564b934090ab4a212d2d4d68 GIT binary patch literal 19279 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 Bg#7>j literal 0 HcmV?d00001 diff --git a/Assets/Arts/Temporaires/Sprites/beer.png.meta b/Assets/Arts/Temporaires/Sprites/beer.png.meta new file mode 100644 index 0000000..453c05b --- /dev/null +++ b/Assets/Arts/Temporaires/Sprites/beer.png.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: 17d59b2d4d882c04480a40119a442279 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 4096 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Client_controller.cs b/Assets/Scripts/Client_controller.cs new file mode 100644 index 0000000..a52c647 --- /dev/null +++ b/Assets/Scripts/Client_controller.cs @@ -0,0 +1,39 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[RequireComponent(typeof(Collider2D))] +public class Client_controller : MonoBehaviour +{ + public float consumeTime = 3.0f; //Time to consume currentMug + public float waitingTime = 10.0f; //Patience after ordering + GameObject currentMug; + + public bool use(GameObject new_mug) + { + if(new_mug != null && new_mug.tag=="Mug") + { + Debug.Log(gameObject.name+" take "+new_mug.name); + currentMug = new_mug; + return true; //Object taken from tavernkeeper + } + else + { + Debug.Log("Display order (or something else) of "+gameObject.name); + return false; //Object not taken from tavernkeeper + } + } + + // Start is called before the first frame update + void Start() + { + //Needs to be on Interactions layer and have the Client tag to work properly + gameObject.tag = "Client"; //Force gameobject tag + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/Client_controller.cs.meta b/Assets/Scripts/Client_controller.cs.meta new file mode 100644 index 0000000..d51d9f4 --- /dev/null +++ b/Assets/Scripts/Client_controller.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2dfbc8fb0a162ab4da4ff5cb76650e03 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Mug.cs b/Assets/Scripts/Mug.cs index 2eea93c..5796cc3 100644 --- a/Assets/Scripts/Mug.cs +++ b/Assets/Scripts/Mug.cs @@ -2,15 +2,18 @@ using System.Collections.Generic; using UnityEngine; +[RequireComponent(typeof(Collider2D))] public class Mug : MonoBehaviour, IGrabable { public int size = 1; //Size (1 or 2 hands) of the object + bool dirty = false; + int content = 1; public void use() { - + //Do nothing } - public void take() + public void take() //Object taken { gameObject.SetActive(false); } @@ -20,10 +23,20 @@ public class Mug : MonoBehaviour, IGrabable gameObject.transform.position = position; } + public void fill(int new_content) + { + content = new_content; + } + public void consume() + { + content=0; + } + // Start is called before the first frame update void Start() { - + //Needs to be on Interactions layer and have the Mug tag to work properly + gameObject.tag = "Mug"; //Force gameobject tag } // Update is called once per frame diff --git a/Assets/Scripts/Tavernkeeper_controller.cs b/Assets/Scripts/Tavernkeeper_controller.cs index ae7d768..45c71ba 100644 --- a/Assets/Scripts/Tavernkeeper_controller.cs +++ b/Assets/Scripts/Tavernkeeper_controller.cs @@ -2,6 +2,8 @@ using System.Collections.Generic; using UnityEngine; +[RequireComponent(typeof(Rigidbody))] +[RequireComponent(typeof(Animator))] public class Tavernkeeper_controller : MonoBehaviour { public float mvt_speed = 5.0f; //Movement speed @@ -36,10 +38,10 @@ public class Tavernkeeper_controller : MonoBehaviour //Read inputs horizontal = Input.GetAxis("Horizontal"); //See Edit/Project setting / Input Manager vertical = Input.GetAxis("Vertical"); - // Debug.Log(horizontal); + hands = Input.GetAxis("Hand"); + //Movement action Vector2 move = new Vector2(horizontal, vertical); - //Update animation direction if(!Mathf.Approximately(move.x, 0.0f) || !Mathf.Approximately(move.y, 0.0f)) //Movement requested ? { @@ -50,9 +52,7 @@ public class Tavernkeeper_controller : MonoBehaviour animator.SetFloat("Look Y", lookDirection.y); animator.SetFloat("Speed", move.magnitude); - - hands = Input.GetAxis("Hand"); - // Debug.Log(hands); + //Hands actions if(!Mathf.Approximately(hands, 0.0f)) { if(hands>0) @@ -79,6 +79,7 @@ public class Tavernkeeper_controller : MonoBehaviour rigidbody2d.MovePosition(position); //Movement processed by the phyisc engine for Collision, etc. } + //Handle action with hands void handAction(string hand) { // Test collision of ray from tavernkeeper center (A verifier) at action_dist unit distance on Interactions layer @@ -86,32 +87,37 @@ public class Tavernkeeper_controller : MonoBehaviour if (hit.collider != null) { GameObject hit_object = hit.collider.gameObject; - // Debug.Log("Raycast has hit the object " + hit_object+ hit_object.tag); + // Debug.Log("Raycast has hit the object " + hit_object.name+ hit_object.tag); if (hit_object != null) { - //Empty hand : try grab grabable object - if(hand_container[hand] is null) + if(hit_object.tag == "Mug") { - if(hit_object.tag == "Grabable") //by tag, layer-mask or with parent-name ? + if(hand_container[hand] is null) //Empty hand : try grab mug { // hit_object.transform.SetParent(transform); // hit_object.transform.localPosition = new Vector2(-0.2f,0.2f); - //Doit traiter différement chaque Grabable ... Mug obj = hit_object.GetComponent(); - // if (obj.size==1 || (obj.size==2 && )); - if(obj!=null) + if(obj!=null && obj.size == 1) //Only take obj of size 1 hand { obj.take(); hand_container[hand]=hit_object; } } } - //Full hand : try give to client - else if(hit_object.tag == "Client") //by tag or with parent-name ? + else if(hit_object.tag == "Client") { - Debug.Log("Give "+ hand_container[hand]+" to "+hit_object); - Destroy(hand_container[hand]); + // Debug.Log("Give "+ hand_container[hand].name+" to "+hit_object.name); + Client_controller client = hit_object.GetComponent(); + if(client!=null) + { + if(client.use(hand_container[hand])) //Interactions w/ object in hands + { + //Object taken by client + // Destroy(hand_container[hand]); + hand_container[hand]=null; + } + } } } } @@ -121,12 +127,18 @@ public class Tavernkeeper_controller : MonoBehaviour // Debug.Log("Hand full with "+ hand_container[hand]); // hand_container[hand].transform.SetParent(null); - //Doit traiter différement chaque Grabable ... - Mug obj = hand_container[hand].GetComponent(); - if(obj !=null) + if (hand_container[hand].tag == "Mug") { - obj.drop(rigidbody2d.position); - hand_container[hand]=null; + Mug obj = hand_container[hand].GetComponent(); + if(obj !=null) + { + obj.drop(rigidbody2d.position); + hand_container[hand]=null; + } + } + else + { + Debug.Log(gameObject+" doesn't handle Hand full with "+ hand_container[hand]); } } }