场景地块调整和ui

1 year ago · 40d60bb289
10 changed files with 151754 additions and 86 deletions
--- a/ColorlessWorld-2024-4-2/Assets/Scenes/Level2.unity
+++ b/ColorlessWorld-2024-4-2/Assets/Scenes/Level2.unity
--- a/ColorlessWorld-2024-4-2/Assets/Scenes/Level2.unity.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Scenes/Level2.unity.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7b958003ce382014bb1785f4f33f1d27
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Scenes/Level3.unity
+++ b/ColorlessWorld-2024-4-2/Assets/Scenes/Level3.unity
--- a/ColorlessWorld-2024-4-2/Assets/Scenes/Level3.unity.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Scenes/Level3.unity.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2be81ac4a42fcd540b1e62c7d2b19aed
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Scenes/Level4.unity
+++ b/ColorlessWorld-2024-4-2/Assets/Scenes/Level4.unity
--- a/ColorlessWorld-2024-4-2/Assets/Scenes/Level4.unity.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Scenes/Level4.unity.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f91bfa155360de741a9090cc0cdaedca
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity
+++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity
@ -1500,7 +1500,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &83788479
 RectTransform:
  m_ObjectHideFlags: 0
@ -4194,15 +4194,15 @@ RectTransform:
  m_GameObject: {fileID: 216708359}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: -0.00001546}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
+  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 1298478937}
  m_Father: {fileID: 442538738}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -6.964905, y: 93}
+  m_AnchoredPosition: {x: -154, y: 129}
  m_SizeDelta: {x: 288.5, y: 109.1}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &216708361
@ -6713,8 +6713,8 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 330585543}
  serializedVersion: 2
-  m_LocalRotation: {x: 0.28411034, y: 0.36865208, z: -0.119428165, w: 0.8769914}
-  m_LocalPosition: {x: -2.45, y: 5.99, z: -3.28}
+  m_LocalRotation: {x: 0.3836269, y: 0, z: 0, w: 0.9234882}
+  m_LocalPosition: {x: 2.73, y: 6, z: -2.68}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@ -7078,8 +7078,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 789.05, y: 121.04}
-  m_SizeDelta: {x: 2000, y: 163.72}
+  m_AnchoredPosition: {x: 829.27, y: 73.36}
+  m_SizeDelta: {x: 1658.49, y: 68.35}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &345108946
 MonoBehaviour:
@ -14168,8 +14168,8 @@ RectTransform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 637486497}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0.000054969}
-  m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 471985938}
@ -14181,7 +14181,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 702.3, y: 469.81}
+  m_AnchoredPosition: {x: 778, y: 503}
  m_SizeDelta: {x: 333.6, y: 81.589}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &637486499
@ -14611,6 +14611,43 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 646373155}
  m_CullTransparentMesh: 1
+--- !u!1 &647367596
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 647367597}
+  m_Layer: 5
+  m_Name: RelicPanle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &647367597
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 647367596}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.000042915344}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1840237607}
+  - {fileID: 1748859174}
+  m_Father: {fileID: 846544929}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -780, y: 246.483}
+  m_SizeDelta: {x: 157.04004, y: 173.66998}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &669923021
 GameObject:
  m_ObjectHideFlags: 0
@ -14648,7 +14685,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -89.3, y: -40.050003}
+  m_AnchoredPosition: {x: 64, y: 44}
  m_SizeDelta: {x: 146.8, y: 24.7}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &669923023
@ -14817,6 +14854,7 @@ MonoBehaviour:
  greenNodeCount: 0
  whiteNodeCount: 0
  blackNodeCount: 0
+  metalNodeCount: 0
 --- !u!1 &690000101
 GameObject:
  m_ObjectHideFlags: 0
@ -15119,15 +15157,15 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 699857786}
  serializedVersion: 2
-  m_LocalRotation: {x: 0.28411034, y: 0.36865208, z: -0.119428165, w: 0.8769914}
-  m_LocalPosition: {x: -2.45, y: 5.99, z: -3.28}
+  m_LocalRotation: {x: 0.3836269, y: -0, z: -0, w: 0.9234882}
+  m_LocalPosition: {x: 2.73, y: 6, z: -2.68}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 328654747}
  - {fileID: 1098880431}
  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 35.901, y: 45.6, z: 0}
+  m_LocalEulerAnglesHint: {x: 45.117, y: 0, z: 0}
 --- !u!114 &699857789
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -18282,6 +18320,9 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
+  - {fileID: 1242608529}
+  - {fileID: 1009332617}
+  - {fileID: 647367597}
  - {fileID: 1504140803}
  - {fileID: 442538738}
  - {fileID: 1317009332}
@ -20461,18 +20502,18 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 976430174}
-  m_LocalRotation: {x: 0.35355338, y: 0.35355338, z: -0.1464466, w: 0.8535535}
-  m_LocalPosition: {x: 0, y: 0, z: 2.835674}
+  m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956}
+  m_LocalPosition: {x: 0, y: 0, z: 16.04}
  m_LocalScale: {x: 0.011111111, y: 0.011111111, z: 0.011111111}
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 1733830043}
  - {fileID: 1598057361}
  m_Father: {fileID: 495022420}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 3.8096085, y: -0.6147766}
+  m_AnchoredPosition: {x: 3.8096085, y: -13.82}
  m_SizeDelta: {x: 1920, y: 1080}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &987145031
@ -21286,19 +21327,19 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1009332616}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.000021457672}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 791443578}
  - {fileID: 1818977955}
  - {fileID: 2096369104}
-  m_Father: {fileID: 1504140803}
+  m_Father: {fileID: 846544929}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 257, y: 22}
+  m_AnchoredPosition: {x: -612, y: -351}
  m_SizeDelta: {x: 120, y: 120}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1009332618
@ -23390,7 +23431,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -88.95, y: -118.21}
+  m_AnchoredPosition: {x: 88.95001, y: -17.990013}
  m_SizeDelta: {x: 177.9, y: 75.82}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1143340467
@ -25408,7 +25449,7 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1242608528}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 1}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
@ -25416,11 +25457,11 @@ RectTransform:
  - {fileID: 223587225}
  - {fileID: 2079958393}
  - {fileID: 219845940}
-  m_Father: {fileID: 1504140803}
+  m_Father: {fileID: 846544929}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 257, y: -100}
+  m_AnchoredPosition: {x: -612, y: -473.00012}
  m_SizeDelta: {x: 120, y: 120}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1242608530
@ -26814,6 +26855,7 @@ MonoBehaviour:
  - Y: []
  - Y: []
  - Y: []
+  - Y: []
  character: 0
  playerOn: {fileID: 0}
  player: {fileID: 1809205617}
@ -26916,7 +26958,7 @@ RectTransform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1293189436}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 176}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
  m_ConstrainProportionsScale: 1
  m_Children:
@ -26926,7 +26968,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -825, y: 375}
+  m_AnchoredPosition: {x: -414, y: 471}
  m_SizeDelta: {x: 785.1, y: 749.23}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1293189438
@ -27268,8 +27310,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: -40.166, y: -66.807, z: 50.571}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 787.47, y: 122.74}
-  m_SizeDelta: {x: 2058.14, y: 209.32}
+  m_AnchoredPosition: {x: 829.52, y: 72.79}
+  m_SizeDelta: {x: 1704.27, y: 109.5}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!95 &1313982821
 Animator:
@ -29044,7 +29086,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -100, y: 0.000029564}
+  m_AnchoredPosition: {x: -1685, y: 0.000029564}
  m_SizeDelta: {x: 79.5, y: 62.888}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1433470491
@ -30289,7 +30331,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1480025706
 RectTransform:
  m_ObjectHideFlags: 0
@ -30649,7 +30691,7 @@ RectTransform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1501760641}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: -0.000010729}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
@ -30658,7 +30700,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -129.4, y: -41.100006}
+  m_AnchoredPosition: {x: 171.65, y: 46.449997}
  m_SizeDelta: {x: 28.08, y: 29.6}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1501760643
@ -30886,19 +30928,15 @@ RectTransform:
  m_Children:
  - {fileID: 2060702281}
  - {fileID: 1501760642}
-  - {fileID: 1009332617}
-  - {fileID: 1242608529}
  - {fileID: 669923022}
  - {fileID: 83788479}
  - {fileID: 1143340466}
-  - {fileID: 1840237607}
-  - {fileID: 1748859174}
  m_Father: {fileID: 846544929}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -20.699951, y: -24.699951}
-  m_SizeDelta: {x: 419.5, y: 373.7}
+  m_AnchoredPosition: {x: 12, y: 910.88}
+  m_SizeDelta: {x: 419.5, y: 169.82}
  m_Pivot: {x: 0, y: 0}
 --- !u!114 &1504140804
 MonoBehaviour:
@ -30920,7 +30958,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 19c9ba2f66781c4469b6a6264e57d8cc, type: 3}
+  m_Sprite: {fileID: 0}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -37365,17 +37403,17 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1598057360}
-  m_LocalRotation: {x: 0.38255438, y: 0.009941679, z: -0.024001332, w: 0.9235677}
-  m_LocalPosition: {x: 0, y: 0, z: -145}
+  m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956}
+  m_LocalPosition: {x: 0, y: 0, z: -1774.92}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 976430178}
-  m_LocalEulerAnglesHint: {x: 45, y: 0, z: -2.977}
+  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -25, y: -39}
-  m_SizeDelta: {x: 1854.32, y: 2568.47}
+  m_AnchoredPosition: {x: -97.27, y: 19.08}
+  m_SizeDelta: {x: 1906.43, y: 2182.03}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1598057362
 MonoBehaviour:
@ -40072,7 +40110,7 @@ RectTransform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1733830042}
  m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956}
-  m_LocalPosition: {x: 0, y: 0, z: -94.84}
+  m_LocalPosition: {x: 0, y: 0, z: -1749}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 1
  m_Children: []
@ -40080,7 +40118,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -84.09, y: 19.16}
+  m_AnchoredPosition: {x: -84.09, y: 17}
  m_SizeDelta: {x: 2059.36, y: 2101.82}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1733830044
@ -40303,15 +40341,15 @@ RectTransform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1748859173}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0.000060122}
+  m_LocalPosition: {x: 0, y: 0, z: 0.000042915344}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
-  m_Father: {fileID: 1504140803}
+  m_Father: {fileID: 647367597}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 1, y: 0.5}
  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -43.109985, y: -69.283}
+  m_AnchoredPosition: {x: -79.72986, y: -3.4830322}
  m_SizeDelta: {x: 154.54, y: 173.66}
  m_Pivot: {x: 1, y: 0.5}
 --- !u!114 &1748859175
@ -40654,7 +40692,7 @@ RectTransform:
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0.000011867}
  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 1583609271}
  - {fileID: 1622334931}
@ -40679,7 +40717,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
@ -41976,8 +42014,8 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  mapUnity: {fileID: 887005656701010215, guid: ecde4b12dc4538b4caff9ada56c9ab30, type: 3}
-  line: 8
-  column: 8
+  line: 9
+  column: 6
  generatePoint: {fileID: 514899946}
  lineOffSet: {x: 1, y: 0, z: 0}
  columnOffSet: {x: 0, y: 0, z: 0.865}
@ -43098,8 +43136,8 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1840237606}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.000021457672}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
@ -43109,11 +43147,11 @@ RectTransform:
  - {fileID: 643048636}
  - {fileID: 1191866220}
  - {fileID: 239420341}
-  m_Father: {fileID: 1504140803}
+  m_Father: {fileID: 647367597}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 1, y: 0.5}
  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -41.899994, y: -65.8}
+  m_AnchoredPosition: {x: -78.5199, y: -0.000030517578}
  m_SizeDelta: {x: 157.04, y: 173.67}
  m_Pivot: {x: 1, y: 0.5}
 --- !u!114 &1840237608
@ -47160,7 +47198,7 @@ RectTransform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2060702280}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0}
+  m_LocalPosition: {x: 0, y: 0, z: -0.000021458}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@ -47168,7 +47206,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -89.3, y: 69.100006}
+  m_AnchoredPosition: {x: -125.549995, y: 0.0000076293945}
  m_SizeDelta: {x: 168.4, y: 162.5}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2060702282
@ -48125,7 +48163,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2131110858
 RectTransform:
  m_ObjectHideFlags: 0
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs
@ -120,8 +120,8 @@ public class GameManager : Singleton<GameManager>
    private void Start()
    {
        //生成空地图列表
-        GenerateEnmptyMapList();
-       // GenerateEnmptyMapListDefault();
+       // GenerateEnmptyMapList();
+        GenerateEnmptyMapListDefault();
        //生成角色数据
        if (PlayerStatsManager .Instance .playerState != null)
            playerState = Instantiate(PlayerStatsManager.Instance.playerState);
@ -162,11 +162,20 @@ public class GameManager : Singleton<GameManager>
    }
    public void GenerateEnmptyMapListDefault()
    {
+        int currentColumn = MapManager.Instance.column-1;
        if (complete == false)
        {
            for (int i = 0; i < MapManager.Instance.line; i++)
            {
-                for (int j = 0; j < MapManager.Instance.column; j++)
+                if(i<=( MapManager.Instance.line-1)/2)
+                {
+                    currentColumn += 1;
+                }
+                else
+                {
+                    currentColumn -= 1;
+                }
+                for (int j = 0; j < currentColumn; j++)
                {
                    X[i].Y.Add(null);
                }
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs
@ -55,7 +55,7 @@ public class MapManager : Singleton<MapManager>
        playerMoneyText.text = GameManager.Instance.playerState.money.ToString ();

        //婥⻌華芞呯⑵
-        Object [] mapImage = Resources.LoadAll(imagePath); 
+       /* Object [] mapImage = Resources.LoadAll(imagePath); 
        for(int i=1;i<mapImage .Length;i++)
        {
            mapImageTest.Add((UnityEngine.Sprite)mapImage[i]);
@ -69,10 +69,10 @@ public class MapManager : Singleton<MapManager>
                sprites.Add(mapImageTest[(i - 1) *( column *2) + j]);
            }
            mapImages_dol.Add(sprites);
-        }
+        }*/

        //啞伎華輸芨伎
-        StartCoroutine(WhiteColorNodeSun());
+       // StartCoroutine(WhiteColorNodeSun());

        //珆尨縐齪賤佽
        if(PlayerStatsManager .Instance .levelDevelopData .levelStep ==1)
@ -188,7 +188,7 @@ public class MapManager : Singleton<MapManager>

    IEnumerator GenerateProcess()
    {    
-        yield return StartCoroutine(MapGenerate());
+        yield return StartCoroutine(MapGenerateDefault());
       // yield return StartCoroutine(MapGenerateDefault());
        yield return StartCoroutine(SetUpMapUnity());
        yield return StartCoroutine(UPMoveMapUnity());
@ -306,6 +306,9 @@ public class MapManager : Singleton<MapManager>
    }
    IEnumerator MapGenerateDefault()
    {
+        int middleLine = (line - 1) / 2;
+        int currentColumn = column;
+
        for (int i = 0; i < line; i++)
        {
            if (i != 0)
@ -314,15 +317,25 @@ public class MapManager : Singleton<MapManager>
            }
            generatePoint.transform.position = new Vector3(0, 0, generatePoint.transform.position.z);

-            int currentColumn = column;          
-            for (int j = 0; j < currentColumn; j++)
+            
+            if (i<=middleLine )
            {
-                if (i % 2 == 0 && j == 0)
+                if(i!=0)
                {
-                    generatePoint.transform.position += lineOffSet / 2f;
-                }
-
+                    currentColumn += 1;
+                    generatePoint.transform.position -= (lineOffSet / 2f)*i;
+                }              
+            }
+            else
+            {
+                currentColumn -= 1;
+                generatePoint.transform.position -= (lineOffSet / 2f)*(line -i-1);
+            }
+            Debug.Log("ÁÐÊý£º" + currentColumn+"ÖÐ¼äÖµ£º"+middleLine );
+            for (int j = 0; j < currentColumn; j++)
+            {
                var a = Instantiate(mapUnity, generatePoint.transform.position - new Vector3(0, 2, 0), mapUnity.transform.rotation);
+                a.transform.SetParent(mapUnityFather);
                MapUnity currentMapUnityScript = a.GetComponent<MapUnity>();
                currentMapUnityScript.locationX = i;
                currentMapUnityScript.locationY = j;
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/MapUnity.cs
@ -1,6 +1,6 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
-using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.UI;

@ -102,7 +102,7 @@ public class MapUnity : MonoBehaviour
        {
            yStart += 1;
        }   
-       
+       /*
        //  int index = (xStart - 1) * 22 + 1 + yStart;
        mapImages[0].sprite = (UnityEngine.Sprite)MapManager.Instance.mapImages_dol[xStart][yStart];
        //  int index_2 = (xStart - 2) * 22 + 1 + yStart;
@ -114,7 +114,7 @@ public class MapUnity : MonoBehaviour
        // int index_5 = (xStart) * 22 + 1 + yStart - 1;
        mapImages[4].sprite = (UnityEngine.Sprite)MapManager.Instance.mapImages_dol[xStart + 1][yStart - 1];
        //  int index_6 = (xStart) * 22 + 1 + yStart;
-        mapImages[5].sprite = (UnityEngine.Sprite)MapManager.Instance.mapImages_dol[xStart + 1][yStart];
+        mapImages[5].sprite = (UnityEngine.Sprite)MapManager.Instance.mapImages_dol[xStart + 1][yStart];*/
    }


@ -216,8 +216,110 @@ public class MapUnity : MonoBehaviour
    }
    public void ConnectUnit()
    {
+        if (locationX % 2 == 0)
+        {
+            try
+            {
+                unitPool[0] = GameManager.Instance.X[locationX].Y[locationY - 1];
+            }
+            catch (Exception e)
+            {
+
+            }
+            try
+            {
+                unitPool[1] = GameManager.Instance.X[locationX + 1].Y[locationY - 1];
+            }
+            catch (Exception e)
+            {
+
+            }
+            try
+            {     
+                unitPool[2] = GameManager.Instance.X[locationX + 1].Y[locationY];
+            }
+            catch (Exception e)
+            {
+
+            }
+            try
+            {     
+                unitPool[3] = GameManager.Instance.X[locationX].Y[locationY + 1];
+            }
+            catch (Exception e)
+            {
+
+            }
+            try
+            { 
+                unitPool[4] = GameManager.Instance.X[locationX - 1].Y[locationY];
+            }
+            catch (Exception e)
+            {
+
+            }
+            try
+            {
+                unitPool[5] = GameManager.Instance.X[locationX - 1].Y[locationY - 1];
+            }
+            catch (Exception e)
+            {
+
+            }
+        }
+        else
+        {
+            try
+            {
+                unitPool[0] = GameManager.Instance.X[locationX].Y[locationY - 1];
+            }
+            catch (Exception e)
+            {
+
+            }
+            try
+            {
+                unitPool[1] = GameManager.Instance.X[locationX + 1].Y[locationY];
+            }
+            catch (Exception e)
+            {
+
+            }
+            try
+            {
+                unitPool[2] = GameManager.Instance.X[locationX + 1].Y[locationY + 1];
+            }
+            catch (Exception e)
+            {
+
+            }
+            try
+            {
+                unitPool[3] = GameManager.Instance.X[locationX].Y[locationY + 1];
+            }
+            catch (Exception e)
+            {
+
+            }
+            try
+            {
+                unitPool[4] = GameManager.Instance.X[locationX - 1].Y[locationY + 1];
+            }
+            catch (Exception e)
+            {
+
+            }
+            try
+            {
+                unitPool[5] = GameManager.Instance.X[locationX - 1].Y[locationY];
+            }
+            catch (Exception e)
+            {

-        if (locationX % 2 == 0)//Å¼Êý
+            }
+        }
+          
+       /* if (locationX % 2 == 0)//Å¼Êý
        {
            if (locationY - 1 >= 0)
            {
@ -270,7 +372,7 @@ public class MapUnity : MonoBehaviour

                unitPool[5] = GameManager.Instance.X[locationX - 1].Y[locationY];
            }
-        }
+        }*/
    }

    public void Complete()
@ -299,23 +401,23 @@ public class MapUnity : MonoBehaviour
    {
        if (whoColour == Name.NodeColor.Green)
        {
-            colourGameObject.GetComponent<Renderer>().material = greenColour[Random.Range(0, greenColour.Count)];
+            colourGameObject.GetComponent<Renderer>().material = greenColour[UnityEngine.Random.Range(0, greenColour.Count)];
        }
        else if (whoColour == Name.NodeColor.Blue)
        {
-            colourGameObject.GetComponent<Renderer>().material = blueColour[Random.Range(0, blueColour.Count)];
+            colourGameObject.GetComponent<Renderer>().material = blueColour[UnityEngine.Random.Range(0, blueColour.Count)];
        }
        else if (whoColour == Name.NodeColor.Red)
        {
-            colourGameObject.GetComponent<Renderer>().material = redColour[Random.Range(0, redColour.Count)];
+            colourGameObject.GetComponent<Renderer>().material = redColour[UnityEngine.Random.Range(0, redColour.Count)];
        }
        else if (whoColour == Name.NodeColor.Black)
        {
-            colourGameObject.GetComponent<Renderer>().material = blackColour[Random.Range(0, blackColour.Count)];
+            colourGameObject.GetComponent<Renderer>().material = blackColour[UnityEngine.Random.Range(0, blackColour.Count)];
        }
        else if (whoColour == Name.NodeColor.White)
        {
-            colourGameObject.GetComponent<Renderer>().material = whiteColour[Random.Range(0, whiteColour.Count)];
+            colourGameObject.GetComponent<Renderer>().material = whiteColour[UnityEngine.Random.Range(0, whiteColour.Count)];
        }
    }
    public void ParticlePlay()