Merge pull request #166 from hhzzff/dev

feat: ✨ Add resource collect and damage action
eesast · Mar 31, 2024 · 5e3e1ae · 5e3e1ae
2 parents cdfee3f + a73908c
commit 5e3e1ae
Show file tree

Hide file tree

Showing 51 changed files with 1,163 additions and 73 deletions.
diff --git a/interface/interface_local/Assets/Prefabs/afflict_civilship3.prefab b/interface/interface_local/Assets/Prefabs/afflict_civilship3.prefab
@@ -184,7 +184,7 @@ GameObject:
   - component: {fileID: 5830000981015486441}
   m_Layer: 6
   m_Name: afflict_civilship3
-  m_TagString: Untagged
+  m_TagString: Ship
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -277,9 +277,10 @@ MonoBehaviour:
     armor: 0
     shield: 0
     playerTeam: 0
-    shipType: 1
+    shipState: 0
+    shipType: 0
     viewRange: 0
-    producerType: 0
+    producerType: 1
     constructorType: 0
     armorType: 0
     shieldType: 0
@@ -306,6 +307,7 @@ MonoBehaviour:
   seObj: {fileID: 0}
   moveOption: {x: 0, y: 0}
   attackOption: {x: 0, y: 0}
+  enableMove: 0
 --- !u!50 &-4359886877623418897
 Rigidbody2D:
   serializedVersion: 4

diff --git a/interface/interface_local/Assets/Prefabs/disperse_militaryship3.prefab b/interface/interface_local/Assets/Prefabs/disperse_militaryship3.prefab
@@ -16,7 +16,7 @@ GameObject:
   - component: {fileID: 5170778442484362911}
   m_Layer: 6
   m_Name: disperse_militaryship3
-  m_TagString: Untagged
+  m_TagString: Ship
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -109,7 +109,8 @@ MonoBehaviour:
     armor: 400
     shield: 400
     playerTeam: 0
-    shipType: 2
+    shipState: 0
+    shipType: 0
     viewRange: 0
     producerType: 0
     constructorType: 0
@@ -138,6 +139,7 @@ MonoBehaviour:
   seObj: {fileID: 0}
   moveOption: {x: 0, y: 0}
   attackOption: {x: 0, y: 0}
+  enableMove: 0
 --- !u!50 &1666208417870257314
 Rigidbody2D:
   serializedVersion: 4

diff --git a/interface/interface_local/Assets/Prefabs/foreshadow_flagship3.prefab b/interface/interface_local/Assets/Prefabs/foreshadow_flagship3.prefab
@@ -184,7 +184,7 @@ GameObject:
   - component: {fileID: 7800904211505029374}
   m_Layer: 6
   m_Name: foreshadow_flagship3
-  m_TagString: Untagged
+  m_TagString: Ship
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -277,9 +277,10 @@ MonoBehaviour:
     armor: 800
     shield: 800
     playerTeam: 0
+    shipState: 0
     shipType: 3
     viewRange: 0
-    producerType: 0
+    producerType: 1
     constructorType: 0
     armorType: 0
     shieldType: 0
@@ -306,6 +307,7 @@ MonoBehaviour:
   seObj: {fileID: 0}
   moveOption: {x: 0, y: 0}
   attackOption: {x: 0, y: 0}
+  enableMove: 0
 --- !u!50 &3397589707071195213
 Rigidbody2D:
   serializedVersion: 4

diff --git a/interface/interface_local/Assets/Prefabs/laser.prefab b/interface/interface_local/Assets/Prefabs/laser.prefab
@@ -95,9 +95,10 @@ GameObject:
   - component: {fileID: 1201941676677779376}
   - component: {fileID: 7532294776290804330}
   - component: {fileID: 4187446393248317159}
+  - component: {fileID: 1737824880196549920}
   m_Layer: 0
   m_Name: laser
-  m_TagString: Untagged
+  m_TagString: Bullet
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -161,3 +162,48 @@ Rigidbody2D:
   m_SleepingMode: 1
   m_CollisionDetection: 1
   m_Constraints: 0
+--- !u!61 &1737824880196549920
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5236724725662676995}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: -0.0000949204, y: 0}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 0.18993536, y: 1}
+  m_EdgeRadius: 0
diff --git a/interface/interface_local/Assets/Prefabs/missile.prefab b/interface/interface_local/Assets/Prefabs/missile.prefab
@@ -11,9 +11,10 @@ GameObject:
   - component: {fileID: 4201782037208779027}
   - component: {fileID: -8537481700179265297}
   - component: {fileID: 787263036322237022}
+  - component: {fileID: 3497806888274562941}
   m_Layer: 0
   m_Name: missile
-  m_TagString: Untagged
+  m_TagString: Bullet
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -77,6 +78,51 @@ Rigidbody2D:
   m_SleepingMode: 1
   m_CollisionDetection: 1
   m_Constraints: 0
+--- !u!61 &3497806888274562941
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6742644745694519620}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0.00051154196, y: 0.062394217}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 0.31279585, y: 0.7504232}
+  m_EdgeRadius: 0
 --- !u!1 &9211391338782469537
 GameObject:
   m_ObjectHideFlags: 0
@@ -103,7 +149,7 @@ Transform:
   m_GameObject: {fileID: 9211391338782469537}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 1.2787311, y: -0.42751598, z: 0.1775014}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

diff --git a/interface/interface_local/Assets/Prefabs/plasma.prefab b/interface/interface_local/Assets/Prefabs/plasma.prefab
@@ -26,7 +26,7 @@ Transform:
   m_GameObject: {fileID: 6117473897745876090}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0.04258275, y: -0.41616893, z: 0.1775014}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -95,9 +95,10 @@ GameObject:
   - component: {fileID: 3329987006929507500}
   - component: {fileID: 8590620219904582428}
   - component: {fileID: 1888889249344211522}
+  - component: {fileID: 4752681040706189447}
   m_Layer: 0
   m_Name: plasma
-  m_TagString: Untagged
+  m_TagString: Bullet
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -161,3 +162,38 @@ Rigidbody2D:
   m_SleepingMode: 1
   m_CollisionDetection: 1
   m_Constraints: 0
+--- !u!70 &4752681040706189447
+CapsuleCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7049118564761611801}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0.001422558, y: 0.01707118}
+  m_Size: {x: 0.24677815, y: 0.84636}
+  m_Direction: 0
diff --git a/interface/interface_local/Assets/Prefabs/shell.prefab b/interface/interface_local/Assets/Prefabs/shell.prefab
@@ -26,7 +26,7 @@ Transform:
   m_GameObject: {fileID: 3845175679092181272}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.43515015, y: -0.4198817, z: 0.1775014}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -95,9 +95,10 @@ GameObject:
   - component: {fileID: 116280945263292980}
   - component: {fileID: -8199526034595813093}
   - component: {fileID: 330809320193030683}
+  - component: {fileID: 4501115928246254698}
   m_Layer: 0
   m_Name: shell
-  m_TagString: Untagged
+  m_TagString: Bullet
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -161,3 +162,38 @@ Rigidbody2D:
   m_SleepingMode: 1
   m_CollisionDetection: 1
   m_Constraints: 0
+--- !u!58 &4501115928246254698
+CircleCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5671706578558220722}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0.0011312403, y: 0}
+  serializedVersion: 2
+  m_Radius: 0.18664187