diff --git a/IF3210-2024-Unity-AFK/Assets/Code/Scripts/UI/StatsMenu.cs b/IF3210-2024-Unity-AFK/Assets/Code/Scripts/UI/StatsMenu.cs
index 29e3d33d92ec285b7dd1e5353d0dd4f8b62689ed..14d67f12e64999e4b1dacf51ccc384fe9009f96b 100644
--- a/IF3210-2024-Unity-AFK/Assets/Code/Scripts/UI/StatsMenu.cs
+++ b/IF3210-2024-Unity-AFK/Assets/Code/Scripts/UI/StatsMenu.cs
@@ -19,7 +19,7 @@ public class StatsMenu : MonoBehaviour
private void Start()
{
- shotAccuracy.text = (PlayerPrefs.GetInt("hits") / (float) PlayerPrefs.GetInt("shots") * 100).ToString() + "%";
+ shotAccuracy.text = PlayerPrefs.GetInt("shots") == 0 ? "0%" : (PlayerPrefs.GetInt("hits") / (float) PlayerPrefs.GetInt("shots") * 100).ToString() + "%";
distanceTraveled.text = PlayerPrefs.GetFloat("distance_traveled").ToString();
DateTime startTime = DateTime.Parse(PlayerPrefs.GetString("start_time"));
TimeSpan deltaTime = DateTime.Now - startTime;
diff --git a/IF3210-2024-Unity-AFK/Assets/Level/Scenes/Main 2.unity b/IF3210-2024-Unity-AFK/Assets/Level/Scenes/Main 2.unity
index a687c383f6b9265cb9da8f4c3eae6d4bf56146c1..f91a2b483270e80c0c114f6a9c89dc3afc23a9c2 100644
--- a/IF3210-2024-Unity-AFK/Assets/Level/Scenes/Main 2.unity
+++ b/IF3210-2024-Unity-AFK/Assets/Level/Scenes/Main 2.unity
@@ -2981,6 +2981,94 @@ Transform:
m_CorrespondingSourceObject: {fileID: 4424112051086032, guid: ebd56a6d944d9a446986d0cb28d5338d, type: 3}
m_PrefabInstance: {fileID: 449764974}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &329931789
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 60253137160692316, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 15.03598
+ objectReference: {fileID: 0}
+ - target: {fileID: 60253137160692316, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 79.90636
+ objectReference: {fileID: 0}
+ - target: {fileID: 60253137160692316, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 1.55388
+ objectReference: {fileID: 0}
+ - target: {fileID: 60253137160692316, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 60253137160692316, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 60253137160692316, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 60253137160692316, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 60253137160692316, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 60253137160692316, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 60253137160692316, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 348045508547534544, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+ propertyPath: gunSystem
+ value:
+ objectReference: {fileID: 329931790}
+ - target: {fileID: 348045508547534544, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+ propertyPath: MainPlayer
+ value:
+ objectReference: {fileID: 803879370}
+ - target: {fileID: 348045508547534544, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+ propertyPath: targetLayer.m_Bits
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 837070589710612710, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+ propertyPath: m_Name
+ value: King
+ objectReference: {fileID: 0}
+ - target: {fileID: 837070589710612710, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 837070589710612710, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+ propertyPath: m_TagString
+ value: King
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+--- !u!114 &329931790 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 8404342860993974077, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+ m_PrefabInstance: {fileID: 329931789}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d527b94985391da4d8ea13002fb4814e, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &330974320 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1151832108952812, guid: 6c33ac13022677c4bb7913d9d496a50e, type: 3}
@@ -11377,76 +11465,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ebd56a6d944d9a446986d0cb28d5338d, type: 3}
---- !u!1001 &1363711749
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 365717458043885804, guid: 082078b59b2c5d446853fa3c4601e43d, type: 3}
- propertyPath: target
- value:
- objectReference: {fileID: 2120152598}
- - target: {fileID: 8396581159872611695, guid: 082078b59b2c5d446853fa3c4601e43d, type: 3}
- propertyPath: m_LocalPosition.x
- value: 12.682841
- objectReference: {fileID: 0}
- - target: {fileID: 8396581159872611695, guid: 082078b59b2c5d446853fa3c4601e43d, type: 3}
- propertyPath: m_LocalPosition.y
- value: 80.05
- objectReference: {fileID: 0}
- - target: {fileID: 8396581159872611695, guid: 082078b59b2c5d446853fa3c4601e43d, type: 3}
- propertyPath: m_LocalPosition.z
- value: 8.363163
- objectReference: {fileID: 0}
- - target: {fileID: 8396581159872611695, guid: 082078b59b2c5d446853fa3c4601e43d, type: 3}
- propertyPath: m_LocalRotation.w
- value: 0.7021817
- objectReference: {fileID: 0}
- - target: {fileID: 8396581159872611695, guid: 082078b59b2c5d446853fa3c4601e43d, type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 8396581159872611695, guid: 082078b59b2c5d446853fa3c4601e43d, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0.7119978
- objectReference: {fileID: 0}
- - target: {fileID: 8396581159872611695, guid: 082078b59b2c5d446853fa3c4601e43d, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 8396581159872611695, guid: 082078b59b2c5d446853fa3c4601e43d, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8396581159872611695, guid: 082078b59b2c5d446853fa3c4601e43d, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 90.795
- objectReference: {fileID: 0}
- - target: {fileID: 8396581159872611695, guid: 082078b59b2c5d446853fa3c4601e43d, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 9209147377552826325, guid: 082078b59b2c5d446853fa3c4601e43d, type: 3}
- propertyPath: m_Name
- value: King
- objectReference: {fileID: 0}
- - target: {fileID: 9209147377552826325, guid: 082078b59b2c5d446853fa3c4601e43d, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 082078b59b2c5d446853fa3c4601e43d, type: 3}
---- !u!1 &1363711750 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 9209147377552826325, guid: 082078b59b2c5d446853fa3c4601e43d, type: 3}
- m_PrefabInstance: {fileID: 1363711749}
- m_PrefabAsset: {fileID: 0}
--- !u!1001 &1367056743
PrefabInstance:
m_ObjectHideFlags: 0
@@ -18229,7 +18247,7 @@ PrefabInstance:
- target: {fileID: 3777290212366644686, guid: aa6f29a441791614eb4b0f78ec563f40, type: 3}
propertyPath: EnemyKingRef
value:
- objectReference: {fileID: 1363711750}
+ objectReference: {fileID: 0}
- target: {fileID: 3777290212366644686, guid: aa6f29a441791614eb4b0f78ec563f40, type: 3}
propertyPath: kingCountMax
value: 0
@@ -18553,9 +18571,9 @@ SceneRoots:
- {fileID: 936607851}
- {fileID: 1970064229465066262}
- {fileID: 7242710482768570079}
+ - {fileID: 329931789}
- {fileID: 4950877034845451912}
- {fileID: 697611184958665259}
- - {fileID: 1363711749}
- {fileID: 1324482148}
- {fileID: 173039253}
- {fileID: 743883003}
diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FirstPart/FirstPartQuest.asset b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FirstPart/FirstPartQuest.asset
index e2f038aa516f720b6a69d2e6cce1a1b8ce21e237..ff448436d352aedf7e4f32602a1a3b96ad55af3c 100644
--- a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FirstPart/FirstPartQuest.asset
+++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FirstPart/FirstPartQuest.asset
@@ -17,5 +17,7 @@ MonoBehaviour:
questPrereq: []
questSteps:
- {fileID: 3109361365139701332, guid: a02f625a2336b2f46bf2e7d22b55b7aa, type: 3}
+ - {fileID: 2059339404615624799, guid: b2394b63df3c0d94791c0c777c1d7ac4, type: 3}
+ - {fileID: 7388949460918184852, guid: cb256c09fe674564f9fcc7f9ad09c9a4, type: 3}
reward: 200
startCutScene: {fileID: 6495384598351137644, guid: b6925bc607ad6d048abbd233d30db451, type: 3}
diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/FourthPartQuest.asset b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/FourthPartQuest.asset
index b826db81be8c5d7db96c81f08f30382729bcf6fb..ddebcc6aa585d226fa5e16f860e6bbbf568b2ce8 100644
--- a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/FourthPartQuest.asset
+++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/FourthPartQuest.asset
@@ -15,7 +15,7 @@ MonoBehaviour:
<id>k__BackingField: FourthPartQuest
displayName: Fourth Part
questPrereq:
- - {fileID: 11400000, guid: 1455f982b19c4af419f86c590974bd95, type: 2}
+ - {fileID: 11400000, guid: 6527b3979efd2394eb71d63c82bf8585, type: 2}
questSteps:
- {fileID: 9034925817477878778, guid: 137a152eb8c9a73439af804b7dd2abd1, type: 3}
- {fileID: 2533058413809311019, guid: a5ea5898a9226dd4a961038170b1dcb4, type: 3}
diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/SecondPart/SecondPartQuest.asset b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/SecondPart/SecondPartQuest.asset
index 86884d11f83c721fc80f5fcb413ca900c04374c6..e134d375610a4bc4451ae2e08e75194c5702e37b 100644
--- a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/SecondPart/SecondPartQuest.asset
+++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/SecondPart/SecondPartQuest.asset
@@ -15,8 +15,10 @@ MonoBehaviour:
<id>k__BackingField: SecondPartQuest
displayName: Second Part
questPrereq:
- - {fileID: 11400000, guid: 6527b3979efd2394eb71d63c82bf8585, type: 2}
+ - {fileID: 11400000, guid: 1455f982b19c4af419f86c590974bd95, type: 2}
questSteps:
- {fileID: 2190299236600376276, guid: d46e6cf568afe9a489b4956888b44680, type: 3}
+ - {fileID: 1940443205054926610, guid: 04c1665d17db44c45981ca470731b060, type: 3}
+ - {fileID: 4409694400009113235, guid: 6397dfdb8fb00074fbb06ca46c01c064, type: 3}
reward: 400
startCutScene: {fileID: 6495384598351137644, guid: 7ed84912ace90cb43b7b72e643b1f18b, type: 3}
diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/ThirdPart/ThirdPartQuest.asset b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/ThirdPart/ThirdPartQuest.asset
index bce1302235651f4a90481c5530ef0c4229c0d8a5..d2ed5a2fd4120b09621b9e1858b0d6a1a783824c 100644
--- a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/ThirdPart/ThirdPartQuest.asset
+++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/ThirdPart/ThirdPartQuest.asset
@@ -18,5 +18,7 @@ MonoBehaviour:
- {fileID: 11400000, guid: 170b8be828def4843ba3194453ee011e, type: 2}
questSteps:
- {fileID: 7049229370314528892, guid: 4182b65f595954540b54f86ae4df11a7, type: 3}
+ - {fileID: 851398358463362485, guid: 110cf3434a8edde4db5378d5ac7bcd29, type: 3}
+ - {fileID: 2358154313255904229, guid: 84b26a40b00f91f48bd50806b593b064, type: 3}
reward: 600
startCutScene: {fileID: 6495384598351137644, guid: 7ed84912ace90cb43b7b72e643b1f18b, type: 3}
diff --git a/IF3210-2024-Unity-AFK/ProjectSettings/EditorBuildSettings.asset b/IF3210-2024-Unity-AFK/ProjectSettings/EditorBuildSettings.asset
index fffbc5537236020fce8f009f6a7a11fbee337db2..da0ddb697bdf567ab6efcb38475b8a42de062011 100644
--- a/IF3210-2024-Unity-AFK/ProjectSettings/EditorBuildSettings.asset
+++ b/IF3210-2024-Unity-AFK/ProjectSettings/EditorBuildSettings.asset
@@ -5,18 +5,9 @@ EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes:
- - enabled: 0
- path: Assets/Level/Scenes/Main.unity
- guid: 06eea051d7918d04c9823621f5c812d3
- - enabled: 0
- path: Assets/Level/Scenes/Scene1.unity
- guid: f168082dd04aa8d44a735959a8bc8f40
- enabled: 1
path: Assets/Level/Scenes/MainMenu.unity
guid: 6103cb8d745e3bd47baa0ff6bd9837ec
- - enabled: 0
- path: Assets/Level/Scenes/TestRMA.unity
- guid: 3cf7e1b8f87c6904192ace6edd83596d
- enabled: 1
path: Assets/Level/Scenes/SettingsMenu.unity
guid: cc0032fa205f8f94389f0afc4c0360bb
diff --git a/IF3210-2024-Unity-AFK/ProjectSettings/ProjectSettings.asset b/IF3210-2024-Unity-AFK/ProjectSettings/ProjectSettings.asset
index 590bd37f99cbf5c7bc99645fc4f8a3c3bdf96daf..8143530a77e196c2a10ae60387e7a210ff6a2e3e 100644
--- a/IF3210-2024-Unity-AFK/ProjectSettings/ProjectSettings.asset
+++ b/IF3210-2024-Unity-AFK/ProjectSettings/ProjectSettings.asset
@@ -140,7 +140,11 @@ PlayerSettings:
visionOSBundleVersion: 1.0
tvOSBundleVersion: 1.0
bundleVersion: 0.1
- preloadedAssets: []
+ preloadedAssets:
+ - {fileID: 11400000, guid: 9145c9e5015cc0340853a7c3fa4565f8, type: 2}
+ - {fileID: 11400000, guid: 5c67378b93471e446ab529dcaf5193d5, type: 2}
+ - {fileID: -3542042799318375949, guid: 11f97696518e6a74e9fbdbc9d74899a6, type: 2}
+ - {fileID: -3508527533700250897, guid: 7cd4a6b44a75c85429e8556938d57b6a, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1