Merge branch 'hzf' of https://github.com/hhzzff/EESDC_2024 into hzf

EESAST-Software-Design-Competition · Apr 8, 2024 · 38042c9 · 38042c9
2 parents 047f275 + 8b9bdda
commit 38042c9
Show file tree

Hide file tree

Showing 120 changed files with 5,047 additions and 2,479 deletions.
diff --git a/Assets/Materials/Enemy.physicsMaterial2D b/Assets/Materials/Enemy.physicsMaterial2D
@@ -8,4 +8,4 @@ PhysicsMaterial2D:
   m_PrefabAsset: {fileID: 0}
   m_Name: Enemy
   friction: 0.4
-  bounciness: 1
+  bounciness: 0.8
diff --git a/Assets/Prefabs/Base.prefab b/Assets/Prefabs/Base.prefab
@@ -156,7 +156,7 @@ MonoBehaviour:
   - {x: 0.5, y: -0.5, z: 0}
   m_ShapePathHash: 0
   m_Mesh: {fileID: 0}
-  m_InstanceId: -1278
+  m_InstanceId: 33528
   m_LocalBounds:
     m_Center: {x: 0, y: 0, z: 0}
     m_Extent: {x: 0.5, y: 0.5, z: 0}
@@ -189,7 +189,7 @@ BoxCollider2D:
   m_CallbackLayers:
     serializedVersion: 2
     m_Bits: 4294967295
-  m_IsTrigger: 1
+  m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
   m_Offset: {x: 0, y: 0}

diff --git a/Assets/Prefabs/Beacon.prefab b/Assets/Prefabs/Beacon.prefab
@@ -45,7 +45,7 @@ GameObject:
   - component: {fileID: 2891098559284789736}
   m_Layer: 3
   m_Name: Base
-  m_TagString: Untagged
+  m_TagString: Tower
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -162,7 +162,7 @@ MonoBehaviour:
   - {x: 0.21497606, y: 0.14017361, z: 0}
   m_ShapePathHash: -923138628
   m_Mesh: {fileID: 0}
-  m_InstanceId: 31186
+  m_InstanceId: 31976
   m_LocalBounds:
     m_Center: {x: 0.0009900928, y: 0.0011378229, z: 0}
     m_Extent: {x: 0.25529408, y: 0.25528216, z: 0}
@@ -195,7 +195,7 @@ CircleCollider2D:
   m_CallbackLayers:
     serializedVersion: 2
     m_Bits: 4294967295
-  m_IsTrigger: 1
+  m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
   m_Offset: {x: 0, y: 0}
@@ -348,7 +348,7 @@ GameObject:
   - component: {fileID: 4427209377352985101}
   m_Layer: 0
   m_Name: Beacon
-  m_TagString: Untagged
+  m_TagString: Tower
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0

diff --git a/Assets/Prefabs/Defender.prefab b/Assets/Prefabs/Defender.prefab
@@ -405,7 +405,7 @@ GameObject:
   - component: {fileID: 6241565386717072023}
   m_Layer: 0
   m_Name: Defender
-  m_TagString: Untagged
+  m_TagString: Tower
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -441,7 +441,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   health: 0
   towerData: {fileID: 11400000, guid: 9325f592ad660d74fbb8551ac6d17acf, type: 2}
-  defenderData: {fileID: 11400000, guid: 9325f592ad660d74fbb8551ac6d17acf, type: 2}
   laserData: {fileID: 11400000, guid: c7cc92cb4ec2e234ca20aa4f78d58f40, type: 2}
   currentAngle: 0
   battery: {fileID: 0}
@@ -1408,7 +1407,7 @@ GameObject:
   - component: {fileID: 5073114577420200157}
   m_Layer: 3
   m_Name: Base
-  m_TagString: Untagged
+  m_TagString: Tower
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1526,7 +1525,7 @@ MonoBehaviour:
   - {x: -0.12465501, y: -0.4529965, z: 0}
   m_ShapePathHash: -826565579
   m_Mesh: {fileID: 0}
-  m_InstanceId: -1272
+  m_InstanceId: 31758
   m_LocalBounds:
     m_Center: {x: 0.00005853176, y: 0.0001001358, z: 0}
     m_Extent: {x: 0.45289528, y: 0.45309663, z: 0}

diff --git a/Assets/Prefabs/Parclose.prefab b/Assets/Prefabs/Parclose.prefab
@@ -447,7 +447,7 @@ GameObject:
   - component: {fileID: 4366914082301741315}
   m_Layer: 0
   m_Name: Parclose
-  m_TagString: Shield
+  m_TagString: Tower
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -482,6 +482,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7582168ea1458cc49b363d838a1c165c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  health: 0
+  towerData: {fileID: 0}
   chargingState: 0
   shield: {fileID: 0}
 --- !u!1 &4593650174762532075
@@ -768,7 +770,7 @@ GameObject:
   - component: {fileID: 2922929959555684011}
   m_Layer: 3
   m_Name: Base
-  m_TagString: Untagged
+  m_TagString: Tower
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -894,7 +896,7 @@ MonoBehaviour:
   - {x: -0.04203534, y: -0.21973974, z: 0}
   m_ShapePathHash: -401280251
   m_Mesh: {fileID: 0}
-  m_InstanceId: 40668
+  m_InstanceId: 32156
   m_LocalBounds:
     m_Center: {x: -0.0000538826, y: 0.0005067587, z: 0}
     m_Extent: {x: 0.29054093, y: 0.2904083, z: 0}

diff --git a/Assets/Prefabs/Projector.prefab b/Assets/Prefabs/Projector.prefab
@@ -857,7 +857,7 @@ GameObject:
   - component: {fileID: 4873589388666150760}
   m_Layer: 0
   m_Name: Projector
-  m_TagString: Untagged
+  m_TagString: Tower
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -893,7 +893,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   health: 0
   towerData: {fileID: 11400000, guid: 251b181669ba6e945a40e4043a2ad79e, type: 2}
-  projectorData: {fileID: 11400000, guid: 251b181669ba6e945a40e4043a2ad79e, type: 2}
   shellData: {fileID: 11400000, guid: 473dc586f0ccb7340b860dbaefb82de1, type: 2}
   currentAngle: 0
   battery: {fileID: 0}

diff --git a/Assets/Resources/Enemy/Die.meta b/Assets/Resources/Enemy/Die.meta
diff --git a/Assets/Resources/Enemy/Die/CIRCLE-DIE.png b/Assets/Resources/Enemy/Die/CIRCLE-DIE.png