mirror of
https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git
synced 2024-11-29 13:03:05 +00:00
More anim-code progress
i procrastinated a bit
This commit is contained in:
KrispyDotlessI
parent
8ecce14cfa
commit
1ea5edaef8
7 changed files with 469 additions and 23 deletions
|
|
@ -1167,7 +1167,7 @@ SpriteRenderer:
|
|||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 20
|
||||
m_Sprite: {fileID: 21300000, guid: 587b6b50120b33142ada32f85f1747a7, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 75cba2142c34a5a4eb069770d51814b6, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.5254902}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
|
|
@ -1328,6 +1328,30 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 4161079182365989534}
|
||||
m_Modifications:
|
||||
- target: {fileID: 161048534229830808, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0.755
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 161048534229830808, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -1.399
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 161048534229830808, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.5639419
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 161048534229830808, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0.82581455
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 161048534229830808, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: -111.34231
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 176042315512854799, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 308962927016676861, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 5
|
||||
|
|
@ -1372,30 +1396,126 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 375375241175271521, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: -1.04
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 375375241175271521, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 1.04
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 375375241175271521, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -0.406
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 375375241175271521, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0.915
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 375375241175271521, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 375375241175271521, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 375375241175271521, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 375375241175271521, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 375375241175271521, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1000208939380644342, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0.041999996
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1015188722160415083, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1015188722160415083, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0.406
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1015188722160415083, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0.915
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1015188722160415083, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1015188722160415083, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1015188722160415083, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1015188722160415083, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1015188722160415083, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1015188722160415083, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1240379293656630318, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2486501137883457502, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2782604673486759644, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2782604673486759644, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0.77
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3878859842876720844, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3967833991789106222, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4242949895883883619, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -0.688
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4242949895883883619, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -1.44
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4242949895883883619, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.96238863
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4242949895883883619, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.27167666
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4242949895883883619, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 31.52813
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5319488906539053294, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.666
|
||||
|
|
@ -1408,6 +1528,10 @@ PrefabInstance:
|
|||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6040458626585462611, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7328984060156112397, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
|
|
@ -1428,6 +1552,10 @@ PrefabInstance:
|
|||
propertyPath: m_LocalPosition.x
|
||||
value: -0.166
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8252745207487221176, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -2.2257
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9061429332552348868, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ Transform:
|
|||
m_LocalScale: {x: -1.04, y: 1.04, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 308962927016676861}
|
||||
m_RootOrder: 5
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &769711594857171973
|
||||
SpriteRenderer:
|
||||
|
|
@ -70,7 +70,7 @@ SpriteRenderer:
|
|||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 3
|
||||
m_SortingOrder: 4
|
||||
m_Sprite: {fileID: 6271359101650170431, guid: 07a712fc3a8592248b24d4108837306c, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
|
|
@ -152,7 +152,7 @@ SpriteRenderer:
|
|||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 8
|
||||
m_SortingOrder: 10
|
||||
m_Sprite: {fileID: -611560658681698378, guid: 07a712fc3a8592248b24d4108837306c, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
|
|
@ -164,6 +164,170 @@ SpriteRenderer:
|
|||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &2486501137883457502
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 161048534229830808}
|
||||
- component: {fileID: 5687200238003682152}
|
||||
m_Layer: 0
|
||||
m_Name: cadetHand2
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &161048534229830808
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2486501137883457502}
|
||||
m_LocalRotation: {x: 0, y: 0, z: -0.82581455, w: 0.5639419}
|
||||
m_LocalPosition: {x: 0.755, y: -1.399, z: 0}
|
||||
m_LocalScale: {x: 1.04, y: 1.04, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 308962927016676861}
|
||||
m_RootOrder: 7
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -111.34231}
|
||||
--- !u!212 &5687200238003682152
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2486501137883457502}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
m_DynamicOccludee: 1
|
||||
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: 3
|
||||
m_Sprite: {fileID: 4255857739320035051, guid: 07a712fc3a8592248b24d4108837306c, 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, y: 1}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &3878859842876720844
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4242949895883883619}
|
||||
- component: {fileID: 3017752970385461760}
|
||||
m_Layer: 0
|
||||
m_Name: cadetHand1
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &4242949895883883619
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3878859842876720844}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0.27167666, w: 0.96238863}
|
||||
m_LocalPosition: {x: -0.688, y: -1.44, z: 0}
|
||||
m_LocalScale: {x: 1.04, y: 1.04, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 308962927016676861}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 31.52813}
|
||||
--- !u!212 &3017752970385461760
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3878859842876720844}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
m_DynamicOccludee: 1
|
||||
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: 5
|
||||
m_Sprite: {fileID: -5761476485571466652, guid: 07a712fc3a8592248b24d4108837306c, 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, y: 1}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &3967833991789106222
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -234,7 +398,7 @@ SpriteRenderer:
|
|||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 6
|
||||
m_SortingOrder: 8
|
||||
m_Sprite: {fileID: -7998149598989480986, guid: 07a712fc3a8592248b24d4108837306c, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
|
|
@ -275,7 +439,7 @@ Transform:
|
|||
m_LocalScale: {x: 1.04, y: 1.04, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 308962927016676861}
|
||||
m_RootOrder: 6
|
||||
m_RootOrder: 8
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &6040458626585462611
|
||||
SpriteRenderer:
|
||||
|
|
@ -357,7 +521,7 @@ Transform:
|
|||
m_LocalScale: {x: 1.04, y: 1.04, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 308962927016676861}
|
||||
m_RootOrder: 7
|
||||
m_RootOrder: 9
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &4464208391638844824
|
||||
SpriteRenderer:
|
||||
|
|
@ -443,7 +607,9 @@ Transform:
|
|||
- {fileID: 1000208939380644342}
|
||||
- {fileID: 8252745207487221176}
|
||||
- {fileID: 7343212495396614607}
|
||||
- {fileID: 4242949895883883619}
|
||||
- {fileID: 375375241175271521}
|
||||
- {fileID: 161048534229830808}
|
||||
- {fileID: 1015188722160415083}
|
||||
- {fileID: 6829737740816145249}
|
||||
m_Father: {fileID: 0}
|
||||
|
|
@ -538,7 +704,7 @@ SpriteRenderer:
|
|||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 5
|
||||
m_SortingOrder: 7
|
||||
m_Sprite: {fileID: 1876675414622521761, guid: 07a712fc3a8592248b24d4108837306c, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
|
|
@ -620,7 +786,7 @@ SpriteRenderer:
|
|||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 7
|
||||
m_SortingOrder: 9
|
||||
m_Sprite: {fileID: 9063607464200046497, guid: 07a712fc3a8592248b24d4108837306c, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
|
|
@ -702,7 +868,7 @@ SpriteRenderer:
|
|||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 4
|
||||
m_SortingOrder: 6
|
||||
m_Sprite: {fileID: 1876675414622521761, guid: 07a712fc3a8592248b24d4108837306c, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
|
|
|
|||
|
|
@ -0,0 +1,53 @@
|
|||
%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: MarchL
|
||||
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: []
|
||||
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: []
|
||||
pptrCurveMapping: []
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
m_AdditiveReferencePoseTime: 0
|
||||
m_StartTime: 0
|
||||
m_StopTime: 1
|
||||
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: []
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3ce0703882ac1af46b561501a6b07533
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 7400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
%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: MarchR
|
||||
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: []
|
||||
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: []
|
||||
pptrCurveMapping: []
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
m_AdditiveReferencePoseTime: 0
|
||||
m_StartTime: 0
|
||||
m_StopTime: 1
|
||||
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: []
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a899d5f088118664d854c689e48fb690
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 7400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -32,12 +32,12 @@ namespace HeavenStudio.Games.Loaders
|
|||
|
||||
|
||||
//the cues do nothing at the moment, so i temporarily disabled them
|
||||
new GameAction("bop", delegate { MarchingOrders.instance.Bop(eventCaller.currentEntity.beat); }, 1f, false),
|
||||
new GameAction("bop", delegate { var e = eventCaller.currentEntity; MarchingOrders.instance.Bop(e.beat, e.length); }, 1f, true),
|
||||
//new GameAction("marching", delegate { MarchingOrders.instance.CadetsMarch(eventCaller.currentEntity.beat); }, 4f, true),
|
||||
|
||||
new GameAction("attention", delegate { MarchingOrders.instance.SargeAttention(eventCaller.currentEntity.beat); }, 2.25f, false),
|
||||
new GameAction("march", delegate { MarchingOrders.instance.SargeMarch(eventCaller.currentEntity.beat); }, 2.0f, false),
|
||||
new GameAction("halt", delegate {}, 2f, false),
|
||||
new GameAction("attention", delegate { var e = eventCaller.currentEntity; MarchingOrders.instance.SargeAttention(e.beat); }, 2.25f, false),
|
||||
new GameAction("march", delegate { var e = eventCaller.currentEntity; MarchingOrders.instance.SargeMarch(e.beat); }, 2.0f, false),
|
||||
new GameAction("halt", delegate { var e = eventCaller.currentEntity; MarchingOrders.instance.SargeHalt(e.beat); }, 2f, false),
|
||||
//new GameAction("face turn", delegate {}, 4f, false, parameters: new List<Param>()
|
||||
//{
|
||||
// new Param("type", MarchingOrders.DirectionFaceTurn.Right, "Direction", "The direction sarge wants the cadets to face"),
|
||||
|
|
@ -53,6 +53,7 @@ namespace HeavenStudio.Games
|
|||
//using Scripts_MarchingOrders;
|
||||
public class MarchingOrders : Minigame
|
||||
{
|
||||
//code is just copied from other minigame code, i will polish them later
|
||||
[Header("References")]
|
||||
public Animator Sarge;
|
||||
public Animator Cadet1;
|
||||
|
|
@ -60,6 +61,11 @@ namespace HeavenStudio.Games
|
|||
public Animator Cadet3;
|
||||
public Animator CadetPlayer;
|
||||
public GameObject Player;
|
||||
|
||||
|
||||
public GameEvent bop = new GameEvent();
|
||||
public GameEvent noBop = new GameEvent();
|
||||
|
||||
public static MarchingOrders instance;
|
||||
|
||||
public enum DirectionFaceTurn
|
||||
|
|
@ -82,6 +88,19 @@ namespace HeavenStudio.Games
|
|||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
var cond = Conductor.instance;
|
||||
if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1))
|
||||
{
|
||||
if (cond.songPositionInBeats >= bop.startBeat && cond.songPositionInBeats < bop.startBeat + bop.length)
|
||||
{
|
||||
if (!(cond.songPositionInBeats >= noBop.startBeat && cond.songPositionInBeats < noBop.startBeat + noBop.length))
|
||||
Cadet1.Play("Bop", -1, 0);
|
||||
Cadet2.Play("Bop", -1, 0);
|
||||
Cadet3.Play("Bop", -1, 0);
|
||||
CadetPlayer.Play("Bop", -1, 0);
|
||||
}
|
||||
}
|
||||
|
||||
if (PlayerInput.Pressed() && !IsExpectingInputNow())
|
||||
{
|
||||
Jukebox.PlayOneShotGame("miss");
|
||||
|
|
@ -89,15 +108,10 @@ namespace HeavenStudio.Games
|
|||
}
|
||||
}
|
||||
|
||||
public void Bop(float beat)
|
||||
public void Bop(float beat, float length)
|
||||
{
|
||||
BeatAction.New(Player, new List<BeatAction.Action>()
|
||||
{
|
||||
new BeatAction.Action(beat, delegate { Cadet1.Play("Bop", -1, 0);}),
|
||||
new BeatAction.Action(beat, delegate { Cadet2.Play("Bop", -1, 0);}),
|
||||
new BeatAction.Action(beat, delegate { Cadet3.Play("Bop", -1, 0);}),
|
||||
new BeatAction.Action(beat, delegate { CadetPlayer.Play("Bop", -1, 0);}),
|
||||
});
|
||||
bop.length = length;
|
||||
bop.startBeat = beat;
|
||||
}
|
||||
|
||||
public void CadetsMarch(float beat)
|
||||
|
|
@ -129,9 +143,25 @@ namespace HeavenStudio.Games
|
|||
BeatAction.New(Player, new List<BeatAction.Action>()
|
||||
{
|
||||
new BeatAction.Action(beat, delegate { Sarge.Play("Talk", -1, 0);}),
|
||||
});
|
||||
new BeatAction.Action(beat + 1f, delegate { Cadet1.Play("MarchL", -1, 0);}),
|
||||
new BeatAction.Action(beat + 1f, delegate { Cadet2.Play("MarchL", -1, 0);}),
|
||||
new BeatAction.Action(beat + 1f, delegate { Cadet3.Play("MarchL", -1, 0);}),
|
||||
new BeatAction.Action(beat + 1f, delegate { CadetPlayer.Play("MarchL", -1, 0);}),
|
||||
});
|
||||
}
|
||||
|
||||
public void SargeHalt(float beat)
|
||||
{
|
||||
MultiSound.Play(new MultiSound.Sound[] {
|
||||
new MultiSound.Sound("marchingOrders/halt1", beat),
|
||||
new MultiSound.Sound("marchingOrders/halt2", beat + 1f),
|
||||
});
|
||||
|
||||
BeatAction.New(Player, new List<BeatAction.Action>()
|
||||
{
|
||||
new BeatAction.Action(beat, delegate { Sarge.Play("Talk", -1, 0);}),
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue