diff --git a/Assets/Resources/Games/kitties.prefab b/Assets/Resources/Games/kitties.prefab index c6837149a..e4580dd77 100644 --- a/Assets/Resources/Games/kitties.prefab +++ b/Assets/Resources/Games/kitties.prefab @@ -85,8 +85,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3078320056411217663} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 20, y: 20, z: 1} + m_LocalPosition: {x: 0, y: 0, z: 4} + m_LocalScale: {x: 40, y: 40, z: 1} m_Children: [] m_Father: {fileID: 7036960847367506643} m_RootOrder: 0 @@ -407,15 +407,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} propertyPath: m_LocalPosition.x - value: -5.11 + value: -6.61 objectReference: {fileID: 0} - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} propertyPath: m_LocalPosition.y - value: -0.5 + value: 2.5 objectReference: {fileID: 0} - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 6 objectReference: {fileID: 0} - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} propertyPath: m_LocalRotation.w @@ -519,11 +519,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} propertyPath: m_LocalPosition.y - value: -0.5 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} propertyPath: m_LocalRotation.w @@ -589,6 +589,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7036960847367506643} m_Modifications: + - target: {fileID: 3555030977011516957, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5258587802238640298, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} propertyPath: m_Name value: KittyPlayer @@ -627,15 +631,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} propertyPath: m_LocalPosition.x - value: 5.75 + value: 4.25 objectReference: {fileID: 0} - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} propertyPath: m_LocalPosition.y - value: -0.5 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -2 objectReference: {fileID: 0} - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/Resources/Sprites/Games/Kitties/Animations/Kitty.controller b/Assets/Resources/Sprites/Games/Kitties/Animations/Kitty.controller index 735805291..8d393c232 100644 --- a/Assets/Resources/Sprites/Games/Kitties/Animations/Kitty.controller +++ b/Assets/Resources/Sprites/Games/Kitties/Animations/Kitty.controller @@ -131,22 +131,22 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -1562517816871150084} - m_Position: {x: 240, y: -90, z: 0} + m_Position: {x: 250, y: -90, z: 0} - serializedVersion: 1 m_State: {fileID: 7444453054908554979} - m_Position: {x: 235, y: 65, z: 0} + m_Position: {x: 230, y: 60, z: 0} - serializedVersion: 1 m_State: {fileID: 2244834140372957844} - m_Position: {x: 280, y: 150, z: 0} + m_Position: {x: 260, y: 170, z: 0} - serializedVersion: 1 m_State: {fileID: -3829949611351272118} - m_Position: {x: 510, y: 150, z: 0} + m_Position: {x: 500, y: 180, z: 0} - serializedVersion: 1 m_State: {fileID: 4006658929380800863} - m_Position: {x: 540, y: 40, z: 0} + m_Position: {x: 550, y: 50, z: 0} - serializedVersion: 1 m_State: {fileID: 9150623838022980312} - m_Position: {x: 575, y: 105, z: 0} + m_Position: {x: 540, y: 110, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -288,7 +288,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ClapBarely + m_Name: ClapMiss m_Speed: 1 m_CycleOffset: 0 m_Transitions: diff --git a/Assets/Scripts/Games/Kitties/CtrTeppanPlayer.cs b/Assets/Scripts/Games/Kitties/CtrTeppanPlayer.cs index c335446a6..792e593d4 100644 --- a/Assets/Scripts/Games/Kitties/CtrTeppanPlayer.cs +++ b/Assets/Scripts/Games/Kitties/CtrTeppanPlayer.cs @@ -52,7 +52,7 @@ namespace HeavenStudio.Games.Scripts_Kitties { //todo: proper near miss feedback Jukebox.PlayOneShotGame("kitties/ClapMiss1"); Jukebox.PlayOneShotGame("kitties/tink"); - anim.Play("Clap1", 0, 0); + anim.Play("ClapMiss", 0, 0); } else { @@ -76,7 +76,7 @@ namespace HeavenStudio.Games.Scripts_Kitties { //todo: proper near miss feedback Jukebox.PlayOneShotGame("kitties/ClapMiss2"); Jukebox.PlayOneShotGame("kitties/tink"); - anim.Play("Clap1", 0, 0); + anim.Play("ClapMiss", 0, 0); } else { diff --git a/Assets/Scripts/Games/Kitties/Kitties.cs b/Assets/Scripts/Games/Kitties/Kitties.cs index d322ebcb1..ea6440dce 100644 --- a/Assets/Scripts/Games/Kitties/Kitties.cs +++ b/Assets/Scripts/Games/Kitties/Kitties.cs @@ -140,6 +140,63 @@ namespace HeavenStudio.Games } } break; + + case 1: + + if (!isInverse) + { + Cats[0].transform.position = new Vector3(-6.61f, 2.5f, 6f); + Cats[1].transform.position = new Vector3(.32f, 0.5f, 2f); + Cats[2].transform.position = new Vector3(4.25f, -1f, -2f); + + for (int x = 0; x < 3; x++) + { + Cats[catNum].transform.GetChild(0).gameObject.GetComponent().flipX = true; + Cats[catNum].transform.GetChild(1).gameObject.transform.localScale = new Vector3(1f, 1f, 1f); + } + } + else + { + Cats[0].transform.position = new Vector3(6.61f, 2.5f, 6f); + Cats[1].transform.position = new Vector3(.32f, 0.5f, 2f); + Cats[2].transform.position = new Vector3(-4.25f, -1f, -2f); + + for (int x = 0; x < 3; x++) + { + Cats[catNum].transform.GetChild(0).gameObject.GetComponent().flipX = false; + Cats[catNum].transform.GetChild(1).gameObject.transform.localScale = new Vector3(-1f, 1f, 1f); + } + } + break; + + case 2: + + if (!isInverse) + { + Cats[0].transform.position = new Vector3(4.25f, -1f, -2f); + Cats[1].transform.position = new Vector3(.32f, 0.5f, 2f); + Cats[2].transform.position = new Vector3(-6.61f, 2.5f, 6f); + + for (int x = 0; x < 3; x++) + { + Cats[catNum].transform.GetChild(0).gameObject.GetComponent().flipX = true; + Cats[catNum].transform.GetChild(1).gameObject.transform.localScale = new Vector3(1f, 1f, 1f); + } + } + else + { + Cats[0].transform.position = new Vector3(-4.25f, -1f, -2f); + Cats[1].transform.position = new Vector3(.32f, 0.5f, 2f); + Cats[2].transform.position = new Vector3(6.61f, 2.5f, 6f); + + for (int x = 0; x < 3; x++) + { + Cats[catNum].transform.GetChild(0).gameObject.GetComponent().flipX = false; + Cats[catNum].transform.GetChild(1).gameObject.transform.localScale = new Vector3(-1f, 1f, 1f); + } + } + break; + default: break; }