敌人卡组ui0804

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

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

ColorlessWorld-2024-4-2/Assets/Prefab/EnemyCardPrefab/EnemyCard.prefab

@@ -0,0 +1,233 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2164375220746341275
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7844100700305095097}
+  - component: {fileID: 2698200776871774953}
+  - component: {fileID: 2632894681187877082}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7844100700305095097
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2164375220746341275}
+  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: 4708247228734791050}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0.000030517578, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2698200776871774953
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2164375220746341275}
+  m_CullTransparentMesh: 1
+--- !u!114 &2632894681187877082
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2164375220746341275}
+  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: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 100
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 108
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: X
+--- !u!1 &2851390917020499219
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4708247228734791050}
+  - component: {fileID: 700278776622380886}
+  - component: {fileID: 3824413123567589468}
+  m_Layer: 5
+  m_Name: DisMaskImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &4708247228734791050
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2851390917020499219}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.000056082215}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7844100700305095097}
+  m_Father: {fileID: 8013579619966043593}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0.000030517578, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &700278776622380886
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2851390917020499219}
+  m_CullTransparentMesh: 1
+--- !u!114 &3824413123567589468
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2851390917020499219}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.78431374}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5488427976241108427
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8013579619966043593}
+  - component: {fileID: 8778626249013257331}
+  - component: {fileID: 3750999967405702493}
+  m_Layer: 5
+  m_Name: EnemyCard
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8013579619966043593
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5488427976241108427}
+  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: 4708247228734791050}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 170, y: -170}
+  m_SizeDelta: {x: 200, y: 200}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8778626249013257331
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5488427976241108427}
+  m_CullTransparentMesh: 1
+--- !u!114 &3750999967405702493
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5488427976241108427}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1

ColorlessWorld-2024-4-2/Assets/Prefab/EnemyCardPrefab/EnemyCard.prefab.meta

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

ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/RelicReward.prefab

@@ -150,6 +150,156 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1940003937405211964
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6273709181233876595}
+  - component: {fileID: 4261442503438008653}
+  - component: {fileID: 3090777398203095122}
+  m_Layer: 0
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6273709181233876595
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1940003937405211964}
+  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: 73226582809733933}
+  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: 120.6}
+  m_SizeDelta: {x: 500, y: 5}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4261442503438008653
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1940003937405211964}
+  m_CullTransparentMesh: 1
+--- !u!114 &3090777398203095122
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1940003937405211964}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 2417b4f61de715a4bb4c632aeed5fd8b, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6645390030520431729
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6147733292761466666}
+  - component: {fileID: 366954496476915652}
+  - component: {fileID: 5126936418478906587}
+  m_Layer: 0
+  m_Name: Image (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6147733292761466666
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6645390030520431729}
+  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: 73226582809733933}
+  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: -120.1}
+  m_SizeDelta: {x: 500, y: 5}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &366954496476915652
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6645390030520431729}
+  m_CullTransparentMesh: 1
+--- !u!114 &5126936418478906587
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6645390030520431729}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 46214e882f723bd428dd16c48f15a94c, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &6978259832841498792
 GameObject:
   m_ObjectHideFlags: 0
@@ -392,6 +542,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8046344663846924764}
+  - {fileID: 6273709181233876595}
+  - {fileID: 6147733292761466666}
   m_Father: {fileID: 5883788949264027352}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
@@ -420,15 +572,15 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
+  m_Sprite: {fileID: 21300000, guid: 6f1a9652ce8517f42b2c19c45da9236e, type: 3}
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -518,7 +670,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -526,19 +678,19 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 9a3e41c5dbfbbf64e9816d4e123e3f77, type: 3}
     m_FontSize: 25
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 1
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: New Text
+  m_Text: "\u9057\u7269\u63CF\u8FF0"
 --- !u!1 &8550563113017744413
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -9090,7 +9090,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 8fd74ffa775b75741a21abd9250e2767, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 0a1daf24126ecb54e87fbf1dbf3cec7b, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -24352,6 +24352,7 @@ GameObject:
   - component: {fileID: 1010647078}
   - component: {fileID: 1010647077}
   - component: {fileID: 1010647076}
+  - component: {fileID: 1010647080}
   m_Layer: 5
   m_Name: SwitchButton
   m_TagString: Untagged
@@ -24436,7 +24437,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 0}
+      - m_Target: {fileID: 2079222900}
         m_TargetAssemblyTypeName: AttackScorManager, Assembly-CSharp
         m_MethodName: ChangeHitType
         m_Mode: 1
@@ -24486,6 +24487,18 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1010647074}
   m_CullTransparentMesh: 1
+--- !u!225 &1010647080
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1010647074}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &1010659527
 GameObject:
   m_ObjectHideFlags: 0
@@ -53571,10 +53584,11 @@ MonoBehaviour:
   isScorSettle: 0
   playerScore: 0
   enemyScore: 0
-  straightHit: 0
+  straightHit: 1
   attackPattern: {fileID: 348419493}
   defenseIcon: {fileID: 21300000, guid: 8fd74ffa775b75741a21abd9250e2767, type: 3}
   attackIcon: {fileID: 21300000, guid: 0a1daf24126ecb54e87fbf1dbf3cec7b, type: 3}
+  attackHitTypeCanvasGroup: {fileID: 1010647080}
   scorResults: 0
   playerScoreBar: {fileID: 905852578}
   playerScoreText: {fileID: 32712585}

ColorlessWorld-2024-4-2/Assets/Scripts/AttackScore/AttackScorManager.cs

@@ -17,6 +17,7 @@ public class AttackScorManager : Singleton<AttackScorManager>
     public Image attackPattern;//攻击模式指示
     public Sprite defenseIcon;
     public Sprite attackIcon;
+    public CanvasGroup attackHitTypeCanvasGroup;//ÓÃÀ´¹Ø±Õ¿ªÆôÉäÏß×èµ²
     [Header("分数")]
     public int scorResults;
     public Image playerScoreBar;
@@ -66,8 +67,9 @@ public class AttackScorManager : Singleton<AttackScorManager>
         enemyScoreText .text = enemyScore .ToString();
         //玩家血量
         float maxHP = PlayerStatsManager.Instance.playerState.maxHP;
-        playerHPBar.fillAmount = (PlayerStatsManager.Instance.playerState.currentHP / maxHP);
-        float resultHP = PlayerStatsManager.Instance.playerState.currentHP;
+        float currentHP = PlayerStatsManager.Instance.playerState.currentHP;
+        playerHPBar.fillAmount = (currentHP / maxHP);
+        float resultHP = currentHP;
         if(straightHit ==false )
         {
             if (scorResults < 0)
@@ -80,10 +82,19 @@ public class AttackScorManager : Singleton<AttackScorManager>
            resultHP -= enemyScore;
         }
         preViewHPBar.fillAmount = (resultHP / maxHP);
-        playerHPText.text = resultHP.ToString() + "/" + maxHP.ToString();
+        if (resultHP != currentHP )
+        {
+            playerHPText.text = currentHP.ToString() + "(" + (resultHP - currentHP).ToString() + ")/" + maxHP.ToString();
+        }
+        else
+        {
+            playerHPText.text = currentHP.ToString() + "/" + maxHP.ToString();
+        }
+        
         //敌人血量
-        enemyHPBar.fillAmount = GameManager.Instance.enemy.currentEnemyHP / (float)GameManager.Instance.enemy.maxEnemyHP;
-        float resultEnemyHP = GameManager.Instance.enemy.currentEnemyHP;
+        int currentEnemyHP = GameManager.Instance.enemy.currentEnemyHP;
+        enemyHPBar.fillAmount =currentEnemyHP / (float)GameManager.Instance.enemy.maxEnemyHP;
+        float resultEnemyHP = currentEnemyHP;
         if (straightHit == false)
         {
             if (scorResults > 0)
@@ -98,7 +109,14 @@ public class AttackScorManager : Singleton<AttackScorManager>
         preEnemyHPBar.fillAmount = resultEnemyHP / 60.0f;
         if (resultEnemyHP>0)
         {
-            enemyHPText.text = resultEnemyHP.ToString() + "/" + GameManager.Instance.enemy.maxEnemyHP.ToString();
+            if (resultEnemyHP != currentEnemyHP)
+            {
+                enemyHPText.text = currentEnemyHP.ToString() + "(" + (resultEnemyHP - currentEnemyHP).ToString() + ")/" + GameManager.Instance.enemy.maxEnemyHP.ToString();
+            }
+            else
+            {
+                enemyHPText.text = currentEnemyHP.ToString() + "/" + GameManager.Instance.enemy.maxEnemyHP.ToString();
+            }
         }
         else
         {
@@ -161,10 +179,12 @@ public class AttackScorManager : Singleton<AttackScorManager>
     {
         isScorSettle = true;
         enemyScoreBar.fillAmount = 1;
+        attackHitTypeCanvasGroup.blocksRaycasts = true;
     }
     public void FadeMode()//非战斗界面隐藏功能
     {
         isScorSettle = false;
+        attackHitTypeCanvasGroup .blocksRaycasts = false;
 
         playerScoreBar.fillAmount = 0;
         playerScoreText.text = " ";

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

@@ -5,6 +5,7 @@ using System.Diagnostics;
 using System.Linq;
 using Unity.VisualScripting;
 using UnityEngine;
+using UnityEngine.UI;
 using static TurnMaster;
 using Debug = UnityEngine.Debug;
 using Random = UnityEngine.Random;
@@ -13,9 +14,13 @@ public class Enemy : MonoBehaviour
 {
     [Header ("¹ÖÎ￨×é")]
     public List<EnemyCard> deck = new List<EnemyCard>();       // ¿¨×é 
-    public List<EnemyCard> hand = new List<EnemyCard>();       // 手牌 
     public List<EnemyCard> discardPile = new List<EnemyCard>();// ÆúÅÆ¶Ñ 
-    public List<EnemyCard> inPlay = new List<EnemyCard>();     // 战场上的牌 
+    // public List<EnemyCard> hand = new List<EnemyCard>();       // 手牌 
+    // public List<EnemyCard> inPlay = new List<EnemyCard>();     // 战场上的牌 
+    [Header("怪物卡组ui")]
+    public Transform cardFather;
+    public GameObject cardPrefab;
+    
     [Header("¹ÖÎïѪÁ¿")]
     public int currentEnemyHP=60;
     public int maxEnemyHP=60;
@@ -37,8 +42,41 @@ public class Enemy : MonoBehaviour
 
         }
         //yield return null;
+        //刷新卡组ui
+        RefreshCardDeckUI();
         //½áÊø»ØºÏ
         TurnMaster.Instance.turn = Turn.enemyTurnEnd;
+        
+    }
+    public void RefreshCardDeckUI()
+    {
+        //删除所有子物体
+        if (cardFather.childCount !=0)
+        {
+            int count = cardFather.childCount;
+            for (int i=0;i<count;i++)
+            {
+                DestroyImmediate(cardFather.GetChild(0).gameObject);   
+            }
+        }
+        //重新生成ui
+        for (int i=0;i<deck .Count;i++)
+        {
+            GameObject card = Instantiate(cardPrefab, cardFather);
+            if (deck[i].isKnow == true)
+            {
+                card.GetComponent<Image>().sprite = deck[i].cardSprite;
+            }
+        }
+        for (int i = 0; i < discardPile.Count; i++)
+        {
+            GameObject disCard = Instantiate(cardPrefab, cardFather);
+            if (discardPile[i].isKnow == true)
+            {
+                disCard.GetComponent<Image>().sprite = discardPile[i].cardSprite;
+            }     
+            disCard .transform .GetChild (0).gameObject.SetActive(true);
+        }
     }
     public void PlayCard(int num)
     {

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

@@ -7,7 +7,8 @@ public class EnemyCard
 {
     public string[] nodesMark;
     public string[] nodesColor;
-
+    public Sprite cardSprite;
+    public bool isKnow =false ;//是否打出过
     public void CardSettle(MapUnity targetNode)
     {
         Debug.Log("打出一张");

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/PlayCard/EnemyPlayerCardUIManager.cs

@@ -9,7 +9,8 @@ public class EnemyPlayerCardUIManager : Singleton<EnemyPlayerCardUIManager>
 
     public void ShowCard(EnemyCard enemyCard)
     {
-        cardUIImage.sprite = CardManager.Instance.createGemImageByToolX(enemyCard.nodesMark, enemyCard.nodesColor);
+        cardUIImage.sprite = enemyCard.cardSprite;
+        enemyCard .isKnow = true;
     }
 
 }

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

@@ -0,0 +1,46 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+public class ShowEnemyDeck : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
+{
+    public GameObject cardDeck;
+    public bool isLock;
+    public bool isOn;
+    private void Update()
+    {    
+        if(isLock ==true )
+        {
+            if (Input.GetKeyDown(KeyCode.Mouse0)|| Input.GetKeyDown(KeyCode.Mouse1))
+            {
+                cardDeck.gameObject.SetActive(false);
+                isLock = false;
+            }
+        }
+        else
+        {
+            if (Input.GetKeyDown(KeyCode.Mouse1))
+            {
+                if (isOn == true)
+                {
+                   isLock = true;
+                }
+            }
+        }
+    }
+    public void OnPointerEnter(PointerEventData eventData)
+    {
+        cardDeck.SetActive(true);
+        isOn = true;
+    }
+
+    public void OnPointerExit(PointerEventData eventData)
+    {
+        if (isLock == false)
+        {
+            cardDeck.SetActive(false);
+        }
+        isOn = false;
+    }
+}

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

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

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

@@ -130,37 +130,61 @@ public class GameManager : Singleton<GameManager>
         //Éú³É½ÇÉ«Êý¾Ý
         if (PlayerStatsManager.Instance.playerState != null)
             playerState = PlayerStatsManager.Instance.playerState;
+        //生成敌人数据
+        StartCoroutine(CreatEnemyDate());
+        //生成空地图列表
+        // GenerateEnmptyMapList();
+        GenerateEnmptyMapListDefault();       
+        //开局场地涂色并开始阶段
+        StartCoroutine(StartStartColourCoroutine(complete));
+
+    }
 
+    [System.Serializable]
+    public class Yunit
+    {
+        public List<MapUnity> Y;
+    }
+    IEnumerator CreatEnemyDate()
+    {
+        yield return new WaitUntil(() => complete == true);
+        yield return null;
+        //生成敌人卡牌
         EnemyCard enemyCard = new EnemyCard();
         enemyCard.nodesMark = new string[5] { "0_1", "0_-1", "-1_1", "-1_-1", "0_0" };
         enemyCard.nodesColor = new string[5] { "black", "black", "black", "black", "black" };
+        enemyCard.cardSprite = CardManager.Instance.createGemImageByToolX(enemyCard.nodesMark, enemyCard.nodesColor);
         EnemyCard enemyCard_2 = new EnemyCard();
         enemyCard_2.nodesMark = new string[6] { "1_0", "0_1", "0_-1", "-1_0", "-1_1", "-1_-1" };
         enemyCard_2.nodesColor = new string[6] { "black", "black", "black", "black", "black", "black" };
+        enemyCard_2.cardSprite = CardManager.Instance.createGemImageByToolX(enemyCard_2.nodesMark, enemyCard_2.nodesColor);
         EnemyCard enemyCard_3 = new EnemyCard();
         enemyCard_3.nodesMark = new string[5] { "0_0", "1_0", "2_0", "-1_0", "-2_0" };
         enemyCard_3.nodesColor = new string[5] { "black", "black", "black", "black", "black" };
+        enemyCard_3.cardSprite = CardManager.Instance.createGemImageByToolX(enemyCard_3.nodesMark, enemyCard_3.nodesColor);
+
+        EnemyCard enemyCard_4 = new EnemyCard();
+        enemyCard_4.nodesMark = new string[5] { "0_1", "0_-1", "-1_1", "-1_-1", "0_0" };
+        enemyCard_4.nodesColor = new string[5] { "black", "black", "black", "black", "black" };
+        enemyCard_4.cardSprite = CardManager.Instance.createGemImageByToolX(enemyCard_4.nodesMark, enemyCard_4.nodesColor);
+        EnemyCard enemyCard_5 = new EnemyCard();
+        enemyCard_5.nodesMark = new string[6] { "1_0", "0_1", "0_-1", "-1_0", "-1_1", "-1_-1" };
+        enemyCard_5.nodesColor = new string[6] { "black", "black", "black", "black", "black", "black" };
+        enemyCard_5.cardSprite = CardManager.Instance.createGemImageByToolX(enemyCard_5.nodesMark, enemyCard_5.nodesColor);
+        EnemyCard enemyCard_6 = new EnemyCard();
+        enemyCard_6.nodesMark = new string[5] { "0_0", "1_0", "2_0", "-1_0", "-2_0" };
+        enemyCard_6.nodesColor = new string[5] { "black", "black", "black", "black", "black" };
+        enemyCard_6.cardSprite = CardManager.Instance.createGemImageByToolX(enemyCard_6.nodesMark, enemyCard_6.nodesColor);
 
         enemy.deck.Add(enemyCard);
-        enemy.deck.Add(enemyCard);
-        enemy.deck.Add(enemyCard_2);
         enemy.deck.Add(enemyCard_2);
         enemy.deck.Add(enemyCard_3);
-        enemy.deck.Add(enemyCard_3);
-        //生成空地图列表
-        // GenerateEnmptyMapList();
-        GenerateEnmptyMapListDefault();       
-        //开局场地涂色并开始阶段
-        StartCoroutine(StartStartColourCoroutine(complete));
-
+        enemy.deck.Add(enemyCard_4);
+        enemy.deck.Add(enemyCard_5);
+        enemy.deck.Add(enemyCard_6);
+        //生成敌人卡牌预览
+        enemy.RefreshCardDeckUI();
     }
-
-    [System.Serializable]
-    public class Yunit
-    {
-        public List<MapUnity> Y;
-    }
-    
     public void GenerateEnmptyMapList()
     {
         if (complete == false)

ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponManager.cs

@@ -113,5 +113,18 @@ public class WeaponManager : Singleton<WeaponManager>
         isWeaponSettle = false;
         enemyWeaponObject.SetActive(false);
         enemyWeaponNodeList .gameObject .SetActive(false);
+
+        foreach (Transform transform in playerWeaponNodeList)
+        {
+            WeaponNode weaponNode = transform.GetChild(0).GetComponent<WeaponNode>();
+            if (weaponNode.enableVFX != null)
+                weaponNode.enableVFX.SetActive(false);
+        }
+        foreach (Transform transform in enemyWeaponNodeList)
+        {
+            WeaponNode weaponNode = transform.GetChild(0).GetComponent<WeaponNode>();
+            if (weaponNode.enableVFX != null)
+                weaponNode.enableVFX.SetActive(false);
+        }
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponNode.cs

@@ -589,6 +589,9 @@ public class WeaponNode : MonoBehaviour,IDragHandler, IBeginDragHandler, IEndDra
         {
             //临时加入背包
             transform.SetParent(targetObj.transform);
+            //触发特效
+            if (enableVFX != null)
+                enableVFX.SetActive(false);
         }
         else//其他位置归位
         {