Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Res/TestCombat.prefab

@@ -1,5 +1,114 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &5929937923140812097
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6623440459028824870}
+  - component: {fileID: 5757323762370340157}
+  - component: {fileID: 5951150786019705180}
+  - component: {fileID: 152968666917814082}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Cube
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6623440459028824870
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5929937923140812097}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.5488694, y: -0.12548317, z: -0.08376986, w: 0.82217944}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3904968013911866960}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &5757323762370340157
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5929937923140812097}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &5951150786019705180
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5929937923140812097}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &152968666917814082
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5929937923140812097}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &9214784224709271120
 GameObject:
   m_ObjectHideFlags: 0
@@ -30,7 +139,8 @@ Transform:
   m_LocalPosition: {x: -22.807297, y: -0.99843895, z: -6.5913196}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 6623440459028824870}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &6090200664286961698
@@ -51,9 +161,11 @@ MonoBehaviour:
     hp: 10000
     att: 100
     skill: 
+    magicWeaponId: 13270000
   enemyHeroInfo:
   - heroID: 101
     level: 10
     hp: 100
     att: 1
     skill: 
+    magicWeaponId: 12270000

Assets/Res/UI/CombatPanel.prefab

@@ -1039,7 +1039,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &5837590194851709526
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2110,9 +2110,10 @@ GameObject:
   m_Component:
   - component: {fileID: 8250092803578968627}
   - component: {fileID: 2625907129377560717}
+  - component: {fileID: 8984094799762700017}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: gf_widget
+  m_Name: EnemyGf_skill
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2168,7 +2169,56 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: mybutton
+    gameObject: {fileID: 8984094799762700017}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!114 &8984094799762700017
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3104343098119091553}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 0}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3218032141213002039
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/testCombat.scene

@@ -252,11 +252,6 @@ Transform:
   - {fileID: 1515802678}
   m_Father: {fileID: 1902930422}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &24964071 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 3904968013911866960, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-  m_PrefabInstance: {fileID: 293130736}
-  m_PrefabAsset: {fileID: 0}
 --- !u!213 &51194050
 Sprite:
   m_ObjectHideFlags: 0
@@ -1868,116 +1863,17 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: enemyHeroInfo.Array.size
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: enemyHeroInfo.Array.data[1].hp
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: enemyHeroInfo.Array.data[2].hp
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: enemyHeroInfo.Array.data[1].att
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: enemyHeroInfo.Array.data[2].att
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: enemyHeroInfo.Array.data[1].level
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: enemyHeroInfo.Array.data[2].level
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: enemyHeroInfo.Array.data[0].heroID
-      value: 101
-      objectReference: {fileID: 0}
-    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: enemyHeroInfo.Array.data[1].heroID
-      value: 9103
-      objectReference: {fileID: 0}
-    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: enemyHeroInfo.Array.data[2].heroID
-      value: 9101
-      objectReference: {fileID: 0}
-    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.size
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: enemyHeroInfo.Array.data[0].magicWeaponId.Array.size
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: enemyHeroInfo.Array.data[1].magicWeaponId.Array.size
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[0]
-      value: 10003
-      objectReference: {fileID: 0}
-    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[1]
-      value: 10008
-      objectReference: {fileID: 0}
-    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[2]
-      value: 10008
-      objectReference: {fileID: 0}
-    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[3]
-      value: 10008
-      objectReference: {fileID: 0}
-    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[4]
-      value: 10008
-      objectReference: {fileID: 0}
-    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[5]
-      value: 10008
-      objectReference: {fileID: 0}
-    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: enemyHeroInfo.Array.data[0].magicWeaponId.Array.data[0]
-      value: 10002
-      objectReference: {fileID: 0}
-    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: enemyHeroInfo.Array.data[0].magicWeaponId.Array.data[1]
-      value: 10005
-      objectReference: {fileID: 0}
-    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: enemyHeroInfo.Array.data[0].magicWeaponId.Array.data[2]
-      value: 10006
-      objectReference: {fileID: 0}
-    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: enemyHeroInfo.Array.data[1].magicWeaponId.Array.data[0]
-      value: 10004
-      objectReference: {fileID: 0}
-    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      propertyPath: enemyHeroInfo.Array.data[1].magicWeaponId.Array.data[1]
-      value: 10005
-      objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_Name
       value: TestCombat
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
-    m_AddedGameObjects:
-    - targetCorrespondingSourceObject: {fileID: 3904968013911866960, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 948078761}
+    m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
 --- !u!1 &312708676
@@ -5438,115 +5334,6 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 6694772361877173011, guid: 9e7a1f1f33f8f5b44aa99d244e38770f, type: 3}
   m_PrefabInstance: {fileID: 2430196628191906972}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &948078760
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 948078761}
-  - component: {fileID: 948078764}
-  - component: {fileID: 948078763}
-  - component: {fileID: 948078762}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Cube
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &948078761
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 948078760}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.5488694, y: -0.12548317, z: -0.08376986, w: 0.82217944}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 24964071}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!65 &948078762
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 948078760}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 0
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 1, y: 1, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
---- !u!23 &948078763
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 948078760}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!33 &948078764
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 948078760}
-  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &977005972
 GameObject:
   m_ObjectHideFlags: 0
@@ -6534,71 +6321,6 @@ Sprite:
     - {x: 0.45, y: -0.17}
   m_Bones: []
   m_SpriteID: 5e97eb03825dee720800000000000000
---- !u!1001 &1396997705
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 280866919276522893, guid: 3e2adcc225c13154daa6652991cc58db, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2583360796260655289, guid: 3e2adcc225c13154daa6652991cc58db, type: 3}
-      propertyPath: m_Name
-      value: LevelBattle1 (1)
-      objectReference: {fileID: 0}
-    - target: {fileID: 2583360796260655289, guid: 3e2adcc225c13154daa6652991cc58db, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5358946683605546402, guid: 3e2adcc225c13154daa6652991cc58db, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5358946683605546402, guid: 3e2adcc225c13154daa6652991cc58db, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5358946683605546402, guid: 3e2adcc225c13154daa6652991cc58db, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5358946683605546402, guid: 3e2adcc225c13154daa6652991cc58db, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5358946683605546402, guid: 3e2adcc225c13154daa6652991cc58db, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5358946683605546402, guid: 3e2adcc225c13154daa6652991cc58db, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5358946683605546402, guid: 3e2adcc225c13154daa6652991cc58db, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5358946683605546402, guid: 3e2adcc225c13154daa6652991cc58db, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5358946683605546402, guid: 3e2adcc225c13154daa6652991cc58db, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5358946683605546402, guid: 3e2adcc225c13154daa6652991cc58db, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 3e2adcc225c13154daa6652991cc58db, type: 3}
 --- !u!213 &1409402869
 Sprite:
   m_ObjectHideFlags: 0
@@ -7634,6 +7356,7 @@ Transform:
   m_Children:
   - {fileID: 82517509}
   - {fileID: 424169261}
+  - {fileID: 1766432353}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!213 &1572835774
@@ -9048,13 +8771,13 @@ Transform:
   m_GameObject: {fileID: 1766432351}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -3.4419997, y: 0, z: -3.108}
+  m_LocalPosition: {x: 0, y: 0, z: -3.108}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1582393390}
   - {fileID: 1056415447}
-  m_Father: {fileID: 0}
+  m_Father: {fileID: 1557285921}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!213 &1770406332
 Sprite:
@@ -12194,11 +11917,9 @@ SceneRoots:
   - {fileID: 613972499}
   - {fileID: 321407578}
   - {fileID: 1856735312}
-  - {fileID: 1396997705}
   - {fileID: 7971796013686853673}
   - {fileID: 1584646302}
   - {fileID: 2622624}
   - {fileID: 144571669}
   - {fileID: 1089162872}
   - {fileID: 1557285921}
-  - {fileID: 1766432353}

Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneDecoration.cs

@@ -21,9 +21,9 @@ namespace GameLogic.Combat.CombatTool.SceneTool
                 _materialPropertyBlock = new MaterialPropertyBlock();
             }
 
-            Vector3 pos = CombatController.currActiveCombat.CombatCameraControllder.root.position;
-            Vector3 p2 = pool.own.transform.position;
-            float d = Vector3.Distance(pos, p2);
+            // Vector3 pos = CombatController.currActiveCombat.CombatCameraControllder.root.position;
+            // Vector3 p2 = pool.own.transform.position;
+            // float d = Vector3.Distance(pos, p2);
 
             currTime = Random.Range(-1f, 0);
             renderers = pool.own.transform.GetComponentsInChildren<Renderer>();

Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -41,7 +41,7 @@ namespace GameLogic.Combat.CombatType
         protected override void ProHeroDie(CombatHeroEntity combatHeroEntity, HarmReturnInfo harmReturnInfo)
         {
             CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true);
-            if (allHero==null||allHero.Length <= 0)
+            if (allHero == null || allHero.Length <= 0)
             {
                 //胜利
                 CombatController.currActiveCombat.GameOver(true);
@@ -49,7 +49,7 @@ namespace GameLogic.Combat.CombatType
             }
 
             allHero = combatController.CombatHeroController.GetHero(false);
-            if (allHero==null||allHero.Length <= 0)
+            if (allHero == null || allHero.Length <= 0)
             {
                 //失败
                 CombatController.currActiveCombat.GameOver(false);
@@ -86,7 +86,7 @@ namespace GameLogic.Combat.CombatType
                 for (int j = 0; j < monster.Length; j++)
                 {
                     HeroInfo heroInfo = new HeroInfo();
-                    heroInfo.InitMonster(monster[j],level);
+                    heroInfo.InitMonster(monster[j], level);
                     CreateEnemy(cTaskAwaitBuffer, heroInfo, j);
                 }
             }
@@ -128,29 +128,29 @@ namespace GameLogic.Combat.CombatType
             Vector3 heroPoint = CombatController.currActiveCombat.CombatSenceController.GetTarget(0);
             CombatController.currActiveCombat.MagicWeaponCombatSence.SetMagicWeaponCombatSence(heroPoint,
                 Vector3.forward);
-            TestCombatHeroConfig testCombatHeroConfig = GameObject.FindObjectOfType<TestCombatHeroConfig>();
-            if (testCombatHeroConfig != null)
-            {
-                // TestCombatHeroConfig.TestHeroInfoConfig testHeroInfoConfig = testCombatHeroConfig.myHeroInfo[0];
-                // PlayerManager.Instance.AddTestHeroInfo(testHeroInfoConfig.heroID, testHeroInfoConfig.level,
-                //     testHeroInfoConfig.skill, testHeroInfoConfig.magicWeaponId);
-
-
-                CombatHeroEntity heroEntity = new CombatHeroEntity();
-         
-                heroEntity.IsEnemy = false;
-                heroEntity.number = 0;
-
-                Vector3 pos = heroPoint;
-                cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatHeroAi(), PlayerManager.Instance.myHero, pos,
-                    delegate(CombatHeroEntity entity)
-                    {
-                        entity.CurrCombatHeroInfo.hp = (EncryptionLong)(20000);
-                        entity.MaxCombatHeroInfo.hp = (EncryptionLong)(20000);
-                        combatController.CombatHeroController.AddHero(entity);
-                        CombatController.currActiveCombat.CombatHeroController.playerHeroEntity = heroEntity;
-                    }, isPlayer: true));
-            }
+            // TestCombatHeroConfig testCombatHeroConfig = GameObject.FindObjectOfType<TestCombatHeroConfig>();
+            // if (testCombatHeroConfig != null)
+            // {
+            // TestCombatHeroConfig.TestHeroInfoConfig testHeroInfoConfig = testCombatHeroConfig.myHeroInfo[0];
+            // PlayerManager.Instance.AddTestHeroInfo(testHeroInfoConfig.heroID, testHeroInfoConfig.level,
+            //     testHeroInfoConfig.skill, testHeroInfoConfig.magicWeaponId);
+
+
+            CombatHeroEntity heroEntity = new CombatHeroEntity();
+
+            heroEntity.IsEnemy = false;
+            heroEntity.number = 0;
+
+            Vector3 pos = heroPoint;
+            cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatHeroAi(), PlayerManager.Instance.myHero, pos,
+                delegate(CombatHeroEntity entity)
+                {
+                    entity.CurrCombatHeroInfo.hp = (EncryptionLong)(20000);
+                    entity.MaxCombatHeroInfo.hp = (EncryptionLong)(20000);
+                    combatController.CombatHeroController.AddHero(entity);
+                    CombatController.currActiveCombat.CombatHeroController.playerHeroEntity = heroEntity;
+                }, isPlayer: true));
         }
+        // }
     }
 }

Assets/Scripts/GameLogic/Combat/CombatType/TestCombatType.cs

@@ -3,6 +3,7 @@ using Common.Utility.CombatEvent;
 using Core.Utility;
 using Excel2Json;
 using Fort23.Core;
+using Fort23.Mono;
 using Fort23.UTool;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
@@ -54,10 +55,12 @@ namespace GameLogic.Combat.CombatType
 
         protected override async CTask ProStartGame()
         {
+          
             CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
+
             TestCombat(cTaskAwaitBuffer);
             InitTestCombatBoChi();
-            // CreateEnemy(cTaskAwaitBuffer);
+            CreateEnemy(cTaskAwaitBuffer);
             await cTaskAwaitBuffer.WaitAll();
             CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
         }
@@ -81,7 +84,6 @@ namespace GameLogic.Combat.CombatType
                 int[] monster = groupConfig.GroupMonster;
                 for (int j = 0; j < monster.Length; j++)
                 {
-                    
                 }
             }
 

Assets/Scripts/GameUI/Combat/CombatDrive.cs

@@ -45,10 +45,14 @@ namespace GameLogic.Combat
             cTaskAwaitBuffer.AddTask(combatMonoBaisc.Init(CombatController));
             await cTaskAwaitBuffer.WaitAll();
             await CombatHPPanel.OpenCombatHPPanel();
-
-
+         
             LogTool.Log("战斗逻辑自己写");
             await CombatController.InitCombat(startCombatInfo);
+            if (startCombatInfo.CombatType == CombatType.CombatType.TestCombat)
+            {
+                await CombatPanel.OpenCombatPanel();
+            }
+
             StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
         }
 

Assets/Scripts/GameUI/GameApplction.cs

@@ -125,12 +125,11 @@ public class GameApplction : IGameStart
         TestCombatHeroConfig testCombatHeroConfig = GameObject.FindObjectOfType<TestCombatHeroConfig>();
         if (testCombatHeroConfig != null)
         {
-            startCombatInfo.CombatType = CombatType.LevelBattle;
+            startCombatInfo.CombatType = CombatType.TestCombat;
+            TestCombatHeroConfig.TestHeroInfoConfig testHeroInfoConfig = testCombatHeroConfig.myHeroInfo[0];
+            PlayerManager.Instance.AddTestHeroInfo(testHeroInfoConfig.heroID, testHeroInfoConfig.level,
+                testHeroInfoConfig.skill, testHeroInfoConfig.magicWeaponId);
         }
-
-        TestCombatHeroConfig.TestHeroInfoConfig testHeroInfoConfig = testCombatHeroConfig.myHeroInfo[0];
-        PlayerManager.Instance.AddTestHeroInfo(testHeroInfoConfig.heroID, testHeroInfoConfig.level,
-            testHeroInfoConfig.skill, testHeroInfoConfig.magicWeaponId);
 #endif
 
         startCombatInfo.levelBattleId = AccountFileInfo.Instance.playerData.levelBattle;
@@ -138,8 +137,12 @@ public class GameApplction : IGameStart
         gameStartUIPanel.ShowMassge("loadCombat");
         gameStartUIPanel.SetSlider(0.95f);
         await CombatDrive.Instance.StartCombat(startCombatInfo);
+        if (startCombatInfo.CombatType != CombatType.TestCombat)
+        {
+            await MainPanel.OpenPanel();
+        }
+
 
-        await MainPanel.OpenPanel();
 
         gameStartUIPanel.ShowMassge("loadFinish");
         gameStartUIPanel.SetSlider(1f);

Assets/Scripts/GameUI/UI/CombatPanel/BossHpWidget.cs

@@ -15,7 +15,7 @@ namespace Fort23.Mono
 
         private CombatHeroSkillControl combatHeroSkillControl;
 
-        protected BetterList<gf_widget> currShowGfWidget = new BetterList<gf_widget>();
+        protected BetterList<EnemyGf_skill> currShowGfWidget = new BetterList<EnemyGf_skill>();
 
         private HeroHpWidget heroHpWidget;
         private void Init()
@@ -77,7 +77,7 @@ namespace Fort23.Mono
         private async CTask ReshSkill()
         {
             currShowGfWidget.Clear();
-            UIManager.Instance.DormancyAllGComponent<gf_widget>("bossWidget");
+            UIManager.Instance.DormancyAllGComponent<EnemyGf_skill>("bossWidget");
             
             int maxCount = 2;
            
@@ -109,7 +109,7 @@ namespace Fort23.Mono
                     if (minSlots != null)
                     {
                         showSkillSlots.Add(minSlots);
-                        gf_widget gfWidget = await UIManager.Instance.CreateGComponentForObject<gf_widget>(
+                        EnemyGf_skill gfWidget = await UIManager.Instance.CreateGComponentForObject<EnemyGf_skill>(
                             this.gf_widget,
                             null,
                             SkillRoot, poolName: "bossWidget", isInstance: true);

Assets/Scripts/GameUI/UI/CombatPanel/EnemyGf_skill.cs

@@ -0,0 +1,180 @@
+using Common.Utility.CombatEvent;
+using Core.Language;
+using Excel2Json;
+using Fort23.Core;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero.Turntable;
+using GameLogic.Combat.Skill;
+using GameLogic.Player;
+using UnityEngine;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "EnemyGf_skill")]
+    public partial class EnemyGf_skill : UIComponent
+    {
+        public SkillSlots SkillSlots;
+        public SkillBasic SkillBasic;
+        public float jd;
+
+        public int useCount;
+        public WuXingType HuangDaoWuXingType;
+
+        public CombatHeroEntity combatHeroEntity;
+
+        private void Init()
+        {
+        }
+
+        public override void AddEvent()
+        {
+            CombatEventManager.Instance.AddEventListener(CombatEventType.SkillSlotsAlter, SkillSlotsAlter);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.HuangDaoAlterSlots, HuangDaoAlterSlots);
+        }
+
+        public override void DelEvent()
+        {
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.SkillSlotsAlter, SkillSlotsAlter);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.HuangDaoAlterSlots, HuangDaoAlterSlots);
+        }
+
+        private void HuangDaoAlterSlots(IEventData iEventData)
+        {
+            HuangDaoAlterSlotsEventData huangDaoAlterSlotsEventData = iEventData as HuangDaoAlterSlotsEventData;
+            if (huangDaoAlterSlotsEventData.CombatHeroEntity != combatHeroEntity || SkillSlots == null)
+            {
+                return;
+            }
+
+            if (huangDaoAlterSlotsEventData.index != SkillSlots.index)
+            {
+                return;
+            }
+
+            HuangDaoWuXingType = huangDaoAlterSlotsEventData.WuXingType;
+            switch ((int)HuangDaoWuXingType)
+            {
+                case 1:
+                    quan.color = new Color(1f, 0.98f, 0.09f);
+                    break;
+                case 2:
+                    quan.color = new Color(0.19f, 0.51f, 1f);
+
+                    break;
+                case 4:
+                    quan.color = new Color(0.17f, 1f, 0.35f);
+                    break;
+                case 8:
+                    quan.color = new Color(1f, 0.19f, 0.04f);
+                    break;
+                case 16:
+                    quan.color = new Color(1f, 0.65f, 0.17f);
+                    break;
+            }
+        }
+
+        public void SkillSlotsAlter(IEventData eventData)
+        {
+            SkillSlotsAlterEventData skillSlotsAlterEventData = (SkillSlotsAlterEventData)eventData;
+            if (skillSlotsAlterEventData.SkillSlots == SkillSlots)
+            {
+                SkillBasic = SkillSlots.SkillBasic;
+              
+                SetUIInfo();
+            }
+        }
+
+        public override void AddButtonEvent()
+        {
+            mybutton.onClick.AddListener(OnClick);
+        }
+        private void OnClick()
+        { 
+            SkillConfig skillConfig = SkillBasic.SelfSkillConfig;
+            CombatController.currActiveCombat.isUpdate = false;
+            SkillMassgePanel.OpenSkillSelectPanel(LanguageManager.Instance.Text(skillConfig.name), LanguageManager.Instance.Text(skillConfig.dec),
+                delegate()
+                {
+                    CombatController.currActiveCombat.isUpdate = true;
+                });
+        }
+
+        private void SetUIInfo()
+        {
+            if (SkillBasic == null)
+            {
+                useSkillIcon.transform.parent.gameObject.SetActive(false);
+                quan.color = new Color(1, 1, 1, 0.2f);
+                // if (PlayerGf_widget != null)
+                // {
+                //     PlayerGf_widget.Play("likai",false);
+                // }
+
+                return;
+            }
+
+            useSkillIcon.transform.parent.gameObject.SetActive(true);
+            useSkillIcon.icon_name = SkillBasic.SelfSkillConfig.icon;
+            cd.fillAmount = 0;
+            if (SkillBasic.SelfSkillConfig.SkillType == 2)
+            {
+                quan.color = new Color(0.81f, 0.21f, 1f);
+                return;
+            }
+
+            // useCount= SkillBasic.UseCount;
+            switch (SkillBasic.SelfSkillConfig.attribute)
+            {
+                case 1:
+                    quan.color = new Color(1f, 0.98f, 0.09f);
+                    break;
+                case 2:
+                    quan.color = new Color(0.19f, 0.51f, 1f);
+
+                    break;
+                case 4:
+                    quan.color = new Color(0.17f, 1f, 0.35f);
+                    break;
+                case 8:
+                    quan.color = new Color(1f, 0.19f, 0.04f);
+                    break;
+                case 16:
+                    quan.color = new Color(1f, 0.65f, 0.17f);
+                    break;
+            }
+        }
+
+        public void Update()
+        {
+            if (SkillSlots == null || SkillBasic == null)
+            {
+                return;
+            }
+
+            SkillBasic skillBasic = SkillBasic;
+            if (skillBasic.SelfSkillConfig.SkillType != 1)
+            {
+                return;
+            }
+
+            float bl = 1 - SkillSlots.GetFinishBl();
+            cd.fillAmount = bl;
+        }
+
+        public void InitSkillWidget(SkillBasic SkillBasic, CombatHeroEntity combatHeroEntity)
+        {
+            this.combatHeroEntity = combatHeroEntity;
+            this.SkillBasic = SkillBasic;
+            this.SkillSlots = null;
+            SetUIInfo();
+        }
+
+        public void InitWidget(SkillSlots skillSlots, CombatHeroEntity combatHeroEntity)
+        {
+            this.combatHeroEntity = combatHeroEntity;
+            this.SkillSlots = skillSlots;
+            SkillBasic = skillSlots.SkillBasic;
+            SetUIInfo();
+        }
+    }
+}

Assets/Scripts/GameUI/UI/CombatPanel/EnemyGf_skill.cs.meta

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

Assets/Scripts/GameUI/UI/CombatPanel/EnemyGf_skillData.cs

@@ -0,0 +1,62 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class EnemyGf_skill 
+	{
+	  #region 自定义数据 
+	  private MyImage _quan;
+	  public MyImage quan
+	   {
+	   get{
+	      if (_quan == null)
+	       {
+	         _quan  = GetUIUnit<MyImage>("quan"); 
+	       }
+	      return _quan;
+	     }
+	   }
+	  private MyImage _useSkillIcon;
+	  public MyImage useSkillIcon
+	   {
+	   get{
+	      if (_useSkillIcon == null)
+	       {
+	         _useSkillIcon  = GetUIUnit<MyImage>("useSkillIcon"); 
+	       }
+	      return _useSkillIcon;
+	     }
+	   }
+	  private MyImage _cd;
+	  public MyImage cd
+	   {
+	   get{
+	      if (_cd == null)
+	       {
+	         _cd  = GetUIUnit<MyImage>("cd"); 
+	       }
+	      return _cd;
+	     }
+	   }
+	  private Button _mybutton;
+	  public Button mybutton
+	   {
+	   get{
+	      if (_mybutton == null)
+	       {
+	         _mybutton  = GetUIUnit<Button>("mybutton"); 
+	       }
+	      return _mybutton;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/CombatPanel/EnemyGf_skillData.cs.meta

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

Assets/Scripts/GameUI/UI/CombatPanel/MagicWeaponWidget.cs

@@ -1,4 +1,7 @@
+using Core.Language;
+using Excel2Json;
 using GameLogic.Combat.Buff;
+using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
 
 namespace Fort23.Mono
@@ -28,6 +31,13 @@ namespace Fort23.Mono
             {
                 if (combatMagicWeaponEntity.IsEnemy)
                 {
+                    // SkillConfig skillConfig = SkillBasic.SelfSkillConfig;
+                    CombatController.currActiveCombat.isUpdate = false;
+                    SkillMassgePanel.OpenSkillSelectPanel(LanguageManager.Instance.Text(combatMagicWeaponEntity.FaBaoInfo.FabaoConfig.name), LanguageManager.Instance.Text(combatMagicWeaponEntity.FaBaoInfo.FabaoConfig.model),
+                        delegate()
+                        {
+                            CombatController.currActiveCombat.isUpdate = true;
+                        });
                     return;
                 }
 

Assets/Scripts/GameUI/UI/CombatPanel/SkillMassgePanel.cs

@@ -5,12 +5,13 @@ namespace Fort23.Mono
     [UIBinding(prefab = "SkillMassgePanel")]
     public partial class SkillMassgePanel : UIPanel
     {
-        public static async CTask OpenSkillSelectPanel(string name, string massge)
+        private System.Action callBack;
+        public static async CTask OpenSkillSelectPanel(string name, string massge,System.Action callBack=null)
         {
             SkillMassgePanel skillMassgePanel =
                 await UIManager.Instance.LoadAndOpenPanel<SkillMassgePanel>(null, UILayer.Middle);
 
-            skillMassgePanel.ShowPanel(name, massge);
+            skillMassgePanel.ShowPanel(name, massge,callBack);
         }
 
         private void Init()
@@ -19,19 +20,33 @@ namespace Fort23.Mono
 
         protected override void AddEvent()
         {
+            StaticUpdater.Instance.AddLateUpdateCallBack(Update);
         }
 
         protected override void DelEvent()
         {
+            StaticUpdater.Instance.RemoveLateUpdateCallBack(Update);
         }
 
+        private void Update()
+        {
+            // if (callBack != null)
+            // {
+            //   if()
+            // }
+        }
         public override void AddButtonEvent()
         {
-            guanbi.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+            guanbi.onClick.AddListener(() =>
+            {
+                callBack?.Invoke();
+                UIManager.Instance.HideUIUIPanel(this);
+            });
         }
 
-        public void ShowPanel(string name, string massge)
+        public void ShowPanel(string name, string massge,System.Action callBack=null)
         {
+            this.callBack = callBack;
             nameText.text = name;
             massgeText.text = massge;
         }