This commit is contained in:
OliverS 2024-04-21 10:53:52 +02:00
commit 16bbb47471
7 changed files with 789 additions and 957 deletions

View File

@ -29,7 +29,17 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 7245704655224527388}
- {fileID: 5605165050639995407}
- {fileID: 6802839870593563897}
- {fileID: 4466439333973485225}
- {fileID: 3258605224198378748}
- {fileID: 6103523252845735297}
- {fileID: 3442000647806576757}
- {fileID: 4587143579862508518}
- {fileID: 3830008328112291491}
- {fileID: 7724817902332944249}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4274405463174037481
@ -45,4 +55,324 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
WaypointRadiusTolerence: 0.01
Waypoints: []
Waypoints:
- {fileID: 7245704655224527388}
- {fileID: 5605165050639995407}
- {fileID: 6802839870593563897}
- {fileID: 4466439333973485225}
- {fileID: 3258605224198378748}
- {fileID: 6103523252845735297}
- {fileID: 3442000647806576757}
- {fileID: 4587143579862508518}
- {fileID: 3830008328112291491}
- {fileID: 7724817902332944249}
--- !u!1 &2268749426516078211
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6103523252845735297}
m_Layer: 0
m_Name: Waypoint (5)
m_TagString: Untagged
m_Icon: {fileID: 1206586993520771344, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6103523252845735297
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2268749426516078211}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1, y: 7.25, z: -0.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3065217788553285465}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2631744247312081611
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5605165050639995407}
m_Layer: 0
m_Name: Waypoint (1)
m_TagString: Untagged
m_Icon: {fileID: 1206586993520771344, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5605165050639995407
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2631744247312081611}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -3.375, y: 0.5, z: -1.125}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3065217788553285465}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5335044460312728223
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6802839870593563897}
m_Layer: 0
m_Name: Waypoint (2)
m_TagString: Untagged
m_Icon: {fileID: 1206586993520771344, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6802839870593563897
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5335044460312728223}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -3.375, y: 2.875, z: -1.125}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3065217788553285465}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5690493490326020338
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7245704655224527388}
m_Layer: 0
m_Name: Waypoint
m_TagString: Untagged
m_Icon: {fileID: 1206586993520771344, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7245704655224527388
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5690493490326020338}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -7.625, y: 0.5, z: -1.125}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3065217788553285465}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6157467933559483783
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3830008328112291491}
m_Layer: 0
m_Name: Waypoint (8)
m_TagString: Untagged
m_Icon: {fileID: 1206586993520771344, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3830008328112291491
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6157467933559483783}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 4.375, y: 0.6875, z: -0.125}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3065217788553285465}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6648052233762796004
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7724817902332944249}
m_Layer: 0
m_Name: Waypoint (9)
m_TagString: Untagged
m_Icon: {fileID: 1206586993520771344, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7724817902332944249
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6648052233762796004}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 7.75, y: 0.5625, z: -0.125}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3065217788553285465}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6937515022564444010
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4466439333973485225}
m_Layer: 0
m_Name: Waypoint (3)
m_TagString: Untagged
m_Icon: {fileID: 1206586993520771344, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4466439333973485225
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6937515022564444010}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1, y: 2.875, z: 1.375}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3065217788553285465}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8177749473435960016
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3258605224198378748}
m_Layer: 0
m_Name: Waypoint (4)
m_TagString: Untagged
m_Icon: {fileID: 1206586993520771344, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3258605224198378748
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8177749473435960016}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1, y: 5.875, z: -3}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3065217788553285465}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8600863331339361685
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4587143579862508518}
m_Layer: 0
m_Name: Waypoint (7)
m_TagString: Untagged
m_Icon: {fileID: 1206586993520771344, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4587143579862508518
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8600863331339361685}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 3.5, y: 4, z: -1.625}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3065217788553285465}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8675755487638305121
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3442000647806576757}
m_Layer: 0
m_Name: Waypoint (6)
m_TagString: Untagged
m_Icon: {fileID: 1206586993520771344, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3442000647806576757
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8675755487638305121}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -2, y: 7.25, z: -0.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3065217788553285465}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@ -616,6 +616,7 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7134937801519496076}
- {fileID: 1264509985005215626}
- {fileID: 4189792432299129876}
- {fileID: 7094050956717546836}
@ -873,9 +874,9 @@ RectTransform:
- {fileID: 6925912160577396843}
m_Father: {fileID: 1571444269651810830}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 97.85, y: -475.8032}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1590834972027237251
@ -1644,9 +1645,9 @@ RectTransform:
- {fileID: 8740154629202535075}
m_Father: {fileID: 1571444269651810830}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 97.85, y: -105}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4030747125337201116
@ -1998,6 +1999,125 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &3636042489164766214
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7134937801519496076}
- component: {fileID: 6841324586320787202}
- component: {fileID: 2318978185183132365}
- component: {fileID: 3260134957589381690}
m_Layer: 0
m_Name: white-circle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7134937801519496076
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3636042489164766214}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 175, y: 175, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3367038424042638127}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &6841324586320787202
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3636042489164766214}
m_Enabled: 0
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: -767687967
m_SortingLayer: 1
m_SortingOrder: 10
m_Sprite: {fileID: 21300000, guid: 018869dee58a46448a71dde3b39911b4, type: 3}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 19.2, y: 19.2}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!95 &2318978185183132365
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3636042489164766214}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 752ab9ab7721d6246ad7f9161769a07c, 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!114 &3260134957589381690
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3636042489164766214}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 616e7cd8100c1104692b3e809a4bafa7, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &3682788892521122381
GameObject:
m_ObjectHideFlags: 0
@ -3364,7 +3484,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 360, y: 0}
m_AnchoredPosition: {x: 359.99994, y: 0}
m_SizeDelta: {x: 720, y: 1100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8199987074529867173
@ -3489,9 +3609,9 @@ RectTransform:
- {fileID: 2761822326100020935}
m_Father: {fileID: 1571444269651810830}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 97.85, y: -846.6064}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8651936493222350935
@ -4518,9 +4638,9 @@ RectTransform:
- {fileID: 3463979208659812338}
m_Father: {fileID: 1571444269651810830}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 97.85, y: -290.4016}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1595412627603319622
@ -5235,9 +5355,9 @@ RectTransform:
- {fileID: 1879052238577856330}
m_Father: {fileID: 1571444269651810830}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 97.85, y: -661.2048}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2364807694092123912
@ -5522,7 +5642,7 @@ PrefabInstance:
- target: {fileID: 2241899669629734285, guid: fff998a9abaaf2f43a388f7a721aa1c2,
type: 3}
propertyPath: m_hasFontAssetChanged
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4125502744177332373, guid: fff998a9abaaf2f43a388f7a721aa1c2,
type: 3}
@ -5549,7 +5669,7 @@ PrefabInstance:
- target: {fileID: 4125502744177332373, guid: fff998a9abaaf2f43a388f7a721aa1c2,
type: 3}
propertyPath: m_hasFontAssetChanged
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7027000765413775412, guid: fff998a9abaaf2f43a388f7a721aa1c2,
type: 3}

File diff suppressed because it is too large Load Diff

View File

@ -2,7 +2,6 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Unity.VisualScripting;
using UnityEngine;
public class AudioManager : MonoBehaviour
@ -11,28 +10,23 @@ public class AudioManager : MonoBehaviour
public AudioLibraryObject audioLibrary;
private void OnEnable()
private void Awake()
{
if (Instance is null)
if (Instance != null)
{
Instance = this;
Destroy(this);
// TODO: manager itself should not handle this
// DontDestroyOnLoad(this);
return;
}
else
{
Destroy(Instance);
Instance = this;
}
}
private void OnDisable()
{
Instance = null;
}
public static AudioClip FindAudioClip(string nameOfClip)
{
Debug.Log(nameOfClip);
Debug.Log(Instance);
Debug.Log(Instance.audioLibrary);
return Instance.audioLibrary.Clips.First(x => x.name == nameOfClip);
}

View File

@ -30,8 +30,13 @@ public class GameManager : MonoBehaviour
private void Awake()
{
if (Instance != this)
Destroy(Instance);
if (Instance != null)
{
Destroy(gameObject);
return;
}
Instance = this;
health = startHealth;
}

View File

@ -16,6 +16,12 @@ public class MusicManager : MonoBehaviour
void Awake()
{
if (Instance != null)
{
Destroy(this);
return;
}
Instance = this;
sources = new AudioSource[intensities.Length];
}

View File

@ -2,9 +2,13 @@ using UnityEngine;
public class StartSceneTransition : MonoBehaviour
{
Animator animator;
void Start()
{
SpriteRenderer sp = GetComponent<SpriteRenderer>();
sp.enabled = false;
animator = GetComponent<Animator>();
animator.SetTrigger("start1");
}