Rendering Fixes and Other Adjustments (#384)

* fix game view alpha issues

* fix right-clicking on parameter-less entity locking event selection

* reduce ram use of rendertextures

* fix missing sprite references

fix cheer readers sprite masks not working

* fix lockstep rendering discrepancy

* fix section medal toggle not matching described behaviour in UI

* fix game settings masking issue

* dj school "Scratchy Music" toggle on by default

* import new sheets for fan club, mahou tsukai

* make dj school audio FX persist between game change

* make one shot sounds not create extra objects when not needed

* fix potential issue with new one shots

* make string properties apply changes for every keystroke
This commit is contained in:
minenice55 2023-04-03 00:17:55 -04:00 committed by GitHub
parent be78d1567e
commit 3984c8353f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 1913 additions and 173 deletions

View file

@ -103,7 +103,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5822623106182197534}
m_RootOrder: 27
m_RootOrder: 28
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &4375666065977025420
Camera:
@ -148,6 +148,90 @@ Camera:
m_OcclusionCulling: 0
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!1 &1062481741219987324
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 668724129055865293}
- component: {fileID: 2221099543016921213}
m_Layer: 11
m_Name: R3
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &668724129055865293
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1062481741219987324}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -6.375, y: -3.48, z: 0}
m_LocalScale: {x: 1.1, y: 1.1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5822623106182197534}
m_RootOrder: 20
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &2221099543016921213
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1062481741219987324}
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: 2100000, guid: 471c4a2ed0684d24d9abb5c5aeffc0c4, type: 2}
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: -6366962435105001689, guid: 927be5fac4a997244b6201c857fd91a5, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 100, y: 5.5}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &1116127266977386569
GameObject:
m_ObjectHideFlags: 0
@ -335,7 +419,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5822623106182197534}
m_RootOrder: 22
m_RootOrder: 23
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &4532798257539804896
SpriteRenderer:
@ -418,7 +502,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5822623106182197534}
m_RootOrder: 26
m_RootOrder: 27
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2248617818051995982
GameObject:
@ -515,7 +599,7 @@ GameObject:
- component: {fileID: 3934319583520123542}
- component: {fileID: 8050626680266531175}
- component: {fileID: 3631086194869090727}
m_Layer: 11
m_Layer: 15
m_Name: OverPlayer
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -557,7 +641,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 471c4a2ed0684d24d9abb5c5aeffc0c4, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -808,7 +892,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5822623106182197534}
m_RootOrder: 25
m_RootOrder: 26
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1533188956834819093
SpriteRenderer:
@ -938,6 +1022,7 @@ MonoBehaviour:
- {fileID: 4209238681665287308}
- {fileID: 8099115411269024535}
- {fileID: 1030508991832533071}
- {fileID: 2221099543016921213}
- {fileID: 6592758210475429824}
- {fileID: 3605157125876727930}
- {fileID: 8945482826445941702}
@ -1341,7 +1426,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 471c4a2ed0684d24d9abb5c5aeffc0c4, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -1592,7 +1677,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5822623106182197534}
m_RootOrder: 21
m_RootOrder: 22
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &3605157125876727930
SpriteRenderer:
@ -1699,7 +1784,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 471c4a2ed0684d24d9abb5c5aeffc0c4, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -1782,7 +1867,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5822623106182197534}
m_RootOrder: 28
m_RootOrder: 29
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &5999766133995784627
Camera:
@ -2056,7 +2141,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5822623106182197534}
m_RootOrder: 23
m_RootOrder: 24
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &3262450115413950937
SpriteRenderer:
@ -2496,7 +2581,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5822623106182197534}
m_RootOrder: 24
m_RootOrder: 25
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &8945482826445941702
SpriteRenderer:
@ -2664,7 +2749,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5822623106182197534}
m_RootOrder: 29
m_RootOrder: 30
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &1430771648366705456
Camera:
@ -2926,6 +3011,7 @@ Transform:
- {fileID: 4281713574544881382}
- {fileID: 6032092358538231119}
- {fileID: 285201578801513332}
- {fileID: 668724129055865293}
- {fileID: 8960539057473647192}
- {fileID: 1697154566264949540}
- {fileID: 3402850656474589604}
@ -3053,7 +3139,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5822623106182197534}
m_RootOrder: 20
m_RootOrder: 21
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &6592758210475429824
SpriteRenderer:

View file

@ -27,6 +27,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 3.71, y: -3.373, z: 0}
m_LocalScale: {x: 2.082, y: 2.082, z: 2.09291}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1558448215581441312}
m_RootOrder: 2
@ -42,6 +43,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -109,6 +111,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -2.325, z: 0}
m_LocalScale: {x: 1.04, y: 1.04, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 708937727427539446}
m_RootOrder: 2
@ -124,6 +127,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -191,6 +195,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -6.659, y: -3.2057, z: 0}
m_LocalScale: {x: 2.082, y: 2.082, z: 2.09291}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1558448215581441312}
m_RootOrder: 1
@ -206,6 +211,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -273,6 +279,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.02, y: -0.513, z: 0}
m_LocalScale: {x: -1.04, y: 1.04, z: 1.0439054}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 708937727427539446}
m_RootOrder: 0
@ -288,6 +295,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -355,6 +363,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6576414245721136236}
- {fileID: 984938186019639657}
@ -372,6 +381,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -421,7 +431,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1558448215581441312}
- component: {fileID: 4986707985294744365}
m_Layer: 0
m_Name: BG
m_TagString: Untagged
@ -439,6 +448,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7150405460527854978}
- {fileID: 1361520185717226678}
@ -448,57 +458,6 @@ Transform:
m_Father: {fileID: 4161079182365989534}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &4986707985294744365
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4721136555746708586}
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: 0
m_Sprite: {fileID: 7482667652216324306, guid: 394eab447e3d92140be461519b267611, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0}
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 &4826819211563721063
GameObject:
m_ObjectHideFlags: 0
@ -526,6 +485,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -6.12, y: 0, z: 0}
m_LocalScale: {x: 2.082, y: 2.082, z: 2.09291}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 757229637864904103}
m_RootOrder: 0
@ -541,6 +501,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -608,6 +569,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4516561034748738355}
- {fileID: 4676267018483621227}
@ -625,6 +587,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -692,6 +655,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 4.8700004, y: 1.29, z: 0}
m_LocalScale: {x: 2.082, y: 2.082, z: 2.09291}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 26205533931196358}
m_RootOrder: 1
@ -707,6 +671,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -775,6 +740,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -6.66, y: -1.13, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6128300493106227402}
- {fileID: 7162401519775036327}
@ -793,6 +759,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -830,12 +797,12 @@ SpriteRenderer:
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_WasSpriteAssigned: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!95 &2588778952987738506
Animator:
serializedVersion: 3
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -848,10 +815,12 @@ Animator:
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &6782522466276628430
GameObject:
m_ObjectHideFlags: 0
@ -879,6 +848,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 6.37, y: 0, z: 0}
m_LocalScale: {x: 2.082, y: 2.082, z: 2.09291}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 757229637864904103}
m_RootOrder: 1
@ -894,6 +864,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -961,6 +932,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 17.777779, y: 10, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1558448215581441312}
m_RootOrder: 0
@ -976,6 +948,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -1005,7 +978,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -50
m_Sprite: {fileID: 7482667652216324306, guid: 394eab447e3d92140be461519b267611, type: 3}
m_Sprite: {fileID: 7482667652216324306, guid: ef2fa2a75dc283e40b9d4fe1f20dc6fb, type: 3}
m_Color: {r: 0.2627451, g: 0.36078432, b: 0.39215687, a: 1}
m_FlipX: 0
m_FlipY: 0
@ -1044,6 +1017,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -6.649, y: 2.213, z: 0}
m_LocalScale: {x: 1.04, y: 1.04, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4161079182365989534}
m_RootOrder: 2
@ -1059,6 +1033,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -1101,7 +1076,7 @@ SpriteRenderer:
m_SpriteSortPoint: 0
--- !u!95 &6480067077458975222
Animator:
serializedVersion: 3
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -1114,10 +1089,12 @@ Animator:
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &7465949559389362926
GameObject:
m_ObjectHideFlags: 0
@ -1145,6 +1122,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.083, y: 1.421, z: 0}
m_LocalScale: {x: -1.04, y: 1.04, z: 1.0439054}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 708937727427539446}
m_RootOrder: 1
@ -1160,6 +1138,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -1227,6 +1206,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1558448215581441312}
- {fileID: 708937727427539446}
@ -1368,6 +1348,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -4.539, y: 1.29, z: 0}
m_LocalScale: {x: 2.082, y: 2.082, z: 2.09291}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 26205533931196358}
m_RootOrder: 0
@ -1383,6 +1364,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -1796,16 +1778,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
--- !u!4 &1638447572751535848 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 308962927016676861, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
m_PrefabInstance: {fileID: 1366076435959956245}
m_PrefabAsset: {fileID: 0}
--- !u!95 &416600750635270691 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 1674590754458698038, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
m_PrefabInstance: {fileID: 1366076435959956245}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1638447572751535848 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 308962927016676861, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
m_PrefabInstance: {fileID: 1366076435959956245}
m_PrefabAsset: {fileID: 0}
--- !u!95 &6030929238039482332 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 4703848696091020489, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
@ -1872,16 +1854,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
--- !u!4 &1822172518577804911 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 308962927016676861, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
m_PrefabInstance: {fileID: 2089670662784752530}
m_PrefabAsset: {fileID: 0}
--- !u!95 &737841632799169188 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 1674590754458698038, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
m_PrefabInstance: {fileID: 2089670662784752530}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1822172518577804911 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 308962927016676861, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
m_PrefabInstance: {fileID: 2089670662784752530}
m_PrefabAsset: {fileID: 0}
--- !u!95 &6649403303197644635 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 4703848696091020489, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}

View file

@ -28,6 +28,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.86462736, y: -30.122763, z: 326.05524}
m_LocalScale: {x: 141.85547, y: 47.383713, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1897369786098534687}
m_RootOrder: 0
@ -43,6 +44,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -122,6 +124,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.16, y: -0.83, z: 143.10336}
m_LocalScale: {x: 0.38, y: 0.38, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7842623188933788604}
m_RootOrder: 2
@ -137,6 +140,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -203,6 +207,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.5865827, y: 0.100856654, z: -10.001053}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8106055227459882777}
- {fileID: 6343048051081085708}
@ -238,6 +243,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.16, y: -0.83, z: 143.10336}
m_LocalScale: {x: 0.38, y: 0.38, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8259004929389243547}
m_RootOrder: 2
@ -253,6 +259,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -320,6 +327,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.16, y: -0.83, z: 143.10336}
m_LocalScale: {x: 0.38, y: 0.38, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3960404442465330201}
m_RootOrder: 2
@ -335,6 +343,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -401,6 +410,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 4.503, y: 0.93235195, z: -9.178155}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8679065474153490714}
- {fileID: 3164402338688351745}
@ -436,6 +446,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 3.92, y: 0.91, z: 10.001053}
m_LocalScale: {x: 0.4, y: 0.4, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8867049551599227347}
m_Father: {fileID: 5646040752524136664}
@ -452,6 +463,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -519,6 +531,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -5.1, y: 0.91, z: 10.001053}
m_LocalScale: {x: 0.4, y: 0.4, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7124135669493761450}
m_Father: {fileID: 5646040752524136664}
@ -535,6 +548,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -602,6 +616,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.11, y: 64.72, z: 143.10336}
m_LocalScale: {x: 0.4, y: 0.4, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8259004929389243547}
m_RootOrder: 0
@ -617,6 +632,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -684,6 +700,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2.2522, y: 0, z: 0}
m_LocalScale: {x: 400, y: 400, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 781267280139074967}
m_RootOrder: 0
@ -699,6 +716,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -766,6 +784,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -4.1638274, y: -6.4448404, z: 320.86728}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2266375707430807129}
- {fileID: 2364188660994577360}
@ -813,6 +832,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.11, y: 64.72, z: 143.10336}
m_LocalScale: {x: 0.4, y: 0.4, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 509176496249949167}
m_RootOrder: 0
@ -828,6 +848,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -894,6 +915,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -9.01, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7299751633417405353}
- {fileID: 105147413890102603}
@ -929,6 +951,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -41.583168, y: -12.286962, z: 326.05524}
m_LocalScale: {x: 56.724, y: 15.3429785, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1897369786098534687}
m_RootOrder: 2
@ -944,6 +967,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -1023,6 +1047,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.135, y: 31.4057, z: 143.10336}
m_LocalScale: {x: 0.379, y: 0.379, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 509176496249949167}
m_RootOrder: 1
@ -1038,6 +1063,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -1105,6 +1131,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.91, y: 0.91, z: 10.001053}
m_LocalScale: {x: 0.4, y: 0.4, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 887696229785984937}
m_Father: {fileID: 5646040752524136664}
@ -1121,6 +1148,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -1188,6 +1216,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6343048051081085708}
m_RootOrder: 0
@ -1203,6 +1232,7 @@ SpriteMask:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -1270,6 +1300,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 5.2229, y: 64.5392, z: 20.09578}
m_LocalScale: {x: 142.18599, y: 120.65881, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6499369440861734875}
m_RootOrder: 0
@ -1285,6 +1316,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -1364,6 +1396,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.11, y: 64.72, z: 143.10336}
m_LocalScale: {x: 0.4, y: 0.4, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3960404442465330201}
m_RootOrder: 0
@ -1379,6 +1412,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -1446,6 +1480,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.11, y: 64.72, z: 143.10336}
m_LocalScale: {x: 0.4, y: 0.4, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7842623188933788604}
m_RootOrder: 0
@ -1461,6 +1496,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -1527,6 +1563,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6302125329956331579}
- {fileID: 6528312903474099066}
@ -1561,6 +1598,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.16, y: -0.83, z: 143.10336}
m_LocalScale: {x: 0.38, y: 0.38, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 509176496249949167}
m_RootOrder: 2
@ -1576,6 +1614,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -1643,6 +1682,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 48530212580946997}
m_RootOrder: 0
@ -1658,6 +1698,7 @@ SpriteMask:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -1724,6 +1765,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.135, y: 31.4057, z: 143.10336}
m_LocalScale: {x: 0.379, y: 0.379, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8259004929389243547}
m_RootOrder: 1
@ -1739,6 +1781,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -1805,6 +1848,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.3638709, y: 1.6623516, z: -143.10336}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 509176496249949167}
- {fileID: 3960404442465330201}
@ -1840,6 +1884,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8106055227459882777}
m_RootOrder: 0
@ -1855,6 +1900,7 @@ SpriteMask:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -1921,6 +1967,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2.02, y: 0.2, z: 20.095783}
m_LocalScale: {x: 500, y: 500, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6499369440861734875}
m_RootOrder: 1
@ -1936,6 +1983,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -2002,6 +2050,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -6.01, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2858186507511515158}
- {fileID: 2599027865143194461}
@ -2036,6 +2085,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9157871296346160953}
m_RootOrder: 0
@ -2051,6 +2101,7 @@ SpriteMask:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -2116,6 +2167,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 396561036207805484}
- {fileID: 6877143038616850174}
@ -2150,6 +2202,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.135, y: 31.4057, z: 143.10336}
m_LocalScale: {x: 0.379, y: 0.379, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3960404442465330201}
m_RootOrder: 1
@ -2165,6 +2218,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -2233,6 +2287,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -6.866803, y: -6.546962, z: 326.05524}
m_LocalScale: {x: 0.6, y: 0.6, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1897369786098534687}
m_RootOrder: 1
@ -2248,6 +2303,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -2327,6 +2383,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -2.11, y: 0.91, z: 10.001053}
m_LocalScale: {x: 0.4, y: 0.4, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2736962449129303923}
m_Father: {fileID: 5646040752524136664}
@ -2343,6 +2400,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -2409,6 +2467,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -2.873769, y: -1.2993346, z: -20.09578}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7300017601209462654}
- {fileID: 3215541483237215647}
@ -2441,6 +2500,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.596803, y: 3.477627, z: -326.0552}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7762572243762772068}
- {fileID: 7255343223301782611}
@ -2477,6 +2537,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3812992600370832856}
- {fileID: 6499369440861734875}
@ -2520,7 +2581,7 @@ MonoBehaviour:
darkness: {fileID: 6333964518265533667}
--- !u!95 &1464443001728871423
Animator:
serializedVersion: 3
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -2533,10 +2594,12 @@ Animator:
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &9099388898269379416
GameObject:
m_ObjectHideFlags: 0
@ -2564,6 +2627,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.135, y: 31.4057, z: 143.10336}
m_LocalScale: {x: 0.379, y: 0.379, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7842623188933788604}
m_RootOrder: 1
@ -2579,6 +2643,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -3250,11 +3315,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7bb6590d80f4d624987932f439222903, type: 3}
--- !u!4 &5911378620854522815 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8222931150450068117, guid: 7bb6590d80f4d624987932f439222903, type: 3}
m_PrefabInstance: {fileID: 2311709837228857642}
m_PrefabAsset: {fileID: 0}
--- !u!114 &4835831880042317218 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7136099434120862856, guid: 7bb6590d80f4d624987932f439222903, type: 3}
@ -3266,6 +3326,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ddfec1a1860bd5a4486d8690d6b59396, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &5911378620854522815 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8222931150450068117, guid: 7bb6590d80f4d624987932f439222903, type: 3}
m_PrefabInstance: {fileID: 2311709837228857642}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &2941717666903817529
PrefabInstance:
m_ObjectHideFlags: 0
@ -3614,6 +3679,11 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7bb6590d80f4d624987932f439222903, type: 3}
--- !u!4 &3164402338688351745 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8222931150450068117, guid: 7bb6590d80f4d624987932f439222903, type: 3}
m_PrefabInstance: {fileID: 6482807939298833556}
m_PrefabAsset: {fileID: 0}
--- !u!114 &4251129601446570012 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7136099434120862856, guid: 7bb6590d80f4d624987932f439222903, type: 3}
@ -3625,11 +3695,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ddfec1a1860bd5a4486d8690d6b59396, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &3164402338688351745 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8222931150450068117, guid: 7bb6590d80f4d624987932f439222903, type: 3}
m_PrefabInstance: {fileID: 6482807939298833556}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7974833086625679325
PrefabInstance:
m_ObjectHideFlags: 0
@ -3715,11 +3780,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 351a7cb06f3d9504aac946406ac67406, type: 3}
--- !u!4 &9073063413360122139 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1388713331832348358, guid: 351a7cb06f3d9504aac946406ac67406, type: 3}
m_PrefabInstance: {fileID: 7974833086625679325}
m_PrefabAsset: {fileID: 0}
--- !u!114 &2231021787619408423 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8095891093602516474, guid: 351a7cb06f3d9504aac946406ac67406, type: 3}
@ -3731,3 +3791,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 12e2c9b60bfc1804aa8402261a998149, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &9073063413360122139 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1388713331832348358, guid: 351a7cb06f3d9504aac946406ac67406, type: 3}
m_PrefabInstance: {fileID: 7974833086625679325}
m_PrefabAsset: {fileID: 0}

View file

@ -453,7 +453,7 @@ Camera:
field of view: 53.15
orthographic: 1
orthographic size: 5
m_Depth: 2
m_Depth: 100
m_CullingMask:
serializedVersion: 2
m_Bits: 72
@ -614,7 +614,7 @@ GameObject:
- component: {fileID: 9126116407185073410}
- component: {fileID: 9182755598382872870}
- component: {fileID: 3596148951806340129}
- component: {fileID: 4765703529618674964}
- component: {fileID: 2408100308142214852}
m_Layer: 31
m_Name: LetterboxMask
m_TagString: Untagged
@ -671,7 +671,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 7482667652216324306, guid: ef2fa2a75dc283e40b9d4fe1f20dc6fb, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -681,7 +681,7 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &4765703529618674964
--- !u!114 &2408100308142214852
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -690,11 +690,10 @@ MonoBehaviour:
m_GameObject: {fileID: 7252983913051326197}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3}
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding: {x: 0, y: 0, z: 0, w: 0}
m_Softness: {x: 0, y: 0}
m_ShowMaskGraphic: 1
--- !u!1 &8244570575520829750
GameObject:
m_ObjectHideFlags: 0

View file

@ -13,12 +13,12 @@ RenderTexture:
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 3
serializedVersion: 5
m_Width: 1280
m_Height: 720
m_AntiAliasing: 1
m_MipCount: -1
m_DepthFormat: 2
m_DepthStencilFormat: 0
m_ColorFormat: 8
m_MipMap: 0
m_GenerateMips: 1
@ -36,3 +36,4 @@ RenderTexture:
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
m_ShadowSamplingMode: 2

View file

@ -18,7 +18,7 @@ RenderTexture:
m_Height: 1259
m_AntiAliasing: 2
m_MipCount: -1
m_DepthStencilFormat: 91
m_DepthStencilFormat: 92
m_ColorFormat: 8
m_MipMap: 0
m_GenerateMips: 1

View file

@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: GameTexMaterial
m_Shader: {fileID: 10721, guid: 0000000000000000f000000000000000, type: 0}
m_Shader: {fileID: 4800000, guid: 0ae724cf80d801b43b140517e4bbb12f, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
@ -62,6 +62,9 @@ Material:
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _Alpha: 1
- _BlendDst: 1
- _BlendSrc: 1
- _BumpScale: 1
- _ColorMask: 15
- _Cutoff: 0.5
@ -89,4 +92,6 @@ Material:
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Tint1: {r: 1, g: 1, b: 1, a: 0}
- _Tint2: {r: 1, g: 1, b: 1, a: 0}
m_BuildTextureStacks: []

Binary file not shown.

After

Width:  |  Height:  |  Size: 917 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.3 MiB

View file

@ -296,12 +296,12 @@ TextureImporter:
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
spriteMeshType: 0
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 300
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
spriteGenerateFallbackPhysicsShape: 0
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1

Binary file not shown.

Before

Width:  |  Height:  |  Size: 469 KiB

After

Width:  |  Height:  |  Size: 386 KiB

View file

@ -13,12 +13,12 @@ RenderTexture:
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 3
m_Width: 1280
m_Height: 1280
serializedVersion: 5
m_Width: 1000
m_Height: 1000
m_AntiAliasing: 1
m_MipCount: -1
m_DepthFormat: 0
m_DepthStencilFormat: 0
m_ColorFormat: 8
m_MipMap: 0
m_GenerateMips: 1
@ -28,7 +28,7 @@ RenderTexture:
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_FilterMode: 2
m_Aniso: 0
m_MipBias: 0
m_WrapU: 1
@ -36,3 +36,4 @@ RenderTexture:
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
m_ShadowSamplingMode: 2

View file

@ -511,6 +511,7 @@ namespace HeavenStudio
Destroy(SoundObjects[i].gameObject);
SoundObjects.Clear();
Util.Jukebox.KillOneShots();
}
#endregion

View file

@ -56,7 +56,7 @@ namespace HeavenStudio.Games.Loaders
},
new GameAction("dj voice lines", "DJ Yellow Banter")
{
function = delegate { DJSchool.instance.voiceLines(eventCaller.currentEntity.beat, eventCaller.currentEntity["type"]); },
function = delegate { DJSchool.instance.VoiceLines(eventCaller.currentEntity.beat, eventCaller.currentEntity["type"]); },
defaultLength = 2f,
inactiveFunction = delegate { DJSchool.WarnDJVoiceLines(eventCaller.currentEntity.beat, eventCaller.currentEntity["type"]); },
parameters = new List<Param>()
@ -66,11 +66,11 @@ namespace HeavenStudio.Games.Loaders
},
new GameAction("sound FX", "Scratchy Music")
{
function = delegate { DJSchool.instance.soundFX(eventCaller.currentEntity["toggle"]); },
function = delegate { DJSchool.SoundFX(eventCaller.currentEntity["toggle"]); },
defaultLength = 0.5f,
parameters = new List<Param>()
{
new Param("toggle", false, "Radio FX", "Toggle on and off for Radio Effects")
new Param("toggle", true, "Radio FX", "Toggle on and off for Radio Effects")
}
},
new GameAction("forceHold", "Force Hold")
@ -156,7 +156,7 @@ namespace HeavenStudio.Games
}
else if(wantDJVoiceLines != Single.MinValue)
{
voiceLines(wantDJVoiceLines, 0);
VoiceLines(wantDJVoiceLines, 0);
wantDJVoiceLines = Single.MinValue;
}
}
@ -549,11 +549,11 @@ namespace HeavenStudio.Games
// student.ResetState();
//}
public void soundFX(bool toggle)
public static void SoundFX(bool toggle)
{
student.soundFX = toggle;
Student.soundFX = toggle;
}
public void voiceLines(float beat, int type)
public void VoiceLines(float beat, int type)
{
string[] sounds;
var sound = new MultiSound.Sound[] { };

View file

@ -12,6 +12,7 @@ namespace HeavenStudio.Games.Scripts_DJSchool
public class Student : PlayerActionObject
{
public Animator anim;
public static bool soundFX;
[Header("Properties")]
public float holdBeat;
@ -21,7 +22,6 @@ namespace HeavenStudio.Games.Scripts_DJSchool
public bool eligible;
public bool missed;
public bool swiping;
public bool soundFX;
bool canBoo = true;
[Header("Components")]

View file

@ -104,6 +104,10 @@ namespace HeavenStudio.Editor
active = true;
}
else
{
active = false;
}
}
private void AddParam(string propertyName, object type, string caption, string tooltip = "")

View file

@ -28,7 +28,7 @@ namespace HeavenStudio.Editor
_ =>
Editor.instance.editingInputField = true
);
inputFieldString.onEndEdit.AddListener(
inputFieldString.onValueChanged.AddListener(
_ =>
{;
parameterManager.entity[propertyName] = inputFieldString.text;

View file

@ -28,7 +28,7 @@ namespace HeavenStudio.Editor
_ =>
Editor.instance.editingInputField = true
);
inputFieldString.onEndEdit.AddListener(
inputFieldString.onValueChanged.AddListener(
_ =>
{;
parameterManager.chart[propertyName] = inputFieldString.text;

View file

@ -51,7 +51,7 @@ namespace HeavenStudio.Common
public void OnSectionChange(DynamicBeatmap.ChartSection section)
{
if (section == null) return;
Debug.Log(PersistentDataManager.gameSettings.isMedalOn);
if (!PersistentDataManager.gameSettings.isMedalOn) return;
if (PersistentDataManager.gameSettings.isMedalOn && !isMedalsStarted)
{
isMedalsStarted = true;
@ -67,6 +67,7 @@ namespace HeavenStudio.Common
public void OnRemixEnd()
{
if (!PersistentDataManager.gameSettings.isMedalOn) return;
if (PersistentDataManager.gameSettings.isMedalOn && isMedalsStarted)
{
GameObject medal = Instantiate(isMedalsEligible ? MedalOkPrefab : MedalMissPrefab, MedalsHolder.transform);

View file

@ -7,6 +7,9 @@ namespace HeavenStudio.Util
{
public class Jukebox
{
static GameObject oneShotAudioSourceObject;
static AudioSource oneShotAudioSource;
public enum AudioType
{
OGG,
@ -23,6 +26,14 @@ namespace HeavenStudio.Util
GameObject Jukebox = new GameObject("Jukebox");
Jukebox.AddComponent<AudioSource>();
Jukebox.tag = "Jukebox";
}
if (oneShotAudioSourceObject == null)
{
oneShotAudioSourceObject = new GameObject("OneShot Audio Source");
oneShotAudioSource = oneShotAudioSourceObject.AddComponent<AudioSource>();
UnityEngine.Object.DontDestroyOnLoad(oneShotAudioSourceObject);
}
}
@ -40,15 +51,16 @@ namespace HeavenStudio.Util
FindJukebox().GetComponent<AudioSource>().volume = volume;
}
public static void KillOneShots()
{
if (oneShotAudioSource != null)
{
oneShotAudioSource.Stop();
}
}
public static Sound PlayOneShot(string name, float beat = -1, float pitch = 1f, float volume = 1f, bool looping = false, string game = null)
{
GameObject oneShot = new GameObject("oneShot");
AudioSource audioSource = oneShot.AddComponent<AudioSource>();
//audioSource.outputAudioMixerGroup = Settings.GetSFXMixer();
audioSource.playOnAwake = false;
Sound snd = oneShot.AddComponent<Sound>();
AudioClip clip = null;
if (game != null)
{
@ -72,16 +84,39 @@ namespace HeavenStudio.Util
clip = Resources.Load<AudioClip>($"Sfx/{name}");
}
snd.clip = clip;
snd.beat = beat;
snd.pitch = pitch;
snd.volume = volume;
snd.looping = looping;
// snd.pitch = (clip.length / Conductor.instance.secPerBeat);
if (looping || beat != -1 || pitch != 1f)
{
GameObject oneShot = new GameObject("oneShot");
GameManager.instance.SoundObjects.Add(oneShot);
AudioSource audioSource = oneShot.AddComponent<AudioSource>();
//audioSource.outputAudioMixerGroup = Settings.GetSFXMixer();
audioSource.playOnAwake = false;
return snd;
Sound snd = oneShot.AddComponent<Sound>();
snd.clip = clip;
snd.beat = beat;
snd.pitch = pitch;
snd.volume = volume;
snd.looping = looping;
// snd.pitch = (clip.length / Conductor.instance.secPerBeat);
GameManager.instance.SoundObjects.Add(oneShot);
return snd;
}
else
{
if (oneShotAudioSourceObject == null)
{
oneShotAudioSourceObject = new GameObject("OneShot Audio Source");
oneShotAudioSource = oneShotAudioSourceObject.AddComponent<AudioSource>();
UnityEngine.Object.DontDestroyOnLoad(oneShotAudioSourceObject);
}
oneShotAudioSource.PlayOneShot(clip, volume);
return null;
}
}
public static Sound PlayOneShotScheduled(string name, double targetTime, float pitch = 1f, float volume = 1f, bool looping = false, string game = null)

View file

@ -1,5 +1,5 @@
ManifestFileVersion: 0
CRC: 3784306723
CRC: 4155798416
AssetBundleManifest:
AssetBundleInfos:
Info_0:

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 3928469644
CRC: 2696947868
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 144370751551b2ea261e8003716088ad
Hash: 71227d2dea00e50f13fabe3452feedb0
TypeTreeHash:
serializedVersion: 2
Hash: 66d7bc0128dfa9bd2a6d8ac797c3d10f

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 3021707106
CRC: 1164448568
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 3aa0646695d683b93bdee5580c806613
Hash: 4a6c0ecd333ce5354d27cff0b9bd39b4
TypeTreeHash:
serializedVersion: 2
Hash: a69a432361ad996e59b7d2fb60b810e3
@ -121,6 +121,7 @@ Assets:
- Assets/Resources/Sprites/Games/FanClub/fanClub_IdolParts.png
- Assets/Resources/Sprites/Games/FanClub/Animations/Arisa/Long/IdolBigCall1.anim
- Assets/Resources/Sprites/Games/FanClub/Animations/Arisa/Long/IdolDab.anim
- Assets/Resources/Sprites/Games/FanClub/fanClub_AmieParts.png
- Assets/Resources/Sprites/Games/FanClub/Animations/Arisa/Arrange/IdolBigCall0Arrange.anim
- Assets/Resources/Sfx/games/fanClub/play_clap.wav
- Assets/Resources/Sprites/Games/FanClub/Animations/Arisa/Long/IdolPeace.anim

View file

@ -15,13 +15,13 @@ TagManager:
- EventBlocks
- EventProperties
- RenderTextures
- 3DDefault
- 3DAlt
- GameCamera0
- GameCamera1
- Flash
- Textboxes
- StudioDanceRender
-
-
- GameCamera2
- GameCamera3
-
-
-