diff --git a/IF3210-2024-Unity-AFK/Assets/Code/Scripts/Console/Console.cs b/IF3210-2024-Unity-AFK/Assets/Code/Scripts/Console/Console.cs
index a374a832c8f1e9c3dcdeb498e86d8571e9914edd..5dd9223e371f2445e16e1376e0ef614138075efe 100644
--- a/IF3210-2024-Unity-AFK/Assets/Code/Scripts/Console/Console.cs
+++ b/IF3210-2024-Unity-AFK/Assets/Code/Scripts/Console/Console.cs
@@ -91,7 +91,9 @@ public class Console : MonoBehaviour
});
SKIPPER = new ConsoleCommand("skipper", "skip current quest", "skipper", () =>
{
- // Skip current quest
+ QuestManager questManager = GameObject.Find("QuestManager").GetComponent<QuestManager>();
+ questManager.SkipCurrentQuest();
+ Debug.Log("skipping current quest");
});
commandList = new List<object>
diff --git a/IF3210-2024-Unity-AFK/Assets/Code/Scripts/DataPersistance/DataPersistenceManager.cs b/IF3210-2024-Unity-AFK/Assets/Code/Scripts/DataPersistance/DataPersistenceManager.cs
index b639881a57aa5ad213237116967ae35a409f28ab..1aa5df392b0b9d1a80c978397a49517f13cf8ab7 100644
--- a/IF3210-2024-Unity-AFK/Assets/Code/Scripts/DataPersistance/DataPersistenceManager.cs
+++ b/IF3210-2024-Unity-AFK/Assets/Code/Scripts/DataPersistance/DataPersistenceManager.cs
@@ -9,6 +9,7 @@ using Unity.VisualScripting;
using UnityEngine.UI;
using Unity.XR.CoreUtils;
using TMPro;
+using UnityEngine.SceneManagement;
public class DataPersistenceManager : MonoBehaviour
{
@@ -62,9 +63,24 @@ public class DataPersistenceManager : MonoBehaviour
if (!PlayerPrefs.HasKey("kill_count")) PlayerPrefs.SetInt("kill_count", 0);
if (!PlayerPrefs.HasKey("death_count")) PlayerPrefs.SetInt("death_count", 0);
if (!PlayerPrefs.HasKey("spend_count")) PlayerPrefs.SetInt("spend_count", 0);
+ SceneManager.sceneLoaded += OnSceneLoaded;
LoadGame();
}
+ private void OnDestroy()
+ {
+ SceneManager.sceneLoaded -= OnSceneLoaded;
+ }
+
+ private void OnSceneLoaded(Scene scene, LoadSceneMode mode)
+ {
+ if (scene.name == "Main 2")
+ {
+ dataPersistenceObjects = FindAllDataPersistenceObjects();
+ LoadGame();
+ }
+ }
+
private void OnApplicationQuit()
{
DateTime startTime = DateTime.Parse(PlayerPrefs.GetString("start_time"));
@@ -80,6 +96,11 @@ public class DataPersistenceManager : MonoBehaviour
return new List<IDataPersistence>(dataPersistenceObjects);
}
+ private void Update()
+ {
+ dataPersistenceObjects = FindAllDataPersistenceObjects();
+ }
+
public void LoadGame()
{
// Load data from file
@@ -92,26 +113,19 @@ public class DataPersistenceManager : MonoBehaviour
NewGame();
}
- Debug.Log("pers lenggngngngn " + dataPersistenceObjects.Count);
// push data to all scripts
foreach (IDataPersistence dataPersistenceObject in dataPersistenceObjects)
{
- Debug.Log("pers obj " + dataPersistenceObject);
+ Debug.Log(dataPersistenceObject);
dataPersistenceObject.LoadData(gameData);
}
}
- private void Update()
- {
- dataPersistenceObjects = FindAllDataPersistenceObjects();
- }
-
public void SaveGame()
{
// pass data to update
foreach (IDataPersistence dataPersistenceObject in dataPersistenceObjects)
{
- Debug.Log(dataPersistenceObject);
dataPersistenceObject.SaveData(ref gameData);
}
@@ -145,4 +159,4 @@ public class DataPersistenceManager : MonoBehaviour
{
return dataHandler.LoadAllSaves();
}
-}
+}
\ No newline at end of file
diff --git a/IF3210-2024-Unity-AFK/Assets/Code/Scripts/EnemyController.cs b/IF3210-2024-Unity-AFK/Assets/Code/Scripts/EnemyController.cs
index 6e33c46ebe8ae942ea1f98d21e670da4d0009c45..147a03d80adadcbd42a49d5c84a5e431e276706e 100644
--- a/IF3210-2024-Unity-AFK/Assets/Code/Scripts/EnemyController.cs
+++ b/IF3210-2024-Unity-AFK/Assets/Code/Scripts/EnemyController.cs
@@ -163,6 +163,9 @@ public class EnemyController : MonoBehaviour
public void KillAllKeroco()
{
kerocoCountMax = 0;
+ kepalaKerocoMax = 0;
+ generalCountMax = 0;
+ kingCountMax = 0;
GameObject[] kerocos = GameObject.FindGameObjectsWithTag("Enemy");
GameObject[] kepalaKerocos = GameObject.FindGameObjectsWithTag("KepalaKeroco");
GameObject[] generals = GameObject.FindGameObjectsWithTag("General");
diff --git a/IF3210-2024-Unity-AFK/Assets/Code/Scripts/FPSController.cs b/IF3210-2024-Unity-AFK/Assets/Code/Scripts/FPSController.cs
index 9a78b763746a9ec194ce6296918cc30297a26009..8c340463006867f96122585332f66269cb3d0bbf 100644
--- a/IF3210-2024-Unity-AFK/Assets/Code/Scripts/FPSController.cs
+++ b/IF3210-2024-Unity-AFK/Assets/Code/Scripts/FPSController.cs
@@ -47,7 +47,12 @@ public class FPSController : BaseBehaviour, IDataPersistence
Cursor.lockState = CursorLockMode.Locked;
Cursor.visible = false;
- GameManager.StartQuest(firstQuestId);
+ QuestManager qm = GameObject.Find("QuestManager").GetComponent<QuestManager>();
+
+ if (!qm.GetQuestById(firstQuestId).state.Equals(QuestState.FINISHED))
+ {
+ GameManager.StartQuest(firstQuestId);
+ }
pistol.SetActive(false);
shotgun.SetActive(false);
sword.SetActive(false);
diff --git a/IF3210-2024-Unity-AFK/Assets/Code/Scripts/Quest/Quest.cs b/IF3210-2024-Unity-AFK/Assets/Code/Scripts/Quest/Quest.cs
index 0078192da59f0fb45d92826ed518a29183839ed3..abd2009144d2b7685fc37d8e873c0daf4bd7eb34 100644
--- a/IF3210-2024-Unity-AFK/Assets/Code/Scripts/Quest/Quest.cs
+++ b/IF3210-2024-Unity-AFK/Assets/Code/Scripts/Quest/Quest.cs
@@ -35,7 +35,7 @@ public class Quest
}
}
- private GameObject GetCurrentQuestStep()
+ public GameObject GetCurrentQuestStep()
{
GameObject questStep = null;
if (CurrentStepExists())
diff --git a/IF3210-2024-Unity-AFK/Assets/Code/Scripts/Quest/QuestManager.cs b/IF3210-2024-Unity-AFK/Assets/Code/Scripts/Quest/QuestManager.cs
index 1cd827e66daf747936058b9c78159d3b9a6e2174..b45d46f30d80b1c905e0faffa542aeab1c6ab257 100644
--- a/IF3210-2024-Unity-AFK/Assets/Code/Scripts/Quest/QuestManager.cs
+++ b/IF3210-2024-Unity-AFK/Assets/Code/Scripts/Quest/QuestManager.cs
@@ -103,7 +103,18 @@ public class QuestManager : MonoBehaviour, IDataPersistence
return idToQuestMap;
}
- private Quest GetQuestById(string id)
+ public void SkipCurrentQuest()
+ {
+ foreach (Quest quest in questMap.Values)
+ {
+ if (quest.state.Equals(QuestState.IN_PROGRESS))
+ {
+ GameManager.FinishQuest(quest.info.id);
+ }
+ }
+ }
+
+ public Quest GetQuestById(string id)
{
return questMap[id];
}
@@ -128,7 +139,7 @@ public class QuestManager : MonoBehaviour, IDataPersistence
int idx = 0;
foreach (Quest quest in questMap.Values)
{
- quest.state = (QuestState) data.questState[idx];
+ quest.state = (QuestState)data.questState[idx];
GameManager.QuestStateChange(quest);
idx++;
}
@@ -136,9 +147,13 @@ public class QuestManager : MonoBehaviour, IDataPersistence
}
public void SaveData(ref GameData data)
{
+ int idx = 0;
foreach (Quest quest in questMap.Values)
{
- data.questState.Append((int) quest.state);
+ data.questState[idx] = (int) quest.state;
+ Debug.Log("stettt " + (int) quest.state);
+
+ idx++;
}
}
}
diff --git a/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/BearIncrease.prefab b/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/BearIncrease.prefab
index 2ac8cf41a6e5e378818d51c09cb7f9f9762fea4c..cffd3bcc1e1ea189ec5887ea0d9adfd0b4fc887f 100644
--- a/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/BearIncrease.prefab
+++ b/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/BearIncrease.prefab
@@ -286,7 +286,7 @@ MonoBehaviour:
target: {fileID: 0}
distanceToStop: 2
player: {fileID: 0}
- owner: {fileID: 0}
+ weapon: {fileID: 0}
avoidDistance: 6
--- !u!1 &858561777231605297
GameObject:
diff --git a/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/General/General.prefab b/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/General/General.prefab
index 9aa9a889f2453d05d5536fabd259c7031d6c986e..fd5827e3b015db2ae696d5c2797a6054ecff4313 100644
--- a/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/General/General.prefab
+++ b/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/General/General.prefab
@@ -309,7 +309,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 5970e93311ed7a64abafca14bacba4d2, type: 3}
propertyPath: m_IsActive
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 5970e93311ed7a64abafca14bacba4d2, type: 3}
propertyPath: m_TagString
diff --git a/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/KepalaKeroco/KepalaKeroco.prefab b/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/KepalaKeroco/KepalaKeroco.prefab
index 6f5ee115234aba4ae4ee8db42bd77c8b503b1f2d..c8468ce13c9041eb1255eeee941e77ce22feafca 100644
--- a/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/KepalaKeroco/KepalaKeroco.prefab
+++ b/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/KepalaKeroco/KepalaKeroco.prefab
@@ -189,9 +189,6 @@ MonoBehaviour:
shootSound: {fileID: 8300000, guid: ec74244db866d154dba2cfb885da464c, type: 3}
reloadSound: {fileID: 8300000, guid: 5d3ab9b06f05efd41a31dceae0a40f88, type: 3}
outOfAmmoSound: {fileID: 8300000, guid: 6c381b82855de4548903d6de903dedfb, type: 3}
- shootingAudioSource: {fileID: 0}
- reloadAudioSource: {fileID: 0}
- outOfAmmoAudioSource: {fileID: 0}
--- !u!1 &7219233355402842943 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7196647888327801612, guid: f7a69565ab2ff984789da792b0969f4b, type: 3}
@@ -435,7 +432,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 4c3156e6c05dd974e8d74d50fc01f09a, type: 3}
propertyPath: m_IsActive
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 4c3156e6c05dd974e8d74d50fc01f09a, type: 3}
propertyPath: m_TagString
@@ -622,7 +619,7 @@ MonoBehaviour:
attackRange: 20
attackArea: 30
speed: 1
- spawnKerocoCooldown: 1
+ spawnKerocoCooldown: 25
gunSystem: {fileID: 846705046568214959}
--- !u!136 &5498472879649580988
CapsuleCollider:
diff --git a/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/Keroco.prefab b/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/Keroco.prefab
index cd9a46e5d325f8a646697bcb9ba4569a5b1e700c..9e40d515458933aa3e8ec9865512de98b5f3e724 100644
--- a/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/Keroco.prefab
+++ b/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/Keroco.prefab
@@ -481,6 +481,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b50b21c063772dd488c92b072f73cce0, type: 3}
m_Name:
m_EditorClassIdentifier:
+ baseDamage: 0
WeaponDamage: 10
LayerToHit:
serializedVersion: 2
@@ -509,7 +510,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &6362556716749362280
Transform:
m_ObjectHideFlags: 0
@@ -603,11 +604,12 @@ MonoBehaviour:
m_Bits: 8
MainPlayer: {fileID: 0}
attackArea: 10
- attackRange: 5
+ attackRange: 3
speed: 8
moveAnimation: IsChasing
attackAnimation: Attack
cooldownDuration: 3
+ haveOwner: 0
--- !u!114 &3829515506295796899
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/King/King.prefab b/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/King/King.prefab
index c0d1e88852bc3ee150bfe4f599d6894592141f44..48862a624eeea4343c0884100637fc713a6df4aa 100644
--- a/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/King/King.prefab
+++ b/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/King/King.prefab
@@ -9,7 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2310342336232065191}
- m_Layer: 0
+ m_Layer: 8
m_Name: PetPosition2
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -40,7 +40,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 5606326166826521576}
- m_Layer: 0
+ m_Layer: 8
m_Name: PetPosition1
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -70,6 +70,38 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
+ - target: {fileID: -9118025242015620493, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -9070493210130169274, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -9045469263409247392, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -8957831334042658566, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -8779331259821478841, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1.5
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1.5
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1.5
+ objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
propertyPath: m_LocalPosition.x
value: 15.03598
@@ -110,10 +142,222 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: -8183481454299698827, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -8006009767450596044, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -7775411853920973154, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -7760786952023322420, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -7657966619581158213, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -7360747449169001873, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -7121769801107515815, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -6621945745981909287, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -6417667819814013140, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -6370085079684087283, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -6234591296559379751, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -6170625038081293824, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -6056541330796499132, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -5857696854640597626, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -5711465929836668559, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -5561550452697079657, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -5195048882033904264, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -5085301246113094511, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -4999088201633142198, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -4728426434207774260, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -4501530691011011137, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -4372896282149530661, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -4332706925441422008, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -4278032810995721380, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -3884798910821002625, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -3799395697873186154, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -3542885339558904099, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -3478013746326755454, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -3214267034143217929, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -3091909129101683708, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -3086436065929644917, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -2937149141965382543, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -2084811680363313996, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -1781356600409242780, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -1738091582638529434, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -1703473491307067327, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -1462064639112088997, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -1425791611860619382, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -1268151995469589007, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -1215323356521919849, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -1200856079203341021, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -1010782818046803662, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -877423703413426222, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -751476226918971245, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -567240014926860372, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -552831747908440785, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -290750445479886849, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -203856693384778745, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: -76546954072915012, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 9171100556185337, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 390961419295672086, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 414117464747255840, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
propertyPath: m_Name
value: King
objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
propertyPath: m_IsActive
value: 0
@@ -122,10 +366,182 @@ PrefabInstance:
propertyPath: m_TagString
value: King
objectReference: {fileID: 0}
+ - target: {fileID: 1072800675642982989, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 1082271958561512970, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 1203090927246367344, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 1339101018200438765, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 1711505207429034123, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 2017927234042892172, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 2158975759703390516, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 2334541885690575373, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 2344967749671864042, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 2586065998465600510, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 2715566404302941441, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 2898355158428612036, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 3047284246813455858, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 3135921509060577837, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 3426704162167943418, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 3588849560313704984, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 3614653200513675785, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 3882815353823017779, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 3948933247560734027, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 3974016661214395164, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 4114030615378554161, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 4237274458221626025, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 4441848305933595309, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 4549111882529890269, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 5035886810029416814, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 5120724536234783804, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 5567237881422871782, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
- target: {fileID: 5866666021909216657, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 9100000, guid: 6274ab9f4f381504e944c753a91d0671, type: 2}
+ - target: {fileID: 6081355108740403386, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 6240733294840144465, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 6242591854960971276, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 6514210125699187276, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 7363479242261063072, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 7542137907003004905, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 7654984237464026937, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 7732535366517880319, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 7776229726456038893, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 8261160630648301274, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 8279239330272192641, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 8714665655525456601, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 8817898888258712963, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 8953972740105248388, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037727976738196030, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 9202586570038635510, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -253,7 +669,9 @@ MonoBehaviour:
reloadAnimation: Reload
chasingAnimation: Chasing
retreatAnimation: Retreat
- positionToOwner: []
+ positionToOwner:
+ - {fileID: 9201246382918732124}
+ - {fileID: 58360307679841736}
chasingRange: 10
retreatRange: 5
attackRange: 20
@@ -264,8 +682,15 @@ MonoBehaviour:
weaknessMultiplier: 0.8
speed: 3
spawnKerocoCooldown: 15
+ playerWeapons:
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
crippleCooldownDuration: 1
gunSystem: {fileID: 8404342860993974077}
+ backgroundMusic: {fileID: 8300000, guid: ea2d51c544565a141b2077540e1b5697, type: 3}
+ screechAudio: {fileID: 8300000, guid: 7d0f696c9bca0d844b9cbf0f4227ad01, type: 3}
+ laughAudio: {fileID: 8300000, guid: 6e56d32c9c87b7e43827cc1e6019cebd, type: 3}
--- !u!1001 &6830873422513509872
PrefabInstance:
m_ObjectHideFlags: 0
@@ -328,7 +753,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3745853452057941777, guid: f7a69565ab2ff984789da792b0969f4b, type: 3}
propertyPath: m_Layer
- value: 0
+ value: 8
objectReference: {fileID: 0}
- target: {fileID: 3815012777963350514, guid: f7a69565ab2ff984789da792b0969f4b, type: 3}
propertyPath: m_LocalPosition.x
@@ -344,7 +769,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4205521026231025682, guid: f7a69565ab2ff984789da792b0969f4b, type: 3}
propertyPath: m_Layer
- value: 0
+ value: 8
objectReference: {fileID: 0}
- target: {fileID: 6243173373811746305, guid: f7a69565ab2ff984789da792b0969f4b, type: 3}
propertyPath: m_Name
@@ -352,7 +777,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6243173373811746305, guid: f7a69565ab2ff984789da792b0969f4b, type: 3}
propertyPath: m_Layer
- value: 0
+ value: 8
objectReference: {fileID: 0}
- target: {fileID: 6833607587047669960, guid: f7a69565ab2ff984789da792b0969f4b, type: 3}
propertyPath: spread
@@ -380,23 +805,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7196647888327801600, guid: f7a69565ab2ff984789da792b0969f4b, type: 3}
propertyPath: m_Layer
- value: 0
+ value: 8
objectReference: {fileID: 0}
- target: {fileID: 7196647888327801602, guid: f7a69565ab2ff984789da792b0969f4b, type: 3}
propertyPath: m_Layer
- value: 0
+ value: 8
objectReference: {fileID: 0}
- target: {fileID: 7196647888327801604, guid: f7a69565ab2ff984789da792b0969f4b, type: 3}
propertyPath: m_Layer
- value: 0
+ value: 8
objectReference: {fileID: 0}
- target: {fileID: 7196647888327801606, guid: f7a69565ab2ff984789da792b0969f4b, type: 3}
propertyPath: m_Layer
- value: 0
+ value: 8
objectReference: {fileID: 0}
- target: {fileID: 7196647888327801612, guid: f7a69565ab2ff984789da792b0969f4b, type: 3}
propertyPath: m_Layer
- value: 0
+ value: 8
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 6833607587047669960, guid: f7a69565ab2ff984789da792b0969f4b, type: 3}
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 8084883303ceb7c8207422d83a78d2ef90e9fb27..d28b3d7354b6d8eff3dd5c4f981210d6d61a85d1 100644
--- a/IF3210-2024-Unity-AFK/Assets/Level/Scenes/Main 2.unity
+++ b/IF3210-2024-Unity-AFK/Assets/Level/Scenes/Main 2.unity
@@ -3025,84 +3025,6 @@ 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: MainPlayer
- value:
- objectReference: {fileID: 803879370}
- - target: {fileID: 348045508547534544, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
- propertyPath: positionToOwner.Array.size
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 348045508547534544, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
- propertyPath: positionToOwner.Array.data[0]
- value:
- objectReference: {fileID: 329931791}
- - target: {fileID: 348045508547534544, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
- propertyPath: positionToOwner.Array.data[1]
- value:
- objectReference: {fileID: 332599545}
- - target: {fileID: 837070589710612710, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
- propertyPath: m_Name
- value: King
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
---- !u!1 &329931791 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 9201246382918732124, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
- m_PrefabInstance: {fileID: 329931789}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &330974320 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1151832108952812, guid: 6c33ac13022677c4bb7913d9d496a50e, type: 3}
@@ -3314,11 +3236,6 @@ PrefabInstance:
insertIndex: -1
addedObject: {fileID: 1804109466}
m_SourcePrefab: {fileID: 100100000, guid: 0d2909c3862e975479d5eb092d70d279, type: 3}
---- !u!1 &332599545 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 58360307679841736, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
- m_PrefabInstance: {fileID: 329931789}
- m_PrefabAsset: {fileID: 0}
--- !u!1001 &345278042
PrefabInstance:
m_ObjectHideFlags: 0
@@ -11067,18 +10984,10 @@ PrefabInstance:
propertyPath: MainPlayer
value:
objectReference: {fileID: 803879370}
- - target: {fileID: 3657383671722862, guid: fe44ef7cfa14aeb4bafaab57bef8bcd7, type: 3}
- propertyPath: spawnKerocoCooldown
- value: 25
- objectReference: {fileID: 0}
- target: {fileID: 125898456715854681, guid: fe44ef7cfa14aeb4bafaab57bef8bcd7, type: 3}
propertyPath: m_Name
value: KepalaKeroco
objectReference: {fileID: 0}
- - target: {fileID: 125898456715854681, guid: fe44ef7cfa14aeb4bafaab57bef8bcd7, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- target: {fileID: 789422231072659939, guid: fe44ef7cfa14aeb4bafaab57bef8bcd7, type: 3}
propertyPath: m_LocalPosition.x
value: 9.28
@@ -15048,26 +14957,6 @@ PrefabInstance:
propertyPath: MainPlayer
value:
objectReference: {fileID: 803879370}
- - target: {fileID: 348045508547534544, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
- propertyPath: laughAudio
- value:
- objectReference: {fileID: 8300000, guid: 6e56d32c9c87b7e43827cc1e6019cebd, type: 3}
- - target: {fileID: 348045508547534544, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
- propertyPath: screechAudio
- value:
- objectReference: {fileID: 8300000, guid: 7d0f696c9bca0d844b9cbf0f4227ad01, type: 3}
- - target: {fileID: 348045508547534544, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
- propertyPath: backgroundMusic
- value:
- objectReference: {fileID: 8300000, guid: ea2d51c544565a141b2077540e1b5697, type: 3}
- - target: {fileID: 348045508547534544, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
- propertyPath: targetLayer.m_Bits
- value: 8
- objectReference: {fileID: 0}
- - target: {fileID: 348045508547534544, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
- propertyPath: playerWeapons.Array.size
- value: 3
- objectReference: {fileID: 0}
- target: {fileID: 348045508547534544, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
propertyPath: playerWeapons.Array.data[0]
value:
@@ -15084,15 +14973,16 @@ PrefabInstance:
propertyPath: m_Name
value: King
objectReference: {fileID: 0}
- - target: {fileID: 837070589710612710, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+--- !u!1 &1790942473 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 837070589710612710, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
+ m_PrefabInstance: {fileID: 1790942472}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1800556984
PrefabInstance:
m_ObjectHideFlags: 0
@@ -17039,11 +16929,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1130455608505835520, guid: 4dd21ac6e33aa6146a7b7b0367332af1, type: 3}
m_PrefabInstance: {fileID: 201340806}
m_PrefabAsset: {fileID: 0}
---- !u!1 &2091342201 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 837070589710612710, guid: c98aeaa500ff50d48ac11ae3f232869a, type: 3}
- m_PrefabInstance: {fileID: 329931789}
- m_PrefabAsset: {fileID: 0}
--- !u!4 &2091533281 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5381386135662447605, guid: 21a364ddeffc797439f2a5721660b0e6, type: 3}
@@ -17779,10 +17664,6 @@ PrefabInstance:
propertyPath: m_Name
value: General
objectReference: {fileID: 0}
- - target: {fileID: 2392205708116502428, guid: 1019550c11621c349ba0ba1bcafb4a2c, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- target: {fileID: 3060480472799935782, guid: 1019550c11621c349ba0ba1bcafb4a2c, type: 3}
propertyPath: m_LocalPosition.x
value: 13.713942
@@ -18019,18 +17900,10 @@ PrefabInstance:
propertyPath: m_Name
value: Keroco
objectReference: {fileID: 0}
- - target: {fileID: 1030568321855449875, guid: 7464348af7ec1b04cb63ed8a62f74b87, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- target: {fileID: 2541506280352382561, guid: 7464348af7ec1b04cb63ed8a62f74b87, type: 3}
propertyPath: MainPlayer
value:
objectReference: {fileID: 803879370}
- - target: {fileID: 2541506280352382561, guid: 7464348af7ec1b04cb63ed8a62f74b87, type: 3}
- propertyPath: attackRange
- value: 3
- objectReference: {fileID: 0}
- target: {fileID: 6362556716749362280, guid: 7464348af7ec1b04cb63ed8a62f74b87, type: 3}
propertyPath: m_LocalPosition.x
value: 19.58
@@ -18229,10 +18102,6 @@ PrefabInstance:
propertyPath: m_Name
value: BearIncrease
objectReference: {fileID: 0}
- - target: {fileID: 810414018641897104, guid: 9af55e16e07f7214daaebd1f64defd8d, type: 3}
- propertyPath: m_TagString
- value: Enemy
- objectReference: {fileID: 0}
- target: {fileID: 6017016057415308320, guid: 9af55e16e07f7214daaebd1f64defd8d, type: 3}
propertyPath: m_LocalPosition.x
value: 14.36
@@ -18458,7 +18327,7 @@ PrefabInstance:
- target: {fileID: 3777290212366644686, guid: aa6f29a441791614eb4b0f78ec563f40, type: 3}
propertyPath: EnemyKingRef
value:
- objectReference: {fileID: 2091342201}
+ objectReference: {fileID: 1790942473}
- target: {fileID: 3777290212366644686, guid: aa6f29a441791614eb4b0f78ec563f40, type: 3}
propertyPath: kingCountMax
value: 0
@@ -18783,7 +18652,6 @@ SceneRoots:
- {fileID: 936607851}
- {fileID: 1970064229465066262}
- {fileID: 7242710482768570079}
- - {fileID: 329931789}
- {fileID: 4950877034845451912}
- {fileID: 697611184958665259}
- {fileID: 1324482148}
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