第二次合并代码

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

@@ -109,7 +109,6 @@ GameObject:
   - component: {fileID: 6042570540965326076}
   - component: {fileID: 7385599250693012335}
   - component: {fileID: 4793736772745952604}
-  - component: {fileID: 4344221442974234100}
   m_Layer: 5
   m_Name: Card
   m_TagString: Untagged
@@ -193,9 +192,6 @@ MonoBehaviour:
   ainPanle: {fileID: 4722556306121517745}
   currentNode: {fileID: 0}
   influencePreviewPool: []
-  mapGroundLayerMask:
-    serializedVersion: 2
-    m_Bits: 64
 --- !u!114 &6042570540965326076
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -240,18 +236,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9878eb734a9bb9e448c1a125b1e863e6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  cardOriginalData: {fileID: 0}
-  cardData: {fileID: 0}
   cardId: 0
---- !u!114 &4344221442974234100
+  originalParent: {fileID: 0}
-MonoBehaviour:
+  originalpoint: {x: 0, y: 0, z: 0}
-  m_ObjectHideFlags: 0
+  eventSystem: {fileID: 0}
-  m_CorrespondingSourceObject: {fileID: 0}
+  ainPanle: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
+  currentNode: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
+  influencePreviewPool: []
-  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,7 +802,6 @@ GameObject:
   - component: {fileID: 8067268704048347736}
   - component: {fileID: 2967471168845626985}
   - component: {fileID: 1131717685372222914}
-  - component: {fileID: 7437127433431600243}
   m_Layer: 5
   m_Name: Card_v01
   m_TagString: Untagged
@@ -880,7 +879,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3410471369990512392}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 80971e1d1b78104439c3472d4276e502, type: 3}
   m_Name: 
@@ -891,9 +890,6 @@ MonoBehaviour:
   ainPanle: {fileID: 1075869202937435496}
   currentNode: {fileID: 0}
   influencePreviewPool: []
-  mapGroundLayerMask:
-    serializedVersion: 2
-    m_Bits: 64
 --- !u!114 &8067268704048347736
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -938,21 +934,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9878eb734a9bb9e448c1a125b1e863e6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  cardOriginalData: {fileID: 0}
-  cardData: {fileID: 0}
   cardId: 0
---- !u!114 &7437127433431600243
+  originalParent: {fileID: 0}
-MonoBehaviour:
+  originalpoint: {x: 0, y: 0, z: 0}
-  m_ObjectHideFlags: 0
+  eventSystem: {fileID: 0}
-  m_CorrespondingSourceObject: {fileID: 0}
+  ainPanle: {fileID: 1075869202937435496}
-  m_PrefabInstance: {fileID: 0}
+  currentNode: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
+  influencePreviewPool: []
-  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

@@ -274,85 +274,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 27108910}
   m_CullTransparentMesh: 1
---- !u!1 &52892955
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 52892958}
-  - component: {fileID: 52892957}
-  - component: {fileID: 52892956}
-  m_Layer: 5
-  m_Name: Text (Legacy)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &52892956
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 52892955}
-  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, g: 0, b: 0, a: 1}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 0
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 35
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 0
-    m_MaxSize: 239
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: 1
---- !u!222 &52892957
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 52892955}
-  m_CullTransparentMesh: 1
---- !u!224 &52892958
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 52892955}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0.000000022352}
-  m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 504324360}
-  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.0000025332, y: 0.0000000074506}
-  m_SizeDelta: {x: 50, y: 50}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &82673845
 GameObject:
   m_ObjectHideFlags: 0
@@ -977,6 +898,37 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 197216735}
   m_CullTransparentMesh: 1
+--- !u!1 &208314014
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 208314015}
+  m_Layer: 0
+  m_Name: AbnormalCondition
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &208314015
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 208314014}
+  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: 2019229959}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &216708359
 GameObject:
   m_ObjectHideFlags: 0
@@ -2093,108 +2045,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   attack: 10001
---- !u!1 &456858065
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 456858066}
-  - component: {fileID: 456858069}
-  - component: {fileID: 456858068}
-  - component: {fileID: 456858067}
-  m_Layer: 5
-  m_Name: StapCanvas
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &456858066
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 456858065}
-  m_LocalRotation: {x: -0, y: -0.70041114, z: 0.71373963, w: 0}
-  m_LocalPosition: {x: 0, y: 0, z: -5.29}
-  m_LocalScale: {x: 7, y: 5.818175, z: 0.7002189}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1320912959}
-  m_Father: {fileID: 1406908584}
-  m_LocalEulerAnglesHint: {x: 61, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -5.27, y: 0.392}
-  m_SizeDelta: {x: 1, y: 1}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &456858067
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 456858065}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
---- !u!114 &456858068
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 456858065}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
-  m_ReferencePixelsPerUnit: 1
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 1
---- !u!223 &456858069
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 456858065}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 330585545}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_UpdateRectTransformForStandalone: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
 --- !u!1 &468997172
 GameObject:
   m_ObjectHideFlags: 0
@@ -2606,82 +2456,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0ddfb517f3ae49c42b2c7ff57e12f8d8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1 &504324359
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 504324360}
-  - component: {fileID: 504324362}
-  - component: {fileID: 504324361}
-  m_Layer: 5
-  m_Name: StepPanel
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &504324360
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 504324359}
-  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: 52892958}
-  m_Father: {fileID: 1435541146}
-  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: 0.5, y: 0.5}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &504324361
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 504324359}
-  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: 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 &504324362
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 504324359}
-  m_CullTransparentMesh: 1
 --- !u!1 &514899946
 GameObject:
   m_ObjectHideFlags: 0
@@ -5021,7 +4795,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 34479ee20dc78fb49927983a85316eb8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  templateardData_SO: {fileID: 11400000, guid: ffdc07f6b04b7ea4ca942c1d22367a8e, type: 2}
 --- !u!1 &1171367442
 GameObject:
   m_ObjectHideFlags: 0
@@ -5278,85 +5051,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 952604643}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1226812836
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1226812839}
-  - component: {fileID: 1226812838}
-  - component: {fileID: 1226812837}
-  m_Layer: 5
-  m_Name: Text (Legacy)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &1226812837
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1226812836}
-  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, g: 0, b: 0, a: 1}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 0
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 35
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 0
-    m_MaxSize: 239
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: 1
---- !u!222 &1226812838
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1226812836}
-  m_CullTransparentMesh: 1
---- !u!224 &1226812839
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1226812836}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0.000000022352}
-  m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 1320912959}
-  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.0000025332, y: 0.0000000074506}
-  m_SizeDelta: {x: 50, y: 50}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1229558973
 GameObject:
   m_ObjectHideFlags: 0
@@ -6256,82 +5950,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1320647294}
   m_CullTransparentMesh: 1
---- !u!1 &1320912958
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1320912959}
-  - component: {fileID: 1320912961}
-  - component: {fileID: 1320912960}
-  m_Layer: 5
-  m_Name: StepPanel
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1320912959
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1320912958}
-  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: 1226812839}
-  m_Father: {fileID: 456858066}
-  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: 0.5, y: 0.5}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1320912960
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1320912958}
-  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: 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 &1320912961
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1320912958}
-  m_CullTransparentMesh: 1
 --- !u!1 &1406908583
 GameObject:
   m_ObjectHideFlags: 0
@@ -6367,7 +5985,6 @@ Transform:
   m_Children:
   - {fileID: 1800977356}
   - {fileID: 1896503657}
-  - {fileID: 456858066}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 30.08, y: 180, z: 0}
 --- !u!114 &1406908585
@@ -6435,7 +6052,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   HPBar: {fileID: 1098221465}
-  stepText: {fileID: 1226812837}
 --- !u!1 &1433470489
 GameObject:
   m_ObjectHideFlags: 0
@@ -6512,108 +6128,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1433470489}
   m_CullTransparentMesh: 1
---- !u!1 &1435541145
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1435541146}
-  - component: {fileID: 1435541149}
-  - component: {fileID: 1435541148}
-  - component: {fileID: 1435541147}
-  m_Layer: 5
-  m_Name: StapCanvas
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1435541146
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1435541145}
-  m_LocalRotation: {x: -0, y: -0.70041114, z: 0.7137397, w: 0}
-  m_LocalPosition: {x: 0, y: 0, z: -6.33}
-  m_LocalScale: {x: 7, y: 5.818174, z: 0.7002188}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 504324360}
-  m_Father: {fileID: 1697565456}
-  m_LocalEulerAnglesHint: {x: 61, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -6.19, y: 0.382}
-  m_SizeDelta: {x: 1, y: 1}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1435541147
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1435541145}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
---- !u!114 &1435541148
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1435541145}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
-  m_ReferencePixelsPerUnit: 1
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 1
---- !u!223 &1435541149
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1435541145}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 330585545}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_UpdateRectTransformForStandalone: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
 --- !u!1 &1485850293
 GameObject:
   m_ObjectHideFlags: 0
@@ -7323,7 +6837,6 @@ Transform:
   m_Children:
   - {fileID: 544861405}
   - {fileID: 682606416}
-  - {fileID: 1435541146}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 30.08, y: 180, z: 0}
 --- !u!114 &1697565457
@@ -7375,7 +6888,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   HPBar: {fileID: 1241159476}
-  stepText: {fileID: 52892956}
 --- !u!1 &1704571197
 GameObject:
   m_ObjectHideFlags: 0
@@ -9015,6 +8527,38 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1983891394}
   m_CullTransparentMesh: 1
+--- !u!1 &2019229958
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2019229959}
+  m_Layer: 0
+  m_Name: Tools
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2019229959
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2019229958}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 3.4023416, y: -0.40519047, z: 3.0697613}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 208314015}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2050905749
 GameObject:
   m_ObjectHideFlags: 0
@@ -9386,3 +8930,4 @@ SceneRoots:
   - {fileID: 662569098}
   - {fileID: 490441552}
   - {fileID: 130569072}
+  - {fileID: 2019229959}

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

@@ -9,21 +9,20 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
 {
     // public Vector3 OriginTransform;
     //private Vector3 EndTransform;
-    [Header ("拖拽参数")]
+    [Header("拖拽参数")]
     public Transform originalParent;
     public Vector3 originalpoint;
     public EventSystem eventSystem;
-   
+
-    [Header ("贝塞尔曲线瞄准")]
+    [Header("贝塞尔曲线瞄准")]
     public GameObject ainPanle;
 
     [Header("影响格参数")]
     public MapUnity currentNode;//瞄准的格子
     public List<MapUnity> influencePreviewPool;
 
-    [Header("层级检测")]
+    //[Header("卡牌属性")]
-    public LayerMask mapGroundLayerMask ;
+
-    
     void Start()
     {
         eventSystem = GameObject.FindObjectOfType<EventSystem>();
@@ -36,17 +35,20 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
     }
     public void OnBeginDrag(PointerEventData eventData)
     {
-       // if (GameObject.Find("CardPanel") != null)
+        // if (GameObject.Find("CardPanel") != null)
-       //     graphicRaycaster = GameObject.Find("CardPanel").GetComponent<GraphicRaycaster>();
+        //     graphicRaycaster = GameObject.Find("CardPanel").GetComponent<GraphicRaycaster>();
 
         GetComponent<CanvasGroup>().blocksRaycasts = false;
-         
+
         originalParent = this.gameObject.transform.parent;
         originalpoint = this.transform.localPosition;
 
         transform.SetParent(transform.parent.parent);
         transform.position = eventData.position;
 
+        //根据卡牌数据决定是否调用曲线
+
+
         ainPanle.SetActive(true);
 
         //todo-统一确定锚点位置
@@ -69,17 +71,17 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
         // if (eventData.pointerCurrentRaycast.gameObject != null)
         //  Debug.Log(eventData.pointerCurrentRaycast.gameObject.name);
 
-       
+
 
         //射线检测瞄准的地图节点，判断是否可放置和改变放置影响区
         Ray ray = Camera.main.ScreenPointToRay(Mouse.current.position.value);
-        if(eventData .pointerCurrentRaycast.gameObject!=null)
+        if (eventData.pointerCurrentRaycast.gameObject != null)
         {
-            if (Physics.Raycast(ray, out RaycastHit raycastHit,500,mapGroundLayerMask.value ))
+            if (Physics.Raycast(ray, out RaycastHit raycastHit))
             {
                 // 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++)
                     {
@@ -87,11 +89,11 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
                     }
                     influencePreviewPool.Clear();
                     currentNode = raycastHit.collider.transform.GetComponent<MapUnity>();
-                    Debug.Log(raycastHit.collider.transform.name);
+
                     //重新调用范围预览
                     GameManager.Instance.player.StepPreviewInfluencedNode(1);
                     //预览影响范围
-                    if (currentNode != null && currentNode.influenced)
+                    if (currentNode.influenced)
                     {
                         //根据卡牌属性改变影响池  
                         influencePreviewPool.Add(currentNode);
@@ -154,13 +156,13 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
                 }
             }
         }
-       
+
     }
 
 
     public void OnEndDrag(PointerEventData eventData)
     {
-        if(eventData .pointerCurrentRaycast.gameObject!=null )
+        if (eventData.pointerCurrentRaycast.gameObject != null)
         {
             if (eventData.pointerCurrentRaycast.gameObject.name == "Card")
             {
@@ -202,7 +204,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
         ainPanle.SetActive(false);//关闭贝塞尔曲线
 
         //检测碰撞的地图节点是否被影响（可释放）
-        if (currentNode == null|| currentNode.influenced==false)
+        if (currentNode == null || currentNode.influenced == false)
         {
             //遍历范围预览池消除影响色
             for (int i = 0; i < GameManager.Instance.player.influencePreviewPool.Count; i++)
@@ -221,13 +223,13 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
             //临时效果--将颜色变成玩家颜色
             for (int i = 0; i < influencePreviewPool.Count; i++)
             {
-                influencePreviewPool[i].whoColour = MapUnity.WhoColour .playerColour;
+                influencePreviewPool[i].whoColour = MapUnity.WhoColour.playerColour;
                 //造成伤害
-                if(influencePreviewPool[i].enemyNode !=null )
+                if (influencePreviewPool[i].enemyNode != null)
                 {
                     influencePreviewPool[i].enemyNode.EnemyState.currentHP -= 50;
                     Debug.Log(influencePreviewPool[i].enemyNode.EnemyState.currentHP);
-                    if(influencePreviewPool[i].enemyNode.EnemyState.currentHP<=0)
+                    if (influencePreviewPool[i].enemyNode.EnemyState.currentHP <= 0)
                     {
                         influencePreviewPool[i].enemyNode.OnDeath();
                     }
@@ -250,10 +252,10 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
             GameManager.Instance.player.influencePreviewPool.Clear();
 
             //临时效果--将其加入墓地并销毁实体
-            TurnMaster.Instance.usedCard.usedCardList.Add(this.gameObject.GetComponent <CardEntity>().CardId );
+            TurnMaster.Instance.usedCard.usedCardList.Add(this.gameObject.GetComponent<CardEntity>().CardId);
             Destroy(this.gameObject);
         }
-        
+
 
         GetComponent<CanvasGroup>().blocksRaycasts = true;
 
@@ -262,7 +264,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
         transform.localPosition = originalpoint;
         return;
     }
-   
+
 }
 
 

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

@@ -1,12 +1,15 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using Unity.VisualScripting;
 using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.InputSystem;
 
-public class CardEntity : MonoBehaviour
+public class CardEntity : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler
 {
-    public CardData_SO cardOriginalData;
+    public CardOriginalData cardOriginalData;
-    public CardOriginalData cardData;
+    //public CardOriginalData cardData;
 
     public int cardId;
     public int CardId
@@ -15,15 +18,62 @@ public class CardEntity : MonoBehaviour
         set { cardId = value; }
     }
 
+    // public Vector3 OriginTransform;
+    //private Vector3 EndTransform;
+    [Header("拖拽参数")]
+    public Transform originalParent;
+    public Vector3 originalpoint;
+    public EventSystem eventSystem;
+    bool canUse=true;//决定卡牌是否可以释放
+    bool choosed;//标识卡牌是否被选中
+
+    [Header("贝塞尔曲线瞄准")]
+    public GameObject ainPanle;
+
+    [Header("影响格参数")]
+    public MapUnity currentNode;//瞄准的格子
+    public List<MapUnity> influencePreviewPool;//卡牌的影响范围
+
     public void Start()
     {
-      cardData = GetComponent<CardOriginalData>();
+        //cardData = GetComponent<CardOriginalData>();
+        eventSystem = GameObject.FindObjectOfType<EventSystem>(); 
+    }
+    private void Update()
+    {
+        //右键取消释放
+        if (choosed && Mouse.current.rightButton.wasPressedThisFrame)
+        {
+            Debug.Log("1");
+            canUse = false;//取消释放
+            ainPanle.SetActive(false);
+            //遍历范围预览池消除影响色
+            for (int i = 0; i < GameManager.Instance.player.influencePreviewPool.Count; i++)
+            {
+                GameManager.Instance.player.influencePreviewPool[i].influenced = false;
+            }
+            GameManager.Instance.player.influencePreviewPool.Clear();
+            //遍历影响池变色
+            for (int i = 0; i < influencePreviewPool.Count; i++)
+            {
+                influencePreviewPool[i].influenced = false;
+            }
+            influencePreviewPool.Clear();
+
+
+            //其他位置都归位
+            transform.SetParent(originalParent);
+            transform.localPosition = originalpoint;
+            GetComponent<CanvasGroup>().blocksRaycasts = true;
+            return;
+        }
     }
 
     public void createCard(int cardId)
     {
         this.cardId = cardId;
-        cardOriginalData = CardOriginalDataList.cardOriginalDataList[cardId];
+        Debug.Log(cardId + "-" + CardOriginalDataList.Instance.cardOriginalDataList[cardId]);
+        cardOriginalData = CardOriginalDataList.Instance.cardOriginalDataList[cardId];
         settleForStart(SettlementManager.settleTurn);
     }
 
@@ -31,15 +81,7 @@ public class CardEntity : MonoBehaviour
     public void use()
     {
         settle(0);
-        /*if (cardOriginalData.CastingRange == 0) 
+
-        {
-          //作用坐标为自身        
-        }
-        else
-        {
-          //玩家选择的作用坐标
-        }
-        settle(SettlementManager.settleTurn);*/
 
     }
     //卡牌效果的结算
@@ -50,11 +92,75 @@ public class CardEntity : MonoBehaviour
             switch (cardOriginalData.Function[i])
             {
                 case CardFunction.cardDamage:
-                    Usermanager.Instance.Health = Usermanager.Instance.Health - int.Parse(cardOriginalData.FunctionVal[i]);
+                    damageWork(int.Parse(cardOriginalData.FunctionVal[i]));
+                    break;
+                case CardFunction.cardShield:
+                    Usermanager.Instance.Shield = Usermanager.Instance.Shield + int.Parse(cardOriginalData.FunctionVal[i]);
                     break;
+                case CardFunction.posion:
+                case CardFunction.weak:
+                case CardFunction.coma:
+                case CardFunction.disarm:
+                case CardFunction.sleep:
+                case CardFunction.bleed:
+                case CardFunction.thorn:
+                    abnormalConditionWork(cardOriginalData.Function[i], int.Parse(cardOriginalData.FunctionVal[i]));
+                    break;
+                case CardFunction.costRestore:
+                    break;
+                case CardFunction.dyeing:
+                    Debug.Log("功能是：" + cardOriginalData.Function[1]);
+                    dyeingWork();
+                    break;
+            }
+        }
+
+    }
+
+    public void abnormalConditionWork(string condition, int stackVak)
+    {
+        for (int i = 0; i < influencePreviewPool.Count; i++)
+        {
+            //施加负面
+            if (influencePreviewPool[i].enemyNode != null)
+            {
+                influencePreviewPool[i].enemyNode.sufferAbnormalCondition(condition, stackVak);
             }
         }
     }
+
+    private void damageWork(int damageVal)
+    {
+        for (int i = 0; i < influencePreviewPool.Count; i++)
+        {
+            //造成伤害
+            if (influencePreviewPool[i].enemyNode != null)
+            {
+                influencePreviewPool[i].enemyNode.sufferDamage(damageVal);
+            }
+        }
+    }
+
+    private void dyeingWork()
+    {
+        Debug.Log(influencePreviewPool.Count);
+        for (int i = 0; i < influencePreviewPool.Count; i++)
+        {
+            influencePreviewPool[i].whoColour = MapUnity.WhoColour.playerColour;
+        }
+    }
+
+    private void dyeing()
+    {
+        //遍历影响池变色
+        for (int i = 0; i < influencePreviewPool.Count; i++)
+        {
+            influencePreviewPool[i].influenced = true;
+            influencePreviewPool[i].choossedMark.GetComponent<Renderer>().material = influencePreviewPool[i].yellow;
+        }
+    }
+
+
     //生成卡牌时候遗物的结算
     public void settleForStart(int settleTurn)
     {
@@ -65,4 +171,266 @@ public class CardEntity : MonoBehaviour
     {
 
     }
+
+    public void OnBeginDrag(PointerEventData eventData)
+    {
+        // if (GameObject.Find("CardPanel") != null)
+        //     graphicRaycaster = GameObject.Find("CardPanel").GetComponent<GraphicRaycaster>();
+        choosed = true;
+
+        GetComponent<CanvasGroup>().blocksRaycasts = false;
+
+        originalParent = this.gameObject.transform.parent;
+        originalpoint = this.transform.localPosition;
+
+        transform.SetParent(transform.parent.parent);
+        transform.position = eventData.position;
+
+        //根据卡牌数据决定是否调用曲线
+        if (cardOriginalData.CastingRange != 0)
+        {
+            //释放范围为0则不需要调用曲线
+            ainPanle.SetActive(true);
+        }
+        else
+        {
+            ainPanle.SetActive(false);
+        }
+
+
+
+
+        //todo-统一确定锚点位置
+
+        //重新调用范围预览--以后要写到卡牌效果里，现在默认影响1格
+        //GameManager.Instance.player.StepPreviewInfluencedNode(1);
+    }
+
+    public void OnDrag(PointerEventData eventData)
+    {
+      
+        if (cardOriginalData.CastingRange != 0)
+        {
+            ainPanleWork(eventData);
+        }
+        else
+        {
+            //没有范围不需要射线吧，因为不需要指定目标点？
+           // noAinPanleWork(eventData);
+        }
+        dyeing();
+
+    }
+
+    private void ainPanleWork(PointerEventData eventData)
+    {
+        //射线检测瞄准的地图节点，判断是否可放置和改变放置影响区
+        Ray ray = Camera.main.ScreenPointToRay(Mouse.current.position.value);
+        if (eventData.pointerCurrentRaycast.gameObject != null)
+        {
+            if (Physics.Raycast(ray, out RaycastHit raycastHit))
+            {
+                // Debug.Log(raycastHit.collider.gameObject.name);
+                //检测到跟上次瞄准地方不同，更新
+                if (currentNode == null || raycastHit.collider.transform.gameObject != currentNode.gameObject)
+                {
+                    for (int i = 0; i < influencePreviewPool.Count; i++)
+                    {
+                        influencePreviewPool[i].influenced = false;
+                    }
+                    influencePreviewPool.Clear();
+                    currentNode = raycastHit.collider.transform.GetComponent<MapUnity>();
+
+                    //重新调用范围预览
+                    GameManager.Instance.player.StepPreviewInfluencedNode(cardOriginalData.CastingRange);
+                    Debug.Log(cardOriginalData.CastingRange);
+                    //预览影响范围
+                    if (currentNode.influenced)
+                    {
+                        //根据卡牌属性改变影响池  
+                        influencePreviewPool.Add(currentNode);
+                        Vector3 face = currentNode.transform.position - GameManager.Instance.playerOn.transform.position;
+                        float euler = Vector3.SignedAngle(-GameManager.Instance.playerOn.transform.forward, face, GameManager.Instance.playerOn.transform.up) + 180;
+                        Debug.Log(euler);
+                        if (euler > 0 && euler < 45)
+                        {
+                            if (currentNode.unitPool[0] != null)
+                                influencePreviewPool.Add(currentNode.unitPool[0]);
+                            if (currentNode.unitPool[4] != null)
+                                influencePreviewPool.Add(currentNode.unitPool[4]);
+                        }
+                        else if (euler > 45 && euler < 135)
+                        {
+                            if (currentNode.unitPool[1] != null)
+                                influencePreviewPool.Add(currentNode.unitPool[1]);
+                            if (currentNode.unitPool[5] != null)
+                                influencePreviewPool.Add(currentNode.unitPool[5]);
+                        }
+                        else if (euler > 135 && euler < 180)
+                        {
+                            if (currentNode.unitPool[2] != null)
+                                influencePreviewPool.Add(currentNode.unitPool[2]);
+                            if (currentNode.unitPool[0] != null)
+                                influencePreviewPool.Add(currentNode.unitPool[0]);
+                        }
+                        else if (euler > 180 && euler < 225)
+                        {
+                            if (currentNode.unitPool[1] != null)
+                                influencePreviewPool.Add(currentNode.unitPool[1]);
+                            if (currentNode.unitPool[3] != null)
+                                influencePreviewPool.Add(currentNode.unitPool[3]);
+                        }
+                        else if (euler > 225 && euler < 315)
+                        {
+                            if (currentNode.unitPool[2] != null)
+                                influencePreviewPool.Add(currentNode.unitPool[2]);
+                            if (currentNode.unitPool[4] != null)
+                                influencePreviewPool.Add(currentNode.unitPool[4]);
+                        }
+                        else if (euler > 315 && euler < 360)
+                        {
+                            if (currentNode.unitPool[3] != null)
+                                influencePreviewPool.Add(currentNode.unitPool[3]);
+                            if (currentNode.unitPool[5] != null)
+                                influencePreviewPool.Add(currentNode.unitPool[5]);
+                        }
+                        //influencePreviewPool.Add(currentNode);
+
+
+                    }
+
+
+                }
+            }
+        }
+        Debug.Log("结束影响数值" + influencePreviewPool.Count);
+    }
+
+    private void noAinPanleWork(PointerEventData eventData)
+    {
+
+        Ray ray = Camera.main.ScreenPointToRay(Mouse.current.position.value);
+        if (eventData.pointerCurrentRaycast.gameObject != null)
+        {
+            if (Physics.Raycast(ray, out RaycastHit raycastHit))
+            {
+                currentNode = raycastHit.collider.transform.GetComponent<MapUnity>();
+                influencePreviewPool.Add(currentNode);
+            }
+        }
+    }
+
+
+    public void OnEndDrag(PointerEventData eventData)
+    {
+        choosed = false;
+        if(canUse )
+        {
+            Debug.Log("进入影响数值" + influencePreviewPool.Count);
+            if (eventData.pointerCurrentRaycast.gameObject != null)
+            {
+                if (eventData.pointerCurrentRaycast.gameObject.name == "Card")
+                {
+                    transform.SetParent(eventData.pointerCurrentRaycast.gameObject.transform.parent);
+                    transform.position = eventData.pointerCurrentRaycast.gameObject.transform.position;
+                    eventData.pointerCurrentRaycast.gameObject.transform.position = originalParent.position;
+                    eventData.pointerCurrentRaycast.gameObject.transform.SetParent(originalParent);
+
+                    GetComponent<CanvasGroup>().blocksRaycasts = true;
+
+                    ainPanle.SetActive(false);//关闭贝塞尔曲线
+                                              //遍历范围预览池消除影响色
+                    for (int i = 0; i < GameManager.Instance.player.influencePreviewPool.Count; i++)
+                    {
+                        GameManager.Instance.player.influencePreviewPool[i].influenced = false;
+                    }
+                    //GameManager.Instance.player.influencePreviewPool.Clear();
+
+                    return;
+                }
+                else if (eventData.pointerCurrentRaycast.gameObject.name == "cardSlot")
+                {
+                    transform.SetParent(eventData.pointerCurrentRaycast.gameObject.transform);
+                    transform.position = eventData.pointerCurrentRaycast.gameObject.transform.position;
+                    GetComponent<CanvasGroup>().blocksRaycasts = true;
+
+                    ainPanle.SetActive(false);//关闭贝塞尔曲线
+                                              //遍历范围预览池消除影响色
+                    for (int i = 0; i < GameManager.Instance.player.influencePreviewPool.Count; i++)
+                    {
+                        GameManager.Instance.player.influencePreviewPool[i].influenced = false;
+                    }
+                    //GameManager.Instance.player.influencePreviewPool.Clear();
+
+                    return;
+                }
+            }
+            if (ainPanle.activeSelf)
+            {
+                ainPanle.SetActive(false);//关闭贝塞尔曲线
+            }
+
+            //先判断该卡牌的类型是否是需要范围
+            if (cardOriginalData.CastingRange != 0)
+            {
+                //检测碰撞的地图节点是否被影响（可释放）
+                if (currentNode == null || currentNode.influenced == false)
+                {
+                    //遍历范围预览池消除影响色（红色，卡牌的释放范围）
+                    for (int i = 0; i < GameManager.Instance.player.influencePreviewPool.Count; i++)
+                    {
+                        GameManager.Instance.player.influencePreviewPool[i].influenced = false;
+                    }
+                    //GameManager.Instance.player.influencePreviewPool.Clear();
+                }
+                else if (currentNode.influenced)
+                {
+
+                    //卡牌释放效果
+                    use();
+                    Debug.Log("玩家盾量：" + Usermanager.Instance.Shield);
+
+                    //临时效果--将其加入墓地并销毁实体
+                    TurnMaster.Instance.usedCard.usedCardList.Add(this.gameObject.GetComponent<CardEntity>().CardId);
+                    Destroy(this.gameObject);
+                }
+                //遍历范围预览池消除影响色
+                for (int i = 0; i < GameManager.Instance.player.influencePreviewPool.Count; i++)
+                {
+                    GameManager.Instance.player.influencePreviewPool[i].influenced = false;
+                }
+                GameManager.Instance.player.influencePreviewPool.Clear();
+                //遍历影响池变色
+                for (int i = 0; i < influencePreviewPool.Count; i++)
+                {
+                    influencePreviewPool[i].influenced = false;
+                }
+                influencePreviewPool.Clear();
+                GetComponent<CanvasGroup>().blocksRaycasts = true;
+
+                //其他位置都归位
+                transform.SetParent(originalParent);
+                transform.localPosition = originalpoint;
+                return;
+            }//范围类，需要指定被影响的节点才能释放
+            else
+            {
+                //卡牌释放效果
+                use();
+                Debug.Log("玩家盾量：" + Usermanager.Instance.Shield);
+
+                //临时效果--将其加入墓地并销毁实体
+                TurnMaster.Instance.usedCard.usedCardList.Add(this.gameObject.GetComponent<CardEntity>().CardId);
+                Destroy(this.gameObject);
+
+                return;
+
+            }//无范围类，直接释放
+
+        }
+        else
+        {
+            canUse = true;
+        }
+    }
 }

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 : MonoBehaviour
+public class CardOriginalData : System.Object
 {
     private int cardId;
 

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

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

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

@@ -47,10 +47,12 @@ public class TurnMaster : Singleton<TurnMaster>
 
         if (turn == Turn.enemyTurn)
         {
-            //敌人动作如移动，涂色
+            //敌人动作如移动，涂色   
             EnemyManager.Instance.EnemyMove_Observer();
             EnemyManager.Instance.EnemyColour_Observer();
 
+            EnemyManager.Instance.enemyTurnSettle(0);
+
             EndEnemyTurn();
         }
 

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

@@ -31,6 +31,7 @@ public class EnemyManager : Singleton<EnemyManager>
         foreach (var observer in enemyObservers)
         {
             observer.EnemyMove();
+            observer.GetEnemyNode().bleedSettle();
         }
     }
     public void EnemySkillCoolDown_Observer()
@@ -40,4 +41,13 @@ public class EnemyManager : Singleton<EnemyManager>
             observer.SettlementSkill();
         }
     }
+
+    public void enemyTurnSettle(int settleTurn)
+    {
+        foreach (var observer in enemyObservers)
+        {
+            observer.GetEnemyNode().enemyTurnSettleInit();
+            observer.GetEnemyNode().enemyTurnSettle(settleTurn);
+        }
+    }
 }

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

@@ -1,5 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
+using System.Xml;
 using UnityEngine;
 
 public class EnemyNode : MonoBehaviour,IEnemyObserver
@@ -147,5 +149,154 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
 
     }
 
-   
+    //老吊写的应用函数
+    public void sufferAbnormalCondition(string condition, int value)
+    {
+        if (EnemyState.abnormalCondition.ContainsKey(condition))
+        {
+            int beforeval = EnemyState.abnormalCondition[condition];
+            int afterval = beforeval + value;
+            EnemyState.abnormalCondition[condition] = afterval;
+        }
+        else
+        {
+            EnemyState.abnormalCondition[condition] = value;
+        }
+        Debug.Log("异常层数" + EnemyState.abnormalCondition[condition]);
+    }
+
+    public void sufferDamage(int damageVal)
+    {
+        EnemyState.currentHP -= damageVal;
+        Debug.Log("敌人血量" + EnemyState.currentHP);
+        if (EnemyState.currentHP <= 0)
+        {
+            OnDeath();
+        }
+    }
+
+    public void enemyTurnSettleInit()
+    {
+        EnemyState.damageMultiplier = 1;
+        EnemyState.stepRangeMultiplier = 1;
+    }
+
+
+    public void enemyTurnSettle(int settleTurn)
+    {
+        foreach (var key in EnemyState.abnormalCondition.Keys.ToList())
+        {
+            switch (key)
+            {
+                case AbnormalCondition.posion:
+                    posionSettle(EnemyState.abnormalCondition[key]);
+                    break;
+                case AbnormalCondition.weak:
+                    weakSettle(EnemyState.abnormalCondition[key]);
+                    break;
+                case AbnormalCondition.coma:
+                    comaSettle(EnemyState.abnormalCondition[key]);
+                    break;
+                case AbnormalCondition.disarm:
+                    disarmSettle(EnemyState.abnormalCondition[key]);
+                    break;
+                case AbnormalCondition.sleep:
+                    sleepSettle(EnemyState.abnormalCondition[key]);
+                    break;
+                case AbnormalCondition.bleed:
+                    //bleedSettle(EnemyState.abnormalCondition[key]);
+                    break;
+                case AbnormalCondition.thorn:
+                    thornSettle(EnemyState.abnormalCondition[key]);
+                    break;
+            }
+            abnormalConditionEndCheck();
+        }
+        /*for(int i=0;i< EnemyState.abnormalCondition.Count; i++)
+        {
+            switch (EnemyState.abnormalCondition[i].key)
+            {
+                case AbnormalCondition.posion:
+                    posionSettle(kvp.Value);
+                    break;
+                case AbnormalCondition.weak:
+                    weakSettle(kvp.Value);
+                    break;
+                case AbnormalCondition.coma:
+                    comaSettle(kvp.Value);
+                    break;
+                case AbnormalCondition.disarm:
+                    disarmSettle(kvp.Value);
+                    break;
+                case AbnormalCondition.sleep:
+                    sleepSettle(kvp.Value);
+                    break;
+                case AbnormalCondition.bleed:
+                    bleedSettle(kvp.Value);
+                    break;
+                case AbnormalCondition.thorn:
+                    thornSettle(kvp.Value);
+                    break;
+            }
+        }*/
+    }
+
+    private void posionSettle(int posionStack)
+    {
+        sufferDamage(posionStack);
+        EnemyState.abnormalCondition[AbnormalCondition.posion]--;
+    }
+
+
+    private void weakSettle(int weakStack)
+    {
+        EnemyState.damageMultiplier = 0.75;
+        EnemyState.abnormalCondition[AbnormalCondition.weak]--;
+    }
+
+
+    private void comaSettle(int comaStack)
+    {
+        EnemyState.damageMultiplier = 0;
+        EnemyState.stepRangeMultiplier = 0;
+        EnemyState.abnormalCondition[AbnormalCondition.coma]--;
+    }
+
+    private void disarmSettle(int disarmStack)
+    {
+        EnemyState.damageMultiplier = 0;
+        EnemyState.abnormalCondition[AbnormalCondition.disarm]--;
+    }
+
+    private void sleepSettle(int sleepStack)
+    {
+        EnemyState.damageMultiplier = 0;
+        EnemyState.stepRangeMultiplier = 0;
+    }
+
+    public void bleedSettle()
+    {
+        if (EnemyState.abnormalCondition.TryGetValue(AbnormalCondition.bleed, out int stack))
+        {
+            sufferDamage(2);
+            EnemyState.abnormalCondition[AbnormalCondition.bleed] = stack - 1;
+        }
+
+    }
+
+    private void thornSettle(int thornStack)
+    {
+
+    }
+
+    private void abnormalConditionEndCheck()
+    {
+        foreach (var key in EnemyState.abnormalCondition.Keys.ToList())
+        {
+            if (EnemyState.abnormalCondition[key] <= 0)
+            {
+                EnemyState.abnormalCondition.Remove(key);
+            }
+        }
+    }
 }

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

@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class AbnormalCondition : Singleton<AbnormalCondition>
+{
+    //中毒
+    public const string posion = "4";
+    //虚弱
+    public const string weak = "5";
+    //昏迷
+    public const string coma = "6";
+    //缴械
+    public const string disarm = "7";
+    //睡眠
+    public const string sleep = "8";
+    //流血
+    public const string bleed = "9";
+    //荆棘
+    public const string thorn = "10";
+}

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

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b11a487f21e55274181e172db1955ef0
+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

@@ -6,15 +6,22 @@ using UnityEngine;
 public class EnemyState_SO : ScriptableObject
 {
     public int stepRange;//步数
+    public double stepRangeMultiplier = 1;//步数系数
 
     public int shieldValue;//护盾
 
     public float maxHP;//血量
 
-    public float currentHP;
+    public float currentHP;//当前血量
 
     public int colourType;//涂色类型，0为不涂色
 
     public int maxSkillCoolDown;//技能冷却
     public int currentSkillCoolDown;//技能冷却
+
+    public Dictionary<string, int> abnormalCondition = new Dictionary<string, int>();//异常状态
+
+    public double damageMultiplier = 1;//攻击力系数
+
+    public int damage;//攻击力
 }

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

@@ -2,13 +2,36 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
- public  class CardFunction
+public class CardFunction
 {
+    //伤害
     public const string cardDamage = "1";
+    //护盾
+    public const string cardShield = "2";
+    //生成草地
+    public const string createGrassGroud = "3";
+    //中毒
+    public const string posion = "4";
+    //虚弱
+    public const string weak = "5";
+    //昏迷
+    public const string coma = "6";
+    //缴械
+    public const string disarm = "7";
+    //睡眠
+    public const string sleep = "8";
+    //流血
+    public const string bleed = "9";
+    //荆棘
+    public const string thorn = "10";
+    //回复能量
+    public const string costRestore = "11";
+    //抽牌
+    public const string drawCard = "12";
+    //弃牌
+    public const string discard = "13";
+    //染色
+    public const string dyeing = "14";
+
 
-    public static string CardDamage()
-    {
-        return cardDamage;
-    }
-    
 }

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

@@ -6,7 +6,7 @@ using UnityEngine.UI;
 public class EnemyUIBar : MonoBehaviour
 {
     public Image HPBar;
-    public Text stepText;
+
 
     EnemyNode enemyNode;
 
@@ -17,6 +17,5 @@ public class EnemyUIBar : MonoBehaviour
     private void Update()
     {
         HPBar.fillAmount = enemyNode .EnemyState .currentHP /enemyNode .EnemyState .maxHP ;
-        stepText.text = enemyNode .EnemyState .stepRange .ToString ();
     }
 }

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

@@ -5,16 +5,19 @@ using UnityEngine;
 public class Usermanager : Singleton<Usermanager>
 {
     private int health;
-
+    private int shield;
     public int Health { get => health; set => health = value; }
+    public int Shield { get => shield; set => shield = value; }
 
     public Usermanager(int health)
     {
         Health = health;
+        Shield = 0;
     }
 
     public void Start()
     {
         health = 100;
+        Shield = 0;
     }
 }

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

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

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7cee1ff11519af74a857e0a4e5475750
+guid: dcf08d9f8e01b8f40a3615a26c19e29d
 TextScriptImporter:
   externalObjects: {}
   userData: 

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Assembly-CSharp-Editor.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Assembly-CSharp.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Assembly-CSharp.rsp

@@ -389,6 +389,7 @@
 "Assets/Scripts/MapUnity.cs"
 "Assets/Scripts/Player.cs"
 "Assets/Scripts/relics/RelicsEntity.cs"
+"Assets/Scripts/Tool/AbnormalCondition.cs"
 "Assets/Scripts/Tool/AStar/AStarManager.cs"
 "Assets/Scripts/Tool/AStar/AStarNode.cs"
 "Assets/Scripts/Tool/CardData_SO/CardData_SO.cs"

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/PPv2URPConverters.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/PPv2URPConverters.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.Burst.CodeGen.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.Burst.CodeGen.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.Burst.Editor.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.Burst.Editor.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.Burst.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.Burst.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.CollabProxy.Editor.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.CollabProxy.Editor.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.InputSystem.ForUI.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.InputSystem.ForUI.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.InputSystem.TestFramework.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.InputSystem.TestFramework.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.InputSystem.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.InputSystem.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.Mathematics.Editor.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.Mathematics.Editor.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.Mathematics.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.Mathematics.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.PlasticSCM.Editor.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.PlasticSCM.Editor.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.RenderPipeline.Universal.ShaderLibrary.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.RenderPipeline.Universal.ShaderLibrary.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.RenderPipelines.Core.Editor.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.RenderPipelines.Core.Editor.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.RenderPipelines.Core.Runtime.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.RenderPipelines.Core.Runtime.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.RenderPipelines.Core.ShaderLibrary.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.RenderPipelines.Core.ShaderLibrary.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.RenderPipelines.Universal.Config.Runtime.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.RenderPipelines.Universal.Config.Runtime.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.RenderPipelines.Universal.Editor.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.RenderPipelines.Universal.Editor.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.RenderPipelines.Universal.Runtime.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.RenderPipelines.Universal.Runtime.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.RenderPipelines.Universal.Shaders.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.RenderPipelines.Universal.Shaders.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.Rider.Editor.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.Rider.Editor.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.Searcher.Editor.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.Searcher.Editor.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.ShaderGraph.Editor.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.ShaderGraph.Editor.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.ShaderGraph.Utilities.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.ShaderGraph.Utilities.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.TextMeshPro.Editor.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.TextMeshPro.Editor.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.TextMeshPro.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.TextMeshPro.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.Timeline.Editor.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.Timeline.Editor.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.Timeline.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.Timeline.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.VSCode.Editor.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.VSCode.Editor.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.VisualScripting.Core.Editor.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.VisualScripting.Core.Editor.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.VisualScripting.Core.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.VisualScripting.Core.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.VisualScripting.Flow.Editor.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.VisualScripting.Flow.Editor.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.VisualScripting.Flow.UnityAdditionalFile.txt

@@ -1 +1 @@
-D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2
+D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2

ColorlessWorld-2024-4-2/Library/Bee/artifacts/1900b0aE.dag/Unity.VisualScripting.Flow.rsp2

@@ -1 +1 @@
-/pathmap:"D:\GitInventory_2024-5-28\test_45\ColorlessWorld-2024-4-2"=.
+/pathmap:"D:\GitInventory_0524\test_45\ColorlessWorld-2024-4-2"=.