Merge pull request '遗物弹窗。新事件' (#73) from dev-1027-3 into dev-0524

Reviewed-on: #73

ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset

@@ -12,8 +12,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 23280c7f867c4ca468ab73909d4f7707, type: 3}
   m_Name: LevelState_1
   m_EditorClassIdentifier: 
-  levelStep: 0
+  levelStep: 1
-  currentPoint: {x: 3, y: 1}
+  currentPoint: {x: 0, y: 3}
   levelSaveMap:
   - levelDataList:
     - roomType: 0
@@ -32,26 +32,27 @@ MonoBehaviour:
       column: 1
       fatherLevelNodes: []
       nextLevelNodes:
-      - {x: 1, y: 1}
       - {x: 1, y: 0}
+      - {x: 1, y: 2}
     - roomType: 0
       isUse: 1
-      passBy: 1
+      passBy: 0
       nodePos: {x: -7.583029, y: 0.05970955, z: -6.679107}
       line: 0
       column: 2
       fatherLevelNodes: []
       nextLevelNodes:
-      - {x: 1, y: 3}
+      - {x: 1, y: 2}
     - roomType: 0
       isUse: 1
-      passBy: 0
+      passBy: 1
       nodePos: {x: -7.5830364, y: 0.059711456, z: -5.679109}
       line: 0
       column: 3
       fatherLevelNodes: []
       nextLevelNodes:
       - {x: 1, y: 3}
+      - {x: 1, y: 2}
     - roomType: 0
       isUse: 0
       passBy: 0
@@ -71,7 +72,7 @@ MonoBehaviour:
       - {x: 0, y: 1}
       nextLevelNodes:
       - {x: 2, y: 0}
-    - roomType: 5
+    - roomType: 4
       isUse: 0
       passBy: 0
       nodePos: {x: -5.4530506, y: 0.059720993, z: -7.679108}
@@ -79,107 +80,80 @@ MonoBehaviour:
       column: 1
       fatherLevelNodes: []
       nextLevelNodes: []
-    - roomType: 5
+    - roomType: 0
       isUse: 1
-      passBy: 1
+      passBy: 0
       nodePos: {x: -5.4530544, y: 0.0597229, z: -6.679111}
       line: 1
       column: 2
       fatherLevelNodes:
       - {x: 0, y: 1}
       - {x: 0, y: 2}
+      - {x: 0, y: 3}
       nextLevelNodes:
-      - {x: 2, y: 1}
+      - {x: 2, y: 3}
-    - roomType: 0
-      isUse: 1
-      passBy: 0
-      nodePos: {x: -5.4530506, y: 0.059720993, z: -7.679108}
-      line: 1
-      column: 1
-      fatherLevelNodes:
-      - {x: 0, y: 1}
-      nextLevelNodes:
       - {x: 2, y: 2}
-    - roomType: 1
+    - roomType: 5
-      isUse: 0
-      passBy: 0
-      nodePos: {x: -5.4530544, y: 0.0597229, z: -6.679111}
-      line: 1
-      column: 2
-      fatherLevelNodes: []
-      nextLevelNodes: []
-    - roomType: 0
       isUse: 1
-      passBy: 1
+      passBy: 0
       nodePos: {x: -5.45306, y: 0.059724808, z: -5.679114}
       line: 1
       column: 3
       fatherLevelNodes:
-      - {x: 0, y: 2}
+      - {x: 0, y: 3}
       nextLevelNodes:
       - {x: 2, y: 3}
-      - {x: 2, y: 2}
+    - roomType: 0
-    - roomType: 5
       isUse: 0
       passBy: 0
       nodePos: {x: -5.453064, y: 0.059726715, z: -4.679116}
       line: 1
       column: 4
-      fatherLevelNodes:
+      fatherLevelNodes: []
-      - {x: 0, y: 3}
+      nextLevelNodes: []
-      nextLevelNodes:
-      - {x: 2, y: 4}
   - levelDataList:
-    - roomType: 0
+    - roomType: 5
       isUse: 1
       passBy: 0
       nodePos: {x: -3.3230686, y: 0.059732437, z: -8.679108}
       line: 2
       column: 0
-      fatherLevelNodes: []
-      nextLevelNodes: []
-    - roomType: 0
-      isUse: 1
-      passBy: 0
-      nodePos: {x: -3.3230724, y: 0.059734344, z: -7.679109}
-      line: 2
-      column: 1
       fatherLevelNodes:
       - {x: 1, y: 0}
       nextLevelNodes:
       - {x: 3, y: 0}
-    - roomType: 5
+    - roomType: 0
-      isUse: 1
+      isUse: 0
-      passBy: 1
+      passBy: 0
       nodePos: {x: -3.3230724, y: 0.059734344, z: -7.679109}
       line: 2
       column: 1
-      fatherLevelNodes:
+      fatherLevelNodes: []
-      - {x: 1, y: 2}
+      nextLevelNodes: []
-      nextLevelNodes:
+    - roomType: 0
-      - {x: 3, y: 0}
-      - {x: 3, y: 1}
-    - roomType: 5
       isUse: 1
       passBy: 0
       nodePos: {x: -3.3230762, y: 0.05973625, z: -6.679111}
       line: 2
       column: 2
       fatherLevelNodes:
-      - {x: 1, y: 3}
+      - {x: 1, y: 2}
       nextLevelNodes:
       - {x: 3, y: 1}
-    - roomType: 0
+      - {x: 3, y: 2}
+    - roomType: 5
       isUse: 1
       passBy: 0
       nodePos: {x: -3.32308, y: 0.05973816, z: -5.679112}
       line: 2
       column: 3
       fatherLevelNodes:
+      - {x: 1, y: 2}
       - {x: 1, y: 3}
       nextLevelNodes:
       - {x: 3, y: 2}
-    - roomType: 5
+      - {x: 3, y: 4}
+    - roomType: 0
       isUse: 0
       passBy: 0
       nodePos: {x: -3.3230858, y: 0.059740067, z: -4.679114}
@@ -195,24 +169,20 @@ MonoBehaviour:
       line: 3
       column: 0
       fatherLevelNodes:
-      - {x: 2, y: 1}
       - {x: 2, y: 0}
       nextLevelNodes:
-      - {x: 4, y: 1}
       - {x: 4, y: 0}
-    - roomType: 0
+    - roomType: 5
       isUse: 1
       passBy: 0
       nodePos: {x: -1.1930962, y: 0.059747696, z: -7.679107}
       line: 3
       column: 1
       fatherLevelNodes:
-      - {x: 2, y: 1}
       - {x: 2, y: 2}
       nextLevelNodes:
-      - {x: 4, y: 2}
+      - {x: 4, y: 0}
-      - {x: 4, y: 1}
+    - roomType: 0
-    - roomType: 5
       isUse: 1
       passBy: 0
       nodePos: {x: -1.1931, y: 0.059749603, z: -6.679109}
@@ -220,7 +190,9 @@ MonoBehaviour:
       column: 2
       fatherLevelNodes:
       - {x: 2, y: 3}
+      - {x: 2, y: 2}
       nextLevelNodes:
+      - {x: 4, y: 1}
       - {x: 4, y: 2}
     - roomType: 0
       isUse: 0
@@ -231,17 +203,17 @@ MonoBehaviour:
       fatherLevelNodes: []
       nextLevelNodes: []
     - roomType: 5
-      isUse: 0
+      isUse: 1
       passBy: 0
       nodePos: {x: -1.1931071, y: 0.059753418, z: -4.679114}
       line: 3
       column: 4
       fatherLevelNodes:
-      - {x: 2, y: 4}
+      - {x: 2, y: 3}
       nextLevelNodes:
-      - {x: 4, y: 4}
+      - {x: 4, y: 3}
   - levelDataList:
-    - roomType: 0
+    - roomType: 5
       isUse: 1
       passBy: 0
       nodePos: {x: 0.9368901, y: 0.05975914, z: -8.679108}
@@ -249,20 +221,19 @@ MonoBehaviour:
       column: 0
       fatherLevelNodes:
       - {x: 3, y: 0}
+      - {x: 3, y: 1}
       nextLevelNodes:
-      - {x: 5, y: 0}
+      - {x: 5, y: 1}
-    - roomType: 5
+    - roomType: 3
       isUse: 1
       passBy: 0
       nodePos: {x: 0.93688774, y: 0.059761047, z: -7.67911}
       line: 4
       column: 1
       fatherLevelNodes:
-      - {x: 3, y: 0}
+      - {x: 3, y: 2}
-      - {x: 3, y: 1}
       nextLevelNodes:
-      - {x: 5, y: 2}
+      - {x: 5, y: 1}
-      - {x: 5, y: 0}
     - roomType: 0
       isUse: 1
       passBy: 0
@@ -270,19 +241,19 @@ MonoBehaviour:
       line: 4
       column: 2
       fatherLevelNodes:
-      - {x: 3, y: 1}
       - {x: 3, y: 2}
       nextLevelNodes:
       - {x: 5, y: 2}
-      - {x: 5, y: 3}
+    - roomType: 5
-    - roomType: 1
+      isUse: 1
-      isUse: 0
       passBy: 0
       nodePos: {x: 0.93688345, y: 0.059764862, z: -5.679114}
       line: 4
       column: 3
-      fatherLevelNodes: []
+      fatherLevelNodes:
-      nextLevelNodes: []
+      - {x: 3, y: 4}
+      nextLevelNodes:
+      - {x: 5, y: 3}
     - roomType: 5
       isUse: 0
       passBy: 0
@@ -292,77 +263,73 @@ MonoBehaviour:
       fatherLevelNodes: []
       nextLevelNodes: []
   - levelDataList:
-    - roomType: 1
+    - roomType: 0
       isUse: 0
       passBy: 0
       nodePos: {x: 3.0668812, y: 0.05977249, z: -8.679108}
       line: 5
       column: 0
+      fatherLevelNodes: []
+      nextLevelNodes: []
+    - roomType: 4
+      isUse: 1
+      passBy: 0
+      nodePos: {x: 3.0668805, y: 0.0597744, z: -7.679108}
+      line: 5
+      column: 1
       fatherLevelNodes:
       - {x: 4, y: 0}
       - {x: 4, y: 1}
       nextLevelNodes:
-      - {x: 6, y: 1}
+      - {x: 6, y: 2}
+      - {x: 6, y: 0}
     - roomType: 0
-      isUse: 0
-      passBy: 0
-      nodePos: {x: 3.0668805, y: 0.0597744, z: -7.679108}
-      line: 5
-      column: 1
-      fatherLevelNodes: []
-      nextLevelNodes: []
-    - roomType: 4
       isUse: 1
       passBy: 0
       nodePos: {x: 3.0668807, y: 0.059776306, z: -6.67911}
       line: 5
       column: 2
       fatherLevelNodes:
-      - {x: 4, y: 1}
       - {x: 4, y: 2}
       nextLevelNodes:
-      - {x: 6, y: 1}
       - {x: 6, y: 2}
-    - roomType: 5
+    - roomType: 0
       isUse: 1
       passBy: 0
       nodePos: {x: 3.06688, y: 0.059778214, z: -5.679112}
       line: 5
       column: 3
       fatherLevelNodes:
-      - {x: 4, y: 2}
+      - {x: 4, y: 3}
       nextLevelNodes:
       - {x: 6, y: 4}
-    - roomType: 0
+    - roomType: 1
       isUse: 0
       passBy: 0
       nodePos: {x: 3.0668788, y: 0.05978012, z: -4.679114}
       line: 5
       column: 4
-      fatherLevelNodes:
+      fatherLevelNodes: []
-      - {x: 4, y: 4}
+      nextLevelNodes: []
-      nextLevelNodes:
-      - {x: 6, y: 4}
   - levelDataList:
     - roomType: 6
-      isUse: 0
+      isUse: 1
       passBy: 0
       nodePos: {x: 5.1968794, y: 0.059785843, z: -8.679108}
       line: 6
       column: 0
-      fatherLevelNodes: []
+      fatherLevelNodes:
-      nextLevelNodes: []
+      - {x: 5, y: 1}
+      nextLevelNodes:
+      - {x: 7, y: 0}
     - roomType: 6
       isUse: 0
       passBy: 0
       nodePos: {x: 5.1968794, y: 0.05978775, z: -7.679109}
       line: 6
       column: 1
-      fatherLevelNodes:
+      fatherLevelNodes: []
-      - {x: 5, y: 2}
+      nextLevelNodes: []
-      - {x: 5, y: 0}
-      nextLevelNodes:
-      - {x: 7, y: 0}
     - roomType: 6
       isUse: 1
       passBy: 0
@@ -370,9 +337,10 @@ MonoBehaviour:
       line: 6
       column: 2
       fatherLevelNodes:
+      - {x: 5, y: 1}
       - {x: 5, y: 2}
       nextLevelNodes:
-      - {x: 7, y: 1}
+      - {x: 7, y: 3}
     - roomType: 6
       isUse: 0
       passBy: 0
@@ -381,14 +349,6 @@ MonoBehaviour:
       column: 3
       fatherLevelNodes: []
       nextLevelNodes: []
-    - roomType: 6
-      isUse: 1
-      passBy: 0
-      nodePos: {x: 5.1968794, y: 0.059791565, z: -5.679115}
-      line: 6
-      column: 3
-      fatherLevelNodes: []
-      nextLevelNodes: []
     - roomType: 6
       isUse: 1
       passBy: 0
@@ -398,30 +358,27 @@ MonoBehaviour:
       fatherLevelNodes:
       - {x: 5, y: 3}
       nextLevelNodes:
-      - {x: 7, y: 4}
+      - {x: 7, y: 3}
   - levelDataList:
-    - roomType: 0
+    - roomType: 1
-      isUse: 0
+      isUse: 1
       passBy: 0
       nodePos: {x: 7.3268824, y: 0.059799194, z: -8.679108}
       line: 7
       column: 0
       fatherLevelNodes:
-      - {x: 6, y: 1}
+      - {x: 6, y: 0}
       nextLevelNodes:
       - {x: 8, y: 0}
-      - {x: 8, y: 1}
+    - roomType: 5
-    - roomType: 0
+      isUse: 0
-      isUse: 1
       passBy: 0
       nodePos: {x: 7.3268833, y: 0.0598011, z: -7.67911}
       line: 7
       column: 1
-      fatherLevelNodes:
+      fatherLevelNodes: []
-      - {x: 6, y: 2}
+      nextLevelNodes: []
-      nextLevelNodes:
+    - roomType: 5
-      - {x: 8, y: 2}
-    - roomType: 0
       isUse: 0
       passBy: 0
       nodePos: {x: 7.326885, y: 0.05980301, z: -6.679111}
@@ -429,26 +386,28 @@ MonoBehaviour:
       column: 2
       fatherLevelNodes: []
       nextLevelNodes: []
-    - roomType: 0
+    - roomType: 4
-      isUse: 0
+      isUse: 1
       passBy: 0
       nodePos: {x: 7.3268857, y: 0.059804916, z: -5.679114}
       line: 7
       column: 3
-      fatherLevelNodes: []
+      fatherLevelNodes:
-      nextLevelNodes: []
+      - {x: 6, y: 2}
+      - {x: 6, y: 4}
+      nextLevelNodes:
+      - {x: 8, y: 3}
+      - {x: 8, y: 4}
     - roomType: 0
-      isUse: 1
+      isUse: 0
       passBy: 0
       nodePos: {x: 7.326885, y: 0.059806824, z: -4.679115}
       line: 7
       column: 4
-      fatherLevelNodes:
+      fatherLevelNodes: []
-      - {x: 6, y: 4}
+      nextLevelNodes: []
-      nextLevelNodes:
-      - {x: 8, y: 3}
   - levelDataList:
-    - roomType: 4
+    - roomType: 5
       isUse: 1
       passBy: 0
       nodePos: {x: 9.456891, y: 0.059812546, z: -8.679108}
@@ -458,27 +417,22 @@ MonoBehaviour:
       - {x: 7, y: 0}
       nextLevelNodes:
       - {x: 9, y: 0}
-      - {x: 9, y: 1}
+    - roomType: 0
-    - roomType: 1
+      isUse: 0
-      isUse: 1
       passBy: 0
       nodePos: {x: 9.456893, y: 0.059814453, z: -7.679108}
       line: 8
       column: 1
-      fatherLevelNodes:
+      fatherLevelNodes: []
-      - {x: 7, y: 0}
+      nextLevelNodes: []
-      nextLevelNodes:
+    - roomType: 3
-      - {x: 9, y: 2}
+      isUse: 0
-    - roomType: 0
-      isUse: 1
       passBy: 0
       nodePos: {x: 9.456895, y: 0.05981636, z: -6.67911}
       line: 8
       column: 2
-      fatherLevelNodes:
+      fatherLevelNodes: []
-      - {x: 7, y: 1}
+      nextLevelNodes: []
-      nextLevelNodes:
-      - {x: 9, y: 3}
     - roomType: 5
       isUse: 1
       passBy: 0
@@ -486,17 +440,20 @@ MonoBehaviour:
       line: 8
       column: 3
       fatherLevelNodes:
-      - {x: 7, y: 4}
+      - {x: 7, y: 3}
       nextLevelNodes:
-      - {x: 9, y: 3}
+      - {x: 9, y: 4}
-    - roomType: 0
+      - {x: 9, y: 2}
-      isUse: 0
+    - roomType: 1
+      isUse: 1
       passBy: 0
       nodePos: {x: 9.456898, y: 0.059820175, z: -4.679116}
       line: 8
       column: 4
-      fatherLevelNodes: []
+      fatherLevelNodes:
-      nextLevelNodes: []
+      - {x: 7, y: 3}
+      nextLevelNodes:
+      - {x: 9, y: 4}
   - levelDataList:
     - roomType: 1
       isUse: 1
@@ -508,40 +465,35 @@ MonoBehaviour:
       - {x: 8, y: 0}
       nextLevelNodes:
       - {x: 10, y: 1}
-    - roomType: 0
+      - {x: 10, y: 0}
-      isUse: 1
+    - roomType: 5
+      isUse: 0
       passBy: 0
       nodePos: {x: 11.586911, y: 0.059827805, z: -7.679109}
       line: 9
       column: 1
-      fatherLevelNodes:
+      fatherLevelNodes: []
-      - {x: 8, y: 0}
+      nextLevelNodes: []
-      nextLevelNodes:
+    - roomType: 1
-      - {x: 10, y: 1}
-    - roomType: 5
       isUse: 1
       passBy: 0
       nodePos: {x: 11.586914, y: 0.059829712, z: -6.679111}
       line: 9
       column: 2
       fatherLevelNodes:
-      - {x: 8, y: 1}
+      - {x: 8, y: 3}
       nextLevelNodes:
-      - {x: 10, y: 3}
+      - {x: 10, y: 1}
-    - roomType: 1
+    - roomType: 5
-      isUse: 1
+      isUse: 0
       passBy: 0
       nodePos: {x: 11.58692, y: 0.05983162, z: -5.679112}
       line: 9
       column: 3
-      fatherLevelNodes:
+      fatherLevelNodes: []
-      - {x: 8, y: 2}
+      nextLevelNodes: []
-      - {x: 8, y: 3}
+    - roomType: 4
-      nextLevelNodes:
+      isUse: 1
-      - {x: 10, y: 4}
-      - {x: 10, y: 3}
-    - roomType: 1
-      isUse: 0
       passBy: 0
       nodePos: {x: 11.586924, y: 0.059833527, z: -4.679114}
       line: 9
@@ -550,18 +502,20 @@ MonoBehaviour:
       - {x: 8, y: 3}
       - {x: 8, y: 4}
       nextLevelNodes:
-      - {x: 10, y: 3}
       - {x: 10, y: 4}
+      - {x: 10, y: 3}
   - levelDataList:
-    - roomType: 1
+    - roomType: 0
-      isUse: 0
+      isUse: 1
       passBy: 0
       nodePos: {x: 13.71693, y: 0.05983925, z: -8.679108}
       line: 10
       column: 0
-      fatherLevelNodes: []
+      fatherLevelNodes:
-      nextLevelNodes: []
+      - {x: 9, y: 0}
-    - roomType: 3
+      nextLevelNodes:
+      - {x: 11, y: 1}
+    - roomType: 5
       isUse: 1
       passBy: 0
       nodePos: {x: 13.716934, y: 0.059841156, z: -7.679107}
@@ -569,11 +523,10 @@ MonoBehaviour:
       column: 1
       fatherLevelNodes:
       - {x: 9, y: 0}
-      - {x: 9, y: 1}
+      - {x: 9, y: 2}
       nextLevelNodes:
-      - {x: 11, y: 2}
+      - {x: 11, y: 1}
-      - {x: 11, y: 0}
+    - roomType: 4
-    - roomType: 0
       isUse: 0
       passBy: 0
       nodePos: {x: 13.716938, y: 0.059843063, z: -6.679109}
@@ -581,57 +534,55 @@ MonoBehaviour:
       column: 2
       fatherLevelNodes: []
       nextLevelNodes: []
-    - roomType: 5
+    - roomType: 3
       isUse: 1
       passBy: 0
       nodePos: {x: 13.71694, y: 0.05984497, z: -5.679113}
       line: 10
       column: 3
       fatherLevelNodes:
-      - {x: 9, y: 2}
+      - {x: 9, y: 4}
-      - {x: 9, y: 3}
       nextLevelNodes:
       - {x: 11, y: 3}
-      - {x: 11, y: 4}
+    - roomType: 1
-    - roomType: 0
       isUse: 1
       passBy: 0
       nodePos: {x: 13.716942, y: 0.059846878, z: -4.679115}
       line: 10
       column: 4
       fatherLevelNodes:
-      - {x: 9, y: 3}
+      - {x: 9, y: 4}
       nextLevelNodes:
       - {x: 11, y: 4}
   - levelDataList:
-    - roomType: 1
+    - roomType: 5
-      isUse: 1
+      isUse: 0
       passBy: 0
       nodePos: {x: 15.846952, y: 0.0598526, z: -8.67911}
       line: 11
       column: 0
-      fatherLevelNodes:
-      - {x: 10, y: 1}
-      nextLevelNodes:
-      - {x: 12, y: 0}
-    - roomType: 0
-      isUse: 0
-      passBy: 0
-      nodePos: {x: 15.846956, y: 0.059854507, z: -7.67911}
-      line: 11
-      column: 1
       fatherLevelNodes: []
       nextLevelNodes: []
     - roomType: 0
       isUse: 1
       passBy: 0
-      nodePos: {x: 15.84696, y: 0.059856415, z: -6.679111}
+      nodePos: {x: 15.846956, y: 0.059854507, z: -7.67911}
       line: 11
-      column: 2
+      column: 1
       fatherLevelNodes:
       - {x: 10, y: 1}
+      - {x: 10, y: 0}
       nextLevelNodes:
       - {x: 12, y: 1}
+      - {x: 12, y: 0}
+    - roomType: 0
+      isUse: 0
+      passBy: 0
+      nodePos: {x: 15.84696, y: 0.059856415, z: -6.679111}
+      line: 11
+      column: 2
+      fatherLevelNodes: []
+      nextLevelNodes: []
     - roomType: 1
       isUse: 1
       passBy: 0
@@ -641,8 +592,8 @@ MonoBehaviour:
       fatherLevelNodes:
       - {x: 10, y: 3}
       nextLevelNodes:
-      - {x: 12, y: 2}
+      - {x: 12, y: 3}
-    - roomType: 0
+    - roomType: 5
       isUse: 1
       passBy: 0
       nodePos: {x: 15.846968, y: 0.05986023, z: -4.679115}
@@ -650,9 +601,8 @@ MonoBehaviour:
       column: 4
       fatherLevelNodes:
       - {x: 10, y: 4}
-      - {x: 10, y: 3}
       nextLevelNodes:
-      - {x: 12, y: 4}
+      - {x: 12, y: 3}
   - levelDataList:
     - roomType: 4
       isUse: 1
@@ -661,7 +611,7 @@ MonoBehaviour:
       line: 12
       column: 0
       fatherLevelNodes:
-      - {x: 11, y: 0}
+      - {x: 11, y: 1}
       nextLevelNodes:
       - {x: 13, y: 2}
     - roomType: 4
@@ -671,38 +621,38 @@ MonoBehaviour:
       line: 12
       column: 1
       fatherLevelNodes:
-      - {x: 11, y: 2}
+      - {x: 11, y: 1}
       nextLevelNodes:
       - {x: 13, y: 2}
-    - roomType: 4
-      isUse: 1
-      passBy: 0
-      nodePos: {x: 17.977, y: 0.059869766, z: -6.679111}
-      line: 12
-      column: 2
-      fatherLevelNodes:
-      - {x: 11, y: 3}
-      nextLevelNodes:
       - {x: 13, y: 2}
     - roomType: 4
       isUse: 0
       passBy: 0
-      nodePos: {x: 17.977009, y: 0.059871674, z: -5.679112}
+      nodePos: {x: 17.977, y: 0.059869766, z: -6.679111}
       line: 12
-      column: 3
+      column: 2
       fatherLevelNodes: []
       nextLevelNodes: []
     - roomType: 4
       isUse: 1
       passBy: 0
-      nodePos: {x: 17.977015, y: 0.05987358, z: -4.679114}
+      nodePos: {x: 17.977009, y: 0.059871674, z: -5.679112}
       line: 12
-      column: 4
+      column: 3
       fatherLevelNodes:
       - {x: 11, y: 4}
+      - {x: 11, y: 3}
       nextLevelNodes:
       - {x: 13, y: 2}
       - {x: 13, y: 2}
+    - roomType: 4
+      isUse: 0
+      passBy: 0
+      nodePos: {x: 17.977015, y: 0.05987358, z: -4.679114}
+      line: 12
+      column: 4
+      fatherLevelNodes: []
+      nextLevelNodes: []
   - levelDataList:
     - roomType: 2
       isUse: 0
@@ -727,11 +677,11 @@ MonoBehaviour:
       line: 13
       column: 2
       fatherLevelNodes:
+      - {x: 12, y: 3}
       - {x: 12, y: 1}
-      - {x: 12, y: 2}
-      - {x: 12, y: 4}
-      - {x: 12, y: 4}
       - {x: 12, y: 0}
+      - {x: 12, y: 3}
+      - {x: 12, y: 1}
       nextLevelNodes: []
     - roomType: 2
       isUse: 0
@@ -749,4 +699,4 @@ MonoBehaviour:
       column: 4
       fatherLevelNodes: []
       nextLevelNodes: []
-  fightEenemyPool: Boss
+  fightEenemyPool: weak

ColorlessWorld-2024-4-2/Assets/Image/新玩家角色/未命名作品_1729955392.png.meta

@@ -0,0 +1,215 @@
+fileFormatVersion: 2
+guid: da31238a16a427241899a124cf4b0609
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: "\u672A\u547D\u540D\u4F5C\u54C1_1729955392_0"
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 150
+        height: 150
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: fe5d6ff8739d8e846aec35abc2f6f75d
+      internalID: -1506003306
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: "\u672A\u547D\u540D\u4F5C\u54C1_1729955392_1"
+      rect:
+        serializedVersion: 2
+        x: 157
+        y: 2
+        width: 150
+        height: 150
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 9eb183dce4ef71941a9cce7318035970
+      internalID: 902670823
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: "\u672A\u547D\u540D\u4F5C\u54C1_1729955392_2"
+      rect:
+        serializedVersion: 2
+        x: 352
+        y: 3
+        width: 150
+        height: 150
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 63528eecf54d6464db078129405c47ae
+      internalID: -1056989932
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: "\u672A\u547D\u540D\u4F5C\u54C1_1729955392_3"
+      rect:
+        serializedVersion: 2
+        x: 539
+        y: 0
+        width: 150
+        height: 150
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: d29b3f7c04684584dacfacec224faccf
+      internalID: -257868070
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: e82f962c44529be43bd5b84f18456653
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable:
+      "\u672A\u547D\u540D\u4F5C\u54C1_1729955392_0": -1506003306
+      "\u672A\u547D\u540D\u4F5C\u54C1_1729955392_1": 902670823
+      "\u672A\u547D\u540D\u4F5C\u54C1_1729955392_2": -1056989932
+      "\u672A\u547D\u540D\u4F5C\u54C1_1729955392_3": -257868070
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Prefab/Relic.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b1db7a967c418df4ea52187cdeb07cb7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/Image.prefab → ColorlessWorld-2024-4-2/Assets/Prefab/Relic/Image.prefab

@@ -11,6 +11,7 @@ GameObject:
   - component: {fileID: 1311931387777519489}
   - component: {fileID: 3362123693157999914}
   - component: {fileID: 3517266222871449953}
+  - component: {fileID: 4973472248603975134}
   m_Layer: 5
   m_Name: Image
   m_TagString: Untagged
@@ -75,3 +76,19 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &4973472248603975134
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 912575536458647953}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 517975a48f8546f4a98750093e5b11e4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  inforBar: {fileID: 0}
+  offSet: {x: 0, y: 0, z: 0}
+  layoutGroup: {fileID: 0}
+  textAnchor: 1

ColorlessWorld-2024-4-2/Assets/Prefab/Relic/RelicInforTip.prefab

@@ -0,0 +1,252 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2592041783247472681
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5029496837788054627}
+  - component: {fileID: 1914585258800841885}
+  - component: {fileID: 326719674285812878}
+  - component: {fileID: 2548817127250553047}
+  m_Layer: 0
+  m_Name: RelicInforTip
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5029496837788054627
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2592041783247472681}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 953402618508117459}
+  - {fileID: 6065930914584557401}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 300, y: 300}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1914585258800841885
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2592041783247472681}
+  m_CullTransparentMesh: 1
+--- !u!114 &326719674285812878
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2592041783247472681}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: -1505802468, guid: dc6b9182f75d3ba4dba9ab97c6560421, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &2548817127250553047
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2592041783247472681}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ce546151309d8d34b8d16be4a50491a7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  nameText: {fileID: 6183072798072282244}
+  inforText: {fileID: 4327419987093604587}
+--- !u!1 &2875204946471600193
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 953402618508117459}
+  - component: {fileID: 5030735656716133214}
+  - component: {fileID: 6183072798072282244}
+  m_Layer: 0
+  m_Name: Name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &953402618508117459
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2875204946471600193}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5029496837788054627}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 7.2625, y: -6.5822}
+  m_SizeDelta: {x: 288.45, y: 59.8548}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &5030735656716133214
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2875204946471600193}
+  m_CullTransparentMesh: 1
+--- !u!114 &6183072798072282244
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2875204946471600193}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3}
+    m_FontSize: 35
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 45
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: New Text
+--- !u!1 &7015832689841986644
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6065930914584557401}
+  - component: {fileID: 4287330037165761715}
+  - component: {fileID: 4327419987093604587}
+  m_Layer: 0
+  m_Name: Infor
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6065930914584557401
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7015832689841986644}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5029496837788054627}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 1.4873962, y: -33.218536}
+  m_SizeDelta: {x: -11.5501, y: -66.4371}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4287330037165761715
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7015832689841986644}
+  m_CullTransparentMesh: 1
+--- !u!114 &4327419987093604587
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7015832689841986644}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: b5f80b20a6319c744ad2296a28845fda, type: 2}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3}
+    m_FontSize: 30
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: New Text

ColorlessWorld-2024-4-2/Assets/Prefab/Relic/RelicInforTip.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 42e2dea72c5c004419a8c0eb09a884d0
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Prefab/Shop/RelicSaleNode.prefab

@@ -137,7 +137,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -212,7 +212,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -291,7 +291,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -382,7 +382,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -493,6 +493,7 @@ GameObject:
   - component: {fileID: 4838161266964251115}
   - component: {fileID: 2751101482477415459}
   - component: {fileID: 6589884146827135549}
+  - component: {fileID: 8654141132941770650}
   m_Layer: 5
   m_Name: RelicIcon
   m_TagString: Untagged
@@ -613,3 +614,19 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &8654141132941770650
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4547862564442214964}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 517975a48f8546f4a98750093e5b11e4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  inforBar: {fileID: 0}
+  offSet: {x: 0, y: 0, z: 0}
+  layoutGroup: {fileID: 0}
+  textAnchor: 1

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

@@ -11498,6 +11498,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b3dac0a4602fa1b41bbfa073875344c3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  inforPanleType: 0
 --- !u!114 &1041908128
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -15158,7 +15159,7 @@ Canvas:
   serializedVersion: 3
   m_RenderMode: 1
   m_Camera: {fileID: 1786106964}
-  m_PlaneDistance: 100
+  m_PlaneDistance: 7
   m_PixelPerfect: 0
   m_ReceivesEvents: 1
   m_OverrideSorting: 0
@@ -15273,6 +15274,120 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1356428853}
   m_CullTransparentMesh: 1
+--- !u!1 &1372075103
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1372075104}
+  - component: {fileID: 1372075108}
+  - component: {fileID: 1372075107}
+  - component: {fileID: 1372075106}
+  - component: {fileID: 1372075105}
+  m_Layer: 0
+  m_Name: RelicInforPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1372075104
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1372075103}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.513083, y: 0.5130829, z: 0.5130829}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2130507677}
+  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: 0, y: 225.7565}
+  m_SizeDelta: {x: 200, y: 200}
+  m_Pivot: {x: 0.5, y: 1.5}
+--- !u!114 &1372075105
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1372075103}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b3dac0a4602fa1b41bbfa073875344c3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  inforPanleType: 2
+--- !u!114 &1372075106
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1372075103}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_StartCorner: 0
+  m_StartAxis: 1
+  m_CellSize: {x: 300, y: 300}
+  m_Spacing: {x: 0, y: 0}
+  m_Constraint: 2
+  m_ConstraintCount: 4
+--- !u!114 &1372075107
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1372075103}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.2528302, g: 0.2528302, b: 0.2528302, a: 0}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 0
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 100
+--- !u!222 &1372075108
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1372075103}
+  m_CullTransparentMesh: 1
 --- !u!1 &1382649334
 GameObject:
   m_ObjectHideFlags: 0
@@ -23466,6 +23581,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1041908126}
+  - {fileID: 1372075104}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 59.43, y: 0.3, z: 0.1}
   m_AnchorMin: {x: 0, y: 0}

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

@@ -6034,6 +6034,120 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 508797890}
   m_CullTransparentMesh: 1
+--- !u!1 &510656449
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 510656450}
+  - component: {fileID: 510656454}
+  - component: {fileID: 510656453}
+  - component: {fileID: 510656452}
+  - component: {fileID: 510656451}
+  m_Layer: 0
+  m_Name: RelicInforPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &510656450
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 510656449}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0.000031045667}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2036621014}
+  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: 3.4923236, y: 7.999999}
+  m_SizeDelta: {x: 200, y: 200}
+  m_Pivot: {x: 0.5, y: -0.7}
+--- !u!114 &510656451
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 510656449}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b3dac0a4602fa1b41bbfa073875344c3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  inforPanleType: 2
+--- !u!114 &510656452
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 510656449}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_StartCorner: 0
+  m_StartAxis: 1
+  m_CellSize: {x: 300, y: 300}
+  m_Spacing: {x: 0, y: 0}
+  m_Constraint: 2
+  m_ConstraintCount: 4
+--- !u!114 &510656453
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 510656449}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.2528302, g: 0.2528302, b: 0.2528302, a: 0}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 0
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 100
+--- !u!222 &510656454
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 510656449}
+  m_CullTransparentMesh: 1
 --- !u!1 &513645957
 GameObject:
   m_ObjectHideFlags: 0
@@ -22253,6 +22367,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b3dac0a4602fa1b41bbfa073875344c3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  inforPanleType: 0
 --- !u!114 &1736399740
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -25800,6 +25915,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1736399738}
+  - {fileID: 510656450}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 59.43, y: 0.3, z: 0.1}
   m_AnchorMin: {x: 0, y: 0}

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

@@ -15184,6 +15184,10 @@ MonoBehaviour:
   buffInforBarTipPrefab: {fileID: 2592041783247472681, guid: 1b58ed47ff3c01b408a4adac252a6554,
     type: 3}
   buffInforBarTipList: []
+  relicInforBar: {fileID: 0}
+  relicInforBarTipPrefab: {fileID: 2592041783247472681, guid: 42e2dea72c5c004419a8c0eb09a884d0,
+    type: 3}
+  relicInforBarTipList: []
 --- !u!4 &628364367
 Transform:
   m_ObjectHideFlags: 0
@@ -38781,11 +38785,7 @@ MonoBehaviour:
   generatePoint: {fileID: 514899946}
   lineOffSet: {x: 1, y: 0, z: 0}
   columnOffSet: {x: 0, y: 0, z: 0.865}
-  enemyGenerateDataList:
+  enemyGenerateDataList: []
-  - enemyPrefab: {fileID: 1253231568001379261, guid: 3d83bb7c6cfaa71439ad6302d0dceb51,
-      type: 3}
-    locationX: 1
-    locationY: 1
   playerNameText: {fileID: 742474145}
   playerMoneyText: {fileID: 506890230}
   cardGuide: {fileID: 1393562878}
@@ -39284,6 +39284,12 @@ MonoBehaviour:
   StepIconFather: {fileID: 1975487182}
   stepIconPrefab: {fileID: 5159667013927544512, guid: ca425697306c5a941b283345d04e8f26,
     type: 3}
+  standOnBuff: {fileID: 374190882}
+  defaultBuff: {fileID: 486269610, guid: d6b5c035f507c154b961512d292efe19, type: 3}
+  onRed: {fileID: -1506003306, guid: da31238a16a427241899a124cf4b0609, type: 3}
+  onGreen: {fileID: 902670823, guid: da31238a16a427241899a124cf4b0609, type: 3}
+  onBule: {fileID: -1056989932, guid: da31238a16a427241899a124cf4b0609, type: 3}
+  onBlack: {fileID: -257868070, guid: da31238a16a427241899a124cf4b0609, type: 3}
 --- !u!1 &1817435585
 GameObject:
   m_ObjectHideFlags: 0
@@ -43600,6 +43606,120 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1998717000}
   m_CullTransparentMesh: 1
+--- !u!1 &2005167260
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2005167261}
+  - component: {fileID: 2005167265}
+  - component: {fileID: 2005167264}
+  - component: {fileID: 2005167263}
+  - component: {fileID: 2005167262}
+  m_Layer: 0
+  m_Name: RelicInforPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2005167261
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2005167260}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0.000031045667}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2140661235}
+  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: -1.9991547, y: -238.89023}
+  m_SizeDelta: {x: 200, y: 200}
+  m_Pivot: {x: 0.5, y: -0.7}
+--- !u!114 &2005167262
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2005167260}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b3dac0a4602fa1b41bbfa073875344c3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  inforPanleType: 2
+--- !u!114 &2005167263
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2005167260}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_StartCorner: 0
+  m_StartAxis: 1
+  m_CellSize: {x: 300, y: 300}
+  m_Spacing: {x: 0, y: 0}
+  m_Constraint: 2
+  m_ConstraintCount: 4
+--- !u!114 &2005167264
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2005167260}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.2528302, g: 0.2528302, b: 0.2528302, a: 0}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 0
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 100
+--- !u!222 &2005167265
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2005167260}
+  m_CullTransparentMesh: 1
 --- !u!1 &2007315019
 GameObject:
   m_ObjectHideFlags: 0
@@ -45941,6 +46061,7 @@ RectTransform:
   m_Children:
   - {fileID: 569168383}
   - {fileID: 532689218}
+  - {fileID: 2005167261}
   m_Father: {fileID: 196188496}
   m_LocalEulerAnglesHint: {x: 59.43, y: 0.3, z: 0.1}
   m_AnchorMin: {x: 0, y: 0}

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

@@ -5169,6 +5169,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 650636581}
+  - {fileID: 1589894559}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 59.43, y: 0.3, z: 0.1}
   m_AnchorMin: {x: 0, y: 0}
@@ -9537,6 +9538,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b3dac0a4602fa1b41bbfa073875344c3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  inforPanleType: 0
 --- !u!114 &650636583
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -24995,6 +24997,120 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1586415769}
   m_CullTransparentMesh: 1
+--- !u!1 &1589894558
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1589894559}
+  - component: {fileID: 1589894563}
+  - component: {fileID: 1589894562}
+  - component: {fileID: 1589894561}
+  - component: {fileID: 1589894560}
+  m_Layer: 0
+  m_Name: RelicInforPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1589894559
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1589894558}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -694.8203}
+  m_LocalScale: {x: 0.6352641, y: 0.6352641, z: 0.6352641}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 307263762}
+  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: -282.50662, y: 59.92774}
+  m_SizeDelta: {x: 200, y: 200}
+  m_Pivot: {x: 0.5, y: 1.5}
+--- !u!114 &1589894560
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1589894558}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b3dac0a4602fa1b41bbfa073875344c3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  inforPanleType: 2
+--- !u!114 &1589894561
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1589894558}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_StartCorner: 0
+  m_StartAxis: 1
+  m_CellSize: {x: 300, y: 300}
+  m_Spacing: {x: 0, y: 0}
+  m_Constraint: 2
+  m_ConstraintCount: 4
+--- !u!114 &1589894562
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1589894558}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.2528302, g: 0.2528302, b: 0.2528302, a: 0}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 0
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 100
+--- !u!222 &1589894563
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1589894558}
+  m_CullTransparentMesh: 1
 --- !u!1 &1596501908
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -3614,7 +3614,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &431178197
 RectTransform:
   m_ObjectHideFlags: 0
@@ -4536,6 +4536,62 @@ RectTransform:
   m_AnchoredPosition: {x: 296.6, y: 27.171}
   m_SizeDelta: {x: 52.6, y: 54.714}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &526484576
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 526484578}
+  - component: {fileID: 526484577}
+  m_Layer: 0
+  m_Name: InforBarManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &526484577
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 526484576}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d9f2f6a3e81a55a4e989158e3351d7ee, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  InforBar: {fileID: 0}
+  InforBarTipPrefab: {fileID: 8650645450562924027, guid: 64ec1d3890ee945458d7528b185a796a,
+    type: 3}
+  InforBarTipList: []
+  buffInforBar: {fileID: 0}
+  buffInforBarTipPrefab: {fileID: 2592041783247472681, guid: 1b58ed47ff3c01b408a4adac252a6554,
+    type: 3}
+  buffInforBarTipList: []
+  relicInforBar: {fileID: 0}
+  relicInforBarTipPrefab: {fileID: 2592041783247472681, guid: 42e2dea72c5c004419a8c0eb09a884d0,
+    type: 3}
+  relicInforBarTipList: []
+--- !u!4 &526484578
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 526484576}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &526514134
 GameObject:
   m_ObjectHideFlags: 0
@@ -10528,7 +10584,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1173798764
 RectTransform:
   m_ObjectHideFlags: 0
@@ -12253,54 +12309,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1349440564}
   m_CullTransparentMesh: 1
---- !u!1 &1356258020
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1356258022}
-  - component: {fileID: 1356258021}
-  m_Layer: 0
-  m_Name: CardInforBarManager
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &1356258021
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1356258020}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d9f2f6a3e81a55a4e989158e3351d7ee, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  InforBar: {fileID: 0}
-  InforBarTipPrefab: {fileID: 8650645450562924027, guid: 64ec1d3890ee945458d7528b185a796a,
-    type: 3}
-  InforBarTipList: []
---- !u!4 &1356258022
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1356258020}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1361839512
 GameObject:
   m_ObjectHideFlags: 0
@@ -12503,6 +12511,85 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1362523115}
   m_CullTransparentMesh: 1
+--- !u!1 &1375270811
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1375270812}
+  - component: {fileID: 1375270814}
+  - component: {fileID: 1375270813}
+  m_Layer: 5
+  m_Name: Start
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1375270812
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1375270811}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1576156920}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1375270813
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1375270811}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3}
+    m_FontSize: 30
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 42
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: ToEvent
+--- !u!222 &1375270814
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1375270811}
+  m_CullTransparentMesh: 1
 --- !u!1 &1389667900
 GameObject:
   m_ObjectHideFlags: 0
@@ -14484,6 +14571,153 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1574058775}
   m_CullTransparentMesh: 1
+--- !u!1 &1576156919
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1576156920}
+  - component: {fileID: 1576156924}
+  - component: {fileID: 1576156923}
+  - component: {fileID: 1576156922}
+  - component: {fileID: 1576156921}
+  m_Layer: 5
+  m_Name: ToEvent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1576156920
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1576156919}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
+  m_ConstrainProportionsScale: 1
+  m_Children:
+  - {fileID: 1375270812}
+  m_Father: {fileID: 1872135081}
+  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: 14.9999695, y: -75}
+  m_SizeDelta: {x: 170, y: 60}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1576156921
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1576156919}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 46ab6b1e3fd59ea468ab6edcf30f9913, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetScale: {x: 1.8, y: 1.8, z: 1.8}
+--- !u!114 &1576156922
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1576156919}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1576156923}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1621631701}
+        m_TargetAssemblyTypeName: ScenceLoadManager, Assembly-CSharp
+        m_MethodName: LoadTargetLevel
+        m_Mode: 3
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 3
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+--- !u!114 &1576156923
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1576156919}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  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
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1576156924
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1576156919}
+  m_CullTransparentMesh: 1
 --- !u!1 &1576284734
 GameObject:
   m_ObjectHideFlags: 0
@@ -17625,6 +17859,7 @@ RectTransform:
   - {fileID: 2146457977}
   - {fileID: 1173798764}
   - {fileID: 431178197}
+  - {fileID: 1576156920}
   - {fileID: 238416522}
   - {fileID: 790207029}
   m_Father: {fileID: 912102762}
@@ -19027,4 +19262,4 @@ SceneRoots:
   - {fileID: 813734000}
   - {fileID: 146625440}
   - {fileID: 61966381}
-  - {fileID: 1356258022}
+  - {fileID: 526484578}

ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs

@@ -154,16 +154,7 @@ public class CardEntity : MonoBehaviour
     
     }
 
-    private void OnDisable()
+    public void DestoryCard()
-    {
-        if(noSmallCard ==false )
-        {
-            CreateSmallCard();
-        }
-      
-    }
-
-    public void CreateSmallCard()
     {
         //卡牌音效
         AudioManager.Instance.DrawCardVoicePlayer(1);
@@ -183,6 +174,8 @@ public class CardEntity : MonoBehaviour
         //生成粒子特效
         var light = Instantiate(ParticalManager.Instance.usingCardParticleEffect,cardPrefab.transform.position,cardPrefab.transform.rotation);
         light.transform.position += new Vector3(0, 0.6f, 0);
+
+        Destroy(this.gameObject);
     }
 
     //获取卡牌图片

ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar/CardInfroBarManager.cs

@@ -17,6 +17,12 @@ public class CardInfroBarManager : Singleton<CardInfroBarManager>
     public GameObject buffInforBarTipPrefab;
     [Header("Buff信息面板内条目列表")]
     public List<GameObject> buffInforBarTipList = new List<GameObject>();
+    [Header("遗物信息面板")]
+    public GameObject relicInforBar;
+    [Header("遗物信息面板内条目预制体")]
+    public GameObject relicInforBarTipPrefab;
+    [Header("遗物信息面板内条目列表")]
+    public List<GameObject> relicInforBarTipList = new List<GameObject>();
     void Start()
     {
         DontDestroyOnLoad(this.gameObject);

ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardInforBar/RegisteInforPanle.cs

@@ -23,7 +23,7 @@ public class RegisteInforPanle : MonoBehaviour
                 CardInfroBarManager.Instance.buffInforBar = this.gameObject;
                 break;
             case InforPanleType.relic:
-              //  CardInfroBarManager.Instance.buffInforBar = this.gameObject;
+                CardInfroBarManager.Instance.relicInforBar = this.gameObject;
                 break;
         }
 

ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs

@@ -377,7 +377,7 @@ public class TurnMaster : Singleton<TurnMaster>
         //将其加入墓地并销毁实体
         CardEntity cardEntity = handCard.cardEntityList[cardIndex];
         usedCard.usedCardList.Add(cardEntity.CardId);
-        Destroy(cardEntity .gameObject);
+        cardEntity.DestoryCard();
         handCard.cardEntityList.RemoveAt(cardIndex);
     }
 

ColorlessWorld-2024-4-2/Assets/Scripts/ChooseWeapon/Giude/Giude.cs

@@ -57,7 +57,7 @@ public class Giude : Singleton<Giude>
     {
         if(guideProcess <2)
         {
-           if( Input .GetMouseButtonUp (0))
+           if( Input .GetMouseButtonDown (0))
            {
                 guideProcess++;
            }

ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction.cs

@@ -64,9 +64,9 @@ public class EnemyAction
         {
             enemyNode.rangePool[i].markInfluenced = false;
         }
-        foreach (var mapNode in enemyNode.aoeRangePool)
+        for (int i = 0; i < enemyNode.aoeRangePool.Count; i++)
         {
-            mapNode.aoeInfluenced = false;
+            enemyNode .aoeRangePool[i].aoeInfluenced = false;
         }
 
     }

ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs

@@ -56,8 +56,12 @@ public class RewardManager : Singleton<RewardManager>
         if (EnemyManager.Instance.enemySpeedSortingList.Count <= 1)
         {
            rewardPanle.SetActive(true);
+            //谿꼍沂좆
+            PlayerStatsManager.Instance.playerState .currentHP = GameManager .Instance .playerState .currentHP;
             //关闭战斗场内UI
             HideUIBarManager.Instance.HideUIBar();
+            //헌왕buff
+            Usermanager.Instance .ClearBuff();
             //销毁手卡
             PlayerStatsManager.Instance.DeleteHandCard();
         }

ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardTipData.cs

@@ -34,7 +34,7 @@ public class RewardTipData : MonoBehaviour
     {
         RewardManager.Instance.DeleteRewardTip(this .gameObject);
         //¼ÓÇ®;
-        PlayerStatsManager.Instance.EffectFunction(1, moneyCount);
+        PlayerStatsManager.Instance.EffectFunction(1, moneyCount.ToString());
         //ÉùÒô
         AudioManager.Instance.MenuClosePlayer();
     }

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyNode.cs

@@ -6,8 +6,9 @@ using UnityEngine.UI;
 [System .Serializable ]
 public class LegacyNode : MonoBehaviour 
 {
-    public new string name ;
+    public string relicName ;
-    public string className;
+    public string relicClassName;
+    public string infor;
     public Sprite image;
 
     //¹¹Ô캯Êý
@@ -15,12 +16,12 @@ public class LegacyNode : MonoBehaviour
     {
         LegacyManager.Instance.legacyNodesList.Add(this);
         List<string> relicData = LegacyManager.Instance.relicsDictionary[className];
-        name = relicData[3];
+        relicName = relicData[3];
-        className = relicData[1];
+        relicClassName = relicData[1];
+        infor = relicData[4];
         image = ToolDontDestory.Instance.LoadImage(relicData[2]);
         GetComponent<Image>().sprite = image;
-
+        if (isOnGet )
-        if(isOnGet )
         {
             OnGet();
         }
@@ -30,8 +31,9 @@ public class LegacyNode : MonoBehaviour
     {
         LegacyManager.Instance.legacyNodesList.Add(this);
         List<string> relicData = LegacyManager.Instance.relicsDictionary[className];
-        name = relicData[3];
+        relicName = relicData[3];
-        className = relicData[1];
+        relicClassName = relicData[1];
+        infor = relicData[4];
         image = ToolDontDestory.Instance.LoadImage(relicData[2]);
         transform.GetChild(0).GetComponent<Image>().sprite = image;
         if (isOnGet)

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

@@ -2,6 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.InputSystem;
+using UnityEngine.UI;
 public class Player : MonoBehaviour
 {
     public int step;
@@ -29,7 +30,13 @@ public class Player : MonoBehaviour
     public int stepIconCount;
     public Transform StepIconFather;
     public GameObject stepIconPrefab;
-
+    [Header("µØ¿éʵʱbuff")]
+    public Image standOnBuff;
+    public Sprite defaultBuff;
+    public Sprite onRed;
+    public Sprite onGreen;
+    public Sprite onBule;
+    public Sprite onBlack;
     private void Start()
     {
        // Invoke("StartPlayer", 4f);
@@ -88,10 +95,30 @@ public class Player : MonoBehaviour
 
             if(TurnMaster.Instance.playerAction != TurnMaster.PlayerAction.banAction)
             TurnMaster.Instance.playerAction = TurnMaster.PlayerAction.none;
-            
+
         }
+
+        switch (GameManager.Instance.playerOn.whoColour)
+        {
+            case Name .NodeColor .Red :
+                standOnBuff.sprite = onRed;
+                break;
+            case Name.NodeColor.Green:
+                standOnBuff.sprite = onGreen;
+                break;
+            case Name.NodeColor.Blue:
+                standOnBuff.sprite = onBule;
+                break;
+            case Name.NodeColor.Black:
+                standOnBuff.sprite = onBlack;
+                break;
+            case Name.NodeColor.White:
+                standOnBuff.sprite = defaultBuff;
+                break;
+        }
+
     }
-    
+
     IEnumerator  MoveToChooseNode()//ÉäÏß¼ì²âÑ¡ÔñÒ»¸ömapNode
     {
         Ray ray = Camera.main.ScreenPointToRay(Mouse.current.position.value);

ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs

@@ -31,20 +31,20 @@ public class PlayerStatsManager : Singleton <PlayerStatsManager>
     }
      
     //选项效果==加一个同步UI的订阅系统
-    public void EffectFunction(int functionIndex, int amount)
+    public void EffectFunction(int functionIndex, string amount)
     {
         switch (functionIndex)
         {
             //加钱
             case 1:
-                gainMoney(amount);
+                gainMoney(int.Parse ( amount));
                 BroadCastSyncMoneyText();//同步UI
                 //声音
                 AudioManager.Instance.GainMoneyVoicePlayer();
                 break;
             //加血
             case 2:
-                playerState.currentHP += amount;
+                playerState.currentHP += int.Parse(amount);
                 if (playerState.currentHP > playerState.maxHP)
                 {
                     playerState.currentHP = playerState.maxHP;
@@ -57,18 +57,22 @@ public class PlayerStatsManager : Singleton <PlayerStatsManager>
                 break;
             //加遗物
             case 4:
-                Debug.Log("获得遗物:发光藤曼" + amount);
+                LegacyManager.Instance.CreateLegacyClassAsNew(amount);
+                Debug.Log("ťńľĂŇĹÎď:" + amount);
                 break;
         }
     }
-
     public void gainMoney(int value)
     {
         playerState.money += value;
         MathTool.keepNature(playerState.money);
         if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_GoldVines))
         {
-            Usermanager.Instance.recoverHp(2);
+            playerState.currentHP += 2;
+            if (playerState.currentHP > playerState.maxHP)
+            {
+                playerState.currentHP = playerState.maxHP;
+            }
         }
     }
 
@@ -91,7 +95,17 @@ public class PlayerStatsManager : Singleton <PlayerStatsManager>
         }
 
     }
-
+    public void ClearLevelStep()
+    {
+        levelDevelopData.levelStep = 0;
+        playerState.maxHP = 68;
+        playerState.currentHP = 68;
+        playerState.currentCost = 3;
+        playerState.maxCost = 3;
+        playerState.maxStepRange = 2;
+        playerState.currentStepRange = 2;
+        playerState.money = 0;
+    }
     //广播同步文本（在UI上添加synctextMono来订阅事件）
     public Action syncMoneyText;
     public void BroadCastSyncMoneyText()

ColorlessWorld-2024-4-2/Assets/Scripts/UI/EventChooseButtonData.cs

@@ -11,7 +11,7 @@ public class EventChooseButtonData : MonoBehaviour
     public Sprite endImage;
     public string endText;
 
-    public List<int> effectList = new List<int>();
+    public List<string> effectList = new List<string>();
 
     public void Effect()
     {
@@ -20,7 +20,7 @@ public class EventChooseButtonData : MonoBehaviour
         for (int i = 0;i<effectList .Count-1;i+=2)
         {
             Debug .Log (effectList[i]+"\\" + effectList[i + 1]);
-           PlayerStatsManager.Instance.EffectFunction(effectList[i], effectList[i + 1]);
+           PlayerStatsManager.Instance.EffectFunction(int.Parse( effectList[i]), effectList[i + 1]);
         }
 
         foreach (var data in EventManager.Instance.eventChooseButtonDatasList)

ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs

@@ -20,7 +20,7 @@ public class DestructionManager : Singleton<DestructionManager>
             TurnMaster.Instance.usedCard.deleteCardList.Add(target.GetComponent<CardEntity>().CardId);
         }
         TurnMaster.Instance.handCard.cardEntityList.Remove(target.GetComponent<CardEntity>());
-        Destroy(target);
+        target.GetComponent<CardEntity>().DestoryCard ();
         yield return null;
         yield return StartCoroutine(TurnMaster.Instance.MoveCards());
         //±éÀúÓ°Ïì³Ø±äÉ«

ColorlessWorld-2024-4-2/Assets/Scripts/manager/EventManager.cs

@@ -72,7 +72,7 @@ public class EventManager : Singleton <EventManager>
             currentButtonData.endImage = LoadImage(values[2]);
             for(int j= 3;j<values .Length;j++)
             {
-                currentButtonData.effectList.Add(int.Parse(values[j]));
+               currentButtonData.effectList.Add(values[j]);
             }
             eventChooseButtonDatasList.Add(currentButtonData);
         }

ColorlessWorld-2024-4-2/Assets/Scripts/manager/ScenceLoadManager.cs

@@ -46,6 +46,13 @@ public class ScenceLoadManager : Singleton <ScenceLoadManager>
     public void ClearLevelStep()
     {
         PlayerStatsManager.Instance.levelDevelopData.levelStep = 0;
+        PlayerStatsManager.Instance.playerState.maxHP  = 68;
+        PlayerStatsManager.Instance.playerState.currentHP  = 68;
+        PlayerStatsManager.Instance.playerState.currentCost = 3;
+        PlayerStatsManager.Instance.playerState.maxCost = 3;
+        PlayerStatsManager.Instance.playerState.maxStepRange = 2;
+        PlayerStatsManager.Instance.playerState.currentStepRange = 2;
+        PlayerStatsManager.Instance.playerState.money = 0;
     }
     public void QuitGame()
     {

ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs

@@ -338,7 +338,20 @@ public class Usermanager : Singleton<Usermanager>
             }
         }
     }
-
+    public void ClearBuff()
+    {      
+        foreach (var icon in buffIconList)
+        {
+            Destroy(icon);
+        }
+        buffIconList.Clear();
+        foreach (var icon in buffIconListInPlayerPanel)
+        {
+            Destroy(icon);
+        }
+        buffIconListInPlayerPanel.Clear();
+        playerAbnormalCondition.Clear();
+    }
     //Òì³£BuffÏÔʾ
     public void RefreshPlayerBuffIcon()
     { 

ColorlessWorld-2024-4-2/Assets/Scripts/relics/RelicInforTip.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: eedf98fc4d621df4b942f54fc3ec2f61
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/relics/RelicInforTip/RelicInforTipNode.cs

@@ -0,0 +1,10 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class RelicInforTipNode : MonoBehaviour
+{
+    public Text nameText;
+    public Text inforText;
+}

ColorlessWorld-2024-4-2/Assets/Scripts/relics/RelicInforTip/RelicInforTipNode.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ce546151309d8d34b8d16be4a50491a7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/relics/RelicInforTip/RelicOnMouse.cs

@@ -0,0 +1,68 @@
+using System.Collections;
+using System.Collections.Generic;
+using Unity.VisualScripting;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+
+public class RelicOnMouse : MonoBehaviour,IPointerEnterHandler, IPointerExitHandler
+{
+    bool isShow;
+    [Header("信息表")]
+    public GameObject inforBar;
+    [Header("偏移量")]
+    public Vector3 offSet;
+    [Header("排版轴")]
+    public LayoutGroup layoutGroup;
+    public TextAnchor textAnchor;
+
+    public void OnPointerEnter(PointerEventData eventData)
+    {
+        isShow = true;
+        inforBar = CardInfroBarManager.Instance.relicInforBar;
+        layoutGroup = inforBar.GetComponent<LayoutGroup>();
+        layoutGroup.childAlignment = textAnchor;
+        inforBar.SetActive(true);
+        //同步位置
+        inforBar.transform.position = transform.position + offSet;
+        //删除以前的条目
+        foreach (var tip in CardInfroBarManager.Instance.relicInforBarTipList)
+        {
+            if (tip != null)
+                Destroy(tip.gameObject);
+        }
+        CardInfroBarManager.Instance.relicInforBarTipList.Clear();
+        //生成新条目
+        var currentTip = Instantiate(CardInfroBarManager.Instance.relicInforBarTipPrefab, inforBar.transform);
+        LegacyNode legacyNode;
+        if( TryGetComponent<LegacyNode>(out legacyNode))
+        {
+
+        }
+        else
+        {
+            legacyNode = transform.parent.GetComponent<LegacyNode>();
+        }
+        RelicInforTipNode relicInforTipNode  = currentTip.GetComponent<RelicInforTipNode>();
+        relicInforTipNode .nameText .text = legacyNode.relicName ;
+        relicInforTipNode.inforText.text = legacyNode.infor;
+        CardInfroBarManager.Instance.relicInforBarTipList.Add(currentTip);
+
+    }
+
+    public void OnPointerExit(PointerEventData eventData)
+    {
+        isShow = false;
+        inforBar.SetActive(false);
+    }
+
+    /*private void Update()
+    {
+        if (isShow)
+        {
+            //跟随
+            // inforBar .transform .position = Mouse.current.position.value;
+            inforBar.transform.position = transform.position + offSet;
+        }
+    }*/
+}

ColorlessWorld-2024-4-2/Assets/Scripts/relics/RelicInforTip/RelicOnMouse.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 517975a48f8546f4a98750093e5b11e4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/StreamingAssets/Event.csv

@@ -1,2 +1,2 @@
 序列号,名称,文本,图片路径,选项个数,,,
-10001,许愿树,你发现了一棵巨大的树木，它的枝叶覆盖着整个天空，树干上缠绕着发光的藤蔓。据说大树能实现人们的愿望，但也需要付出相应的代价。树木的枝叶轻轻摇曳，仿佛在低语，邀请你靠近。,Event/tree-1,3,你闭上眼睛，向大树祈祷天上会掉下50金币（获得发光藤曼，收到15点伤害）;摸了摸头上的包，有点疼;Event/tree-2;1;50;2;-5,砍下发光的藤曼（获得发光藤曼，收到15点伤害）;树木发出嚎叫，震穿你的耳膜，预感不妙溜之大吉;Event/tree-2;2;-15;4;10001,你感受到梦境之树的强大与神秘，决定保持敬畏之心，不轻易打扰它的宁静（偷偷溜走）;隐约听到一声叹息;Event/tree-2
+10001,神奇海螺,你在路边发现了一只超大的海螺，你选择,Event/tree-1,3,向海螺祈祷（获得100金币）;你挠了挠头想不明白为什么海螺会向外蹦出金币;Event/tree-2;1;100,尝试带走（获得神奇海螺）;手触碰到海螺的瞬间，海螺一下就变小了;Event/tree-2;4;LegacyNode_EnchantedConch,煮了吃！;食物中毒，拉了一天肚子;Event/tree-2;2;-15

ColorlessWorld-2024-4-2/Assets/StreamingAssets/Relic.csv

@@ -1,8 +1,8 @@
-1001,LegacyNode_AgnisTorch,RelicsIcon/LegacyNode_AgnisTorch,
+1001,LegacyNode_AgnisTorch,RelicsIcon/LegacyNode_AgnisTorch,阿耆尼的火炬,火种触发改为8层，与沃肯的锤子互相替换
-1002,LegacyNode_VulcanHammer,RelicsIcon/LegacyNode_VulcanHammer,
+1002,LegacyNode_VulcanHammer,RelicsIcon/LegacyNode_VulcanHammer,沃肯的锤子,火种触发改为15层，触发伤害改为25，与阿耆尼的祝福互相替换
-1003,LegacyNode_AncientSilverCoin,RelicsIcon/LegacyNode_AncientSilverCoin,FireHeart
+1003,LegacyNode_AncientSilverCoin,RelicsIcon/LegacyNode_AncientSilverCoin,古老银币,第一回合额外拥有1点费用
-1004,LegacyNode_EnchantedConch,RelicsIcon/LegacyNode_EnchantedConch,
+1004,LegacyNode_EnchantedConch,RelicsIcon/LegacyNode_EnchantedConch,神奇海螺,通过潮湿触发眩晕时候，额外附加一层易伤
-1005,LegacyNode_GoldVines,RelicsIcon/LegacyNode_GoldVines,
+1005,LegacyNode_GoldVines,RelicsIcon/LegacyNode_GoldVines,黄金藤曼,每当获得金币时，恢复2点生命值
-1006,LegacyNode_Starfish,RelicsIcon/LegacyNode_Starfish,
+1006,LegacyNode_Starfish,RelicsIcon/LegacyNode_Starfish,海星,蓝色的判定宽松1
-1007,LegacyNode_SuspiciousMushroom,RelicsIcon/LegacyNode_SuspiciousMushroom,
+1007,LegacyNode_SuspiciousMushroom,RelicsIcon/LegacyNode_SuspiciousMushroom,可疑的蘑菇,进行绿色染色的时候对怪物施加一层中毒
-1008,LegacyNode_SnakeGall,RelicsIcon/LegacyNode_SnakeGall,
+1008,LegacyNode_SnakeGall,RelicsIcon/LegacyNode_SnakeGall,蛇胆,如果怪物带着超过10层中毒死去，那么玩家回复1点生命