diff --git a/Assets/Resources/Games/karateman.prefab b/Assets/Resources/Games/karateman.prefab
index d947d2f2b..78eaa0e5b 100644
--- a/Assets/Resources/Games/karateman.prefab
+++ b/Assets/Resources/Games/karateman.prefab
@@ -31,7 +31,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1483789816297415762}
- m_RootOrder: 6
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &2578711457631181227
SpriteRenderer:
@@ -5129,7 +5129,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_Color: {r: 0.8862745, g: 0.52156866, b: 0.13725491, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@@ -5181,7 +5181,7 @@ Transform:
- {fileID: 1823940461699441785}
- {fileID: 7998296216023943797}
m_Father: {fileID: 1483789816297415762}
- m_RootOrder: 9
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!210 &5835591724531542630
SortingGroup:
@@ -5440,7 +5440,7 @@ Transform:
- {fileID: 607707502233677433}
- {fileID: 3542369029029140826}
m_Father: {fileID: 1483789816297415762}
- m_RootOrder: 15
+ m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1089457186893806244
GameObject:
@@ -10424,7 +10424,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: -270761472599659251, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_Color: {r: 0.8862745, g: 0.52156866, b: 0.13725491, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@@ -15417,7 +15417,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_Color: {r: 0.8862745, g: 0.52156866, b: 0.13725491, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@@ -20841,7 +20841,7 @@ Transform:
- {fileID: 7721752935214517217}
- {fileID: 7422225348526634591}
m_Father: {fileID: 1483789816297415762}
- m_RootOrder: 16
+ m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2133099716162141502
GameObject:
@@ -31309,90 +31309,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!1 &2644959564095788039
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 5558339493236770269}
- - component: {fileID: 6418913030626917357}
- m_Layer: 0
- m_Name: ref_man
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!4 &5558339493236770269
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2644959564095788039}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -2.02, y: -1.08, z: 0}
- m_LocalScale: {x: 2.35, y: 2.35, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 3609080353678146599}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &6418913030626917357
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2644959564095788039}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- 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: -5000
- m_Sprite: {fileID: 21300000, guid: c64c7787d5638454d94c6d1fc5bb46e8, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 0.6117647}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 5.12, y: 5.12}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 0
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
--- !u!1 &2663523590501458685
GameObject:
m_ObjectHideFlags: 0
@@ -31477,90 +31393,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!1 &2707606657656961620
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8437085058865309782}
- - component: {fileID: 7966717703427789461}
- m_Layer: 0
- m_Name: ref_item
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!4 &8437085058865309782
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2707606657656961620}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 2.35, y: 2.35, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 3609080353678146599}
- m_RootOrder: 3
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &7966717703427789461
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2707606657656961620}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- 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: -5000
- m_Sprite: {fileID: 21300000, guid: 223bb24c40a67fa4aa0a9c1d23dcc149, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 0.6117647}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 5.12, y: 5.12}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 0
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
--- !u!1 &2790469215453043610
GameObject:
m_ObjectHideFlags: 0
@@ -31591,7 +31423,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1483789816297415762}
- m_RootOrder: 3
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &5147067056442997835
SpriteRenderer:
@@ -36554,7 +36386,7 @@ Transform:
- {fileID: 79217107384843364}
- {fileID: 4570176829701856741}
m_Father: {fileID: 1483789816297415762}
- m_RootOrder: 13
+ m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!210 &7426437971534503015
SortingGroup:
@@ -36671,7 +36503,7 @@ Transform:
- {fileID: 6607715910393405022}
- {fileID: 6402550105555280064}
m_Father: {fileID: 1483789816297415762}
- m_RootOrder: 11
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3121129389948568248
GameObject:
@@ -36842,90 +36674,6 @@ MonoBehaviour:
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 1
---- !u!1 &3317749162070580323
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 3795370127036445573}
- - component: {fileID: 7189349373277129013}
- m_Layer: 0
- m_Name: ref_word
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!4 &3795370127036445573
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3317749162070580323}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -1.8, y: 1.5, z: 0}
- m_LocalScale: {x: 3, y: 3, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 3609080353678146599}
- m_RootOrder: 2
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &7189349373277129013
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3317749162070580323}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- 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: -5000
- m_Sprite: {fileID: 21300000, guid: 6815c6a795c92dd4f84bc69647ca1a61, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 0.53333336}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 5.12, y: 5.12}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 0
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
--- !u!1 &3418320730155705769
GameObject:
m_ObjectHideFlags: 0
@@ -51703,90 +51451,6 @@ ParticleSystemRenderer:
m_MeshWeighting2: 1
m_MeshWeighting3: 1
m_MaskInteraction: 0
---- !u!1 &3742810944473094226
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8330865912302329553}
- - component: {fileID: 3814198436135378499}
- m_Layer: 0
- m_Name: screenSpace
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!4 &8330865912302329553
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3742810944473094226}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 18, y: 10.8, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1483789816297415762}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &3814198436135378499
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3742810944473094226}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- 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: -5002
- m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3}
- m_Color: {r: 1, g: 0, b: 0.365098, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 1, y: 1}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
--- !u!1 &3826058516668778663
GameObject:
m_ObjectHideFlags: 0
@@ -51923,7 +51587,7 @@ Transform:
- {fileID: 4580764379744752145}
- {fileID: 6153427326708225474}
m_Father: {fileID: 1483789816297415762}
- m_RootOrder: 14
+ m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3868604044228909325
GameObject:
@@ -62123,7 +61787,6 @@ MonoBehaviour:
path: 1
hitSfxOverride:
Shadow: {fileID: 2136808730019920255}
- ShadowInstance: {fileID: 0}
HitMark: {fileID: 5218911297968347512}
HitParticles:
- {fileID: 4150348285995905317}
@@ -62422,94 +62085,6 @@ MonoBehaviour:
handleType: 0
leftHandleLocalPosition: {x: -9.748012, y: -17.766153, z: -24.712715}
rightHandleLocalPosition: {x: 9.748012, y: 17.766153, z: 24.712715}
---- !u!1 &4461166469202109451
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 3609080353678146599}
- - component: {fileID: 5347082990439079511}
- m_Layer: 0
- m_Name: reference
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!4 &3609080353678146599
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4461166469202109451}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1.5, y: 1.5, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 3848867281373793675}
- - {fileID: 5558339493236770269}
- - {fileID: 3795370127036445573}
- - {fileID: 8437085058865309782}
- m_Father: {fileID: 1483789816297415762}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &5347082990439079511
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4461166469202109451}
- m_Enabled: 0
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- 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: -5000
- m_Sprite: {fileID: 21300000, guid: 81f0d9c70bb068b468db7d0af31cf321, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 0.46666667}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 1, y: 1}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 0
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
--- !u!1 &4485706438535911762
GameObject:
m_ObjectHideFlags: 0
@@ -67414,7 +66989,7 @@ Transform:
- {fileID: 5398479681583471366}
- {fileID: 4697915430287191595}
m_Father: {fileID: 1483789816297415762}
- m_RootOrder: 8
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3856490809560069226
MonoBehaviour:
@@ -82635,7 +82210,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1483789816297415762}
- m_RootOrder: 4
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &6796439334000697740
SpriteRenderer:
@@ -82683,7 +82258,7 @@ SpriteRenderer:
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
- m_Size: {x: 17.777779, y: 10}
+ m_Size: {x: 16, y: 12}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
@@ -87591,7 +87166,7 @@ Transform:
m_Children:
- {fileID: 7344154808606932117}
m_Father: {fileID: 1483789816297415762}
- m_RootOrder: 10
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5641315844638892119
GameObject:
@@ -97545,8 +97120,6 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- - {fileID: 3609080353678146599}
- - {fileID: 8330865912302329553}
- {fileID: 570774704746437793}
- {fileID: 602434937145741663}
- {fileID: 24004413385253441}
@@ -97593,13 +97166,6 @@ MonoBehaviour:
- {r: 1, g: 0.58431375, b: 0.3137255, a: 1}
- {r: 0.9607844, g: 0.7725491, b: 0.78823537, a: 1}
- {r: 0, g: 0, b: 0, a: 0}
- ShadowColors:
- - {r: 0.84313726, g: 0.52156866, b: 0.23137255, a: 1}
- - {r: 0.88235295, g: 0.41960785, b: 0.5294118, a: 1}
- - {r: 0.3137255, g: 0.31764707, b: 0.40784317, a: 1}
- - {r: 0, g: 0, b: 0, a: 1}
- - {r: 0.454902, g: 0.19607845, b: 0.121568635, a: 1}
- - {r: 0.654902, g: 0.4156863, b: 0.45882356, a: 1}
CameraPosition:
- {fileID: 3542369029029140826}
- {fileID: 607707502233677433}
@@ -97617,9 +97183,6 @@ MonoBehaviour:
- {fileID: 5147067056442997835}
- {fileID: 6796439334000697740}
- {fileID: 4189433424192044813}
- BGGradient: {fileID: 2790469215453043610}
- BGBlood: {fileID: 5404947306895237780}
- BGRadial: {fileID: 8238140095837895901}
Wind: {fileID: 9003203273337395302}
Effects: []
--- !u!1 &6574514768376321096
@@ -102821,90 +102384,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!1 &6900082977360491289
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 3848867281373793675}
- - component: {fileID: 4197955849851210928}
- m_Layer: 0
- m_Name: ref_HitPosition.000
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!4 &3848867281373793675
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6900082977360491289}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -2.02, y: -1.0800002, z: 0}
- m_LocalScale: {x: 2.35, y: 2.35, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 3609080353678146599}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &4197955849851210928
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6900082977360491289}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- 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: -5000
- m_Sprite: {fileID: 21300000, guid: fe161e100042cd6479c549e037887ee7, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 0.4392157}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 5.12, y: 5.12}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 0
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
--- !u!1 &6979528226812344444
GameObject:
m_ObjectHideFlags: 0
@@ -103718,7 +103197,7 @@ Transform:
- {fileID: 7797479191699406299}
- {fileID: 5150790184898265248}
m_Father: {fileID: 1483789816297415762}
- m_RootOrder: 12
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7724750281891176066
GameObject:
@@ -108773,12 +108252,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7919762816917508181}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 20, z: 50}
+ m_LocalPosition: {x: 0, y: 0, z: 50}
m_LocalScale: {x: 256, y: 256, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1483789816297415762}
- m_RootOrder: 2
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &5423016352081307686
SpriteRenderer:
@@ -108906,7 +108385,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: -270761472599659251, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_Color: {r: 0.8862745, g: 0.52156866, b: 0.13725491, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@@ -108977,7 +108456,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1483789816297415762}
- m_RootOrder: 5
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &4189433424192044813
SpriteRenderer:
@@ -113938,7 +113417,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1483789816297415762}
- m_RootOrder: 7
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!212 &819146809661568170
SpriteRenderer:
diff --git a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word.controller b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word.controller
index a2b73c402..6d5440e39 100644
--- a/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word.controller
+++ b/Assets/Resources/Sprites/Games/KarateMan/anime/word/Word.controller
@@ -7,7 +7,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: Word04
+ m_Name: Word01
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
@@ -33,7 +33,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: Word00
+ m_Name: Word06
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
@@ -59,7 +59,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: Word03
+ m_Name: Word04
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
@@ -85,7 +85,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: Word06
+ m_Name: Word00
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
@@ -111,7 +111,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: Word02
+ m_Name: Word03
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
@@ -211,7 +211,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: Word01
+ m_Name: Word02
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
@@ -241,35 +241,35 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -2381588529378463098}
- m_Position: {x: 200, y: 0, z: 0}
+ m_Position: {x: 250, y: 110, z: 0}
- serializedVersion: 1
m_State: {fileID: -3348998483261200728}
- m_Position: {x: 235, y: 65, z: 0}
+ m_Position: {x: 170, y: -30, z: 0}
- serializedVersion: 1
m_State: {fileID: -6746426325098372422}
- m_Position: {x: 270, y: 130, z: 0}
+ m_Position: {x: 210, y: 40, z: 0}
- serializedVersion: 1
m_State: {fileID: 1136731949493752883}
- m_Position: {x: 305, y: 195, z: 0}
+ m_Position: {x: 290, y: 180, z: 0}
- serializedVersion: 1
m_State: {fileID: -3478175207042509151}
- m_Position: {x: 340, y: 260, z: 0}
+ m_Position: {x: 330, y: 250, z: 0}
- serializedVersion: 1
m_State: {fileID: -806466539819283022}
- m_Position: {x: 375, y: 325, z: 0}
+ m_Position: {x: 370, y: 320, z: 0}
- serializedVersion: 1
m_State: {fileID: -3526870332612620235}
m_Position: {x: 410, y: 390, z: 0}
- serializedVersion: 1
m_State: {fileID: 1133350279288983051}
- m_Position: {x: 445, y: 455, z: 0}
+ m_Position: {x: 450, y: 460, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
- m_AnyStatePosition: {x: 50, y: 20, z: 0}
- m_EntryPosition: {x: 50, y: 120, z: 0}
- m_ExitPosition: {x: 800, y: 120, z: 0}
+ m_AnyStatePosition: {x: 40, y: 210, z: 0}
+ m_EntryPosition: {x: 470, y: 530, z: 0}
+ m_ExitPosition: {x: 110, y: 340, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 1133350279288983051}
diff --git a/Assets/Resources/Sprites/Games/KarateMan/karate_bg_bloody.png.meta b/Assets/Resources/Sprites/Games/KarateMan/karate_bg_bloody.png.meta
index bdd1332d0..7c64f455e 100644
--- a/Assets/Resources/Sprites/Games/KarateMan/karate_bg_bloody.png.meta
+++ b/Assets/Resources/Sprites/Games/KarateMan/karate_bg_bloody.png.meta
@@ -3,7 +3,7 @@ guid: 2126ec8bc0fd27047a483933dcc9f9b0
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
- serializedVersion: 11
+ serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
@@ -24,6 +24,7 @@ TextureImporter:
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
+ ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
@@ -35,15 +36,15 @@ TextureImporter:
filterMode: 1
aniso: 1
mipBias: 0
- wrapU: 1
- wrapV: 1
- wrapW: 1
+ wrapU: 2
+ wrapV: 2
+ wrapW: 2
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
- spriteMeshType: 1
+ spriteMeshType: 0
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 400
@@ -62,6 +63,7 @@ TextureImporter:
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
+ cookieLightType: 1
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
@@ -87,6 +89,18 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Server
+ 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: []
@@ -100,6 +114,7 @@ TextureImporter:
edges: []
weights: []
secondaryTextures: []
+ nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
diff --git a/Assets/Scripts/Games/KarateMan/KarateMan.cs b/Assets/Scripts/Games/KarateMan/KarateMan.cs
index c57803db7..d06c1ed3f 100644
--- a/Assets/Scripts/Games/KarateMan/KarateMan.cs
+++ b/Assets/Scripts/Games/KarateMan/KarateMan.cs
@@ -14,38 +14,64 @@ namespace HeavenStudio.Games.Loaders
{
public static Minigame AddGame(EventCaller eventCaller)
{
- RiqEntity WarningUpdater(string datamodel, RiqEntity entity)
+ RiqEntity WarningUpdater(string datamodel, RiqEntity e)
{
if (datamodel == "karateman/hitX")
{
- int newWarning = (int)entity["type"];
- if (entity["type"] < 7) {
+ int newWarning = (int)e["type"];
+ if (e["type"] < 7) {
newWarning++;
} else {
newWarning = 0;
}
- entity.CreateProperty("whichWarning", newWarning);
- entity.CreateProperty("customLength", false);
- entity.CreateProperty("cutOut", true);
-
- entity.dynamicData.Remove("type");
+ e.CreateProperty("whichWarning", newWarning);
+ e.CreateProperty("pitchVoice", false);
+ e.CreateProperty("forcePitch", 1);
+ e.CreateProperty("customLength", false);
+ e.CreateProperty("cutOut", true);
- entity.datamodel = "karateman/warnings";
- return entity;
+ e.dynamicData.Remove("type");
+
+ e.datamodel = "karateman/warnings";
+ return e;
}
return null;
}
RiqBeatmap.OnUpdateEntity += WarningUpdater;
- // future astrl (when she's done with the new background stuff) :
- // MAKE THIS WORK! it's just a matter of transferring over the old values to the new
- // RiqEntity BackgroundUpdater(string datamodel, RiqEntity entity)
+ // RiqEntity BackgroundUpdater(string datamodel, RiqEntity e)
// {
// if (datamodel == "karateman/set background effects")
// {
-
- // return entity;
+ // Debug.Log(e["colorA"]);
+ // void NewProperty(string newProp, string remove) {
+ // var v = e[remove];
+ // if (v.GetType() == typeof(Newtonsoft.Json.Linq.JObject)) {
+ // v = new Color((float)v["r"], (float)v["g"], (float)v["b"]);
+ // }
+ // e.CreateProperty(newProp, v);
+ // e.dynamicData.Remove(remove);
+ // }
+
+ // bool fade = e["type3"] == 3;
+
+ // NewProperty("presetBg", "type");
+ // NewProperty("startColor", "colorA");
+ // NewProperty("endColor", fade ? "colorD" : "colorA");
+ // NewProperty("shadowType", "type2");
+ // NewProperty("shadowStart", "colorB");
+ // NewProperty("shadowEnd", "colorB");
+ // NewProperty("textureType", "type4");
+ // NewProperty("autoColor", "type5");
+ // e.CreateProperty("startTexture", e["colorC"]);
+ // NewProperty("endTexture", "colorC");
+
+ // e.CreateProperty("ease", fade ? (int)Util.EasingFunction.Ease.Linear : null);
+ // e.dynamicData.Remove("type3");
+
+ // e.datamodel = "background appearance";
+ // return e;
// }
// return null;
// }
@@ -226,14 +252,18 @@ namespace HeavenStudio.Games.Loaders
},
new GameAction("set gameplay modifiers", "Flow/Gameplay Modifiers")
{
- function = delegate { var e = eventCaller.currentEntity; KarateMan.instance.SetGameplayMods(e.beat, e["type"], e["toggle"]); },
+ function = delegate { var e = eventCaller.currentEntity; KarateMan.instance.SetGameplayMods(e.beat, e["fxType"], e["type"], e["toggle"]); },
defaultLength = 0.5f,
parameters = new List()
{
new Param("fxType", KarateMan.BackgroundFXType.None, "FX Type", "The background effect to be displayed"),
- new Param("type", KarateMan.NoriMode.None, "Flow Bar type", "The type of Flow bar to use"),
+ new Param("type", KarateMan.NoriMode.None, "Flow Bar type", "The type of Flow bar to use", new List()
+ {
+ new Param.CollapseParam(x => (int)x != (int)KarateMan.NoriMode.None, new string[] { "startColor" })
+ }),
+ new Param("hitsPerHeart", new EntityTypes.Float(0f, 20f, 0f), "Hits Per Heart", "How many hits will it take for each heart to light up? (0 will do it automatically.)"),
new Param("toggle", true, "Enable Combos", "Allow the player to combo? (Contextual combos will still be allowed even when off)"),
- new Param("toggle2", true, "Enable Kicks (INIT ONLY )", "Allow the player to kick? (Contextual kicks will still be allowed even when off)"),
+ //new Param("toggle2", true, "Enable Kicks", "Allow the player to kick? (Contextual kicks will still be allowed even when off)"),
},
},
new GameAction("background appearance", "Background Appearance")
@@ -242,7 +272,7 @@ namespace HeavenStudio.Games.Loaders
var e = eventCaller.currentEntity;
KarateMan.instance.BackgroundColor(
e.beat, e.length,
- e["presetBg"], e["startColor"], e["endColor"], e["bgEase"],
+ e["presetBg"], e["startColor"], e["endColor"], e["ease"],
e["shadowType"], e["shadowStart"], e["shadowEnd"],
e["textureType"], e["autoColor"], e["startTexture"], e["endTexture"]
);
@@ -257,7 +287,7 @@ namespace HeavenStudio.Games.Loaders
}),
new Param("startColor", new Color(0.985f, 0.79f, 0.243f), "Start BG Color", "The background color to start with"),
new Param("endColor", new Color(0.985f, 0.79f, 0.243f), "End BG Color", "The background color to end with"),
- new Param("bgEase", Util.EasingFunction.Ease.Instant, "BG Color Ease", "Ease to use when fading color", new List()
+ new Param("ease", Util.EasingFunction.Ease.Instant, "BG Color Ease", "Ease to use when fading color", new List()
{
//new Param.CollapseParam(x => (int)x != (int)Util.EasingFunction.Ease.Instant, new string[] { "startColor" })
}),
@@ -497,7 +527,6 @@ namespace HeavenStudio.Games
public Color[] LightBulbColors;
public Color[] BackgroundColors;
- public Color[] ShadowColors;
//camera positions (normal, special)
[Header("Camera Positions")]
@@ -536,23 +565,23 @@ namespace HeavenStudio.Games
-1
};
private float[] colorLengths = new float[3];
- private Color[] colorStarts;
- private Color[] colorEnds;
+ private Color[] colorStarts = new Color[3];
+ private Color[] colorEnds = new Color[3];
private Util.EasingFunction.Ease[] colorEases = new Util.EasingFunction.Ease[3];
- public int currentBgEffect = (int) BackgroundFXType.None;
+ public int currentBgEffect = (int)BackgroundFXType.None;
public SpriteRenderer BGPlane;
public GameObject BGEffect;
public SpriteRenderer[] BGTextures;
- public GameObject BGGradient;
- SpriteRenderer bgGradientRenderer;
- public GameObject BGRadial;
- SpriteRenderer bgRadialRenderer;
- public GameObject BGBlood;
- SpriteRenderer bgBloodRenderer;
+ // public GameObject BGGradient;
+ // SpriteRenderer bgGradientRenderer;
+ // public GameObject BGRadial;
+ // SpriteRenderer bgRadialRenderer;
+ // public GameObject BGBlood;
+ // SpriteRenderer bgBloodRenderer;
Animator bgEffectAnimator;
SpriteRenderer bgEffectSpriteRenderer;
@@ -577,7 +606,7 @@ namespace HeavenStudio.Games
colorEnds =
colorStarts = new Color[] {
BackgroundColors[0],
- ShadowColors[0],
+ TintColor(BackgroundColors[0]),
new(),
};
@@ -621,8 +650,8 @@ namespace HeavenStudio.Games
if (bg != null) {
BackgroundColor(
- bg.beat, bg.length,
- bg["presetBg"], bg["startColor"], bg["endColor"], bg["bgEase"],
+ bg.beat, bg.length,
+ bg["presetBg"], bg["startColor"], bg["endColor"], bg["ease"],
bg["shadowType"], bg["shadowStart"], bg["shadowEnd"],
bg["textureType"], bg["autoColor"], bg["startTexture"], bg["endTexture"]
);
@@ -650,7 +679,6 @@ namespace HeavenStudio.Games
public override void OnStop(double beat)
{
OnGameSwitch(beat);
- Debug.Log("ONSTOP BEAT : " + beat);
}
public override void OnPlay(double beat)
@@ -764,7 +792,6 @@ namespace HeavenStudio.Games
public static string DoWordSound(double beat, double length, int type, bool pitchVoice, float forcePitch, bool customLength, bool doSound = true)
{
- string word = $"Word0{(type < (int)HitThree.HitThreeAlt ? type : type - 1)}";
double clear = type switch {
<= (int)HitThree.HitFour => beat + 4f,
<= (int)HitThree.Warning => beat + 1f,
@@ -791,7 +818,7 @@ namespace HeavenStudio.Games
if (songPos <= clear && songPos >= beat) {
wordClearTime = customLength ? (beat + length) : clear;
}
- return word;
+ return $"Word0{(type < (int)HitThree.HitThreeAlt ? type : type - 1)}";
}
public static void CreateItemSFX(double beat, int type, bool muteSound = false)
@@ -802,7 +829,7 @@ namespace HeavenStudio.Games
public static void CreateBulbSFX(double beat, int type, bool muteSound = false)
{
string obj = type switch {
- (int)LightBulbType.Normal => "LightbulbAgb",
+ //(int)LightBulbType.Normal => "LightbulbAgb",
(int)LightBulbType.Yellow => "LightbulbNtr",
_ => "Lightbulb",
};
@@ -863,20 +890,16 @@ namespace HeavenStudio.Games
});
}
- public void CreateBulbSpecial(double beat, int type, Color c, int expression)
+ public void CreateBulbSpecial(double beat, int type, Color color, int expression)
{
string obj = type switch {
- (int)LightBulbType.Normal => "LightbulbAgb",
+ //(int)LightBulbType.Normal => "LightbulbAgb",
(int)LightBulbType.Yellow => "LightbulbNtr",
_ => "Lightbulb",
};
- var mobj = CreateItemInstance(beat, "Item01", expression, KarateManPot.ItemType.Bulb, hitSfxOverride: $"karateman/{obj}Hit");
+ var mobj = CreateItemInstance(beat, "Item01", expression, KarateManPot.ItemType.Bulb, hitSfxOverride: $"karateman/{obj}Hit").GetComponent();
- if (type == (int) LightBulbType.Custom) {
- mobj.GetComponent().SetBulbColor(c);
- } else {
- mobj.GetComponent().SetBulbColor(LightBulbColors[type]);
- }
+ mobj.SetBulbColor((type == (int)LightBulbType.Custom) ? color : LightBulbColors[type]);
}
public static void ComboSFX()
@@ -1014,15 +1037,20 @@ namespace HeavenStudio.Games
}
bool preset = presetBG != (int)BackgroundType.Custom;
- colorStarts[0] = preset ? BGPlane.color : colorStart;
- colorEnds[0] = preset ? BackgroundColors[presetBG] : colorEnd;
-
bool tinted = shadowType == (int)ShadowType.Tinted;
- colorStarts[1] = tinted ? Joe.Shadows[0].color : shadowStart;
- colorEnds[1] = tinted ? (preset ? ShadowColors[presetBG] : TintColor(colorEnd)) : shadowEnd;
+ Color bgColorStart = preset ? BGPlane.color : colorStart;
+ colorStarts = new Color[] {
+ bgColorStart,
+ tinted ? TintColor(bgColorStart) : shadowStart,
+ autoColor ? TintColor(bgColorStart): filterStart,
+ };
- colorStarts[2] = autoColor ? BGTextures[0].color : filterStart;
- colorEnds[2] = autoColor ? TintColor(filterEnd) : filterEnd;
+ Color bgColorEnd = preset ? BackgroundColors[presetBG] : colorEnd;
+ colorEnds = new Color[] {
+ bgColorEnd,
+ tinted ? TintColor(bgColorEnd) : shadowEnd,
+ autoColor ? TintColor(bgColorEnd) : filterEnd,
+ };
for (int i = 0; i < BGTextures.Length; i++) {
BGTextures[i].gameObject.SetActive(textureType == (i + 1));
@@ -1045,12 +1073,12 @@ namespace HeavenStudio.Games
for (int i = 0; i < spriteRenderers.Length; i++)
{
- Debug.Log(colorStartBeats[i] + " and " + colorLengths[i]);
+ // Debug.Log(colorStartBeats[i] + " and " + colorLengths[i]);
float normalizedBeat = Mathf.Clamp01(Conductor.instance.GetPositionFromBeat(colorStartBeats[i], colorLengths[i]));
if (double.IsNaN(normalizedBeat)) normalizedBeat = 0;
- Debug.Log("normalizedBeat : " + normalizedBeat);
+ // Debug.Log("normalizedBeat : " + normalizedBeat);
var func = Util.EasingFunction.GetEasingFunction(colorEases[i]);
- Debug.Log("func : " + func);
+ // Debug.Log("func : " + colorEases[i]);
float[] color = new float[3];
for (int j = 0; j < color.Length; j++)
@@ -1060,14 +1088,13 @@ namespace HeavenStudio.Games
1 => whichColors[i].g,
_ => whichColors[i].b,
};
+ // Debug.Log(j + ": Hue(colorStarts) : " + Hue(colorStarts) + ", Hue(colorEnds) : " + Hue(colorEnds));
color[j] = func(Hue(colorStarts), Hue(colorEnds), normalizedBeat);
- Debug.Log("color " + j + " : " + color[j]);
}
foreach (var renderer in spriteRenderers[i]) {
renderer.color = new Color(color[0], color[1], color[2]);
}
-
}
// manual color setting. remove this if the loop works
@@ -1082,13 +1109,12 @@ namespace HeavenStudio.Games
// }
}
- public void SetGameplayMods(double beat, int mode, bool combo)
+ public void SetGameplayMods(double beat, int fxType, int mode, bool combo)
{
NoriGO.SetActive(true);
Nori.SetNoriMode(beat, mode);
+ currentBgEffect = fxType;
IsComboEnable = combo;
-
- //currentBgEffect = fxType;
}
diff --git a/Assets/Scripts/Games/KarateMan/KarateManPot.cs b/Assets/Scripts/Games/KarateMan/KarateManPot.cs
index 0cdcd1bc7..6695eb0ef 100644
--- a/Assets/Scripts/Games/KarateMan/KarateManPot.cs
+++ b/Assets/Scripts/Games/KarateMan/KarateManPot.cs
@@ -16,7 +16,9 @@ namespace HeavenStudio.Games.Scripts_KarateMan
public string hitSfxOverride;
public GameObject Shadow;
- public GameObject ShadowInstance;
+ private GameObject ShadowInstance;
+ private SpriteRenderer shadowRenderer;
+
//hit effects
public GameObject HitMark;
@@ -255,8 +257,11 @@ namespace HeavenStudio.Games.Scripts_KarateMan
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);
- //shadowRenderer.color = KarateMan.instance.GetShadowColor();
+
+
+ ShadowInstance = Instantiate(Shadow, KarateMan.instance.ItemHolder);
+ shadowRenderer = ShadowInstance.GetComponent();
+ shadowRenderer.color = KarateMan.instance.Joe.Shadows[0].color;
ShadowInstance.SetActive(true);
ShadowInstance.transform.position = new Vector3(transform.position.x, floorHeight - 0.5f, transform.position.z);
}
@@ -289,8 +294,8 @@ namespace HeavenStudio.Games.Scripts_KarateMan
ParticleSystem p = Instantiate(HitParticles[7], transform.position, Quaternion.identity, KarateMan.instance.ItemHolder);
p.Play();
- GameObject.Destroy(ShadowInstance.gameObject);
- GameObject.Destroy(gameObject);
+ Destroy(ShadowInstance.gameObject);
+ Destroy(gameObject);
return;
}
else if (prog >= 2f || (ItemKickable() && prog >= 1f)) {
@@ -299,8 +304,8 @@ namespace HeavenStudio.Games.Scripts_KarateMan
ParticleSystem p = Instantiate(HitParticles[7], ItemCurves[6].GetPoint(1f), Quaternion.identity, KarateMan.instance.ItemHolder);
p.Play();
}
- GameObject.Destroy(ShadowInstance.gameObject);
- GameObject.Destroy(gameObject);
+ Destroy(ShadowInstance.gameObject);
+ Destroy(gameObject);
return;
}
else if (CurrentCurve == null && prog < 1f - ItemSlipRt[path]) {
@@ -318,8 +323,8 @@ namespace HeavenStudio.Games.Scripts_KarateMan
ParticleSystem p = Instantiate(HitParticles[7], CurrentCurve.GetPoint(1f), Quaternion.identity, KarateMan.instance.ItemHolder);
p.Play();
- GameObject.Destroy(ShadowInstance.gameObject);
- GameObject.Destroy(gameObject);
+ Destroy(ShadowInstance.gameObject);
+ Destroy(gameObject);
SoundByte.PlayOneShotGame("karateman/bombBreak", volume: 0.25f);
return;
@@ -334,8 +339,8 @@ namespace HeavenStudio.Games.Scripts_KarateMan
else if (type == ItemType.KickBall && cond.songPositionInBeatsAsDouble < startBeat + curveTargetBeat + 1f)
return;
- GameObject.Destroy(ShadowInstance.gameObject);
- GameObject.Destroy(gameObject);
+ Destroy(ShadowInstance.gameObject);
+ Destroy(gameObject);
return;
}
else {
@@ -359,8 +364,8 @@ namespace HeavenStudio.Games.Scripts_KarateMan
ParticleSystem p = Instantiate(HitParticles[7], CurrentCurve.GetPoint(1f), Quaternion.identity, KarateMan.instance.ItemHolder);
p.Play();
- GameObject.Destroy(ShadowInstance.gameObject);
- GameObject.Destroy(gameObject);
+ Destroy(ShadowInstance.gameObject);
+ Destroy(gameObject);
return;
}
else if (cond.songPositionInBeatsAsDouble >= startBeat + Mathf.Max(2f, curveTargetBeat) || (ItemKickable() && prog >= 1f) || CurrentCurve == null) {
@@ -369,8 +374,8 @@ namespace HeavenStudio.Games.Scripts_KarateMan
ParticleSystem p = Instantiate(HitParticles[7], ItemCurves[8].GetPoint(1f), Quaternion.identity, KarateMan.instance.ItemHolder);
p.Play();
}
- GameObject.Destroy(ShadowInstance.gameObject);
- GameObject.Destroy(gameObject);
+ Destroy(ShadowInstance.gameObject);
+ Destroy(gameObject);
return;
}
else {
@@ -396,14 +401,14 @@ namespace HeavenStudio.Games.Scripts_KarateMan
ParticleSystem p = Instantiate(HitParticles[7], pos, Quaternion.identity, KarateMan.instance.ItemHolder);
p.Play();
- GameObject.Destroy(ShadowInstance.gameObject);
- GameObject.Destroy(gameObject);
+ Destroy(ShadowInstance.gameObject);
+ Destroy(gameObject);
return;
}
else if (cond.songPositionInBeatsAsDouble >= startBeat + 3f)
{
- GameObject.Destroy(ShadowInstance.gameObject);
- GameObject.Destroy(gameObject);
+ Destroy(ShadowInstance.gameObject);
+ Destroy(gameObject);
return;
}
if (prog <= 1f)
@@ -414,13 +419,13 @@ namespace HeavenStudio.Games.Scripts_KarateMan
break;
}
ShadowInstance.transform.position = new Vector3(transform.position.x, floorHeight - 0.5f, transform.position.z);
- //shadowRenderer.color = KarateMan.instance.GetShadowColor();
+ shadowRenderer.color = KarateMan.instance.Joe.Shadows[0].color;
SetColourMapping();
}
void CreateHitMark(bool useLocalPos = false)
{
- GameObject hitMark = GameObject.Instantiate(HitMark, KarateMan.instance.ItemHolder);
+ GameObject hitMark = Instantiate(HitMark, KarateMan.instance.ItemHolder);
if (useLocalPos)
hitMark.transform.localPosition = transform.position;
else