diff --git a/Assets/Resources/Games/cannery.prefab b/Assets/Resources/Games/cannery.prefab
index a23be9738..0ccb05911 100644
--- a/Assets/Resources/Games/cannery.prefab
+++ b/Assets/Resources/Games/cannery.prefab
@@ -59,7 +59,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1681142449906937503}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -6.674, y: -1.039, z: 0}
+ m_LocalPosition: {x: -6.674, y: -1.4652, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -505,6 +505,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3652404578509339934}
+ - {fileID: 8257575025868298104}
m_Father: {fileID: 8847864683807253247}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -873,6 +874,90 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
+--- !u!1 &6416848576205163449
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8257575025868298104}
+ - component: {fileID: 8896831006369008573}
+ m_Layer: 0
+ m_Name: Head
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &8257575025868298104
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6416848576205163449}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: -3.587, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 7819539421109718628}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &8896831006369008573
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6416848576205163449}
+ 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: 150
+ m_Sprite: {fileID: -506358788, guid: 5a8f2715082952e4b804a4b950cf25d4, 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.99492383, y: 0.5482234}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
--- !u!1 &6779319467216197044
GameObject:
m_ObjectHideFlags: 0
@@ -931,7 +1016,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8394760733365779905}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalPosition: {x: 0, y: -2.63, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -1017,7 +1102,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8575099813453766973}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -9.5, y: -3.742, z: 0}
+ m_LocalPosition: {x: -9.5, y: -3.772, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -1091,6 +1176,7 @@ MonoBehaviour:
startBeat: 0
parentAnim: {fileID: 0}
anim: {fileID: 5817211847633092072}
+ game: {fileID: 0}
--- !u!95 &5817211847633092072
Animator:
serializedVersion: 5
diff --git a/Assets/Resources/Prefabs/GameView/GameTex.renderTexture b/Assets/Resources/Prefabs/GameView/GameTex.renderTexture
index 7b61f2944..df7203cbf 100644
--- a/Assets/Resources/Prefabs/GameView/GameTex.renderTexture
+++ b/Assets/Resources/Prefabs/GameView/GameTex.renderTexture
@@ -14,8 +14,8 @@ RenderTexture:
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 5
- m_Width: 2238
- m_Height: 1258
+ m_Width: 2560
+ m_Height: 1440
m_AntiAliasing: 2
m_MipCount: -1
m_DepthStencilFormat: 92
diff --git a/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture b/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture
index 994f54231..a88e21df7 100644
--- a/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture
+++ b/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture
@@ -14,8 +14,8 @@ RenderTexture:
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 5
- m_Width: 3357
- m_Height: 1887
+ m_Width: 3840
+ m_Height: 2160
m_AntiAliasing: 1
m_MipCount: -1
m_DepthStencilFormat: 92
diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerAnim.controller b/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerAnim.controller
index 628c151de..95d6ddddf 100644
--- a/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerAnim.controller
+++ b/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerAnim.controller
@@ -74,6 +74,32 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
+--- !u!1102 &3415158190403112181
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: CanEmpty
+ 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: 1baf862e90a0bad42a0d6526c7c31c71, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
--- !u!1107 &6171391464121929582
AnimatorStateMachine:
serializedVersion: 6
@@ -89,6 +115,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: -6689453687654492570}
m_Position: {x: 280, y: 190, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 3415158190403112181}
+ m_Position: {x: 279.17062, y: 256.5166, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCan.anim b/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCan.anim
index 93c697d39..c499cb22d 100644
--- a/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCan.anim
+++ b/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCan.anim
@@ -20,35 +20,35 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: {x: 0, y: 0.61, z: 0}
+ value: {x: 0, y: 0.73, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- - serializedVersion: 3
- time: 0.016666668
- value: {x: 0, y: 0.61, z: 0}
- inSlope: {x: 0, y: -0, z: 0}
- outSlope: {x: 0, y: 0, z: 0}
- tangentMode: 0
- weightedMode: 0
- inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.033333335
- value: {x: 0, y: 0.61, z: 0}
- inSlope: {x: 0, y: -0, z: 0}
- outSlope: {x: 0, y: 34.371426, z: 0}
+ value: {x: 0, y: 0.85, z: 0}
+ inSlope: {x: 0, y: 3.6, z: 0}
+ outSlope: {x: 0, y: 1.8, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
- time: 0.15
+ time: 0.06666667
+ value: {x: 0, y: 0.91, z: 0}
+ inSlope: {x: 0, y: 1.8, z: 0}
+ outSlope: {x: 0, y: 15.899998, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.3
value: {x: 0, y: 4.62, z: 0}
- inSlope: {x: 0, y: 34.371426, z: 0}
+ inSlope: {x: 0, y: 15.899998, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
@@ -73,7 +73,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
- time: 0.016666668
+ time: 0.033333335
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -88,8 +88,19 @@ AnimationClip:
path: MotionLines
classID: 1
script: {fileID: 0}
- m_PPtrCurves: []
- m_SampleRate: 60
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: -627351396, guid: 5a8f2715082952e4b804a4b950cf25d4, type: 3}
+ - time: 0.033333335
+ value: {fileID: -595179016, guid: 5a8f2715082952e4b804a4b950cf25d4, type: 3}
+ - time: 0.06666667
+ value: {fileID: -506358788, guid: 5a8f2715082952e4b804a4b950cf25d4, type: 3}
+ attribute: m_Sprite
+ path: Head
+ classID: 212
+ script: {fileID: 0}
+ m_SampleRate: 30
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
@@ -110,13 +121,23 @@ AnimationClip:
typeID: 1
customType: 0
isPPtrCurve: 0
- pptrCurveMapping: []
+ - serializedVersion: 2
+ path: 130111906
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: -627351396, guid: 5a8f2715082952e4b804a4b950cf25d4, type: 3}
+ - {fileID: -595179016, guid: 5a8f2715082952e4b804a4b950cf25d4, type: 3}
+ - {fileID: -506358788, guid: 5a8f2715082952e4b804a4b950cf25d4, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 0.15
+ m_StopTime: 0.3
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@@ -144,15 +165,6 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.016666668
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
value: 0
@@ -163,7 +175,16 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 0.15
+ time: 0.06666667
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.3
value: 0
inSlope: 0
outSlope: 0
@@ -183,35 +204,35 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: 0.61
+ value: 0.73
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.016666668
- value: 0.61
- inSlope: -0
- outSlope: 0
- tangentMode: 69
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
- value: 0.61
- inSlope: -0
- outSlope: 34.371426
+ value: 0.85
+ inSlope: 3.6
+ outSlope: 1.8
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 0.15
+ time: 0.06666667
+ value: 0.91
+ inSlope: 1.8
+ outSlope: 15.899998
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.3
value: 4.62
- inSlope: 34.371426
+ inSlope: 15.899998
outSlope: 0
tangentMode: 69
weightedMode: 0
@@ -236,15 +257,6 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.016666668
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
value: 0
@@ -255,7 +267,16 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 0.15
+ time: 0.06666667
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.3
value: 0
inSlope: 0
outSlope: 0
@@ -283,7 +304,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
- time: 0.016666668
+ time: 0.033333335
value: 0
inSlope: Infinity
outSlope: Infinity
diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCanEmpty.anim b/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCanEmpty.anim
new file mode 100644
index 000000000..3c5b7da5c
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCanEmpty.anim
@@ -0,0 +1,304 @@
+%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: CannerCanEmpty
+ 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: 0, y: 0.91, z: 0}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.033333335
+ value: {x: 0, y: 0.91, z: 0}
+ inSlope: {x: 0, y: -0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.06666667
+ value: {x: 0, y: 0.91, z: 0}
+ inSlope: {x: 0, y: -0, z: 0}
+ outSlope: {x: 0, y: 15.899998, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.3
+ value: {x: 0, y: 4.62, z: 0}
+ inSlope: {x: 0, y: 15.899998, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ path:
+ 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
+ - serializedVersion: 3
+ time: 0.033333335
+ 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: MotionLines
+ classID: 1
+ script: {fileID: 0}
+ m_PPtrCurves: []
+ m_SampleRate: 30
+ 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: 0
+ attribute: 1
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 868128025
+ attribute: 2086281974
+ script: {fileID: 0}
+ typeID: 1
+ customType: 0
+ isPPtrCurve: 0
+ pptrCurveMapping: []
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.3
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 0
+ 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: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.033333335
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.06666667
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.3
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.x
+ path:
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.91
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.033333335
+ value: 0.91
+ inSlope: -0
+ outSlope: 0
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.06666667
+ value: 0.91
+ inSlope: -0
+ outSlope: 15.899998
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.3
+ value: 4.62
+ inSlope: 15.899998
+ outSlope: 0
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.y
+ path:
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.033333335
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.06666667
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.3
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.z
+ path:
+ 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
+ - serializedVersion: 3
+ time: 0.033333335
+ 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: MotionLines
+ classID: 1
+ script: {fileID: 0}
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 1
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCanEmpty.anim.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCanEmpty.anim.meta
new file mode 100644
index 000000000..ea43b93fa
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCanEmpty.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1baf862e90a0bad42a0d6526c7c31c71
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sprites/Games/Cannery/Cannery.png.meta b/Assets/Resources/Sprites/Games/Cannery/Cannery.png.meta
index 55ca905e3..0f81e8f6c 100644
--- a/Assets/Resources/Sprites/Games/Cannery/Cannery.png.meta
+++ b/Assets/Resources/Sprites/Games/Cannery/Cannery.png.meta
@@ -112,8 +112,8 @@ TextureImporter:
y: 1907
width: 206
height: 116
- alignment: 0
- pivot: {x: 0.5, y: 0.5}
+ alignment: 9
+ pivot: {x: 0.5, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@@ -133,8 +133,8 @@ TextureImporter:
y: 1906
width: 206
height: 141
- alignment: 0
- pivot: {x: 0.5, y: 0.5}
+ alignment: 9
+ pivot: {x: 0.5, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@@ -154,8 +154,8 @@ TextureImporter:
y: 1907
width: 207
height: 165
- alignment: 0
- pivot: {x: 0.5, y: 0.5}
+ alignment: 9
+ pivot: {x: 0.5, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@@ -281,7 +281,7 @@ TextureImporter:
width: 224
height: 93
alignment: 0
- pivot: {x: 0, y: 0}
+ pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@@ -302,7 +302,7 @@ TextureImporter:
width: 251
height: 167
alignment: 0
- pivot: {x: 0, y: 0}
+ pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@@ -406,8 +406,8 @@ TextureImporter:
y: 1192
width: 196
height: 108
- alignment: 0
- pivot: {x: 0.5, y: 0.5}
+ alignment: 9
+ pivot: {x: 0.5, y: 1}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@@ -427,8 +427,8 @@ TextureImporter:
y: 1005
width: 255
height: 97
- alignment: 0
- pivot: {x: 0.5, y: 0.5}
+ alignment: 9
+ pivot: {x: 0.5, y: 1}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@@ -448,8 +448,8 @@ TextureImporter:
y: 878
width: 308
height: 76
- alignment: 0
- pivot: {x: 0.5, y: 0.5}
+ alignment: 9
+ pivot: {x: 0.5, y: 1}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@@ -470,7 +470,7 @@ TextureImporter:
width: 225
height: 267
alignment: 0
- pivot: {x: 0, y: 0}
+ pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@@ -491,7 +491,7 @@ TextureImporter:
width: 222
height: 81
alignment: 0
- pivot: {x: 0, y: 0}
+ pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@@ -512,7 +512,7 @@ TextureImporter:
width: 207
height: 86
alignment: 0
- pivot: {x: 0, y: 0}
+ pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@@ -533,7 +533,7 @@ TextureImporter:
width: 266
height: 177
alignment: 0
- pivot: {x: 0, y: 0}
+ pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
diff --git a/Assets/Scripts/Games/Cannery/Can.cs b/Assets/Scripts/Games/Cannery/Can.cs
index a7a2d431f..70d3d9ef2 100644
--- a/Assets/Scripts/Games/Cannery/Can.cs
+++ b/Assets/Scripts/Games/Cannery/Can.cs
@@ -16,11 +16,10 @@ namespace HeavenStudio.Games.Scripts_Cannery
[SerializeField] Animator anim;
// [SerializeField] SpriteRenderer sr;
- Cannery game;
+ public Cannery game;
private void Awake()
{
- game = Cannery.instance;
int random = Random.Range(-1, 1);
Debug.Log(random);
var pos = transform.position;
diff --git a/Assets/Scripts/Games/Cannery/Cannery.cs b/Assets/Scripts/Games/Cannery/Cannery.cs
index 94ee10786..9fbebdfc9 100644
--- a/Assets/Scripts/Games/Cannery/Cannery.cs
+++ b/Assets/Scripts/Games/Cannery/Cannery.cs
@@ -56,12 +56,14 @@ namespace HeavenStudio.Games.Loaders
{
function = delegate {
var e = eventCaller.currentEntity;
- Cannery.instance.AlarmColor(e.beat, e.length, e["startColor"], e["endColor"], e["ease"]);
+ if (eventCaller.gameManager.minigameObj.TryGetComponent(out Cannery instance)) {
+ instance.AlarmColor(e.beat, e.length, e["startColor"], e["endColor"], e["ease"]);
+ }
},
defaultLength = 0.5f,
parameters = new List()
{
- new Param("startColor", new Color(0.8627f, 0.3725f, 0.0313f), "Start Color", "Set the color at the start of the event."),
+ new Param("startColor", new Color(0.8627f, 0.3725f, 0.0313f), "Start Color", "Set the color at the start of the event.", new() { new((_, _) => true, new string[] { "startColor" }) }),
new Param("endColor", new Color(0.8627f, 0.3725f, 0.0313f), "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."),
}
@@ -71,7 +73,7 @@ namespace HeavenStudio.Games.Loaders
// new List() { "mob", "normal" },
// "mobcannery", "en",
// new List() { }
- );
+ );A
}
}
}
@@ -99,11 +101,11 @@ namespace HeavenStudio.Games
private bool alarmBop = true;
- public static Cannery instance;
+ // public static Cannery instance;
private void Awake()
{
- instance = this;
+ // instance = this;
canGO.SetActive(false);
}
@@ -143,7 +145,7 @@ namespace HeavenStudio.Games
OnGameSwitch(beat);
}
- public override void OnBeatPulse(double beat)
+ public override void OnLateBeatPulse(double beat)
{
if (alarmBop) {
alarmAnim.DoScaledAnimationAsync("Bop", 0.5f);
@@ -183,6 +185,7 @@ namespace HeavenStudio.Games
BeatAction.New(this, new() { new(beat, delegate { dingAnim.DoScaledAnimationFromBeatAsync("Ding", 0.5f, beat); }) });
Can newCan = Instantiate(canGO, transform).GetComponent();
+ newCan.game = this;
newCan.startBeat = beat;
newCan.gameObject.SetActive(true);
}
diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset
index 9bd4b8b72..80c390d2c 100644
--- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset
+++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset
@@ -17,46 +17,7 @@ MonoBehaviour:
DenseViewWidthThreshold: 512
_disableAutoReloadInBackground: 0
ImportedScriptPaths:
- - Assets/Scripts/Minigames.cs
- - Assets/Editor/CreateAssetBundles.cs
- - Assets/Editor/CreateMinigameScriptTemplate.cs
- - Assets/Scripts/Games/Minigame.cs
- - Assets/Scripts/Games/FanClub/FanClub.cs
- - Assets/Scripts/GameManager.cs
- - Assets/Editor/SpritesheetScaler.cs
- - Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs
- - Assets/Scripts/Games/TheDazzles/TheDazzles.cs
- - Assets/Scripts/Games/FirstContact/FirstContact.cs
- - Assets/Scripts/SourceGenerators/ControllerLoaderGenerator.cs
- - Assets/Scripts/InputSystem/PlayerInput.cs
- - Assets/Scripts/JudgementManager.cs
- - Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/RatingScreenPropertyDialog.cs
- - Assets/Scripts/GlobalGameManager.cs
- - Assets/Scripts/Games/KarateMan/KarateMan.cs
- - Assets/Scripts/Games/KarateMan/KarateManJoe.cs
- - Assets/Scripts/Games/KarateMan/KarateManNoriController.cs
- - Assets/Scripts/Util/BeatAction.cs
- - Assets/Scripts/Games/TossBoys/TossBoys.cs
- - Assets/Scripts/Games/DoubleDate/DoubleDate.cs
- - Assets/Scripts/Games/AirRally/AirRally.cs
- - Assets/Scripts/LevelEditor/Editor.cs
- - Assets/Scripts/Common/MemRenderer.cs
- - Assets/Scripts/Games/BoardMeeting/BoardMeeting.cs
- - Assets/Scripts/PersistentDataManager.cs
- - Assets/Scripts/UI/Overlays/OverlaysManager.cs
- - Assets/Scripts/TitleManager.cs
- - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SectionDialog.cs
- - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TimelineObjs/SectionTimelineObj.cs
- - Assets/Scripts/Games/DJSchool/Student.cs
- - Assets/Scripts/UI/PauseMenu.cs
- - Assets/Scripts/Util/Sound.cs
- - Assets/Scripts/Conductor.cs
- - Assets/Scripts/EventCaller.cs
- - Assets/Scripts/Games/TrickClass/TrickClass.cs
- - Assets/Scripts/GameInitializer.cs
- - Assets/Scripts/LevelEditor/Timeline/Timeline.cs
- - Assets/Scripts/Games/PlayerActionEvent.cs
- - Assets/Scripts/Games/KarateMan/KarateManPot.cs
- - Assets/Scripts/Games/DJSchool/DJSchool.cs
+ - Assets/Scripts/Games/Cannery/Cannery.cs
+ - Assets/Scripts/Games/Cannery/Can.cs
PathsToSkipImportEvent: []
PathsToIgnoreOverwriteSettingOnAttribute: []