ColorlessWorld-2024-4-2/Assets/Anim/StartChooseGetCard/GetWeaponNode/CantGetWeaponNode.anim

@@ -362,6 +362,36 @@ AnimationClip:
     classID: 1
     script: {fileID: 0}
     flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_BlocksRaycasts
+    path: 
+    classID: 225
+    script: {fileID: 0}
+    flags: 0
   m_PPtrCurves: []
   m_SampleRate: 60
   m_WrapMode: 0
@@ -478,6 +508,15 @@ AnimationClip:
       isPPtrCurve: 0
       isIntCurve: 0
       isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 3739863151
+      script: {fileID: 0}
+      typeID: 225
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
     pptrCurveMapping: []
   m_AnimationClipSettings:
     serializedVersion: 2
@@ -1094,6 +1133,36 @@ AnimationClip:
     classID: 1
     script: {fileID: 0}
     flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_BlocksRaycasts
+    path: 
+    classID: 225
+    script: {fileID: 0}
+    flags: 0
   m_EulerEditorCurves:
   - serializedVersion: 2
     curve:

ColorlessWorld-2024-4-2/Assets/Anim/StartChooseGetCard/GetWeaponNode/EnterWeaponNode.anim

@@ -389,6 +389,36 @@ AnimationClip:
     classID: 1
     script: {fileID: 0}
     flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_BlocksRaycasts
+    path: 
+    classID: 225
+    script: {fileID: 0}
+    flags: 0
   m_PPtrCurves: []
   m_SampleRate: 60
   m_WrapMode: 0
@@ -505,6 +535,15 @@ AnimationClip:
       isPPtrCurve: 0
       isIntCurve: 0
       isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 3739863151
+      script: {fileID: 0}
+      typeID: 225
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
     pptrCurveMapping: []
   m_AnimationClipSettings:
     serializedVersion: 2
@@ -1148,6 +1187,36 @@ AnimationClip:
     classID: 1
     script: {fileID: 0}
     flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_BlocksRaycasts
+    path: 
+    classID: 225
+    script: {fileID: 0}
+    flags: 0
   m_EulerEditorCurves:
   - serializedVersion: 2
     curve:

ColorlessWorld-2024-4-2/Assets/Anim/StartChooseGetCard/GetWeaponNode/GetWeaponNode.anim

@@ -470,6 +470,36 @@ AnimationClip:
     classID: 1
     script: {fileID: 0}
     flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1.6666666
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_BlocksRaycasts
+    path: 
+    classID: 225
+    script: {fileID: 0}
+    flags: 0
   m_PPtrCurves: []
   m_SampleRate: 60
   m_WrapMode: 0
@@ -586,6 +616,15 @@ AnimationClip:
       isPPtrCurve: 0
       isIntCurve: 0
       isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 3739863151
+      script: {fileID: 0}
+      typeID: 225
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
     pptrCurveMapping: []
   m_AnimationClipSettings:
     serializedVersion: 2
@@ -1364,6 +1403,36 @@ AnimationClip:
     classID: 1
     script: {fileID: 0}
     flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1.6666666
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_BlocksRaycasts
+    path: 
+    classID: 225
+    script: {fileID: 0}
+    flags: 0
   m_EulerEditorCurves:
   - serializedVersion: 2
     curve:

ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset

@@ -13,12 +13,13 @@ MonoBehaviour:
   m_Name: cardDeckList
   m_EditorClassIdentifier: 
   cardDeckList:
-  - 1018
-  - 1018
-  - 1018
-  - 1018
-  - 1018
-  - 1027
-  - 1027
-  - 1027
-  - 1027
+  - 1025
+  - 1025
+  - 1025
+  - 1025
+  - 1025
+  - 1025
+  - 1025
+  - 1025
+  - 1025
+  - 1025

ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_White.mat

@@ -30,7 +30,7 @@ Material:
     m_Ints: []
     m_Floats: []
     m_Colors:
-    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.000053972006, a: 0}
+    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.16408885, a: 0}
     - _Tex2offset: {r: 0.6, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []
 --- !u!114 &558137770919511581

ColorlessWorld-2024-4-2/Assets/Particle Eff/UI Animation/UI_AttackPreview/BarDuiZhuang/Bar_DuiZhuang_left.anim

@@ -87,14 +87,14 @@ AnimationClip:
     intParameter: 0
     messageOptions: 0
   - time: 1
-    functionName: PlayerUpScore
+    functionName: EnemyUpScore
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
     intParameter: 0
     messageOptions: 0
   - time: 1.5
-    functionName: EnemyUpScore
+    functionName: PlayerUpScore
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0

ColorlessWorld-2024-4-2/Assets/Particle Eff/UI Animation/UI_AttackPreview/BarDuiZhuang/Bar_DuiZhuang_right.anim

@@ -87,14 +87,14 @@ AnimationClip:
     intParameter: 0
     messageOptions: 0
   - time: 1
-    functionName: EnemyUpScore
+    functionName: PlayerUpScore
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
     intParameter: 0
     messageOptions: 0
   - time: 1.5
-    functionName: PlayerUpScore
+    functionName: EnemyUpScore
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0

ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/MapUnity _2.prefab

@@ -114,7 +114,7 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.45, y: 1, z: 1}
+  m_LocalScale: {x: 1.2, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4579690416932963536}

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Bamboo.prefab

@@ -165,7 +165,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7128087568868009527
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Believer.prefab

@@ -165,7 +165,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7128087568868009527
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/BlackSheep.prefab

@@ -86,7 +86,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7128087568868009527
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Bomb.prefab

@@ -86,7 +86,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7470075999252082373
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Burrower.prefab

@@ -188,7 +188,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7128087568868009527
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/BurrowerOld.prefab

@@ -189,7 +189,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7128087568868009527
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Cactus.prefab

@@ -267,7 +267,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &3481001194713140367
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/CampHold.prefab

@@ -298,7 +298,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &6343251402112390214
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/CoconutPalm.prefab

@@ -86,7 +86,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7128087568868009527
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Cultist.prefab

@@ -86,7 +86,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &3481001194713140367
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/FireDragon.prefab

@@ -86,7 +86,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7128087568868009527
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Hibiscus.prefab

@@ -86,7 +86,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7128087568868009527
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Hippo.prefab

@@ -86,7 +86,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7128087568868009527
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/IceDragon.prefab

@@ -86,7 +86,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7128087568868009527
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Jimsonweed.prefab

@@ -86,7 +86,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7128087568868009527
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Lizard.prefab

@@ -86,7 +86,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7128087568868009527
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Lotus.prefab

@@ -86,7 +86,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7128087568868009527
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Mimic.prefab

@@ -86,7 +86,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7128087568868009527
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Penguin.prefab

@@ -165,7 +165,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7128087568868009527
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Rabbit.prefab

@@ -86,7 +86,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7128087568868009527
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Singularity.prefab

@@ -86,7 +86,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7128087568868009527
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Spruce.prefab

@@ -86,7 +86,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &3481001194713140367
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Squirrel.prefab

@@ -86,7 +86,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7128087568868009527
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Sunflower.prefab

@@ -86,7 +86,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7128087568868009527
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Trash.prefab

@@ -166,7 +166,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7128087568868009527
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/TrashCan.prefab

@@ -86,7 +86,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7128087568868009527
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Treasure.prefab

@@ -86,7 +86,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7128087568868009527
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Volcano.prefab

@@ -86,7 +86,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &6555535221111057200
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Willow.prefab

@@ -86,7 +86,7 @@ SphereCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Radius: 1
+  m_Radius: 0.6
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7128087568868009527
 MonoBehaviour:

ColorlessWorld-2024-4-2/Assets/Scenes/ChooseWeaponNew.unity

@@ -14207,6 +14207,7 @@ GameObject:
   - component: {fileID: 1010123424}
   - component: {fileID: 1010123426}
   - component: {fileID: 1010123427}
+  - component: {fileID: 1010123428}
   m_Layer: 5
   m_Name: ChooseWeaponNodePanel
   m_TagString: Untagged
@@ -14310,6 +14311,18 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7d07b6b7217cbee468422fa1f8485641, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!225 &1010123428
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1010123422}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &1013219087
 GameObject:
   m_ObjectHideFlags: 0

ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity

@@ -30186,8 +30186,8 @@ Camera:
   near clip plane: 0.3
   far clip plane: 1000
   field of view: 50
-  orthographic: 0
-  orthographic size: 5
+  orthographic: 1
+  orthographic size: 4.2
   m_Depth: 0
   m_CullingMask:
     serializedVersion: 2
@@ -30212,7 +30212,7 @@ Transform:
   m_GameObject: {fileID: 330585543}
   serializedVersion: 2
   m_LocalRotation: {x: 0.60876137, y: 0, z: 0, w: 0.7933534}
-  m_LocalPosition: {x: 2.99, y: 10.42, z: -0.7}
+  m_LocalPosition: {x: 3.3, y: 9.65, z: -0.7}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -62232,7 +62232,7 @@ MonoBehaviour:
   m_Follow: {fileID: 0}
   m_Lens:
     FieldOfView: 50
-    OrthographicSize: 5
+    OrthographicSize: 4.2
     NearClipPlane: 0.3
     FarClipPlane: 1000
     Dutch: 0
@@ -62258,7 +62258,7 @@ Transform:
   m_GameObject: {fileID: 699857786}
   serializedVersion: 2
   m_LocalRotation: {x: 0.60876137, y: 0, z: 0, w: 0.7933534}
-  m_LocalPosition: {x: 2.99, y: 10.42, z: -0.7}
+  m_LocalPosition: {x: 3.3, y: 9.65, z: -0.7}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -118089,9 +118089,6 @@ MonoBehaviour:
   - Y: []
   - Y: []
   - Y: []
-  - Y: []
-  - Y: []
-  - Y: []
   character: 0
   lastWhoColor: 0
   playerState: {fileID: 0}
@@ -134722,11 +134719,71 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4508506136082123919, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 19
+      objectReference: {fileID: 0}
+    - target: {fileID: 4508506136082123919, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 10.120683
+      objectReference: {fileID: 0}
+    - target: {fileID: 4508506136082123919, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 11.270374
+      objectReference: {fileID: 0}
+    - target: {fileID: 4508506136082123919, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 6589840777862894700, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
         type: 3}
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7267532954517249698, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 19
+      objectReference: {fileID: 0}
+    - target: {fileID: 7267532954517249698, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 10.120684
+      objectReference: {fileID: 0}
+    - target: {fileID: 7267532954517249698, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 11.270374
+      objectReference: {fileID: 0}
+    - target: {fileID: 7267532954517249698, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8435594806998215029, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 19
+      objectReference: {fileID: 0}
+    - target: {fileID: 8435594806998215029, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 10.120683
+      objectReference: {fileID: 0}
+    - target: {fileID: 8435594806998215029, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 11.270374
+      objectReference: {fileID: 0}
+    - target: {fileID: 8435594806998215029, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -178505,6 +178562,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 445384651250783383, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
         type: 3}
       propertyPath: m_IsActive
@@ -178515,6 +178577,11 @@ PrefabInstance:
       propertyPath: startDelay.scalar
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1233851070431612615, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 2490369801246147296, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
         type: 3}
       propertyPath: TriggerModule.enabled
@@ -178525,16 +178592,81 @@ PrefabInstance:
       propertyPath: TriggerModule.primitives.Array.size
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2626598613216839226, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 3419851601979508938, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
         type: 3}
       propertyPath: m_Name
       value: par_eff_ui_gameIn
       objectReference: {fileID: 0}
+    - target: {fileID: 4508506136082123919, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 19
+      objectReference: {fileID: 0}
+    - target: {fileID: 4508506136082123919, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 10.120682
+      objectReference: {fileID: 0}
+    - target: {fileID: 4508506136082123919, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 11.270379
+      objectReference: {fileID: 0}
+    - target: {fileID: 4508506136082123919, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 6218921812816820065, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
         type: 3}
       propertyPath: startDelay.scalar
       value: 0.58
       objectReference: {fileID: 0}
+    - target: {fileID: 7267532954517249698, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 19
+      objectReference: {fileID: 0}
+    - target: {fileID: 7267532954517249698, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 10.120682
+      objectReference: {fileID: 0}
+    - target: {fileID: 7267532954517249698, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 11.270379
+      objectReference: {fileID: 0}
+    - target: {fileID: 7267532954517249698, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8435594806998215029, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 19
+      objectReference: {fileID: 0}
+    - target: {fileID: 8435594806998215029, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 10.120682
+      objectReference: {fileID: 0}
+    - target: {fileID: 8435594806998215029, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 11.270379
+      objectReference: {fileID: 0}
+    - target: {fileID: 8435594806998215029, guid: 926ec935ad69f0f44b5c7c12ab4295d3,
+        type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -186882,12 +187014,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mapUnity: {fileID: 887005656701010215, guid: ecde4b12dc4538b4caff9ada56c9ab30, type: 3}
-  line: 7
-  column: 5
+  line: 6
+  column: 6
   generatePoint: {fileID: 514899946}
-  lineOffSet: {x: 1.43, y: 0, z: 0}
+  lineOffSet: {x: 1.2, y: 0, z: 0}
   columnOffSet: {x: 0, y: 0, z: 0.86}
-  mapUniteLineOffset: 00000000fffffffffffffffffeffffffffffffffffffffff00000000
+  mapUniteLineOffset: 000000000000000000000000000000000000000000000000
   enemyGenerateDataList: []
   mapUnityFather: {fileID: 471426433}
   cardDeckNumberText: {fileID: 1577863296}

ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity

@@ -24287,7 +24287,7 @@ GameObject:
   - component: {fileID: 513198971}
   - component: {fileID: 513198970}
   m_Layer: 5
-  m_Name: Canvas8
+  m_Name: Canvas9
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -24377,7 +24377,7 @@ Canvas:
   m_AdditionalShaderChannelsFlag: 25
   m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 1637390125
-  m_SortingOrder: 8
+  m_SortingOrder: 9
   m_TargetDisplay: 0
 --- !u!1 &513238045
 GameObject:

ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs

@@ -152,8 +152,8 @@ public class GameManager : Singleton<GameManager>
             playerState = PlayerStatsManager.Instance.playerState;
        
         //生成空地图列表
-        // GenerateEnmptyMapList();
-        GenerateEnmptyMapListDefault();       
+         GenerateEnmptyMapList();
+       // GenerateEnmptyMapListDefault();       
         //开局场地涂色并开始阶段
         StartCoroutine(StartStartColourCoroutine(complete));
 
@@ -214,6 +214,9 @@ public class GameManager : Singleton<GameManager>
             for (int i = 0; i < MapManager.Instance.line; i++)
             {
                 int currentColum = 0;
+                currentColum = MapManager.Instance.column;
+                //暂时不减
+                /*
                 if (i % 2 == 0)
                 {
                     currentColum = MapManager.Instance.column;
@@ -221,7 +224,7 @@ public class GameManager : Singleton<GameManager>
                 else
                 {
                     currentColum = MapManager.Instance.column - 1;
-                }
+                }*/
                 for (int j = 0; j < currentColum; j++)
                 {
                     X[i].Y.Add(null);

ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs

@@ -177,7 +177,8 @@ public class MapManager : Singleton<MapManager>
 
     IEnumerator GenerateProcess()
     {    
-        yield return StartCoroutine(MapGenerateDefault());
+       // yield return StartCoroutine(MapGenerateDefault());
+        yield return StartCoroutine(MapGenerateCube());   
         yield return StartCoroutine(SetUpMapUnity());
         yield return StartCoroutine(TransformMapUnity());
         yield return StartCoroutine(SetUpMapUnityForCube());
@@ -511,7 +512,7 @@ public class MapManager : Singleton<MapManager>
         }
         yield return null;
     }
-
+    //两边尖尖的地块
     IEnumerator MapGenerateDefault()
     {
         int middleLine = (line - 1) / 2;
@@ -554,7 +555,35 @@ public class MapManager : Singleton<MapManager>
         yield return null;
     }
 
+    //正方形地块
+    IEnumerator MapGenerateCube()
+    {
+        for (int i = 0; i < line; i++)
+        {
+            if (i != 0)
+            {
+                generatePoint.transform.position += columnOffSet;
+            }
+            generatePoint.transform.position = new Vector3(0, 0, generatePoint.transform.position.z);
+
+            if (i % 2 != 0)
+            {
+                generatePoint.transform.position += (lineOffSet / 2.0f);
+            }
 
+            for (int j = 0; j < column; j++)
+            {
+                var a = Instantiate(mapUnity, generatePoint.transform.position, mapUnity.transform.rotation);
+                a.transform.SetParent(mapUnityFather);
+                MapUnity currentMapUnityScript = a.GetComponent<MapUnity>();
+                currentMapUnityScript.locationX = i;
+                currentMapUnityScript.locationY = j;
+                currentMapUnityScript.RegisterUnit();
+                generatePoint.transform.position += lineOffSet;
+            }
+        }
+        yield return null;
+    }
     //地块上移动画
     IEnumerator  UPMoveMapUnity()
     {