Merge branch 'dev' into dev

eesast · May 16, 2024 · 7276149 · 7276149
2 parents b73242a + 5c02727
commit 7276149
Show file tree

Hide file tree

Showing 50 changed files with 2,416 additions and 1,241 deletions.
diff --git a/interface/interface_live/Assets/Prefabs/Base.prefab b/interface/interface_live/Assets/Prefabs/Base.prefab
@@ -10,8 +10,6 @@ GameObject:
   m_Component:
   - component: {fileID: 2343335082935178983}
   - component: {fileID: 2633087526931125268}
-  - component: {fileID: 185038739592644713}
-  - component: {fileID: 3858766104968319131}
   - component: {fileID: 791497468914672102}
   m_Layer: 6
   m_Name: Base
@@ -77,7 +75,7 @@ SpriteRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: -1026933429
-  m_SortingLayer: -1
+  m_SortingLayer: 0
   m_SortingOrder: 0
   m_Sprite: {fileID: -452132711, guid: 8d794b099727c684aa35073dfebec3ae, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -90,57 +88,6 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
---- !u!114 &185038739592644713
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2487624789702488523}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 33624e7926488114892585bc69105bab, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  interactBase: {fileID: 0}
-  generatePos:
-  - {x: -2.003803e+15, y: 6.99e-43}
-  - {x: 0.000042965818, y: 0.00000016502315}
-  messageOfBase:
-    x: 0
-    y: 0
-    hp: 24000
-    economy: 0
-    playerTeam: 0
-    shipNum:
-      civilShipNum: 0
-      militaryShipNum: 0
-      flagShipNum: 0
-    shipTotalNum: 0
-  obj: {fileID: 0}
---- !u!114 &3858766104968319131
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2487624789702488523}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 515cf190256e2214ea5daad3164a90b3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  interactType: 1
-  interactOption: 0
-  tobeSelected: 0
-  selected: 0
-  selectedSign: {fileID: 2362405429118444927, guid: d5b0673cd77cb7f43b9b1df36ceb2520, type: 3}
-  tobeSelectedSign: {fileID: 5230180300230231966, guid: c35172cad03b3784c93db13d884b4bbc, type: 3}
-  tobeseObj: {fileID: 0}
-  seObj: {fileID: 0}
-  moveOption: {x: 0, y: 0}
-  attackOption: {x: 0, y: 0}
-  enableMove: 0
 --- !u!61 &791497468914672102
 BoxCollider2D:
   m_ObjectHideFlags: 0

diff --git a/interface/interface_live/Assets/Prefabs/afflict_civilship3.prefab b/interface/interface_live/Assets/Prefabs/afflict_civilship3.prefab
@@ -179,7 +179,6 @@ GameObject:
   - component: {fileID: 3612929307087270911}
   - component: {fileID: 6770427568174600179}
   - component: {fileID: -4359886877623418897}
-  - component: {fileID: 5830000981015486441}
   m_Layer: 6
   m_Name: afflict_civilship3
   m_TagString: Ship
@@ -283,56 +282,3 @@ Rigidbody2D:
   m_SleepingMode: 1
   m_CollisionDetection: 1
   m_Constraints: 4
---- !u!60 &5830000981015486441
-PolygonCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7171601645716739352}
-  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: 0
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 1.4222223, y: 1.4222223}
-    newSize: {x: 1.4222223, y: 1.4222223}
-    adaptiveTilingThreshold: 0.5
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  m_Points:
-    m_Paths:
-    - - {x: -0.65203804, y: -0.2703777}
-      - {x: -0.20493068, y: -0.688784}
-      - {x: 0.21247491, y: -0.6915976}
-      - {x: 0.6544107, y: -0.26316732}
-      - {x: 0.49007905, y: 0.24612868}
-      - {x: 0.10974354, y: 0.6245806}
-      - {x: -0.11176881, y: 0.6241703}
-      - {x: -0.4908295, y: 0.24613677}
-  m_UseDelaunayMesh: 0
diff --git a/interface/interface_live/Assets/Prefabs/asteroid1.prefab b/interface/interface_live/Assets/Prefabs/asteroid1.prefab
@@ -27,7 +27,7 @@ Transform:
   m_GameObject: {fileID: 73901610976941151}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 1.31, y: -3.26, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -71,7 +71,7 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: -1026933429
+  m_SortingLayerID: 1016154807
   m_SortingLayer: -1
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: ca8591645aa5c1b42be3a00db68050e4, type: 3}

diff --git a/interface/interface_live/Assets/Prefabs/asteroid2.prefab b/interface/interface_live/Assets/Prefabs/asteroid2.prefab
@@ -27,7 +27,7 @@ Transform:
   m_GameObject: {fileID: 2076829689532050399}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -3.1050818, y: -3.35494, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -71,7 +71,7 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: -1026933429
+  m_SortingLayerID: 1016154807
   m_SortingLayer: -1
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: bfbebd03ad1eba94d97d36f4a8379755, type: 3}

diff --git a/interface/interface_live/Assets/Prefabs/asteroid3.prefab b/interface/interface_live/Assets/Prefabs/asteroid3.prefab
@@ -27,7 +27,7 @@ Transform:
   m_GameObject: {fileID: 889495328777635882}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -4.0897093, y: -3.2946568, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -71,7 +71,7 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: -1026933429
+  m_SortingLayerID: 1016154807
   m_SortingLayer: -1
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: 7c8a580b4bd61134f9c036fad1092802, type: 3}

diff --git a/interface/interface_live/Assets/Prefabs/community.prefab b/interface/interface_live/Assets/Prefabs/community.prefab
@@ -70,8 +70,8 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 1016154807
+  m_SortingLayer: 1
   m_SortingOrder: 1
   m_Sprite: {fileID: 21300000, guid: 9b6824ba5f9a5044da5da80bf1cbead2, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}

diff --git a/interface/interface_live/Assets/Prefabs/construction.prefab b/interface/interface_live/Assets/Prefabs/construction.prefab
@@ -27,7 +27,7 @@ Transform:
   m_GameObject: {fileID: 4461932328840788347}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 3.5624852, y: 2.1974292, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -71,7 +71,7 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: -1026933429
+  m_SortingLayerID: 1016154807
   m_SortingLayer: -1
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: b6fffae4cf6650f41b662f7a04e25e43, type: 3}

diff --git a/interface/interface_live/Assets/Prefabs/disperse_militaryship3.prefab b/interface/interface_live/Assets/Prefabs/disperse_militaryship3.prefab
@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 6703198644651489217}
   - component: {fileID: 3937469415223448877}
   - component: {fileID: 1666208417870257314}
-  - component: {fileID: 5170778442484362911}
   m_Layer: 6
   m_Name: disperse_militaryship3
   m_TagString: Ship
@@ -115,61 +114,6 @@ Rigidbody2D:
   m_SleepingMode: 1
   m_CollisionDetection: 1
   m_Constraints: 4
---- !u!60 &5170778442484362911
-PolygonCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1718981553063819522}
-  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: 0
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 1.5058824, y: 1.5058824}
-    newSize: {x: 1.5058824, y: 1.5058824}
-    adaptiveTilingThreshold: 0.5
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  m_Points:
-    m_Paths:
-    - - {x: -0.006146442, y: -0.6972494}
-      - {x: 0.5091776, y: -0.5894133}
-      - {x: 0.640808, y: -0.39379779}
-      - {x: 0.6350861, y: 0.04032734}
-      - {x: 0.3777029, y: 0.58883476}
-      - {x: 0.0045966506, y: 0.7119452}
-      - {x: -0.3869319, y: 0.5855302}
-      - {x: -0.63092756, y: 0.027574211}
-      - {x: -0.6246743, y: -0.4011431}
-      - {x: -0.4897193, y: -0.59641504}
-  m_UseDelaunayMesh: 0
 --- !u!1 &6322145347568992764
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/interface/interface_live/Assets/Prefabs/factory.prefab b/interface/interface_live/Assets/Prefabs/factory.prefab
@@ -155,8 +155,8 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 1016154807
+  m_SortingLayer: 1
   m_SortingOrder: 1
   m_Sprite: {fileID: 21300000, guid: 4e69b7691cca9c241a1519d297e81311, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}

diff --git a/interface/interface_live/Assets/Prefabs/foreshadow_flagship3.prefab b/interface/interface_live/Assets/Prefabs/foreshadow_flagship3.prefab
@@ -179,7 +179,6 @@ GameObject:
   - component: {fileID: 750574882568330089}
   - component: {fileID: 4697488312729372394}
   - component: {fileID: 3397589707071195213}
-  - component: {fileID: 7800904211505029374}
   m_Layer: 6
   m_Name: foreshadow_flagship3
   m_TagString: Ship
@@ -283,59 +282,3 @@ Rigidbody2D:
   m_SleepingMode: 1
   m_CollisionDetection: 1
   m_Constraints: 4
---- !u!60 &7800904211505029374
-PolygonCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8427987949455047532}
-  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: 0
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 1.6, y: 1.6}
-    newSize: {x: 1.6, y: 1.6}
-    adaptiveTilingThreshold: 0.5
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  m_Points:
-    m_Paths:
-    - - {x: -0.223483, y: 0.7550932}
-      - {x: -0.5892876, y: 0.53113854}
-      - {x: -0.7454866, y: 0.14892353}
-      - {x: -0.7455398, y: -0.16528817}
-      - {x: -0.32776636, y: -0.7462833}
-      - {x: 0.3340975, y: -0.7320269}
-      - {x: 0.7405982, y: -0.16136909}
-      - {x: 0.7467126, y: 0.1469028}
-      - {x: 0.57987946, y: 0.52651507}
-      - {x: 0.23184037, y: 0.75532526}
-      - {x: -0.0021837428, y: 0.7553253}
-  m_UseDelaunayMesh: 0
diff --git a/interface/interface_live/Assets/Prefabs/resourceA1.prefab b/interface/interface_live/Assets/Prefabs/resourceA1.prefab
@@ -27,7 +27,7 @@ Transform:
   m_GameObject: {fileID: 2817536373982564735}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 14.645768, y: 47.229996, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -73,7 +73,7 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: -1026933429
+  m_SortingLayerID: 1016154807
   m_SortingLayer: -1
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: 63989317c1fbb7446aa044069dbe9028, type: 3}