From ded14f62c8919e7c533627d82cff60f5b293c9a8 Mon Sep 17 00:00:00 2001
From: RMA1403 <ravamaulana14@gmail.com>
Date: Sat, 11 May 2024 15:08:47 +0700
Subject: [PATCH] fix: scene main
---
.../Assets/Level/Scenes/Main 2.unity | 143 ++++++++----------
.../Quest/FourthPart/FourthPartQuest.asset | 1 +
2 files changed, 68 insertions(+), 76 deletions(-)
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 bfcb5b0c..f9c2d85a 100644
--- a/IF3210-2024-Unity-AFK/Assets/Level/Scenes/Main 2.unity
+++ b/IF3210-2024-Unity-AFK/Assets/Level/Scenes/Main 2.unity
@@ -5860,75 +5860,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 4424112051086032, guid: ebd56a6d944d9a446986d0cb28d5338d, type: 3}
m_PrefabInstance: {fileID: 1700439489}
m_PrefabAsset: {fileID: 0}
---- !u!1001 &626857163
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 100008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
- propertyPath: m_Name
- value: OrbHeal
- objectReference: {fileID: 0}
- - target: {fileID: 100008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
- propertyPath: m_LocalPosition.x
- value: 33.19978
- objectReference: {fileID: 0}
- - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
- propertyPath: m_LocalPosition.y
- value: -4.3997126
- objectReference: {fileID: 0}
- - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
- propertyPath: m_LocalPosition.z
- value: 49.32073
- objectReference: {fileID: 0}
- - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3614688502589247029, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
- propertyPath: player
- value:
- objectReference: {fileID: 803879370}
- - target: {fileID: 3614688502589247029, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
- propertyPath: player
- value:
- objectReference: {fileID: 803879370}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
--- !u!1001 &635240359
PrefabInstance:
m_ObjectHideFlags: 0
@@ -8184,6 +8115,71 @@ NavMeshObstacle:
m_CarveOnlyStationary: 1
m_Center: {x: 0, y: 0, z: 0}
m_TimeToStationary: 0.5
+--- !u!1001 &951915982
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 100008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+ propertyPath: m_Name
+ value: OrbHeal
+ objectReference: {fileID: 0}
+ - target: {fileID: 100008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 400008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 33.19978
+ objectReference: {fileID: 0}
+ - target: {fileID: 400008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -4.3997126
+ objectReference: {fileID: 0}
+ - target: {fileID: 400008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 49.32073
+ objectReference: {fileID: 0}
+ - target: {fileID: 400008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 400008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 400008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 400008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 400008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 400008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 400008, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3614688502589247029, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
+ propertyPath: player
+ value:
+ objectReference: {fileID: 803879370}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 5ddee63852f56514dad5a9e1740480de, type: 3}
--- !u!1 &963194225
GameObject:
m_ObjectHideFlags: 0
@@ -16864,11 +16860,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 2825129452562445933, guid: 728efbbacd783a146a43268236da14bd, type: 3}
m_PrefabInstance: {fileID: 2029597297}
m_PrefabAsset: {fileID: 0}
---- !u!1 &2032293648 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 100008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3}
- m_PrefabInstance: {fileID: 626857163}
- m_PrefabAsset: {fileID: 0}
--- !u!4 &2050559878 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 400000, guid: 65c6fec096cc69643b5869d0ed9de0be, type: 3}
@@ -18422,7 +18413,7 @@ PrefabInstance:
- target: {fileID: 2710870401587581456, guid: aa6f29a441791614eb4b0f78ec563f40, type: 3}
propertyPath: orbs.Array.data[2]
value:
- objectReference: {fileID: 2032293648}
+ objectReference: {fileID: 0}
- target: {fileID: 3777290212366644686, guid: aa6f29a441791614eb4b0f78ec563f40, type: 3}
propertyPath: terrain
value:
@@ -18739,7 +18730,7 @@ SceneRoots:
- {fileID: 294113759}
- {fileID: 449399895}
- {fileID: 803241245}
- - {fileID: 626857163}
+ - {fileID: 951915982}
- {fileID: 84448838}
- {fileID: 1096088233}
- {fileID: 1244925701}
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 ddebcc6a..1aba09ce 100644
--- a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/FourthPartQuest.asset
+++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/FourthPartQuest.asset
@@ -20,5 +20,6 @@ MonoBehaviour:
- {fileID: 9034925817477878778, guid: 137a152eb8c9a73439af804b7dd2abd1, type: 3}
- {fileID: 2533058413809311019, guid: a5ea5898a9226dd4a961038170b1dcb4, type: 3}
- {fileID: 8277191341983839390, guid: 532749565fc31f74e90f150eac15ce21, type: 3}
+ - {fileID: 4419727373730916708, guid: 3e856fa67a2c0044da4cbb1864de28e2, type: 3}
reward: 800
startCutScene: {fileID: 6495384598351137644, guid: 7ed84912ace90cb43b7b72e643b1f18b, type: 3}
--
GitLab