done health bar

2025-11-25 16:20:55 +07:00
parent 0b22878be6
commit 31f4012bec
8 changed files with 980 additions and 1430 deletions
@@ -2,6 +2,7 @@ using System;
 using CSNetwork.GPDataType;
 using TMPro;
 using UnityEngine;
+using UnityEngine.UI;

 namespace BrewMonster
 {
@@ -12,6 +13,9 @@ namespace BrewMonster
        public TextMeshProUGUI expText;
        public TextMeshProUGUI nameText;
        public TextMeshProUGUI levelText;
+        public Image healthImage;
+        public Image manaImage;
+        public Image expImage;

        public float neededExp;
        private void Awake()
@@ -21,6 +25,13 @@ namespace BrewMonster
            EventBus.Subscribe<EXPToUpLevel>(UpdateNeededExp);
        }

+        private void OnDestroy()
+        {
+            EventBus.Unsubscribe<cmd_self_info_00>(UpdateHostPlayerInfoUI);
+            EventBus.Unsubscribe<InfoHostPlayer>(UpdateNameHostPlayer);
+            EventBus.Unsubscribe<EXPToUpLevel>(UpdateNeededExp);
+        }
+
        private void UpdateNeededExp(EXPToUpLevel obj)
        {
            neededExp = obj.NeededExp;
@@ -33,10 +44,14 @@ namespace BrewMonster

        private void UpdateHostPlayerInfoUI(cmd_self_info_00 obj)
        {
+            BMLogger.LogError("Update HUD Player Info");
            healthText.text = $"{obj.iHP}/{obj.iMaxHP}";
            manaText.text = $"{obj.iMP}/{obj.iMaxMP}";
            expText.text = $"{((float)obj.iExp/neededExp)*100}%";
            levelText.text = $"{obj.sLevel}";
+            healthImage.fillAmount = (float)obj.iHP / (float)obj.iMaxHP;
+            manaImage.fillAmount = (float)obj.iMP / (float)obj.iMaxMP;
+            expImage.fillAmount = (float)obj.iExp / (float)neededExp;
        }
    }
 }
@@ -0,0 +1,31 @@
+using System;
+using CSNetwork.GPDataType;
+using TMPro;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace BrewMonster.PerfectWorld.Scripts.UI
+{
+    public class UIPlayer : MonoBehaviour
+    {
+        public Image healthImage;
+     //   public TextMeshProUGUI healthText;
+     public CECHostPlayer hostplayer;
+        private void Start()
+        { 
+            hostplayer = GetComponentInParent<CECHostPlayer>();
+            EventBus.SubscribeChannel<cmd_self_info_00>(hostplayer.m_PlayerInfo.cid,UpdateHostPlayerInfoUI);
+        }
+
+        private void OnDestroy()
+        {
+            EventBus.UnsubscribeChannel<cmd_self_info_00>(hostplayer.m_PlayerInfo.cid,UpdateHostPlayerInfoUI);
+        }
+
+        private void UpdateHostPlayerInfoUI(cmd_self_info_00 obj)
+        {
+            //healthText.text = $"{obj.iHP}/{obj.iMaxHP}";
+            healthImage.fillAmount = (float)obj.iHP / obj.iMaxHP;
+        }
+    }
+}
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 3a7b59d5bbe14947a77334fc659033df
+timeCreated: 1764058877
@@ -1,80 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!1 &494527354240988833
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 488350059091319944}
-  - component: {fileID: 8593071179722408578}
-  - component: {fileID: 921419674790977218}
-  m_Layer: 5
-  m_Name: ImageSkill3
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &488350059091319944
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 494527354240988833}
-  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: 5846576993284758716}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8593071179722408578
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 494527354240988833}
-  m_CullTransparentMesh: 1
--- !u!114 &921419674790977218
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 494527354240988833}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &695809075354249832
 GameObject:
  m_ObjectHideFlags: 0
@@ -120,370 +45,6 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  _nextSceneName: LoginScene
--- !u!1 &1919778866676473847
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1142009100106113265}
-  - component: {fileID: 8065594275821516655}
-  - component: {fileID: 8504224074677298596}
-  - component: {fileID: 1151123696261167864}
-  m_Layer: 5
-  m_Name: ImageBorder
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &1142009100106113265
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1919778866676473847}
-  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: 1246341264222303661}
-  m_Father: {fileID: 2939659133088006666}
-  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.3055, y: 0}
-  m_SizeDelta: {x: 120, y: 120}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8065594275821516655
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1919778866676473847}
-  m_CullTransparentMesh: 1
--- !u!114 &8504224074677298596
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1919778866676473847}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
--- !u!114 &1151123696261167864
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1919778866676473847}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_ShowMaskGraphic: 1
--- !u!1 &3493024708801173976
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7142053399096767309}
-  - component: {fileID: 1276598646855116547}
-  - component: {fileID: 3189974089603112086}
-  - component: {fileID: 3458242582226058381}
-  - component: {fileID: 5797020864492755895}
-  m_Layer: 5
-  m_Name: ButtonSkill3
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &7142053399096767309
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3493024708801173976}
-  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: 5846576993284758716}
-  m_Father: {fileID: 33904160082820478}
-  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: 525, y: 22}
-  m_SizeDelta: {x: 160, y: 155.1223}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1276598646855116547
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3493024708801173976}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 67fd391520cbfd44f84a1c6bb57673c0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  skillbutton: {fileID: 0}
-  skillImage: {fileID: 0}
-  cooldownTime: 0
--- !u!222 &3189974089603112086
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3493024708801173976}
-  m_CullTransparentMesh: 1
--- !u!114 &3458242582226058381
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3493024708801173976}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.16981131, g: 0.15619436, b: 0.15619436, a: 0.62352943}
-  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: 10913, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
--- !u!114 &5797020864492755895
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3493024708801173976}
-  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: 1
-  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: 3458242582226058381}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
--- !u!1 &3978987014378155233
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2939659133088006666}
-  - component: {fileID: 7071724488663021237}
-  - component: {fileID: 445526918160676674}
-  - component: {fileID: 7095217816542363878}
-  - component: {fileID: 7456661863811740863}
-  m_Layer: 5
-  m_Name: ButtonSkill2
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &2939659133088006666
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3978987014378155233}
-  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: 1142009100106113265}
-  m_Father: {fileID: 33904160082820478}
-  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: 295, y: -131}
-  m_SizeDelta: {x: 160, y: 155.1223}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7071724488663021237
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3978987014378155233}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 67fd391520cbfd44f84a1c6bb57673c0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  skillbutton: {fileID: 0}
-  skillImage: {fileID: 0}
-  cooldownTime: 0
--- !u!222 &445526918160676674
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3978987014378155233}
-  m_CullTransparentMesh: 1
--- !u!114 &7095217816542363878
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3978987014378155233}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.16981131, g: 0.15619436, b: 0.15619436, a: 0.62352943}
-  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: 10913, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
--- !u!114 &7456661863811740863
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3978987014378155233}
-  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: 1
-  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: 7095217816542363878}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &4031863963514808284
 GameObject:
  m_ObjectHideFlags: 0
@@ -623,171 +184,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: ddf01aaf66ec43f2bc9deda891a457d3, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
--- !u!1 &8724842880287856420
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5846576993284758716}
-  - component: {fileID: 6596731477737614961}
-  - component: {fileID: 3597798642197841968}
-  - component: {fileID: 2324668322655309914}
-  m_Layer: 5
-  m_Name: ImageBorder
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &5846576993284758716
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8724842880287856420}
-  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: 488350059091319944}
-  m_Father: {fileID: 7142053399096767309}
-  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.3055, y: 0}
-  m_SizeDelta: {x: 120, y: 120}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6596731477737614961
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8724842880287856420}
-  m_CullTransparentMesh: 1
--- !u!114 &3597798642197841968
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8724842880287856420}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
--- !u!114 &2324668322655309914
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8724842880287856420}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_ShowMaskGraphic: 1
--- !u!1 &9142330036183254215
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1246341264222303661}
-  - component: {fileID: 4384866183590606767}
-  - component: {fileID: 1308811555402040857}
-  m_Layer: 5
-  m_Name: ImageSkill2
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &1246341264222303661
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9142330036183254215}
-  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: 1142009100106113265}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4384866183590606767
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9142330036183254215}
-  m_CullTransparentMesh: 1
--- !u!114 &1308811555402040857
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9142330036183254215}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1001 &1374891186868484667
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -1142,34 +538,10 @@ PrefabInstance:
      propertyPath: m_aSkillButton.Array.size
      value: 3
      objectReference: {fileID: 0}
-    - target: {fileID: 7339434961787820866, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: 'm_aSkillImage.Array.data[1]'
-      value: 
-      objectReference: {fileID: 1308811555402040857}
-    - target: {fileID: 7339434961787820866, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: 'm_aSkillImage.Array.data[2]'
-      value: 
-      objectReference: {fileID: 921419674790977218}
-    - target: {fileID: 7339434961787820866, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: 'm_aSkillButton.Array.data[1]'
-      value: 
-      objectReference: {fileID: 7456661863811740863}
-    - target: {fileID: 7339434961787820866, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: 'm_aSkillButton.Array.data[2]'
-      value: 
-      objectReference: {fileID: 5797020864492755895}
    - target: {fileID: 7339434961787820866, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
      propertyPath: AUIImagePictureList.Array.size
      value: 3
      objectReference: {fileID: 0}
-    - target: {fileID: 7339434961787820866, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: 'AUIImagePictureList.Array.data[1]'
-      value: 
-      objectReference: {fileID: 7071724488663021237}
-    - target: {fileID: 7339434961787820866, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: 'AUIImagePictureList.Array.data[2]'
-      value: 
-      objectReference: {fileID: 1276598646855116547}
    - target: {fileID: 7646065705685923996, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
      propertyPath: m_AnchoredPosition.x
      value: 264
@@ -1263,10 +635,10 @@ PrefabInstance:
    m_AddedGameObjects:
    - targetCorrespondingSourceObject: {fileID: 1608209508545832950, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
      insertIndex: -1
-      addedObject: {fileID: 2939659133088006666}
+      addedObject: {fileID: 2272012679362150154}
    - targetCorrespondingSourceObject: {fileID: 1608209508545832950, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
      insertIndex: -1
-      addedObject: {fileID: 7142053399096767309}
+      addedObject: {fileID: 6331912252351786375}
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
 --- !u!224 &33904160082820478 stripped
@@ -1279,6 +651,210 @@ RectTransform:
  m_CorrespondingSourceObject: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
  m_PrefabInstance: {fileID: 1597073214178286216}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1766854943939269159
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 33904160082820478}
+    m_Modifications:
+    - target: {fileID: 4284393271722921544, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_Name
+      value: ButtonSkill1 (2)
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 160
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 155.1223
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 613
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -134
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+--- !u!224 &6331912252351786375 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+  m_PrefabInstance: {fileID: 1766854943939269159}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &5826979442234998954
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 33904160082820478}
+    m_Modifications:
+    - target: {fileID: 4284393271722921544, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_Name
+      value: ButtonSkill1 (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 160
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 155.1223
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 390
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -232
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+--- !u!224 &2272012679362150154 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3}
+  m_PrefabInstance: {fileID: 5826979442234998954}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6181970391454287574
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -1437,6 +1013,18 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.x
      value: -2.8752
      objectReference: {fileID: 0}
+    - target: {fileID: 4616316815177720404, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
+      propertyPath: expImage
+      value: 
+      objectReference: {fileID: 3733224041861329312}
+    - target: {fileID: 4616316815177720404, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
+      propertyPath: manaImage
+      value: 
+      objectReference: {fileID: 6244221233348898833}
+    - target: {fileID: 4616316815177720404, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
+      propertyPath: healthImage
+      value: 
+      objectReference: {fileID: 7824698984410963527}
    - target: {fileID: 6306963712940686582, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
      propertyPath: m_AnchorMax.x
      value: 1
@@ -1639,3 +1227,36 @@ RectTransform:
  m_CorrespondingSourceObject: {fileID: 6641252726352799703, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
  m_PrefabInstance: {fileID: 6181970391454287574}
  m_PrefabAsset: {fileID: 0}
+--- !u!114 &3733224041861329312 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 7351517459147011958, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
+  m_PrefabInstance: {fileID: 6181970391454287574}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &6244221233348898833 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 246901321761552071, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
+  m_PrefabInstance: {fileID: 6181970391454287574}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &7824698984410963527 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 4133230328392276113, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
+  m_PrefabInstance: {fileID: 6181970391454287574}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
@@ -203,6 +203,7 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 8793437051475293945}
+  - component: {fileID: 2274946704047842688}
  m_Layer: 0
  m_Name: UIPlayer
  m_TagString: Untagged
@@ -226,6 +227,20 @@ Transform:
  - {fileID: 7804302986034915478}
  m_Father: {fileID: 5695237227048099898}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2274946704047842688
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5505736060713067023}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3a7b59d5bbe14947a77334fc659033df, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  healthImage: {fileID: 6923483925198672938}
+  hostplayer: {fileID: 0}
 --- !u!1 &5826062684364525110
 GameObject:
  m_ObjectHideFlags: 0
@@ -560,6 +575,6 @@ MonoBehaviour:
  m_FillMethod: 0
  m_FillAmount: 1
  m_FillClockwise: 1
-  m_FillOrigin: 0
+  m_FillOrigin: 1
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:deddf3d0e097d9052eff3ac8feee9297b0979df6155d3957a1f29eae5e38b337
-size 530552580
+oid sha256:426f51615dadbf8c8cea9fc659dc0e630e9062f6627cf224958e5d795a62919c
+size 530563977
@@ -85,7 +85,6 @@ namespace BrewMonster
        private CECSkill m_pCurSkill;
        private CECCounter m_IncantCnt;
        private bool m_bMelee;
-        private float m_fPrayDistancePlus;

        // ====== Ground cast config ======
        [Header("Ground Cast")]
@@ -339,40 +338,40 @@ namespace BrewMonster
                    SelectTarget(m_idUCSelTarget);
                }

-                if (idTraceTarget != 0)
-                {
-                    if (iTraceReason == CECHPWorkTrace.Trace_reason.TRACE_ATTACK)
-                    {
-                        if (!CanDo(ActionCanDo.CANDO_MELEE))
-                            return;
-                        NormalAttackObject(idTraceTarget, bForceAttack);
-                    }
-                    else
-                    {
-                        if (!CanDo(ActionCanDo.CANDO_MOVETO))
-                            return;
-                        CECHPWork pWork;
-                        if (iTraceReason == CECHPWorkTrace.Trace_reason.TRACE_PICKUP)
-                        {
-                            //PickupObject(idTraceTarget, false);
-                        }
-                        else if (iTraceReason == CECHPWorkTrace.Trace_reason.TRACE_GATHER)
-                        {
-                            //PickupObject(idTraceTarget, true);
-                        }
-                        else if ((pWork = m_pWorkMan.GetWork(CECHPWork.Host_work_ID.WORK_TRACEOBJECT)) != null)
-                        {
-                            CECHPWorkTrace pWorkTrace = (pWork) as CECHPWorkTrace;
-                            pWorkTrace.SetTraceTarget(pWorkTrace.CreatTraceTarget(idTraceTarget, iTraceReason, bForceAttack));
-                        }
-                        else if (m_pWorkMan.CanStartWork(CECHPWork.Host_work_ID.WORK_TRACEOBJECT) && !bWikiMonster)
-                        {
-                            CECHPWorkTrace pWorkTrace = (CECHPWorkTrace)m_pWorkMan.CreateWork(CECHPWork.Host_work_ID.WORK_TRACEOBJECT);
-                            pWorkTrace.SetTraceTarget(pWorkTrace.CreatTraceTarget(idTraceTarget, iTraceReason, bForceAttack));
-                            m_pWorkMan.StartWork_p1(pWorkTrace);
-                        }
-                    }
-                }
+                  if (idTraceTarget != 0)
+                  {
+                      if (iTraceReason == CECHPWorkTrace.Trace_reason.TRACE_ATTACK)
+                      {
+                          if (!CanDo(ActionCanDo.CANDO_MELEE))
+                              return;
+                          NormalAttackObject(idTraceTarget, bForceAttack);
+                      }
+                      else
+                      {
+                          if (!CanDo(ActionCanDo.CANDO_MOVETO))
+                              return;
+                          CECHPWork pWork;
+                          if (iTraceReason == CECHPWorkTrace.Trace_reason.TRACE_PICKUP)
+                          {
+                              //PickupObject(idTraceTarget, false);
+                          }
+                          else if (iTraceReason == CECHPWorkTrace.Trace_reason.TRACE_GATHER)
+                          {
+                              //PickupObject(idTraceTarget, true);
+                          }
+                          else if ((pWork = m_pWorkMan.GetWork(CECHPWork.Host_work_ID.WORK_TRACEOBJECT)) != null)
+                          {
+                              CECHPWorkTrace pWorkTrace = (pWork) as CECHPWorkTrace;
+                              pWorkTrace.SetTraceTarget(pWorkTrace.CreatTraceTarget(idTraceTarget, iTraceReason, bForceAttack));
+                          }
+                          else if (m_pWorkMan.CanStartWork(CECHPWork.Host_work_ID.WORK_TRACEOBJECT) && !bWikiMonster)
+                          {
+                              CECHPWorkTrace pWorkTrace = (CECHPWorkTrace)m_pWorkMan.CreateWork(CECHPWork.Host_work_ID.WORK_TRACEOBJECT);
+                              pWorkTrace.SetTraceTarget(pWorkTrace.CreatTraceTarget(idTraceTarget, iTraceReason, bForceAttack));
+                              m_pWorkMan.StartWork_p1(pWorkTrace);
+                          }
+                      }
+                  }
            }

            m_pWorkMan?.Tick(Time.deltaTime);
@@ -650,6 +649,9 @@ namespace BrewMonster
        public bool HostIsReady() { return true /*m_bEnterGame*/; }
        private void OnMsgHstDied(in ECMSG msg)
        {
+            // Mark host player as corpse so CECPlayer.IsDead() returns true
+            m_dwStates |= (uint)PlayerNPCState.GP_STATE_CORPSE;
+
            EventBus.PublishChannel(GetCharacterID(), new CECPlayer.ClearComActFlagAllRankNodesEvent(true));
            PlayAction((int)PLAYER_ACTION_TYPE.ACT_GROUNDDIE);
            if (PopupManager.Instance != null)
@@ -700,7 +702,8 @@ namespace BrewMonster
            m_ExtProps.max_ap = pCmd.iMaxAP;

            EventBus.Publish(new EXPToUpLevel(GetLevelUpExp(pCmd.sLevel)));
-            EventBus.Publish(pCmd);
+            EventBus.Publish<cmd_self_info_00>(pCmd);
+            EventBus.PublishChannel<cmd_self_info_00>(GetCharacterID(),pCmd);
            // if (pCmd.State != 0 && m_bFight == false) PlayEnterBattleGfx();
            m_bFight = pCmd.State != 0 ? true : false;

@@ -1363,12 +1366,19 @@ namespace BrewMonster
            //	Create work manager
            m_pWorkMan = new CECHPWorkMan(this);
            m_pWorkMan.StartWork_p0(m_pWorkMan.CreateWork(Host_work_ID.WORK_STAND));
-            /*if (IsDead())
+            if (IsDead())
            {
-                CECHPWorkDead pWork = (CECHPWorkDead*)m_pWorkMan->CreateWork(CECHPWork.Host_work_ID.WORK_DEAD);
-                pWork->SetBeDeadFlag(true);
-                m_pWorkMan->StartWork_p0(pWork);
+                //CECHPWorkDead pWork = (CECHPWorkDead*)m_pWorkMan->CreateWork(CECHPWork.Host_work_ID.WORK_DEAD);
+                //pWork->SetBeDeadFlag(true);
+                //m_pWorkMan->StartWork_p0(pWork);
+                EventBus.PublishChannel(GetCharacterID(), new CECPlayer.ClearComActFlagAllRankNodesEvent(true));
+                PlayAction((int)PLAYER_ACTION_TYPE.ACT_GROUNDDIE);
+                if (PopupManager.Instance != null)
+                {
+                    PopupManager.Instance.OnPlayerDied();
+                }
            }
+            /*
            else if (IsSitting())
            {
                CECHPWorkSit* pWork = (CECHPWorkSit*)m_pWorkMan->CreateWork(CECHPWork.Host_work_ID.WORK_SIT);
@@ -1756,21 +1766,21 @@ namespace BrewMonster
                        break;
                    }
                //case 2:     //	cast magic
+                //{
+                //    if (m_pPrepSkill)
                //    {
-                //        if (m_pPrepSkill != null)
+                //        float fRange = m_pPrepSkill.GetCastRange(m_ExtProps.ak.AttackRange, GetPrayDistancePlus());
+                //        if (fRange > 0.0f)
                //        {
-                //            float fRange = m_pPrepSkill.GetCastRange(m_ExtProps.ak.AttackRange, GetPrayDistancePlus());
-                //            if (fRange > 0.0f)
-                //            {
-                //                if (fDist - fTargetRad <= fRange)
-                //                    return true;
-                //            }
-                //            else
+                //            if (fDist - fTargetRad <= fRange)
                //                return true;
                //        }
-
-                //        break;
+                //        else
+                //            return true;
                //    }
+
+                //    break;
+                //}
                case 3: //	talk
                    {
                        if (fDist - fTargetRad <= 5.0f)
@@ -1826,17 +1836,13 @@ namespace BrewMonster
        {
            return m_pvp.bEnable;
        }
-        public float GetPrayDistancePlus() { return m_fPrayDistancePlus; }

        //	Get faction ID
        public int GetFactionID()
        {
            return m_idFaction;
        }
-        public void SetPrayDistancePlus(float prayDistancePlus)
-        {
-            m_fPrayDistancePlus = prayDistancePlus;
-        }
+
        public bool IsJumping()
        {
            return m_iJumpCount > 0;
@@ -2306,7 +2312,6 @@ namespace BrewMonster
        {
            byte byPVPMask = glb_BuildPVPMask(bForceAttack);
            UnityGameSession.c2s_CmdCastSkill(m_pPrepSkill.GetSkillID(), byPVPMask, 1, idTarget);
-            PlayAction((int)PLAYER_ACTION_TYPE.ACT_STAND, false,300, false);
            return true;
        }
        public bool UpdateEquipSkins()