diff --git a/Assets/Resources/Games/cannery.prefab b/Assets/Resources/Games/cannery.prefab index 5519b89f6..88e53dc2b 100644 --- a/Assets/Resources/Games/cannery.prefab +++ b/Assets/Resources/Games/cannery.prefab @@ -725,7 +725,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8615374414734561705} - - component: {fileID: 2491713825135125463} m_Layer: 0 m_Name: Conveyor3Angle m_TagString: Untagged @@ -749,27 +748,6 @@ Transform: m_Father: {fileID: 5813499711186931250} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 2.15} ---- !u!95 &2491713825135125463 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2659786308152561463} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 999ca577510d16e408d34fb24be911b8, 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 &2751657772362777455 GameObject: m_ObjectHideFlags: 0 @@ -1115,7 +1093,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3578108882218100712} - - component: {fileID: 4980712815265515627} m_Layer: 0 m_Name: Conveyor1Angle m_TagString: Untagged @@ -1139,27 +1116,6 @@ Transform: m_Father: {fileID: 5813499711186931250} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 2} ---- !u!95 &4980712815265515627 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3428754964196628754} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 999ca577510d16e408d34fb24be911b8, 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 &3504642808999640427 GameObject: m_ObjectHideFlags: 0 @@ -2330,7 +2286,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7301854396171564631} - - component: {fileID: 4489137636915631815} m_Layer: 0 m_Name: Conveyor2Angle m_TagString: Untagged @@ -2354,27 +2309,6 @@ Transform: m_Father: {fileID: 5813499711186931250} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -4.45} ---- !u!95 &4489137636915631815 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5698069872256704531} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 999ca577510d16e408d34fb24be911b8, 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 &5813499711186931251 GameObject: m_ObjectHideFlags: 0 @@ -2437,14 +2371,15 @@ MonoBehaviour: alarmMat: {fileID: 2100000, guid: cffd715f1564d4440881c6fe148baa9c, type: 2} bgPlaneSR: {fileID: 0} conveyorBeltAnim: {fileID: 3839135881600344077} + bgAnims: + - {fileID: 1312871934097871502} + - {fileID: 1330445918762147576} + - {fileID: 7967578891305360991} alarmAnim: {fileID: 3637100343128600021} dingAnim: {fileID: 7386547292618809648} cannerAnim: {fileID: 7509521705116870356} - aStartBeat: 0 - aLength: 0 - aStartColor: {r: 0, g: 0, b: 0, a: 0} - aEndColor: {r: 0, g: 0, b: 0, a: 0} - aEase: 0 + bgCurrentTime: 0 + bgCurrentSpeed: 0 --- !u!1 &5862740553224149703 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Games/cannery.prefab.meta b/Assets/Resources/Games/cannery.prefab.meta index d969bdd91..ffba3a826 100644 --- a/Assets/Resources/Games/cannery.prefab.meta +++ b/Assets/Resources/Games/cannery.prefab.meta @@ -3,5 +3,5 @@ guid: e46f5dcf26ef3494683666c938722e3e PrefabImporter: externalObjects: {} userData: - assetBundleName: mobcannery/common + assetBundleName: pcocannery/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/cannery/can.ogg.meta b/Assets/Resources/Sfx/games/cannery/can.ogg.meta index 123c5e7a2..912c6c559 100644 --- a/Assets/Resources/Sfx/games/cannery/can.ogg.meta +++ b/Assets/Resources/Sfx/games/cannery/can.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: mobcannery/common + assetBundleName: pcocannery/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/cannery/ding.ogg.meta b/Assets/Resources/Sfx/games/cannery/ding.ogg.meta index 1289e52c8..ade8731fa 100644 --- a/Assets/Resources/Sfx/games/cannery/ding.ogg.meta +++ b/Assets/Resources/Sfx/games/cannery/ding.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: mobcannery/common + assetBundleName: pcocannery/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/nearMiss.ogg b/Assets/Resources/Sfx/nearMiss.ogg index 3503d75f4..bea29c813 100644 Binary files a/Assets/Resources/Sfx/nearMiss.ogg and b/Assets/Resources/Sfx/nearMiss.ogg differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/cannery.png b/Assets/Resources/Sprites/Editor/GameIcons/cannery.png index 8cc7dbe4a..397c1aafd 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/cannery.png and b/Assets/Resources/Sprites/Editor/GameIcons/cannery.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/cannery_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/cannery_mask.png index f71b0fc1a..46d699a78 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/cannery_mask.png and b/Assets/Resources/Sprites/Editor/GameIcons/cannery_mask.png differ diff --git a/Assets/Resources/Sprites/Games/Cannery/AlarmMat.mat.meta b/Assets/Resources/Sprites/Games/Cannery/AlarmMat.mat.meta index 3dc7aa72b..96a5390ba 100644 --- a/Assets/Resources/Sprites/Games/Cannery/AlarmMat.mat.meta +++ b/Assets/Resources/Sprites/Games/Cannery/AlarmMat.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: mobcannery/common + assetBundleName: pcocannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/Alarm/AlarmAnim.controller.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/Alarm/AlarmAnim.controller.meta index 58b9f61e0..0563689c1 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Animations/Alarm/AlarmAnim.controller.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/Alarm/AlarmAnim.controller.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 userData: - assetBundleName: mobcannery/common + assetBundleName: pcocannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/Alarm/AlarmBop.anim.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/Alarm/AlarmBop.anim.meta index 70a9dcb4d..407cce886 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Animations/Alarm/AlarmBop.anim.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/Alarm/AlarmBop.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: mobcannery/common + assetBundleName: pcocannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/AlarmFlash/AlarmFlash.anim.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/AlarmFlash/AlarmFlash.anim.meta index e4fdbf190..605154a3d 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Animations/AlarmFlash/AlarmFlash.anim.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/AlarmFlash/AlarmFlash.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: mobcannery/common + assetBundleName: pcocannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/AlarmFlash/AlarmFlashAnim.controller.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/AlarmFlash/AlarmFlashAnim.controller.meta index f64a26d08..c9a5a9a59 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Animations/AlarmFlash/AlarmFlashAnim.controller.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/AlarmFlash/AlarmFlashAnim.controller.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 userData: - assetBundleName: mobcannery/common + assetBundleName: pcocannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/BG/ClawConveyorScroll.anim.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/BG/ClawConveyorScroll.anim.meta index 6083f8118..7c5156099 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Animations/BG/ClawConveyorScroll.anim.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/BG/ClawConveyorScroll.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: pcocannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/BG/Conveyor1.controller b/Assets/Resources/Sprites/Games/Cannery/Animations/BG/Conveyor1.controller index 54c662136..d05df803f 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Animations/BG/Conveyor1.controller +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/BG/Conveyor1.controller @@ -48,6 +48,32 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1102 &2909293221411300295 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Start + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 0 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &6631440365927086464 AnimatorStateMachine: serializedVersion: 6 @@ -62,7 +88,10 @@ AnimatorStateMachine: m_Position: {x: 260, y: 200, z: 0} - serializedVersion: 1 m_State: {fileID: 7990101752887186977} - m_Position: {x: 235, y: 65, z: 0} + m_Position: {x: 260, y: 110, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2909293221411300295} + m_Position: {x: 30, y: 180, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -80,7 +109,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ClawConveyorScroll + m_Name: Scroll m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/BG/Conveyor1.controller.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/BG/Conveyor1.controller.meta index fa5344874..e51ad2289 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Animations/BG/Conveyor1.controller.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/BG/Conveyor1.controller.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 userData: - assetBundleName: + assetBundleName: pcocannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/BG/ConveyorScroll.anim.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/BG/ConveyorScroll.anim.meta index 8d6831391..f22a471e0 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Animations/BG/ConveyorScroll.anim.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/BG/ConveyorScroll.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: pcocannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanAnim.controller.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanAnim.controller.meta index 5426df9d4..1d7d393c7 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanAnim.controller.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanAnim.controller.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 userData: - assetBundleName: + assetBundleName: pcocannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanCan.anim.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanCan.anim.meta index e3c231e98..95a159285 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanCan.anim.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanCan.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: pcocannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanFlip.anim.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanFlip.anim.meta index 77bd776be..a15864620 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanFlip.anim.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanFlip.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: pcocannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanMove.anim b/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanMove.anim index 3a97c8e75..8b0f4041a 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanMove.anim +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanMove.anim @@ -20,9 +20,9 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -11.5, y: -3.772, z: 0} + value: {x: -12, y: -3.772, z: 0} inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 132, y: 0, z: 0} + outSlope: {x: 135, y: 0, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -30,7 +30,7 @@ AnimationClip: - serializedVersion: 3 time: 0.16666667 value: {x: 10.5, y: -3.772, z: 0} - inSlope: {x: 132, y: 0, z: 0} + inSlope: {x: 135, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 @@ -84,9 +84,9 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -11.5 + value: -12 inSlope: 0 - outSlope: 132 + outSlope: 135 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 @@ -94,7 +94,7 @@ AnimationClip: - serializedVersion: 3 time: 0.16666667 value: 10.5 - inSlope: 132 + inSlope: 135 outSlope: 0 tangentMode: 69 weightedMode: 0 diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanMove.anim.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanMove.anim.meta index dd70784b4..9a186b5c2 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanMove.anim.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanMove.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: pcocannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanReopen.anim.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanReopen.anim.meta index 2d49cfe14..ac0ec4ba1 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanReopen.anim.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanReopen.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: pcocannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerAnim.controller.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerAnim.controller.meta index bcbbe284f..c4538a09d 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerAnim.controller.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerAnim.controller.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 userData: - assetBundleName: mobcannery/common + assetBundleName: pcocannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCan.anim.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCan.anim.meta index 06b700ea5..82350749c 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCan.anim.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCan.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: mobcannery/common + assetBundleName: pcocannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCanBarely.anim.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCanBarely.anim.meta index f4d327214..d4143bcdd 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCanBarely.anim.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCanBarely.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: pcocannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCanEmpty.anim.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCanEmpty.anim.meta index ea43b93fa..1f5ff59d7 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCanEmpty.anim.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCanEmpty.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: pcocannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/ConveyorBelt/ConveyorBeltAnim.controller.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/ConveyorBelt/ConveyorBeltAnim.controller.meta index 0c06601a8..5fe9b265e 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Animations/ConveyorBelt/ConveyorBeltAnim.controller.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/ConveyorBelt/ConveyorBeltAnim.controller.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 userData: - assetBundleName: mobcannery/common + assetBundleName: pcocannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/ConveyorBelt/ConveyorBeltMove.anim.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/ConveyorBelt/ConveyorBeltMove.anim.meta index 32a7f0a63..a7346110b 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Animations/ConveyorBelt/ConveyorBeltMove.anim.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/ConveyorBelt/ConveyorBeltMove.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: mobcannery/common + assetBundleName: pcocannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Cannery/Cannery.png.meta b/Assets/Resources/Sprites/Games/Cannery/Cannery.png.meta index 7a2653c0d..d3879f601 100644 --- a/Assets/Resources/Sprites/Games/Cannery/Cannery.png.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Cannery.png.meta @@ -582,5 +582,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: mobcannery/common + assetBundleName: pcocannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Cannery/cans.png.meta b/Assets/Resources/Sprites/Games/Cannery/cans.png.meta index cbd520015..fa573977b 100644 --- a/Assets/Resources/Sprites/Games/Cannery/cans.png.meta +++ b/Assets/Resources/Sprites/Games/Cannery/cans.png.meta @@ -163,5 +163,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: pcocannery/common assetBundleVariant: diff --git a/Assets/Scripts/Games/Cannery/Can.cs b/Assets/Scripts/Games/Cannery/Can.cs index 232ca3f1b..ec6fd99b6 100644 --- a/Assets/Scripts/Games/Cannery/Can.cs +++ b/Assets/Scripts/Games/Cannery/Can.cs @@ -34,7 +34,7 @@ namespace HeavenStudio.Games.Scripts_Cannery SoundByte.PlayOneShotGame("cannery/can"); anim.DoScaledAnimationAsync("Can", 0.5f, 0, 1); if (state is >= 1 or <= -1) { - SoundByte.PlayOneShot("nearMiss"); + SoundByte.PlayOneShot("miss"); game.cannerAnim.DoScaledAnimationAsync("CanBarely", 0.5f); double beat = caller.startBeat + caller.timer; BeatAction.New(this, new() { diff --git a/Assets/Scripts/Games/Cannery/Cannery.cs b/Assets/Scripts/Games/Cannery/Cannery.cs index b7f334904..0545c86c4 100644 --- a/Assets/Scripts/Games/Cannery/Cannery.cs +++ b/Assets/Scripts/Games/Cannery/Cannery.cs @@ -47,6 +47,24 @@ namespace HeavenStudio.Games.Loaders }, defaultLength = 0.5f, }, + new GameAction("backgroundModifiers", "Background Modifiers") + { + function = delegate { + var e = eventCaller.currentEntity; + if (eventCaller.gameManager.minigameObj.TryGetComponent(out Cannery instance)) { + instance.BackgroundModifiers(e.beat, e.length, e["startSpeed"], e["endSpeed"], e["ease"]); + } + }, + defaultLength = 0.5f, + resizable = true, + parameters = new List() + { + // new Param("speed", new EntityTypes.Float(0, 50, 10), "Speed", "Set the speed of the background."), + new Param("startSpeed", new EntityTypes.Float(0, 50, 10), "Start Speed", "Set the speed at the start of the event."), + new Param("endSpeed", new EntityTypes.Float(0, 50, 10), "End Speed", "Set the speed at the end of the event."), + new Param("ease", Util.EasingFunction.Ease.Instant, "Ease", "Set the easing of the action.", new() { new((x, _) => (int)x == (int)Util.EasingFunction.Ease.Instant, "startSpeed") }), + } + }, new GameAction("alarmColor", "Alarm Color") { function = delegate { @@ -56,18 +74,18 @@ namespace HeavenStudio.Games.Loaders } }, defaultLength = 0.5f, + resizable = true, parameters = new List() { - new Param("startColor", Cannery.alarmColor , "Start Color", "Set the color at the start of the event.", new() { new((_, _) => true, new string[] { "startColor" }) }), + new Param("startColor", Cannery.alarmColor , "Start Color", "Set the color at the start of the event."), new Param("endColor", Cannery.alarmColor, "End Color", "Set the color at the end of the event."), - new Param("ease", Util.EasingFunction.Ease.Instant, "Ease", "Set the easing of the action."), + new Param("ease", Util.EasingFunction.Ease.Instant, "Ease", "Set the easing of the action.", new() { new((x, _) => (int)x == (int)Util.EasingFunction.Ease.Instant, "startColor") }), } }, - } - // , - // new List() { "mob", "normal" }, - // "mobcannery", "en", - // new List() { } + }, + new List() { "pco", "normal" }, + "pcocannery", "en", + new List() { } ); } } @@ -87,17 +105,26 @@ namespace HeavenStudio.Games [Header("Animators")] [SerializeField] Animator conveyorBeltAnim; + [SerializeField] Animator[] bgAnims; [SerializeField] Animator alarmAnim; public Animator dingAnim; public Animator cannerAnim; // private ColorEase bgColorEase = new(Color.white); - public static readonly Color alarmColor = new Color(0.8627f, 0.3725f, 0.0313f); - public double aStartBeat; - public float aLength; - public Color aStartColor, aEndColor; - public Util.EasingFunction.Ease aEase = Util.EasingFunction.Ease.Instant; - public Util.EasingFunction.Function aEaseFunc; + public float bgCurrentTime; + public float bgCurrentSpeed; + [NonSerialized] public double bgStartBeat; + [NonSerialized] public float bgLength; + [NonSerialized] public float bgStartSpeed, bgEndSpeed; + [NonSerialized] public Util.EasingFunction.Ease bgEase = Util.EasingFunction.Ease.Instant; + [NonSerialized] public Util.EasingFunction.Function bgEaseFunc; + + [NonSerialized] public static readonly Color alarmColor = new Color(0.8627f, 0.3725f, 0.0313f); + [NonSerialized] public double aStartBeat; + [NonSerialized] public float aLength; + [NonSerialized] public Color aStartColor, aEndColor; + [NonSerialized] public Util.EasingFunction.Ease aEase = Util.EasingFunction.Ease.Instant; + [NonSerialized] public Util.EasingFunction.Function aEaseFunc; private bool alarmBop = true; @@ -111,19 +138,32 @@ namespace HeavenStudio.Games { if (PlayerInput.GetIsAction(InputAction_BasicPress) && !IsExpectingInputNow(InputAction_BasicPress)) { cannerAnim.DoScaledAnimationAsync("CanEmpty", 0.5f); - SoundByte.PlayOneShotGame("cannery/can"); + // SoundByte.PlayOneShotGame("cannery/can"); SoundByte.PlayOneShot("nearMiss"); } conveyorBeltAnim.DoNormalizedAnimation("Move", (conductor.songPositionInBeats / 2) % 1); - float normalizedBeat = Mathf.Clamp01(Conductor.instance.GetPositionFromBeat(conductor.songPositionInBeatsAsDouble, aLength)); + // bg stuff + float bgNormalizedBeat = Mathf.Clamp01(Conductor.instance.GetPositionFromBeat(bgStartBeat, bgLength)); + if (!double.IsNaN(bgNormalizedBeat)) { + bgEaseFunc ??= Util.EasingFunction.GetEasingFunction(bgEase); + bgCurrentSpeed = bgEaseFunc(bgStartSpeed, bgEndSpeed, bgNormalizedBeat); + } + + bgCurrentTime = (bgCurrentTime + (Time.deltaTime * (bgCurrentSpeed / 10))) % 1; + foreach (var anim in bgAnims) { + anim.DoNormalizedAnimation("Scroll", bgCurrentTime); + } + + // alarm color stuff + float aNormalizedBeat = Mathf.Clamp01(Conductor.instance.GetPositionFromBeat(aStartBeat, aLength)); Color newColor = alarmColor; - if (!double.IsNaN(normalizedBeat)) { + if (!double.IsNaN(aNormalizedBeat)) { aEaseFunc ??= Util.EasingFunction.GetEasingFunction(aEase); - float newR = aEaseFunc(aStartColor.r, aEndColor.r, normalizedBeat); - float newG = aEaseFunc(aStartColor.g, aEndColor.g, normalizedBeat); - float newB = aEaseFunc(aStartColor.b, aEndColor.b, normalizedBeat); + float newR = aEaseFunc(aStartColor.r, aEndColor.r, aNormalizedBeat); + float newG = aEaseFunc(aStartColor.g, aEndColor.g, aNormalizedBeat); + float newB = aEaseFunc(aStartColor.b, aEndColor.b, aNormalizedBeat); newColor = new Color(newR, newG, newB); } @@ -147,6 +187,13 @@ namespace HeavenStudio.Games } else { AlarmColor(0, 0, alarmColor, alarmColor, (int)Util.EasingFunction.Ease.Instant); } + RiqEntity bgEvent = events.FindLast(e => e.datamodel == "cannery/backgroundModifiers" && e.beat < beat); + if (bgEvent != null) { + var e = alarmEvent; + BackgroundModifiers(e.beat, e.length, e["startSpeed"], e["endSpeed"], e["ease"]); + } else { + BackgroundModifiers(0, 0, 10, 10, (int)Util.EasingFunction.Ease.Instant); + } } public override void OnLateBeatPulse(double beat) @@ -168,16 +215,6 @@ namespace HeavenStudio.Games } } - public void AlarmColor(double beat, float length, Color startColor, Color endColor, int ease) - { - aStartBeat = beat; - aLength = length; - aStartColor = startColor; - aEndColor = endColor; - aEase = (Util.EasingFunction.Ease)ease; - aEaseFunc = Util.EasingFunction.GetEasingFunction(aEase); - } - public void SendCan(double beat) { // do the ding animation on the beat @@ -192,5 +229,25 @@ namespace HeavenStudio.Games { blackout.SetActive(!blackout.activeSelf); } + + public void BackgroundModifiers(double beat, float length, float startSpeed, float endSpeed, int ease) + { + bgStartBeat = beat; + bgLength = length; + bgStartSpeed = startSpeed; + bgEndSpeed = endSpeed; + bgEase = (Util.EasingFunction.Ease)ease; + bgEaseFunc = Util.EasingFunction.GetEasingFunction(bgEase); + } + + public void AlarmColor(double beat, float length, Color startColor, Color endColor, int ease) + { + aStartBeat = beat; + aLength = length; + aStartColor = startColor; + aEndColor = endColor; + aEase = (Util.EasingFunction.Ease)ease; + aEaseFunc = Util.EasingFunction.GetEasingFunction(aEase); + } } }