diff --git a/Assets/Resources/Games/sumoBrothers.prefab b/Assets/Resources/Games/sumoBrothers.prefab index ed8500711..a654c1e5c 100644 --- a/Assets/Resources/Games/sumoBrothers.prefab +++ b/Assets/Resources/Games/sumoBrothers.prefab @@ -25,8 +25,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 390818466804584483} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -1, z: 0} - m_LocalScale: {x: 4.2, y: 4.2, z: 1} + m_LocalPosition: {x: 0, y: -1.64, z: 0} + m_LocalScale: {x: 3.4, y: 3.4, z: 1} m_Children: [] m_Father: {fileID: 5411433861679147670} m_RootOrder: 4 @@ -107,8 +107,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 444398237968610205} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 2.3, z: 0} - m_LocalScale: {x: 4.2, y: 4.2, z: 1} + m_LocalPosition: {x: 0.03, y: 2.6, z: 0} + m_LocalScale: {x: 3.3, y: 3.3, z: 1} m_Children: [] m_Father: {fileID: 5411433861679147670} m_RootOrder: 7 @@ -436,7 +436,7 @@ Transform: m_GameObject: {fileID: 1571341233357023295} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.1, z: 0} - m_LocalScale: {x: 4.2, y: 4.2, z: 1} + m_LocalScale: {x: 3.1, y: 3.1, z: 1} m_Children: [] m_Father: {fileID: 5411433861679147670} m_RootOrder: 1 @@ -480,7 +480,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 2 + m_SortingOrder: 3 m_Sprite: {fileID: -634844184711935702, guid: 3eeab378f5f7af04e9c1a69ca8659fd0, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -598,8 +598,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2076759543105989636} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -2.95, z: 0} - m_LocalScale: {x: 4.2, y: 4.3, z: 1} + m_LocalPosition: {x: 0, y: -2.92, z: 0} + m_LocalScale: {x: 3.38, y: 3.38, z: 1} m_Children: - {fileID: 5027793911758892482} - {fileID: 7213482127143916375} @@ -665,10 +665,6 @@ MonoBehaviour: inuSensei: {fileID: 5227835019659435990} sumoBrotherP: {fileID: 830840952002067636} sumoBrotherG: {fileID: 7994875306944076183} - goBopSumo: 0 - goBopInu: 0 - allowBopSumo: 0 - allowBopInu: 0 --- !u!1 &2594614983758801598 GameObject: m_ObjectHideFlags: 0 @@ -905,7 +901,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: c5c3dea9d217be94c9fd8504a8090007, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.50980395} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -941,7 +937,7 @@ Transform: m_GameObject: {fileID: 3506524817364013249} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 6, y: 3.79, z: 1} + m_LocalScale: {x: 150, y: 3.79, z: 1} m_Children: - {fileID: 7885221573673103498} - {fileID: 2500682156147004011} @@ -1024,7 +1020,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3755402736554734648} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.005, y: 0, z: 0} + m_LocalPosition: {x: 0.02, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1726575689327162893} @@ -1270,7 +1266,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4323469768149801684} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.6, y: 2.5, z: 0} + m_LocalPosition: {x: -0.5, y: 2.4, z: 0} m_LocalScale: {x: 4.2, y: 4.2, z: 1} m_Children: [] m_Father: {fileID: 5411433861679147670} @@ -1352,8 +1348,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4337521390274852560} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -1, z: 0} - m_LocalScale: {x: 4.2, y: 4.2, z: 1} + m_LocalPosition: {x: 0, y: -0.99, z: 0} + m_LocalScale: {x: 3.4, y: 3.4, z: 1} m_Children: [] m_Father: {fileID: 7621216590368296269} m_RootOrder: 1 @@ -1481,7 +1477,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: bea58a4bd914ef1449be1891d514124f, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.64705884} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -1655,8 +1651,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4647838761364209505} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.8, z: 0} - m_LocalScale: {x: 4.2, y: 4.2, z: 1} + m_LocalPosition: {x: 0.03, y: -0.4, z: 0} + m_LocalScale: {x: 3.3, y: 3.3, z: 1} m_Children: [] m_Father: {fileID: 5411433861679147670} m_RootOrder: 6 @@ -1820,7 +1816,7 @@ Transform: m_GameObject: {fileID: 4837859304220241771} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 1, z: 0} - m_LocalScale: {x: 4.2, y: 4.2, z: 1} + m_LocalScale: {x: 3.3, y: 3.3, z: 1} m_Children: [] m_Father: {fileID: 5411433861679147670} m_RootOrder: 2 @@ -1864,7 +1860,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 2 + m_SortingOrder: 3 m_Sprite: {fileID: 5033618459941488035, guid: 3eeab378f5f7af04e9c1a69ca8659fd0, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1902,7 +1898,7 @@ Transform: m_GameObject: {fileID: 4902383002529011706} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -1.055409, z: 0} - m_LocalScale: {x: 5.63, y: 1, z: 1} + m_LocalScale: {x: 1.0416667, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2722313523461046499} m_RootOrder: 0 @@ -1983,7 +1979,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5259524508195570774} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.005, y: 0, z: 0} + m_LocalPosition: {x: -0.02, y: 0, z: 0} m_LocalScale: {x: -1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1726575689327162893} @@ -2065,8 +2061,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5542188394923546587} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 2.5, z: 0} - m_LocalScale: {x: 4.2, y: 4.2, z: 1} + m_LocalPosition: {x: 0, y: 2.4, z: 0} + m_LocalScale: {x: 3.3, y: 3.3, z: 1} m_Children: [] m_Father: {fileID: 5411433861679147670} m_RootOrder: 10 @@ -2147,8 +2143,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5864212608072914966} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.8, z: 0} - m_LocalScale: {x: 4.2, y: 4.2, z: 1} + m_LocalPosition: {x: 0, y: -0.92, z: 0} + m_LocalScale: {x: 3.3, y: 3.3, z: 1} m_Children: [] m_Father: {fileID: 5411433861679147670} m_RootOrder: 0 @@ -2192,7 +2188,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingOrder: 2 m_Sprite: {fileID: -1078659944613355180, guid: 3eeab378f5f7af04e9c1a69ca8659fd0, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -2310,9 +2306,9 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6365022513337707962} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 3.3, z: 0} - m_LocalScale: {x: 4.96, y: 4, z: 1} + m_LocalScale: {x: 0.41333336, y: 4, z: 1} m_Children: [] m_Father: {fileID: 2722313523461046499} m_RootOrder: 1 @@ -2393,7 +2389,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6747932310023502656} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.03, y: 1.85, z: 0} + m_LocalPosition: {x: 0.04, y: 2.3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8429657635782174246} @@ -2840,7 +2836,7 @@ Transform: m_GameObject: {fileID: 9009260536645694530} m_LocalRotation: {x: 0, y: 0, z: -0.33380687, w: 0.94264156} m_LocalPosition: {x: 0.7, y: 0, z: 0} - m_LocalScale: {x: 4.2, y: 4.2, z: 1} + m_LocalScale: {x: 3.2, y: 3.2, z: 1} m_Children: [] m_Father: {fileID: 5411433861679147670} m_RootOrder: 5 @@ -3003,7 +2999,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9081158673666972172} m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} - m_LocalPosition: {x: 0.6, y: 2.5, z: 0} + m_LocalPosition: {x: 0.5, y: 2.4, z: 0} m_LocalScale: {x: 4.2, y: 4.2, z: 1} m_Children: [] m_Father: {fileID: 5411433861679147670} diff --git a/Assets/Resources/Sprites/Games/SumoBrothers/Animations/InuBop.anim b/Assets/Resources/Sprites/Games/SumoBrothers/Animations/InuBop.anim index 4083d9af1..e92df42a2 100644 --- a/Assets/Resources/Sprites/Games/SumoBrothers/Animations/InuBop.anim +++ b/Assets/Resources/Sprites/Games/SumoBrothers/Animations/InuBop.anim @@ -45,7 +45,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: -0.2, z: 0} + value: {x: 0, y: -0.78, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -54,7 +54,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.25 - value: {x: 0, y: 0.1, z: 0} + value: {x: -0.02, y: -0.376, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -70,7 +70,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0.7, z: 0} + value: {x: 0, y: 0.378, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -79,7 +79,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.25 - value: {x: 0, y: 1.0763519, z: 0} + value: {x: -0.01, y: 0.8, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -95,7 +95,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.8, y: -0.3, z: 0} + value: {x: 1, y: -0.71, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -104,7 +104,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.25 - value: {x: 0.7, y: 0, z: 0} + value: {x: 0.8, y: -0.25, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -115,13 +115,12 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: inuThing - m_ScaleCurves: - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: {x: 5, y: 3.4, z: 1} + value: {x: 0.03, y: -1, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -130,7 +129,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.25 - value: {x: 4.2, y: 4.2, z: 1} + value: {x: 0, y: -0.92, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -141,6 +140,130 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: inuIdle + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.25 + value: {x: 0, y: -1.64, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: inuShadow + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 3.8, y: 2.9, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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.25 + value: {x: 3.3, y: 3.4, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: inuIdle + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 3.1, y: 3.1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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.25 + value: {x: 3.1, y: 3.1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: inuCollar + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 3.2, y: 3.3, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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.25 + value: {x: 3.3, y: 3.3, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: inuHead + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.25 + value: {x: 3.4, y: 3.4, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: inuShadow + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.25 + value: {x: 3.2, y: 3.2, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: inuThing m_FloatCurves: - curve: serializedVersion: 2 @@ -249,15 +372,6 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 - - serializedVersion: 3 - time: 0.25 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -294,6 +408,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 3722187498 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 1984904105 attribute: 4 @@ -308,6 +429,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 2785759587 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 1504329368 attribute: 2086281974 @@ -350,6 +478,34 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 2933934316 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 226936323 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2933934316 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1984904105 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -377,7 +533,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 5 + value: 3.8 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -386,7 +542,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: 4.2 + value: 3.3 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -405,7 +561,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 3.4 + value: 2.9 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -414,7 +570,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: 4.2 + value: 3.4 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -431,15 +587,6 @@ AnimationClip: - curve: serializedVersion: 2 m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 value: 1 @@ -470,7 +617,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: 0 + value: -0.02 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -489,7 +636,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.2 + value: -0.78 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -498,7 +645,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: 0.1 + value: -0.376 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -515,15 +662,6 @@ AnimationClip: - curve: serializedVersion: 2 m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 value: 0 @@ -554,7 +692,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: 0 + value: -0.01 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -573,7 +711,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.7 + value: 0.378 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -582,7 +720,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: 1.0763519 + value: 0.8 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -599,15 +737,6 @@ AnimationClip: - curve: serializedVersion: 2 m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 value: 0 @@ -627,15 +756,6 @@ AnimationClip: - curve: serializedVersion: 2 m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 value: 0 @@ -655,15 +775,6 @@ AnimationClip: - curve: serializedVersion: 2 m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 value: 0 @@ -713,7 +824,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.8 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -722,7 +833,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: 0.7 + value: 0.8 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -741,7 +852,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.3 + value: -0.71 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -750,7 +861,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: 0 + value: -0.25 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -767,15 +878,6 @@ AnimationClip: - curve: serializedVersion: 2 m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 value: 0 @@ -899,15 +1001,6 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 - - serializedVersion: 3 - time: 0.25 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -915,6 +1008,411 @@ AnimationClip: path: inuStinkEye classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 3.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: inuCollar + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 3.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: inuCollar + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: inuCollar + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 3.3 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: inuHead + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.3 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 3.3 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: inuHead + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.25 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: inuHead + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.03 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: inuIdle + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: -0.92 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: inuIdle + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: inuIdle + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: inuShadow + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.25 + value: -1.64 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: inuShadow + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: inuShadow + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.25 + value: 3.4 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: inuShadow + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.25 + value: 3.4 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: inuShadow + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.25 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: inuShadow + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.25 + value: 3.2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: inuThing + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.25 + value: 3.2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: inuThing + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.25 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: inuThing + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/Assets/Resources/Sprites/Games/SumoBrothers/Animations/InuCrouch.anim b/Assets/Resources/Sprites/Games/SumoBrothers/Animations/InuCrouch.anim index 06cfb747d..93baba1c7 100644 --- a/Assets/Resources/Sprites/Games/SumoBrothers/Animations/InuCrouch.anim +++ b/Assets/Resources/Sprites/Games/SumoBrothers/Animations/InuCrouch.anim @@ -36,7 +36,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: -0.2, z: 0} + value: {x: 0, y: -0.78, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -52,7 +52,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0.7, z: 0} + value: {x: 0, y: 0.378, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -68,7 +68,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.8, y: -0.3, z: 0} + value: {x: 1, y: -0.71, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -79,22 +79,12 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: inuThing - m_ScaleCurves: - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: {x: 5, y: 3.4, z: 1} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, 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.016666668 - value: {x: 5, y: 3.4, z: 1} + value: {x: 0.03, y: -1, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -105,6 +95,55 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: inuIdle + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 3.8, y: 2.9, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: inuIdle + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 3.1, y: 3.1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: inuCollar + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 3.2, y: 3.3, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: inuHead m_FloatCurves: - curve: serializedVersion: 2 @@ -137,15 +176,6 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 - - serializedVersion: 3 - time: 0.25 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -274,6 +304,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 3722187498 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 1984904105 attribute: 4 @@ -288,13 +325,27 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 226936323 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2785759587 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.25 + m_StopTime: 0 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -334,7 +385,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.2 + value: -0.78 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -391,7 +442,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.7 + value: 0.378 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -429,16 +480,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 5 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.016666668 - value: 5 + value: 3.8 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -457,16 +499,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 3.4 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.016666668 - value: 3.4 + value: 2.9 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -492,15 +525,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.016666668 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -513,7 +537,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.8 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -532,7 +556,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.3 + value: -0.71 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -653,15 +677,6 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 - - serializedVersion: 3 - time: 0.25 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -726,6 +741,139 @@ AnimationClip: path: inuMouth classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: inuCollar + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: inuCollar + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: inuCollar + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: inuHead + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.3 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: inuHead + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.03 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: inuIdle + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: inuIdle + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/Assets/Resources/Sprites/Games/SumoBrothers/Animations/InuIdle.anim b/Assets/Resources/Sprites/Games/SumoBrothers/Animations/InuIdle.anim index 37a6952a1..0c60f5187 100644 --- a/Assets/Resources/Sprites/Games/SumoBrothers/Animations/InuIdle.anim +++ b/Assets/Resources/Sprites/Games/SumoBrothers/Animations/InuIdle.anim @@ -36,7 +36,23 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0.1, z: 0} + value: {x: 0, y: -0.92, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: inuIdle + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.02, y: -0.376, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -52,7 +68,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 1, z: 0} + value: {x: -0.01, y: 0.8, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -68,7 +84,23 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.7, y: 0, z: 0} + value: {x: 0, y: -1.64, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: inuShadow + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.8, y: -0.25, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -85,7 +117,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 4.2, y: 4.2, z: 1} + value: {x: 3.3, y: 3.4, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -96,6 +128,70 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: inuIdle + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 3.1, y: 3.1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: inuCollar + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 3.3, y: 3.3, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: inuHead + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 3.4, y: 3.4, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: inuShadow + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 3.2, y: 3.2, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: inuThing m_FloatCurves: - curve: serializedVersion: 2 @@ -147,15 +243,6 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 - - serializedVersion: 3 - time: 0.25 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -244,6 +331,13 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 3722187498 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 226936323 attribute: 1 @@ -258,6 +352,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 2933934316 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 1984904105 attribute: 1 @@ -279,13 +380,41 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 226936323 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2785759587 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2933934316 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1984904105 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.25 + m_StopTime: 0 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -301,6 +430,101 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: inuBounce + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: inuHeadBounce + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: inuEar1 + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: inuEar2 + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: inuMouth + classID: 1 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -317,7 +541,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: inuCollar + path: inuIdle classID: 4 script: {fileID: 0} - curve: @@ -325,7 +549,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.1 + value: -0.92 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -336,7 +560,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: inuCollar + path: inuIdle classID: 4 script: {fileID: 0} - curve: @@ -355,7 +579,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: inuCollar + path: inuIdle classID: 4 script: {fileID: 0} - curve: @@ -363,64 +587,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: inuHead - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: inuHead - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: inuHead - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 4.2 + value: 3.3 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -439,7 +606,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 4.2 + value: 3.4 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -477,7 +644,349 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.7 + value: -0.02 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: inuCollar + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.376 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: inuCollar + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: inuCollar + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: inuCollar + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: inuCollar + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: inuCollar + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.01 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: inuHead + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.8 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: inuHead + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: inuHead + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.3 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: inuHead + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.3 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: inuHead + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: inuHead + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: inuShadow + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -1.64 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: inuShadow + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: inuShadow + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.4 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: inuShadow + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.4 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: inuShadow + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: inuShadow + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.8 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -496,7 +1005,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -0.25 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -591,104 +1100,57 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + value: 3.2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_IsActive - path: inuBounce - classID: 1 + attribute: m_LocalScale.x + path: inuThing + classID: 4 script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + value: 3.2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_IsActive - path: inuHeadBounce - classID: 1 + attribute: m_LocalScale.y + path: inuThing + classID: 4 script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.25 value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_IsActive - path: inuEar1 - classID: 1 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: inuEar2 - classID: 1 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: inuMouth - classID: 1 + attribute: m_LocalScale.z + path: inuThing + classID: 4 script: {fileID: 0} m_EulerEditorCurves: - curve: diff --git a/Assets/Resources/Sprites/Games/SumoBrothers/Animations/InuTweet.anim b/Assets/Resources/Sprites/Games/SumoBrothers/Animations/InuTweet.anim index 58d2dc7cb..b5ecb959e 100644 --- a/Assets/Resources/Sprites/Games/SumoBrothers/Animations/InuTweet.anim +++ b/Assets/Resources/Sprites/Games/SumoBrothers/Animations/InuTweet.anim @@ -48,92 +48,6 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: inuThing - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, 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.05 - value: {x: 0, y: 0, z: 10} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, 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.075 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, 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, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, 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} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: inuEar1 - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: 180, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, 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.075 - value: {x: 0, y: 180, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, 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.1 - value: {x: 0, y: 180, z: -10} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, 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: 180, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, 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} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: inuEar2 m_PositionCurves: - curve: serializedVersion: 2 @@ -203,6 +117,31 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: -1.2, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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: -1.2, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: inuShadow m_ScaleCurves: [] m_FloatCurves: - curve: @@ -477,20 +416,6 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 - - serializedVersion: 2 - path: 696698251 - attribute: 4 - script: {fileID: 0} - typeID: 4 - customType: 4 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 2962199601 - attribute: 4 - script: {fileID: 0} - typeID: 4 - customType: 4 - isPPtrCurve: 0 - serializedVersion: 2 path: 3722187498 attribute: 2086281974 @@ -554,6 +479,13 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 2933934316 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -940,228 +872,6 @@ AnimationClip: path: classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.x - path: inuEar1 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.y - path: inuEar1 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.05 - value: 10 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.075 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.z - path: inuEar1 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.x - path: inuEar2 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 180 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 180 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: 180 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.y - path: inuEar2 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.075 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: -10 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.z - path: inuEar2 - classID: 4 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -1302,6 +1012,72 @@ AnimationClip: path: inuHeadBounce classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: inuShadow + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -1.2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: inuShadow + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: inuShadow + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 @@ -1333,66 +1109,6 @@ AnimationClip: path: inuThing classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: inuEar2 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: inuEar2 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: inuEar2 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: inuEar1 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: inuEar1 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: inuEar1 - classID: 4 - script: {fileID: 0} m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Resources/Sprites/Games/SumoBrothers/sumou_bg.png b/Assets/Resources/Sprites/Games/SumoBrothers/sumou_bg.png new file mode 100644 index 000000000..2ccf1e69c Binary files /dev/null and b/Assets/Resources/Sprites/Games/SumoBrothers/sumou_bg.png differ diff --git a/Assets/Resources/Sprites/Games/SumoBrothers/sumou_bg.png.meta b/Assets/Resources/Sprites/Games/SumoBrothers/sumou_bg.png.meta new file mode 100644 index 000000000..2f726e1a0 --- /dev/null +++ b/Assets/Resources/Sprites/Games/SumoBrothers/sumou_bg.png.meta @@ -0,0 +1,444 @@ +fileFormatVersion: 2 +guid: 3eeab378f5f7af04e9c1a69ca8659fd0 +TextureImporter: + internalIDToNameTable: + - first: + 213: -8551528264012278953 + second: background + - first: + 213: -2768974374605152282 + second: backgroundGlow + - first: + 213: 423810776407373802 + second: inuSenseiPlatform + - first: + 213: 4054221790298107953 + second: ground + - first: + 213: 1277806008517062153 + second: inuBounce + - first: + 213: -1078659944613355180 + second: inuIdle + - first: + 213: 1654900032682902085 + second: inuEar + - first: + 213: 249072357185814813 + second: inuStinkEye + - first: + 213: 5033618459941488035 + second: inuHead + - first: + 213: -1120999474862527824 + second: inuHeadBounce + - first: + 213: 7874366561150129192 + second: inuThing + - first: + 213: 7251623275569825146 + second: inuShadow + - first: + 213: -634844184711935702 + second: inuCollar + - first: + 213: -3432944208663641432 + second: inuMouth + 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: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 200 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + 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: + - serializedVersion: 2 + name: background + rect: + serializedVersion: 2 + x: 98 + y: 1858 + width: 84 + height: 670 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 753d5d01a5ed25980800000000000000 + internalID: -8551528264012278953 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: backgroundGlow + rect: + serializedVersion: 2 + x: 259 + y: 1859 + width: 82 + height: 420 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 6ef10891a70a299d0800000000000000 + internalID: -2768974374605152282 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: inuSenseiPlatform + rect: + serializedVersion: 2 + x: 1581 + y: 2215 + width: 160 + height: 279 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: ae77ebbd7ada1e500800000000000000 + internalID: 423810776407373802 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ground + rect: + serializedVersion: 2 + x: 1800 + y: 2183 + width: 749 + height: 341 + alignment: 5 + pivot: {x: 1, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 130fd53fc3d734830800000000000000 + internalID: 4054221790298107953 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: inuBounce + rect: + serializedVersion: 2 + x: 2444 + y: 4 + width: 104 + height: 200 + alignment: 9 + pivot: {x: 0.5, y: 0.24} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 90ee48d6bcdabb110800000000000000 + internalID: 1277806008517062153 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: inuIdle + rect: + serializedVersion: 2 + x: 2285 + y: 4 + width: 120 + height: 136 + alignment: 9 + pivot: {x: 0.5, y: 0.32} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 451e0efce74d701f0800000000000000 + internalID: -1078659944613355180 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: inuEar + rect: + serializedVersion: 2 + x: 2323 + y: 148 + width: 88 + height: 56 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 542c8dacfc267f610800000000000000 + internalID: 1654900032682902085 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: inuStinkEye + rect: + serializedVersion: 2 + x: 2123 + y: 4 + width: 120 + height: 136 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: d110e6d3df1e47300800000000000000 + internalID: 249072357185814813 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: inuHead + rect: + serializedVersion: 2 + x: 1962 + y: 4 + width: 120 + height: 136 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 3a549afe1510bd540800000000000000 + internalID: 5033618459941488035 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: inuHeadBounce + rect: + serializedVersion: 2 + x: 1820 + y: 4 + width: 104 + height: 136 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 0ba6b6bbae86170f0800000000000000 + internalID: -1120999474862527824 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: inuThing + rect: + serializedVersion: 2 + x: 1696 + y: 0 + width: 88 + height: 140 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 824519ccaae574d60800000000000000 + internalID: 7874366561150129192 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: inuShadow + rect: + serializedVersion: 2 + x: 2020 + y: 148 + width: 104 + height: 56 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: a754b49c2f0f2a460800000000000000 + internalID: 7251623275569825146 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: inuCollar + rect: + serializedVersion: 2 + x: 2155 + y: 175 + width: 56 + height: 28 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: a29c58ad3949037f0800000000000000 + internalID: -634844184711935702 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: inuMouth + rect: + serializedVersion: 2 + x: 2236 + y: 148 + width: 56 + height: 56 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 8a28ed44e6bbb50d0800000000000000 + internalID: -3432944208663641432 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/SumoBrothers/sumou_bg_rot.png.meta b/Assets/Resources/Sprites/Games/SumoBrothers/sumou_bg_rot.png.meta index dfafda0e4..07f371065 100644 --- a/Assets/Resources/Sprites/Games/SumoBrothers/sumou_bg_rot.png.meta +++ b/Assets/Resources/Sprites/Games/SumoBrothers/sumou_bg_rot.png.meta @@ -1,49 +1,7 @@ fileFormatVersion: 2 -guid: 3eeab378f5f7af04e9c1a69ca8659fd0 +guid: 3d993408eb949c945b89991b4fe3be4b TextureImporter: - internalIDToNameTable: - - first: - 213: -8551528264012278953 - second: background - - first: - 213: -2768974374605152282 - second: backgroundGlow - - first: - 213: 423810776407373802 - second: inuSenseiPlatform - - first: - 213: 4054221790298107953 - second: ground - - first: - 213: 1277806008517062153 - second: inuBounce - - first: - 213: -1078659944613355180 - second: inuIdle - - first: - 213: 1654900032682902085 - second: inuEar - - first: - 213: 249072357185814813 - second: inuStinkEye - - first: - 213: 5033618459941488035 - second: inuHead - - first: - 213: -1120999474862527824 - second: inuHeadBounce - - first: - 213: 7874366561150129192 - second: inuThing - - first: - 213: 7251623275569825146 - second: inuShadow - - first: - 213: -634844184711935702 - second: inuCollar - - first: - 213: -3432944208663641432 - second: inuMouth + internalIDToNameTable: [] externalObjects: {} serializedVersion: 11 mipmaps: @@ -83,7 +41,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -117,315 +75,9 @@ TextureImporter: 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: - - serializedVersion: 2 - name: background - rect: - serializedVersion: 2 - x: 8 - y: 752 - width: 496 - height: 264 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 753d5d01a5ed25980800000000000000 - internalID: -8551528264012278953 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: backgroundGlow - rect: - serializedVersion: 2 - x: 520 - y: 752 - width: 88 - height: 176 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 6ef10891a70a299d0800000000000000 - internalID: -2768974374605152282 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: inuSenseiPlatform - rect: - serializedVersion: 2 - x: 632 - y: 892 - width: 64 - height: 111 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: ae77ebbd7ada1e500800000000000000 - internalID: 423810776407373802 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: ground - rect: - serializedVersion: 2 - x: 720 - y: 880 - width: 296 - height: 134 - alignment: 5 - pivot: {x: 1, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 130fd53fc3d734830800000000000000 - internalID: 4054221790298107953 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: inuBounce - rect: - serializedVersion: 2 - x: 970 - y: 2 - width: 52 - height: 100 - alignment: 9 - pivot: {x: 0.5, y: 0.24} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 90ee48d6bcdabb110800000000000000 - internalID: 1277806008517062153 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: inuIdle - rect: - serializedVersion: 2 - x: 906 - y: 2 - width: 60 - height: 68 - alignment: 9 - pivot: {x: 0.5, y: 0.32} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 451e0efce74d701f0800000000000000 - internalID: -1078659944613355180 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: inuEar - rect: - serializedVersion: 2 - x: 922 - y: 74 - width: 44 - height: 28 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 542c8dacfc267f610800000000000000 - internalID: 1654900032682902085 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: inuStinkEye - rect: - serializedVersion: 2 - x: 842 - y: 2 - width: 60 - height: 68 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: d110e6d3df1e47300800000000000000 - internalID: 249072357185814813 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: inuHead - rect: - serializedVersion: 2 - x: 778 - y: 2 - width: 60 - height: 68 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 3a549afe1510bd540800000000000000 - internalID: 5033618459941488035 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: inuHeadBounce - rect: - serializedVersion: 2 - x: 722 - y: 2 - width: 52 - height: 68 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 0ba6b6bbae86170f0800000000000000 - internalID: -1120999474862527824 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: inuThing - rect: - serializedVersion: 2 - x: 674 - y: 2 - width: 44 - height: 68 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 824519ccaae574d60800000000000000 - internalID: 7874366561150129192 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: inuShadow - rect: - serializedVersion: 2 - x: 802 - y: 74 - width: 52 - height: 28 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: a754b49c2f0f2a460800000000000000 - internalID: 7251623275569825146 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: inuCollar - rect: - serializedVersion: 2 - x: 858 - y: 74 - width: 28 - height: 28 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: a29c58ad3949037f0800000000000000 - internalID: -634844184711935702 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: inuMouth - rect: - serializedVersion: 2 - x: 890 - y: 74 - width: 28 - height: 28 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 8a28ed44e6bbb50d0800000000000000 - internalID: -3432944208663641432 - vertices: [] - indices: - edges: [] - weights: [] + sprites: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/Resources/Sprites/Games/SumoBrothers/sumou_brothers.png b/Assets/Resources/Sprites/Games/SumoBrothers/sumou_brothers.png new file mode 100644 index 000000000..0a5f53c82 Binary files /dev/null and b/Assets/Resources/Sprites/Games/SumoBrothers/sumou_brothers.png differ diff --git a/Assets/Resources/Sprites/Games/SumoBrothers/sumou_brothers.png.meta b/Assets/Resources/Sprites/Games/SumoBrothers/sumou_brothers.png.meta new file mode 100644 index 000000000..237216188 --- /dev/null +++ b/Assets/Resources/Sprites/Games/SumoBrothers/sumou_brothers.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 8c64907ce6b9ba948a869d3723e411a2 +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: 0 + 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: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + 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 + 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/Resources/Sprites/Games/SumoBrothers/sumou_obj_rot.png.meta b/Assets/Resources/Sprites/Games/SumoBrothers/sumou_obj_rot.png.meta index c06454aa1..0a1fef6cc 100644 --- a/Assets/Resources/Sprites/Games/SumoBrothers/sumou_obj_rot.png.meta +++ b/Assets/Resources/Sprites/Games/SumoBrothers/sumou_obj_rot.png.meta @@ -223,7 +223,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 4c738e75c9f4fce10800000000000000 internalID: 2220080674225272772 @@ -244,7 +244,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 238c468a25ebf02e0800000000000000 internalID: -2157296434265405390 @@ -265,7 +265,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 3fa84c614bf2df8c0800000000000000 internalID: -3963959646493570317 @@ -286,7 +286,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 10acebe10f2b58d60800000000000000 internalID: 7891910666414377473 @@ -307,7 +307,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 489d412e93737dd70800000000000000 internalID: 9067777096479463812 @@ -328,7 +328,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 94b614d05a654e500800000000000000 internalID: 424559531771652937 @@ -349,7 +349,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: ded39544404d86360800000000000000 internalID: 7163208322124430829 @@ -370,7 +370,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 96cc84a47add146b0800000000000000 internalID: -5313722374744912791 @@ -391,7 +391,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 476c2b0a1cb3230c0800000000000000 internalID: -4597546566781057420 @@ -412,7 +412,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 80d31f8ee8776a4e0800000000000000 internalID: -1970756331250828024 @@ -433,7 +433,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: c0796123034843e40800000000000000 internalID: 5635274376280971020 @@ -454,7 +454,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 6d1d0bfb2e1ae3050800000000000000 internalID: 5782236966841012694 @@ -475,7 +475,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 1c954703aedfa0170800000000000000 internalID: 8145602058330069441 @@ -496,7 +496,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 28e06ab62814383c0800000000000000 internalID: -4358567985956909438 @@ -517,7 +517,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: d910e0d21ec4a7240800000000000000 internalID: 4790225683669189021 @@ -538,7 +538,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: c03e2f7f9caf08810800000000000000 internalID: 1765686799284495116 @@ -559,7 +559,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: b9f18ae50aa0c8bc0800000000000000 internalID: -3779634303371567205 @@ -580,7 +580,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 562a8e48b9f6aadb0800000000000000 internalID: -4779885340759907739 @@ -601,7 +601,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 9435de8c535f45680800000000000000 internalID: -8767112963230444727 @@ -622,7 +622,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 21c71ada8456a1a80800000000000000 internalID: -8495366384255927278 @@ -643,7 +643,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 5e56b0aabd8bab2a0800000000000000 internalID: -6720856240306821659 @@ -664,7 +664,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: a40a2517c888b5900800000000000000 internalID: 674282706000060490 @@ -685,7 +685,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 08a8b496b852e2f10800000000000000 internalID: 2246774544801696384 @@ -706,7 +706,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 3acdadc61d5cb9cd0800000000000000 internalID: -2550227260710134621 @@ -727,7 +727,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 9de4a7cb1ea07c020800000000000000 internalID: 2361868494225166041 @@ -748,7 +748,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: b1d2e0d05547e97c0800000000000000 internalID: -4062681905201533669 @@ -769,7 +769,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: f1d0b163ccf045bb0800000000000000 internalID: -4948312720817844961 @@ -790,7 +790,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 4e143612b87c493b0800000000000000 internalID: -5506557043992739356 @@ -811,7 +811,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: d7f4f629b2a045eb0800000000000000 internalID: -4732146126202908803 @@ -832,7 +832,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 320f02c9ed97fa120800000000000000 internalID: 2427292721185091619 @@ -853,7 +853,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: b6311c0f12a6f5230800000000000000 internalID: 3629736518689559403 @@ -874,7 +874,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: de5c1e25b827dd8b0800000000000000 internalID: -5125814858161207827 @@ -895,7 +895,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 9b7af651cc693ba60800000000000000 internalID: 7688654792128702393 @@ -916,7 +916,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 0c9551caced00b730800000000000000 internalID: 4012722578137635264 @@ -937,7 +937,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 1a10aec0a494fb710800000000000000 internalID: 1711166965817147809 @@ -958,7 +958,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 2bcefaa059c7646b0800000000000000 internalID: -5312421730865648462 @@ -979,7 +979,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 6f4a1e23421460c20800000000000000 internalID: 3172294611257369846 @@ -1000,7 +1000,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: fa9e6c1f2b6387dd0800000000000000 internalID: -2488178651933775441 @@ -1021,7 +1021,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 611f446f1f07250c0800000000000000 internalID: -4588480885815971562 @@ -1042,7 +1042,7 @@ TextureImporter: border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 11c26bc3326353d60800000000000000 internalID: 7869255448870136849 diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index bb48928db..9b1927571 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -23702,7 +23702,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 130.07068} + m_AnchoredPosition: {x: 0, y: 130.06236} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1154875944 @@ -31801,7 +31801,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1292844878} m_HandleRect: {fileID: 1292844877} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: diff --git a/Assets/Scripts/Games/SumoBrothers/SumoBrothers.cs b/Assets/Scripts/Games/SumoBrothers/SumoBrothers.cs index 3f3c57374..b17b2aaaf 100644 --- a/Assets/Scripts/Games/SumoBrothers/SumoBrothers.cs +++ b/Assets/Scripts/Games/SumoBrothers/SumoBrothers.cs @@ -10,26 +10,26 @@ namespace HeavenStudio.Games.Loaders { public static Minigame AddGame(EventCaller eventCaller) { - return new Minigame("sumoBrothers", "Sumo Brothers \n[INITIALIZATION ONLY]", "0058CE", false, false, new List() + return new Minigame("sumoBrothers", "Sumo Brothers \n[INITIALIZATION ONLY]", "EDED15", false, false, new List() { new GameAction("bop", "Bop") { - function = delegate { var e = eventCaller.currentEntity; SumoBrothers.instance.Bop(e["toggle"], e["toggle1"]); }, + function = delegate { var e = eventCaller.currentEntity; SumoBrothers.instance.Bop(e["inu"], e["sumo"]); }, parameters = new List() { - new Param("toggle", true, "Inu Bop", "Whether Inu Sensei bops or not."), - new Param("toggle1", true, "Brothers Bop", "Whether the Sumo Brothers bop or not."), + new Param("inu", true, "Inu Bop", "Whether Inu Sensei bops or not."), + new Param("sumo", true, "Brothers Bop", "Whether the Sumo Brothers bop or not."), }, defaultLength = 0.5f }, new GameAction("crouch", "Crouch") { - function = delegate { var e = eventCaller.currentEntity; SumoBrothers.instance.Crouch(e.beat, e.length, e["toggle"], e["toggle1"]); }, + function = delegate { var e = eventCaller.currentEntity; SumoBrothers.instance.Crouch(e.beat, e.length, e["inu"], e["sumo"]); }, parameters = new List() { - new Param("toggle", true, "Inu Crouch", "Whether Inu Sensei crouches or not."), - new Param("toggle1", true, "Brothers Crouch", "Whether the Sumo Brothers crouch or not.") + new Param("inu", true, "Inu Crouch", "Whether Inu Sensei crouches or not."), + new Param("sumo", true, "Brothers Crouch", "Whether the Sumo Brothers crouch or not.") }, defaultLength = 1f, resizable = true @@ -37,7 +37,12 @@ namespace HeavenStudio.Games.Loaders new GameAction("endPose", "End Pose") { - function = delegate { var e = eventCaller.currentEntity; SumoBrothers.instance.Pose(e.beat); }, + function = delegate { var e = eventCaller.currentEntity; SumoBrothers.instance.EndPose(e.beat); }, + parameters = new List() + { + new Param("type", SumoBrothers.PoseType.Crouching, "Pose", "The pose that the Sumo Brothers will make."), + new Param("bg", SumoBrothers.BGType.TheGreatWave, "Background", "The background that appears on a successful input.") + }, defaultLength = 5f } @@ -57,14 +62,39 @@ namespace HeavenStudio.Games [SerializeField] Animator sumoBrotherG; [Header("Properties")] - public bool goBopSumo; - public bool goBopInu; - public bool allowBopSumo; - public bool allowBopInu; + static List queuedInputs = new List(); + public struct queuedSumoInputs + { + public float beat; + public int cue; + public int poseType; + public int poseBG; + } + + private bool goBopSumo; + private bool goBopInu; + + private bool allowBopSumo; + private bool allowBopInu; + private float lastReportedBeat = 0f; public static SumoBrothers instance; + public enum PoseType + { + Crouching = 0, + Crossed = 1, + Pointing = 2, + Finale = 3 + } + + public enum BGType + { + TheGreatWave = 0, + OtaniOniji = 1 + } + // Start is called before the first frame update void Awake() { @@ -76,6 +106,14 @@ namespace HeavenStudio.Games } + void OnDestroy() + { + if (!Conductor.instance.isPlaying || Conductor.instance.isPaused) + { + if (queuedInputs.Count > 0) queuedInputs.Clear(); + } + } + // Update is called once per frame void Update() { @@ -95,6 +133,11 @@ namespace HeavenStudio.Games } } + + if (PlayerInput.Pressed() && !IsExpectingInputNow()) + { + + } } public void Bop(bool inu, bool sumo) @@ -131,39 +174,66 @@ namespace HeavenStudio.Games } - public void Pose(float beat) + public void EndPose(float beat) { var cond = Conductor.instance; - var cueLength = 3 * cond.secPerBeat; - print(cond.pitchedSecPerBeat); - var loopAmount = Math.Round((cueLength - 0.208) / 0.395); - var beatsPerSecond = cond.songBpm / 60; - var soundBeatLength = beatsPerSecond * 0.395; + #region Tweet + var loopAmount = Math.Round((3 * cond.secPerBeat - 0.208) / 0.395); + var beatsPerSecond = cond.songBpm / 60; + var soundBeatLength = beatsPerSecond * 0.395; + + List sound = new List(); + sound.Add(new MultiSound.Sound("sumoBrothers/posesignalBegin", beat)); + + for (int i = 1; i <= loopAmount; i++) + { + sound.Add(new MultiSound.Sound("sumoBrothers/posesignalLoop", i * (float)soundBeatLength + beat - (float)soundBeatLength + ((float)beatsPerSecond * 0.208f))); + } + + MultiSound.Play(sound.ToArray()); + + var tweetLength = (float)loopAmount * (float)soundBeatLength - (float)soundBeatLength + ((float)beatsPerSecond * 0.208f); + print(tweetLength); + + #endregion + + //SumoBrothers.instance.EndPoseCheck(beat); + - List sound = new List(); - sound.Add(new MultiSound.Sound("sumoBrothers/posesignalBegin", beat)); - - for (int i = 1; i <= loopAmount; i++) - { - sound.Add(new MultiSound.Sound("sumoBrothers/posesignalLoop", i * (float)soundBeatLength + beat - (float)soundBeatLength + ((float)beatsPerSecond * 0.208f))); - } - - MultiSound.Play(sound.ToArray()); - allowBopInu = false; inuSensei.DoScaledAnimationAsync("InuTweet", 0.5f); - var tweetLength = (float)loopAmount * (float)soundBeatLength - (float)soundBeatLength + ((float)beatsPerSecond * 0.208f); - print(tweetLength); - BeatAction.New(instance.gameObject, new List() { - new BeatAction.Action(beat + tweetLength + 1, delegate { allowBopInu = true; }), - new BeatAction.Action(beat + tweetLength + 1, delegate { if (goBopInu == false) inuSensei.DoScaledAnimationAsync("InuIdle", 0.5f); }), - new BeatAction.Action(beat + tweetLength + 1, delegate { if (goBopInu == true) inuSensei.DoScaledAnimationAsync("InuBop", 0.5f); }) + + BeatAction.New(instance.gameObject, new List() { + new BeatAction.Action(beat + 3, delegate { allowBopInu = true; }), + new BeatAction.Action(beat + 3, delegate { if (goBopInu == false) inuSensei.DoScaledAnimationAsync("InuIdle", 0.5f); }), + new BeatAction.Action(beat + 3, delegate { if (goBopInu == true) inuSensei.DoScaledAnimationAsync("InuBop", 0.5f); }) }); - + } + + void EndPoseCheck(float beat) + { + + //ScheduleInput(beat, 5f, InputType.STANDARD_ALT_DOWN, SuccessEndPose, MissEndPose, Nothing); + + } + + void SuccessEndPose(PlayerActionEvent caller) + { + } + + void MissEndPose(PlayerActionEvent caller) + { + + + + } + + void Nothing(PlayerActionEvent caller) { } + } }