添加boss

Assets/Res/UI/CombatPanel.prefab

@@ -964,6 +964,64 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_IsOn: 0
+--- !u!1 &1397381218573381203
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8524214783602811684}
+  - component: {fileID: 277278844817635205}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: FaBaoSkillNameWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8524214783602811684
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1397381218573381203}
+  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: 1943328072580482287}
+  - {fileID: 3474779637280216729}
+  m_Father: {fileID: 9109434647151808463}
+  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: 44, y: 176}
+  m_SizeDelta: {x: 100, y: 347.8903}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!114 &277278844817635205
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1397381218573381203}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: faBaoName
+    gameObject: {fileID: 4300043605684872914}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
 --- !u!1 &1464355855513364024
 GameObject:
   m_ObjectHideFlags: 0
@@ -1050,6 +1108,43 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!1 &1484256651725221174
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9109434647151808463}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: FaBaoSkillDec
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9109434647151808463
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1484256651725221174}
+  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: 8524214783602811684}
+  m_Father: {fileID: 9037135992368401232}
+  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: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1762992081455727594
 GameObject:
   m_ObjectHideFlags: 0
@@ -3126,6 +3221,86 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
+--- !u!1 &4698755721976036948
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3474779637280216729}
+  - component: {fileID: 7758776097718559615}
+  - component: {fileID: 4300043605684872914}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: faBaoName
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3474779637280216729
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4698755721976036948}
+  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: 8524214783602811684}
+  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.6108, y: 59.832535}
+  m_SizeDelta: {x: 40.2844, y: 188.3441}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7758776097718559615
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4698755721976036948}
+  m_CullTransparentMesh: 1
+--- !u!114 &4300043605684872914
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4698755721976036948}
+  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: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 29
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u795E\u9F99\u9F0E\u795E\u9F99\u9F0E"
 --- !u!1 &4734203859052862721
 GameObject:
   m_ObjectHideFlags: 0
@@ -5986,6 +6161,90 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u91D1"
+--- !u!1 &7270377581846000412
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1943328072580482287}
+  - component: {fileID: 3501188637053276574}
+  - component: {fileID: 3541868711859062564}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1943328072580482287
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7270377581846000412}
+  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: 8524214783602811684}
+  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: 69, y: 360}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3501188637053276574
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7270377581846000412}
+  m_CullTransparentMesh: 1
+--- !u!114 &3541868711859062564
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7270377581846000412}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, 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
+  _icon_name: dec_name_01
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 08bcd577b76e3c94cacfc8e9783bd09a, type: 3}
+  packInfo:
+    packName: battle
+    packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
+    packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
+    lasetJsonGUID: b16af8f38185cf96d8030bb6e121b19f
 --- !u!1 &7272320765542434062
 GameObject:
   m_ObjectHideFlags: 0
@@ -6885,6 +7144,7 @@ RectTransform:
   - {fileID: 6474916107440211306}
   - {fileID: 943568758315423495}
   - {fileID: 4287798501111193387}
+  - {fileID: 9109434647151808463}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -6970,6 +7230,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: FaBaoSkillNameWidget
+    gameObject: {fileID: 1397381218573381203}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: FaBaoSkillDec
+    gameObject: {fileID: 9109434647151808463}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &9048783764069595547
 GameObject:

Assets/Scenes/testCombat.scene

@@ -511,6 +511,40 @@ Sprite:
     - {x: -0.085, y: -0.405}
   m_Bones: []
   m_SpriteID: 5e97eb03825dee720800000000000000
+--- !u!1 &82517508
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 82517509}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &82517509
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 82517508}
+  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:
+  - {fileID: 1243025902}
+  - {fileID: 533860923}
+  m_Father: {fileID: 1557285921}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &101587813
 GameObject:
   m_ObjectHideFlags: 0
@@ -2760,6 +2794,38 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &424169260
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 424169261}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: GameObject (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &424169261
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 424169260}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
+  m_LocalPosition: {x: -1.82, y: 0, z: 9.89}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1557285921}
+  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!1 &442218246
 GameObject:
   m_ObjectHideFlags: 0
@@ -3173,6 +3239,38 @@ Sprite:
     - {x: 0.64, y: 0.64}
   m_Bones: []
   m_SpriteID: 5e97eb03825dee720800000000000000
+--- !u!1 &533860922
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 533860923}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: GameObject (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &533860923
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 533860922}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -1, z: -0, w: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 6.81}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 82517509}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &535912257
 GameObject:
   m_ObjectHideFlags: 0
@@ -5591,6 +5689,38 @@ Transform:
   m_Children: []
   m_Father: {fileID: 869594678}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1056415446
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1056415447}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: GameObject (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1056415447
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1056415446}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 22.44}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1766432353}
+  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!1 &1080868191
 GameObject:
   m_ObjectHideFlags: 0
@@ -5689,6 +5819,38 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+--- !u!1 &1155545070
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1155545071}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: GameObject (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1155545071
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1155545070}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -1, z: -0, w: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1582393390}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1185765189
 GameObject:
   m_ObjectHideFlags: 0
@@ -5722,6 +5884,38 @@ Transform:
   - {fileID: 1927815586}
   m_Father: {fileID: 8535240}
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+--- !u!1 &1243025901
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1243025902}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: GameObject (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1243025902
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1243025901}
+  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: 82517509}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!213 &1269329713
 Sprite:
   m_ObjectHideFlags: 0
@@ -7379,6 +7573,69 @@ Transform:
   - {fileID: 312708677}
   m_Father: {fileID: 584408559}
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+--- !u!1 &1557285919
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1557285921}
+  - component: {fileID: 1557285920}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!114 &1557285920
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1557285919}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8b0bd7b63396499eacce1f4c28a706ea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Transforms:
+  - {fileID: 82517509}
+  - {fileID: 1243025902}
+  - {fileID: 533860923}
+  - {fileID: 424169261}
+  BesselPath:
+    isActive: 0
+    controlPoints:
+    - {x: -3.4419997, y: 0, z: 0}
+    - {x: -3.4419997, y: 0, z: 0}
+    - {x: -3.4419997, y: 0, z: 6.81}
+    - {x: -5.2619996, y: 0, z: 9.89}
+    allDis: 0
+  isRun: 0
+  strat0ff: {x: 0, y: 0, z: 0}
+  endOff: {x: -1.82, y: 0, z: 3.0800004}
+--- !u!4 &1557285921
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1557285919}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -3.4419997, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 82517509}
+  - {fileID: 424169261}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!213 &1572835774
 Sprite:
   m_ObjectHideFlags: 0
@@ -7605,6 +7862,40 @@ Sprite:
     - {x: 0.45, y: -0.17}
   m_Bones: []
   m_SpriteID: 5e97eb03825dee720800000000000000
+--- !u!1 &1582393389
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1582393390}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1582393390
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1582393389}
+  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:
+  - {fileID: 2068818558}
+  - {fileID: 1155545071}
+  m_Father: {fileID: 1766432353}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1584646302
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -8702,6 +8993,69 @@ Sprite:
     - {x: 0.64, y: 0.64}
   m_Bones: []
   m_SpriteID: 5e97eb03825dee720800000000000000
+--- !u!1 &1766432351
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1766432353}
+  - component: {fileID: 1766432352}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: GameObject (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!114 &1766432352
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1766432351}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8b0bd7b63396499eacce1f4c28a706ea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Transforms:
+  - {fileID: 1582393390}
+  - {fileID: 2068818558}
+  - {fileID: 1155545071}
+  - {fileID: 1056415447}
+  BesselPath:
+    isActive: 0
+    controlPoints:
+    - {x: -3.4419997, y: 0, z: -3.108}
+    - {x: -3.4419997, y: 0, z: -3.108}
+    - {x: -3.4419997, y: 0, z: -3.108}
+    - {x: -3.4419997, y: 0, z: 19.332}
+    allDis: 0
+  isRun: 0
+  strat0ff: {x: 0, y: 0, z: 0}
+  endOff: {x: 0, y: 0, z: 22.44}
+--- !u!4 &1766432353
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  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_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1582393390}
+  - {fileID: 1056415447}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!213 &1770406332
 Sprite:
   m_ObjectHideFlags: 0
@@ -10480,6 +10834,38 @@ Sprite:
     - {x: 0.64, y: 0.64}
   m_Bones: []
   m_SpriteID: 5e97eb03825dee720800000000000000
+--- !u!1 &2068818557
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2068818558}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: GameObject (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2068818558
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2068818557}
+  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: 1582393390}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!213 &2083193692
 Sprite:
   m_ObjectHideFlags: 0
@@ -11814,3 +12200,5 @@ SceneRoots:
   - {fileID: 2622624}
   - {fileID: 144571669}
   - {fileID: 1089162872}
+  - {fileID: 1557285921}
+  - {fileID: 1766432353}

Assets/Scripts/GameLogic/Combat/CombatEvent/CombatEventType.cs

@@ -38,6 +38,7 @@
         /// </summary>
         CombatExpAlter,
         UseMagicWeapon,
+        ShowUseMagicWeaponName,
         /// <summary>
         /// 功法改变
         /// </summary>

Assets/Scripts/GameLogic/Combat/CombatState/CombatFightState.cs

@@ -16,7 +16,7 @@ namespace GameLogic.Combat.CombatState
             CombatController.CombatCameraControllder.SetPos(playerHeroEntity.combatHeroGameObject.transform);
             CombatController.CombatCameraControllder.isStop = true;
             CombatController.IsFightState = true;
-            CombatController.currActiveCombat.CombatCameraControllder.SetFieldOfView(50);
+            CombatController.currActiveCombat.CombatCameraControllder.SetFieldOfView(55,3);
         }
 
         protected override void ProExit()

Assets/Scripts/GameLogic/Combat/CombatState/CombatIdleState.cs

@@ -22,7 +22,7 @@ namespace GameLogic.Combat.CombatState
 
                 CombatController.MagicWeaponCombatSence.CloseSecene();
             }
-            CombatController.currActiveCombat.CombatCameraControllder.SetFieldOfView(50);
+            CombatController.currActiveCombat.CombatCameraControllder.SetFieldOfView(55,3);
         }
 
         protected override void ProUpdate(float t)

Assets/Scripts/GameLogic/Combat/CombatState/CombatUpdateState.cs

@@ -42,7 +42,7 @@ namespace GameLogic.Combat.CombatState
             _nextMonsterTime = Random.Range(5, 10);
             isNullMonster = true;
             CombatController.MagicWeaponCombatSence.CloseSecene();
-            CombatController.currActiveCombat.CombatCameraControllder.SetFieldOfView(80);
+            CombatController.currActiveCombat.CombatCameraControllder.SetFieldOfView(80,1);
         }
 
         protected override void ProUpdate(float t)
@@ -78,7 +78,7 @@ namespace GameLogic.Combat.CombatState
             Vector3 dir = Vector3.zero;
             float fx = 1;
 
-            pos = CombatController.currActiveCombat.CombatSenceController.Move(30 * t);
+            pos = CombatController.currActiveCombat.CombatSenceController.Move(10 * t);
             float lt = CombatController.currActiveCombat.CombatSenceController.currTime - 0.01f;
             Vector3 p = CombatController.currActiveCombat.CombatSenceController.GetTarget(lt);
             dir = (pos - p).normalized;

Assets/Scripts/GameLogic/Combat/CombatTool/CombatCameraControllder.cs

@@ -36,6 +36,7 @@ namespace GameLogic.Combat.CombatTool
         private float FieldOfViewTime;
         private float FieldOfViewTargetValue;
         private float FieldOfViewStartValue;
+        private float FieldOfViewSpeed;
 
         public void Init(CombatController combatController, Camera camera)
         {
@@ -98,8 +99,9 @@ namespace GameLogic.Combat.CombatTool
             isStartShake = false;
         }
 
-        public void SetFieldOfView(float fieldOfView)
+        public void SetFieldOfView(float fieldOfView,float speed)
         {
+            FieldOfViewSpeed=speed;
             FieldOfViewTime = 0;
             FieldOfViewStartValue = Camera.fieldOfView;
             FieldOfViewTargetValue = fieldOfView;
@@ -111,7 +113,7 @@ namespace GameLogic.Combat.CombatTool
 
             if (isUpdateFieldOfView)
             {
-                FieldOfViewTime += t;
+                FieldOfViewTime += t*FieldOfViewSpeed;
                 Camera.fieldOfView = Mathf.Lerp(FieldOfViewStartValue, FieldOfViewTargetValue, FieldOfViewTime);
                 if (FieldOfViewTime >= 1)
                 {

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

@@ -74,10 +74,10 @@ namespace GameLogic.Combat.CombatTool
             }
             Vector3 p = besselPath.GetValue(0.99f);
             lasetDir = (target - p).normalized;
-            GameObject gameObject = new GameObject("path");
-            gameObject.transform.position = satrtPos;
-            CombatPathMono combatPathMono = gameObject.AddComponent<CombatPathMono>();
-            combatPathMono.BesselPath = besselPath;
+            // GameObject gameObject = new GameObject("path");
+            // gameObject.transform.position = satrtPos;
+            // CombatPathMono combatPathMono = gameObject.AddComponent<CombatPathMono>();
+            // combatPathMono.BesselPath = besselPath;
             InitZhuangSHi(besselPath);
             return besselPath;
         }
@@ -85,21 +85,21 @@ namespace GameLogic.Combat.CombatTool
         private CombatSencePath InitBesselPath(Vector3 satrtPos, float offx)
         {
             CombatSencePath besselPath = new CombatSencePath();
-            Vector3 dir = Quaternion.LookRotation(lasetDir) * new Vector3(offx, 0, 1);
+            Vector3 dir = Quaternion.LookRotation(lasetDir) * new Vector3(offx*0.3f, 0, 1);
             Vector3 target = satrtPos + dir.normalized * maxD;
-            Vector3 dir2 = Quaternion.LookRotation(lasetDir) * new Vector3(offx * -1, 0, 1);
+            Vector3 dir2 = Quaternion.LookRotation(lasetDir) * new Vector3(0, 0, 1);
             dir2 = dir2.normalized;
-            Vector3 centre = satrtPos + dir2.normalized * maxD;
+            Vector3 centre = satrtPos + dir2.normalized * maxD*0.7f;
             // if (offx == 0)
             {
                 besselPath.SetPos(satrtPos, centre, target);
             }
             Vector3 p = besselPath.GetValue(0.99f);
             lasetDir = (target - p).normalized;
-            GameObject gameObject = new GameObject("path");
-            gameObject.transform.position = satrtPos;
-            CombatPathMono combatPathMono = gameObject.AddComponent<CombatPathMono>();
-            combatPathMono.BesselPath = besselPath;
+            // GameObject gameObject = new GameObject("path");
+            // gameObject.transform.position = satrtPos;
+            // CombatPathMono combatPathMono = gameObject.AddComponent<CombatPathMono>();
+            // combatPathMono.BesselPath = besselPath;
             InitZhuangSHi(besselPath);
             return besselPath;
         }

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Core.Utility;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Combat.CombatTool.SceneTool;
@@ -10,30 +11,44 @@ namespace GameLogic.Combat.CombatTool
     [Serializable]
     public class CombatSencePath : CObject
     {
-        public Vector3 a;
-        public Vector3 b;
-        public Vector3 Centre;
+        public BesselPath BesselPath;
+
+        // public Vector3 a;
+        public Vector3 b
+        {
+            get { return BesselPath.controlPoints[3]; }
+        }
+
+        // public Vector3 Centre;
         public bool isCentre;
 
         public float reclaimTime;
 
         public List<SceneDecoration> allPool = new List<SceneDecoration>();
 
-        public float len;
+        public float len
+        {
+            get { return BesselPath.allDis; }
+        }
 
         public void SetPos(Vector3 startPos, Vector3 target)
         {
-            a = startPos;
-            b = target;
+            BesselPath = new BesselPath();
+            BesselPath.controlPoints.Add(startPos);
+            BesselPath.controlPoints.Add(startPos);
+            BesselPath.controlPoints.Add(target);
+            BesselPath.controlPoints.Add(target);
             isCentre = false;
             SetLen();
         }
 
         public void SetPos(Vector3 startPos, Vector3 centre, Vector3 target)
         {
-            a = startPos;
-            Centre = centre;
-            b = target;
+            BesselPath = new BesselPath();
+            BesselPath.controlPoints.Add(startPos);
+            BesselPath.controlPoints.Add(startPos);
+            BesselPath.controlPoints.Add(centre);
+            BesselPath.controlPoints.Add(target);
             isCentre = true;
             SetLen();
         }
@@ -41,40 +56,12 @@ namespace GameLogic.Combat.CombatTool
 
         private void SetLen()
         {
-            float a = 1 / 100f;
-            len = 0;
-            for (int i = 0; i < 100; i++)
-            {
-                Vector3 p = GetValue(i * a);
-                Vector3 p2 = GetValue((i + 1) * a);
-                len += Vector3.Distance(p, p2);
-            }
+            BesselPath.SetLengthAtT();
         }
 
         public Vector3 GetValue(float t)
         {
-            float t1 = t;
-            if (t1 > 1)
-            {
-                t1 = 1;
-            }
-
-            if (t1 < 0)
-            {
-                t1 = 0;
-            }
-
-
-            if (isCentre)
-            {
-                Vector3 p1 = Vector3.Lerp(a, Centre, t1);
-                Vector3 p2 = Vector3.Lerp(p1, b, t1);
-                return p2;
-            }
-            else
-            {
-                return Vector3.Lerp(a, b, t1);
-            }
+            return BesselPath.CalculatePoint(t);
         }
 
         public void Update(float t)

Assets/Scripts/GameLogic/Combat/Hero/CombatMagicWeaponEntity.cs

@@ -24,6 +24,9 @@ namespace GameLogic.Combat.Hero
         public float cd = 2;
 
         public WuXingType WuXingType;
+        public FaBaoInfo FaBaoInfo {
+            get { return _faBaoInfo;}
+        }
         private FaBaoInfo _faBaoInfo;
 
         public float HpBl

Assets/Scripts/GameLogic/Combat/Hero/MagicWeaponControl.cs

@@ -72,6 +72,11 @@ namespace GameLogic.Combat.Hero
 
         public void UseMagicWeapon(CombatMagicWeaponEntity combatMagicWeaponEntity)
         {
+            UseMagicWeaponEventData useMagicWeaponEventData = UseMagicWeaponEventData.Create();
+            useMagicWeaponEventData.combatHeroEntity = combatHeroEntity;
+            useMagicWeaponEventData.combatMagicWeaponEntity = combatMagicWeaponEntity;
+            CombatEventManager.Instance.Dispatch(CombatEventType.UseMagicWeapon, useMagicWeaponEventData);
+            // CombatEventManager.Instance.AddEventListener(CombatEventType.UseMagicWeapon,
             CombatController.currActiveCombat.MagicWeaponCombatSence.AddMagicWeaponToSence(combatMagicWeaponEntity);
         }
 

Assets/Scripts/GameLogic/Combat/Hero/State/MagicWeaponChuChangState.cs

@@ -1,4 +1,5 @@
 using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using Common.Utility.CombatEvent;
 using GameLogic.Combat.CombatTool;
 using UnityEngine;
 using Utility.CTween;
@@ -17,6 +18,8 @@ namespace GameLogic.Combat.Hero.State
         private TimeLineEventLogicGroupBasic timeLineEventLogicGroup;
 
         private bool isUpdate;
+        private int[] xOff = new int[] { 0, 1, -1, 2, -2 };
+
         public MagicWeaponChuChangState(CombatHeroEntity combatHeroEntity) : base(combatHeroEntity)
         {
             myCombatMagicWeaponEntity = combatHeroEntity as CombatMagicWeaponEntity;
@@ -34,13 +37,14 @@ namespace GameLogic.Combat.Hero.State
                 .combatHeroEntity.GameObject.transform.rotation;
             myCombatMagicWeaponEntity.GameObject.SetActive(true);
             startPos = myCombatMagicWeaponEntity.MagicWeaponControl.combatHeroEntity.dotPos;
-            float y = myCombatMagicWeaponEntity.IsEnemy ? 5: 5;
-            float x = myCombatMagicWeaponEntity.useIndex*1.5f;
+            float y = myCombatMagicWeaponEntity.IsEnemy ? 5 : 5;
+            float x = xOff[myCombatMagicWeaponEntity.useIndex];
 
-            endPos= myCombatMagicWeaponEntity.MagicWeaponControl.combatHeroEntity.GameObject.transform.TransformPoint(
-                new Vector3(x - 3, y, 0));
+            endPos = myCombatMagicWeaponEntity.MagicWeaponControl.combatHeroEntity.GameObject.transform.TransformPoint(
+                new Vector3(x, y, 0));
             // endPos = startPos +  Vector3(x-3, y, 0);
-            _addTime = 1.0f / (Vector3.Distance(startPos, endPos) / CustomTweenManager.AnimationCurveLibrary.fabaoMoveTopSpeed);
+            _addTime = 1.0f / (Vector3.Distance(startPos, endPos) /
+                               CustomTweenManager.AnimationCurveLibrary.fabaoMoveTopSpeed);
             _currTime = 0;
             isUpdate = true;
         }
@@ -63,6 +67,10 @@ namespace GameLogic.Combat.Hero.State
                 {
                     timeLineEventLogicGroup.CloseLoopFx();
                 }
+                UseMagicWeaponEventData useMagicWeaponEventData = UseMagicWeaponEventData.Create();
+                useMagicWeaponEventData.combatHeroEntity = myCombatMagicWeaponEntity.MagicWeaponControl.combatHeroEntity;
+                useMagicWeaponEventData.combatMagicWeaponEntity = myCombatMagicWeaponEntity;
+                CombatEventManager.Instance.Dispatch(CombatEventType.ShowUseMagicWeaponName, useMagicWeaponEventData);
                 // myCombatMagicWeaponEntity.GameObject.SetActive(true);
                 timeLineEventLogicGroup =
                     combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup("show");
@@ -70,7 +78,6 @@ namespace GameLogic.Combat.Hero.State
                 {
                     timeLineEventLogicGroup.TimeLineUpdateEnd = delegate()
                     {
-                      
                         timeLineEventLogicGroup.CloseLoopFx();
                         myCombatMagicWeaponEntity.isCombatState = true;
                         myCombatMagicWeaponEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);

Assets/Scripts/GameLogic/Combat/Hero/State/MagicWeaponIdleState.cs

@@ -28,6 +28,7 @@ namespace GameLogic.Combat.Hero
             TimeLineEventLogicGroupBasic timeLineEventLogicGroup =
                 combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup("run");
             _awaitTime = 1.0f;
+         
         }
 
 

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

@@ -41,71 +41,71 @@ namespace Fort23.Mono
         {
         }
 
-        private async void TargetAlter(IEventData iEventData)
-        {
-            CombatHeroTargetAlterEventData combatHeroTargetAlterEventData =
-                iEventData as CombatHeroTargetAlterEventData;
-            if (combatHeroTargetAlterEventData.combatHeroEntity.IsEnemy)
-            {
-                return;
-            }
-
-            if (combatHeroTargetAlterEventData.targetCombatHeroEntity != null)
-            {
-                CombatHeroEntity t = combatHeroTargetAlterEventData.targetCombatHeroEntity as CombatHeroEntity;
-                if (t != null)
-                {
-                    if (t.CurrCombatHeroInfo.heroType == 4||t.CurrCombatHeroInfo.heroType ==3)
-                    {
-                        return;
-                    }
-
-                    if (!currTargetHeroHp.TryGetValue(combatHeroTargetAlterEventData.targetCombatHeroEntity,
-                            out int count))
-                    {
-                    }
-
-                    if (count <= 0)
-                    {
-                        CreateHpUI(t);
-                    }
-
-                    count++;
-                    currTargetHeroHp[t] = count;
-                }
-            }
-
-            if (combatHeroTargetAlterEventData.lasetCombatHeroEntity != null)
-            {
-                CombatHeroEntity t = combatHeroTargetAlterEventData.lasetCombatHeroEntity as CombatHeroEntity;
-              
-                if (t != null)
-                {
-                    if (t.CurrCombatHeroInfo.heroType == 4||t.CurrCombatHeroInfo.heroType ==3)
-                    {
-                        return;
-                    }
-                    if (currTargetHeroHp.TryGetValue(combatHeroTargetAlterEventData.lasetCombatHeroEntity,
-                            out int count))
-                    {
-                        count--;
-                        if (count <= 0)
-                        {
-                            currTargetHeroHp.Remove(combatHeroTargetAlterEventData.lasetCombatHeroEntity);
-                            HeroHpUpdateEventData heroHpUpdateEventData = HeroHpUpdateEventData.Create();
-                            heroHpUpdateEventData.combatHeroEntity = t;
-                            CombatEventManager.Instance.Dispatch(CombatEventType.ClearHeroHp, heroHpUpdateEventData);
-                        }
-                        else
-                        {
-                            currTargetHeroHp[t] = count;
-                        }
-
-                       
-                    }
-                }
-            }
-        }
+        // private async void TargetAlter(IEventData iEventData)
+        // {
+        //     CombatHeroTargetAlterEventData combatHeroTargetAlterEventData =
+        //         iEventData as CombatHeroTargetAlterEventData;
+        //     if (combatHeroTargetAlterEventData.combatHeroEntity.IsEnemy)
+        //     {
+        //         return;
+        //     }
+        //
+        //     if (combatHeroTargetAlterEventData.targetCombatHeroEntity != null)
+        //     {
+        //         CombatHeroEntity t = combatHeroTargetAlterEventData.targetCombatHeroEntity as CombatHeroEntity;
+        //         if (t != null)
+        //         {
+        //             if (t.CurrCombatHeroInfo.heroType == 4||t.CurrCombatHeroInfo.heroType ==3)
+        //             {
+        //                 return;
+        //             }
+        //
+        //             if (!currTargetHeroHp.TryGetValue(combatHeroTargetAlterEventData.targetCombatHeroEntity,
+        //                     out int count))
+        //             {
+        //             }
+        //
+        //             if (count <= 0)
+        //             {
+        //                 CreateHpUI(t);
+        //             }
+        //
+        //             count++;
+        //             currTargetHeroHp[t] = count;
+        //         }
+        //     }
+        //
+        //     if (combatHeroTargetAlterEventData.lasetCombatHeroEntity != null)
+        //     {
+        //         CombatHeroEntity t = combatHeroTargetAlterEventData.lasetCombatHeroEntity as CombatHeroEntity;
+        //       
+        //         if (t != null)
+        //         {
+        //             if (t.CurrCombatHeroInfo.heroType == 4||t.CurrCombatHeroInfo.heroType ==3)
+        //             {
+        //                 return;
+        //             }
+        //             if (currTargetHeroHp.TryGetValue(combatHeroTargetAlterEventData.lasetCombatHeroEntity,
+        //                     out int count))
+        //             {
+        //                 count--;
+        //                 if (count <= 0)
+        //                 {
+        //                     currTargetHeroHp.Remove(combatHeroTargetAlterEventData.lasetCombatHeroEntity);
+        //                     HeroHpUpdateEventData heroHpUpdateEventData = HeroHpUpdateEventData.Create();
+        //                     heroHpUpdateEventData.combatHeroEntity = t;
+        //                     CombatEventManager.Instance.Dispatch(CombatEventType.ClearHeroHp, heroHpUpdateEventData);
+        //                 }
+        //                 else
+        //                 {
+        //                     currTargetHeroHp[t] = count;
+        //                 }
+        //
+        //                
+        //             }
+        //         }
+        //     }
+        // }
 
         private async void CreateHpUI(CombatHeroEntity combatHeroEntity)
         {
@@ -118,9 +118,9 @@ namespace Fort23.Mono
 
         private async void CreateHeroHp(IEventData iEventData)
         {
-            CreateHeroHpEventData createHeroHpEventData = iEventData as CreateHeroHpEventData;
-            CombatHeroEntity combatHeroEntity = createHeroHpEventData.combatHeroEntity;
-            CreateHpUI(combatHeroEntity);
+            // CreateHeroHpEventData createHeroHpEventData = iEventData as CreateHeroHpEventData;
+            // CombatHeroEntity combatHeroEntity = createHeroHpEventData.combatHeroEntity;
+            // CreateHpUI(combatHeroEntity);
         }
 
         public override void Close()

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

@@ -50,7 +50,7 @@ namespace Fort23.Mono
             // CombatEventManager.Instance.AddEventListener(CombatEventType.AddMagicWeaponHeroEntity,
             //     AddMagicWeaponHeroEntity);
             CombatEventManager.Instance.AddEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
-
+            CombatEventManager.Instance.AddEventListener(CombatEventType.ShowUseMagicWeaponName, UseMagicWeapon);
             StaticUpdater.Instance.AddLateUpdateCallBack(Update);
             // CameraSelect.value = 0.7f;
         }
@@ -60,10 +60,33 @@ namespace Fort23.Mono
             // CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddMagicWeaponHeroEntity,
             //     AddMagicWeaponHeroEntity);
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
-
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.ShowUseMagicWeaponName, UseMagicWeapon);
             StaticUpdater.Instance.RemoveLateUpdateCallBack(Update);
         }
 
+        private async void UseMagicWeapon(IEventData ieveData)
+        {
+            UseMagicWeaponEventData eventData = ieveData as UseMagicWeaponEventData;
+            CombatMagicWeaponEntity combatMagicWeaponEntity = eventData.combatMagicWeaponEntity;
+            CombatHeroEntity combatHeroEntity = eventData.combatHeroEntity;
+            FaBaoSkillNameWidget faBaoSkillNameWidget =
+                await UIManager.Instance.CreateGComponentForObject<FaBaoSkillNameWidget>(FaBaoSkillNameWidget, null,
+                    FaBaoSkillDec, isInstance: true);
+            Vector3 pos = Vector3.zero;
+            if (combatMagicWeaponEntity.IsEnemy)
+            {
+                 pos = combatMagicWeaponEntity.GameObject.transform.TransformPoint(new Vector3(-1, 2, 0));
+            }
+            else
+            {
+                pos = combatMagicWeaponEntity.GameObject.transform.TransformPoint(new Vector3(-0.5f, 0.5f, 0));
+            }
+
+            // combatHeroEntity.dotPos+
+            faBaoSkillNameWidget.ShowWidget(combatMagicWeaponEntity.FaBaoInfo.FabaoConfig.model, pos);
+            // useQuqueSkill.transform.SetAsLastSibling();
+        }
+
         private async void AddUseGongFa(IEventData ieveData)
         {
             AddUseGongFaEventData eventData = ieveData as AddUseGongFaEventData;

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

@@ -151,6 +151,28 @@ namespace Fort23.Mono
 	      return _BossHpRoot;
 	     }
 	   }
+	  private GameObject _FaBaoSkillNameWidget;
+	  public GameObject FaBaoSkillNameWidget
+	   {
+	   get{
+	      if (_FaBaoSkillNameWidget == null)
+	       {
+	         _FaBaoSkillNameWidget  = GetUIUnit<GameObject>("FaBaoSkillNameWidget"); 
+	       }
+	      return _FaBaoSkillNameWidget;
+	     }
+	   }
+	  private RectTransform _FaBaoSkillDec;
+	  public RectTransform FaBaoSkillDec
+	   {
+	   get{
+	      if (_FaBaoSkillDec == null)
+	       {
+	         _FaBaoSkillDec  = GetUIUnit<RectTransform>("FaBaoSkillDec"); 
+	       }
+	      return _FaBaoSkillDec;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -0,0 +1,32 @@
+using Fort23.Core;
+using UnityEngine;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "FaBaoSkillNameWidget")]
+    public partial class FaBaoSkillNameWidget : UIComponent
+    {
+        private void Init()
+        {
+        }
+
+        public override void AddEvent()
+        {
+        }
+
+        public override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+        }
+
+        public void ShowWidget(string name, Vector3 dotPos)
+        {
+            faBaoName.text = name;
+            transform.position = UIManager.Instance.WorldToUIWorld(dotPos);
+            TimerComponent.Instance.AddTimer(1000, delegate() { UIManager.Instance.DormancyGComponent(this); });
+        }
+    }
+}

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

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

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

@@ -0,0 +1,29 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class FaBaoSkillNameWidget 
+	{
+	  #region 自定义数据 
+	  private Text _faBaoName;
+	  public Text faBaoName
+	   {
+	   get{
+	      if (_faBaoName == null)
+	       {
+	         _faBaoName  = GetUIUnit<Text>("faBaoName"); 
+	       }
+	      return _faBaoName;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

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

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

UserSettings/Layouts/default-2022.dwlt

@@ -14,17 +14,69 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: -2552
+    x: 8
     y: 51
     width: 2544
     height: 1333
   m_ShowMode: 4
-  m_Title: Game
-  m_RootView: {fileID: 2}
+  m_Title: Project
+  m_RootView: {fileID: 4}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 0
 --- !u!114 &2
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: SceneView
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 609
+    width: 1201
+    height: 674
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 16}
+  m_Panes:
+  - {fileID: 16}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &3
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 11}
+  - {fileID: 2}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1201
+    height: 1283
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 8096, y: 16192}
+  vertical: 1
+  controlID: 9812
+  draggingID: 0
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -37,9 +89,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 3}
-  - {fileID: 4}
   - {fileID: 5}
+  - {fileID: 6}
+  - {fileID: 7}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -52,7 +104,7 @@ MonoBehaviour:
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &3
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -74,7 +126,7 @@ MonoBehaviour:
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &4
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -87,22 +139,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 9}
-  - {fileID: 6}
-  - {fileID: 7}
+  - {fileID: 3}
   - {fileID: 8}
+  - {fileID: 9}
+  - {fileID: 10}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
     width: 2544
     height: 1283
-  m_MinSize: {x: 400, y: 50}
-  m_MaxSize: {x: 32384, y: 8096}
+  m_MinSize: {x: 400, y: 100}
+  m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 55
+  controlID: 9811
   draggingID: 0
---- !u!114 &5
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -123,7 +175,7 @@ MonoBehaviour:
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &6
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -144,12 +196,12 @@ MonoBehaviour:
     height: 1283
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 10}
+  m_ActualView: {fileID: 12}
   m_Panes:
-  - {fileID: 10}
+  - {fileID: 12}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &7
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -170,12 +222,12 @@ MonoBehaviour:
     height: 1283
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 12}
+  m_ActualView: {fileID: 14}
   m_Panes:
-  - {fileID: 12}
+  - {fileID: 14}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &8
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -194,14 +246,14 @@ MonoBehaviour:
     y: 0
     width: 443
     height: 1283
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 11}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 13}
   m_Panes:
-  - {fileID: 11}
+  - {fileID: 13}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &9
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -211,7 +263,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneView
+  m_Name: GameView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
@@ -219,16 +271,15 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 1201
-    height: 1283
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 14}
+    height: 609
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 15}
   m_Panes:
-  - {fileID: 13}
-  - {fileID: 14}
-  m_Selected: 1
+  - {fileID: 15}
+  m_Selected: 0
   m_LastSelected: 0
---- !u!114 &10
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -248,7 +299,7 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -1351
+    x: 1209
     y: 81
     width: 286
     height: 1262
@@ -265,25 +316,25 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
-      m_LastClickedID: 0
-      m_ExpandedIDs: eae9f7ffde33f9fff033f9ff6234f9ff2c39f9ff3239f9ff223af9ff303af9ffd891fdffe291fdfff291fdff929dfdffa09dfdffe2d9fdffecd9fdfff6d9fdff06dafdff88e5fdff96e5fdfff2a7ffff2ea8fffff8adffff06aeffff78faffff
+      m_SelectedIDs: 02b9f9ff
+      m_LastClickedID: -411390
+      m_ExpandedIDs: 22e9fbff8a4ffcff904ffcffe4c6fcffeac6fcff1290fdff9a02feffec4cfeff004dfeffe495feff5afaffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: 
-        m_OriginalName: 
+        m_Name: path
+        m_OriginalName: path
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 0
+        m_UserData: -405690
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 11
+        m_OriginalEventType: 4
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 6}
+        m_ClientGUIView: {fileID: 8}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -291,7 +342,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &11
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -311,7 +362,7 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -451
+    x: 2109
     y: 81
     width: 442
     height: 1262
@@ -338,7 +389,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &12
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -358,7 +409,7 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -1063
+    x: 1497
     y: 81
     width: 610
     height: 1262
@@ -383,7 +434,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/GameUI/UI/DialoguePanel
+    - Assets/Scripts/GameLogic/Combat/CombatTool
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -391,32 +442,32 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Scripts/GameUI/UI/DialoguePanel
+  - Assets/Scripts/GameLogic/Combat/CombatTool
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: D:\FB\XiuXianGame
+  m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 38}
-    m_SelectedIDs: 6ec70000
-    m_LastClickedID: 51054
-    m_ExpandedIDs: 00000000d6be0000d8be0000dabe000042bf000050bf000064bf00006ebf000082bf000068c700006cc7000000ca9a3b
+    scrollPos: {x: 0, y: 360}
+    m_SelectedIDs: 867b0200
+    m_LastClickedID: 162694
+    m_ExpandedIDs: 0000000060bc000062bc000064bc000066bc000068bc00006abc00006cbc00006ebc000070bc000072bc000074bc000078bc00007abc00007cbc00007ebc000080bc000084bc000086bc000088bc00008abc00008cbc0000e4c00000887b020000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: Res
+      m_OriginalName: Res
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 48256
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 0}
+      m_ClientGUIView: {fileID: 9}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -428,7 +479,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000d6be0000d8be0000dabe0000
+    m_ExpandedIDs: 0000000060bc000062bc000064bc000066bc000068bc00006abc00006cbc00006ebc000070bc000072bc000074bc000076bc000078bc00007abc00007cbc00007ebc000080bc000082bc000084bc000086bc000088bc00008abc00008cbc0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -459,20 +510,20 @@ MonoBehaviour:
     m_ExpandedInstanceIDs: 
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: DivineSenceEventResultPanel
-      m_OriginalName: DivineSenceEventResultPanel
+      m_Name: fb_huohulu
+      m_OriginalName: fb_huohulu
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 189696
+      m_UserData: 57174
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
       m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 7}
+      m_ClientGUIView: {fileID: 9}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -484,7 +535,7 @@ MonoBehaviour:
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 351
---- !u!114 &13
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -504,10 +555,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -2552
+    x: 8
     y: 81
     width: 1200
-    height: 1262
+    height: 588
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -533,7 +584,7 @@ MonoBehaviour:
   m_VSyncEnabled: 0
   m_Gizmos: 0
   m_Stats: 0
-  m_SelectedSizes: 08000000000000000000000012000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 07000000000000000000000012000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
     m_HRangeLocked: 0
     m_VRangeLocked: 0
@@ -549,9 +600,9 @@ MonoBehaviour:
     m_VAllowExceedBaseRangeMax: 1
     m_ScaleWithWindow: 0
     m_HSlider: 0
-    m_VSlider: 0
+    m_VSlider: 1
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 0
+    m_EnableMouseInput: 1
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
@@ -561,28 +612,28 @@ MonoBehaviour:
       x: 0
       y: 21
       width: 1200
-      height: 1241
-    m_Scale: {x: 0.76416254, y: 0.76416254}
-    m_Translation: {x: 600, y: 620.5}
+      height: 567
+    m_Scale: {x: 0.40403914, y: 0.40403914}
+    m_Translation: {x: 600, y: 248.9416}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -785.1733
-      y: -812
-      width: 1570.3466
-      height: 1624
+      x: -1485.0046
+      y: -616.1324
+      width: 2970.0093
+      height: 1403.3293
     m_MinimalGUI: 1
-  m_defaultScale: 0.76416254
-  m_LastWindowPixelSize: {x: 1200, y: 1262}
+  m_defaultScale: 0.34913793
+  m_LastWindowPixelSize: {x: 1200, y: 588}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &14
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -602,10 +653,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -2552
-    y: 81
+    x: 8
+    y: 690
     width: 1200
-    height: 1262
+    height: 653
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -672,7 +723,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 0, y: 25}
+      snapOffset: {x: 0, y: 0}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: unity-transform-toolbar
@@ -698,9 +749,9 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 67.5, y: 86}
-      snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
+      snapOffset: {x: 67.5, y: -107}
+      snapOffsetDelta: {x: 0, y: -16}
+      snapCorner: 2
       id: Orientation
       index: 0
       layout: 4
@@ -841,7 +892,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 0
-      snapOffset: {x: 0, y: 0}
+      snapOffset: {x: 0, y: 25}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Particles
@@ -953,20 +1004,33 @@ MonoBehaviour:
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 48, y: 10}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: UnityEditor.SceneViewCameraOverlay
+      index: 12
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
     m_OverlaysVisible: 1
   m_WindowGUID: 3de2bc164a2229345aaffb3c6f51b287
   m_Gizmos: 1
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
-  m_2DMode: 1
+  m_2DMode: 0
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -1.2977293, y: 1.5301197, z: -0.010358917}
+    m_Target: {x: 17.096537, y: 84.89492, z: 59.795376}
     speed: 2
-    m_Value: {x: -1.2977293, y: 1.5301197, z: -0.010358917}
+    m_Value: {x: 17.096537, y: 84.89492, z: 59.795376}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -994,17 +1058,17 @@ MonoBehaviour:
       m_Size: {x: 0, y: 0}
     yGrid:
       m_Fade:
-        m_Target: 0
+        m_Target: 1
         speed: 2
-        m_Value: 0
+        m_Value: 1
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
     zGrid:
       m_Fade:
-        m_Target: 1
+        m_Target: 0
         speed: 2
-        m_Value: 1
+        m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
@@ -1012,17 +1076,17 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0, y: 0, z: 0, w: 1}
+    m_Target: {x: -0.27148616, y: -0.6173056, z: 0.24002555, w: -0.6983244}
     speed: 2
-    m_Value: {x: 0, y: 0, z: 0, w: 1}
+    m_Value: {x: -0.27148074, y: -0.61729324, z: 0.24002074, w: -0.6983104}
   m_Size:
-    m_Target: 2.078711
+    m_Target: 7.7563634
     speed: 2
-    m_Value: 2.078711
+    m_Value: 7.7563634
   m_Ortho:
-    m_Target: 1
+    m_Target: 0
     speed: 2
-    m_Value: 1
+    m_Value: 0
   m_CameraSettings:
     m_Speed: 1
     m_SpeedNormalized: 0.5