From aed1c5882ffee0aae508cf07506bc0cb308befb1 Mon Sep 17 00:00:00 2001
From: Akhmad Setiawan <13521164@mahasiswa.itb.ac.id>
Date: Thu, 9 May 2024 20:44:20 +0700
Subject: [PATCH] fix: player shootable mask & edit kroco sword
---
Assets/Prefabs/Enemies/ZomBunny.prefab | 2 +-
Assets/Prefabs/Player.prefab | 44 +++++++++++++++++++-------
2 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/Assets/Prefabs/Enemies/ZomBunny.prefab b/Assets/Prefabs/Enemies/ZomBunny.prefab
index 5c5c4ef..d50bddc 100644
--- a/Assets/Prefabs/Enemies/ZomBunny.prefab
+++ b/Assets/Prefabs/Enemies/ZomBunny.prefab
@@ -10296,7 +10296,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4806514186181128, guid: f800fcc198377b4408a28f2715b1a60d, type: 3}
propertyPath: m_LocalScale.y
- value: 0.35
+ value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4806514186181128, guid: f800fcc198377b4408a28f2715b1a60d, type: 3}
propertyPath: m_LocalScale.z
diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab
index 5a6d664..73c140b 100644
--- a/Assets/Prefabs/Player.prefab
+++ b/Assets/Prefabs/Player.prefab
@@ -10,7 +10,7 @@ GameObject:
m_Component:
- component: {fileID: 400000}
- component: {fileID: 13700000}
- m_Layer: 0
+ m_Layer: 6
m_Name: Player
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -95,7 +95,7 @@ GameObject:
m_Component:
- component: {fileID: 400002}
- component: {fileID: 13700002}
- m_Layer: 0
+ m_Layer: 6
m_Name: Gun
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -185,7 +185,7 @@ GameObject:
- component: {fileID: 12000000}
- component: {fileID: 11400000}
- component: {fileID: 10800000}
- m_Layer: 0
+ m_Layer: 6
m_Name: GunBarrelEnd
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -5391,7 +5391,7 @@ GameObject:
- component: {fileID: 13600000}
- component: {fileID: 8200002}
- component: {fileID: 9039977707415807151}
- m_Layer: 0
+ m_Layer: 6
m_Name: Player
m_TagString: Player
m_Icon: {fileID: 0}
@@ -5638,7 +5638,7 @@ GameObject:
m_Component:
- component: {fileID: 400008}
- component: {fileID: 10800002}
- m_Layer: 0
+ m_Layer: 6
m_Name: FaceLight
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -5731,7 +5731,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8997193238200672011}
- m_Layer: 0
+ m_Layer: 6
m_Name: Default
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -5765,7 +5765,7 @@ GameObject:
m_Component:
- component: {fileID: 8762545912576295216}
- component: {fileID: 5721332875106761620}
- m_Layer: 0
+ m_Layer: 6
m_Name: Weapons
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -5811,7 +5811,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2229189631820467177}
- m_Layer: 0
+ m_Layer: 6
m_Name: Sword
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -5843,7 +5843,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 5881081989059531979}
- m_Layer: 0
+ m_Layer: 6
m_Name: Shotgun
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -5878,7 +5878,7 @@ GameObject:
- component: {fileID: 8263715704072058757}
- component: {fileID: 2237919186314458316}
- component: {fileID: 2200019198424883589}
- m_Layer: 0
+ m_Layer: 6
m_Name: SwordAttack
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -5944,7 +5944,7 @@ GameObject:
m_Component:
- component: {fileID: 5502312865022624580}
- component: {fileID: 482007001229305827}
- m_Layer: 0
+ m_Layer: 6
m_Name: FaceLight
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -6043,7 +6043,7 @@ GameObject:
- component: {fileID: 4411055977104296898}
- component: {fileID: 7830425590893830298}
- component: {fileID: 5416872962971171281}
- m_Layer: 0
+ m_Layer: 6
m_Name: GunBarrelEnd
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -11242,10 +11242,22 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 2229189631820467177}
m_Modifications:
+ - target: {fileID: 1105315487503178, guid: 9e3ccb5d46edb7e4095888928abdaa2e, type: 3}
+ propertyPath: m_Layer
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 1749659106864458, guid: 9e3ccb5d46edb7e4095888928abdaa2e, type: 3}
+ propertyPath: m_Layer
+ value: 6
+ objectReference: {fileID: 0}
- target: {fileID: 1821482385955872, guid: 9e3ccb5d46edb7e4095888928abdaa2e, type: 3}
propertyPath: m_Name
value: MoonSword 2b
objectReference: {fileID: 0}
+ - target: {fileID: 1821482385955872, guid: 9e3ccb5d46edb7e4095888928abdaa2e, type: 3}
+ propertyPath: m_Layer
+ value: 6
+ objectReference: {fileID: 0}
- target: {fileID: 4775197332251522, guid: 9e3ccb5d46edb7e4095888928abdaa2e, type: 3}
propertyPath: m_LocalPosition.x
value: 0.4
@@ -11335,6 +11347,14 @@ PrefabInstance:
propertyPath: m_Name
value: Shotgun
objectReference: {fileID: 0}
+ - target: {fileID: 1624697429439270, guid: eedb02d5022eae8419dfe61ce8b8db75, type: 3}
+ propertyPath: m_Layer
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 1987405700366004, guid: eedb02d5022eae8419dfe61ce8b8db75, type: 3}
+ propertyPath: m_Layer
+ value: 6
+ objectReference: {fileID: 0}
- target: {fileID: 4072197404026632, guid: eedb02d5022eae8419dfe61ce8b8db75, type: 3}
propertyPath: m_LocalScale.x
value: 0.61
--
GitLab