Commit f848dbc4 authored by DESKTOP-753A1KM\Robin's avatar DESKTOP-753A1KM\Robin
Browse files

Merge branch 'master' of...

Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/orchestra-defense

# Conflicts:
#	Assets/_Game/Scenes/Level1.unity
parents 045f3247 06473306
......@@ -22,7 +22,7 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &1101275729925905688
--- !u!1101 &1101730668626328352
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
......@@ -31,10 +31,10 @@ AnimatorStateTransition:
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 0}
m_DstState: {fileID: 1102136810395311416}
m_Solo: 0
m_Mute: 0
m_IsExit: 1
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
......@@ -70,6 +70,32 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102136810395311416
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: dead
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 5356d392e5a377d4784dfae169637b3e, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102381893199856782
AnimatorState:
serializedVersion: 5
......@@ -81,7 +107,7 @@ AnimatorState:
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101275729925905688}
- {fileID: 1101730668626328352}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
......@@ -213,6 +239,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 1102381893199856782}
m_Position: {x: 348, y: 48, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102136810395311416}
m_Position: {x: 336, y: 216, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
......
%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: dead
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:
- curve:
- time: 0
value: {fileID: 21300008, guid: 6e625eeaafef607428e4aeae3364574f, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 1
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 21300008, guid: 6e625eeaafef607428e4aeae3364574f, type: 3}
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: []
fileFormatVersion: 2
guid: 5356d392e5a377d4784dfae169637b3e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
......@@ -27,6 +27,7 @@ Transform:
m_LocalPosition: {x: 0, y: 0.7, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4059605671211526038}
- {fileID: 1876277152}
- {fileID: 1632742893}
- {fileID: 1918173735}
......@@ -68,7 +69,7 @@ Transform:
m_LocalScale: {x: 5, y: 5, z: 1}
m_Children: []
m_Father: {fileID: 546501086}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
--- !u!212 &666632742
SpriteRenderer:
......@@ -147,7 +148,7 @@ Transform:
m_LocalScale: {x: 5, y: 5, z: 1}
m_Children: []
m_Father: {fileID: 546501086}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
--- !u!212 &1123904376
SpriteRenderer:
......@@ -226,7 +227,7 @@ Transform:
m_LocalScale: {x: 5, y: 5, z: 1}
m_Children: []
m_Father: {fileID: 546501086}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
--- !u!212 &1215981705
SpriteRenderer:
......@@ -305,7 +306,7 @@ Transform:
m_LocalScale: {x: 5, y: 5, z: 1}
m_Children: []
m_Father: {fileID: 546501086}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
--- !u!212 &1343390204
SpriteRenderer:
......@@ -384,7 +385,7 @@ Transform:
m_LocalScale: {x: 5, y: 5, z: 1}
m_Children: []
m_Father: {fileID: 546501086}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
--- !u!212 &1536015851
SpriteRenderer:
......@@ -463,7 +464,7 @@ Transform:
m_LocalScale: {x: 5, y: 5, z: 1}
m_Children: []
m_Father: {fileID: 546501086}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
--- !u!212 &1632742894
SpriteRenderer:
......@@ -542,7 +543,7 @@ Transform:
m_LocalScale: {x: 5, y: 5, z: 1}
m_Children: []
m_Father: {fileID: 546501086}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
--- !u!212 &1876277153
SpriteRenderer:
......@@ -621,7 +622,7 @@ Transform:
m_LocalScale: {x: 5, y: 5, z: 1}
m_Children: []
m_Father: {fileID: 546501086}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
--- !u!212 &1918173736
SpriteRenderer:
......@@ -700,7 +701,7 @@ Transform:
m_LocalScale: {x: 5, y: 5, z: 1}
m_Children: []
m_Father: {fileID: 546501086}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
--- !u!212 &2000788338
SpriteRenderer:
......@@ -750,3 +751,82 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &6685758965582847288
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4059605671211526038}
- component: {fileID: 8132197544640108202}
m_Layer: 0
m_Name: Wegpunkt (9)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4059605671211526038
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6685758965582847288}
m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: 0.5, y: -10.5, z: 0}
m_LocalScale: {x: 5, y: 5, z: 1}
m_Children: []
m_Father: {fileID: 546501086}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
--- !u!212 &8132197544640108202
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6685758965582847288}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
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_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
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: 10915, guid: 0000000000000000f000000000000000, type: 0}
m_Color: {r: 1, g: 0, b: 0.7671118, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.2, y: 0.2}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
......@@ -27,6 +27,7 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: -1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6669526932625606387}
- {fileID: 4752280251298453997}
- {fileID: 4752280250501541308}
- {fileID: 4752280250647476803}
......@@ -90,7 +91,7 @@ PrefabInstance:
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_RootOrder
value: 9
value: 10
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
......@@ -165,7 +166,7 @@ PrefabInstance:
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_RootOrder
value: 4
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
......@@ -240,7 +241,7 @@ PrefabInstance:
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_RootOrder
value: 8
value: 9
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
......@@ -315,7 +316,7 @@ PrefabInstance:
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_RootOrder
value: 5
value: 6
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
......@@ -390,7 +391,7 @@ PrefabInstance:
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_RootOrder
value: 2
value: 3
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
......@@ -465,7 +466,7 @@ PrefabInstance:
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_RootOrder
value: 6
value: 7
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
......@@ -540,7 +541,7 @@ PrefabInstance:
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_RootOrder
value: 1
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
......@@ -615,7 +616,7 @@ PrefabInstance:
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_RootOrder
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
......@@ -690,7 +691,7 @@ PrefabInstance:
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_RootOrder
value: 7
value: 8
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
......@@ -765,7 +766,7 @@ PrefabInstance:
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_RootOrder
value: 3
value: 4
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
......@@ -790,3 +791,78 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 2488433828315489830}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4608633485555451592
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 2488433826472836037}
m_Modifications:
- target: {fileID: 7385391646690426135, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_Name
value: Wegpunkt (10)
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_LocalPosition.x
value: -5.5
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_LocalPosition.y
value: -9.5
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_LocalRotation.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 180
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 70cb1fbee3c9e7e479bd589c6e901543, type: 3}
--- !u!4 &6669526932625606387 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
m_PrefabInstance: {fileID: 4608633485555451592}
m_PrefabAsset: {fileID: 0}
......@@ -27,6 +27,7 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: -2}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 85495811999707916}
- {fileID: 6410111948615236561}
- {fileID: 6410111946950669854}
- {fileID: 6410111949032540723}
......@@ -91,7 +92,7 @@ PrefabInstance:
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_RootOrder
value: 3
value: 4
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
......@@ -166,7 +167,7 @@ PrefabInstance:
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_RootOrder
value: 5
value: 6
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
......@@ -241,7 +242,7 @@ PrefabInstance:
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_RootOrder
value: 10
value: 11
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
......@@ -316,7 +317,7 @@ PrefabInstance:
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_RootOrder
value: 7
value: 8
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
......@@ -391,7 +392,7 @@ PrefabInstance:
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_RootOrder
value: 6
value: 7
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
......@@ -466,7 +467,7 @@ PrefabInstance:
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_RootOrder
value: 2
value: 3
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
......@@ -541,7 +542,7 @@ PrefabInstance:
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_RootOrder
value: 9
value: 10
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
......@@ -616,7 +617,7 @@ PrefabInstance:
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_RootOrder
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
......@@ -691,7 +692,7 @@ PrefabInstance:
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_RootOrder
value: 4
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
......@@ -766,7 +767,7 @@ PrefabInstance:
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_RootOrder
value: 1
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
......@@ -841,7 +842,7 @@ PrefabInstance:
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
propertyPath: m_RootOrder
value: 8
value: 9
objectReference: {fileID: 0}
- target: {fileID: 7168548444297756731, guid: 70cb1fbee3c9e7e479bd589c6e901543,
type: 3}
......@@ -866,3 +867,78 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 4291514893522558409}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7085412533217702711
PrefabInstance: