Compare commits

..

No commits in common. "bedea8c0997740cd50de0452330e395e5cf8848b" and "7781d68924a068af90fca1c0bba0261d53d7c509" have entirely different histories.

5 changed files with 149 additions and 940 deletions

View File

@ -124,11 +124,6 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 8239960702235718114, guid: 67f4f13276986cc4cb4705a4f1c4808a, type: 3} m_CorrespondingSourceObject: {fileID: 8239960702235718114, guid: 67f4f13276986cc4cb4705a4f1c4808a, type: 3}
m_PrefabInstance: {fileID: 5778659820767749594} m_PrefabInstance: {fileID: 5778659820767749594}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!50 &164601440 stripped
Rigidbody2D:
m_CorrespondingSourceObject: {fileID: 1203434784585445923, guid: d00d92ab204198c489965b31a298b234, type: 3}
m_PrefabInstance: {fileID: 2316236105731553357}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &202393221 --- !u!1001 &202393221
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -592,81 +587,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1 m_WasSpriteAssigned: 1
m_MaskInteraction: 0 m_MaskInteraction: 0
m_SpriteSortPoint: 0 m_SpriteSortPoint: 0
--- !u!1 &757145543
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 757145544}
- component: {fileID: 757145546}
- component: {fileID: 757145545}
m_Layer: 5
m_Name: Border
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &757145544
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 757145543}
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: 1970785967}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -0.000015258789, y: 0}
m_SizeDelta: {x: 15, y: 0}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &757145545
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 757145543}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &757145546
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 757145543}
m_CullTransparentMesh: 1
--- !u!1 &815539230 stripped --- !u!1 &815539230 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 935186437773880931, guid: 67f4f13276986cc4cb4705a4f1c4808a, type: 3} m_CorrespondingSourceObject: {fileID: 935186437773880931, guid: 67f4f13276986cc4cb4705a4f1c4808a, type: 3}
@ -855,86 +775,6 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1200173921
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1200173922}
- component: {fileID: 1200173924}
- component: {fileID: 1200173923}
m_Layer: 5
m_Name: Border
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1200173922
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1200173921}
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: 1970785967}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 369, y: 0}
m_SizeDelta: {x: 5, y: 0}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &1200173923
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1200173921}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1200173924
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1200173921}
m_CullTransparentMesh: 1
--- !u!224 &1223463192 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1569907743588288592, guid: 67f4f13276986cc4cb4705a4f1c4808a, type: 3}
m_PrefabInstance: {fileID: 5778659820767749594}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1262976100 --- !u!1 &1262976100
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -15526,85 +15366,6 @@ ParticleSystem:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
vectorLabel1_3: W vectorLabel1_3: W
--- !u!1 &1302188853
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1302188856}
- component: {fileID: 1302188855}
- component: {fileID: 1302188854}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1302188854
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1302188853}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
m_Name:
m_EditorClassIdentifier:
m_SendPointerHoverToParent: 1
m_MoveRepeatDelay: 0.5
m_MoveRepeatRate: 0.1
m_XRTrackingOrigin: {fileID: 0}
m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
m_DeselectOnBackgroundClick: 1
m_PointerBehavior: 0
m_CursorLockBehavior: 0
m_ScrollDeltaPerTick: 6
--- !u!114 &1302188855
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1302188853}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
m_sendNavigationEvents: 1
m_DragThreshold: 10
--- !u!4 &1302188856
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1302188853}
serializedVersion: 2
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: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1323442186 --- !u!1 &1323442186
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -15746,81 +15507,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1787569555844345674, guid: d00d92ab204198c489965b31a298b234, type: 3} m_CorrespondingSourceObject: {fileID: 1787569555844345674, guid: d00d92ab204198c489965b31a298b234, type: 3}
m_PrefabInstance: {fileID: 2316236105731553357} m_PrefabInstance: {fileID: 2316236105731553357}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &1480927095
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1480927096}
- component: {fileID: 1480927098}
- component: {fileID: 1480927097}
m_Layer: 5
m_Name: Border
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1480927096
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1480927095}
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: 1970785967}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 184.5, y: 0}
m_SizeDelta: {x: 369, y: 5}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &1480927097
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1480927095}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1480927098
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1480927095}
m_CullTransparentMesh: 1
--- !u!1001 &1507780130 --- !u!1001 &1507780130
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -71091,11 +70777,6 @@ Tilemap:
e31: 0 e31: 0
e32: 0 e32: 0
e33: 1 e33: 1
--- !u!224 &1631026202 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6623046322102314554, guid: 67f4f13276986cc4cb4705a4f1c4808a, type: 3}
m_PrefabInstance: {fileID: 5778659820767749594}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1681818444 --- !u!1 &1681818444
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -71127,7 +70808,6 @@ Transform:
m_Children: m_Children:
- {fileID: 519420032} - {fileID: 519420032}
- {fileID: 308205147} - {fileID: 308205147}
- {fileID: 1223463192}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1731397399 stripped --- !u!1 &1731397399 stripped
@ -71135,134 +70815,6 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 8668308405175649564, guid: 67f4f13276986cc4cb4705a4f1c4808a, type: 3} m_CorrespondingSourceObject: {fileID: 8668308405175649564, guid: 67f4f13276986cc4cb4705a4f1c4808a, type: 3}
m_PrefabInstance: {fileID: 5778659820767749594} m_PrefabInstance: {fileID: 5778659820767749594}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &1940124274
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1940124275}
- component: {fileID: 1940124276}
m_Layer: 0
m_Name: StaminaBar
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1940124275
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1940124274}
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: 2109719712}
- {fileID: 1970785967}
m_Father: {fileID: 1631026202}
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: -713.01825, y: -504.86374}
m_SizeDelta: {x: 383.6456, y: 30.9142}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1940124276
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1940124274}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 0
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 0
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 0
m_TargetGraphic: {fileID: 0}
m_FillRect: {fileID: 2109719712}
m_HandleRect: {fileID: 0}
m_Direction: 0
m_MinValue: 0
m_MaxValue: 1
m_WholeNumbers: 0
m_Value: 0.623
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
--- !u!1 &1970785966
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1970785967}
m_Layer: 5
m_Name: Border
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1970785967
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1970785966}
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: 1480927096}
- {fileID: 2070038358}
- {fileID: 1200173922}
- {fileID: 757145544}
m_Father: {fileID: 1940124275}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.000015258789, y: 0}
m_SizeDelta: {x: -369, y: 0}
m_Pivot: {x: 0, y: 0.5}
--- !u!1 &1990193558 --- !u!1 &1990193558
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -71393,81 +70945,6 @@ AudioSource:
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
--- !u!1 &2070038357
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2070038358}
- component: {fileID: 2070038360}
- component: {fileID: 2070038359}
m_Layer: 5
m_Name: Border
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2070038358
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2070038357}
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: 1970785967}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 184.5, y: 0}
m_SizeDelta: {x: 369, y: 5}
m_Pivot: {x: 0.5, y: 0}
--- !u!114 &2070038359
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2070038357}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &2070038360
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2070038357}
m_CullTransparentMesh: 1
--- !u!1001 &2078146384 --- !u!1001 &2078146384
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -71525,81 +71002,6 @@ PrefabInstance:
m_AddedGameObjects: [] m_AddedGameObjects: []
m_AddedComponents: [] m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6447e7f877b893f46bc4efe1ebc9fe9e, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 6447e7f877b893f46bc4efe1ebc9fe9e, type: 3}
--- !u!1 &2109719711
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2109719712}
- component: {fileID: 2109719714}
- component: {fileID: 2109719713}
m_Layer: 5
m_Name: Fill
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2109719712
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2109719711}
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: 1940124275}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2109719713
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2109719711}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0.85961366, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &2109719714
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2109719711}
m_CullTransparentMesh: 1
--- !u!1001 &2316236105731553357 --- !u!1001 &2316236105731553357
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -71612,30 +71014,14 @@ PrefabInstance:
propertyPath: JumpDelay propertyPath: JumpDelay
value: 0.3 value: 0.3
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1680573792925415762, guid: d00d92ab204198c489965b31a298b234, type: 3}
propertyPath: Rigidbody
value:
objectReference: {fileID: 164601440}
- target: {fileID: 1680573792925415762, guid: d00d92ab204198c489965b31a298b234, type: 3} - target: {fileID: 1680573792925415762, guid: d00d92ab204198c489965b31a298b234, type: 3}
propertyPath: VfxShockwave propertyPath: VfxShockwave
value: value:
objectReference: {fileID: 8992219285309707884, guid: 1f334a9f024858d44b8a3ff8bd31dc97, type: 3} objectReference: {fileID: 8992219285309707884, guid: 1f334a9f024858d44b8a3ff8bd31dc97, type: 3}
- target: {fileID: 1680573792925415762, guid: d00d92ab204198c489965b31a298b234, type: 3}
propertyPath: DashDecayRate
value: 30
objectReference: {fileID: 0}
- target: {fileID: 1680573792925415762, guid: d00d92ab204198c489965b31a298b234, type: 3}
propertyPath: DashMultiplier
value: 10
objectReference: {fileID: 0}
- target: {fileID: 1680573792925415762, guid: d00d92ab204198c489965b31a298b234, type: 3} - target: {fileID: 1680573792925415762, guid: d00d92ab204198c489965b31a298b234, type: 3}
propertyPath: VfxKineticSurge propertyPath: VfxKineticSurge
value: value:
objectReference: {fileID: 4566952472781634859, guid: 0d7c4835b1f550241bb630daef9e33e8, type: 3} objectReference: {fileID: 4566952472781634859, guid: 0d7c4835b1f550241bb630daef9e33e8, type: 3}
- target: {fileID: 1680573792925415762, guid: d00d92ab204198c489965b31a298b234, type: 3}
propertyPath: DashSpeedInitial
value: 200
objectReference: {fileID: 0}
- target: {fileID: 1680573792925415762, guid: d00d92ab204198c489965b31a298b234, type: 3} - target: {fileID: 1680573792925415762, guid: d00d92ab204198c489965b31a298b234, type: 3}
propertyPath: FighterClass.VfxKineticSurge propertyPath: FighterClass.VfxKineticSurge
value: value:
@ -71838,7 +71224,7 @@ PrefabInstance:
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 1681818445} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 210474383900406282, guid: 67f4f13276986cc4cb4705a4f1c4808a, type: 3} - target: {fileID: 210474383900406282, guid: 67f4f13276986cc4cb4705a4f1c4808a, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
@ -72022,10 +71408,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: [] m_RemovedGameObjects: []
m_AddedGameObjects: m_AddedGameObjects: []
- targetCorrespondingSourceObject: {fileID: 6623046322102314554, guid: 67f4f13276986cc4cb4705a4f1c4808a, type: 3}
insertIndex: -1
addedObject: {fileID: 1940124275}
m_AddedComponents: [] m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 67f4f13276986cc4cb4705a4f1c4808a, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 67f4f13276986cc4cb4705a4f1c4808a, type: 3}
--- !u!1660057539 &9223372036854775807 --- !u!1660057539 &9223372036854775807
@ -72037,10 +71420,10 @@ SceneRoots:
- {fileID: 1990193559} - {fileID: 1990193559}
- {fileID: 1177372200} - {fileID: 1177372200}
- {fileID: 2316236105731553357} - {fileID: 2316236105731553357}
- {fileID: 5778659820767749594}
- {fileID: 1507780130} - {fileID: 1507780130}
- {fileID: 2078146384} - {fileID: 2078146384}
- {fileID: 202393221} - {fileID: 202393221}
- {fileID: 1607851311} - {fileID: 1607851311}
- {fileID: 1341160148} - {fileID: 1341160148}
- {fileID: 268356502} - {fileID: 268356502}
- {fileID: 1302188856}

View File

@ -1,18 +1,12 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics.Contracts;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices.WindowsRuntime;
using System.Text; using System.Text;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Unity.VisualScripting;
using UnityEngine; using UnityEngine;
[System.Serializable]
public class ClassBase { public class ClassBase {
[HideInInspector] public float TimeElapsed;
[HideInInspector] public int MaxHealth; [HideInInspector] public int MaxHealth;
[HideInInspector] public int MaxMana; [HideInInspector] public int MaxMana;
[HideInInspector] public float AttackPower; [HideInInspector] public float AttackPower;
@ -26,8 +20,6 @@ public class ClassBase {
protected FloatingTextSpawner TextPopUp; protected FloatingTextSpawner TextPopUp;
/// <summary>Always in the order of Up, Down, Left, Right</summary> /// <summary>Always in the order of Up, Down, Left, Right</summary>
public string AnimationToPlay = ""; public string AnimationToPlay = "";
public Dictionary<int, ClassSkill> Skills = new Dictionary<int, ClassSkill>();
[SerializeField] private List<ClassSkill> AvailableSkills = new List<ClassSkill>();
public ClassBase(Player player) { public ClassBase(Player player) {
Player = player; Player = player;
@ -36,59 +28,7 @@ public class ClassBase {
TextPopUp = new FloatingTextSpawner(player.transform); TextPopUp = new FloatingTextSpawner(player.transform);
} }
public void GenerateAvailableSkillsList() { virtual public void Tick() { }
AvailableSkills.AddRange(Skills.Values);
}
virtual public void Tick() {
TimeElapsed = Time.time;
ClassSkill.TimeElapsed = TimeElapsed;
AvailableSkills.ForEach((x) => x.UpdateCooldown());
foreach (var skill in Skills.Values) { skill.UpdateCooldown(); }
}
virtual public void HandlePrimaryAttack() { } virtual public void HandlePrimaryAttack() { }
virtual public void HandleSecondaryAttack() { } virtual public void HandleSecondaryAttack() { }
[Serializable]
public class ClassSkill {
public static float TimeElapsed;
public string Name { get; private set; }
public float CooldownTime { get; private set; }
public float CooldownTimeElapsed { get; private set; }
public float CooldownRef { get; private set; }
public int SkillCountMax { get; private set; }
public int SkillCount { get; private set; } = 0;
public bool IsPaused { get; set; }
public bool IsNotReady { get { return SkillCount == 0; } }
protected bool SkillCountMaxed { get { return SkillCount == SkillCountMax; } }
protected float CooldownLeftInRatio { get { return SkillCountMaxed ? 1 : (CooldownTimeElapsed / CooldownTime); } }
public ClassSkill(string skillName, float cooldownTime, int skillCount) {
Name = skillName;
CooldownTime = cooldownTime;
SkillCountMax = skillCount;
}
public bool IsReady(bool useSkill = true) {
if (SkillCount == 0) return false;
if (useSkill) {
if (SkillCountMaxed) CooldownRef = Time.time;
SkillCount--;
Debug.Log($"[{Name}] Using skill [{SkillCount}/{SkillCountMax}]");
}
return true;
}
public void UpdateCooldown() {
if (SkillCount == SkillCountMax) return;
CooldownTimeElapsed = TimeElapsed - CooldownRef;
if (CooldownTimeElapsed < CooldownTime) return;
SkillCount++;
CooldownRef = Time.time;
Debug.Log($"[{Name}] Updating skill count [{SkillCount}/{SkillCountMax}]");
}
}
} }

View File

@ -1,7 +1,4 @@
using System.Collections.Generic; using UnityEngine;
using System.Runtime.CompilerServices;
using Unity.VisualScripting;
using UnityEngine;
[System.Serializable] [System.Serializable]
public class MeleeFighterClass : ClassBase { public class MeleeFighterClass : ClassBase {
@ -13,19 +10,16 @@ public class MeleeFighterClass : ClassBase {
public float ChargeValue; public float ChargeValue;
public bool AllowBladeVortex; public bool AllowBladeVortex;
public int ChargeTick; public int ChargeTick;
public float ComboTimeElapsed; public float TimeElapsed;
public float Cooldown; public float Cooldown;
public bool TimesUp; public bool TimesUp;
private bool HandlingOnStateEnter;
public VfxHandlerBase VfxKineticSurgeHandler { get { return Player.VfxKineticSurgeHandler; } } public VfxHandlerBase VfxKineticSurgeHandler { get { return Player.VfxKineticSurgeHandler; } }
public MeleeFighterClass(Player player) : base(player) { public MeleeFighterClass(Player player) : base(player) {
Skills.Add((int)AttackState.PhaseCleave, new ClassSkill("PhaseCleave", 2f, 3));
Skills.Add((int)AttackState.BladeVortex, new ClassSkill("BladeVortex", 2f, 3));
Skills.Add((int)AttackState.Shockwave, new ClassSkill("Shockwave", 2f, 3));
GenerateAvailableSkillsList();
} }
@ -49,10 +43,8 @@ public class MeleeFighterClass : ClassBase {
override public void Tick() { override public void Tick() {
base.Tick(); TimeElapsed = Time.time - LastComboTime;
TimesUp = TimeElapsed > ComboResetTime;
ComboTimeElapsed = Time.time - LastComboTime;
TimesUp = ComboTimeElapsed > ComboResetTime;
switch (CurrentState) { switch (CurrentState) {
case AttackState.None: case AttackState.None:
@ -60,7 +52,7 @@ public class MeleeFighterClass : ClassBase {
return; return;
case AttackState.BasicAttack1: case AttackState.BasicAttack1:
AllowBladeVortex = ComboTimeElapsed <= 0.1f; AllowBladeVortex = TimeElapsed <= 0.1f;
break; break;
@ -78,7 +70,7 @@ public class MeleeFighterClass : ClassBase {
// break; // break;
} }
if (CurrentState == AttackState.BasicAttack3 && ComboTimeElapsed > 0.1) { if (CurrentState == AttackState.BasicAttack3 && TimeElapsed > 0.1) {
ChangeState(AttackState.KineticSurgeRelease); ChangeState(AttackState.KineticSurgeRelease);
AttackAnimator.MeleeResetKineticCharge(); AttackAnimator.MeleeResetKineticCharge();
AttackAnimator.MeleeKineticSurge(); AttackAnimator.MeleeKineticSurge();
@ -88,7 +80,7 @@ public class MeleeFighterClass : ClassBase {
//Player.MoveSpeed = PlayerOriginalSpeed; //Player.MoveSpeed = PlayerOriginalSpeed;
} }
if (!ChargingAnAttack && TimesUp || Player.IsJumping) { if (!ChargingAnAttack && TimesUp) {
Player.MoveSpeedDampener = 1; Player.MoveSpeedDampener = 1;
ChangeState(AttackState.None); ChangeState(AttackState.None);
AttackAnimator.MeleeResetKineticCharge(); AttackAnimator.MeleeResetKineticCharge();
@ -126,10 +118,9 @@ public class MeleeFighterClass : ClassBase {
if ((Time.time - Player.DashTime) <= 0.1f) if ((Time.time - Player.DashTime) <= 0.1f)
ChangeState(AttackState.PhaseCleave, 1.5f); ChangeState(AttackState.PhaseCleave, 1.5f);
else if (Player.IsJumping) { else if (Player.IsJumping)
if (Player.ActionAfterJumpReady) ChangeState(AttackState.Shockwave, 0);
ChangeState(AttackState.Shockwave, 0); else
} else
ChangeState(AttackState.BasicAttack1, 0.35f); ChangeState(AttackState.BasicAttack1, 0.35f);
break; break;
@ -154,7 +145,7 @@ public class MeleeFighterClass : ClassBase {
switch (CurrentState) { switch (CurrentState) {
case AttackState.None: case AttackState.None:
/*PlayerOriginalSpeed = Player.MoveSpeed*/ /*PlayerOriginalSpeed = Player.MoveSpeed*/
if (Player.IsDashing) if (Player.IsDashing)
ChangeState(AttackState.None); ChangeState(AttackState.None);
@ -167,10 +158,6 @@ public class MeleeFighterClass : ClassBase {
case AttackState.BasicAttack1: case AttackState.BasicAttack1:
if (!AllowBladeVortex) return; if (!AllowBladeVortex) return;
if (!Skills[(int)AttackState.BladeVortex].IsReady()) {
ChangeState(AttackState.None);
return;
}
Cooldown = 0; Cooldown = 0;
ChangeState(AttackState.BladeVortex, 0.4f, 1.5f); ChangeState(AttackState.BladeVortex, 0.4f, 1.5f);
break; break;
@ -195,7 +182,7 @@ public class MeleeFighterClass : ClassBase {
float resetTime = 0.3f, float resetTime = 0.3f,
float cooldown = 0.05f) { float cooldown = 0.05f) {
if (ComboTimeElapsed < Cooldown) return; if (TimeElapsed < Cooldown) return;
CurrentState = state; CurrentState = state;
Player.MoveSpeedDampener = (state == AttackState.None) ? 1 : 1 / decreasedSpeed; Player.MoveSpeedDampener = (state == AttackState.None) ? 1 : 1 / decreasedSpeed;
if (state == AttackState.None) return; if (state == AttackState.None) return;
@ -245,7 +232,6 @@ public class MeleeFighterClass : ClassBase {
} }
} }
public void RotateTowardsMouse() { public void RotateTowardsMouse() {
return; return;
Vector3 mouseWorldPos = Camera.main.ScreenToWorldPoint(Input.mousePosition); Vector3 mouseWorldPos = Camera.main.ScreenToWorldPoint(Input.mousePosition);

View File

@ -1,9 +1,7 @@
using System.Collections; using System.Collections;
using System.Data;
using System.Linq; using System.Linq;
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI; using UnityEngine.UI;
[SelectionBase] [SelectionBase]
@ -12,7 +10,7 @@ public class Player : MonoBehaviour {
[SerializeField] public BuilderManager Builder; [SerializeField] public BuilderManager Builder;
[Header("Movement")] [Header("Movement")]
[SerializeField] private Rigidbody2D Rigidbody; [SerializeField] private Rigidbody2D RigidBody;
[SerializeField] public Animator Animator; [SerializeField] public Animator Animator;
[SerializeField] private SpriteRenderer Renderer; [SerializeField] private SpriteRenderer Renderer;
@ -23,24 +21,12 @@ public class Player : MonoBehaviour {
[SerializeField] private MeleeFighterClass FighterClass; [SerializeField] private MeleeFighterClass FighterClass;
public AttackAnimatorFactory AttackAnimator; public AttackAnimatorFactory AttackAnimator;
[Header("Stamina")]
[SerializeField] public float StaminaMax = 100;
[SerializeField] public float Stamina = 0;
[SerializeField] public float StaminaRegenPerSecond = 5;
[SerializeField] public Slider StaminaSliderHud;
[Header("Movement Attributes")] [Header("Movement Attributes")]
[SerializeField] public float MoveSpeed = 8; [SerializeField] public float MoveSpeed = 8;
[SerializeField] public float MoveSpeedDampener = 1; [SerializeField] public float MoveSpeedDampener = 1;
[SerializeField] private float DashSpeedInitial = 200; [SerializeField] private float DashMultiplier = 60;
[SerializeField] private float DashSpeed = 0; [SerializeField] private float DriftSpeed = 60;
[SerializeField] private float DashDecayRate = 30; [SerializeField] private float DriftFactorial = 0.85f;
[SerializeField] private float DashDelay1 = 0.05f;
[SerializeField] private float DashDelay2 = 0.05f;
[SerializeField] private float DashCooldown = 0.1f;
//[SerializeField] private float DriftSpeed = 60;
//[SerializeField] private float DriftFactorial = 0.85f;
[SerializeField] private float JumpDelay = 0.3f; [SerializeField] private float JumpDelay = 0.3f;
[Header("VFX")] [Header("VFX")]
@ -56,19 +42,13 @@ public class Player : MonoBehaviour {
public Vector2 PrevDirection = Vector2.zero; public Vector2 PrevDirection = Vector2.zero;
private Vector2 MoveDirection = Vector2.zero; private Vector2 MoveDirection = Vector2.zero;
private Vector2 DashDirection = Vector2.zero; private Directions FaceDir = Directions.Down;
public bool IsJumping { get; set; } public bool IsJumping { get; set; }
public float LastJumpTime { get; private set; }
public bool ActionAfterJumpReady {
get {
return (!IsJumping || (Time.time - LastJumpTime > 0.03f));
}
}
public bool IsDashing { get; private set; } public bool IsDashing { get; private set; }
public float DashTime { get; private set; } public float DashTime { get; private set; }
public bool CanDash { get; private set; } = true; public Vector2 DriftDirection { get; private set; } = Vector2.zero;
private float Drift = 0;
public bool SkillInUse = false; public bool SkillInUse = false;
private enum Directions { Left, Right, Up, Down } private enum Directions { Left, Right, Up, Down }
@ -81,14 +61,12 @@ public class Player : MonoBehaviour {
FighterClass = new MeleeFighterClass(this); FighterClass = new MeleeFighterClass(this);
VfxShockwavePool = new GameObjectPool(VfxShockwave, 5, 5); VfxShockwavePool = new GameObjectPool(VfxShockwave, 5, 5);
BoxColliders = GetComponentsInChildren<BoxCollider2D>(); BoxColliders = GetComponentsInChildren<BoxCollider2D>();
StaminaSliderHud.maxValue = StaminaMax;
SetClass(1); SetClass(1);
} }
private void Update() { private void Update() {
KeyPressActions();
GatherInput(); GatherInput();
UpdatePlayerStatus(); KeyPressActions();
ActiveClass.Tick(); ActiveClass.Tick();
} }
@ -99,7 +77,7 @@ public class Player : MonoBehaviour {
private void KeyPressActions() { private void KeyPressActions() {
if (Input.GetKeyDown(KeyCode.LeftShift) || Input.GetKeyDown(KeyCode.RightShift)) { if (Input.GetKeyDown(KeyCode.LeftShift) || Input.GetKeyDown(KeyCode.RightShift)) {
DoDash(); Dash(MoveDirection);
} else if (!IsJumping && Input.GetKeyDown(KeyCode.Space)) { } else if (!IsJumping && Input.GetKeyDown(KeyCode.Space)) {
Jump(); Jump();
} else if (Input.GetKeyDown(KeyCode.F1)) { } else if (Input.GetKeyDown(KeyCode.F1)) {
@ -117,37 +95,32 @@ public class Player : MonoBehaviour {
else if (Input.GetKeyDown(KeyCode.C)) ActiveClass.HandleSecondaryAttack(); else if (Input.GetKeyDown(KeyCode.C)) ActiveClass.HandleSecondaryAttack();
} }
private void DoDash() { private void Dash(Vector2 direction) {
if (!CanDash) return; if (Drift > 0.5f) return;
if (!ActionAfterJumpReady) return;
if (Stamina < 25) return;
Stamina -= 25;
CanDash = false;
IsDashing = true; IsDashing = true;
DashDirection = MoveDirection.normalized; DashTime = Time.time;
if (DashDirection == Vector2.zero) return;
DashSpeed = DashSpeedInitial; RigidBody.linearVelocity = (direction.normalized * MoveSpeed * DashMultiplier) / MoveSpeedDampener;
float angle = Mathf.Atan2(direction.y, direction.x) * Mathf.Rad2Deg + 180;
if (direction.normalized != Vector2.zero)
VfxDashHandler.PlayAll(this.transform.position, Quaternion.Euler(0f, 0f, angle));
DriftDirection = direction.normalized;
Drift = DriftSpeed;
IsDashing = false;
} }
private void Jump() { private void Jump() {
if (SkillInUse) return;
IsJumping = true; IsJumping = true;
LastJumpTime = Time.time;
foreach (var col in BoxColliders) foreach (var col in BoxColliders)
col.enabled = false; col.enabled = false;
if (CoroutineJumpReset != null) StartCoroutine(ResetJumpAfterDelay());
StopCoroutine(CoroutineJumpReset);
CoroutineJumpReset = StartCoroutine(ResetJumpAfterDelay());
MoveSpeedDampener = 2;
} }
public Coroutine CoroutineJumpReset { get; private set; }
private IEnumerator ResetJumpAfterDelay() { private IEnumerator ResetJumpAfterDelay() {
yield return new WaitForSeconds(JumpDelay); yield return new WaitForSeconds(JumpDelay);
foreach (var col in BoxColliders) foreach (var col in BoxColliders)
col.enabled = true; col.enabled = true;
IsJumping = false; IsJumping = false;
MoveSpeedDampener = 1;
} }
private void SetClass(int classIdx) { private void SetClass(int classIdx) {
@ -169,41 +142,32 @@ public class Player : MonoBehaviour {
} }
private void UpdatePlayerStatus() {
if (Stamina == StaminaMax) return;
Stamina = Mathf.Min(Stamina + StaminaRegenPerSecond * Time.deltaTime, StaminaMax);
StaminaSliderHud.value = Stamina;
}
private void FixedUpdate() { private void FixedUpdate() {
MovementUpdate(); MovementUpdate();
CalculateFacingDirection();
UpdateAnimation(); UpdateAnimation();
} }
private void MovementUpdate() { private void MovementUpdate() {
var movement = (MoveDirection.normalized * MoveSpeed) / MoveSpeedDampener; if (IsDashing) return;
if (IsDashing) {
if (DashSpeed < 0.2f) { RigidBody.linearVelocity = (MoveDirection.normalized * MoveSpeed) / MoveSpeedDampener;
DashSpeed = 0; if (Drift > 0.2f) {
CanDash = true; RigidBody.linearVelocity += DriftDirection * Drift;
IsDashing = false; Drift *= DriftFactorial;
} else if (DashSpeed > (movement.magnitude * 2)) { } else {
if (IsJumping) Jump(); Drift = 0f;
movement = DashDirection * DashSpeed;
DashSpeed *= Mathf.Exp(-DashDecayRate * Time.deltaTime);
} else {
movement = ((DashDirection * DashSpeed) + movement) / 2;
DashSpeed *= Mathf.Exp(-DashDecayRate * Time.deltaTime);
}
} }
Rigidbody.linearVelocity = movement; }
private void CalculateFacingDirection() {
if (MoveDirection.x != 0)
if (MoveDirection.x < 0)
FaceDir = Directions.Left;
else
FaceDir = Directions.Right;
} }
private void UpdateAnimation() { private void UpdateAnimation() {
@ -237,13 +201,13 @@ public class Player : MonoBehaviour {
} }
private void DrawPlayerDirection() { private void DrawPlayerDirection() {
if (Rigidbody == null) Rigidbody = GetComponent<Rigidbody2D>(); if (RigidBody == null) RigidBody = GetComponent<Rigidbody2D>();
if (Rigidbody == null) return; if (RigidBody == null) return;
Gizmos.color = Color.cyan; Gizmos.color = Color.cyan;
Vector3 start = Rigidbody.transform.position; Vector3 start = RigidBody.transform.position;
Vector3 end = start + (Vector3)(Rigidbody.linearVelocity * 1); Vector3 end = start + (Vector3)(RigidBody.linearVelocity * 1);
Gizmos.DrawLine(start, end); Gizmos.DrawLine(start, end);
DrawArrowHead(end, (end - start).normalized); DrawArrowHead(end, (end - start).normalized);

View File

@ -24,7 +24,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 150} m_MinSize: {x: 300, y: 150}
m_MaxSize: {x: 24288, y: 24288} m_MaxSize: {x: 24288, y: 24288}
vertical: 0 vertical: 0
controlID: -1 controlID: 125259
draggingID: 0 draggingID: 0
--- !u!114 &2 --- !u!114 &2
MonoBehaviour: MonoBehaviour:
@ -47,10 +47,10 @@ MonoBehaviour:
m_TextWithWhitespace: "Game\u200B" m_TextWithWhitespace: "Game\u200B"
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 1198.6667 x: 1190
y: 86 y: 86
width: 967.33325 width: 975.3334
height: 534.6667 height: 535.3333
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
@ -72,7 +72,7 @@ MonoBehaviour:
m_TextureFilterMode: 0 m_TextureFilterMode: 0
m_TextureHideFlags: 61 m_TextureHideFlags: 61
m_RenderIMGUI: 1 m_RenderIMGUI: 1
m_EnterPlayModeBehavior: 0 m_EnterPlayModeBehavior: 1
m_UseMipMap: 0 m_UseMipMap: 0
m_VSyncEnabled: 0 m_VSyncEnabled: 0
m_Gizmos: 0 m_Gizmos: 0
@ -95,7 +95,7 @@ MonoBehaviour:
m_HSlider: 0 m_HSlider: 0
m_VSlider: 0 m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0 m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 0 m_EnableMouseInput: 1
m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0 m_EnableSliderZoomVertical: 0
m_UniformScale: 1 m_UniformScale: 1
@ -104,23 +104,23 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 21 y: 21
width: 967.33325 width: 975.3334
height: 513.6667 height: 514.3333
m_Scale: {x: 1, y: 1} m_Scale: {x: 0.71435183, y: 0.71435183}
m_Translation: {x: 483.66663, y: 256.83334} m_Translation: {x: 487.6667, y: 257.16666}
m_MarginLeft: 0 m_MarginLeft: 0
m_MarginRight: 0 m_MarginRight: 0
m_MarginTop: 0 m_MarginTop: 0
m_MarginBottom: 0 m_MarginBottom: 0
m_LastShownAreaInsideMargins: m_LastShownAreaInsideMargins:
serializedVersion: 2 serializedVersion: 2
x: -483.66663 x: -682.67017
y: -256.83334 y: -360
width: 967.33325 width: 1365.3403
height: 513.6667 height: 720
m_MinimalGUI: 1 m_MinimalGUI: 1
m_defaultScale: 0.71342593 m_defaultScale: 0.71435183
m_LastWindowPixelSize: {x: 1450.9999, y: 802} m_LastWindowPixelSize: {x: 1463, y: 803}
m_ClearInEditMode: 1 m_ClearInEditMode: 1
m_NoCameraWarning: 1 m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 00000000000000000000 m_LowResolutionForAspectRatios: 00000000000000000000
@ -146,12 +146,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1252.6666 width: 1252
height: 1284.6667 height: 1284.6667
m_MinSize: {x: 200, y: 150} m_MinSize: {x: 200, y: 150}
m_MaxSize: {x: 16192, y: 24288} m_MaxSize: {x: 16192, y: 24288}
vertical: 1 vertical: 1
controlID: -1 controlID: 125260
draggingID: 0 draggingID: 0
--- !u!114 &4 --- !u!114 &4
MonoBehaviour: MonoBehaviour:
@ -172,12 +172,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1252.6666 width: 1252
height: 882 height: 882
m_MinSize: {x: 200, y: 100} m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 16192} m_MaxSize: {x: 16192, y: 16192}
vertical: 0 vertical: 0
controlID: -1 controlID: 125261
draggingID: 0 draggingID: 0
--- !u!114 &5 --- !u!114 &5
MonoBehaviour: MonoBehaviour:
@ -198,12 +198,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 283.33334 width: 274.66666
height: 882 height: 882
m_MinSize: {x: 100, y: 100} m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 8096, y: 16192} m_MaxSize: {x: 8096, y: 16192}
vertical: 1 vertical: 1
controlID: 125439 controlID: 125152
draggingID: 0 draggingID: 0
--- !u!114 &6 --- !u!114 &6
MonoBehaviour: MonoBehaviour:
@ -222,7 +222,7 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 283.33334 width: 274.66666
height: 586.6667 height: 586.6667
m_MinSize: {x: 201, y: 226} m_MinSize: {x: 201, y: 226}
m_MaxSize: {x: 4001, y: 4026} m_MaxSize: {x: 4001, y: 4026}
@ -254,7 +254,7 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 915.3334 x: 915.3334
y: 86 y: 86
width: 282.33334 width: 273.66666
height: 560.6667 height: 560.6667
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
@ -270,9 +270,9 @@ MonoBehaviour:
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: f0d0f7ff m_SelectedIDs:
m_LastClickedID: -536336 m_LastClickedID: 0
m_ExpandedIDs: b6b9f5ffc4dcf5ffe6f6f5ff1401f6ffe6d0f7fff0d0f7ff04d1f7ff22d1f7ff2ed1f7ff6cd1f7ff38eef7ff76fdf7ff88fdf7fff800f8ff245dfdff869bfdff20f9ffff38f9ffffcef9fffffaa100004ca20000700902008a090200bc090200c2090200 m_ExpandedIDs: 76fdf7ff88fdf7fff800f8ff245dfdff869bfdffaa51ffff20f9ffff38f9ffffcef9fffffaa100004ca20000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@ -314,7 +314,7 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 586.6667 y: 586.6667
width: 283.33334 width: 274.66666
height: 295.3333 height: 295.3333
m_MinSize: {x: 51, y: 76} m_MinSize: {x: 51, y: 76}
m_MaxSize: {x: 4001, y: 4026} m_MaxSize: {x: 4001, y: 4026}
@ -346,7 +346,7 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 915.3334 x: 915.3334
y: 672.6667 y: 672.6667
width: 282.33334 width: 273.66666
height: 269.3333 height: 269.3333
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
@ -376,14 +376,14 @@ MonoBehaviour:
- {fileID: 14} - {fileID: 14}
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 283.33334 x: 274.66666
y: 0 y: 0
width: 969.33325 width: 977.3334
height: 882 height: 882
m_MinSize: {x: 100, y: 100} m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 8096, y: 16192} m_MaxSize: {x: 8096, y: 16192}
vertical: 1 vertical: 1
controlID: -1 controlID: 125262
draggingID: 0 draggingID: 0
--- !u!114 &11 --- !u!114 &11
MonoBehaviour: MonoBehaviour:
@ -402,8 +402,8 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 969.33325 width: 977.3334
height: 560.6667 height: 561.3333
m_MinSize: {x: 52, y: 76} m_MinSize: {x: 52, y: 76}
m_MaxSize: {x: 4002, y: 4026} m_MaxSize: {x: 4002, y: 4026}
m_ActualView: {fileID: 2} m_ActualView: {fileID: 2}
@ -436,8 +436,8 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 1190 x: 1190
y: 86 y: 86
width: 976 width: 975.3334
height: 534.6667 height: 535.3333
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
@ -880,9 +880,9 @@ MonoBehaviour:
m_AudioPlay: 0 m_AudioPlay: 0
m_DebugDrawModesUseInteractiveLightBakingData: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0
m_Position: m_Position:
m_Target: {x: 872.89624, y: 524.46875, z: -7.8891673} m_Target: {x: -3.2640777, y: -0.8338971, z: -0.044870697}
speed: 2 speed: 2
m_Value: {x: 872.89624, y: 524.46875, z: -7.8891673} m_Value: {x: -3.2640777, y: -0.8338971, z: -0.044870697}
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
@ -932,9 +932,9 @@ MonoBehaviour:
speed: 2 speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1} m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size: m_Size:
m_Target: 789.7805 m_Target: 5.063645
speed: 2 speed: 2
m_Value: 789.7805 m_Value: 5.063645
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
@ -989,10 +989,10 @@ MonoBehaviour:
m_TextWithWhitespace: "Recorder\u200B" m_TextWithWhitespace: "Recorder\u200B"
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 1190 x: 321
y: 86 y: 79
width: 975.3334 width: 1140
height: 535.3333 height: 381
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
@ -1014,23 +1014,23 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: AnimationWindow m_Name: AnimatorControllerTool
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 560.6667 y: 561.3333
width: 969.33325 width: 977.3334
height: 321.3333 height: 320.6667
m_MinSize: {x: 52, y: 76} m_MinSize: {x: 52, y: 76}
m_MaxSize: {x: 4002, y: 4026} m_MaxSize: {x: 4002, y: 4026}
m_ActualView: {fileID: 16} m_ActualView: {fileID: 15}
m_Panes: m_Panes:
- {fileID: 15} - {fileID: 15}
- {fileID: 16} - {fileID: 16}
m_Selected: 1 m_Selected: 0
m_LastSelected: 0 m_LastSelected: 1
--- !u!114 &15 --- !u!114 &15
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@ -1070,32 +1070,15 @@ MonoBehaviour:
m_ViewTransforms: m_ViewTransforms:
m_KeySerializationHelper: m_KeySerializationHelper:
- {fileID: -2159016584420566100, guid: ba58731883bc8cb40be2ed19cc4be25a, type: 2} - {fileID: -2159016584420566100, guid: ba58731883bc8cb40be2ed19cc4be25a, type: 2}
- {fileID: 8178033774095782672, guid: 95f0b268d7716ae4fbf48e1e031c5006, type: 2}
m_ValueSerializationHelper: m_ValueSerializationHelper:
- e00: 0.7091452 - e00: 0.3013559
e01: 0 e01: 0
e02: 0 e02: 0
e03: -77.02728 e03: 203.76672
e10: 0 e10: 0
e11: 0.7091452 e11: 0.3013559
e12: 0 e12: 0
e13: 31.923752 e13: 96.95257
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
- e00: 0.7092281
e01: 0
e02: 0
e03: 12.288605
e10: 0
e11: 0.7092281
e12: 0
e13: 63.239998
e20: 0 e20: 0
e21: 0 e21: 0
e22: 1 e22: 1
@ -1117,7 +1100,7 @@ MonoBehaviour:
m_MiniTool: 0 m_MiniTool: 0
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_CurrentEditor: 1 m_CurrentEditor: 0
m_LayerEditor: m_LayerEditor:
m_SelectedLayerIndex: 0 m_SelectedLayerIndex: 0
--- !u!114 &16 --- !u!114 &16
@ -1141,9 +1124,9 @@ MonoBehaviour:
m_TextWithWhitespace: "Animation\u200B" m_TextWithWhitespace: "Animation\u200B"
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 1198.6667 x: 1190.6667
y: 646.6667 y: 646.6667
width: 967.33325 width: 974
height: 295.3333 height: 295.3333
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
@ -1158,7 +1141,7 @@ MonoBehaviour:
m_OverlaysVisible: 1 m_OverlaysVisible: 1
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_LastSelectedObjectID: -536336 m_LastSelectedObjectID: 41548
--- !u!114 &17 --- !u!114 &17
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@ -1169,24 +1152,24 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 1 m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: ProjectBrowser m_Name: ConsoleWindow
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 882 y: 882
width: 1252.6666 width: 1252
height: 402.66675 height: 402.66675
m_MinSize: {x: 231, y: 276} m_MinSize: {x: 101, y: 126}
m_MaxSize: {x: 10001, y: 10026} m_MaxSize: {x: 4001, y: 4026}
m_ActualView: {fileID: 18} m_ActualView: {fileID: 19}
m_Panes: m_Panes:
- {fileID: 18} - {fileID: 18}
- {fileID: 19} - {fileID: 19}
- {fileID: 20} - {fileID: 20}
m_Selected: 0 m_Selected: 1
m_LastSelected: 1 m_LastSelected: 0
--- !u!114 &18 --- !u!114 &18
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@ -1210,7 +1193,7 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 915.3334 x: 915.3334
y: 968 y: 968
width: 1251.6666 width: 1251
height: 376.66675 height: 376.66675
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
@ -1234,7 +1217,7 @@ MonoBehaviour:
m_SkipHidden: 0 m_SkipHidden: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
- Assets/Prefabs/UI - Assets/Scripts/Runtime/AI/StateMachines
m_Globs: [] m_Globs: []
m_ProductIds: m_ProductIds:
m_AnyWithAssetOrigin: 0 m_AnyWithAssetOrigin: 0
@ -1244,16 +1227,16 @@ MonoBehaviour:
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 16 m_StartGridSize: 16
m_LastFolders: m_LastFolders:
- Assets/Prefabs/UI - Assets/Scripts/Runtime/AI/StateMachines
m_LastFoldersGridSize: 16 m_LastFoldersGridSize: 16
m_LastProjectPath: C:\Users\Nico\Desktop\Projects\[ Gamedev ]\TowerDefenseGame m_LastProjectPath: C:\Users\Nico\Desktop\Projects\[ Gamedev ]\TowerDefenseGame
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 751.99994} scrollPos: {x: 0, y: 363.33325}
m_SelectedIDs: 92a40000 m_SelectedIDs: a6a40000
m_LastClickedID: 42130 m_LastClickedID: 42150
m_ExpandedIDs: 00000000eea30000f0a30000f2a30000f4a30000f6a30000f8a30000faa30000fca30000fea3000000a4000002a4000004a4000006a4000008a400000ca4000012a4000014a4000016a4000018a4000080a4000082a400009ea40000a8a4000098bc0000d600020044030200c20302006a060200ec070200 m_ExpandedIDs: 00000000eea30000f0a30000f2a30000f4a30000f6a30000f8a30000faa30000fca30000fea3000000a4000002a4000004a4000006a4000008a400000aa400000ca400000ea4000012a4000014a4000016a4000018a4000080a4000082a400009ea40000a8a4000098bc0000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@ -1308,24 +1291,24 @@ MonoBehaviour:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_ResourceFile: m_ResourceFile:
m_ListAreaState: m_ListAreaState:
m_SelectedInstanceIDs: f0d0f7ff m_SelectedInstanceIDs:
m_LastClickedInstanceID: -536336 m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 1 m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c6230000ec950000f8950000da9500007a9f000010a900004cd100003ca30000000000005c2301005269010000680100ec670100f2670100586701007e670100c66701006c6701004a68010014680100cc05020034080200ea040200 m_ExpandedInstanceIDs: c6230000ec950000f8950000da9500007a9f000010a900004cd100003ca30000000000005c2301005269010000680100ec670100f2670100586701007e670100
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: VfxHandlerDash01 m_Name:
m_OriginalName: VfxHandlerDash01 m_OriginalName:
m_EditFieldRect: m_EditFieldRect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 0 width: 0
height: 0 height: 0
m_UserData: 39854 m_UserData: 0
m_IsWaitingForDelay: 0 m_IsWaitingForDelay: 0
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 0 m_OriginalEventType: 11
m_IsRenamingFilename: 1 m_IsRenamingFilename: 1
m_TrimLeadingAndTrailingWhitespace: 0 m_TrimLeadingAndTrailingWhitespace: 0
m_ClientGUIView: {fileID: 17} m_ClientGUIView: {fileID: 17}
@ -1339,7 +1322,7 @@ MonoBehaviour:
m_ScrollPosition: {x: 0, y: 0} m_ScrollPosition: {x: 0, y: 0}
m_GridSize: 16 m_GridSize: 16
m_SkipHiddenPackages: 0 m_SkipHiddenPackages: 0
m_DirectoriesAreaWidth: 292.3333 m_DirectoriesAreaWidth: 291.66666
--- !u!114 &19 --- !u!114 &19
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@ -1363,7 +1346,7 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 915.3334 x: 915.3334
y: 968 y: 968
width: 1251.6666 width: 1251
height: 376.66675 height: 376.66675
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
@ -1428,18 +1411,17 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 1252.6666 x: 1252
y: 0 y: 0
width: 390.66675 width: 391.33337
height: 1284.6667 height: 1284.6667
m_MinSize: {x: 276, y: 76} m_MinSize: {x: 276, y: 76}
m_MaxSize: {x: 4001, y: 4026} m_MaxSize: {x: 4001, y: 4026}
m_ActualView: {fileID: 22} m_ActualView: {fileID: 22}
m_Panes: m_Panes:
- {fileID: 22} - {fileID: 22}
- {fileID: 23}
m_Selected: 0 m_Selected: 0
m_LastSelected: 1 m_LastSelected: 0
--- !u!114 &22 --- !u!114 &22
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@ -1461,9 +1443,9 @@ MonoBehaviour:
m_TextWithWhitespace: "Inspector\u200B" m_TextWithWhitespace: "Inspector\u200B"
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 2168 x: 2167.3335
y: 86 y: 86
width: 389.66675 width: 390.33337
height: 1258.6667 height: 1258.6667
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
@ -1489,49 +1471,3 @@ MonoBehaviour:
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_PreviewWindow: {fileID: 0} m_PreviewWindow: {fileID: 0}
--- !u!114 &23
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 13961, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Player
m_Image: {fileID: -7606759526039521141, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: HomeTown/Player
m_TextWithWhitespace: "Player\u200B"
m_Pos:
serializedVersion: 2
x: 2168
y: 86
width: 389.66675
height: 1258.6667
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
m_SupportedDataModes:
isAutomatic: 1
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
m_ContainerData: []
m_OverlaysVisible: 1
m_ObjectsLockedBeforeSerialization: []
m_InstanceIDsLockedBeforeSerialization:
m_PreviewResizer:
m_CachedPref: 151
m_ControlHash: 1412526313
m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: -1
m_LastVerticalScrollValue: 54
m_GlobalObjectId: GlobalObjectId_V1-2-2cda990e2423bbf4892e6590ba056729-9147163641451663911-2316236105731553357
m_InspectorMode: 0