武器系统完善，涂色数量修正

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

@@ -14,7 +14,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   levelStep: 0
   mapLevel: 1
-  currentPoint: {x: 1, y: 1}
+  currentPoint: {x: 3, y: 2}
   levelSaveMap:
   - levelDataList:
     - roomType: 13
@@ -62,11 +62,13 @@ MonoBehaviour:
       nextLevelNodes: []
       fightEenemyPool: weak
       enemyList:
+      - 2003
       - 2001
-      mapIndex: 100001
+      - 2002
+      mapIndex: 100002
     - roomType: 0
       isUse: 1
-      passBy: 0
+      passBy: 1
       nodePos: {x: -5.5830364, y: 0.059714317, z: -6.669105}
       line: 1
       column: 1
@@ -78,8 +80,10 @@ MonoBehaviour:
       - {x: 2, y: 2}
       fightEenemyPool: weak
       enemyList:
-      - 2002
-      - 2002
+      - 2004
+      - 2005
+      - 2003
+      - 2003
       mapIndex: 100001
     - roomType: 0
       isUse: 0
@@ -91,10 +95,13 @@ MonoBehaviour:
       nextLevelNodes: []
       fightEenemyPool: weak
       enemyList:
-      - 2001
+      - 2004
+      - 2005
+      - 2003
+      - 2003
       mapIndex: 100001
   - levelDataList:
-    - roomType: 12
+    - roomType: 4
       isUse: 1
       passBy: 0
       nodePos: {x: -3.5830479, y: 0.05972004, z: -7.669102}
@@ -107,7 +114,7 @@ MonoBehaviour:
       fightEenemyPool: 
       enemyList: []
       mapIndex: 
-    - roomType: 6
+    - roomType: 12
       isUse: 1
       passBy: 0
       nodePos: {x: -3.5830517, y: 0.059721947, z: -6.669105}
@@ -120,9 +127,9 @@ MonoBehaviour:
       fightEenemyPool: 
       enemyList: []
       mapIndex: 
-    - roomType: 11
+    - roomType: 8
       isUse: 1
-      passBy: 0
+      passBy: 1
       nodePos: {x: -3.5830574, y: 0.059723854, z: -5.669108}
       line: 2
       column: 2
@@ -145,9 +152,11 @@ MonoBehaviour:
       - {x: 4, y: 0}
       fightEenemyPool: weak
       enemyList:
-      - 2002
-      - 2002
-      mapIndex: 100001
+      - 2004
+      - 2005
+      - 2003
+      - 2003
+      mapIndex: 100004
     - roomType: 0
       isUse: 1
       passBy: 0
@@ -159,14 +168,13 @@ MonoBehaviour:
       - {x: 4, y: 1}
       fightEenemyPool: weak
       enemyList:
-      - 2004
-      - 2005
-      - 2003
       - 2003
+      - 2001
+      - 2002
       mapIndex: 100001
     - roomType: 0
       isUse: 1
-      passBy: 0
+      passBy: 1
       nodePos: {x: -1.5830703, y: 0.059731483, z: -5.669107}
       line: 3
       column: 2
@@ -175,9 +183,8 @@ MonoBehaviour:
       - {x: 4, y: 2}
       fightEenemyPool: weak
       enemyList:
-      - 2002
-      - 2002
-      mapIndex: 100002
+      - 2001
+      mapIndex: 100001
   - levelDataList:
     - roomType: 10
       isUse: 1
@@ -192,7 +199,7 @@ MonoBehaviour:
       fightEenemyPool: 
       enemyList: []
       mapIndex: 
-    - roomType: 8
+    - roomType: 9
       isUse: 1
       passBy: 0
       nodePos: {x: 0.41692448, y: 0.059737206, z: -6.669104}
@@ -205,7 +212,7 @@ MonoBehaviour:
       fightEenemyPool: 
       enemyList: []
       mapIndex: 
-    - roomType: 4
+    - roomType: 6
       isUse: 1
       passBy: 0
       nodePos: {x: 0.41692352, y: 0.059739113, z: -5.669106}
@@ -268,7 +275,7 @@ MonoBehaviour:
       fightEenemyPool: strong
       enemyList: []
       mapIndex: 
-    - roomType: 2
+    - roomType: 0
       isUse: 1
       passBy: 0
       nodePos: {x: 4.4169207, y: 0.059752464, z: -6.669105}
@@ -280,10 +287,10 @@ MonoBehaviour:
       - {x: 7, y: 1}
       - {x: 7, y: 0}
       - {x: 7, y: 2}
-      fightEenemyPool: 
+      fightEenemyPool: strong
       enemyList: []
       mapIndex: 
-    - roomType: 0
+    - roomType: 2
       isUse: 0
       passBy: 0
       nodePos: {x: 4.4169207, y: 0.05975437, z: -5.669106}
@@ -291,11 +298,11 @@ MonoBehaviour:
       column: 2
       fatherLevelNodes: []
       nextLevelNodes: []
-      fightEenemyPool: strong
+      fightEenemyPool: 
       enemyList: []
       mapIndex: 
   - levelDataList:
-    - roomType: 8
+    - roomType: 11
       isUse: 1
       passBy: 0
       nodePos: {x: 6.4169235, y: 0.059758186, z: -7.669102}
@@ -308,7 +315,7 @@ MonoBehaviour:
       fightEenemyPool: 
       enemyList: []
       mapIndex: 
-    - roomType: 9
+    - roomType: 6
       isUse: 1
       passBy: 0
       nodePos: {x: 6.416924, y: 0.059760094, z: -6.669105}
@@ -321,7 +328,7 @@ MonoBehaviour:
       fightEenemyPool: 
       enemyList: []
       mapIndex: 
-    - roomType: 10
+    - roomType: 4
       isUse: 1
       passBy: 0
       nodePos: {x: 6.416925, y: 0.059762, z: -5.669108}
@@ -359,7 +366,7 @@ MonoBehaviour:
       fightEenemyPool: strong
       enemyList: []
       mapIndex: 
-    - roomType: 1
+    - roomType: 0
       isUse: 1
       passBy: 0
       nodePos: {x: 8.416934, y: 0.05976963, z: -5.669107}
@@ -368,11 +375,11 @@ MonoBehaviour:
       fatherLevelNodes: []
       nextLevelNodes:
       - {x: 9, y: 2}
-      fightEenemyPool: elite
+      fightEenemyPool: strong
       enemyList: []
       mapIndex: 
   - levelDataList:
-    - roomType: 9
+    - roomType: 6
       isUse: 1
       passBy: 0
       nodePos: {x: 10.41694, y: 0.059773445, z: -7.669103}
@@ -385,7 +392,7 @@ MonoBehaviour:
       fightEenemyPool: 
       enemyList: []
       mapIndex: 
-    - roomType: 4
+    - roomType: 11
       isUse: 1
       passBy: 0
       nodePos: {x: 10.416943, y: 0.059775352, z: -6.669104}
@@ -398,7 +405,7 @@ MonoBehaviour:
       fightEenemyPool: 
       enemyList: []
       mapIndex: 
-    - roomType: 6
+    - roomType: 9
       isUse: 1
       passBy: 0
       nodePos: {x: 10.416943, y: 0.05977726, z: -5.669106}
@@ -412,7 +419,7 @@ MonoBehaviour:
       enemyList: []
       mapIndex: 
   - levelDataList:
-    - roomType: 0
+    - roomType: 2
       isUse: 0
       passBy: 0
       nodePos: {x: 12.416952, y: 0.059781075, z: -7.669101}
@@ -420,7 +427,7 @@ MonoBehaviour:
       column: 0
       fatherLevelNodes: []
       nextLevelNodes: []
-      fightEenemyPool: strong
+      fightEenemyPool: 
       enemyList: []
       mapIndex: 
     - roomType: 0

ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v03-Common(Look).prefab.meta

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

ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v03-Legendary(Look).prefab.meta

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

ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04.2-CommonForLook.prefab → ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04-Common.prefab

@@ -35,9 +35,9 @@ 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: 1, y: 5}
-  m_SizeDelta: {x: 80, y: 20}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -12.6}
+  m_SizeDelta: {x: 120, y: 20}
+  m_Pivot: {x: 0.5, y: 0.60132146}
 --- !u!222 &1556748052669264222
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -60,13 +60,13 @@ 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:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 1207736521, guid: 9e1e1d3c19411fa41a622f479e3f71ec, type: 3}
+  m_Sprite: {fileID: 1177940304, guid: 2d6fbbc3c6767494eb3246e761b6dea2, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -89,17 +89,17 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 0
+    m_Left: 5
     m_Right: 0
-    m_Top: 0
+    m_Top: -2
     m_Bottom: 0
   m_ChildAlignment: 4
   m_StartCorner: 0
   m_StartAxis: 0
-  m_CellSize: {x: 25, y: 20}
-  m_Spacing: {x: 0, y: 0}
-  m_Constraint: 0
-  m_ConstraintCount: 2
+  m_CellSize: {x: 15, y: 15}
+  m_Spacing: {x: -1, y: 0}
+  m_Constraint: 2
+  m_ConstraintCount: 1
 --- !u!1 &1447975007169538114
 GameObject:
   m_ObjectHideFlags: 0
@@ -135,8 +135,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 99, y: 7.5}
-  m_SizeDelta: {x: 28.6048, y: 33.2259}
+  m_AnchoredPosition: {x: -13.4, y: 14}
+  m_SizeDelta: {x: 45, y: 45}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &3908379299743407417
 CanvasRenderer:
@@ -162,11 +162,11 @@ MonoBehaviour:
   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: 0
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 756292014, guid: f0dc99a8de3b75a4bbb3bdc490b6f610, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 7da46239a132d3d449d2ebaf941eb750, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -187,7 +187,6 @@ GameObject:
   - component: {fileID: 8229442996054676719}
   - component: {fileID: 5689823300698625128}
   - component: {fileID: 3867529107105442162}
-  - component: {fileID: 5973419634906082155}
   m_Layer: 0
   m_Name: nodeColorResult
   m_TagString: Untagged
@@ -209,11 +208,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7139562062302679022}
   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: 53.3, y: 52.4}
-  m_SizeDelta: {x: 20, y: 50}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0.000024318695, y: -1.5}
+  m_SizeDelta: {x: 100, y: 20}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &5689823300698625128
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -237,45 +236,15 @@ MonoBehaviour:
   m_Padding:
     m_Left: 0
     m_Right: 0
-    m_Top: -1
+    m_Top: 0
     m_Bottom: 0
-  m_ChildAlignment: 0
+  m_ChildAlignment: 4
   m_StartCorner: 0
   m_StartAxis: 0
-  m_CellSize: {x: 20, y: 20}
-  m_Spacing: {x: 0, y: 0}
-  m_Constraint: 0
-  m_ConstraintCount: 2
---- !u!114 &5973419634906082155
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3177769488067894455}
-  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: 1}
-  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: 1511406541, guid: 3eb23061a04738d45aa5cb4334d4b054, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
+  m_CellSize: {x: 23, y: 25}
+  m_Spacing: {x: 3, y: 0}
+  m_Constraint: 1
+  m_ConstraintCount: 5
 --- !u!1 &4169693119190854323
 GameObject:
   m_ObjectHideFlags: 0
@@ -291,10 +260,13 @@ GameObject:
   - component: {fileID: 5545682449418996990}
   - component: {fileID: 7526181906643281268}
   - component: {fileID: 7619122435525404041}
-  - component: {fileID: 8882143219709261918}
-  - component: {fileID: 2802567626561707494}
+  - component: {fileID: 2875900341032032975}
+  - component: {fileID: 5188661188061946492}
+  - component: {fileID: 4250043912389478458}
+  - component: {fileID: 4133149447702483658}
+  - component: {fileID: 3277867841352681741}
   m_Layer: 5
-  m_Name: Card_v04.2-CommonForLook
+  m_Name: Card_v04-Common
   m_TagString: Card
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -313,6 +285,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5891999358152162990}
+  - {fileID: 6233605672720327000}
   - {fileID: 8417263142375954454}
   - {fileID: 1083118128749949784}
   - {fileID: 8507021733924720450}
@@ -327,7 +300,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -3.1, y: 29}
-  m_SizeDelta: {x: 125, y: 200}
+  m_SizeDelta: {x: 132, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &806089455888247474
 CanvasRenderer:
@@ -350,14 +323,14 @@ 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
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: -434487570, guid: 78461e69b9e1eea4298f7afe36009d61, type: 3}
+  m_Sprite: {fileID: -1380875850, guid: cd0ed17b6a2a22740bafd80ed9f139f6, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -388,13 +361,19 @@ MonoBehaviour:
   fun1Image: {fileID: 0}
   fun2Image: {fileID: 0}
   fun3Image: {fileID: 0}
+  successCondition: {fileID: -1410864517, guid: e1b9157641a477c4eaca52a6c7ae4185,
+    type: 3}
+  unsuccessCondition: {fileID: 543060715, guid: 34a27929b5374314aa5ffbd201bc99fe,
+    type: 3}
   fun1Val: {fileID: 0}
   fun2Val: {fileID: 0}
   fun3Val: {fileID: 0}
-  smallCardPrefab: {fileID: 3615574969851259241, guid: 2f88da2f5ca2fbc438b76c3faf2ea9db,
+  cardBulletPrefab: {fileID: 7543994039267560688, guid: 8a4a5396ada14ba4bb4e0beecfa3bf1d,
+    type: 3}
+  smallCardPrefab: {fileID: 3615574969851259241, guid: 6b6415efaba29284c9541d0dd5521dd3,
     type: 3}
-  noSmallCard: 1
-  noSyncText: 1
+  noSmallCard: 0
+  noSyncText: 0
   conditionList:
   - {fileID: 4398690247767463098}
   - {fileID: 5970626616650445913}
@@ -403,11 +382,13 @@ MonoBehaviour:
   trueFunPrefab: {fileID: 4818544559399868804, guid: 98bfb86ee08b4924e8175b9d6145957d,
     type: 3}
   nodeColorResultFrame: {fileID: 3177769488067894455}
-  nodeColorResultImage: {fileID: 3463743346225269131, guid: 38f4837b968f61e4b94afcb5535f877c,
+  nodeColorResultImage: {fileID: 2948337350984551391, guid: f5592fae7d00e404586800947db445f2,
     type: 3}
   castRange: {fileID: 5584794665957624749}
   colorConditon: {fileID: 4414271769496108467, guid: 1fd0d425cafce3f4588b40c9cfe1ac25,
     type: 3}
+  cardDataSummary: {fileID: 688789690455570313}
+  animator: {fileID: 5188661188061946492}
 --- !u!114 &5545682449418996990
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -465,9 +446,96 @@ MonoBehaviour:
   speed: 4
   moveOffset: 50
   originPoint: {x: 0, y: 0, z: 0}
-  UpperOffset: {x: 0, y: 70, z: 0}
+  UpperOffset: {x: 0, y: 115, z: 0}
   originRotation: {x: 0, y: 0, z: 0}
---- !u!114 &8882143219709261918
+--- !u!114 &2875900341032032975
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4169693119190854323}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 894fd8c62723dcc42aecbd678cebb6a7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  materials:
+  - {fileID: 3893753280325337861}
+  - {fileID: 1056798440275425373}
+  - {fileID: 4177469149448917414}
+  - {fileID: 2102827337445216865}
+  - {fileID: 5159259897654068178}
+  backBorderMaterials:
+  - {fileID: 1133289726871023171}
+  backGroundMaterials:
+  - {fileID: 3023989870413490820}
+  isSync: 0
+  DissolveProcess: 70
+  TwirlProcess: 0
+  DissolveTwirlProcess: 0
+  Alpha: 1
+  cardListIntensity: 8
+  currentCardListIntensity: 0
+  BackBorderDissolveProcess: 70
+  BackBorderTwirlProcess: 0
+  BackGroundDissolveProcess: 70
+  tapMaterial: {fileID: 2100000, guid: 66f2dce68982ea0499c32d57560a5b8a, type: 2}
+  tapBackBorderMaterial: {fileID: 2100000, guid: 7b3f25b3fd6f5784b87e27532e2d09ba,
+    type: 2}
+  tapBackGroundMaterial: {fileID: 2100000, guid: a397e5d62aa879f4ca4f122cb1285d40,
+    type: 2}
+--- !u!95 &5188661188061946492
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4169693119190854323}
+  m_Enabled: 0
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 3d51622ff957f634e85d6bf360ef3e95, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &4250043912389478458
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4169693119190854323}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cf52735b52f0c10419bd75250fe9591a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  cardEntity: {fileID: 8400832028529023394}
+  inforBar: {fileID: 0}
+  offSet: {x: 0, y: 0, z: 0}
+--- !u!114 &4133149447702483658
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4169693119190854323}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 09549bb4d612106489300b62c6890846, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  cardEntity: {fileID: 8400832028529023394}
+  button: {fileID: 3277867841352681741}
+--- !u!114 &3277867841352681741
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -511,20 +579,6 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
---- !u!114 &2802567626561707494
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4169693119190854323}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 09549bb4d612106489300b62c6890846, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  cardEntity: {fileID: 8400832028529023394}
-  button: {fileID: 8882143219709261918}
 --- !u!1 &4343990849769966524
 GameObject:
   m_ObjectHideFlags: 0
@@ -558,11 +612,11 @@ RectTransform:
   - {fileID: 4872235896629707279}
   m_Father: {fileID: 7139562062302679022}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 100.1, y: -172.9}
-  m_SizeDelta: {x: 28.6048, y: 33.2259}
-  m_Pivot: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: -13.4, y: -7.52}
+  m_SizeDelta: {x: 45, y: 45}
+  m_Pivot: {x: 0, y: 0}
 --- !u!222 &9073797113623819660
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -587,11 +641,11 @@ MonoBehaviour:
   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: 0
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: -888096905, guid: 2f47800ea3a40d646a3dfce662c34637, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 60dd2c714dd7ac548af3feab06a58487, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -636,8 +690,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: 0.2, y: -14.8}
-  m_SizeDelta: {x: 90, y: 20}
+  m_AnchoredPosition: {x: -0.000012636, y: -32.199997}
+  m_SizeDelta: {x: 110, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3754643477587389603
 CanvasRenderer:
@@ -661,13 +715,13 @@ 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:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 821311432, guid: 87fd6738567dcd548a47d40ac30ae0bf, type: 3}
+  m_Sprite: {fileID: 543060715, guid: 34a27929b5374314aa5ffbd201bc99fe, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -694,13 +748,88 @@ MonoBehaviour:
     m_Right: 0
     m_Top: -1
     m_Bottom: 0
-  m_ChildAlignment: 0
+  m_ChildAlignment: 4
   m_StartCorner: 0
   m_StartAxis: 0
-  m_CellSize: {x: 30, y: 20}
-  m_Spacing: {x: 0, y: 0}
-  m_Constraint: 0
-  m_ConstraintCount: 2
+  m_CellSize: {x: 15, y: 16}
+  m_Spacing: {x: -1, y: 0}
+  m_Constraint: 2
+  m_ConstraintCount: 1
+--- !u!1 &4658554123743424936
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4981799998867444173}
+  - component: {fileID: 4524277102594192717}
+  - component: {fileID: 1133289726871023171}
+  m_Layer: 5
+  m_Name: Border
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4981799998867444173
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4658554123743424936}
+  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: 6233605672720327000}
+  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: 0}
+  m_SizeDelta: {x: 132, y: 200}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4524277102594192717
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4658554123743424936}
+  m_CullTransparentMesh: 1
+--- !u!114 &1133289726871023171
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4658554123743424936}
+  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: 1}
+  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: 0}
+  m_Type: 0
+  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!1 &5174392397216232880
 GameObject:
   m_ObjectHideFlags: 0
@@ -830,8 +959,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: 0.2, y: -34.6}
-  m_SizeDelta: {x: 90, y: 20}
+  m_AnchoredPosition: {x: -0.000012636, y: -52.52}
+  m_SizeDelta: {x: 110, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5787701428816686695
 CanvasRenderer:
@@ -855,13 +984,13 @@ 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:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 821311432, guid: 87fd6738567dcd548a47d40ac30ae0bf, type: 3}
+  m_Sprite: {fileID: 543060715, guid: 34a27929b5374314aa5ffbd201bc99fe, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -888,13 +1017,13 @@ MonoBehaviour:
     m_Right: 0
     m_Top: -1
     m_Bottom: 0
-  m_ChildAlignment: 0
+  m_ChildAlignment: 4
   m_StartCorner: 0
   m_StartAxis: 0
-  m_CellSize: {x: 30, y: 20}
-  m_Spacing: {x: 0, y: 0}
-  m_Constraint: 0
-  m_ConstraintCount: 2
+  m_CellSize: {x: 15, y: 16}
+  m_Spacing: {x: -1, y: 0}
+  m_Constraint: 2
+  m_ConstraintCount: 1
 --- !u!1 &6018557167984620928
 GameObject:
   m_ObjectHideFlags: 0
@@ -930,7 +1059,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 132.8754, y: 214.2679}
+  m_SizeDelta: {x: 132, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6630524511444619868
 CanvasRenderer:
@@ -956,11 +1085,11 @@ MonoBehaviour:
   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: 0
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 39548142, guid: 8ee4c1a376a28ce4294ec0bb754ff306, type: 3}
+  m_Sprite: {fileID: -1380875850, guid: cd0ed17b6a2a22740bafd80ed9f139f6, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -996,16 +1125,16 @@ RectTransform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6052323990296705033}
   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_LocalPosition: {x: 0, y: 0, z: -0}
+  m_LocalScale: {x: 0.1, y: 0.12, z: 0.1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8507021733924720450}
   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: 0}
-  m_SizeDelta: {x: 45, y: 45}
+  m_AnchoredPosition: {x: -0.5, y: 0.6}
+  m_SizeDelta: {x: 450, y: 450}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6418759718487919919
 CanvasRenderer:
@@ -1028,20 +1157,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  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: 0
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 25
+    m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3}
+    m_FontSize: 170
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 2
-    m_MaxSize: 40
+    m_MinSize: 1
+    m_MaxSize: 170
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -1049,6 +1178,82 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 1
+--- !u!1 &6061603065920177990
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6233605672720327000}
+  - component: {fileID: 4428790333383959752}
+  - component: {fileID: 3023989870413490820}
+  m_Layer: 5
+  m_Name: BackGround
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &6233605672720327000
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6061603065920177990}
+  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: 4981799998867444173}
+  m_Father: {fileID: 7139562062302679022}
+  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: 0.000030518}
+  m_SizeDelta: {x: 132, y: 200}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4428790333383959752
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6061603065920177990}
+  m_CullTransparentMesh: 1
+--- !u!114 &3023989870413490820
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6061603065920177990}
+  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: 1}
+  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: 0}
+  m_Type: 0
+  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!1 &7367770060306744678
 GameObject:
   m_ObjectHideFlags: 0
@@ -1084,8 +1289,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: 0.2, y: -53.4}
-  m_SizeDelta: {x: 90, y: 20}
+  m_AnchoredPosition: {x: -0.000012636, y: -72.99999}
+  m_SizeDelta: {x: 110, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6495211555079877352
 CanvasRenderer:
@@ -1109,13 +1314,13 @@ 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:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 821311432, guid: 87fd6738567dcd548a47d40ac30ae0bf, type: 3}
+  m_Sprite: {fileID: 543060715, guid: 34a27929b5374314aa5ffbd201bc99fe, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1142,13 +1347,13 @@ MonoBehaviour:
     m_Right: 0
     m_Top: -1
     m_Bottom: 0
-  m_ChildAlignment: 0
+  m_ChildAlignment: 4
   m_StartCorner: 0
   m_StartAxis: 0
-  m_CellSize: {x: 30, y: 20}
-  m_Spacing: {x: 0, y: 0}
-  m_Constraint: 0
-  m_ConstraintCount: 2
+  m_CellSize: {x: 15, y: 16}
+  m_Spacing: {x: -1, y: 0}
+  m_Constraint: 2
+  m_ConstraintCount: 1
 --- !u!1 &8081948450419621271
 GameObject:
   m_ObjectHideFlags: 0
@@ -1176,15 +1381,15 @@ RectTransform:
   m_GameObject: {fileID: 8081948450419621271}
   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_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 66461956134587324}
   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: 0}
-  m_SizeDelta: {x: 45, y: 45}
+  m_AnchoredPosition: {x: -2.1000004, y: 0.00001335144}
+  m_SizeDelta: {x: 450, y: 450}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7985228304631699869
 CanvasRenderer:
@@ -1207,20 +1412,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_Color: {r: 0.3679245, g: 0.3679245, b: 0.3679245, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 0
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 25
+    m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3}
+    m_FontSize: 200
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 2
-    m_MaxSize: 40
+    m_MinSize: 1
+    m_MaxSize: 200
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -1260,11 +1465,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7139562062302679022}
   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.4, y: 54.4}
-  m_SizeDelta: {x: 100, y: 70}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -19.7}
+  m_SizeDelta: {x: 90, y: 85}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &2748996186627099962
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1289,11 +1494,11 @@ MonoBehaviour:
   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: 0
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 8a22e3267925107428c362e702d2c792, type: 3}
+  m_Sprite: {fileID: 677644212, guid: c0cdeb5700cf9a440a32d3f1466d5f75, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v03-Rare.prefab.meta → ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04-Common.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 65d1471389706104e96e171fef0e4cdf
+guid: 873560de094707c4baa099f728c643bd
 PrefabImporter:
   externalObjects: {}
   userData: 

ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04-CommonForLook.prefab.meta

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

ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04-OnlyLook-PuTong.prefab.meta

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

ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04.2-CommonForLook.prefab.meta

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

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

@@ -892,6 +892,106 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_IsOn: 1
+--- !u!1 &25128809
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 25128810}
+  - component: {fileID: 25128813}
+  - component: {fileID: 25128812}
+  - component: {fileID: 25128811}
+  m_Layer: 5
+  m_Name: CardGroup-4
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &25128810
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 25128809}
+  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: 775097751}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 43.3, y: -0.29999924}
+  m_SizeDelta: {x: 13.897, y: 50.329}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!114 &25128811
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 25128809}
+  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: 0
+  m_CellSize: {x: 13, y: 23}
+  m_Spacing: {x: 2, y: 4}
+  m_Constraint: 2
+  m_ConstraintCount: 2
+--- !u!114 &25128812
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 25128809}
+  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: 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: 1
+--- !u!222 &25128813
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 25128809}
+  m_CullTransparentMesh: 1
 --- !u!1 &34700996
 GameObject:
   m_ObjectHideFlags: 0
@@ -7892,7 +7992,7 @@ GameObject:
   - component: {fileID: 481755222}
   - component: {fileID: 481755221}
   m_Layer: 5
-  m_Name: Panel
+  m_Name: TotalCount
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -11952,7 +12052,7 @@ GameObject:
   - component: {fileID: 741462691}
   - component: {fileID: 741462690}
   m_Layer: 5
-  m_Name: Panel (1)
+  m_Name: RedCount
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -12666,6 +12766,7 @@ RectTransform:
   - {fileID: 56212781}
   - {fileID: 1514211913}
   - {fileID: 1424524448}
+  - {fileID: 25128810}
   m_Father: {fileID: 764134692}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
@@ -14891,6 +14992,83 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 955871779}
   m_CullTransparentMesh: 1
+--- !u!1 &961718082
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 961718083}
+  - component: {fileID: 961718085}
+  - component: {fileID: 961718084}
+  m_Layer: 5
+  m_Name: WhiteCount
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &961718083
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 961718082}
+  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: 1340894655}
+  - {fileID: 2117784592}
+  m_Father: {fileID: 1121898980}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: -9.65, y: -52.9}
+  m_SizeDelta: {x: 9, y: 9}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!114 &961718084
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 961718082}
+  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.392}
+  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: 10913, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 0
+  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 &961718085
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 961718082}
+  m_CullTransparentMesh: 1
 --- !u!1 &968989223
 GameObject:
   m_ObjectHideFlags: 0
@@ -17209,6 +17387,7 @@ RectTransform:
   - {fileID: 741462689}
   - {fileID: 2123332545}
   - {fileID: 1992022037}
+  - {fileID: 961718083}
   m_Father: {fileID: 1909567070}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
@@ -20973,6 +21152,85 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1328709638}
   m_CullTransparentMesh: 1
+--- !u!1 &1340894654
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1340894655}
+  - component: {fileID: 1340894657}
+  - component: {fileID: 1340894656}
+  m_Layer: 5
+  m_Name: Text (Legacy) (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1340894655
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1340894654}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0}
+  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 961718083}
+  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: 12.4, y: 0.16699982}
+  m_SizeDelta: {x: 274.09, y: 89.779}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1340894656
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1340894654}
+  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: 40
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 86
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u767D\u8272\u6570\u91CF"
+--- !u!222 &1340894657
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1340894654}
+  m_CullTransparentMesh: 1
 --- !u!1 &1343166073
 GameObject:
   m_ObjectHideFlags: 0
@@ -22163,7 +22421,7 @@ GameObject:
   - component: {fileID: 1424524450}
   - component: {fileID: 1424524449}
   m_Layer: 5
-  m_Name: CardGroup-1 (2)
+  m_Name: CardGroup-3
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -23302,7 +23560,7 @@ GameObject:
   - component: {fileID: 1514211915}
   - component: {fileID: 1514211914}
   m_Layer: 5
-  m_Name: CardGroup-1 (1)
+  m_Name: CardGroup-2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -24134,12 +24392,21 @@ MonoBehaviour:
     cardIDGroup:
     - 1001
     - 1001
+  - cardGroupFathers: {fileID: 25128810}
+    cardIDGroup:
+    - 1002
+    - 1003
   cardGroup_1: []
   cardGroup_2: []
   cardGroup_3: []
   newCardGroup_1: []
   newCardGroup_2: []
   newCardGroup_3: []
+  coloringTotalCount: {fileID: 694549919}
+  coloringRedCount: {fileID: 1457289087}
+  coloringGreenCount: {fileID: 1530801098}
+  coloringBlueCount: {fileID: 3755120}
+  coloringWhitCount: {fileID: 2117784590}
 --- !u!1 &1591943139
 GameObject:
   m_ObjectHideFlags: 0
@@ -30302,7 +30569,7 @@ GameObject:
   - component: {fileID: 1992022039}
   - component: {fileID: 1992022038}
   m_Layer: 5
-  m_Name: Panel (3)
+  m_Name: GreenCount
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -32264,6 +32531,85 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2112233094}
   m_CullTransparentMesh: 1
+--- !u!1 &2117784589
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2117784592}
+  - component: {fileID: 2117784591}
+  - component: {fileID: 2117784590}
+  m_Layer: 5
+  m_Name: CountText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &2117784590
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2117784589}
+  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: 45
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 86
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 1
+--- !u!222 &2117784591
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2117784589}
+  m_CullTransparentMesh: 1
+--- !u!224 &2117784592
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2117784589}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0}
+  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 961718083}
+  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.3, y: -0.19999981}
+  m_SizeDelta: {x: 167.052, y: 164.578}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &2123332544
 GameObject:
   m_ObjectHideFlags: 0
@@ -32276,7 +32622,7 @@ GameObject:
   - component: {fileID: 2123332547}
   - component: {fileID: 2123332546}
   m_Layer: 5
-  m_Name: Panel (2)
+  m_Name: BuleCount
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

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

@@ -20280,7 +20280,6 @@ MonoBehaviour:
   prepareHandCard: []
   newPointList: []
   drawMoveSpeed: 4
-  canDrawCard: 0
 --- !u!1 &967334092
 GameObject:
   m_ObjectHideFlags: 0
@@ -26932,16 +26931,6 @@ MonoBehaviour:
   - Y: []
   - Y: []
   - Y: []
-  ToolX:
-  - Y: []
-  - Y: []
-  - Y: []
-  - Y: []
-  - Y: []
-  - Y: []
-  - Y: []
-  - Y: []
-  - Y: []
   character: 0
   playerOn: {fileID: 0}
   player: {fileID: 1809205617}
@@ -39368,11 +39357,11 @@ MonoBehaviour:
   cardDeck: {fileID: 11400000, guid: 1126a56dae0a1ab40821c18c251900ef, type: 2}
   relicList: {fileID: 11400000, guid: 0ccbda8ca8e9a4146aebd15491d3b067, type: 2}
   colorSortList: 010000000300000004000000
-  commonCardForLook: {fileID: 4169693119190854323, guid: d349e9c2ce0a808418c6eed487637259,
+  commonCardForLook: {fileID: 4169693119190854323, guid: 873560de094707c4baa099f728c643bd,
     type: 3}
-  legendaryCardForLook: {fileID: 4169693119190854323, guid: d349e9c2ce0a808418c6eed487637259,
+  legendaryCardForLook: {fileID: 4169693119190854323, guid: 873560de094707c4baa099f728c643bd,
     type: 3}
-  rareCardForLook: {fileID: 4169693119190854323, guid: d349e9c2ce0a808418c6eed487637259,
+  rareCardForLook: {fileID: 4169693119190854323, guid: 873560de094707c4baa099f728c643bd,
     type: 3}
   isPass: 0
   isTreasure: 0
@@ -42104,11 +42093,7 @@ MonoBehaviour:
   mapUnity: {fileID: 887005656701010215, guid: ecde4b12dc4538b4caff9ada56c9ab30, type: 3}
   line: 9
   column: 6
-  lineForTool: 8
-  columnForTool: 8
   generatePoint: {fileID: 514899946}
-  generatePointTest: {fileID: 668478574}
-  cameraObject: {fileID: 0}
   lineOffSet: {x: 1, y: 0, z: 0}
   columnOffSet: {x: 0, y: 0, z: 0.865}
   enemyGenerateDataList: []
@@ -44367,6 +44352,68 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1882518531}
   m_CullTransparentMesh: 1
+--- !u!1 &1884246783
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1884246785}
+  - component: {fileID: 1884246784}
+  m_Layer: 0
+  m_Name: CardPictureManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1884246784
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1884246783}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 50364d58f6638d7439621773daaf2616, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  generatePointTest: {fileID: 668478574}
+  cameraObject: {fileID: 0}
+  mapUnity: {fileID: 887005656701010215, guid: ecde4b12dc4538b4caff9ada56c9ab30, type: 3}
+  line: 9
+  column: 6
+  lineOffSet: {x: 1, y: 0, z: 0}
+  columnOffSet: {x: 0, y: 0, z: 0.865}
+  mapUnityFather: {fileID: 1884246785}
+  ToolX:
+  - Y: []
+  - Y: []
+  - Y: []
+  - Y: []
+  - Y: []
+  - Y: []
+  - Y: []
+  - Y: []
+  - Y: []
+--- !u!4 &1884246785
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1884246783}
+  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 &1885060087
 GameObject:
   m_ObjectHideFlags: 0
@@ -50613,6 +50660,7 @@ SceneRoots:
   - {fileID: 1690695890}
   - {fileID: 515302569}
   - {fileID: 329040649}
+  - {fileID: 1884246785}
   - {fileID: 992566371}
   - {fileID: 395072433}
   - {fileID: 2068068679}

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

@@ -10903,6 +10903,68 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 643491996}
   m_CullTransparentMesh: 1
+--- !u!1 &657490526
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 657490528}
+  - component: {fileID: 657490527}
+  m_Layer: 0
+  m_Name: CardPictureManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &657490527
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 657490526}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 50364d58f6638d7439621773daaf2616, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  generatePointTest: {fileID: 1014601573}
+  cameraObject: {fileID: 0}
+  mapUnity: {fileID: 887005656701010215, guid: ecde4b12dc4538b4caff9ada56c9ab30, type: 3}
+  line: 9
+  column: 6
+  lineOffSet: {x: 1, y: 0, z: 0}
+  columnOffSet: {x: 0, y: 0, z: 0.865}
+  mapUnityFather: {fileID: 657490528}
+  ToolX:
+  - Y: []
+  - Y: []
+  - Y: []
+  - Y: []
+  - Y: []
+  - Y: []
+  - Y: []
+  - Y: []
+  - Y: []
+--- !u!4 &657490528
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 657490526}
+  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 &658975464
 GameObject:
   m_ObjectHideFlags: 0
@@ -14683,6 +14745,37 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1014383273}
   m_CullTransparentMesh: 1
+--- !u!1 &1014601573
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1014601574}
+  m_Layer: 0
+  m_Name: MapGeneraterTest
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1014601574
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1014601573}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -44.999992, 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 &1022567105
 GameObject:
   m_ObjectHideFlags: 0
@@ -19615,11 +19708,11 @@ MonoBehaviour:
   cardDeck: {fileID: 11400000, guid: 1126a56dae0a1ab40821c18c251900ef, type: 2}
   relicList: {fileID: 11400000, guid: 0ccbda8ca8e9a4146aebd15491d3b067, type: 2}
   colorSortList: 010000000300000004000000
-  commonCardForLook: {fileID: 4169693119190854323, guid: d349e9c2ce0a808418c6eed487637259,
+  commonCardForLook: {fileID: 4169693119190854323, guid: 873560de094707c4baa099f728c643bd,
     type: 3}
-  legendaryCardForLook: {fileID: 4169693119190854323, guid: d349e9c2ce0a808418c6eed487637259,
+  legendaryCardForLook: {fileID: 4169693119190854323, guid: 873560de094707c4baa099f728c643bd,
     type: 3}
-  rareCardForLook: {fileID: 4169693119190854323, guid: d349e9c2ce0a808418c6eed487637259,
+  rareCardForLook: {fileID: 4169693119190854323, guid: 873560de094707c4baa099f728c643bd,
     type: 3}
   isPass: 0
   isTreasure: 0
@@ -29432,4 +29525,6 @@ SceneRoots:
   - {fileID: 541884789}
   - {fileID: 1338730080}
   - {fileID: 780405988}
+  - {fileID: 1014601574}
+  - {fileID: 657490528}
   - {fileID: 61966381}

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

@@ -288,7 +288,7 @@ public class CardEntity : MonoBehaviour
 
     public void createCardImageTest()
     {
-        MapUnity currentNode = GameManager.Instance.ToolX[3].Y[3];
+        MapUnity currentNode = CardPictureManager.Instance.ToolX[3].Y[3];
         Debug.Log("card´´˝¨");
         CardManager.setCardImageTest(cardOriginalData, 90.0f, currentNode,this);
     }

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

@@ -0,0 +1,190 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using static GameManager;
+
+public class CardPictureManager : Singleton<CardPictureManager>
+{
+    public GameObject generatePointTest;
+    public GameObject cameraObject;
+    [Header("地图")]
+    public GameObject mapUnity;
+    public int line;
+    public int column;
+    public Vector3 lineOffSet;
+    public Vector3 columnOffSet;
+    public Transform mapUnityFather;
+    [Header("地图信息列表")]
+    public List<Yunit> ToolX;
+    private void Start()
+    {
+        DontDestroyOnLoad(this.gameObject);
+
+        GenerateEnmptyMapListForTool();
+        StartCoroutine(GenerateProcessTest());
+    }
+    IEnumerator GenerateProcessTest()
+    {
+        yield return StartCoroutine(MapGenerateTest());
+        yield return StartCoroutine(TransformMapUnityForTool());
+        yield return StartCoroutine(SetUpMapUnityForTool());
+        yield return StartCoroutine(SetUpMapUnityForCubeForTool());
+        createCameraAboveObject(ToolX[3].Y[3].gameObject, 10.0f, 0);
+        CardManager.createCardImageMap();
+    }
+    IEnumerator MapGenerateTest()
+    {
+        int middleLine = (line - 1) / 2;
+        int currentColumn = column;
+
+        for (int i = 0; i < line; i++)
+        {
+            if (i != 0)
+            {
+                generatePointTest.transform.position += columnOffSet;
+            }
+            generatePointTest.transform.position = new Vector3(20, 20, generatePointTest.transform.position.z);
+
+
+            if (i <= middleLine)
+            {
+                if (i != 0)
+                {
+                    currentColumn += 1;
+                    generatePointTest.transform.position -= (lineOffSet / 2f) * i;
+                }
+            }
+            else
+            {
+                currentColumn -= 1;
+                generatePointTest.transform.position -= (lineOffSet / 2f) * (line - i - 1);
+            }
+            Debug.Log("列数：" + currentColumn + "中间值：" + middleLine);
+            for (int j = 0; j < currentColumn; j++)
+            {
+                var a = Instantiate(mapUnity, generatePointTest.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;
+                currentMapUnityScript.RegisterUnitForTool();
+                generatePointTest.transform.position += lineOffSet;
+            }
+        }
+        yield return null;
+    }
+
+    IEnumerator TransformMapUnityForTool()
+    {
+        int x = 0, y = 0;
+        int count = 1;
+        int currentOffset = 0;
+        int middeline = ToolX.Count / 2;
+        List<int> lineOffsetList = new List<int>();
+        int lineOffsetListMark = 1;
+        for (int i = 0; i < ToolX.Count; i++)
+        {
+            if (count >= 2)
+            {
+                count = 0;
+                if (i <= middeline)
+                {
+                    currentOffset += 1;
+
+                }
+            }
+            if (i < middeline)
+            {
+                lineOffsetList.Add(currentOffset);
+            }
+            else if (i > middeline)
+            {
+                currentOffset = lineOffsetList[lineOffsetList.Count - lineOffsetListMark];
+                lineOffsetListMark += 1;
+            }
+
+
+            for (int j = 0; j < ToolX[i].Y.Count; j++)
+            {
+
+               ToolX[i].Y[j].ResetLocation(j - currentOffset, y);
+
+            }
+            x = 0;
+            y = i + 1;
+            count += 1;
+        }
+        yield return null;
+    }
+
+    IEnumerator SetUpMapUnityForTool()
+    {
+        // yield return StartCoroutine(MapGenerate());
+        for (int i = 0; i < ToolX.Count; i++)
+        {
+            for (int j = 0; j <ToolX[i].Y.Count; j++)
+            {
+               ToolX[i].Y[j].StartRegiste();
+            }
+        }
+        yield return null;
+    }
+
+    IEnumerator SetUpMapUnityForCubeForTool()
+    {
+        // yield return StartCoroutine(MapGenerate());
+        for (int i = 0; i < ToolX.Count; i++)
+        {
+            for (int j = 0; j < ToolX[i].Y.Count; j++)
+            {
+                ToolX[i].Y[j].CalCube();
+            }
+        }
+        yield return null;
+    }
+    public void createCameraAboveObject(GameObject targetObject, float heightAbove, float lookDownAngle)
+    {
+        // 1. 创建摄像机
+        cameraObject = new GameObject("RenderCamera");
+        Camera renderCamera = cameraObject.AddComponent<Camera>();
+        cameraObject.AddComponent<DontDestoryGameObject>();
+        // 设置摄像机参数
+        renderCamera.clearFlags = CameraClearFlags.SolidColor;  // 清除背景颜色
+        renderCamera.backgroundColor = Color.clear;             // 背景透明
+        renderCamera.orthographic = true;                       // 正交投影
+        renderCamera.orthographicSize = 5;
+        renderCamera.enabled = false;
+        // RenderTexture renderTexture = new RenderTexture(512, 512, 24);
+        //renderCamera.targetTexture = renderTexture;
+
+        // 2. 设置摄像机位置：目标物体上方
+        Vector3 targetPosition = targetObject.transform.position;
+        cameraObject.transform.position = targetPosition + new Vector3(0, heightAbove, 0);
+
+        // 3. 设置摄像机朝向：向下看目标物体
+        cameraObject.transform.LookAt(targetPosition);
+
+        // 4. 调整倾斜角度（可选）
+        cameraObject.transform.Rotate(lookDownAngle, 0, 0);
+    }
+
+    public void GenerateEnmptyMapListForTool()
+    {
+        int currentColumn = column - 1;
+        for (int i = 0; i < line; i++)
+        {
+            if (i <= (line - 1) / 2)
+            {
+                currentColumn += 1;
+            }
+            else
+            {
+                currentColumn -= 1;
+            }
+            for (int j = 0; j < currentColumn; j++)
+            {
+                ToolX[i].Y.Add(null);
+            }
+        }
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardPictureManager.cs.meta

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

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

@@ -1,7 +1,9 @@
 using System.Collections;
 using System.Collections.Generic;
+using Unity.Collections.LowLevel.Unsafe;
 using UnityEngine;
 using UnityEngine.EventSystems;
+using UnityEngine.UI;
 
 public class ChooseWeaponManager : Singleton<ChooseWeaponManager>
 {
@@ -37,6 +39,13 @@ public class ChooseWeaponManager : Singleton<ChooseWeaponManager>
     public List<CardEntity> newCardGroup_1;
     public List<CardEntity> newCardGroup_2;
     public List<CardEntity> newCardGroup_3;
+    [Header("¿¨ÅÆԤͿɫÐÅÏ¢")]
+    public Text coloringTotalCount;
+    public Text coloringRedCount;
+    public Text coloringGreenCount;
+    public Text coloringBlueCount;
+    public Text coloringWhitCount;
+
     private void Start()
     {
         GenerateCardGroup();
@@ -99,6 +108,8 @@ public class ChooseWeaponManager : Singleton<ChooseWeaponManager>
                 
             } 
         }
+
+        SyncPreColoringCount();
     }
     public void GenerateChangeColorCardGroup(int groupIndex ,List<string > newCard )
     {
@@ -135,8 +146,65 @@ public class ChooseWeaponManager : Singleton<ChooseWeaponManager>
             newCardGroup.Add(card.GetComponent<CardEntity>());
         }
 
+        SyncPreColoringCount();
     }
 
+    public void SyncPreColoringCount()
+    {
+        List <string> cardId = new List<string>();
+        if (newCardGroup_1.Count > 0)
+        {
+            for (int i = 0;i < newCardGroup_1.Count;i++)
+            {
+                cardId.Add(newCardGroup_1[i].cardId);
+            }
+        }
+        else
+        {
+            for (int i = 0; i < cardGroup_1 .Count; i++)
+            {
+                cardId.Add(cardGroup_1[i].cardId);
+            }
+        }
+        if (newCardGroup_2.Count > 0)
+        {
+            for (int i = 0; i < newCardGroup_2.Count; i++)
+            {
+                cardId.Add(newCardGroup_2[i].cardId);
+            }
+        }
+        else
+        {
+            for (int i = 0; i < cardGroup_2.Count; i++)
+            {
+                cardId.Add(cardGroup_2[i].cardId);
+            }
+        }
+        if (newCardGroup_3.Count > 0)
+        {
+            for (int i = 0; i < newCardGroup_3.Count; i++)
+            {
+                cardId.Add(newCardGroup_3[i].cardId);
+            }
+        }
+        else
+        {
+            for (int i = 0; i < cardGroup_3.Count; i++)
+            {
+                cardId.Add(cardGroup_3[i].cardId);
+            }
+        }
+        for (int i = 0; i < cardGroupsInfor[3].cardIDGroup .Count; i++)
+        {
+            cardId.Add(cardGroupsInfor[3].cardIDGroup[i]);
+        }
+        List <int> preColoringCountList = PlayerStatsManager.Instance.GetCardDeckColor(cardId);
+        coloringTotalCount.text = preColoringCountList[0].ToString();
+        coloringRedCount .text = preColoringCountList[1].ToString();
+        coloringGreenCount.text = preColoringCountList[4].ToString();
+        coloringBlueCount.text = preColoringCountList[3].ToString();
+        coloringWhitCount .text = preColoringCountList [2].ToString();
+    }
     public void ReturnColorSortChoose()
     {
         PlayerStatsManager.Instance.colorSortList.Clear();

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

@@ -10,7 +10,7 @@ public class GameManager : Singleton<GameManager>
 {
     public bool complete;
     public List <Yunit> X;
-    public List<Yunit> ToolX;
+
     [Header("当前选择角色")]
     public SelectedCharacter character;
     public enum SelectedCharacter
@@ -130,7 +130,6 @@ public class GameManager : Singleton<GameManager>
         //生成空地图列表
         // GenerateEnmptyMapList();
         GenerateEnmptyMapListDefault();       
-        GenerateEnmptyMapListForTool();  
         //开局场地涂色并开始阶段
         StartCoroutine(StartStartColourCoroutine(complete));   
     }
@@ -185,28 +184,7 @@ public class GameManager : Singleton<GameManager>
             }
         }
     }
-    public void GenerateEnmptyMapListForTool()
-    {
-        int currentColumn = MapManager.Instance.column - 1;
-        if (complete == false)
-        {
-            for (int i = 0; i < MapManager.Instance.line; i++)
-            {
-                if (i <= (MapManager.Instance.line - 1) / 2)
-                {
-                    currentColumn += 1;
-                }
-                else
-                {
-                    currentColumn -= 1;
-                }
-                for (int j = 0; j < currentColumn; j++)
-                {
-                    ToolX[i].Y.Add(null);
-                }
-            }
-        }
-    }
+   
     
     private void Update()
     {

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

@@ -14,15 +14,8 @@ public class MapManager : Singleton<MapManager>
     public int line;
     public int column;
 
-    public int lineForTool;
-    public int columnForTool;
-
     public GameObject generatePoint;
 
-    public GameObject generatePointTest;
-
-    public GameObject cameraObject;
-
     public Vector3 lineOffSet;
     public Vector3 columnOffSet;
 
@@ -185,8 +178,9 @@ public class MapManager : Singleton<MapManager>
         bookAnim.GetComponent<Animator>().SetTrigger("move");
         //书缝愈合
         //bookUpAnim.SetActive(true); 
-        StartCoroutine(GenerateProcessTest());  
-       // enemyBurn(PlayerStatsManager.Instance.levelDevelopData.fightEenemyPool);
+        // enemyBurn(PlayerStatsManager.Instance.levelDevelopData.fightEenemyPool);
+        //¿¨ÅÆÅÆ×é
+        // StartCoroutine(GenerateProcessTest()); 
     }
     //总动画控制进程
     public void ContinueProgress()
@@ -251,90 +245,10 @@ public class MapManager : Singleton<MapManager>
         yield return null;
     }
 
-    IEnumerator TransformMapUnityForTool()
-    {
-        int x = 0, y = 0;
-        int count = 1;
-        int currentOffset = 0;
-        int middeline = GameManager.Instance.ToolX.Count / 2;
-        List<int> lineOffsetList = new List<int>();
-        int lineOffsetListMark = 1;
-        for (int i = 0; i < GameManager.Instance.ToolX.Count; i++)
-        {
-            if (count >= 2)
-            {
-                count = 0;
-                if (i <= middeline)
-                {
-                    currentOffset += 1;
   
-                }
-            }
-            if (i < middeline)
-            {
-                lineOffsetList.Add(currentOffset);
-            }
-            else if (i > middeline)
-            {
-                currentOffset = lineOffsetList[lineOffsetList.Count - lineOffsetListMark];
-                lineOffsetListMark += 1;
-            }
-
-
-            for (int j = 0; j < GameManager.Instance.ToolX[i].Y.Count; j++)
-            {
     
-                GameManager.Instance.ToolX[i].Y[j].ResetLocation(j - currentOffset, y);
 
-            }
-            x = 0;
-            y = i + 1;
-            count += 1;
-        }
-        yield return null;
-    }
-    IEnumerator GenerateProcessTest()
-    {
-        yield return StartCoroutine(MapGenerateTest());
-        // yield return StartCoroutine(MapGenerateDefault());
-
-        yield return StartCoroutine(TransformMapUnityForTool());
-        yield return StartCoroutine(SetUpMapUnityForTool());
-        yield return StartCoroutine(SetUpMapUnityForCubeForTool());
-        
-        //yield return StartCoroutine(UPMoveMapUnity());
-        //yield return new WaitForSeconds(2);
-        //yield return StartCoroutine(EnemyGenerate());
-        //yield return StartCoroutine(CompleteGenerate());
-        createCameraAboveObject(GameManager.Instance.ToolX[3].Y[3].gameObject, 10.0f, 0);
-        CardManager.createCardImageMap();
-    }
   
-    public void createCameraAboveObject(GameObject targetObject, float heightAbove, float lookDownAngle)
-    {
-        // 1. 创建摄像机
-        cameraObject = new GameObject("RenderCamera");
-        Camera renderCamera = cameraObject.AddComponent<Camera>();
-
-        // 设置摄像机参数
-        renderCamera.clearFlags = CameraClearFlags.SolidColor;  // 清除背景颜色
-        renderCamera.backgroundColor = Color.clear;             // 背景透明
-        renderCamera.orthographic = true;                       // 正交投影
-        renderCamera.orthographicSize = 5;
-        renderCamera.enabled = false;
-       // RenderTexture renderTexture = new RenderTexture(512, 512, 24);
-        //renderCamera.targetTexture = renderTexture;
-        
-        // 2. 设置摄像机位置：目标物体上方
-        Vector3 targetPosition = targetObject.transform.position;
-        cameraObject.transform.position = targetPosition + new Vector3(0, heightAbove, 0);
-
-        // 3. 设置摄像机朝向：向下看目标物体
-        cameraObject.transform.LookAt(targetPosition);
-
-        // 4. 调整倾斜角度（可选）
-        cameraObject.transform.Rotate(lookDownAngle, 0, 0);
-    }
     
     //完成场地创建
     IEnumerator CompleteGenerate()
@@ -409,31 +323,8 @@ public class MapManager : Singleton<MapManager>
         yield return null;
     }
 
-    IEnumerator SetUpMapUnityForCubeForTool()
-    {
-        // yield return StartCoroutine(MapGenerate());
-        for (int i = 0; i < GameManager.Instance.ToolX.Count; i++)
-        {
-            for (int j = 0; j < GameManager.Instance.ToolX[i].Y.Count; j++)
-            {
-                GameManager.Instance.ToolX[i].Y[j].CalCube();
-            }
-        }
-        yield return null;
-    }
    
-    IEnumerator SetUpMapUnityForTool()
-    {
-        // yield return StartCoroutine(MapGenerate());
-        for (int i = 0; i < GameManager.Instance.ToolX.Count; i++)
-        {
-            for (int j = 0; j < GameManager.Instance.ToolX[i].Y.Count; j++)
-            {
-                GameManager.Instance.ToolX[i].Y[j].StartRegiste();
-            }
-        }
-        yield return null;
-    }
+   
     IEnumerator MapGenerate()
     {
         for (int i = 0; i < line; i++)
@@ -546,83 +437,7 @@ public class MapManager : Singleton<MapManager>
         yield return null;
     }
     
-    IEnumerator MapGenerateTest()
-    {
-        int middleLine = (line - 1) / 2;
-        int currentColumn = column;
    
-        for (int i = 0; i < line; i++)
-        {
-            if (i != 0)
-            {
-                generatePointTest.transform.position += columnOffSet;
-            }
-            generatePointTest.transform.position = new Vector3(20, 20, generatePointTest.transform.position.z);
-
-
-            if (i <= middleLine)
-            {
-                if (i != 0)
-                {
-                    currentColumn += 1;
-                    generatePointTest.transform.position -= (lineOffSet / 2f) * i;
-                }
-            }
-            else
-            {
-                currentColumn -= 1;
-                generatePointTest.transform.position -= (lineOffSet / 2f) * (line - i - 1);
-            }
-            Debug.Log("列数：" + currentColumn + "中间值：" + middleLine);
-            for (int j = 0; j < currentColumn; j++)
-            {
-                var a = Instantiate(mapUnity, generatePointTest.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;
-                currentMapUnityScript.RegisterUnitForTool();
-                generatePointTest.transform.position += lineOffSet;
-            }
-        }
-        yield return null;
-        #region 隐藏多余节点
-        /* //隐藏多余节点
-         List<Yunit> X = GameManager.Instance.X;
-         for (int i = 0; i < (int)(line / 2f); i++)
-         {
-
-             if (i == 0)
-             {
-                 X[i].Y[0].gameObject.SetActive(false);
-                 X[i].Y[1].gameObject.SetActive(false);
-                 X[i].Y[X[i].Y .Count  -1].gameObject.SetActive(false);
-                 X[i].Y[X[i].Y.Count - 2].gameObject.SetActive(false);
-             }
-             else
-             {
-                 X[i].Y[0].gameObject.SetActive(false);
-                 X[i].Y[X[i].Y.Count - 1].gameObject.SetActive(false);
-             }
-         }
-         for (int i = (int)(line / 2f)+1; i < line ; i++)
-         {
-
-             if (i == line -1)
-             {
-                 X[i].Y[0].gameObject.SetActive(false);
-                 X[i].Y[1].gameObject.SetActive(false);
-                 X[i].Y[X[i].Y.Count - 1].gameObject.SetActive(false);
-                 X[i].Y[X[i].Y.Count - 2].gameObject.SetActive(false);
-             }
-             else
-             {
-                 X[i].Y[0].gameObject.SetActive(false);
-                 X[i].Y[X[i].Y.Count - 1].gameObject.SetActive(false);
-             }
-         }*/
-        #endregion
-    }
     //方形场地创建
     public void CreateSquareMap()
     {

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

@@ -242,8 +242,8 @@ public class MapUnity : MonoBehaviour
     
     public void RegisterUnitForTool()
     {
-        Debug.Log(GameManager.Instance.ToolX[0].Y.Count);
-        GameManager.Instance.ToolX[locationX].Y[locationY] = this;
+        // Debug.Log(GameManager.Instance.ToolX[0].Y.Count);
+        CardPictureManager.Instance.ToolX[locationX].Y[locationY] = this;
     }
     public void ConnectUnit()
     {    

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

@@ -234,13 +234,35 @@ public class PlayerStatsManager : Singleton <PlayerStatsManager>
             colorTotalCount += colorCountList[i];
         }
         //计算单个颜色占比有多少个
+        List <float > floatResultsList = new List<float>() { 0, 0, 0, 0, 0, 0, 0 };
         List<int> colorResults = new List<int>() { 0, 0, 0, 0, 0, 0, 0 };//1red,2white,3blue,4green,5black,6matel,0是费用总数
         colorResults[0] = colorCountList [0];
+        int resultCount = 0;
         for (int i = 1; i < colorCountList.Count; i++)
         {
-            colorResults[i] = (int)(((float)colorCountList[i]/ (float)colorTotalCount )*colorResults[0]);
+            floatResultsList[i] = (((float)colorCountList[i] / (float)colorTotalCount) * colorResults[0]);
+            colorResults[i] = (int)floatResultsList[i];
+            floatResultsList[i] -= colorResults[i];//只保留小数位
+            Debug.Log("floatResultsList[" + "i" + "]:" + floatResultsList[i]);
+            resultCount += colorResults[i];
             Debug.Log("涂色" + i + ":"+ colorResults[i]);
         }
+        //平衡被取整少掉的地块数
+        int lackCount = colorResults[0] - resultCount;
+        for (int i = 0;i<lackCount;i++)
+        {
+            int maxIndex = 0;
+            for(int j=1;j<floatResultsList .Count;j++)
+            {
+                if(floatResultsList[maxIndex] < floatResultsList[j])
+                {
+                    maxIndex = j;
+                }
+            }
+
+            colorResults[maxIndex] += 1;
+            floatResultsList.RemoveAt (maxIndex);
+        }
         Debug.Log("涂色总数:" + colorResults[0]);
         return colorResults;
     }

ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs

@@ -155,13 +155,13 @@ public class getNodeTools
         //计算node在列表的第几位
         try
         {
-            for (int i = 0; i < GameManager.Instance.ToolX[locationY].Y.Count; i++)
+            for (int i = 0; i < CardPictureManager.Instance.ToolX[locationY].Y.Count; i++)
             {
 
-                if (GameManager.Instance.ToolX[locationY].Y[i].locationX == locationX)
+                if (CardPictureManager.Instance.ToolX[locationY].Y[i].locationX == locationX)
                 {
                     x = i;
-                    mapUnity = GameManager.Instance.ToolX[locationY].Y[x];
+                    mapUnity = CardPictureManager.Instance.ToolX[locationY].Y[x];
                     break;
                 }
             }

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

@@ -214,7 +214,7 @@ public class CardManager : Singleton<CardManager>
     }
     public static void createCardImageMap()
     {
-        MapUnity currentNode = GameManager.Instance.ToolX[3].Y[3];
+        MapUnity currentNode = CardPictureManager.Instance.ToolX[3].Y[3];
         foreach (CardOriginalData cardOriginalData in CardOriginalDataList.Instance.existCardOriginalDataList.Values)
         {
             Debug.Log("createcardimage!");
@@ -225,12 +225,12 @@ public class CardManager : Singleton<CardManager>
     }
     public static Sprite createCardImage(CardOriginalData cardOriginalData, float euler, MapUnity currentNode)
     {
-        for (int i = 0; i < GameManager.Instance.ToolX.Count; i++)
+        for (int i = 0; i < CardPictureManager.Instance.ToolX.Count; i++)
         {
-            for (int j = 0; j < GameManager.Instance.ToolX[i].Y.Count; j++)
+            for (int j = 0; j < CardPictureManager.Instance.ToolX[i].Y.Count; j++)
             {
-                GameManager.Instance.ToolX[i].Y[j].switchColorWithoutFX(Name.NodeColor.White);
-                GameManager.Instance.ToolX[i].Y[j].gameObject.SetActive(false);
+                CardPictureManager.Instance.ToolX[i].Y[j].switchColorWithoutFX(Name.NodeColor.White);
+                CardPictureManager.Instance.ToolX[i].Y[j].gameObject.SetActive(false);
             }
         }
         List<(int, int, int)> cubeList = new List<(int, int, int)>();
@@ -282,7 +282,7 @@ public class CardManager : Singleton<CardManager>
         int maxDiff = Math.Max(maxXDiff, maxYDiff);
 
         RenderTexture renderTexture = new RenderTexture(512, 512, 24);
-        Camera renderCamera = MapManager.Instance.cameraObject.GetComponent<Camera>();
+        Camera renderCamera = CardPictureManager.Instance.cameraObject.GetComponent<Camera>();
         renderCamera.targetTexture = renderTexture;
         Texture2D texture = new Texture2D(renderTexture.width, renderTexture.height, TextureFormat.ARGB32, false);
         cameraAdjust(maxDiff, renderCamera, currentNode);