diff --git a/Assets/Resources/Games/frogHop.prefab b/Assets/Resources/Games/frogHop.prefab index 01c3b1993..72ced2493 100644 --- a/Assets/Resources/Games/frogHop.prefab +++ b/Assets/Resources/Games/frogHop.prefab @@ -26,7 +26,7 @@ RectTransform: m_GameObject: {fileID: 1957333825293202123} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 20, y: 11, z: 1} + m_LocalScale: {x: 60, y: 11, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 643350981976857931} @@ -268,7 +268,7 @@ Transform: m_GameObject: {fileID: 3684072535637705111} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 11, y: 0.4, z: 1} + m_LocalScale: {x: 33, y: 0.4, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 643350981976857931} diff --git a/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogBackup.prefab b/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogBackup.prefab index ee0c06271..521ade672 100644 --- a/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogBackup.prefab +++ b/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogBackup.prefab @@ -837,6 +837,7 @@ MonoBehaviour: - {fileID: 3660695675016261408} - {fileID: 4265139066045870079} MissFace: {fileID: 2983375294669822441} + Head: {fileID: 406877900976759553} --- !u!1 &8095984365337491922 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogLeader.prefab b/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogLeader.prefab index a94819cef..260ed2a79 100644 --- a/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogLeader.prefab +++ b/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogLeader.prefab @@ -415,6 +415,7 @@ MonoBehaviour: - {fileID: 5161764168841387940} - {fileID: 1060326674701855250} MissFace: {fileID: 0} + Head: {fileID: 406877900976759553} --- !u!1 &8765760830273088637 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogSinger.prefab b/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogSinger.prefab index bb4d7c4e1..dfe6cd835 100644 --- a/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogSinger.prefab +++ b/Assets/Resources/Prefabs/Games/FrogHop/ntrFrogSinger.prefab @@ -499,3 +499,4 @@ MonoBehaviour: - {fileID: 5367215990793986928} - {fileID: 8895987175637078968} MissFace: {fileID: 0} + Head: {fileID: 4042941232235986953} diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderSpin.anim b/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderSpin.anim index a44d806e0..fbe37f5cf 100644 --- a/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderSpin.anim +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderSpin.anim @@ -286,7 +286,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.33333334 - value: {x: -0.43800002, y: 4.6200004, z: 0} + value: {x: -0.43800002, y: 4.651, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -295,7 +295,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.38333333 - value: {x: 0.09200002, y: 4.448, z: 0} + value: {x: 0.068, y: 4.448, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -2330,7 +2330,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.38333333 - value: 0.09200002 + value: 0.068 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -2394,7 +2394,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: 4.6200004 + value: 4.651 inSlope: Infinity outSlope: Infinity tangentMode: 103 diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderTalkWide.anim b/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderTalkWide.anim index a24d2dcc6..f012a4902 100644 --- a/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderTalkWide.anim +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/LeaderTalkWide.anim @@ -22,15 +22,15 @@ AnimationClip: time: 0 value: {x: 0, y: 0, z: 0} inSlope: {x: -0, y: -0, z: -0} - outSlope: {x: 0, y: -1.6666666, z: 0} + outSlope: {x: 0, y: -1.6199999, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.15 - value: {x: 0, y: -0.25, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: -0.243, z: 0} + inSlope: {x: -0, y: Infinity, z: -0} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 weightedMode: 0 @@ -38,7 +38,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.21666667 - value: {x: 0, y: -0.093, z: 0} + value: {x: 0, y: -0.086, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -183,6 +183,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 0 + inSlope: -0 + outSlope: Infinity + tangentMode: 101 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 value: 0 @@ -215,14 +224,14 @@ AnimationClip: time: 0 value: 0 inSlope: -0 - outSlope: -1.6666666 + outSlope: -1.6199999 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: -0.25 + value: -0.243 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -231,7 +240,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: -0.093 + value: -0.086 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -266,6 +275,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 0 + inSlope: -0 + outSlope: Infinity + tangentMode: 101 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 value: 0 diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/SingerSpin.anim b/Assets/Resources/Sprites/Games/FrogHop/Animations/SingerSpin.anim index 3170905b8..e6e146689 100644 --- a/Assets/Resources/Sprites/Games/FrogHop/Animations/SingerSpin.anim +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/SingerSpin.anim @@ -286,7 +286,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.33333334 - value: {x: -0.43800002, y: 4.6200004, z: 0} + value: {x: -0.43800002, y: 4.651, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -295,7 +295,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.38333333 - value: {x: 0.09200002, y: 4.448, z: 0} + value: {x: 0.068, y: 4.448, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -2330,7 +2330,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.38333333 - value: 0.09200002 + value: 0.068 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -2394,7 +2394,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: 4.6200004 + value: 4.651 inSlope: Infinity outSlope: Infinity tangentMode: 103 diff --git a/Assets/Resources/Sprites/Games/FrogHop/froghopupscale4096.png b/Assets/Resources/Sprites/Games/FrogHop/froghopupscale4096.png index a2f047a3f..2f3103138 100644 Binary files a/Assets/Resources/Sprites/Games/FrogHop/froghopupscale4096.png and b/Assets/Resources/Sprites/Games/FrogHop/froghopupscale4096.png differ diff --git a/Assets/Resources/Sprites/Games/FrogHop/froghopupscale4096.png.meta b/Assets/Resources/Sprites/Games/FrogHop/froghopupscale4096.png.meta index cbb0022eb..a6910633c 100644 --- a/Assets/Resources/Sprites/Games/FrogHop/froghopupscale4096.png.meta +++ b/Assets/Resources/Sprites/Games/FrogHop/froghopupscale4096.png.meta @@ -1012,9 +1012,9 @@ TextureImporter: rect: serializedVersion: 2 x: 32 - y: 2455 - width: 146 - height: 152 + y: 2456 + width: 147 + height: 151 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Scripts/Games/FrogHop/ntrFrog.cs b/Assets/Scripts/Games/FrogHop/ntrFrog.cs index 47378e9d1..751ea5bc8 100644 --- a/Assets/Scripts/Games/FrogHop/ntrFrog.cs +++ b/Assets/Scripts/Games/FrogHop/ntrFrog.cs @@ -15,6 +15,7 @@ namespace HeavenStudio.Games.Scripts_FrogHop [SerializeField] public Animator FrogAnim; [SerializeField] public List SpriteParts = new(); [SerializeField] public Transform MissFace; + [SerializeField] public SpriteRenderer Head; [NonSerialized] public int animSide = -1; [NonSerialized] public float scaleConstant = 1; @@ -118,6 +119,9 @@ namespace HeavenStudio.Games.Scripts_FrogHop if (side != 0) animSide = side; else animSide *= -1; if (MissFace != null) MissFace.localScale = new Vector3(animSide, 1, 1); + Head.flipX = animSide > 0; + + Debug.Log(animSide); } public void Darken(bool reverse = false)