From 7bcc51b85b3889d6917bc0361bbcce96ee35c19a Mon Sep 17 00:00:00 2001
From: bewe <93899302+bernarduswillson@users.noreply.github.com>
Date: Sat, 11 May 2024 17:41:03 +0700
Subject: [PATCH] fix: gameover
---
Assets/Scenes/Ending/Ending.unity | 185 +++++++++++++++++-
Assets/Scenes/FinalStage.unity | 141 +++++++------
Assets/Scenes/InitialStage.unity | 2 +-
Assets/Script/Bot/Enemy/Azathoth/Azathoth.cs | 2 -
Assets/Script/{ => CutScene}/CutScene1.cs | 0
.../Script/{ => CutScene}/CutScene1.cs.meta | 0
Assets/Script/Menu/GameOver.cs | 6 +
Assets/Script/Stage/Stage.cs | 2 +-
Assets/Script/Stage/StageManager.cs | 29 ++-
9 files changed, 281 insertions(+), 86 deletions(-)
rename Assets/Script/{ => CutScene}/CutScene1.cs (100%)
rename Assets/Script/{ => CutScene}/CutScene1.cs.meta (100%)
diff --git a/Assets/Scenes/Ending/Ending.unity b/Assets/Scenes/Ending/Ending.unity
index 736b08e5..e2639199 100644
--- a/Assets/Scenes/Ending/Ending.unity
+++ b/Assets/Scenes/Ending/Ending.unity
@@ -4101,7 +4101,7 @@ MonoBehaviour:
gameOverText: {fileID: 1361813100}
back: {fileID: 1444419002}
replay: {fileID: 1295132236}
- stats: {fileID: 1394007606}
+ stats: {fileID: 510020015}
timerText: {fileID: 1967120879}
gameOverUI: {fileID: 1496903767}
gold: {fileID: 390752059}
@@ -4110,7 +4110,8 @@ MonoBehaviour:
accuracy: {fileID: 1566271601}
distance: {fileID: 1539087080}
playTime: {fileID: 2016727064}
- FadeOutCanvas: {fileID: 1496903767}
+ FadeOutCanvas: {fileID: 2013278209}
+ isEnding: 1
--- !u!114 &933550583
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4137,10 +4138,10 @@ Canvas:
m_GameObject: {fileID: 933550581}
m_Enabled: 1
serializedVersion: 3
- m_RenderMode: 2
+ m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
- m_PixelPerfect: 0
+ m_PixelPerfect: 1
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
@@ -4158,9 +4159,9 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 933550581}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ 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_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1496903770}
@@ -4171,10 +4172,10 @@ RectTransform:
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 960, y: 540}
- m_SizeDelta: {x: 1920, y: 1080}
- m_Pivot: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0, y: 0}
--- !u!1 &936875404
GameObject:
m_ObjectHideFlags: 0
@@ -12342,6 +12343,169 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2009779896}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &2013278209
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2013278216}
+ - component: {fileID: 2013278215}
+ - component: {fileID: 2013278214}
+ - component: {fileID: 2013278213}
+ - component: {fileID: 2013278212}
+ - component: {fileID: 2013278211}
+ - component: {fileID: 2013278210}
+ m_Layer: 5
+ m_Name: FadeOut
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!95 &2013278210
+Animator:
+ serializedVersion: 5
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2013278209}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: 77d810e151cf1b843b841ae5fc4e3b67, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_StabilizeFeet: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorStateOnDisable: 0
+ m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &2013278211
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2013278209}
+ 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 &2013278212
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2013278209}
+ m_CullTransparentMesh: 1
+--- !u!114 &2013278213
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2013278209}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+--- !u!114 &2013278214
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2013278209}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_UiScaleMode: 0
+ m_ReferencePixelsPerUnit: 100
+ m_ScaleFactor: 1
+ m_ReferenceResolution: {x: 800, y: 600}
+ m_ScreenMatchMode: 0
+ m_MatchWidthOrHeight: 0
+ m_PhysicalUnit: 3
+ m_FallbackScreenDPI: 96
+ m_DefaultSpriteDPI: 96
+ m_DynamicPixelsPerUnit: 1
+ m_PresetInfoIsWorld: 0
+--- !u!223 &2013278215
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2013278209}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 0
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 0
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_VertexColorAlwaysGammaSpace: 0
+ m_AdditionalShaderChannelsFlag: 0
+ m_UpdateRectTransformForStandalone: 0
+ m_SortingLayerID: 0
+ m_SortingOrder: 0
+ m_TargetDisplay: 0
+--- !u!224 &2013278216
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2013278209}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0, y: 0, z: 0}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ 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, y: 0}
--- !u!1 &2016727063
GameObject:
m_ObjectHideFlags: 0
@@ -12688,3 +12852,4 @@ SceneRoots:
- {fileID: 336123839}
- {fileID: 768624823}
- {fileID: 933550585}
+ - {fileID: 2013278216}
diff --git a/Assets/Scenes/FinalStage.unity b/Assets/Scenes/FinalStage.unity
index 3143188b..50fb0949 100644
--- a/Assets/Scenes/FinalStage.unity
+++ b/Assets/Scenes/FinalStage.unity
@@ -259,7 +259,7 @@ PrefabInstance:
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
- objectReference: {fileID: 0}
+ objectReference: {fileID: 178204620}
- target: {fileID: 1604671993335288653, guid: 2efde1f742401b345992c5c07ac5d64d,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
@@ -299,6 +299,11 @@ PrefabInstance:
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
+ objectReference: {fileID: 178204620}
+ - target: {fileID: 5675171226873387433, guid: 2efde1f742401b345992c5c07ac5d64d,
+ type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: BackToMainMenu
objectReference: {fileID: 0}
- target: {fileID: 8743020687667344940, guid: 2efde1f742401b345992c5c07ac5d64d,
type: 3}
@@ -959,47 +964,47 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1263217620473054, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 143246068027918357, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 143246068027918357, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 143246068027918357, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_SizeDelta.x
- value: 20.99
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 143246068027918357, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_SizeDelta.y
- value: 40
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 143246068027918357, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 137.845
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 143246068027918357, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -20
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224005418473288314, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchorMax.x
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224005418473288314, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchorMax.y
- value: 0.96943974
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224005418473288314, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
@@ -1009,67 +1014,67 @@ PrefabInstance:
- target: {fileID: 224091110387865490, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224091110387865490, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224091110387865490, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_SizeDelta.x
- value: 90.71484
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224091110387865490, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 787.2129
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224091110387865490, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -20
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224130951485110974, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_SizeDelta.y
- value: -589
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224130951485110974, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0
+ value: 0.000030517578
objectReference: {fileID: 0}
- target: {fileID: 224166536479716514, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224166536479716514, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224166536479716514, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_SizeDelta.x
- value: 1000
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224166536479716514, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_SizeDelta.y
- value: 40
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224166536479716514, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 500
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224166536479716514, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -650
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224296548220470038, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
@@ -1174,102 +1179,102 @@ PrefabInstance:
- target: {fileID: 224484317424158076, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224484317424158076, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224484317424158076, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_SizeDelta.x
- value: 80.71484
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224484317424158076, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 875.92773
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224484317424158076, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -20
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224642173552212536, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224642173552212536, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224642173552212536, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_SizeDelta.x
- value: 80.71484
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224642173552212536, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 959.6426
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224642173552212536, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -20
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224711696876568682, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224711696876568682, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224711696876568682, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_SizeDelta.x
- value: 1000
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224711696876568682, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_SizeDelta.y
- value: 607
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224711696876568682, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 500
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224773539050736570, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224773539050736570, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224773539050736570, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_SizeDelta.x
- value: 738.85547
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224773539050736570, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 369.42773
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224773539050736570, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -20
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 265229693040713684, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
@@ -1284,32 +1289,32 @@ PrefabInstance:
- target: {fileID: 363657505470348732, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 363657505470348732, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 363657505470348732, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_SizeDelta.x
- value: 50.36
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 363657505470348732, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_SizeDelta.y
- value: 40
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 363657505470348732, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 96.17
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 363657505470348732, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -20
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 2626955960605667388, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
@@ -1324,67 +1329,67 @@ PrefabInstance:
- target: {fileID: 3005720477010286325, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_SizeDelta.x
- value: 160.34001
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3143326541157679684, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3143326541157679684, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3143326541157679684, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_SizeDelta.x
- value: 20.99
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3143326541157679684, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_SizeDelta.y
- value: 40
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3143326541157679684, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 54.495
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3143326541157679684, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -20
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 4011473737907365368, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 4011473737907365368, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 4011473737907365368, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_SizeDelta.x
- value: 26
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 4011473737907365368, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_SizeDelta.y
- value: 40
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 4011473737907365368, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 25
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 4011473737907365368, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -20
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 4668199621230494770, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
@@ -1481,6 +1486,18 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3}
+--- !u!114 &178204620 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 82616962848050741, guid: 51cde55a2a5a5c3448cd8df1ab6225dd,
+ type: 3}
+ m_PrefabInstance: {fileID: 1230702347393119482}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1494378619}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 9da81d5c40610b1459c7b7178d73527c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &196435159
GameObject:
m_ObjectHideFlags: 3
diff --git a/Assets/Scenes/InitialStage.unity b/Assets/Scenes/InitialStage.unity
index 0eb930d2..647f3f14 100644
--- a/Assets/Scenes/InitialStage.unity
+++ b/Assets/Scenes/InitialStage.unity
@@ -1136,7 +1136,7 @@ PrefabInstance:
- target: {fileID: 224130951485110974, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0.000030517578
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224166536479716514, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f,
type: 3}
diff --git a/Assets/Script/Bot/Enemy/Azathoth/Azathoth.cs b/Assets/Script/Bot/Enemy/Azathoth/Azathoth.cs
index e7c4d177..b0462c58 100644
--- a/Assets/Script/Bot/Enemy/Azathoth/Azathoth.cs
+++ b/Assets/Script/Bot/Enemy/Azathoth/Azathoth.cs
@@ -108,8 +108,6 @@ public class Azathoth : MonoBehaviour
float fillF = frontHealthBar.fillAmount;
float fillB = backHealthBar.fillAmount;
float hFraction = health / maxHealth;
- Debug.Log("Health:" + health);
- Debug.Log("Max:" + maxHealth);
if (fillB > hFraction)
{
diff --git a/Assets/Script/CutScene1.cs b/Assets/Script/CutScene/CutScene1.cs
similarity index 100%
rename from Assets/Script/CutScene1.cs
rename to Assets/Script/CutScene/CutScene1.cs
diff --git a/Assets/Script/CutScene1.cs.meta b/Assets/Script/CutScene/CutScene1.cs.meta
similarity index 100%
rename from Assets/Script/CutScene1.cs.meta
rename to Assets/Script/CutScene/CutScene1.cs.meta
diff --git a/Assets/Script/Menu/GameOver.cs b/Assets/Script/Menu/GameOver.cs
index 27557c71..b395549d 100644
--- a/Assets/Script/Menu/GameOver.cs
+++ b/Assets/Script/Menu/GameOver.cs
@@ -26,6 +26,8 @@ public class GameOver : MonoBehaviour
public GameObject FadeOutCanvas;
+ public bool isEnding;
+
void Update()
{
gold.text = GlobalPreference.Instance.GetPlayerGold().ToString();
@@ -97,6 +99,10 @@ public class GameOver : MonoBehaviour
gameOverUI.SetActive(true);
Time.timeScale = 0.2f;
+ if (isEnding)
+ {
+ gameOverText.text = "AZATHOTH FELL";
+ }
gameOverText.gameObject.SetActive(true);
back.gameObject.SetActive(true);
replay.gameObject.SetActive(true);
diff --git a/Assets/Script/Stage/Stage.cs b/Assets/Script/Stage/Stage.cs
index 09fa111f..d79641df 100644
--- a/Assets/Script/Stage/Stage.cs
+++ b/Assets/Script/Stage/Stage.cs
@@ -260,7 +260,7 @@ public class Stage : MonoBehaviour
public void GoToBossArena()
{
- SceneManager.LoadScene(3);
+ isStageCompleted = true;
}
diff --git a/Assets/Script/Stage/StageManager.cs b/Assets/Script/Stage/StageManager.cs
index f49ae9e4..c0ae5c97 100644
--- a/Assets/Script/Stage/StageManager.cs
+++ b/Assets/Script/Stage/StageManager.cs
@@ -23,15 +23,6 @@ public class StageManager : MonoBehaviour
if (SaveLoadManager.Instance.GetSaveData() != null)
{
SaveData data = SaveLoadManager.Instance.GetSaveData();
- currentStage = (int)data.stageNumber;
- if (currentStage == 2 || currentStage == 3)
- {
- /*if (GameObject.FindGameObjectWithTag("Player") != null)
- {
- GameObject.FindGameObjectWithTag("Player").GetComponent<CharacterController>().center = new Vector3(-18.026f, 20.801f, 49.536f);
- }*/
- GameObject.Find("Gate").GetComponent<Animator>().SetTrigger("OpenGate");
- }
GlobalPreference.Instance.SetPlayerHealth(data.health);
GlobalPreference.Instance.SetPlayerGold(data.golds);
@@ -48,6 +39,7 @@ public class StageManager : MonoBehaviour
GlobalPreference.Instance.setStageNumber((int)data.stageNumber);
}
+ currentStage = GlobalPreference.Instance.getStageNumber();
if (currentStage == 1)
{
GlobalPreference.Instance.SetPlayerHealth(100);
@@ -64,7 +56,16 @@ public class StageManager : MonoBehaviour
GlobalPreference.Instance.setStageNumber(0);
}
+ if (currentStage == 2 || currentStage == 3)
+ {
+ /*if (GameObject.FindGameObjectWithTag("Player") != null)
+ {
+ GameObject.FindGameObjectWithTag("Player").GetComponent<CharacterController>().center = new Vector3(-18.026f, 20.801f, 49.536f);
+ }*/
+ GameObject.Find("Gate").GetComponent<Animator>().SetTrigger("OpenGate");
+ }
+ SaveLoadManager.Instance.SetSaveData(null);
StartNextStage();
}
@@ -115,7 +116,7 @@ public class StageManager : MonoBehaviour
private void Update()
{
- if (currentStage > 0 && currentStage <= stages.Count)
+ if (currentStage > 0 && currentStage < stages.Count)
{
if (stages[currentStage - 1].isStageCompleted)
{
@@ -125,6 +126,14 @@ public class StageManager : MonoBehaviour
StartNextStage();
}
}
+
+ if (currentStage == 3 && stages[currentStage - 1].isStageCompleted)
+ {
+ currentStage++;
+ GlobalPreference.Instance.setStageNumber(currentStage);
+ SceneManager.LoadScene(3);
+ }
+
if (currentStage == 4 && stages[0].isStageCompleted)
{
Ending();
--
GitLab