diff --git a/Assets/Resources/Prefabs/Games/NightWalkAgb/JumpPlatform.prefab b/Assets/Resources/Prefabs/Games/NightWalkAgb/JumpPlatform.prefab
index 8271c11e5..6a217b604 100644
--- a/Assets/Resources/Prefabs/Games/NightWalkAgb/JumpPlatform.prefab
+++ b/Assets/Resources/Prefabs/Games/NightWalkAgb/JumpPlatform.prefab
@@ -171,6 +171,7 @@ Transform:
- {fileID: 6382310734157045642}
- {fileID: 5627634713630652290}
- {fileID: 2747914681378034359}
+ - {fileID: 5424118043307149915}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -188,6 +189,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
platform: {fileID: 8602790381015410525}
fallYan: {fileID: 142440390168805750}
+ fish: {fileID: 3392966659349309181}
--- !u!95 &4653690538679061971
Animator:
serializedVersion: 5
@@ -209,6 +211,91 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
+--- !u!1 &2188794349981402081
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7339190660143833862}
+ - component: {fileID: 6018230273407783958}
+ m_Layer: 0
+ m_Name: Body
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &7339190660143833862
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2188794349981402081}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 1.3, y: 12.01, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 1570052819232453322}
+ m_Father: {fileID: 5424118043307149915}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &6018230273407783958
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2188794349981402081}
+ 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: 1
+ m_Sprite: {fileID: -1703310874, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 3.45, y: 2.95}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
--- !u!1 &3455774344871944137
GameObject:
m_ObjectHideFlags: 0
@@ -377,6 +464,60 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
+--- !u!1 &3979984088656727698
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5424118043307149915}
+ - component: {fileID: 3392966659349309181}
+ m_Layer: 0
+ m_Name: Fish
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &5424118043307149915
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3979984088656727698}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 7339190660143833862}
+ m_Father: {fileID: 9016694733661613840}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!95 &3392966659349309181
+Animator:
+ serializedVersion: 5
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3979984088656727698}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: 1e4c3931aa07c4c47a3815d6bee20902, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_StabilizeFeet: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorStateOnDisable: 0
+ m_WriteDefaultValuesOnDisable: 0
--- !u!1 &4717417375749839996
GameObject:
m_ObjectHideFlags: 0
@@ -461,6 +602,90 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
+--- !u!1 &6481392920688559199
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1570052819232453322}
+ - component: {fileID: 3857451764587854947}
+ m_Layer: 0
+ m_Name: Tail
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1570052819232453322
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6481392920688559199}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 1.77, y: -0.17, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 7339190660143833862}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &3857451764587854947
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6481392920688559199}
+ 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: 0
+ m_Sprite: {fileID: 1245348893, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 0.79, y: 1.66}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
--- !u!1 &7202126364606349233
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Resources/Sfx/games/nightWalkAgb/fish1.wav b/Assets/Resources/Sfx/games/nightWalkAgb/fish1.wav
new file mode 100644
index 000000000..dc742cb94
Binary files /dev/null and b/Assets/Resources/Sfx/games/nightWalkAgb/fish1.wav differ
diff --git a/Assets/Resources/Sfx/games/nightWalkAgb/jumpUmbrella1.ogg.meta b/Assets/Resources/Sfx/games/nightWalkAgb/fish1.wav.meta
similarity index 91%
rename from Assets/Resources/Sfx/games/nightWalkAgb/jumpUmbrella1.ogg.meta
rename to Assets/Resources/Sfx/games/nightWalkAgb/fish1.wav.meta
index 74b21a010..bd11a150d 100644
--- a/Assets/Resources/Sfx/games/nightWalkAgb/jumpUmbrella1.ogg.meta
+++ b/Assets/Resources/Sfx/games/nightWalkAgb/fish1.wav.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 37abfeb140842f84a9e5d2fe0e2709c0
+guid: ade60ad86be5a44478cabb0b91f5e001
AudioImporter:
externalObjects: {}
serializedVersion: 6
diff --git a/Assets/Resources/Sfx/games/nightWalkAgb/fish2.wav b/Assets/Resources/Sfx/games/nightWalkAgb/fish2.wav
new file mode 100644
index 000000000..ffae760f2
Binary files /dev/null and b/Assets/Resources/Sfx/games/nightWalkAgb/fish2.wav differ
diff --git a/Assets/Resources/Sfx/games/nightWalkAgb/jumpUmbrella2.ogg.meta b/Assets/Resources/Sfx/games/nightWalkAgb/fish2.wav.meta
similarity index 91%
rename from Assets/Resources/Sfx/games/nightWalkAgb/jumpUmbrella2.ogg.meta
rename to Assets/Resources/Sfx/games/nightWalkAgb/fish2.wav.meta
index b3dae7601..05eefba01 100644
--- a/Assets/Resources/Sfx/games/nightWalkAgb/jumpUmbrella2.ogg.meta
+++ b/Assets/Resources/Sfx/games/nightWalkAgb/fish2.wav.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 52be7da645bc0fa43a2e990d3d1cd968
+guid: eb97e0cafda344c4eb4116397740c32c
AudioImporter:
externalObjects: {}
serializedVersion: 6
diff --git a/Assets/Resources/Sfx/games/nightWalkAgb/fish3.wav b/Assets/Resources/Sfx/games/nightWalkAgb/fish3.wav
new file mode 100644
index 000000000..64c737193
Binary files /dev/null and b/Assets/Resources/Sfx/games/nightWalkAgb/fish3.wav differ
diff --git a/Assets/Resources/Sfx/games/nightWalkAgb/fish3.wav.meta b/Assets/Resources/Sfx/games/nightWalkAgb/fish3.wav.meta
new file mode 100644
index 000000000..c63f92844
--- /dev/null
+++ b/Assets/Resources/Sfx/games/nightWalkAgb/fish3.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: d6dfa8838fbf7fa40acad060c8738c48
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sfx/games/nightWalkAgb/jumpUmbrella1.ogg b/Assets/Resources/Sfx/games/nightWalkAgb/jumpUmbrella1.ogg
deleted file mode 100644
index 1f482d134..000000000
Binary files a/Assets/Resources/Sfx/games/nightWalkAgb/jumpUmbrella1.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/nightWalkAgb/jumpUmbrella2.ogg b/Assets/Resources/Sfx/games/nightWalkAgb/jumpUmbrella2.ogg
deleted file mode 100644
index 683ffc902..000000000
Binary files a/Assets/Resources/Sfx/games/nightWalkAgb/jumpUmbrella2.ogg and /dev/null differ
diff --git a/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/Fish.controller b/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/Fish.controller
new file mode 100644
index 000000000..55551c0f9
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/Fish.controller
@@ -0,0 +1,101 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-7521411705040657190
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Shock
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: eca48ffba97ff7045a1a978e7a5a88cf, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1107 &-6648123790380149473
+AnimatorStateMachine:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Base Layer
+ m_ChildStates:
+ - serializedVersion: 1
+ m_State: {fileID: 4430827207884076554}
+ m_Position: {x: 200, y: 0, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -7521411705040657190}
+ m_Position: {x: 235, y: 65, 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_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+ m_DefaultState: {fileID: 4430827207884076554}
+--- !u!91 &9100000
+AnimatorController:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Fish
+ serializedVersion: 5
+ m_AnimatorParameters: []
+ m_AnimatorLayers:
+ - serializedVersion: 5
+ m_Name: Base Layer
+ m_StateMachine: {fileID: -6648123790380149473}
+ m_Mask: {fileID: 0}
+ m_Motions: []
+ m_Behaviours: []
+ m_BlendingMode: 0
+ m_SyncedLayerIndex: -1
+ m_DefaultWeight: 0
+ m_IKPass: 0
+ m_SyncedLayerAffectsTiming: 0
+ m_Controller: {fileID: 9100000}
+--- !u!1102 &4430827207884076554
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: FishIdle
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: fbcdcd92d330c5440929df833043447f, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
diff --git a/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/Fish.controller.meta b/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/Fish.controller.meta
new file mode 100644
index 000000000..b2551ea03
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/Fish.controller.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1e4c3931aa07c4c47a3815d6bee20902
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 9100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/FishIdle.anim b/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/FishIdle.anim
new file mode 100644
index 000000000..cfff47b9c
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/FishIdle.anim
@@ -0,0 +1,391 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: FishIdle
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: {x: 1.77, y: -0.17, z: 0}
+ inSlope: {x: Infinity, y: Infinity, z: Infinity}
+ outSlope: {x: Infinity, y: Infinity, z: Infinity}
+ 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.16666667
+ value: {x: 1.67, y: -0.17, z: 0}
+ inSlope: {x: Infinity, y: Infinity, z: Infinity}
+ outSlope: {x: Infinity, y: Infinity, z: Infinity}
+ 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: 1.78, y: -0.26, z: 0}
+ inSlope: {x: Infinity, y: Infinity, z: Infinity}
+ outSlope: {x: Infinity, y: Infinity, z: Infinity}
+ 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.33333334
+ value: {x: 1.67, y: -0.17, z: 0}
+ inSlope: {x: Infinity, y: Infinity, z: Infinity}
+ outSlope: {x: Infinity, y: Infinity, z: Infinity}
+ 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.41666666
+ value: {x: 1.77, y: -0.17, z: 0}
+ inSlope: {x: Infinity, y: Infinity, z: Infinity}
+ outSlope: {x: Infinity, y: Infinity, z: Infinity}
+ 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.5
+ value: {x: 1.77, y: -0.17, z: 0}
+ inSlope: {x: Infinity, y: Infinity, z: Infinity}
+ outSlope: {x: Infinity, y: Infinity, z: Infinity}
+ 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: Body/Tail
+ m_ScaleCurves: []
+ m_FloatCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ 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: Body/Tail
+ classID: 1
+ script: {fileID: 0}
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: 1245348893, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ - time: 0.083333336
+ value: {fileID: -1611729225, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ - time: 0.16666667
+ value: {fileID: 950189746, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ - time: 0.25
+ value: {fileID: -1673937283, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ - time: 0.33333334
+ value: {fileID: 950189746, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ - time: 0.41666666
+ value: {fileID: -1611729225, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ - time: 0.5
+ value: {fileID: 1245348893, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ attribute: m_Sprite
+ path: Body/Tail
+ classID: 212
+ script: {fileID: 0}
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 4070753645
+ attribute: 1
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 4070753645
+ attribute: 2086281974
+ script: {fileID: 0}
+ typeID: 1
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 4070753645
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: 1245348893, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ - {fileID: -1611729225, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ - {fileID: 950189746, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ - {fileID: -1673937283, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ - {fileID: 950189746, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ - {fileID: -1611729225, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ - {fileID: 1245348893, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.51666665
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 1
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1.77
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: 1.67
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: 1.78
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.33333334
+ value: 1.67
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.41666666
+ value: 1.77
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.5
+ value: 1.77
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.x
+ path: Body/Tail
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -0.17
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: -0.17
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: -0.26
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.33333334
+ value: -0.17
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.41666666
+ value: -0.17
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.5
+ value: -0.17
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.y
+ path: Body/Tail
+ 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.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.16666667
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.25
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.33333334
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.41666666
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.5
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.z
+ path: Body/Tail
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ 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: Body/Tail
+ classID: 1
+ script: {fileID: 0}
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/FishIdle.anim.meta b/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/FishIdle.anim.meta
new file mode 100644
index 000000000..8b511c9ad
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/FishIdle.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fbcdcd92d330c5440929df833043447f
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/Shock.anim b/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/Shock.anim
new file mode 100644
index 000000000..900c2afa2
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/Shock.anim
@@ -0,0 +1,119 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Shock
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves: []
+ m_FloatCurves:
+ - 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: Body/Tail
+ classID: 1
+ script: {fileID: 0}
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: -980979782, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ - time: 0.083333336
+ value: {fileID: -2078596099, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ - time: 0.16666667
+ value: {fileID: -2078596099, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ attribute: m_Sprite
+ path: Body
+ classID: 212
+ script: {fileID: 0}
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 4070753645
+ attribute: 2086281974
+ script: {fileID: 0}
+ typeID: 1
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 2073732236
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: -980979782, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ - {fileID: -2078596099, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ - {fileID: -2078596099, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.18333334
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 1
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ 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: Body/Tail
+ classID: 1
+ script: {fileID: 0}
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/Shock.anim.meta b/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/Shock.anim.meta
new file mode 100644
index 000000000..4df927166
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/Shock.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: eca48ffba97ff7045a1a978e7a5a88cf
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/PlayYan/Player.controller b/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/PlayYan/Player.controller
index 09fc04f0a..1f5f7d4bd 100644
--- a/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/PlayYan/Player.controller
+++ b/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/PlayYan/Player.controller
@@ -15,6 +15,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 1145029203047152093}
m_Position: {x: 235, y: 65, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 8776100243285922465}
+ m_Position: {x: 270, y: 130, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@@ -99,3 +102,29 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1102 &8776100243285922465
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Shock
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: 851c025bb60f03d4ca12aee8499ae5fa, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
diff --git a/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/PlayYan/Shock.anim b/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/PlayYan/Shock.anim
new file mode 100644
index 000000000..880f5be4f
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/PlayYan/Shock.anim
@@ -0,0 +1,74 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Shock
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: 1851998298, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ - time: 0.083333336
+ value: {fileID: 379567741, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ - time: 0.16666667
+ value: {fileID: 379567741, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ attribute: m_Sprite
+ path: Sprite
+ classID: 212
+ script: {fileID: 0}
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 850496168
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: 1851998298, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ - {fileID: 379567741, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ - {fileID: 379567741, guid: 425aa48453840844d9f049d7ebd849ce, type: 3}
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.18333334
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 1
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves: []
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/PlayYan/Shock.anim.meta b/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/PlayYan/Shock.anim.meta
new file mode 100644
index 000000000..6edd17c7b
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/PlayYan/Shock.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 851c025bb60f03d4ca12aee8499ae5fa
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sprites/Games/NightWalkGBA/NightWalkGBA.png.meta b/Assets/Resources/Sprites/Games/NightWalkGBA/NightWalkGBA.png.meta
index d7051f21e..416eab13f 100644
--- a/Assets/Resources/Sprites/Games/NightWalkGBA/NightWalkGBA.png.meta
+++ b/Assets/Resources/Sprites/Games/NightWalkGBA/NightWalkGBA.png.meta
@@ -567,15 +567,15 @@ TextureImporter:
edges: []
weights: []
- serializedVersion: 2
- name: NightWalkGBA_22
+ name: shockyan
rect:
serializedVersion: 2
x: 609
y: 2183
width: 268
height: 334
- alignment: 0
- pivot: {x: 0.5, y: 0.5}
+ alignment: 9
+ pivot: {x: 0.54663676, y: 0.48396274}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@@ -805,8 +805,8 @@ TextureImporter:
y: 2011
width: 403
height: 445
- alignment: 0
- pivot: {x: 0.5, y: 0.5}
+ alignment: 9
+ pivot: {x: 0.42683476, y: 0.49631923}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@@ -1619,7 +1619,6 @@ TextureImporter:
NightWalkGBA_2: 1594823612
NightWalkGBA_20: -193465265
NightWalkGBA_21: -1673937283
- NightWalkGBA_22: 1851998298
NightWalkGBA_23: 1372235165
NightWalkGBA_24: -564146531
NightWalkGBA_25: -1611729225
@@ -1672,6 +1671,7 @@ TextureImporter:
note: -1832946202
noteImpact: -354181421
platform: 1193791270
+ shockyan: 1851998298
stem: -124737513
walk1: -239389510
walk2: 1010555121
diff --git a/Assets/Scripts/Games/NightWalkAgb/AgbNightWalk.cs b/Assets/Scripts/Games/NightWalkAgb/AgbNightWalk.cs
index 418da126e..ea6fe30bf 100644
--- a/Assets/Scripts/Games/NightWalkAgb/AgbNightWalk.cs
+++ b/Assets/Scripts/Games/NightWalkAgb/AgbNightWalk.cs
@@ -49,6 +49,14 @@ namespace HeavenStudio.Games.Loaders
new Param("fill", AgbNightWalk.FillType.None, "Umbrella Drum Pattern")
}
},
+ new GameAction("fish", "Electric Fish")
+ {
+ preFunction = delegate { if (!eventCaller.currentEntity["mute"]) AgbNightWalk.FishSound(eventCaller.currentEntity.beat); },
+ parameters = new List()
+ {
+ new Param("mute", false, "Mute Cue")
+ }
+ },
new GameAction("noJump", "No Jumping")
{
defaultLength = 4,
@@ -92,6 +100,7 @@ namespace HeavenStudio.Games
}
List heightEntityEvents = new();
[NonSerialized] public Dictionary platformTypes = new();
+ private List fishBeats = new();
public struct TypeEvent
{
public PlatformType platformType;
@@ -149,6 +158,16 @@ namespace HeavenStudio.Games
}
}
+ List fishEvents = EventCaller.GetAllInGameManagerList("nightWalkAgb", new string[] { "fish" });
+ foreach(var fishEvent in fishEvents)
+ {
+ fishBeats.Add(fishEvent.beat);
+ }
+ }
+
+ public bool FishOnBeat(double beat)
+ {
+ return fishBeats.Contains(beat);
}
public int FindHeightUnitsAtBeat(double beat)
@@ -180,8 +199,19 @@ namespace HeavenStudio.Games
platformHandler.SpawnPlatforms(beat);
}
+ public static void FishSound(double beat)
+ {
+ MultiSound.Play(new MultiSound.Sound[]
+ {
+ new MultiSound.Sound("nightWalkAgb/fish1", beat - 1),
+ new MultiSound.Sound("nightWalkAgb/fish2", beat - 0.75),
+ new MultiSound.Sound("nightWalkAgb/fish3", beat - 0.5),
+ }, forcePlay: true);
+ }
+
public static void FillSound(double beat, FillType fill)
{
+ double third = 1.0 / 3.0;
switch (fill)
{
case FillType.None:
@@ -189,24 +219,24 @@ namespace HeavenStudio.Games
case FillType.Pattern1:
MultiSound.Play(new MultiSound.Sound[]
{
- new MultiSound.Sound("nightWalkAgb/fill1A", beat - 0.66666),
+ new MultiSound.Sound("nightWalkAgb/fill1A", beat - (third * 2)),
new MultiSound.Sound("nightWalkAgb/fill1B", beat - 0.5),
- new MultiSound.Sound("nightWalkAgb/fill1C", beat - 0.33333),
- new MultiSound.Sound("nightWalkAgb/fill1D", beat - 0.16666),
+ new MultiSound.Sound("nightWalkAgb/fill1C", beat - third),
+ new MultiSound.Sound("nightWalkAgb/fill1D", beat - (third * 0.5)),
}, forcePlay: true);
break;
case FillType.Pattern2:
MultiSound.Play(new MultiSound.Sound[]
{
- new MultiSound.Sound("nightWalkAgb/fill2A", beat - 0.66666),
+ new MultiSound.Sound("nightWalkAgb/fill2A", beat - (third * 2)),
new MultiSound.Sound("nightWalkAgb/fill2B", beat - 0.5),
- new MultiSound.Sound("nightWalkAgb/fill2C", beat - 0.16666),
+ new MultiSound.Sound("nightWalkAgb/fill2C", beat - (third * 0.5)),
}, forcePlay: true);
break;
case FillType.Pattern3:
MultiSound.Play(new MultiSound.Sound[]
{
- new MultiSound.Sound("nightWalkAgb/fill3A", beat - 0.66666),
+ new MultiSound.Sound("nightWalkAgb/fill3A", beat - (third * 2)),
new MultiSound.Sound("nightWalkAgb/fill3B", beat - 0.5),
}, forcePlay: true);
break;
diff --git a/Assets/Scripts/Games/NightWalkAgb/AgbPlatform.cs b/Assets/Scripts/Games/NightWalkAgb/AgbPlatform.cs
index a1dfa76d6..50e2e299b 100644
--- a/Assets/Scripts/Games/NightWalkAgb/AgbPlatform.cs
+++ b/Assets/Scripts/Games/NightWalkAgb/AgbPlatform.cs
@@ -35,8 +35,10 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
private bool stopped;
private Sound kickSound;
[SerializeField] private GameObject fallYan;
+ [SerializeField] private Animator fish;
private bool playYanIsFalling;
private double playYanFallBeat;
+ private bool isFish;
public void StartInput(double beat, double hitBeat)
{
@@ -48,6 +50,8 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
platform.SetActive(nextPlatformIsSameHeight);
startBeat = beat;
endBeat = hitBeat;
+ isFish = game.FishOnBeat(endBeat);
+ fish.gameObject.SetActive(isFish);
if (game.platformTypes.ContainsKey(hitBeat))
{
if (game.platformTypes[hitBeat].platformType == AgbNightWalk.PlatformType.Lollipop)
@@ -70,7 +74,7 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
}
if (startBeat < endBeat)
{
- if (game.ShouldNotJumpOnBeat(endBeat))
+ if (game.ShouldNotJumpOnBeat(endBeat) || isFish)
{
inputEvent = AgbNightWalk.instance.ScheduleUserInput(startBeat, endBeat - startBeat, InputType.STANDARD_DOWN, Just, Miss, Empty);
if (nextPlatformIsSameHeight)
@@ -96,10 +100,23 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
}
else
{
-
+ BeatAction.New(gameObject, new List()
+ {
+ new BeatAction.Action(endBeat, delegate
+ {
+ if (GameManager.instance.autoplay && !stopped)
+ {
+ handler.StopAll();
+ handler.DestroyPlatforms(endBeat + 2, endBeat - 3, endBeat + 6);
+ SoundByte.PlayOneShotGame("nightWalkAgb/wot");
+ game.playYan.Hide();
+ fallYan.SetActive(true);
+ }
+ })
+ });
}
}
- else
+ else if (!isFish)
{
inputEvent = AgbNightWalk.instance.ScheduleInput(startBeat, endBeat - startBeat, InputType.STANDARD_DOWN, Just, Miss, Empty);
}
@@ -180,8 +197,28 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
private void Just(PlayerActionEvent caller, float state)
{
canKick = false;
- handler.RaiseHeight(Conductor.instance.songPositionInBeats, lastAdditionalHeightInUnits, additionalHeightInUnits);
- game.playYan.Jump(Conductor.instance.songPositionInBeats);
+ double beat = Conductor.instance.songPositionInBeats;
+ handler.RaiseHeight(beat, lastAdditionalHeightInUnits, additionalHeightInUnits);
+ game.playYan.Jump(beat);
+ if (isFish)
+ {
+ BeatAction.New(gameObject, new List()
+ {
+ new BeatAction.Action(beat + 0.5, delegate
+ {
+ game.ScoreMiss();
+ game.playYan.Shock();
+ fish.DoScaledAnimationAsync("Shock", 0.5f);
+ handler.StopAll();
+ handler.DestroyPlatforms(caller.timer + caller.startBeat + 2, endBeat - 2, endBeat + 6);
+ }),
+ new BeatAction.Action(caller.timer + caller.startBeat + 4, delegate
+ {
+ game.playYan.Fall(caller.timer + caller.startBeat + 4);
+ fish.DoScaledAnimationAsync("FishIdle", 0.5f);
+ })
+ });
+ }
if (state >= 1 || state <= -1)
{
return;
@@ -216,7 +253,7 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
else
{
handler.StopAll();
- handler.DestroyPlatforms(caller.timer + caller.startBeat + 2, endBeat - 3, endBeat + 6);
+ handler.DestroyPlatforms(caller.timer + caller.startBeat + 2, endBeat - 2, endBeat + 6);
SoundByte.PlayOneShotGame("nightWalkAgb/wot");
game.playYan.Hide();
fallYan.SetActive(true);
diff --git a/Assets/Scripts/Games/NightWalkAgb/AgbPlayYan.cs b/Assets/Scripts/Games/NightWalkAgb/AgbPlayYan.cs
index ee88c986e..440a9b161 100644
--- a/Assets/Scripts/Games/NightWalkAgb/AgbPlayYan.cs
+++ b/Assets/Scripts/Games/NightWalkAgb/AgbPlayYan.cs
@@ -12,7 +12,9 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
{
Flying,
Walking,
- Jumping
+ Jumping,
+ Shocked,
+ Falling
}
private JumpingState jumpingState;
private AgbNightWalk game;
@@ -20,6 +22,8 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
[SerializeField] private List balloons = new List();
private Path jumpPath;
private Animator anim;
+ private float fallStartY;
+ private double playYanFallBeat;
private void Awake()
{
@@ -49,15 +53,38 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
}
break;
case JumpingState.Walking:
- transform.localPosition = Vector3.zero;
- break;
case JumpingState.Flying:
transform.localPosition = Vector3.zero;
break;
+ case JumpingState.Shocked:
+ break;
+ case JumpingState.Falling:
+ float normalizedFallBeat = cond.GetPositionFromBeat(playYanFallBeat, 2);
+ EasingFunction.Function func = EasingFunction.GetEasingFunction(EasingFunction.Ease.EaseInQuad);
+ float newPlayYanY = func(fallStartY, -12, normalizedFallBeat);
+ transform.localPosition = new Vector3(0, newPlayYanY);
+ break;
}
}
}
+ public void Shock()
+ {
+ jumpingState = JumpingState.Shocked;
+ anim.DoScaledAnimationAsync("Shock", 0.5f);
+ fallStartY = transform.localPosition.y;
+ SoundByte.PlayOneShotGame("nightWalkAgb/shock");
+ }
+
+ public void Fall(double beat)
+ {
+ jumpingState = JumpingState.Falling;
+ anim.Play("Jump", 0, 0);
+ playYanFallBeat = beat;
+ SoundByte.PlayOneShotGame("nightWalkAgb/fall");
+ Update();
+ }
+
public void Jump(double beat)
{
jumpingState = JumpingState.Jumping;