From f216143e1f995592348ae3e3ff25ba1c3e7150ae Mon Sep 17 00:00:00 2001 From: minenice55 Date: Fri, 12 Aug 2022 10:41:41 -0400 Subject: [PATCH] remappable item colours - fixed bop toggle not working - fixed some entities being stretchable when they shouldn't --- Assets/Resources/Games/karateman.prefab | 114 +++- .../Games/KarateMan/anime/item/Item01.anim | 571 +++++++++++++++--- .../Games/KarateMan/anime/item/Item99.anim | 111 +++- .../Games/KarateMan/karateman_cellshader.mat | 2 +- Assets/Scripts/Games/KarateMan/KarateMan.cs | 5 +- .../Scripts/Games/KarateMan/KarateManJoe.cs | 3 +- .../Scripts/Games/KarateMan/KarateManPot.cs | 68 ++- 7 files changed, 759 insertions(+), 115 deletions(-) diff --git a/Assets/Resources/Games/karateman.prefab b/Assets/Resources/Games/karateman.prefab index 80f49137..6ccfe68f 100644 --- a/Assets/Resources/Games/karateman.prefab +++ b/Assets/Resources/Games/karateman.prefab @@ -31117,7 +31117,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 3.5694444, y: 1.6805556} + m_Size: {x: 3.5694444, y: 1.6805557} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 0 @@ -61611,6 +61611,7 @@ Transform: - {fileID: 7124728438334572711} - {fileID: 2322646606158329272} - {fileID: 5350646417728134167} + - {fileID: 7866149883590960440} m_Father: {fileID: 3325930061220206449} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -61684,6 +61685,31 @@ MonoBehaviour: - {fileID: 4838905935631281929} - {fileID: 6348241087457618039} awakeAnim: + cellRenderers: + - {fileID: 3539874015363083757} + - {fileID: 6100859660585592015} + - {fileID: 5284027654662856434} + - {fileID: 8717773036192970139} + - {fileID: 6902659065314665230} + - {fileID: 7106630173843556496} + - {fileID: 5747805804250125440} + - {fileID: 1280364348460651971} + ItemAlienMap: + - {r: 0.14509805, g: 0.14509805, b: 0.14509805, a: 1} + - {r: 0.99215686, g: 0.99607843, b: 0.99607843, a: 1} + - {r: 0, g: 0, b: 0, a: 0} + ItemBombMap: + - {r: 1, g: 0.08235294, b: 0.12941177, a: 1} + - {r: 1, g: 0.9372549, b: 0.03137255, a: 1} + - {r: 0, g: 0, b: 0, a: 0} + ItemBarrelMap: + - {r: 0.4509804, g: 0.3019608, b: 0.27058825, a: 1} + - {r: 0.3019608, g: 0.16862746, b: 0.03529412, a: 1} + - {r: 0.7137255, g: 0.30980393, b: 0.42352942, a: 1} + ItemCookingLidMap: + - {r: 0, g: 0, b: 0, a: 1} + - {r: 1, g: 1, b: 1, a: 0} + - {r: 0, g: 0, b: 0, a: 0} comboId: -1 HitPosition: - {fileID: 320160549894608069} @@ -61726,7 +61752,7 @@ MonoBehaviour: - {fileID: 3313832072412894528} CurrentCurve: {fileID: 0} curveTargetBeat: 0 - BulbLight: {fileID: 6100859660585592015} + BulbLight: {fileID: 6791490746777997791} --- !u!1 &4199646893499933531 GameObject: m_ObjectHideFlags: 0 @@ -76722,6 +76748,88 @@ MonoBehaviour: handleType: 0 leftHandleLocalPosition: {x: -1, y: 3, z: 0} rightHandleLocalPosition: {x: 1, y: -3, z: -0} +--- !u!1 &5042991525231704989 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7866149883590960440} + - component: {fileID: 6791490746777997791} + m_Layer: 0 + m_Name: MainNoMap + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7866149883590960440 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5042991525231704989} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.64, y: 0.64, z: 1} + m_Children: [] + m_Father: {fileID: 4468064543835661468} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6791490746777997791 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5042991525231704989} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.8888888, y: 3.8888888} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &5218911297968347512 GameObject: m_ObjectHideFlags: 0 @@ -96548,7 +96656,7 @@ MonoBehaviour: Item: {fileID: 4158625219071088136} Joe: {fileID: 5897754239051819249} MappingMaterial: {fileID: 2100000, guid: 01a12550d4a6d8141bbbdf4ce2700eea, type: 2} - BodyColor: {r: 1, g: 1, b: 1, a: 0} + BodyColor: {r: 1, g: 1, b: 1, a: 1} HighlightColor: {r: 0.54901963, g: 0.54901963, b: 0.54901963, a: 1} ItemColor: {r: 1, g: 1, b: 1, a: 1} Word: {fileID: 8471847813194768760} diff --git a/Assets/Resources/Sprites/Games/KarateMan/anime/item/Item01.anim b/Assets/Resources/Sprites/Games/KarateMan/anime/item/Item01.anim index b1c53466..e63e24aa 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/anime/item/Item01.anim +++ b/Assets/Resources/Sprites/Games/KarateMan/anime/item/Item01.anim @@ -24,7 +24,7 @@ AnimationClip: inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 - weightedMode: 0 + weightedMode: 3 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 @@ -33,7 +33,7 @@ AnimationClip: inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 - weightedMode: 0 + weightedMode: 3 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 @@ -49,7 +49,7 @@ AnimationClip: inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 - weightedMode: 0 + weightedMode: 3 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 @@ -58,7 +58,7 @@ AnimationClip: inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 - weightedMode: 0 + weightedMode: 3 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 @@ -67,7 +67,7 @@ AnimationClip: inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 - weightedMode: 0 + weightedMode: 3 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 @@ -83,7 +83,7 @@ AnimationClip: inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 - weightedMode: 0 + weightedMode: 3 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 @@ -92,7 +92,7 @@ AnimationClip: inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 - weightedMode: 0 + weightedMode: 3 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 @@ -108,7 +108,7 @@ AnimationClip: inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 - weightedMode: 0 + weightedMode: 3 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 @@ -117,7 +117,7 @@ AnimationClip: inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 - weightedMode: 0 + weightedMode: 3 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 @@ -133,7 +133,7 @@ AnimationClip: inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 - weightedMode: 0 + weightedMode: 3 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 @@ -142,7 +142,7 @@ AnimationClip: inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 - weightedMode: 0 + weightedMode: 3 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 @@ -158,7 +158,7 @@ AnimationClip: inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 - weightedMode: 0 + weightedMode: 3 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 @@ -167,7 +167,7 @@ AnimationClip: inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 - weightedMode: 0 + weightedMode: 3 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 @@ -183,7 +183,7 @@ AnimationClip: inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 - weightedMode: 0 + weightedMode: 3 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 @@ -192,13 +192,38 @@ AnimationClip: inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 - weightedMode: 0 + weightedMode: 3 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: Sub6 + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 3 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.06666667 + value: {x: -0.164, y: 0.017, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 3 + 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: MainNoMap m_ScaleCurves: - curve: serializedVersion: 2 @@ -209,7 +234,7 @@ AnimationClip: inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 - weightedMode: 0 + weightedMode: 3 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 @@ -218,7 +243,7 @@ AnimationClip: inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 - weightedMode: 0 + weightedMode: 3 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 @@ -227,13 +252,38 @@ AnimationClip: inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 - weightedMode: 0 + weightedMode: 3 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: Sub + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.64, y: 0.64, z: 1} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 3 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.06666667 + value: {x: 1.3, y: 1.3, z: 1} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 3 + 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: MainNoMap m_FloatCurves: - curve: serializedVersion: 2 @@ -244,7 +294,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -253,7 +303,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -262,7 +312,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -281,7 +331,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -290,7 +340,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -299,7 +349,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -309,6 +359,62 @@ AnimationClip: path: Sub classID: 212 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.8888888 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 3 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 2.369884 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 3 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Size.x + path: MainNoMap + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.8888888 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 3 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 2.369884 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 3 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Size.y + path: MainNoMap + classID: 212 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -323,7 +429,7 @@ AnimationClip: - time: 0 value: {fileID: 0} - time: 0.06666667 - value: {fileID: 21300000, guid: 2dcc4a0e0420a8e4097445cac4b2e1ab, type: 3} + value: {fileID: 0} - time: 0.13333334 value: {fileID: 0} attribute: m_Sprite @@ -382,6 +488,17 @@ AnimationClip: path: Sub7 classID: 212 script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 0} + - time: 0.06666667 + value: {fileID: 21300000, guid: 2dcc4a0e0420a8e4097445cac4b2e1ab, type: 3} + - time: 0.13333334 + value: {fileID: 0} + attribute: m_Sprite + path: MainNoMap + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -438,6 +555,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 694289395 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 1615840316 attribute: 3 @@ -445,6 +569,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 694289395 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 1615840316 attribute: 4197328169 @@ -459,6 +590,20 @@ AnimationClip: typeID: 212 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 694289395 + attribute: 4197328169 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 694289395 + attribute: 2368279999 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 521822810 attribute: 0 @@ -515,23 +660,33 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 694289395 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 pptrCurveMapping: - {fileID: 5443719295599431979, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - {fileID: 5443719295599431979, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} - {fileID: 21300000, guid: 2dcc4a0e0420a8e4097445cac4b2e1ab, type: 3} - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -562,7 +717,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -571,7 +726,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -590,7 +745,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -599,7 +754,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -618,7 +773,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -627,7 +782,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -646,7 +801,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -655,7 +810,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -664,7 +819,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -683,7 +838,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -692,7 +847,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -701,7 +856,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -720,7 +875,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -729,7 +884,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -738,7 +893,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -757,7 +912,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -766,7 +921,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -785,7 +940,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -794,7 +949,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -813,7 +968,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -822,7 +977,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -841,7 +996,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -850,7 +1005,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -869,7 +1024,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -878,7 +1033,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -897,7 +1052,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -906,7 +1061,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -925,7 +1080,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -934,7 +1089,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -953,7 +1108,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -962,7 +1117,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -981,7 +1136,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -990,7 +1145,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -1009,7 +1164,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -1018,7 +1173,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -1037,7 +1192,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -1046,7 +1201,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -1065,7 +1220,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -1074,7 +1229,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -1093,7 +1248,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -1102,7 +1257,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -1121,7 +1276,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -1130,7 +1285,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -1149,7 +1304,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -1158,7 +1313,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -1177,7 +1332,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -1186,7 +1341,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -1195,7 +1350,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -1214,7 +1369,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -1223,7 +1378,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -1232,7 +1387,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -1251,7 +1406,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -1260,7 +1415,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -1269,7 +1424,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -1288,7 +1443,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -1297,7 +1452,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -1306,7 +1461,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -1325,7 +1480,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -1334,7 +1489,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 @@ -1343,7 +1498,7 @@ AnimationClip: inSlope: Infinity outSlope: Infinity tangentMode: 103 - weightedMode: 0 + weightedMode: 3 inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 @@ -1353,6 +1508,230 @@ AnimationClip: path: Sub classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 3 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: -0.164 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 3 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: MainNoMap + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 3 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0.017 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 3 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: MainNoMap + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 3 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 3 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: MainNoMap + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.64 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 3 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1.3 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 3 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: MainNoMap + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.64 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 3 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1.3 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 3 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: MainNoMap + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 3 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 3 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: MainNoMap + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.8888888 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 3 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 2.369884 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 3 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Size.x + path: MainNoMap + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.8888888 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 3 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 2.369884 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 3 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Size.y + path: MainNoMap + classID: 212 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Resources/Sprites/Games/KarateMan/anime/item/Item99.anim b/Assets/Resources/Sprites/Games/KarateMan/anime/item/Item99.anim index 51c5e414..253f653c 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/anime/item/Item99.anim +++ b/Assets/Resources/Sprites/Games/KarateMan/anime/item/Item99.anim @@ -144,11 +144,27 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: Main + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.5, y: 0.5, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: MainNoMap m_FloatCurves: [] m_PPtrCurves: - curve: - time: 0 - value: {fileID: -6283416824598814145, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + value: {fileID: 0} attribute: m_Sprite path: Main classID: 212 @@ -202,6 +218,13 @@ AnimationClip: path: Sub7 classID: 212 script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: -6283416824598814145, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} + attribute: m_Sprite + path: MainNoMap + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -265,6 +288,13 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 694289395 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 - serializedVersion: 2 path: 521822810 attribute: 1 @@ -321,15 +351,23 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 694289395 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} - {fileID: -6283416824598814145, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -807,6 +845,63 @@ AnimationClip: path: Main classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: MainNoMap + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: MainNoMap + 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 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: MainNoMap + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Resources/Sprites/Games/KarateMan/karateman_cellshader.mat b/Assets/Resources/Sprites/Games/KarateMan/karateman_cellshader.mat index 4c6a337f..419d3c85 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/karateman_cellshader.mat +++ b/Assets/Resources/Sprites/Games/KarateMan/karateman_cellshader.mat @@ -82,7 +82,7 @@ Material: m_Colors: - _AddColor: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorAlpha: {r: 1, g: 1, b: 1, a: 0} + - _ColorAlpha: {r: 1, g: 1, b: 1, a: 1} - _ColorBravo: {r: 1, g: 0, b: 0, a: 1} - _ColorDelta: {r: 0.54901963, g: 0.54901963, b: 0.54901963, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Scripts/Games/KarateMan/KarateMan.cs b/Assets/Scripts/Games/KarateMan/KarateMan.cs index 87c16644..261594fe 100644 --- a/Assets/Scripts/Games/KarateMan/KarateMan.cs +++ b/Assets/Scripts/Games/KarateMan/KarateMan.cs @@ -13,7 +13,7 @@ namespace HeavenStudio.Games.Loaders public static Minigame AddGame(EventCaller eventCaller) { return new Minigame("karateman", "Karate Man [INDEV REWORK]", "70A8D8", false, false, new List() { - new GameAction("bop", delegate { KarateMan.instance.ToggleBop(eventCaller.currentEntity.toggle); }, 0.5f, true, new List() + new GameAction("bop", delegate { KarateMan.instance.ToggleBop(eventCaller.currentEntity.toggle); }, 0.5f, false, new List() { new Param("toggle", true, "Bop", "Whether to bop to the beat or not") }), @@ -56,7 +56,7 @@ namespace HeavenStudio.Games.Loaders new Param("colorA", new Color(), "Custom Filter Color", "The filter color to use when color filter type is set to Custom"), new Param("colorB", new Color(), "Fading Filter Color", "When using the Fade background effect, make filter colour fade to this colour"), }), - new GameAction("set object colors", delegate { var e = eventCaller.currentEntity; KarateMan.instance.UpdateMaterialColour(e.colorA, e.colorB, e.colorC); }, 0.5f, true, new List() + new GameAction("set object colors", delegate { var e = eventCaller.currentEntity; KarateMan.instance.UpdateMaterialColour(e.colorA, e.colorB, e.colorC); }, 0.5f, false, new List() { new Param("colorA", new Color(), "Joe Body Color", "The color to use for Karate Joe's body"), new Param("colorB", new Color(), "Joe Highlight Color", "The color to use for Karate Joe's highlights"), @@ -291,6 +291,7 @@ namespace HeavenStudio.Games SetBgAndShadowCol(0f, 0f, bgType, (int) currentShadowType, BackgroundColors[bgType], customShadowColour, (int)currentBgEffect); UpdateMaterialColour(BodyColor, HighlightColor, ItemColor); + ToggleBop(true); } private void Update() diff --git a/Assets/Scripts/Games/KarateMan/KarateManJoe.cs b/Assets/Scripts/Games/KarateMan/KarateManJoe.cs index d6637fa8..ee51d393 100644 --- a/Assets/Scripts/Games/KarateMan/KarateManJoe.cs +++ b/Assets/Scripts/Games/KarateMan/KarateManJoe.cs @@ -39,7 +39,6 @@ namespace HeavenStudio.Games.Scripts_KarateMan private void Awake() { - } private void Update() @@ -53,7 +52,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan anim.Play("Beat", -1, 0); } - if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1, false) && cond.songPositionInBeats > bop.startBeat && cond.songPositionInBeats >= unPrepareTime && !inCombo) + if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1, false) && cond.songPositionInBeats > bop.startBeat && cond.songPositionInBeats < bop.startBeat + bop.length && cond.songPositionInBeats >= unPrepareTime && !inCombo) { anim.speed = 1f; anim.Play("Beat", -1, 0); diff --git a/Assets/Scripts/Games/KarateMan/KarateManPot.cs b/Assets/Scripts/Games/KarateMan/KarateManPot.cs index 545d6811..02d6e6cf 100644 --- a/Assets/Scripts/Games/KarateMan/KarateManPot.cs +++ b/Assets/Scripts/Games/KarateMan/KarateManPot.cs @@ -26,7 +26,12 @@ namespace HeavenStudio.Games.Scripts_KarateMan FlyStatus status = FlyStatus.Fly; Color effectTint = Color.white; - Material[] renderMaterials; + [SerializeField] SpriteRenderer[] cellRenderers; + Material[] cellMaterials; + [SerializeField] Color[] ItemAlienMap; + [SerializeField] Color[] ItemBombMap; + [SerializeField] Color[] ItemBarrelMap; + [SerializeField] Color[] ItemCookingLidMap; public int comboId = -1; static int _lastCombo = -1; @@ -110,6 +115,57 @@ namespace HeavenStudio.Games.Scripts_KarateMan return flyPosition; } + void SetColourMapping() + { + Color alpha, bravo, delta; + switch (type) + { + case ItemType.Alien: + alpha = ItemAlienMap[0]; + bravo = ItemAlienMap[1]; + delta = KarateMan.instance.ItemColor; + break; + case ItemType.KickBomb: + alpha = ItemBombMap[0]; + bravo = ItemBombMap[1]; + delta = KarateMan.instance.ItemColor; + break; + case ItemType.KickBarrel: + case ItemType.ComboBarrel: + alpha = ItemBarrelMap[0]; + bravo = ItemBarrelMap[1]; + delta = ItemBarrelMap[2]; + break; + case ItemType.Cooking: + case ItemType.CookingLid: + alpha = ItemCookingLidMap[0]; + bravo = ItemCookingLidMap[1]; + delta = KarateMan.instance.ItemColor; + break; + default: + alpha = KarateMan.instance.ItemColor; + bravo = KarateMan.instance.ItemColor; + delta = KarateMan.instance.ItemColor; + break; + } + for (int i = 0; i < cellRenderers.Length; i++) { + SpriteRenderer r = cellRenderers[i]; + if (r.material != null) + { + if (cellMaterials == null) + { + cellMaterials = new Material[cellRenderers.Length]; + cellMaterials[i] = Instantiate(r.material); + r.material = cellMaterials[i]; + } + + r.material.SetColor("_ColorAlpha", alpha); + r.material.SetColor("_ColorBravo", bravo); + r.material.SetColor("_ColorDelta", delta); + } + } + } + void Awake() { switch (type) @@ -178,8 +234,6 @@ namespace HeavenStudio.Games.Scripts_KarateMan else transform.position = CurrentCurve.GetPoint(0f); - Animator mobjAnim = GetComponent(); - mobjAnim.Play(awakeAnim, -1, 0); transform.rotation = Quaternion.Euler(0, 0, transform.rotation.eulerAngles.z + (-360f * Time.deltaTime) + UnityEngine.Random.Range(0f, 360f)); ShadowInstance = GameObject.Instantiate(Shadow, KarateMan.instance.ItemHolder); @@ -189,6 +243,13 @@ namespace HeavenStudio.Games.Scripts_KarateMan ShadowInstance.transform.position = new Vector3(transform.position.x, floorHeight - 0.5f, transform.position.z); } + void Start() + { + Animator mobjAnim = GetComponent(); + mobjAnim.Play(awakeAnim, -1, 0); + SetColourMapping(); + } + void Update() { var cond = Conductor.instance; @@ -278,6 +339,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan } ShadowInstance.transform.position = new Vector3(transform.position.x, floorHeight - 0.5f, transform.position.z); shadowRenderer.color = KarateMan.instance.GetShadowColor(); + SetColourMapping(); } void CreateHitMark(bool useLocalPos = false)