diff --git a/.plastic/plastic.changes b/.plastic/plastic.changes index bfa9a91d7fdfac6310488407ddfbda1cd039f45a..23d0b461be149a5a29bffcb87bb2fda9fae8464a 100644 Binary files a/.plastic/plastic.changes and b/.plastic/plastic.changes differ diff --git a/.plastic/plastic.wktree b/.plastic/plastic.wktree index 1fc629401f962c3d78b4e189d70123f6111f20d2..e5021fbea2a13593e8dbe5d7ac833b0e39062f77 100644 Binary files a/.plastic/plastic.wktree and b/.plastic/plastic.wktree differ diff --git a/Assets/Prefabs/Bullet/KepalaBullet.prefab b/Assets/Prefabs/Bullet/KepalaBullet.prefab index 6c5cb0be59c1a289a7ea7da5e31ca0cb120c0952..5fc003700c19586835075fe8589bcd5c5a20e2e2 100644 --- a/Assets/Prefabs/Bullet/KepalaBullet.prefab +++ b/Assets/Prefabs/Bullet/KepalaBullet.prefab @@ -15,7 +15,7 @@ GameObject: - component: {fileID: 4975042323023781935} - component: {fileID: -1096706665746059051} - component: {fileID: -7277110434111185755} - m_Layer: 0 + m_Layer: 7 m_Name: KepalaBullet m_TagString: PlayerBullet m_Icon: {fileID: 0} diff --git a/Assets/Prefabs/Bullet/RajaBullet.prefab b/Assets/Prefabs/Bullet/RajaBullet.prefab index 96639577eefccfcc2e4fc1f090af6c96c9f24c40..b5f1bd1932128f3d2edc47ce5e06ce13a4d99ad5 100644 --- a/Assets/Prefabs/Bullet/RajaBullet.prefab +++ b/Assets/Prefabs/Bullet/RajaBullet.prefab @@ -15,7 +15,7 @@ GameObject: - component: {fileID: 4975042323023781935} - component: {fileID: -1096706665746059051} - component: {fileID: -7277110434111185755} - m_Layer: 0 + m_Layer: 7 m_Name: RajaBullet m_TagString: PlayerBullet m_Icon: {fileID: 0} diff --git a/Assets/Prefabs/Enemy/Raja.prefab b/Assets/Prefabs/Enemy/Raja.prefab index 21eea8f8c2ec2bce2767525d8c9b0a0f2245a581..f944c52fcedfeb4dc6e648440f49114d4ec603ef 100644 --- a/Assets/Prefabs/Enemy/Raja.prefab +++ b/Assets/Prefabs/Enemy/Raja.prefab @@ -2766,6 +2766,7 @@ GameObject: - component: {fileID: -521841738368617772} - component: {fileID: 6287959166191641371} - component: {fileID: 4251147995789846570} + - component: {fileID: 1718174398448091442} m_Layer: 0 m_Name: Raja m_TagString: Untagged @@ -2921,6 +2922,29 @@ MonoBehaviour: hitParticle: {fileID: 0} healthBar: {fileID: 3619925109871377233} isDead: 0 +--- !u!136 &1718174398448091442 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2836004475591695743} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 127 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 128 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 2.85 + m_Height: 10.01 + m_Direction: 1 + m_Center: {x: 0, y: 2.04, z: 0} --- !u!1 &4145036871301099801 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Nav.meta b/Assets/Prefabs/Nav.meta new file mode 100644 index 0000000000000000000000000000000000000000..c7f54bd19afe6b52de7722ef551d737267510091 --- /dev/null +++ b/Assets/Prefabs/Nav.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cd30d1f09ae5d054ea52771cfcbf6882 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Nav/NavMesh Surface.prefab b/Assets/Prefabs/Nav/NavMesh Surface.prefab new file mode 100644 index 0000000000000000000000000000000000000000..3a52ceefee7fc0e89d0bc89adf299c2e3fab611e --- /dev/null +++ b/Assets/Prefabs/Nav/NavMesh Surface.prefab @@ -0,0 +1,161 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1401507406560278165 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3745991675566015542} + - component: {fileID: 8893424897307342133} + - component: {fileID: 8092474291171806006} + - component: {fileID: 5935386276134537980} + - component: {fileID: 1725549313017133} + m_Layer: 0 + m_Name: NavMesh Surface + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3745991675566015542 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401507406560278165} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 8.008923, y: 0.7058714, z: 10.727037} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8893424897307342133 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401507406560278165} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AgentTypeID: -1372625422 + m_CollectObjects: 0 + m_Size: {x: 10, y: 10, z: 10} + m_Center: {x: 0, y: 2, z: 0} + m_LayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_UseGeometry: 0 + m_DefaultArea: 0 + m_GenerateLinks: 0 + m_IgnoreNavMeshAgent: 1 + m_IgnoreNavMeshObstacle: 1 + m_OverrideTileSize: 0 + m_TileSize: 256 + m_OverrideVoxelSize: 0 + m_VoxelSize: 0.16666667 + m_MinRegionArea: 2 + m_NavMeshData: {fileID: 23800000, guid: 5d705e93abd9ee04098667f568a0105f, type: 2} + m_BuildHeightMesh: 0 +--- !u!114 &8092474291171806006 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401507406560278165} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AgentTypeID: 0 + m_CollectObjects: 0 + m_Size: {x: 10, y: 10, z: 10} + m_Center: {x: 0, y: 2, z: 0} + m_LayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_UseGeometry: 0 + m_DefaultArea: 0 + m_GenerateLinks: 0 + m_IgnoreNavMeshAgent: 1 + m_IgnoreNavMeshObstacle: 1 + m_OverrideTileSize: 0 + m_TileSize: 256 + m_OverrideVoxelSize: 0 + m_VoxelSize: 0.16666667 + m_MinRegionArea: 2 + m_NavMeshData: {fileID: 23800000, guid: 80e70a015e626c9498f0d0ea083ac36e, type: 2} + m_BuildHeightMesh: 0 +--- !u!114 &5935386276134537980 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401507406560278165} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AgentTypeID: -334000983 + m_CollectObjects: 0 + m_Size: {x: 10, y: 10, z: 10} + m_Center: {x: 0, y: 2, z: 0} + m_LayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_UseGeometry: 0 + m_DefaultArea: 0 + m_GenerateLinks: 0 + m_IgnoreNavMeshAgent: 1 + m_IgnoreNavMeshObstacle: 1 + m_OverrideTileSize: 0 + m_TileSize: 256 + m_OverrideVoxelSize: 0 + m_VoxelSize: 0.16666667 + m_MinRegionArea: 2 + m_NavMeshData: {fileID: 23800000, guid: afce55d8f357fe846b476f207804cbed, type: 2} + m_BuildHeightMesh: 0 +--- !u!114 &1725549313017133 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401507406560278165} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AgentTypeID: 1479372276 + m_CollectObjects: 0 + m_Size: {x: 10, y: 10, z: 10} + m_Center: {x: 0, y: 2, z: 0} + m_LayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_UseGeometry: 0 + m_DefaultArea: 0 + m_GenerateLinks: 0 + m_IgnoreNavMeshAgent: 1 + m_IgnoreNavMeshObstacle: 1 + m_OverrideTileSize: 0 + m_TileSize: 256 + m_OverrideVoxelSize: 0 + m_VoxelSize: 0.16666667 + m_MinRegionArea: 2 + m_NavMeshData: {fileID: 23800000, guid: b897b1ce423e2bd40b48876b76087fa7, type: 2} + m_BuildHeightMesh: 0 diff --git a/Assets/Prefabs/Nav/NavMesh Surface.prefab.meta b/Assets/Prefabs/Nav/NavMesh Surface.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..fb1ff58e9ea1244579b8b0fce6cf74c519f12d5e --- /dev/null +++ b/Assets/Prefabs/Nav/NavMesh Surface.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5dcff9e2eb341014c8098f8c95d71fdd +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player/PlayerObject.prefab b/Assets/Prefabs/Player/PlayerObject.prefab index 082e7a0aac4f547b79415c19db7e5ceee63d9f43..364a571e36f98e3e1784c45a08ecf966a7a54d12 100644 --- a/Assets/Prefabs/Player/PlayerObject.prefab +++ b/Assets/Prefabs/Player/PlayerObject.prefab @@ -5302,9 +5302,9 @@ CapsuleCollider: m_Enabled: 1 serializedVersion: 2 m_Radius: 0.1 - m_Height: 0.89 + m_Height: 1.43 m_Direction: 0 - m_Center: {x: 0, y: 0, z: 0} + m_Center: {x: -0.32, y: 0, z: 0} --- !u!114 &5675895555451934079 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Level04.meta b/Assets/Scenes/Level04.meta new file mode 100644 index 0000000000000000000000000000000000000000..66d8d1b3837c878ef6ce680a3d86426c023e6b47 --- /dev/null +++ b/Assets/Scenes/Level04.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f8792ab4f0906bb43b6d93294a11f4ff +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Level04.unity b/Assets/Scenes/Level04.unity index 38833f90988e50ba677661585d1b206e0c193d2d..e1d860c8e480c2f523f83cf9a90488ea6d4f320c 100644 --- a/Assets/Scenes/Level04.unity +++ b/Assets/Scenes/Level04.unity @@ -443,6 +443,67 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1001 &100604130 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1725549313017133, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} + propertyPath: m_NavMeshData + value: + objectReference: {fileID: 23800000, guid: 4bd59ab2b0d6efd45b7c3b008198d66f, type: 2} + - target: {fileID: 1401507406560278165, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} + propertyPath: m_Name + value: NavMesh Surface + objectReference: {fileID: 0} + - target: {fileID: 3745991675566015542, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} + propertyPath: m_LocalPosition.x + value: 8.008923 + objectReference: {fileID: 0} + - target: {fileID: 3745991675566015542, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} + propertyPath: m_LocalPosition.y + value: 0.7058714 + objectReference: {fileID: 0} + - target: {fileID: 3745991675566015542, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} + propertyPath: m_LocalPosition.z + value: 10.727037 + objectReference: {fileID: 0} + - target: {fileID: 3745991675566015542, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3745991675566015542, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3745991675566015542, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3745991675566015542, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3745991675566015542, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3745991675566015542, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3745991675566015542, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} --- !u!4 &102528149 stripped Transform: m_CorrespondingSourceObject: {fileID: 4028678988923622, guid: 88e9169a6e1a34d43a3188cf129af93a, type: 3} @@ -694,10 +755,106 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 10611051371140767, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 98510429900757671, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 111095796027925020, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 141733828341446225, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 183520828400665499, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 240270280924257701, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 262611387022263920, guid: f261153ff91a0b448945dffee424d778, type: 3} propertyPath: playerHealthBar value: objectReference: {fileID: 1309259527} + - target: {fileID: 418493915593234897, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 511562482271535540, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 539235784477994410, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 571759072897899360, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 624936553962763146, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 985186693451391437, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1105229345544043428, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1218984775121336360, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1438624995374435143, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1450397708615559542, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1489486500537765880, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1502019858074972381, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1552546328675413712, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1687505895957060479, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1723943717313384645, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1789709353946100431, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1944812699015686067, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2259681934802464156, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 2278620806903188652, guid: f261153ff91a0b448945dffee424d778, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -738,10 +895,66 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2382078878515836464, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2394009340182875929, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 2450487762869100509, guid: f261153ff91a0b448945dffee424d778, type: 3} propertyPath: m_Data.m_SourceObjects.m_Item0.transform value: objectReference: {fileID: 821178760} + - target: {fileID: 2530263654646230225, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2647512005773472980, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2710493038336321166, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2886509013297459298, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2922460976011488184, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2959013118112206112, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2974871643164368660, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3128367206412337611, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3147160541501050695, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3196663760324820726, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3250287157746246402, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3274713380308481474, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 3281845298765165036, guid: f261153ff91a0b448945dffee424d778, type: 3} propertyPath: m_LocalPosition.x value: 1.5 @@ -770,23 +983,320 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} + - target: {fileID: 3322074819348834269, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3454197400009792562, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3470596823410297499, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3507548502831134383, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3701955119647635376, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3743083047221806921, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3872465322757129655, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3926006103878155331, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4025124026090718831, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4053237017895311342, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4112397282274201077, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4174791845204512535, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4181598504713468124, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4190069495318692624, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4216690280821785136, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4224138543639044210, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4244259610616728416, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4274773662417507972, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4390592330831483004, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4411580427427710305, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4448185482786385917, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4468189462575005806, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4480909658890287019, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4486657855135263505, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4670788032256272153, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4709597725214237689, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4905519659965186159, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4961224193925144622, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4988589223366516739, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4988589223366516741, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4988589223366516743, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5048622075437774043, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5055838943197304032, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5079468505966006854, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5124574869939454149, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5280137902586023076, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5367472827572243993, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5407539025358702913, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5586817003470205941, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5709587347954857107, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5718545440230401340, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5778877140501098026, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6067999911416899373, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6391958833867749764, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6439646288099704085, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6452806882455297377, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6463425085602369861, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6624749609264376233, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6675212004723330068, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6704663246798641358, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6800604372433129720, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6800604372433129722, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7047442151319247201, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7080858245671594831, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7140374235172703642, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7169104480730326919, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7350971910257513909, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7392108192641862985, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7617817911954447447, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7647936714873209733, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7760449675173512504, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7763654784006614225, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7880994873612118240, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 8115979126246014011, guid: f261153ff91a0b448945dffee424d778, type: 3} propertyPath: aimPos value: objectReference: {fileID: 821178760} + - target: {fileID: 8356651896510578854, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8434642266976606859, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8527087217876247107, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8671453634919795195, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8736930625151719503, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8770355974940153746, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8773906726982000844, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8808234064598230610, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 8820153197437393849, guid: f261153ff91a0b448945dffee424d778, type: 3} propertyPath: m_Data.m_SourceObjects.m_Item0.transform value: objectReference: {fileID: 821178760} + - target: {fileID: 8901125506777126682, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 8997919122600711995, guid: f261153ff91a0b448945dffee424d778, type: 3} propertyPath: m_Name value: PlayerObject objectReference: {fileID: 0} + - target: {fileID: 8997919122600711995, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 9090714396435109988, guid: f261153ff91a0b448945dffee424d778, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 9166355729041913690, guid: f261153ff91a0b448945dffee424d778, type: 3} propertyPath: m_Data.m_SourceObjects.m_Item0.transform value: objectReference: {fileID: 821178760} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: -2499661546830387949, guid: f261153ff91a0b448945dffee424d778, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -2623,6 +3133,75 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 615688eb22692db418c6f8646a5b507c, type: 3} +--- !u!1001 &1047754371 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1718174398448091442, guid: 367cb8bdaca98b7428dcc2671cae981b, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1718174398448091442, guid: 367cb8bdaca98b7428dcc2671cae981b, type: 3} + propertyPath: m_ProvidesContacts + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1718174398448091442, guid: 367cb8bdaca98b7428dcc2671cae981b, type: 3} + propertyPath: m_LayerOverridePriority + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2836004475591197023, guid: 367cb8bdaca98b7428dcc2671cae981b, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2836004475591197023, guid: 367cb8bdaca98b7428dcc2671cae981b, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2836004475591197023, guid: 367cb8bdaca98b7428dcc2671cae981b, type: 3} + propertyPath: m_LocalPosition.z + value: 21.58 + objectReference: {fileID: 0} + - target: {fileID: 2836004475591197023, guid: 367cb8bdaca98b7428dcc2671cae981b, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2836004475591197023, guid: 367cb8bdaca98b7428dcc2671cae981b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2836004475591197023, guid: 367cb8bdaca98b7428dcc2671cae981b, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2836004475591197023, guid: 367cb8bdaca98b7428dcc2671cae981b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2836004475591197023, guid: 367cb8bdaca98b7428dcc2671cae981b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2836004475591197023, guid: 367cb8bdaca98b7428dcc2671cae981b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 2836004475591197023, guid: 367cb8bdaca98b7428dcc2671cae981b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2836004475591695743, guid: 367cb8bdaca98b7428dcc2671cae981b, type: 3} + propertyPath: m_Name + value: Raja + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 367cb8bdaca98b7428dcc2671cae981b, type: 3} --- !u!1 &1049069803 GameObject: m_ObjectHideFlags: 0 @@ -3217,6 +3796,8 @@ Transform: - {fileID: 2089559259} - {fileID: 204019709} - {fileID: 1960755393} + - {fileID: 1552010351} + - {fileID: 1999985456} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1359708691 stripped @@ -3448,6 +4029,76 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1530808504} m_Mesh: {fileID: 4300062, guid: 8d21d1605928a4d46b68ae5628341f42, type: 3} +--- !u!1001 &1552010350 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1341916572} + m_Modifications: + - target: {fileID: 1920013219632090776, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + propertyPath: mob + value: + objectReference: {fileID: 1248815240492774, guid: 7ba28ba2ca766324a80b9290965e1c6b, type: 3} + - target: {fileID: 1920013219632090776, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + propertyPath: timer + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 5278615086690929694, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + propertyPath: m_LocalPosition.x + value: 7.97 + objectReference: {fileID: 0} + - target: {fileID: 5278615086690929694, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + propertyPath: m_LocalPosition.y + value: -0.849741 + objectReference: {fileID: 0} + - target: {fileID: 5278615086690929694, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + propertyPath: m_LocalPosition.z + value: 25.15 + objectReference: {fileID: 0} + - target: {fileID: 5278615086690929694, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5278615086690929694, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5278615086690929694, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5278615086690929694, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5278615086690929694, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5278615086690929694, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5278615086690929694, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7577836556326953487, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + propertyPath: m_Name + value: KepalaKrocoSpawner + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} +--- !u!4 &1552010351 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5278615086690929694, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + m_PrefabInstance: {fileID: 1552010350} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1557739912 PrefabInstance: m_ObjectHideFlags: 0 @@ -4657,6 +5308,68 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 615688eb22692db418c6f8646a5b507c, type: 3} +--- !u!1001 &1999985455 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1341916572} + m_Modifications: + - target: {fileID: 5278615086690929694, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + propertyPath: m_LocalPosition.x + value: 22.29141 + objectReference: {fileID: 0} + - target: {fileID: 5278615086690929694, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + propertyPath: m_LocalPosition.y + value: -0.849741 + objectReference: {fileID: 0} + - target: {fileID: 5278615086690929694, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + propertyPath: m_LocalPosition.z + value: 24.738848 + objectReference: {fileID: 0} + - target: {fileID: 5278615086690929694, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5278615086690929694, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5278615086690929694, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5278615086690929694, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5278615086690929694, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5278615086690929694, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5278615086690929694, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7577836556326953487, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + propertyPath: m_Name + value: Spawner (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} +--- !u!4 &1999985456 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5278615086690929694, guid: d6cf57733c285e14a81ba8b90492c037, type: 3} + m_PrefabInstance: {fileID: 1999985455} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2018751107 PrefabInstance: m_ObjectHideFlags: 0 @@ -4996,7 +5709,9 @@ SceneRoots: - {fileID: 95133364} - {fileID: 1341916572} - {fileID: 260192107} + - {fileID: 1047754371} - {fileID: 1719621484} - {fileID: 821178760} + - {fileID: 100604130} - {fileID: 433719397} - {fileID: 408963295} diff --git a/Assets/Scenes/Level04/NavMesh-NavMesh Surface.asset b/Assets/Scenes/Level04/NavMesh-NavMesh Surface.asset new file mode 100644 index 0000000000000000000000000000000000000000..0cabf2b8fdf3d2971c66cd973459852f2dc3719b Binary files /dev/null and b/Assets/Scenes/Level04/NavMesh-NavMesh Surface.asset differ diff --git a/Assets/Scenes/Level04/NavMesh-NavMesh Surface.asset.meta b/Assets/Scenes/Level04/NavMesh-NavMesh Surface.asset.meta new file mode 100644 index 0000000000000000000000000000000000000000..7125f000c35ffd87960925eb7a0f405071abcacc --- /dev/null +++ b/Assets/Scenes/Level04/NavMesh-NavMesh Surface.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4bd59ab2b0d6efd45b7c3b008198d66f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 23800000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/TemplateScene.unity b/Assets/Scenes/TemplateScene.unity index 88c27302211cc880812bd8063c7078581d0ced37..14abbf91409b61db16ae9cade34cb59eed1713d6 100644 --- a/Assets/Scenes/TemplateScene.unity +++ b/Assets/Scenes/TemplateScene.unity @@ -4160,165 +4160,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8f9905bf996cdc74cb9766b8781e580e, type: 3} ---- !u!1 &2082940273 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2082940275} - - component: {fileID: 2082940274} - - component: {fileID: 2082940276} - - component: {fileID: 2082940277} - - component: {fileID: 2082940278} - m_Layer: 0 - m_Name: NavMesh Surface - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &2082940274 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2082940273} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3} - m_Name: - m_EditorClassIdentifier: - m_AgentTypeID: -1372625422 - m_CollectObjects: 0 - m_Size: {x: 10, y: 10, z: 10} - m_Center: {x: 0, y: 2, z: 0} - m_LayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_UseGeometry: 0 - m_DefaultArea: 0 - m_GenerateLinks: 0 - m_IgnoreNavMeshAgent: 1 - m_IgnoreNavMeshObstacle: 1 - m_OverrideTileSize: 0 - m_TileSize: 256 - m_OverrideVoxelSize: 0 - m_VoxelSize: 0.16666667 - m_MinRegionArea: 2 - m_NavMeshData: {fileID: 23800000, guid: 5d705e93abd9ee04098667f568a0105f, type: 2} - m_BuildHeightMesh: 0 ---- !u!4 &2082940275 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2082940273} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 8.008923, y: 0.7058714, z: 10.727037} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2082940276 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2082940273} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3} - m_Name: - m_EditorClassIdentifier: - m_AgentTypeID: 0 - m_CollectObjects: 0 - m_Size: {x: 10, y: 10, z: 10} - m_Center: {x: 0, y: 2, z: 0} - m_LayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_UseGeometry: 0 - m_DefaultArea: 0 - m_GenerateLinks: 0 - m_IgnoreNavMeshAgent: 1 - m_IgnoreNavMeshObstacle: 1 - m_OverrideTileSize: 0 - m_TileSize: 256 - m_OverrideVoxelSize: 0 - m_VoxelSize: 0.16666667 - m_MinRegionArea: 2 - m_NavMeshData: {fileID: 23800000, guid: 80e70a015e626c9498f0d0ea083ac36e, type: 2} - m_BuildHeightMesh: 0 ---- !u!114 &2082940277 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2082940273} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3} - m_Name: - m_EditorClassIdentifier: - m_AgentTypeID: -334000983 - m_CollectObjects: 0 - m_Size: {x: 10, y: 10, z: 10} - m_Center: {x: 0, y: 2, z: 0} - m_LayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_UseGeometry: 0 - m_DefaultArea: 0 - m_GenerateLinks: 0 - m_IgnoreNavMeshAgent: 1 - m_IgnoreNavMeshObstacle: 1 - m_OverrideTileSize: 0 - m_TileSize: 256 - m_OverrideVoxelSize: 0 - m_VoxelSize: 0.16666667 - m_MinRegionArea: 2 - m_NavMeshData: {fileID: 23800000, guid: afce55d8f357fe846b476f207804cbed, type: 2} - m_BuildHeightMesh: 0 ---- !u!114 &2082940278 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2082940273} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3} - m_Name: - m_EditorClassIdentifier: - m_AgentTypeID: 1479372276 - m_CollectObjects: 0 - m_Size: {x: 10, y: 10, z: 10} - m_Center: {x: 0, y: 2, z: 0} - m_LayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_UseGeometry: 0 - m_DefaultArea: 0 - m_GenerateLinks: 0 - m_IgnoreNavMeshAgent: 1 - m_IgnoreNavMeshObstacle: 1 - m_OverrideTileSize: 0 - m_TileSize: 256 - m_OverrideVoxelSize: 0 - m_VoxelSize: 0.16666667 - m_MinRegionArea: 2 - m_NavMeshData: {fileID: 23800000, guid: b897b1ce423e2bd40b48876b76087fa7, type: 2} - m_BuildHeightMesh: 0 --- !u!1001 &2116487762 PrefabInstance: m_ObjectHideFlags: 0 @@ -4433,6 +4274,63 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4ac31dcd97f41644494e5290c2caa2a7, type: 3} +--- !u!1001 &1226557798087339376 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1401507406560278165, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} + propertyPath: m_Name + value: NavMesh Surface + objectReference: {fileID: 0} + - target: {fileID: 3745991675566015542, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} + propertyPath: m_LocalPosition.x + value: 8.008923 + objectReference: {fileID: 0} + - target: {fileID: 3745991675566015542, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} + propertyPath: m_LocalPosition.y + value: 0.7058714 + objectReference: {fileID: 0} + - target: {fileID: 3745991675566015542, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} + propertyPath: m_LocalPosition.z + value: 10.727037 + objectReference: {fileID: 0} + - target: {fileID: 3745991675566015542, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3745991675566015542, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3745991675566015542, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3745991675566015542, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3745991675566015542, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3745991675566015542, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3745991675566015542, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3} --- !u!1001 &2107203299086727957 PrefabInstance: m_ObjectHideFlags: 0 @@ -4660,7 +4558,7 @@ SceneRoots: - {fileID: 95133364} - {fileID: 439962847} - {fileID: 1341916572} - - {fileID: 2082940275} + - {fileID: 1226557798087339376} - {fileID: 260192107} - {fileID: 2733870658774266544} - {fileID: 1719621484} diff --git a/Assets/Scripts/Enemy/Raja/RajaManager.cs b/Assets/Scripts/Enemy/Raja/RajaManager.cs index 3bd994fc4466db189c7f43dff415098f1b32f017..bb8ca1432950691e59fdd4a923fb8a1b5e75e3a1 100644 --- a/Assets/Scripts/Enemy/Raja/RajaManager.cs +++ b/Assets/Scripts/Enemy/Raja/RajaManager.cs @@ -20,6 +20,8 @@ public class RajaManager : MonoBehaviour [SerializeField] public float distanceAttack; [SerializeField] public int meleAttackCount; [SerializeField] public int rangeAttackCount; + + private float damageAoE = 2; // Start is called before the first frame update void Start() { @@ -52,4 +54,20 @@ public class RajaManager : MonoBehaviour currentState = state; currentState.EnterState(this); } + + private void OnTriggerStay(Collider other) + { + string colliderName = other.gameObject.name; + Debug.Log("Collided with: " + colliderName); + + if (other.gameObject.layer == 3) { + if (other.gameObject.GetComponentInParent<HealthManager>()) + { + Debug.Log("AOE Damage"); + HealthManager playerHealth = other.gameObject.GetComponentInParent<HealthManager>(); + playerHealth.TakeDamage(damageAoE); + Debug.Log("Player : " + playerHealth.health); + } + } + } } diff --git a/Assets/Scripts/Player/Movement/MovementStateManager.cs b/Assets/Scripts/Player/Movement/MovementStateManager.cs index 4972a79344f11ef13b4e8b7c8e00bc2c5907c27c..4347b2858a3871197a3e8b48a950e07055c4650a 100644 --- a/Assets/Scripts/Player/Movement/MovementStateManager.cs +++ b/Assets/Scripts/Player/Movement/MovementStateManager.cs @@ -83,9 +83,9 @@ public class MovementStateManager : MonoBehaviour controller.Move(velocity * Time.deltaTime); } - private void OnDrawGizmos() - { - Gizmos.color = Color.red; - Gizmos.DrawWireSphere(spherePos, controller.radius - 0.05f); - } + // private void OnDrawGizmos() + // { + // Gizmos.color = Color.red; + // Gizmos.DrawWireSphere(spherePos, controller.radius - 0.05f); + // } } diff --git a/Assets/Scripts/Weapon/Bullet/KepalaBulletManager.cs b/Assets/Scripts/Weapon/Bullet/KepalaBulletManager.cs index 7a43b2e40c12abf6db9ee7d17994e513825ec633..3ef0f829ebaf3e5e24f1ddcdab0e63cd76dab409 100644 --- a/Assets/Scripts/Weapon/Bullet/KepalaBulletManager.cs +++ b/Assets/Scripts/Weapon/Bullet/KepalaBulletManager.cs @@ -3,7 +3,7 @@ using UnityEngine; public class KepalaBulletManager : MonoBehaviour { [SerializeField] float timeToDestroy; - private float damage = 2; + private float damage = 0; // float timer; diff --git a/Assets/Scripts/Weapon/Mele/PlayerSword.cs b/Assets/Scripts/Weapon/Mele/PlayerSword.cs index fda67107f48f972b5fb01587e52c927a08b93692..4580b6d7c7e00b48ef871912a0107c2fab05ac69 100644 --- a/Assets/Scripts/Weapon/Mele/PlayerSword.cs +++ b/Assets/Scripts/Weapon/Mele/PlayerSword.cs @@ -3,11 +3,10 @@ using UnityEngine; public class PlayerSword : MonoBehaviour { private float damage = 50; - - private void OnCollisionEnter(Collision other) + private void OnCollisionEnter(Collision other) { - // string colliderName = other.gameObject.name; - // Debug.Log("Sword collide with: " + colliderName); + string colliderName = other.gameObject.name; + Debug.Log("Sword collide with: " + colliderName); if (other.gameObject.GetComponentInParent<EnemyHealth>()) { EnemyHealth enemyHealth = other.gameObject.GetComponentInParent<EnemyHealth>(); @@ -15,4 +14,10 @@ public class PlayerSword : MonoBehaviour Debug.Log("Darah : " + enemyHealth.health); } } + + private void OnTriggerEnter(Collider other) + { + string colliderName = other.gameObject.name; + Debug.Log("Sword trigger with: " + colliderName); + } } \ No newline at end of file diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 2f8b9f0eeadeb81065737e794c5025863fbef902..36dac6e52f0555ef91ebb88eaba61c2faca9943b 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -13,11 +13,11 @@ TagManager: - Default - TransparentFX - Ignore Raycast - - + - Player - Water - UI - DialogueBox - - + - Bullet - - -