From 5f7589ef0f7c454990f9e6ca8e44d245fbcd8375 Mon Sep 17 00:00:00 2001
From: HoseaNA <13521057@std.stei.itb.ac.id>
Date: Sat, 11 May 2024 12:11:06 +0700
Subject: [PATCH] feat: adjustments to main scene
---
.../Assets/Level/Prefabs/King/King.prefab | 106 ++++++++-
.../Assets/Level/Scenes/Main 2.unity | 211 ++++++++----------
2 files changed, 197 insertions(+), 120 deletions(-)
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 2446d02c..c0d1e888 100644
--- a/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/King/King.prefab
+++ b/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/King/King.prefab
@@ -1,5 +1,67 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &58360307679841736
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2310342336232065191}
+ m_Layer: 0
+ m_Name: PetPosition2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &2310342336232065191
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 58360307679841736}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 2.5, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 60253137160692316}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &9201246382918732124
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5606326166826521576}
+ m_Layer: 0
+ m_Name: PetPosition1
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &5606326166826521576
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9201246382918732124}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -2.5, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 60253137160692316}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &530499610606405047
PrefabInstance:
m_ObjectHideFlags: 0
@@ -50,14 +112,32 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
propertyPath: m_Name
- value: Ganfaul M Aure
+ value: King
objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_TagString
+ value: King
+ objectReference: {fileID: 0}
+ - target: {fileID: 5866666021909216657, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ propertyPath: m_Controller
+ value:
+ objectReference: {fileID: 9100000, guid: 6274ab9f4f381504e944c753a91d0671, type: 2}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
insertIndex: 0
addedObject: {fileID: 8060019003118882648}
+ - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 5606326166826521576}
+ - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 2310342336232065191}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 98dfc9728ff817f4aa99880e305b4f5c, type: 3}
insertIndex: -1
@@ -165,10 +245,27 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9acc46f597756224d8112395a3c4f65d, type: 3}
m_Name:
m_EditorClassIdentifier:
- target: {fileID: 0}
- meleeAttackRange: 5
+ targetLayer:
+ serializedVersion: 2
+ m_Bits: 8
+ MainPlayer: {fileID: 0}
+ attackAnimation: Attack
+ reloadAnimation: Reload
+ chasingAnimation: Chasing
+ retreatAnimation: Retreat
+ positionToOwner: []
+ chasingRange: 10
+ retreatRange: 5
+ attackRange: 20
+ attackArea: 30
crippleAttackRange: 2
+ crippleDamage: 5
+ slownessMultiplier: 0.8
+ weaknessMultiplier: 0.8
speed: 3
+ spawnKerocoCooldown: 15
+ crippleCooldownDuration: 1
+ gunSystem: {fileID: 8404342860993974077}
--- !u!1001 &6830873422513509872
PrefabInstance:
m_ObjectHideFlags: 0
@@ -353,9 +450,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!4 &7655423131033009154 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3815012777963350514, 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 9d249968..2211d13d 100644
--- a/IF3210-2024-Unity-AFK/Assets/Level/Scenes/Main 2.unity
+++ b/IF3210-2024-Unity-AFK/Assets/Level/Scenes/Main 2.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 705507994}
- m_IndirectSpecularColor: {r: 0.10493205, g: 0.1865589, b: 0.23119539, a: 1}
+ m_IndirectSpecularColor: {r: 0.10526762, g: 0.18650743, b: 0.23125023, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -3029,46 +3029,36 @@ PrefabInstance:
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
+ 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}
- - 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}
+--- !u!1 &329931791 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 9201246382918732124, 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}
@@ -3280,6 +3270,11 @@ 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
@@ -5821,6 +5816,71 @@ 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: 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!1001 &635240359
PrefabInstance:
m_ObjectHideFlags: 0
@@ -11465,94 +11525,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: f2c095551ebc2fd4487ea010e020c890, type: 3}
- propertyPath: MainPlayer
- value:
- objectReference: {fileID: 803879370}
- - target: {fileID: 365717458043885804, guid: f2c095551ebc2fd4487ea010e020c890, type: 3}
- propertyPath: positionToOwner.Array.size
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 365717458043885804, guid: f2c095551ebc2fd4487ea010e020c890, type: 3}
- propertyPath: positionToOwner.Array.data[0]
- value:
- objectReference: {fileID: 1363711752}
- - target: {fileID: 365717458043885804, guid: f2c095551ebc2fd4487ea010e020c890, type: 3}
- propertyPath: positionToOwner.Array.data[1]
- value:
- objectReference: {fileID: 1363711751}
- - target: {fileID: 8396581159872611695, guid: f2c095551ebc2fd4487ea010e020c890, type: 3}
- propertyPath: m_LocalPosition.x
- value: 12.682841
- objectReference: {fileID: 0}
- - target: {fileID: 8396581159872611695, guid: f2c095551ebc2fd4487ea010e020c890, type: 3}
- propertyPath: m_LocalPosition.y
- value: 80.05
- objectReference: {fileID: 0}
- - target: {fileID: 8396581159872611695, guid: f2c095551ebc2fd4487ea010e020c890, type: 3}
- propertyPath: m_LocalPosition.z
- value: 8.363163
- objectReference: {fileID: 0}
- - target: {fileID: 8396581159872611695, guid: f2c095551ebc2fd4487ea010e020c890, type: 3}
- propertyPath: m_LocalRotation.w
- value: 0.7021817
- objectReference: {fileID: 0}
- - target: {fileID: 8396581159872611695, guid: f2c095551ebc2fd4487ea010e020c890, type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 8396581159872611695, guid: f2c095551ebc2fd4487ea010e020c890, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0.7119978
- objectReference: {fileID: 0}
- - target: {fileID: 8396581159872611695, guid: f2c095551ebc2fd4487ea010e020c890, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 8396581159872611695, guid: f2c095551ebc2fd4487ea010e020c890, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8396581159872611695, guid: f2c095551ebc2fd4487ea010e020c890, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 90.795
- objectReference: {fileID: 0}
- - target: {fileID: 8396581159872611695, guid: f2c095551ebc2fd4487ea010e020c890, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 9209147377552826325, guid: f2c095551ebc2fd4487ea010e020c890, type: 3}
- propertyPath: m_Name
- value: King
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: f2c095551ebc2fd4487ea010e020c890, type: 3}
---- !u!1 &1363711750 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 9209147377552826325, guid: f2c095551ebc2fd4487ea010e020c890, type: 3}
- m_PrefabInstance: {fileID: 1363711749}
- m_PrefabAsset: {fileID: 0}
---- !u!1 &1363711751 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 8544298627315016519, guid: f2c095551ebc2fd4487ea010e020c890, type: 3}
- m_PrefabInstance: {fileID: 1363711749}
- m_PrefabAsset: {fileID: 0}
---- !u!1 &1363711752 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 4319214268273984996, guid: f2c095551ebc2fd4487ea010e020c890, type: 3}
- m_PrefabInstance: {fileID: 1363711749}
- m_PrefabAsset: {fileID: 0}
--- !u!1001 &1367056743
PrefabInstance:
m_ObjectHideFlags: 0
@@ -16775,6 +16747,11 @@ 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: 5ddee63852f56514dad5a9e1740480de, type: 3}
+ m_PrefabInstance: {fileID: 626857163}
+ m_PrefabAsset: {fileID: 0}
--- !u!4 &2050559878 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 400000, guid: 65c6fec096cc69643b5869d0ed9de0be, type: 3}
@@ -16921,6 +16898,11 @@ 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}
@@ -18323,7 +18305,7 @@ PrefabInstance:
- target: {fileID: 2710870401587581456, guid: aa6f29a441791614eb4b0f78ec563f40, type: 3}
propertyPath: orbs.Array.data[2]
value:
- objectReference: {fileID: 0}
+ objectReference: {fileID: 2032293648}
- target: {fileID: 3777290212366644686, guid: aa6f29a441791614eb4b0f78ec563f40, type: 3}
propertyPath: terrain
value:
@@ -18335,7 +18317,7 @@ PrefabInstance:
- target: {fileID: 3777290212366644686, guid: aa6f29a441791614eb4b0f78ec563f40, type: 3}
propertyPath: EnemyKingRef
value:
- objectReference: {fileID: 0}
+ objectReference: {fileID: 2091342201}
- target: {fileID: 3777290212366644686, guid: aa6f29a441791614eb4b0f78ec563f40, type: 3}
propertyPath: kingCountMax
value: 0
@@ -18640,6 +18622,7 @@ SceneRoots:
- {fileID: 294113759}
- {fileID: 449399895}
- {fileID: 803241245}
+ - {fileID: 626857163}
- {fileID: 84448838}
- {fileID: 1096088233}
- {fileID: 1244925701}
--
GitLab