mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

The: fix

Browse source 
mwuahahhaha
This commit is contained in:
AstrlJelly 2024-02-26 23:00:48 -05:00
parent 2581c5761d
commit 52abe86a05
13 changed files with 491 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

204
Assets/Resources/Games/cannery.prefab
View file

@ -1,5 +1,76 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1079411776444769536
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6037561163425648047}
- component: {fileID: 5205926063367497593}
- component: {fileID: 3863404907229660891}
m_Layer: 0
m_Name: CanParent
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6037561163425648047
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1079411776444769536}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -9.5, y: -3.772, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7644659225641316413}
- {fileID: 6913892186430232029}
m_Father: {fileID: 5813499711186931250}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5205926063367497593
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1079411776444769536}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8f323154225ad644881f9c4be951c0e4, type: 3}
m_Name:
m_EditorClassIdentifier:
startBeat: 0
anim: {fileID: 3863404907229660891}
game: {fileID: 6610104882394386402}
--- !u!95 &3863404907229660891
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1079411776444769536}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 694053af8c1fab14e8b08d63b413583c, 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 &1308582206010940970
GameObject:
m_ObjectHideFlags: 0
@ -735,7 +806,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7644659225641316413}
- {fileID: 6037561163425648047}
- {fileID: 4493887983664527898}
- {fileID: 3518197126032361880}
- {fileID: 1162120192388305590}
@ -760,7 +831,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
SoundSequences: []
scheduledInputs: []
canGO: {fileID: 8575099813453766973}
can: {fileID: 5205926063367497593}
blackout: {fileID: 6779319467216197044}
alarmMat: {fileID: 2100000, guid: cffd715f1564d4440881c6fe148baa9c, type: 2}
bgPlaneSR: {fileID: 5948254459511631684}
@ -874,6 +945,90 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &6223089917728306127
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6913892186430232029}
- component: {fileID: 6571857147933827363}
m_Layer: 0
m_Name: CanLid
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6913892186430232029
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6223089917728306127}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.551, y: 0.614, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6037561163425648047}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &6571857147933827363
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6223089917728306127}
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: 100
m_Sprite: {fileID: 626725903, 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: 1.1269035, y: 0.4111675}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &6416848576205163449
GameObject:
m_ObjectHideFlags: 0
@ -1085,15 +1240,13 @@ GameObject:
m_Component:
- component: {fileID: 7644659225641316413}
- component: {fileID: 8380232789943656751}
- component: {fileID: 8614910501145457858}
- component: {fileID: 5817211847633092072}
m_Layer: 0
m_Name: Can
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &7644659225641316413
Transform:
m_ObjectHideFlags: 0
@ -1102,11 +1255,11 @@ 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.772, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5813499711186931250}
m_Father: {fileID: 6037561163425648047}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &8380232789943656751
@ -1161,43 +1314,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &8614910501145457858
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8575099813453766973}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8f323154225ad644881f9c4be951c0e4, type: 3}
m_Name:
m_EditorClassIdentifier:
startBeat: 0
parentAnim: {fileID: 0}
anim: {fileID: 5817211847633092072}
game: {fileID: 0}
--- !u!95 &5817211847633092072
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8575099813453766973}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 84c7be9d29fcd8a41950c45407e4488d, 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 &9174392621480048496
GameObject:
m_ObjectHideFlags: 0

2
Assets/Resources/Sprites/Games/Cannery/AlarmMat.mat
View file

@ -84,7 +84,7 @@ Material:
m_Colors:
- _AddColor: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorAlpha: {r: 0.8627451, g: 0.37254903, b: 0.03137255, a: 1}
- _ColorAlpha: {r: 0.862, g: 0.372, b: 0.031, a: 1}
- _ColorBravo: {r: 0.49803922, g: 0.49803922, b: 0.5058824, a: 1}
- _ColorDelta: {r: 0.24705882, g: 0.24313726, b: 0.24705882, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

97
Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanAnim.controller
View file

@ -14,18 +14,43 @@ AnimatorState:
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_WriteDefaultValues: 0
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: eab50bddc9abe544992c5e8043557ce0, type: 2}
m_Motion: {fileID: 7400000, guid: 562d06be175341c44995efa865866bac, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &-3161862339957932906
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Animating
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 5184350823331276456}
m_Position: {x: 280, y: 110, z: 0}
- serializedVersion: 1
m_State: {fileID: 671542589843244340}
m_Position: {x: 280, y: 180, 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: 5184350823331276456}
--- !u!1102 &-3105581592757715715
AnimatorState:
serializedVersion: 6
@ -63,7 +88,7 @@ AnimatorController:
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_Name: Movement
m_StateMachine: {fileID: 6171391464121929582}
m_Mask: {fileID: 0}
m_Motions: []
@ -74,6 +99,70 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
- serializedVersion: 5
m_Name: Animating
m_StateMachine: {fileID: -3161862339957932906}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 1
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &671542589843244340
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: CanCan
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: cfcd98cf6e8b2f141bdf99de4d2fef94, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &5184350823331276456
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: 1
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 &6171391464121929582
AnimatorStateMachine:
serializedVersion: 6
@ -81,7 +170,7 @@ AnimatorStateMachine:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_Name: Movement
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -7318305927348823551}

4
Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanAnim.controller.meta
View file

@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 84c7be9d29fcd8a41950c45407e4488d
guid: 694053af8c1fab14e8b08d63b413583c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName: mobcannery/common
assetBundleName:
assetBundleVariant:

163
Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanCan.anim Normal file
View file

@ -0,0 +1,163 @@
%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: CanCan
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.56, y: 0.495, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: CanLid
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: -107611502, guid: 5a8f2715082952e4b804a4b950cf25d4, type: 3}
attribute: m_Sprite
path: Can
classID: 212
script: {fileID: 0}
- curve:
- time: 0
value: {fileID: -930593981, guid: 5a8f2715082952e4b804a4b950cf25d4, type: 3}
attribute: m_Sprite
path: CanLid
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: 1534196786
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 3234137767
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 3234137767
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
pptrCurveMapping:
- {fileID: -107611502, guid: 5a8f2715082952e4b804a4b950cf25d4, type: 3}
- {fileID: -930593981, guid: 5a8f2715082952e4b804a4b950cf25d4, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.016666668
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.56
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: CanLid
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.495
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: CanLid
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
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: CanLid
classID: 4
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

8
Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanCan.anim.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: cfcd98cf6e8b2f141bdf99de4d2fef94
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

16
Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanMove.anim
View file

@ -20,17 +20,17 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -9.5, y: -3.742, z: 0}
value: {x: -11.5, y: -3.742, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 114, y: 0, z: 0}
outSlope: {x: 138, 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.16666667
value: {x: 9.5, y: -3.742, z: 0}
inSlope: {x: 114, y: 0, z: 0}
value: {x: 11.5, y: -3.742, z: 0}
inSlope: {x: 138, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
@ -84,17 +84,17 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -9.5
value: -11.5
inSlope: 0
outSlope: 114
outSlope: 138
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: 9.5
inSlope: 114
value: 11.5
inSlope: 138
outSlope: 0
tangentMode: 69
weightedMode: 0

4
Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanMove.anim.meta
View file

@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: eab50bddc9abe544992c5e8043557ce0
guid: 562d06be175341c44995efa865866bac
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName: mobcannery/common
assetBundleName:
assetBundleVariant:

16
Assets/Resources/Sprites/Games/Cannery/Cannery.png.meta
View file

@ -468,7 +468,7 @@ TextureImporter:
x: 1047
y: 744
width: 225
height: 267
height: 323
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -486,12 +486,12 @@ TextureImporter:
name: Cannery_13
rect:
serializedVersion: 2
x: 1308
x: 1305
y: 497
width: 222
width: 225
height: 81
alignment: 0
pivot: {x: 0.5, y: 0.5}
alignment: 9
pivot: {x: 0.016961263, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -509,10 +509,10 @@ TextureImporter:
serializedVersion: 2
x: 1033
y: 512
width: 207
width: 225
height: 86
alignment: 0
pivot: {x: 0.5, y: 0.5}
alignment: 9
pivot: {x: 0.0025580511, y: 0.27294567}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []

8
Assets/Scripts/Games/Cannery/Can.cs
View file

@ -12,7 +12,7 @@ namespace HeavenStudio.Games.Scripts_Cannery
public double startBeat;
[Header("Components")]
[SerializeField] Animator parentAnim;
// [SerializeField] Animator parentAnim;
[SerializeField] Animator anim;
// [SerializeField] SpriteRenderer sr;
@ -21,7 +21,6 @@ namespace HeavenStudio.Games.Scripts_Cannery
private void Awake()
{
int random = Random.Range(-1, 1);
Debug.Log(random);
var pos = transform.position;
pos.x *= random;
@ -31,16 +30,15 @@ namespace HeavenStudio.Games.Scripts_Cannery
private void Update()
{
float normalizedBeat = Conductor.instance.GetPositionFromBeat(startBeat, 2);
Debug.Log(normalizedBeat);
if (normalizedBeat > 1) Destroy(gameObject);
parentAnim.DoNormalizedAnimation("Move", normalizedBeat);
anim.DoNormalizedAnimation("Move", normalizedBeat, 0);
}
private void Hit(PlayerActionEvent caller, float state)
{
game.cannerAnim.DoScaledAnimationAsync("Can", 0.5f);
SoundByte.PlayOneShotGame("cannery/can");
anim.DoScaledAnimationAsync("Canned", 0.5f);
anim.DoScaledAnimationAsync("CanCan", 0.5f, 0, 1);
}
}
}

38
Assets/Scripts/Games/Cannery/Cannery.cs
View file

@ -7,7 +7,7 @@ using UnityEngine;
namespace HeavenStudio.Games.Loaders
{
using static Minigames;
public static class MobCanneryLoader
public static class PcoCanneryLoader
{
public static Minigame AddGame(EventCaller eventCaller)
{
@ -15,7 +15,11 @@ namespace HeavenStudio.Games.Loaders
{
new GameAction("bop", "Bop")
{
function = delegate { Cannery.instance.Bop(eventCaller.currentEntity.beat, eventCaller.currentEntity.length, eventCaller.currentEntity["auto"], eventCaller.currentEntity["toggle"]); },
function = delegate {
if (eventCaller.gameManager.minigameObj.TryGetComponent(out Cannery instance)) {
instance.Bop(eventCaller.currentEntity.beat, eventCaller.currentEntity.length, eventCaller.currentEntity["auto"], eventCaller.currentEntity["toggle"]);
}
},
parameters = new List<Param>()
{
new Param("toggle", true, "Bop", "Toggle if the alarm should bop for the duration of this event."),
@ -26,22 +30,28 @@ namespace HeavenStudio.Games.Loaders
{
preFunction = delegate {
Cannery.CanSFX(eventCaller.currentEntity.beat);
if (GameManager.instance.currentGame == "cannery") {
Cannery.instance.SendCan(eventCaller.currentEntity.beat);
if (eventCaller.gameManager.minigameObj.TryGetComponent(out Cannery instance)) {
instance.SendCan(eventCaller.currentEntity.beat);
}
},
defaultLength = 2,
},
new GameAction("blackout", "Blackout")
{
function = delegate { Cannery.instance.Blackout(); },
function = delegate {
if (eventCaller.gameManager.minigameObj.TryGetComponent(out Cannery instance)) {
instance.Blackout();
}
},
defaultLength = 0.5f,
},
new GameAction("backgroundColor", "Background Color")
{
function = delegate {
var e = eventCaller.currentEntity;
Cannery.instance.BackgroundColorChange(e.beat, e.length, e["startColor"], e["endColor"], e["ease"]);
if (eventCaller.gameManager.minigameObj.TryGetComponent(out Cannery instance)) {
instance.BackgroundColorChange(e.beat, e.length, e["startColor"], e["endColor"], e["ease"]);
}
},
defaultLength = 1f,
resizable = true,
@ -85,7 +95,7 @@ namespace HeavenStudio.Games
public class Cannery : Minigame
{
[Header("Objects")]
[SerializeField] GameObject canGO;
[SerializeField] Can can;
[SerializeField] GameObject blackout;
[SerializeField] Material alarmMat;
[SerializeField] SpriteRenderer bgPlaneSR;
@ -96,8 +106,8 @@ namespace HeavenStudio.Games
public Animator dingAnim;
public Animator cannerAnim;
private ColorEase bgColorEase;
private ColorEase alarmColorEase;
private ColorEase bgColorEase = new(Color.white);
private ColorEase alarmColorEase = new(new Color(0.862f, 0.372f, 0.031f));
private bool alarmBop = true;
@ -106,7 +116,9 @@ namespace HeavenStudio.Games
private void Awake()
{
// instance = this;
canGO.SetActive(false);
can.gameObject.SetActive(false);
// bgColorEase = new(Color.white);
// alarmColorEase = new(new Color(0.86f, 0.37f, 0.03f));
}
private void Update()
@ -181,11 +193,11 @@ namespace HeavenStudio.Games
public void SendCan(double beat)
{
Debug.Log(dingAnim);
// do the ding animation on the beat
BeatAction.New(this, new() { new(beat, delegate { dingAnim.DoScaledAnimationFromBeatAsync("Ding", 0.5f, beat); }) });
BeatAction.New(this, new() { new(beat, delegate { dingAnim.DoScaledAnimationAsync("Ding", 0.5f); }) });
Can newCan = Instantiate(canGO, transform).GetComponent<Can>();
newCan.game = this;
Can newCan = Instantiate(can, transform);
newCan.startBeat = beat;
newCan.gameObject.SetActive(true);
}

8
Assets/Scripts/Games/Minigame.cs
View file

@ -443,12 +443,18 @@ namespace HeavenStudio.Games
this.ease = (Util.EasingFunction.Ease)ease;
this.easeFunc = Util.EasingFunction.GetEasingFunction(this.ease);
}
public ColorEase(Color color) {
startBeat = length = 0;
startColor = endColor = color;
this.ease = Util.EasingFunction.Ease.Instant;
this.easeFunc = Util.EasingFunction.GetEasingFunction(this.ease);
}
}
public Color GetNewColor(ColorEase ce) => GetNewColor(ce.startBeat, ce.length, ce.startColor, ce.endColor, ce.easeFunc);
public Color GetNewColor(double beat, float length, Color start, Color end, Util.EasingFunction.Function func)
{
float normalizedBeat = Mathf.Clamp01(Conductor.instance.GetPositionFromBeat(beat, length));
float normalizedBeat = beat == 0 && length == 0 ? 1 : Mathf.Clamp01(Conductor.instance.GetPositionFromBeat(beat, length));
float newR = func(start.r, end.r, normalizedBeat);
float newG = func(start.g, end.g, normalizedBeat);

22
Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs
View file

@ -57,6 +57,17 @@ namespace HeavenStudio
Debug.LogWarning("Game loader NtrFlickLoader failed!");
}
Debug.Log("Running game loader PcoCanneryLoader");
game = PcoCanneryLoader.AddGame(eventCaller);
if (game != null)
{
eventCaller.minigames.Add(game.name, game);
}
else
{
Debug.LogWarning("Game loader PcoCanneryLoader failed!");
}
Debug.Log("Running game loader CtrCatchLoader");
game = CtrCatchLoader.AddGame(eventCaller);
if (game != null)
@ -343,17 +354,6 @@ namespace HeavenStudio
Debug.LogWarning("Game loader AgbQuizShowLoader failed!");
}
Debug.Log("Running game loader MobCanneryLoader");
game = MobCanneryLoader.AddGame(eventCaller);
if (game != null)
{
eventCaller.minigames.Add(game.name, game);
}
else
{
Debug.LogWarning("Game loader MobRhythmCanneryLoader failed!");
}
Debug.Log("Running game loader NtrPingpongLoader");
game = NtrPingpongLoader.AddGame(eventCaller);
if (game != null)