Commit 43f7dd41 authored by Michael But's avatar Michael But

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

parents 2253a11c 01439d27
......@@ -12,17 +12,17 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 353b156b7c59b1c45a8767d7500b31fb, type: 3}
m_Name: PlayerState
m_EditorClassIdentifier:
currentInfusedElement: 0
currentInfusedElement: 2
currentMoveState:
jumpForce: 15
jumpForce: 10
smoothing: 0.03
airControl: 1
canSwim: 1
moveSpeed: 30
moveSpeed: 20
maxJumpCount: 1
mass: 1
gravity: 3
movementStates: {fileID: 11400000, guid: c757aad6925b37a46b916f609fa9012b, type: 2}
onElementInfused: {fileID: 11400000, guid: 7e5b80a8353af1846a878c3a997bdb4a, type: 2}
onChargeChange: {fileID: 11400000, guid: 6ec6544f645a9d1458383b111fcaf8b6, type: 2}
charges: 0
charges: 1
......@@ -143,3 +143,4 @@ MonoBehaviour:
m_EditorClassIdentifier:
destroyTime: 3
pushFactor: 5
pushEnemyFactor: 1000
......@@ -48,7 +48,7 @@ Rigidbody2D:
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 10000
m_Mass: 1
m_LinearDrag: 5
m_AngularDrag: 0.05
m_GravityScale: 5
......
......@@ -15,6 +15,7 @@ GameObject:
- component: {fileID: 5627041003248903908}
- component: {fileID: 8217090596470256212}
- component: {fileID: 820980056}
- component: {fileID: 4551173074651665413}
m_Layer: 14
m_Name: Feuer-Gegner
m_TagString: Fire
......@@ -49,7 +50,7 @@ Rigidbody2D:
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 10000
m_Mass: 1
m_LinearDrag: 5
m_AngularDrag: 0.05
m_GravityScale: 3
......@@ -177,6 +178,24 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &4551173074651665413
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1634356314439590}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3c0ce2eb523274b6fa61fccbf0227d85, type: 3}
m_Name:
m_EditorClassIdentifier:
m_MaxLife: 1
LostLife:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &8738143122139646636
GameObject:
m_ObjectHideFlags: 0
......
......@@ -50,7 +50,7 @@ Rigidbody2D:
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 10
m_Mass: 1
m_LinearDrag: 5
m_AngularDrag: 0.05
m_GravityScale: 5
......
......@@ -51,7 +51,7 @@ Rigidbody2D:
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 3
m_Mass: 1
m_LinearDrag: 5
m_AngularDrag: 0.05
m_GravityScale: 0
......
......@@ -392,85 +392,6 @@ MonoBehaviour:
m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
delegates: []
--- !u!1 &435587858
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 435587859}
- component: {fileID: 435587861}
- component: {fileID: 435587860}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &435587859
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 435587858}
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_Children: []
m_Father: {fileID: 2129753214}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &435587861
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 435587858}
m_CullTransparentMesh: 0
--- !u!114 &435587860
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 435587858}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 50
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 5
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Abbrechen
--- !u!1 &1230622042
GameObject:
m_ObjectHideFlags: 0
......@@ -488,7 +409,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &1230622045
Transform:
m_ObjectHideFlags: 0
......@@ -515,7 +436,7 @@ MonoBehaviour:
m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 2897530309677776406}
m_FirstSelected: {fileID: 2129753213}
m_sendNavigationEvents: 1
m_DragThreshold: 10
--- !u!114 &1230622043
......@@ -803,7 +724,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 1.2299701}
m_LocalScale: {x: 0.31197917, y: 0.31197917, z: 0.31197917}
m_Children:
- {fileID: 435587859}
- {fileID: 4954122756753591933}
m_Father: {fileID: 6614416692707838556}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -840,7 +761,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Sprite: {fileID: 21300000, guid: cd1946bc0fdd66645a912069e377da89, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -867,7 +788,7 @@ MonoBehaviour:
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Transition: 2
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.78676474, g: 0.32396194, b: 0.6399446, a: 1}
......@@ -876,7 +797,8 @@ MonoBehaviour:
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_HighlightedSprite: {fileID: 21300000, guid: bae7cfbe8b4184342a9a58387f73bb3d,
type: 3}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
......@@ -1213,6 +1135,167 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &1458974227407463829
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4954122756753591933}
- component: {fileID: 6854844666043282523}
- component: {fileID: 9033768019544114198}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4954122756753591933
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1458974227407463829}
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_Children: []
m_Father: {fileID: 2129753214}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6854844666043282523
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1458974227407463829}
m_CullTransparentMesh: 0
--- !u!114 &9033768019544114198
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1458974227407463829}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: Abbrechen
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 14c656a7951b64b469033bb82afe030d, type: 2}
m_sharedMaterial: {fileID: 21801174772623732, guid: 14c656a7951b64b469033bb82afe030d,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281336842
m_fontColor: {r: 0.039215688, g: 0.015686275, b: 0.1882353, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 68
m_fontSizeBase: 68
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_textAlignment: 514
m_isAlignmentEnumConverted: 1
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_firstOverflowCharacterIndex: -1
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_isTextTruncated: 0
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_ignoreRectMaskCulling: 0
m_ignoreCulling: 1
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 9033768019544114198}
characterCount: 9
spriteCount: 0
spaceCount: 0
wordCount: 1
linkCount: 0
lineCount: 1
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 1
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_spriteAnimator: {fileID: 0}
m_isInputParsingRequired: 1
m_inputSource: 0
m_hasFontAssetChanged: 0
m_subTextObjects:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &1940387952919605712
GameObject:
m_ObjectHideFlags: 0
......@@ -1483,7 +1566,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -224.22711, y: 93.781555}
m_AnchoredPosition: {x: -214, y: 41}
m_SizeDelta: {x: 450, y: 350}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2273326149877633599
......@@ -2070,7 +2153,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -66.1, y: 93.781555}
m_AnchoredPosition: {x: -47, y: 42}
m_SizeDelta: {x: 450, y: 350}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8231279422017153594
......@@ -2751,6 +2834,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
Auswahl: {fileID: 7323265529484604271}
_myEventSystem: {fileID: 1230622044}
firstSelect: {fileID: 2129753215}
--- !u!1 &7972291748159151546
GameObject:
......
......@@ -612,6 +612,17 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 2362585431789937767}
m_MethodName: Resume
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &2362585431233343509
......@@ -908,6 +919,17 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 2362585431789937767}
m_MethodName: Resume
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &2362585432235520306
......@@ -1261,7 +1283,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.11764706}
m_Color: {r: 1, g: 1, b: 1, a: 0.19607843}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
......
......@@ -4139,7 +4139,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 2, y: 2}
m_Size: {x: 5, y: 4}
m_EdgeRadius: 0
--- !u!50 &209653169
Rigidbody2D:
......@@ -10799,15 +10799,20 @@ PrefabInstance:
propertyPath: m_TagString
value: Interactive
objectReference: {fileID: 0}
- target: {fileID: 6240296448730384320, guid: a0c6081106659114387502f3e4d51362,
type: 3}
propertyPath: m_Layer
value: 15
objectReference: {fileID: 0}
- target: {fileID: 7732554449417407852, guid: a0c6081106659114387502f3e4d51362,
type: 3}
propertyPath: m_LocalPosition.x
value: 141.3
value: 141.22
objectReference: {fileID: 0}
- target: {fileID: 7732554449417407852, guid: a0c6081106659114387502f3e4d51362,
type: 3}
propertyPath: m_LocalPosition.y
value: 92.59
value: 92.72
objectReference: {fileID: 0}
- target: {fileID: 7732554449417407852, guid: a0c6081106659114387502f3e4d51362,
type: 3}
......@@ -10869,6 +10874,26 @@ PrefabInstance:
propertyPath: force
value: 10
objectReference: {fileID: 0}
- target: {fileID: 6184296985288555399, guid: a0c6081106659114387502f3e4d51362,
type: 3}
propertyPath: m_Layer
value: 15
objectReference: {fileID: 0}
- target: {fileID: 3590286897431027205, guid: a0c6081106659114387502f3e4d51362,
type: 3}
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3590286897431027205, guid: a0c6081106659114387502f3e4d51362,
type: 3}
propertyPath: m_Size.x
value: 6
objectReference: {fileID: 0}
- target: {fileID: 3590286897431027205, guid: a0c6081106659114387502f3e4d51362,
type: 3}
propertyPath: m_Size.y
value: 6
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a0c6081106659114387502f3e4d51362, type: 3}
--- !u!4 &554033098 stripped
......@@ -15471,7 +15496,7 @@ Camera:
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 24375
m_Bits: 57143
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
......@@ -29915,7 +29940,7 @@ PrefabInstance:
- target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_GroundedOffset.y
value: -0.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
......@@ -31290,6 +31315,11 @@ PrefabInstance:
propertyPath: m_TagString
value: Interactive
objectReference: {fileID: 0}
- target: {fileID: 6240296448730384320, guid: a0c6081106659114387502f3e4d51362,
type: 3}
propertyPath: m_Layer
value: 15
objectReference: {fileID: 0}
- target: {fileID: 7732554449417407852, guid: a0c6081106659114387502f3e4d51362,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -37613,6 +37643,11 @@ PrefabInstance:
propertyPath: m_TagString
value: Interactive
objectReference: {fileID: 0}
- target: {fileID: 6240296448730384320, guid: a0c6081106659114387502f3e4d51362,
type: 3}
propertyPath: m_Layer
value: 15
objectReference: {fileID: 0}
- target: {fileID: 7732554449417407852, guid: a0c6081106659114387502f3e4d51362,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -459,7 +459,7 @@ RectTransform:
m_Children:
- {fileID: 1485114214}
m_Father: {fileID: 1834203559}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
......@@ -720,7 +720,7 @@ RectTransform:
m_Children:
- {fileID: 96811154}
m_Father: {fileID: 1834203559}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
......@@ -1123,7 +1123,7 @@ RectTransform:
m_LocalScale: {x: 0.74343, y: 0.74343, z: 0.74343}
m_Children: []
m_Father: {fileID: 1834203559}
m_RootOrder: 2
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
......@@ -1194,9 +1194,9 @@ Transform:
m_LocalPosition: {x: -0.9439087, y: 1.3949738, z: -13.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1692724906}
- {fileID: 153273653}
- {fileID: 711920175}
- {fileID: 1692724906}
m_Father: {fileID: 67646353}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -675,3 +675,22 @@ MonoBehaviour:
m_CallState: 2
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!95 &2142836839
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2142836837}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 375b65aa2cf684af6978a76db238f875, type: 2}
m_CullingMode: 0