2024.5.25代码第一次合并读表

ColorlessWorld-2024-4-2/Assets/GameDate/Enemy.meta

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

ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Enemy_1.asset

@@ -0,0 +1,21 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 20f70984b262f8d4382bf5262dddb83e, type: 3}
+  m_Name: Enemy_1
+  m_EditorClassIdentifier: 
+  positionX: 0
+  positionY: 3
+  maxStepRange: 0
+  currentStepRange: 0
+  currentShieldValue: 0
+  maxHP: 100
+  currentHP: 100

ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Enemy_1.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0d1e4fb37b5ed404e838be53ab42e8ec
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Image/Enemy_1.mat

@@ -0,0 +1,135 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-1760201511799080835
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Enemy_1
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _ALPHATEST_ON
+  - _SPECULARHIGHLIGHTS_OFF
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 2450
+  stringTagMap:
+    RenderType: TransparentCutout
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 2800000, guid: 8ef49f8fd07fb3c4a9605ea6310de0bf, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 8ef49f8fd07fb3c4a9605ea6310de0bf, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AlphaClip: 1
+    - _AlphaToMask: 1
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 0
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []

ColorlessWorld-2024-4-2/Assets/Image/Enemy_1.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4f1cc3f6d514aa44a9759eda985dba4b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card.prefab

@@ -109,6 +109,7 @@ GameObject:
   - component: {fileID: 6042570540965326076}
   - component: {fileID: 7385599250693012335}
   - component: {fileID: 4793736772745952604}
+  - component: {fileID: 4344221442974234100}
   m_Layer: 5
   m_Name: Card
   m_TagString: Untagged
@@ -236,3 +237,16 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9878eb734a9bb9e448c1a125b1e863e6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  cardOriginalData: {fileID: 4344221442974234100}
+--- !u!114 &4344221442974234100
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8750191142195020115}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b4150f21c56643d43b609b96eb88caa1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v01.prefab

@@ -802,6 +802,7 @@ GameObject:
   - component: {fileID: 8067268704048347736}
   - component: {fileID: 2967471168845626985}
   - component: {fileID: 1131717685372222914}
+  - component: {fileID: 7437127433431600243}
   m_Layer: 5
   m_Name: Card_v01
   m_TagString: Untagged
@@ -934,6 +935,21 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9878eb734a9bb9e448c1a125b1e863e6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  cardOriginalData: {fileID: 0}
+  cardData: {fileID: 0}
+  cardId: 0
+--- !u!114 &7437127433431600243
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3410471369990512392}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b4150f21c56643d43b609b96eb88caa1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &4245510081586536158
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -155,10 +155,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 959299392}
   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: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 92.5, y: -130}
+  m_SizeDelta: {x: 125, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &82673847
 MonoBehaviour:
@@ -230,10 +230,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 959299392}
   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: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 402.5, y: -130}
+  m_SizeDelta: {x: 125, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &92053620
 MonoBehaviour:
@@ -273,124 +273,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 92053618}
   m_CullTransparentMesh: 1
---- !u!1001 &96106444
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 5759046674574092087, guid: 30e1ea54554f56345b2e9a90ceacc9ce,
-        type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5759046674574092087, guid: 30e1ea54554f56345b2e9a90ceacc9ce,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5759046674574092087, guid: 30e1ea54554f56345b2e9a90ceacc9ce,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5759046674574092087, guid: 30e1ea54554f56345b2e9a90ceacc9ce,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5759046674574092087, guid: 30e1ea54554f56345b2e9a90ceacc9ce,
-        type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5759046674574092087, guid: 30e1ea54554f56345b2e9a90ceacc9ce,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5759046674574092087, guid: 30e1ea54554f56345b2e9a90ceacc9ce,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 125
-      objectReference: {fileID: 0}
-    - target: {fileID: 5759046674574092087, guid: 30e1ea54554f56345b2e9a90ceacc9ce,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 200
-      objectReference: {fileID: 0}
-    - target: {fileID: 5759046674574092087, guid: 30e1ea54554f56345b2e9a90ceacc9ce,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5759046674574092087, guid: 30e1ea54554f56345b2e9a90ceacc9ce,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5759046674574092087, guid: 30e1ea54554f56345b2e9a90ceacc9ce,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5759046674574092087, guid: 30e1ea54554f56345b2e9a90ceacc9ce,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5759046674574092087, guid: 30e1ea54554f56345b2e9a90ceacc9ce,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5759046674574092087, guid: 30e1ea54554f56345b2e9a90ceacc9ce,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5759046674574092087, guid: 30e1ea54554f56345b2e9a90ceacc9ce,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5759046674574092087, guid: 30e1ea54554f56345b2e9a90ceacc9ce,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5759046674574092087, guid: 30e1ea54554f56345b2e9a90ceacc9ce,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5759046674574092087, guid: 30e1ea54554f56345b2e9a90ceacc9ce,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5759046674574092087, guid: 30e1ea54554f56345b2e9a90ceacc9ce,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5759046674574092087, guid: 30e1ea54554f56345b2e9a90ceacc9ce,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8750191142195020115, guid: 30e1ea54554f56345b2e9a90ceacc9ce,
-        type: 3}
-      propertyPath: m_Name
-      value: Card
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 30e1ea54554f56345b2e9a90ceacc9ce, type: 3}
 --- !u!1 &144591441
 GameObject:
   m_ObjectHideFlags: 0
@@ -539,7 +421,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &196188496
 Transform:
   m_ObjectHideFlags: 0
@@ -1038,10 +920,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 959299392}
   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: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 1332.5, y: -130}
+  m_SizeDelta: {x: 125, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &225360213
 MonoBehaviour:
@@ -1556,7 +1438,9 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 2050905750}
   - {fileID: 495423659}
+  - {fileID: 1147870383}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &361803916
@@ -2564,50 +2448,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 669923021}
   m_CullTransparentMesh: 1
---- !u!1 &677812539
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 677812540}
-  - component: {fileID: 677812541}
-  m_Layer: 0
-  m_Name: CardOriginalData
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &677812540
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 677812539}
-  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: 952604643}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &677812541
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 677812539}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b4150f21c56643d43b609b96eb88caa1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &734247257
 GameObject:
   m_ObjectHideFlags: 0
@@ -2997,8 +2837,6 @@ Transform:
   - {fileID: 1190351098}
   - {fileID: 165968473}
   - {fileID: 1964831962}
-  - {fileID: 677812540}
-  - {fileID: 1147870383}
   - {fileID: 449271698}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3222,10 +3060,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 959299392}
   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: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 1177.5, y: -130}
+  m_SizeDelta: {x: 125, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1028226911
 MonoBehaviour:
@@ -3347,10 +3185,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 959299392}
   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: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 247.5, y: -130}
+  m_SizeDelta: {x: 125, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1139263004
 MonoBehaviour:
@@ -3415,12 +3253,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1147870382}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 952604643}
+  m_Father: {fileID: 348176937}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1147870384
 MonoBehaviour:
@@ -3434,6 +3272,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 34479ee20dc78fb49927983a85316eb8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  templateardData_SO: {fileID: 11400000, guid: ffdc07f6b04b7ea4ca942c1d22367a8e, type: 2}
 --- !u!1 &1190351096
 GameObject:
   m_ObjectHideFlags: 0
@@ -3465,24 +3304,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   cardPrefab: {fileID: 3410471369990512392, guid: d255d4b8a06372542bcbeef98cf4761c,
     type: 3}
-  cardList:
-  - {fileID: 3410471369990512392, guid: d255d4b8a06372542bcbeef98cf4761c, type: 3}
-  - {fileID: 3410471369990512392, guid: d255d4b8a06372542bcbeef98cf4761c, type: 3}
-  - {fileID: 3410471369990512392, guid: d255d4b8a06372542bcbeef98cf4761c, type: 3}
-  - {fileID: 3410471369990512392, guid: d255d4b8a06372542bcbeef98cf4761c, type: 3}
-  - {fileID: 3410471369990512392, guid: d255d4b8a06372542bcbeef98cf4761c, type: 3}
-  - {fileID: 3410471369990512392, guid: d255d4b8a06372542bcbeef98cf4761c, type: 3}
-  - {fileID: 3410471369990512392, guid: d255d4b8a06372542bcbeef98cf4761c, type: 3}
-  - {fileID: 3410471369990512392, guid: d255d4b8a06372542bcbeef98cf4761c, type: 3}
-  - {fileID: 3410471369990512392, guid: d255d4b8a06372542bcbeef98cf4761c, type: 3}
-  - {fileID: 3410471369990512392, guid: d255d4b8a06372542bcbeef98cf4761c, type: 3}
-  - {fileID: 3410471369990512392, guid: d255d4b8a06372542bcbeef98cf4761c, type: 3}
-  - {fileID: 3410471369990512392, guid: d255d4b8a06372542bcbeef98cf4761c, type: 3}
-  - {fileID: 3410471369990512392, guid: d255d4b8a06372542bcbeef98cf4761c, type: 3}
-  - {fileID: 3410471369990512392, guid: d255d4b8a06372542bcbeef98cf4761c, type: 3}
-  - {fileID: 3410471369990512392, guid: d255d4b8a06372542bcbeef98cf4761c, type: 3}
-  - {fileID: 3410471369990512392, guid: d255d4b8a06372542bcbeef98cf4761c, type: 3}
-  cardDeck: []
+  cardList: 11270000112700001127000011270000112700001127000011270000112700001227000012270000122700001227000012270000122700001227000012270000
+  cardDeck: 00000000
 --- !u!4 &1190351098
 Transform:
   m_ObjectHideFlags: 0
@@ -3798,6 +3621,37 @@ Transform:
   m_Children: []
   m_Father: {fileID: 1819238997}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1294001697
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1294001698}
+  m_Layer: 0
+  m_Name: ------Enemy------
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1294001698
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1294001697}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 512.11206, y: 146.54048, z: -389.7122}
+  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 &1298478936
 GameObject:
   m_ObjectHideFlags: 0
@@ -4094,10 +3948,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 959299392}
   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: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 712.5, y: -130}
+  m_SizeDelta: {x: 125, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1320647296
 MonoBehaviour:
@@ -4137,6 +3991,53 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1320647294}
   m_CullTransparentMesh: 1
+--- !u!1 &1406908583
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1406908584}
+  - component: {fileID: 1406908585}
+  m_Layer: 0
+  m_Name: Enemy_1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1406908584
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1406908583}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0.9657449, z: -0.2594933, w: 0}
+  m_LocalPosition: {x: 20, y: 0.36, z: 5.12}
+  m_LocalScale: {x: 0.1, y: 1, z: 0.12}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1800977356}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 30.08, y: 180, z: 0}
+--- !u!114 &1406908585
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1406908583}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b93e606dce1c400408bd059eaaa399b2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  templateEnemyState: {fileID: 11400000, guid: 0d1e4fb37b5ed404e838be53ab42e8ec, type: 2}
+  EnemyState: {fileID: 0}
 --- !u!1 &1433470489
 GameObject:
   m_ObjectHideFlags: 0
@@ -4741,6 +4642,112 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1748859173}
   m_CullTransparentMesh: 1
+--- !u!1 &1800977351
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1800977356}
+  - component: {fileID: 1800977355}
+  - component: {fileID: 1800977354}
+  - component: {fileID: 1800977353}
+  m_Layer: 0
+  m_Name: Enemy_1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!64 &1800977353
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1800977351}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 0
+  serializedVersion: 5
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &1800977354
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1800977351}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 4f1cc3f6d514aa44a9759eda985dba4b, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &1800977355
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1800977351}
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &1800977356
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1800977351}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.48, y: 0.41, z: -2.58}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1406908584}
+  m_LocalEulerAnglesHint: {x: 30.08, y: 180, z: 0}
 --- !u!1 &1802141877
 GameObject:
   m_ObjectHideFlags: 0
@@ -5057,10 +5064,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 959299392}
   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: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 557.5, y: -130}
+  m_SizeDelta: {x: 125, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1824824475
 MonoBehaviour:
@@ -5403,7 +5410,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   cardPrefab: {fileID: 3410471369990512392, guid: d255d4b8a06372542bcbeef98cf4761c,
     type: 3}
-  usedCardList: []
+  usedCardList: 
 --- !u!1 &1983891394
 GameObject:
   m_ObjectHideFlags: 0
@@ -5436,10 +5443,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 959299392}
   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: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 867.5, y: -130}
+  m_SizeDelta: {x: 125, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1983891396
 MonoBehaviour:
@@ -5479,6 +5486,51 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1983891394}
   m_CullTransparentMesh: 1
+--- !u!1 &2050905749
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2050905750}
+  - component: {fileID: 2050905751}
+  m_Layer: 0
+  m_Name: EnemyManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2050905750
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2050905749}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 512.11206, y: 146.54048, z: -389.7122}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 348176937}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2050905751
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2050905749}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f8793b4e36c078945a2ad3a3dc66cb30, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  enemyNode: {fileID: 1406908585}
 --- !u!1 &2060702280
 GameObject:
   m_ObjectHideFlags: 0
@@ -5744,10 +5796,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 959299392}
   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: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 1022.5, y: -130}
+  m_SizeDelta: {x: 125, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2132810048
 MonoBehaviour:
@@ -5799,4 +5851,5 @@ SceneRoots:
   - {fileID: 1819238997}
   - {fileID: 348176937}
   - {fileID: 952604643}
-  - {fileID: 96106444}
+  - {fileID: 1294001698}
+  - {fileID: 1406908584}

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

@@ -5,7 +5,7 @@ using UnityEngine;
 public class CardDeck : MonoBehaviour
 {
     public GameObject cardPrefab;
-    public List<GameObject> cardList;//局内使用卡组
+    public List<int> cardList;//局内使用卡组
 
-    public List<GameObject> cardDeck;//标准卡组
+    public List<int> cardDeck;//标准卡组
 }

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

@@ -39,7 +39,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
        //     graphicRaycaster = GameObject.Find("CardPanel").GetComponent<GraphicRaycaster>();
 
         GetComponent<CanvasGroup>().blocksRaycasts = false;
-
+         
         originalParent = this.gameObject.transform.parent;
         originalpoint = this.transform.localPosition;
 
@@ -78,7 +78,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
             {
                 // Debug.Log(raycastHit.collider.gameObject.name);
                 //检测到跟上次瞄准地方不同，更新
-                if (currentNode == null || raycastHit.collider.transform.gameObject != currentNode.gameObject)
+                if (currentNode == null || raycastHit.collider.transform.gameObject != currentNode.gameObject) 
                 {
                     for (int i = 0; i < influencePreviewPool.Count; i++)
                     {
@@ -239,7 +239,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
             GameManager.Instance.player.influencePreviewPool.Clear();
 
             //临时效果--将其加入墓地并销毁实体
-            TurnMaster.Instance.usedCard.usedCardList.Add(this.gameObject);
+            TurnMaster.Instance.usedCard.usedCardList.Add(this.gameObject.GetComponent <CardEntity>().CardId );
             Destroy(this.gameObject);
         }
         

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

@@ -5,10 +5,10 @@ using UnityEngine;
 
 public class CardEntity : MonoBehaviour
 {
+    public CardData_SO cardOriginalData;
+    public CardOriginalData cardData;
 
-    private CardOriginalData cardOriginalData;
-
-    private int cardId;
+    public int cardId;
     public int CardId
     {
         get { return cardId; }
@@ -17,13 +17,13 @@ public class CardEntity : MonoBehaviour
 
     public void Start()
     {
-        
+      cardData = GetComponent<CardOriginalData>();
     }
 
     public void createCard(int cardId)
     {
         this.cardId = cardId;
-        this.cardOriginalData = CardOriginalDataList.cardOriginalDataList[cardId];
+        cardOriginalData = CardOriginalDataList.cardOriginalDataList[cardId];
         settleForStart(SettlementManager.settleTurn);
     }
 

ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalData MonoBehaviour {.cs → ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalData.cs

@@ -3,7 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class CardOriginalData : Singleton<CardOriginalData>
+public class CardOriginalData : MonoBehaviour
 {
     private int cardId;
 

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

@@ -1,20 +1,34 @@
-
+using System;
+using System.Collections;
 using System.Collections.Generic;
+using UnityEngine;
 using System.IO;
 
 
 public class CardOriginalDataList : Singleton<CardOriginalDataList>
 {
-    public static Dictionary<int, CardOriginalData> cardOriginalDataList;
+    public static Dictionary<int, CardData_SO> cardOriginalDataList;
+
+   // private CardOriginalData cardOriginalData;//卡牌数据类型
+    public CardData_SO templateardData_SO;//卡牌数据模板
+
+   // public List<CardData_SO> cardData_SOs;//测试用的表，用来打印字典
 
     void Start()
     {
         cardOriginalDataList = ReadExcel("Assets/data/card_data.csv");
+
+      /*  for(int i =0;i<10;i++)
+        {
+            cardData_SOs.Add(Instantiate(templateardData_SO));
+            cardData_SOs[i].cardId = i;
+        }*/
+   
     }
 
-    Dictionary<int, CardOriginalData> ReadExcel(string filePath)
+    Dictionary<int, CardData_SO> ReadExcel(string filePath )
     {
-        Dictionary<int, CardOriginalData> cardOriginalDataList = new Dictionary<int, CardOriginalData>();
+        Dictionary<int, CardData_SO> cardOriginalDataList = new Dictionary<int, CardData_SO>();
 
         string[] lines = File.ReadAllLines(filePath);
         // 跳过标题行（如果CSV文件有标题行的话）
@@ -22,15 +36,17 @@ public class CardOriginalDataList : Singleton<CardOriginalDataList>
         {
             // 用逗号分隔每行数据
             string[] values = lines[i].Split(',');
-            CardOriginalData cardOriginalData = loadDatafromCsv(values);
+
+            var cardOriginalData = Instantiate(templateardData_SO);
+            loadDatafromCsv(values , cardOriginalData);
             cardOriginalDataList.Add(cardOriginalData.CardId, cardOriginalData);
         }
         return cardOriginalDataList;
     }
 
-    private CardOriginalData loadDatafromCsv(string[] values)
+    private CardData_SO loadDatafromCsv(string[] values , CardData_SO cardOriginalData)
     {
-        CardOriginalData cardOriginalData = CardOriginalData.Instance;
+        //CardOriginalData cardOriginalData = CardOriginalData.Instance;
         cardOriginalData.CardId = int.Parse(values[0]);
         cardOriginalData.ChineseName = values[1];
         cardOriginalData.Cost = int.Parse(values[2]);

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

@@ -25,7 +25,7 @@ public class TurnMaster : Singleton<TurnMaster>
 
     private void Update()
     {
-        if(turn == Turn.playerTurnBegin )
+        if (turn == Turn.playerTurnBegin)
         {
             //恢复体力
             GameManager.Instance.playerState.currentStepRange = GameManager.Instance.playerState.maxStepRange;
@@ -59,14 +59,14 @@ public class TurnMaster : Singleton<TurnMaster>
     }
 
     public void ShuffleWithLosingCards()
-    { 
+    {
         for (int j = 0; j < handCard.cardSlotList.Count; j++)
         {
             if (handCard.cardSlotList[j].transform.childCount > 0)
             {
                 //临时效果--将其加入墓地并销毁实体
                 var card = handCard.cardSlotList[j].transform.GetChild(0).gameObject;
-                TurnMaster.Instance.usedCard.usedCardList.Add(card);
+                TurnMaster.Instance.usedCard.usedCardList.Add(card.gameObject.GetComponent<CardEntity>().CardId);
                 Destroy(card);
             }
         }
@@ -76,28 +76,32 @@ public class TurnMaster : Singleton<TurnMaster>
 
             if (cardDeck.cardList.Count > 0)
             {
-                var a = Instantiate(cardDeck.cardList[cardDeck.cardList.Count - 1], handCard.cardSlotList[i].transform.position, Quaternion.identity);
+                var a = Instantiate(cardDeck.cardPrefab, handCard.cardSlotList[i].transform.position, Quaternion.identity);
                 a.transform.SetParent(handCard.cardSlotList[i].transform);
+
+                a.GetComponent<CardEntity>().createCard(cardDeck.cardList[cardDeck.cardList.Count - 1]);
                 cardDeck.cardList.RemoveAt(cardDeck.cardList.Count - 1);
-                a.GetComponent<CardEntity>().createCard(10001);
             }
             else
             {
                 //洗牌继续抽
                 for (int c = 0; c < usedCard.usedCardList.Count; c++)
                 {
-                    cardDeck.cardList.Add(cardDeck.cardPrefab);
+                    cardDeck.cardList.Add (usedCard.usedCardList[i]);
                 }
+               
                 usedCard.usedCardList.Clear();
-                var a = Instantiate(cardDeck.cardList[cardDeck.cardList.Count - 1], handCard.cardSlotList[i].transform.position, Quaternion.identity);
+                var a = Instantiate(cardDeck.cardPrefab, handCard.cardSlotList[i].transform.position, Quaternion.identity);
                 a.transform.SetParent(handCard.cardSlotList[i].transform);
-                
+
+                a.GetComponent<CardEntity>().createCard(cardDeck.cardList[cardDeck.cardList.Count - 1]);
                 cardDeck.cardList.RemoveAt(cardDeck.cardList.Count - 1);
-                a.GetComponent<CardEntity>().createCard(CardId.Instance.attack);
+                //a.GetComponent<CardEntity>().createCard(CardId.Instance.attack);
             }
         }
     }
-    public void ShuffleWithoutLosingCards()
+}
+   /* public void ShuffleWithoutLosingCards()
     {
         int k = 0;
         for (int i = 0; i < 6; i++)
@@ -133,4 +137,5 @@ public class TurnMaster : Singleton<TurnMaster>
 
         }
     }
-}
+
+*/

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

@@ -5,5 +5,5 @@ using UnityEngine;
 public class UsedCard : MonoBehaviour
 {
     public GameObject cardPrefab;
-    public List<GameObject> usedCardList;
+    public List<int> usedCardList;
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs

@@ -0,0 +1,8 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EnemyManager : Singleton<EnemyManager>
+{
+    public EnemyNode enemyNode;
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs

@@ -0,0 +1,23 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EnemyNode : MonoBehaviour
+{
+    public EnemyState_SO templateEnemyState;
+    public EnemyState_SO EnemyState;
+
+    public void Start()
+    {
+        //Éú³É½ÇÉ«Êý¾Ý
+        if (templateEnemyState != null)
+            EnemyState = Instantiate(templateEnemyState);
+
+        Invoke("StartPosition", 6f);
+    }
+
+    public void StartPosition()
+    {
+        this.transform.position = GameManager.Instance.X[EnemyState.positionX].Y[EnemyState.positionY].transform.position;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs.meta

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

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

@@ -0,0 +1,121 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[CreateAssetMenu(fileName = "New State", menuName = "Card/CardData")]
+
+public class CardData_SO : ScriptableObject
+{
+    public int cardId;
+
+    public int cost;
+
+    public string chineseName;
+
+    public int rarity;
+
+    public string[] function;
+
+    public string[] functionVal;
+
+    public int castingRange;
+
+    public int effectRange;
+
+    public int isDisposable;
+
+    public string[] advantageFunction;
+
+    public string[] advantageFunctionVal;
+
+    public int carType;
+
+    public string description;
+
+    public string imgPath;
+
+    public int CardId
+    {
+        get { return cardId; }
+        set { cardId = value; }
+    }
+
+
+    public int Cost
+    {
+        get { return cost; }
+        set { cost = value; }
+    }
+
+    public string ChineseName
+    {
+        get { return chineseName; }
+        set { chineseName = value; }
+    }
+
+    public int Rarity
+    {
+        get { return rarity; }
+        set { rarity = value; }
+    }
+
+    public string[] Function
+    {
+        get { return function; }
+        set { function = value; }
+    }
+
+    public string[] FunctionVal
+    {
+        get { return functionVal; }
+        set { functionVal = value; }
+    }
+
+    public int CastingRange
+    {
+        get { return castingRange; }
+        set { castingRange = value; }
+    }
+
+    public int EffectRange
+    {
+        get { return effectRange; }
+        set { effectRange = value; }
+    }
+
+    public bool IsDisposable
+    {
+        get { return isDisposable == 1; }
+        set { isDisposable = value ? 1 : 0; }
+    }
+
+    public string[] AdvantageFunction
+    {
+        get { return advantageFunction; }
+        set { advantageFunction = value; }
+    }
+
+    public string[] AdvantageFunctionVal
+    {
+        get { return advantageFunctionVal; }
+        set { advantageFunctionVal = value; }
+    }
+
+    public int CarType
+    {
+        get { return carType; }
+        set { carType = value; }
+    }
+
+    public string Description
+    {
+        get { return description; }
+        set { description = value; }
+    }
+
+    public string ImgPath
+    {
+        get { return imgPath; }
+        set { imgPath = value; }
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardData_SO/CardData_SO.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardData_SO/EnemyState_SO.cs

@@ -0,0 +1,19 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[CreateAssetMenu(fileName = "New State", menuName = "PlayerState/EnemyState")]
+public class EnemyState_SO : ScriptableObject
+{
+    public int positionX, positionY;//位置
+
+    public int maxStepRange;//步数
+
+    public int currentStepRange;
+
+    public int currentShieldValue;//护盾
+
+    public float maxHP;//血量
+
+    public float currentHP;
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardData_SO/EnemyState_SO.cs.meta

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

ColorlessWorld-2024-4-2/Assets/data/cardData.asset

@@ -0,0 +1,28 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 11d76858438cc3046b72ef2c7991cfe7, type: 3}
+  m_Name: cardData
+  m_EditorClassIdentifier: 
+  cardId: 0
+  cost: 0
+  chineseName: 
+  rarity: 0
+  function: []
+  functionVal: []
+  castingRange: 0
+  effectRange: 0
+  isDisposable: 0
+  advantageFunction: []
+  advantageFunctionVal: []
+  carType: 0
+  description: 
+  imgPath: 

ColorlessWorld-2024-4-2/Assets/data/cardData.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ffdc07f6b04b7ea4ca942c1d22367a8e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/data/card_data.csv

@@ -1,2 +1,3 @@
-ID,名称,费用,稀有度,功能,数值,施法范围,作用范围,消耗,优势功能,数值,卡牌类型,文本描述,图片路径
-10001,打击,1,1,1,2,0,0,0,0,0,1,,
+ID,名称,费用,稀有度,功能,数值,施法范围,作用范围,消耗,优势功能,数值,卡牌类型,文本描述,图片路径
+10001,打击,1,1,1,2,0,0,0,0,0,1,,
+10002,治疗,2,2,2,2,0,0,0,0,0,2,,