From c692179b677ebd9115bbf845ed0f0e082c38c3bd Mon Sep 17 00:00:00 2001
From: Chomper9981 <chomper9981@gmail.com>
Date: Wed, 8 Apr 2026 15:58:51 +0700
Subject: [PATCH 1/4] Add Button for HPMP Usage

---
 Assets/PerfectWorld/Prefab/UIManager.prefab   | 1204 ++++++++++++++++-
 .../Scripts/Managers/EC_Inventory.cs          |   10 +
 .../Managers/EC_IvtrItem/EC_IvtrMedicine.cs   |   13 +-
 .../Scripts/UI/GamePlay/AUIImageHPMPItem.cs   |   28 +
 .../UI/GamePlay/AUIImageHPMPItem.cs.meta      |    2 +
 .../Scripts/UI/GamePlay/AUIImagePicture.cs    |    2 +-
 .../Scripts/UI/GamePlay/CdlgQuickBar.cs       |  171 ++-
 .../Scripts/UI/GamePlay/EC_GameUIMan.cs       |   17 +-
 Assets/Prefabs/UI/AssignSkill.prefab          |   19 +-
 9 files changed, 1447 insertions(+), 19 deletions(-)
 create mode 100644 Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImageHPMPItem.cs
 create mode 100644 Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImageHPMPItem.cs.meta

diff --git a/Assets/PerfectWorld/Prefab/UIManager.prefab b/Assets/PerfectWorld/Prefab/UIManager.prefab
index e9cf3ea870..0f5bff384f 100644
--- a/Assets/PerfectWorld/Prefab/UIManager.prefab
+++ b/Assets/PerfectWorld/Prefab/UIManager.prefab
@@ -780,6 +780,96 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!1 &393194488981333838
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5436358905371864388}
+  - component: {fileID: 3471177786394651986}
+  - component: {fileID: 8930475533815954586}
+  - component: {fileID: 8995978399276477764}
+  m_Layer: 5
+  m_Name: IconHolder
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5436358905371864388
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 393194488981333838}
+  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: 4323229428314121332}
+  m_Father: {fileID: 6550142832931870620}
+  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 &3471177786394651986
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 393194488981333838}
+  m_CullTransparentMesh: 1
+--- !u!114 &8930475533815954586
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 393194488981333838}
+  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: 21300000, guid: 697e2452f28b3244bbd4aedb324f0506, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &8995978399276477764
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 393194488981333838}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 1
 --- !u!1 &427315709131599085
 GameObject:
   m_ObjectHideFlags: 0
@@ -1474,6 +1564,134 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &838519598652901071
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 9190831209898129191}
+  - component: {fileID: 7382895648940793749}
+  - component: {fileID: 6643291068587620150}
+  - component: {fileID: 4529057318008104088}
+  - component: {fileID: 7933533225200336064}
+  m_Layer: 5
+  m_Name: ButtonHPItem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9190831209898129191
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 838519598652901071}
+  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: 5285195702581382648}
+  m_Father: {fileID: 9056141770234008732}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -656.2, y: 681.9}
+  m_SizeDelta: {x: 80, y: 80}
+  m_Pivot: {x: 0, y: 1}
+--- !u!114 &7382895648940793749
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 838519598652901071}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9b2df34c4410f46b5865b5178bfe3058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  slotIndex: -1
+  disPlayImage: {fileID: 4966657577187018761}
+  skillbutton: {fileID: 7933533225200336064}
+  borderImage: {fileID: 5261573525275649535}
+  cooldownTime: 9
+  m_ClockCounter: {fileID: 6643291068587620150}
+  isNotCastSkill: 0
+  m_TextAmount: {fileID: 5046908614215045601}
+--- !u!114 &6643291068587620150
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 838519598652901071}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 70ec0de7d6bb5134fbdf6bf9b1cfbff4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ClockIcon: {fileID: 842444451410779243}
+  m_iMin: 0
+  m_iMax: 0
+  m_iPos: 0
+--- !u!222 &4529057318008104088
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 838519598652901071}
+  m_CullTransparentMesh: 1
+--- !u!114 &7933533225200336064
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 838519598652901071}
+  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: 0}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &921810299079476810
 GameObject:
   m_ObjectHideFlags: 0
@@ -2106,6 +2324,81 @@ MonoBehaviour:
   m_PointerBehavior: 0
   m_CursorLockBehavior: 0
   m_ScrollDeltaPerTick: 6
+--- !u!1 &1287587630908865938
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8992300870168916263}
+  - component: {fileID: 1553206163926497400}
+  - component: {fileID: 842444451410779243}
+  m_Layer: 5
+  m_Name: ImageLock
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8992300870168916263
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1287587630908865938}
+  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: 6539541629831069250}
+  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: -16, y: -16}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1553206163926497400
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1287587630908865938}
+  m_CullTransparentMesh: 1
+--- !u!114 &842444451410779243
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1287587630908865938}
+  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.2924528, g: 0.22485758, b: 0.22485758, 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: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 0
+  m_FillClockwise: 1
+  m_FillOrigin: 2
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &1320901936805636085
 GameObject:
   m_ObjectHideFlags: 0
@@ -4025,6 +4318,81 @@ MonoBehaviour:
   isAlert: 0
   m_InputValidator: {fileID: 0}
   m_ShouldActivateOnSelect: 1
+--- !u!1 &2407043684087297221
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5753210460596773607}
+  - component: {fileID: 62984944633540731}
+  - component: {fileID: 4657637382436301804}
+  m_Layer: 5
+  m_Name: ImageLock
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5753210460596773607
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2407043684087297221}
+  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: 4323229428314121332}
+  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: -16, y: -16}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &62984944633540731
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2407043684087297221}
+  m_CullTransparentMesh: 1
+--- !u!114 &4657637382436301804
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2407043684087297221}
+  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.2924528, g: 0.22485758, b: 0.22485758, a: 0.6117647}
+  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: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 0
+  m_FillClockwise: 1
+  m_FillOrigin: 2
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &2419254825889015091
 GameObject:
   m_ObjectHideFlags: 0
@@ -5197,6 +5565,81 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &3180315909736247254
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5584100995578949242}
+  - component: {fileID: 4627031174241817993}
+  - component: {fileID: 4966657577187018761}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5584100995578949242
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3180315909736247254}
+  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: 6539541629831069250}
+  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: 6, y: 6}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4627031174241817993
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3180315909736247254}
+  m_CullTransparentMesh: 1
+--- !u!114 &4966657577187018761
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3180315909736247254}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 7910159920041122899, guid: a141ce1b94af3cf46aa0695ab5ed6cdd, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &3187516571348395154
 GameObject:
   m_ObjectHideFlags: 0
@@ -6688,6 +7131,96 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _label: {fileID: 2783766523292921853}
   _btnCancel: {fileID: 6372996403105058889}
+--- !u!1 &3822147508416785663
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5285195702581382648}
+  - component: {fileID: 8335946309742761274}
+  - component: {fileID: 623714079993167012}
+  - component: {fileID: 6243320184674300750}
+  m_Layer: 5
+  m_Name: IconHolder
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5285195702581382648
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3822147508416785663}
+  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: 6539541629831069250}
+  m_Father: {fileID: 9190831209898129191}
+  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 &8335946309742761274
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3822147508416785663}
+  m_CullTransparentMesh: 1
+--- !u!114 &623714079993167012
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3822147508416785663}
+  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: 21300000, guid: 697e2452f28b3244bbd4aedb324f0506, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &6243320184674300750
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3822147508416785663}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 1
 --- !u!1 &3988455266904546379
 GameObject:
   m_ObjectHideFlags: 0
@@ -7610,6 +8143,173 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   ReviveOptionPopup: {fileID: 8167981555289453890}
+--- !u!1 &5177492476293168811
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1201998992865507875}
+  - component: {fileID: 4054128017641116982}
+  - component: {fileID: 3415026819600636449}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1201998992865507875
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5177492476293168811}
+  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: 4323229428314121332}
+  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: 6, y: 6}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4054128017641116982
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5177492476293168811}
+  m_CullTransparentMesh: 1
+--- !u!114 &3415026819600636449
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5177492476293168811}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 7910159920041122899, guid: a141ce1b94af3cf46aa0695ab5ed6cdd, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5261573525275649535
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6539541629831069250}
+  - component: {fileID: 5600699028310642834}
+  - component: {fileID: 250673776198584683}
+  - component: {fileID: 6185000055952551984}
+  m_Layer: 5
+  m_Name: ImageBorder
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6539541629831069250
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5261573525275649535}
+  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: 5584100995578949242}
+  - {fileID: 8992300870168916263}
+  - {fileID: 7669270873690823761}
+  m_Father: {fileID: 5285195702581382648}
+  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: 5.999999, y: 6}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5600699028310642834
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5261573525275649535}
+  m_CullTransparentMesh: 1
+--- !u!114 &250673776198584683
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5261573525275649535}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 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 &6185000055952551984
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5261573525275649535}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 1
 --- !u!1 &5490291313877083687
 GameObject:
   m_ObjectHideFlags: 0
@@ -7828,6 +8528,8 @@ RectTransform:
   - {fileID: 4139081827044063170}
   - {fileID: 7693611257239889377}
   - {fileID: 5764038139312484550}
+  - {fileID: 9190831209898129191}
+  - {fileID: 6550142832931870620}
   - {fileID: 7592287337898200118}
   m_Father: {fileID: 3233441867675090637}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -7859,6 +8561,8 @@ MonoBehaviour:
   - {fileID: 2971821658315981769}
   - {fileID: 452969679978752531}
   - {fileID: 3647934876571221831}
+  HpItemButton: {fileID: 7382895648940793749}
+  MpItemButton: {fileID: 7614763976671640739}
   m_nCurPanel1: 1
   m_nCurPanel2: 1
   m_bShowAll1: 0
@@ -9013,6 +9717,142 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6210691000897629082
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2074519717701126543}
+  - component: {fileID: 8433692982734496021}
+  - component: {fileID: 4718149062455034050}
+  m_Layer: 5
+  m_Name: AmountText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2074519717701126543
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6210691000897629082}
+  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: 4323229428314121332}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 3, y: 3}
+  m_SizeDelta: {x: -6, y: 20.4472}
+  m_Pivot: {x: 0, y: 0}
+--- !u!222 &8433692982734496021
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6210691000897629082}
+  m_CullTransparentMesh: 1
+--- !u!114 &4718149062455034050
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6210691000897629082}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: x999
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2}
+  m_sharedMaterial: {fileID: 9092487103257209053, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 18
+  m_fontSizeBase: 18
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 1024
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_TextWrappingMode: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 0
+  m_ActiveFontFeatures: 6e72656b
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &6353807544545313732
 GameObject:
   m_ObjectHideFlags: 0
@@ -9492,6 +10332,134 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &6717017273578620445
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6550142832931870620}
+  - component: {fileID: 7614763976671640739}
+  - component: {fileID: 5948058426259706520}
+  - component: {fileID: 7047362733096336047}
+  - component: {fileID: 4210950067272214338}
+  m_Layer: 5
+  m_Name: ButtonMPItem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6550142832931870620
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6717017273578620445}
+  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: 5436358905371864388}
+  m_Father: {fileID: 9056141770234008732}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -558.6, y: 680.9}
+  m_SizeDelta: {x: 80, y: 80}
+  m_Pivot: {x: 0, y: 1}
+--- !u!114 &7614763976671640739
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6717017273578620445}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9b2df34c4410f46b5865b5178bfe3058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  slotIndex: -1
+  disPlayImage: {fileID: 3415026819600636449}
+  skillbutton: {fileID: 4210950067272214338}
+  borderImage: {fileID: 9185267946099793297}
+  cooldownTime: 9
+  m_ClockCounter: {fileID: 5948058426259706520}
+  isNotCastSkill: 0
+  m_TextAmount: {fileID: 4718149062455034050}
+--- !u!114 &5948058426259706520
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6717017273578620445}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 70ec0de7d6bb5134fbdf6bf9b1cfbff4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ClockIcon: {fileID: 4657637382436301804}
+  m_iMin: 0
+  m_iMax: 0
+  m_iPos: 0
+--- !u!222 &7047362733096336047
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6717017273578620445}
+  m_CullTransparentMesh: 1
+--- !u!114 &4210950067272214338
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6717017273578620445}
+  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: 0}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &6749548056585646144
 GameObject:
   m_ObjectHideFlags: 0
@@ -12260,6 +13228,8 @@ MonoBehaviour:
   - {fileID: 445184971459596056}
   - {fileID: 3804662600613272361}
   - {fileID: 1774515210692260948}
+  HpItemButton: {fileID: 0}
+  MpItemButton: {fileID: 0}
   m_nCurPanel1: 1
   m_nCurPanel2: 1
   m_bShowAll1: 0
@@ -13106,6 +14076,142 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &9176642970006855569
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7669270873690823761}
+  - component: {fileID: 5809446564341675467}
+  - component: {fileID: 5046908614215045601}
+  m_Layer: 5
+  m_Name: AmountText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7669270873690823761
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9176642970006855569}
+  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: 6539541629831069250}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 3, y: 3}
+  m_SizeDelta: {x: -6, y: 20.4472}
+  m_Pivot: {x: 0, y: 0}
+--- !u!222 &5809446564341675467
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9176642970006855569}
+  m_CullTransparentMesh: 1
+--- !u!114 &5046908614215045601
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9176642970006855569}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: x999
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2}
+  m_sharedMaterial: {fileID: 9092487103257209053, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 18
+  m_fontSizeBase: 18
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 1024
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_TextWrappingMode: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 0
+  m_ActiveFontFeatures: 6e72656b
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &9180479633438435476
 GameObject:
   m_ObjectHideFlags: 0
@@ -13242,6 +14348,98 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &9185267946099793297
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4323229428314121332}
+  - component: {fileID: 5722727920572827920}
+  - component: {fileID: 8168192781954405461}
+  - component: {fileID: 9188866318666449746}
+  m_Layer: 5
+  m_Name: ImageBorder
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4323229428314121332
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9185267946099793297}
+  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: 1201998992865507875}
+  - {fileID: 5753210460596773607}
+  - {fileID: 2074519717701126543}
+  m_Father: {fileID: 5436358905371864388}
+  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: 5.999999, y: 6}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5722727920572827920
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9185267946099793297}
+  m_CullTransparentMesh: 1
+--- !u!114 &8168192781954405461
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9185267946099793297}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 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 &9188866318666449746
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9185267946099793297}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 1
 --- !u!1001 &47186325689700198
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -13742,7 +14940,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 776624419558043962, guid: 22d3972b131ebdb4288f9cbdf996d691, type: 3}
       propertyPath: m_text
-      value: 74850388
+      value: 39
       objectReference: {fileID: 0}
     - target: {fileID: 848034462487949471, guid: 22d3972b131ebdb4288f9cbdf996d691, type: 3}
       propertyPath: m_AnchorMax.y
@@ -19363,6 +20561,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 612290564657202925, guid: f2e88ae97c9b2624dbbad1d5fc0c14b8, type: 3}
+      propertyPath: m_text
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 720995613977598853, guid: f2e88ae97c9b2624dbbad1d5fc0c14b8, type: 3}
       propertyPath: m_SizeDelta.y
       value: 0
diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_Inventory.cs b/Assets/PerfectWorld/Scripts/Managers/EC_Inventory.cs
index e16ff0228f..0b455810fd 100644
--- a/Assets/PerfectWorld/Scripts/Managers/EC_Inventory.cs
+++ b/Assets/PerfectWorld/Scripts/Managers/EC_Inventory.cs
@@ -341,5 +341,15 @@ namespace BrewMonster.Scripts
                     m_aItems[i].Freeze(false);
             }
         }
+        public void GetAllItemsOfType<T>(out List<T> items) where T : EC_IvtrItem
+        {
+            items = new List<T>();
+            for (int i = 0; i < m_aItems.Length; i++)
+            {
+                if (m_aItems[i] != null)
+                    if (m_aItems[i] is T item)
+                        items.Add(item);
+            }
+        }
     }
 }
diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrMedicine.cs b/Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrMedicine.cs
index 7ae2af6e3c..52a948990a 100644
--- a/Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrMedicine.cs
+++ b/Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrMedicine.cs
@@ -18,6 +18,13 @@ namespace BrewMonster.Scripts
         protected MEDICINE_ESSENCE		m_pDBEssence;
 
         protected int					m_iLevelReq;
+
+        // Expose data needed by UI/shortcut logic.
+        // 暴露给UI/快捷栏需要的数据 (Expose data needed by UI/quickbar).
+        public int GetMajorTypeId() => (int)m_pDBMajorType.id;
+        public int GetLevelReq() => m_iLevelReq;
+        public int GetHpAddTotal() => m_pDBEssence.hp_add_total;
+        public int GetMpAddTotal() => m_pDBEssence.mp_add_total;
         /// <summary>
         /// Create medicine item (cac loai thuoc)
         /// </summary>
@@ -171,14 +178,16 @@ namespace BrewMonster.Scripts
         }
 
         //	Check item use condition
-        protected bool CheckUseCondition()
+        public override bool CheckUseCondition()
         {
             CECHostPlayer pHost = CECGameRun.Instance.GetHostPlayer();
+            if (pHost == null)
+                return false;
 
             if (pHost.GetMaxLevelSofar() < m_iLevelReq)
                 return false;
 
-            return true;
+            return IsUseable() && GetCount() > 0;
         }
 
         //	Get drop model for shown
diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImageHPMPItem.cs b/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImageHPMPItem.cs
new file mode 100644
index 0000000000..4749f99444
--- /dev/null
+++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImageHPMPItem.cs
@@ -0,0 +1,28 @@
+
+using UnityEngine;
+using TMPro;
+
+namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay
+{
+    public class AUIImageHPMPItem : AUIImagePicture
+    {
+        [SerializeField] TMP_Text m_TextAmount;
+        public void SetText(string text)
+        {
+            if(m_TextAmount != null)
+                m_TextAmount.text = text;
+        }
+
+        /// <summary>
+        /// HP/MP item button should only execute its assigned shortcut.
+        /// It must NOT open the assign-skill UI when empty.
+        /// </summary>
+        public override void Execute()
+        {
+            if (pSC != null)
+            {
+                pSC.Execute();
+            }
+        }
+    }
+}
diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImageHPMPItem.cs.meta b/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImageHPMPItem.cs.meta
new file mode 100644
index 0000000000..2788694e09
--- /dev/null
+++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImageHPMPItem.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 9b2df34c4410f46b5865b5178bfe3058
\ No newline at end of file
diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImagePicture.cs b/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImagePicture.cs
index 54e191f526..9665c6a4d6 100644
--- a/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImagePicture.cs
+++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImagePicture.cs
@@ -52,7 +52,7 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay
             }
         }
 
-        public void Execute()
+        public virtual void Execute()
         {
             if (pSC != null )
             {
diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs b/Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
index 0e76887c8c..e79983f0ad 100644
--- a/Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
+++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
@@ -20,8 +20,8 @@ namespace BrewMonster
         //[SerializeField] List<Image> m_aSkillImage = new List<Image>();
         //[SerializeField] List<Button> m_aSkillButton = new List<Button>();
         [SerializeField] List<AUIImagePicture> AUIImagePictureList = new List<AUIImagePicture>();
-        public int m_nCurPanel1 = 1;
-        public int m_nCurPanel2 = 1;
+        [SerializeField] AUIImageHPMPItem HpItemButton = new AUIImageHPMPItem();
+        [SerializeField] AUIImageHPMPItem MpItemButton = new AUIImageHPMPItem();
 
         int currentListIndex = 0;
         CECSkill assignedSkill = null;
@@ -30,8 +30,8 @@ namespace BrewMonster
         /// </summary>
         /// <returns></returns>
 
-        // public int m_nCurPanel1 = 1;
-        // public int m_nCurPanel2 = 1;
+        public int m_nCurPanel1 = 1;
+        public int m_nCurPanel2 = 1;
         public bool m_bShowAll1 = false;
         public bool m_bShowAll2 = false;
         public int m_nDisplayPanels1 = 0;
@@ -432,9 +432,170 @@ namespace BrewMonster
                          pCell.Clear();
                     }
                 }
-
+            UpdateHpMpItem();
             return true;
         }
+        public void UpdateHpMpItem()
+        {
+            const int HP_MAJOR_TYPE_ID = 1794;
+            const int MP_MAJOR_TYPE_ID = 1802;
+
+            CECHostPlayer pHost = EC_Game.GetGameRun().GetHostPlayer();
+            if (pHost == null)
+                return;
+
+            // Pick the first level-usable medicine with the lowest required level.
+            // Prefer highest heal amount first, then lowest required level.
+            // 优先选择“回复量最高”的药品，其次选择需求等级最低的 (Prefer max heal, tie-break by level).
+            static bool TryFindBestMedicine(CECHostPlayer host, int majorTypeId, out int pack, out int slot, out EC_IvtrMedicine med)
+            {
+                pack = -1;
+                slot = -1;
+                med = null;
+
+                int bestHeal = int.MinValue;
+                int bestReqLevel = int.MaxValue;
+
+                int[] packsToSearch = new int[]
+                {
+                    InventoryConst.IVTRTYPE_PACK,
+                    InventoryConst.IVTRTYPE_TASKPACK,
+                };
+
+                for (int p = 0; p < packsToSearch.Length; p++)
+                {
+                    int curPack = packsToSearch[p];
+                    EC_Inventory inv = host.GetPack(curPack);
+                    if (inv == null)
+                        continue;
+
+                    int size = inv.GetSize();
+                    for (int i = 0; i < size; i++)
+                    {
+                        EC_IvtrItem item = inv.GetItem(i);
+                        if (item is not EC_IvtrMedicine m)
+                            continue;
+
+                        if (m.GetMajorTypeId() != majorTypeId)
+                            continue;
+
+                        if (!m.CheckUseCondition())
+                            continue;
+
+                        int heal = 0;
+                        // HP potion: use hp_add_total; MP potion: use mp_add_total.
+                        // 回血药用 hp_add_total；回蓝药用 mp_add_total。
+                        if (majorTypeId == 1794)
+                            heal = m.GetHpAddTotal();
+                        else if (majorTypeId == 1802)
+                            heal = m.GetMpAddTotal();
+
+                        int req = m.GetLevelReq();
+                        if (heal > bestHeal || (heal == bestHeal && req < bestReqLevel))
+                        {
+                            bestHeal = heal;
+                            bestReqLevel = req;
+                            pack = curPack;
+                            slot = i;
+                            med = m;
+                        }
+                    }
+                }
+
+                return med != null && pack >= 0 && slot >= 0;
+            }
+
+            static bool TryGetShortcutItem(CECHostPlayer host, CECShortcut sc, out EC_IvtrItem item)
+            {
+                item = null;
+                if (host == null || sc is not CECSCItem scItem)
+                    return false;
+
+                EC_Inventory inv = host.GetPack(scItem.GetInventory());
+                if (inv == null)
+                    return false;
+
+                item = inv.GetItem(scItem.GetIvtrSlot());
+                return item != null;
+            }
+
+            void ApplyItemToButton(AUIImageHPMPItem button, CECShortcut sc, EC_IvtrItem item)
+            {
+                if (button == null)
+                    return;
+
+                if (sc == null || item == null)
+                {
+                    button.Clear();
+                    button.SetText(string.Empty);
+                    return;
+                }
+
+                button.SetDataPtr(sc);
+                // Inventory UI uses templateId -> ResolveItemIconSprite, which is more reliable than string icon keys here.
+                // 背包UI使用 templateId -> ResolveItemIconSprite，这里也用同一套更稳定 (use same path as Inventory UI).
+                var sprite = EC_IvtrItemUtils.Instance.ResolveItemIconSprite(item.GetTemplateID());
+                if (sprite != null)
+                    button.SetImage(sprite);
+                else
+                    button.Clear();
+
+                // Amount text / 数量文本
+                int count = Mathf.Max(0, item.GetCount());
+                button.SetText(count > 0 ? count.ToString() : string.Empty);
+
+                // Cooldown overlay / 冷却遮罩
+                var clock = button.GetClockIcon();
+                int max = -1;
+                int cool = 0;
+                if (clock != null)
+                {
+                    cool = item.GetCoolTime(out max);
+                    if (cool > 0 && max > 0)
+                    {
+                        clock.SetProgressRange(0, max);
+                        clock.SetProgressPos(max - cool);
+                        clock.SetColor(new Color32(0, 0, 0, 128));
+                    }
+                    else
+                    {
+                        clock.SetProgressRange(0, 1);
+                        clock.SetProgressPos(1);
+                    }
+                }
+
+                // Interactable state should reflect usability.
+                // 可交互状态应该反映物品是否可使用
+                bool usable = item.CheckUseCondition();
+                bool cooling = (cool > 0 && max > 0);
+                button.SetInteract(usable && !cooling);
+            }
+
+            void EnsureAssignedAndRefresh(AUIImageHPMPItem button, int majorTypeId)
+            {
+                if (button == null)
+                    return;
+
+                CECShortcut sc = button.GetDataPtr();
+
+                // If there is no valid shortcut item, auto assign the best available potion.
+                if (!TryGetShortcutItem(pHost, sc, out EC_IvtrItem item))
+                {
+                    if (TryFindBestMedicine(pHost, majorTypeId, out int pack, out int slot, out EC_IvtrMedicine med))
+                    {
+                        var newSc = new CECSCItem();
+                        newSc.Init(pack, slot, med);
+                        sc = newSc;
+                        item = med;
+                    }
+                }
+
+                ApplyItemToButton(button, sc, item);
+            }
+
+            EnsureAssignedAndRefresh(HpItemButton, HP_MAJOR_TYPE_ID);
+            EnsureAssignedAndRefresh(MpItemButton, MP_MAJOR_TYPE_ID);
+        }
         private void GetQuickBarNameAndSC(CECHostPlayer pHost, List<string> pszPanel, List<CECShortcutSet> pSCS, int panel9, int panel8)
         {
             string dlgName;
diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/EC_GameUIMan.cs b/Assets/PerfectWorld/Scripts/UI/GamePlay/EC_GameUIMan.cs
index 237d6459f8..9d88f800f2 100644
--- a/Assets/PerfectWorld/Scripts/UI/GamePlay/EC_GameUIMan.cs
+++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/EC_GameUIMan.cs
@@ -30,6 +30,7 @@ namespace BrewMonster.UI
 
         private const string SKILL_ICONLIST_NAME = "iconlist_skill_multisprite";
         private const string ACTION_ICONLIST_NAME = "ActionIcon/iconlist_action_multisprite";
+        private const string INVENTORY_ICONLIST_NAME = "UI/IconSprites/iconlist_ivtrm_multisprite";
         private const string STATE_ICONLIST_NAME = "iconlist_state";
 
         public CDlgMiniMap m_pDlgMiniMap;
@@ -375,11 +376,25 @@ namespace BrewMonster.UI
 
             m_IconMap[(byte)EC_GAMEUI_ICONS.ICONS_SKILL] = (SKILL_ICONLIST_NAME, Resources.LoadAll<Sprite>(SKILL_ICONLIST_NAME));
             m_IconMap[(byte)EC_GAMEUI_ICONS.ICONS_ACTION] = (ACTION_ICONLIST_NAME, Resources.LoadAll<Sprite>(ACTION_ICONLIST_NAME));
+            m_IconMap[(byte)EC_GAMEUI_ICONS.ICONS_INVENTORY] = (INVENTORY_ICONLIST_NAME, Resources.LoadAll<Sprite>(INVENTORY_ICONLIST_NAME));
             m_IconMap[(byte)EC_GAMEUI_ICONS.ICONS_STATE] = (STATE_ICONLIST_NAME, Resources.LoadAll<Sprite>(STATE_ICONLIST_NAME));
         }
         public void SetCover(AUIImagePictureBase pImgPic, string nameImage, EC_GAMEUI_ICONS iCONS_TYPE)
         {
-            pImgPic.SetImage(m_IconMap[(byte)iCONS_TYPE].Item2.FirstOrDefault(s => s.name == nameImage));
+            if (pImgPic == null)
+                return;
+
+            if (m_IconMap == null || !m_IconMap.TryGetValue((byte)iCONS_TYPE, out var tuple) || tuple.Item2 == null)
+            {
+                pImgPic.Clear();
+                return;
+            }
+
+            var sprite = tuple.Item2.FirstOrDefault(s => s != null && s.name == nameImage);
+            if (sprite != null)
+                pImgPic.SetImage(sprite);
+            else
+                pImgPic.Clear();
         }
 
         /// <summary>Refresh team UI (Arrange Team dialog). Called after team join/leave/member data.</summary>
diff --git a/Assets/Prefabs/UI/AssignSkill.prefab b/Assets/Prefabs/UI/AssignSkill.prefab
index 40170564e3..de169527f1 100644
--- a/Assets/Prefabs/UI/AssignSkill.prefab
+++ b/Assets/Prefabs/UI/AssignSkill.prefab
@@ -2752,9 +2752,9 @@ RectTransform:
   - {fileID: 4504331075840543341}
   m_Father: {fileID: 1361524257611413148}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 469.781, y: -34.01085}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 179.9124, y: 68.0217}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8804506040386004496
@@ -5515,9 +5515,9 @@ RectTransform:
   - {fileID: 2027606699309904338}
   m_Father: {fileID: 1361524257611413148}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 109.9562, y: -34.01085}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 179.9124, y: 68.0217}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6741821173640675138
@@ -17685,6 +17685,7 @@ MonoBehaviour:
   m_contentRootSkill: {fileID: 0}
   m_scrollRect: {fileID: 0}
   m_windowScale: 1
+  totalSPText: {fileID: 0}
   m_isEvil: 0
 --- !u!1 &7758409605357852732
 GameObject:
@@ -19226,9 +19227,9 @@ RectTransform:
   - {fileID: 911293677621153352}
   m_Father: {fileID: 1361524257611413148}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 289.8686, y: -34.01085}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 179.9124, y: 68.0217}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5623009994815814977

From 8ad46acfaafebe80731c221c973aff0c189b1ecf Mon Sep 17 00:00:00 2001
From: Chomper9981 <chomper9981@gmail.com>
Date: Wed, 8 Apr 2026 16:58:48 +0700
Subject: [PATCH 2/4] fix performent issual of using medicine

---
 .../Scripts/Managers/EC_Inventory.cs          |  14 ++
 .../Scripts/UI/GamePlay/AUIImageHPMPItem.cs   |  24 ++++
 .../Scripts/UI/GamePlay/CdlgQuickBar.cs       | 122 +++++++++++++++---
 3 files changed, 144 insertions(+), 16 deletions(-)

diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_Inventory.cs b/Assets/PerfectWorld/Scripts/Managers/EC_Inventory.cs
index 0b455810fd..04fa47906f 100644
--- a/Assets/PerfectWorld/Scripts/Managers/EC_Inventory.cs
+++ b/Assets/PerfectWorld/Scripts/Managers/EC_Inventory.cs
@@ -81,6 +81,7 @@ namespace BrewMonster.Scripts
 
             var old = m_aItems[iSlot];
             m_aItems[iSlot] = pItem;
+            EventBus.Publish(new InventoryChangedEvent());
             return old;
         }
 
@@ -92,6 +93,7 @@ namespace BrewMonster.Scripts
             }
 
             m_aItems[iSlot] = pItem;
+            EventBus.Publish(new InventoryChangedEvent());
         }
 
         public EC_IvtrItem GetItem(int iSlot, bool bRemove = false)
@@ -144,6 +146,7 @@ namespace BrewMonster.Scripts
                 m_aItems[iSlot] = newItem;
                 piLastSlot = iSlot;
                 piLastAmount = iAmount;
+                EventBus.Publish(new InventoryChangedEvent());
                 return true;
             }
             if (slotItem.GetTemplateID() != tid)
@@ -156,6 +159,7 @@ namespace BrewMonster.Scripts
             slotItem.AddAmount(add);
             piLastSlot = iSlot;
             piLastAmount = slotItem.GetCount();
+            EventBus.Publish(new InventoryChangedEvent());
             return true;
         }
 
@@ -179,6 +183,7 @@ namespace BrewMonster.Scripts
                     {
                         piLastSlot = i;
                         piLastAmount = slotItem.GetCount();
+                        EventBus.Publish(new InventoryChangedEvent());
                         return true;
                     }
                 }
@@ -201,6 +206,7 @@ namespace BrewMonster.Scripts
             m_aItems[firstEmpty] = newItem;
             piLastSlot = firstEmpty;
             piLastAmount = iAmount;
+            EventBus.Publish(new InventoryChangedEvent());
             return true;
         }
 
@@ -240,6 +246,7 @@ namespace BrewMonster.Scripts
             }
 
             RemoveItem(iSrc, iAmount);
+            EventBus.Publish(new InventoryChangedEvent());
             return true;
         }
 
@@ -258,6 +265,7 @@ namespace BrewMonster.Scripts
             if (newCount <= 0)
                 m_aItems[iSlot] = null;
 
+            EventBus.Publish(new InventoryChangedEvent());
             return true;
         }
 
@@ -352,4 +360,10 @@ namespace BrewMonster.Scripts
             }
         }
     }
+
+    /// <summary>
+    /// Fired when any client-side inventory pack mutates (add/remove/move/merge).
+    /// Used by UI (quickbar HP/MP auto-pick) to re-evaluate best potions.
+    /// </summary>
+    public struct InventoryChangedEvent { }
 }
diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImageHPMPItem.cs b/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImageHPMPItem.cs
index 4749f99444..4befe3fcc4 100644
--- a/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImageHPMPItem.cs
+++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImageHPMPItem.cs
@@ -7,6 +7,30 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay
     public class AUIImageHPMPItem : AUIImagePicture
     {
         [SerializeField] TMP_Text m_TextAmount;
+        private int _lastTemplateId = int.MinValue;
+        private int _lastCount = int.MinValue;
+
+        public bool TrySetTemplateId(int templateId)
+        {
+            if (_lastTemplateId == templateId)
+                return false;
+            _lastTemplateId = templateId;
+            return true;
+        }
+
+        public bool TrySetCount(int count)
+        {
+            if (_lastCount == count)
+                return false;
+            _lastCount = count;
+            return true;
+        }
+
+        public void ResetRenderCache()
+        {
+            _lastTemplateId = int.MinValue;
+            _lastCount = int.MinValue;
+        }
         public void SetText(string text)
         {
             if(m_TextAmount != null)
diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs b/Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
index e79983f0ad..484641b086 100644
--- a/Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
+++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
@@ -23,8 +23,34 @@ namespace BrewMonster
         [SerializeField] AUIImageHPMPItem HpItemButton = new AUIImageHPMPItem();
         [SerializeField] AUIImageHPMPItem MpItemButton = new AUIImageHPMPItem();
 
+        private bool _hpmpReselectDirty = true;
+
         int currentListIndex = 0;
         CECSkill assignedSkill = null;
+        public override void OnEnable()
+        {
+            base.OnEnable();
+            EventBus.Subscribe<InventoryChangedEvent>(OnInventoryChanged);
+            EventBus.Subscribe<CECHostPlayer.HostPlayerLevelUpUIEvent>(OnHostLevelUp);
+            _hpmpReselectDirty = true;
+        }
+
+        public override void OnDisable()
+        {
+            EventBus.Unsubscribe<InventoryChangedEvent>(OnInventoryChanged);
+            EventBus.Unsubscribe<CECHostPlayer.HostPlayerLevelUpUIEvent>(OnHostLevelUp);
+            base.OnDisable();
+        }
+
+        private void OnInventoryChanged(InventoryChangedEvent _)
+        {
+            _hpmpReselectDirty = true;
+        }
+
+        private void OnHostLevelUp(CECHostPlayer.HostPlayerLevelUpUIEvent _)
+        {
+            _hpmpReselectDirty = true;
+        }
         /// <summary>
         ///  Apply for a license remove later
         /// </summary>
@@ -59,7 +85,7 @@ namespace BrewMonster
             AUIImagePicture pCell;
             CECSkill pSkill = new CECSkill(-1, -1);
             AUIClockIcon pClock;
-            int iIconFile, nMax = 0;
+            int iIconFile = 0, nMax = 0;
 
             int nCurPanel9 = GetCurPanel1();
             int nCurPanel8 = GetCurPanel2();
@@ -444,6 +470,9 @@ namespace BrewMonster
             if (pHost == null)
                 return;
 
+            bool forceReselect = _hpmpReselectDirty;
+            _hpmpReselectDirty = false;
+
             // Pick the first level-usable medicine with the lowest required level.
             // Prefer highest heal amount first, then lowest required level.
             // 优先选择“回复量最高”的药品，其次选择需求等级最低的 (Prefer max heal, tie-break by level).
@@ -519,6 +548,12 @@ namespace BrewMonster
                 return item != null;
             }
 
+            static int GetHealScore(EC_IvtrMedicine med, int majorTypeId)
+            {
+                if (med == null) return 0;
+                return majorTypeId == 1794 ? med.GetHpAddTotal() : med.GetMpAddTotal();
+            }
+
             void ApplyItemToButton(AUIImageHPMPItem button, CECShortcut sc, EC_IvtrItem item)
             {
                 if (button == null)
@@ -526,23 +561,39 @@ namespace BrewMonster
 
                 if (sc == null || item == null)
                 {
+                    button.ResetRenderCache();
                     button.Clear();
                     button.SetText(string.Empty);
                     return;
                 }
 
-                button.SetDataPtr(sc);
-                // Inventory UI uses templateId -> ResolveItemIconSprite, which is more reliable than string icon keys here.
-                // 背包UI使用 templateId -> ResolveItemIconSprite，这里也用同一套更稳定 (use same path as Inventory UI).
-                var sprite = EC_IvtrItemUtils.Instance.ResolveItemIconSprite(item.GetTemplateID());
-                if (sprite != null)
-                    button.SetImage(sprite);
-                else
-                    button.Clear();
+                // Skill-slot logic pattern: if the shortcut ptr hasn't changed and we're not forced to reselect,
+                // avoid re-applying icon/text every frame.
+                // 复用技能格的思路：快捷键指针没变且非强制刷新时，不要每帧重刷图标/数量。
+                if (button.GetDataPtr() != sc)
+                {
+                    button.SetDataPtr(sc);
+                    button.ResetRenderCache();
+                }
+
+                int tid = item.GetTemplateID();
+                if (button.TrySetTemplateId(tid))
+                {
+                    // Inventory UI path is more reliable than icon-file string matching.
+                    // 背包UI的路径更稳定：按模板ID解析Sprite，而不是匹配图标文件名字符串
+                    var sp = EC_IvtrItemUtils.Instance.ResolveItemIconSprite(tid);
+                    if (sp != null)
+                        button.SetImage(sp);
+                    else
+                        button.Clear();
+                }
 
                 // Amount text / 数量文本
                 int count = Mathf.Max(0, item.GetCount());
-                button.SetText(count > 0 ? count.ToString() : string.Empty);
+                if (button.TrySetCount(count))
+                {
+                    button.SetText(count > 0 ? count.ToString() : string.Empty);
+                }
 
                 // Cooldown overlay / 冷却遮罩
                 var clock = button.GetClockIcon();
@@ -566,9 +617,13 @@ namespace BrewMonster
 
                 // Interactable state should reflect usability.
                 // 可交互状态应该反映物品是否可使用
-                bool usable = item.CheckUseCondition();
+                // Mirror host-side restrictions like `UseItemInPack` uses (CANDO_USEITEM etc.)
+                // 同步宿主侧限制（例如 CANDO_USEITEM），与 UseItemInPack 的限制保持一致
+                bool hostCanUseItem = pHost.CanDo(CECHostPlayer.ActionCanDo.CANDO_USEITEM);
+                bool usable = hostCanUseItem && item.CheckUseCondition() && !item.IsFrozen();
                 bool cooling = (cool > 0 && max > 0);
-                button.SetInteract(usable && !cooling);
+                bool interact = usable && !cooling;
+                button.SetInteract(interact);
             }
 
             void EnsureAssignedAndRefresh(AUIImageHPMPItem button, int majorTypeId)
@@ -578,15 +633,50 @@ namespace BrewMonster
 
                 CECShortcut sc = button.GetDataPtr();
 
+                // Resolve current shortcut item (if any).
+                bool hasCurrent = TryGetShortcutItem(pHost, sc, out EC_IvtrItem item);
+
+                // Find best candidate (used both for initial assign and reselect-on-change).
+                bool hasBest = TryFindBestMedicine(pHost, majorTypeId, out int bestPack, out int bestSlot, out EC_IvtrMedicine bestMed);
+
                 // If there is no valid shortcut item, auto assign the best available potion.
-                if (!TryGetShortcutItem(pHost, sc, out EC_IvtrItem item))
+                if (!hasCurrent)
                 {
-                    if (TryFindBestMedicine(pHost, majorTypeId, out int pack, out int slot, out EC_IvtrMedicine med))
+                    if (hasBest)
                     {
                         var newSc = new CECSCItem();
-                        newSc.Init(pack, slot, med);
+                        newSc.Init(bestPack, bestSlot, bestMed);
                         sc = newSc;
-                        item = med;
+                        item = bestMed;
+                        hasCurrent = true;
+                    }
+                }
+                else if (forceReselect && hasBest)
+                {
+                    // Upgrade to best potion when inventory changes or level changes.
+                    // 背包变化或升级时，自动切换到“最优药品”
+                    var curMed = item as EC_IvtrMedicine;
+                    if (curMed == null || curMed.GetMajorTypeId() != majorTypeId || !curMed.CheckUseCondition())
+                    {
+                        var newSc = new CECSCItem();
+                        newSc.Init(bestPack, bestSlot, bestMed);
+                        sc = newSc;
+                        item = bestMed;
+                    }
+                    else
+                    {
+                        int curHeal = GetHealScore(curMed, majorTypeId);
+                        int bestHeal = GetHealScore(bestMed, majorTypeId);
+                        int curReq = curMed.GetLevelReq();
+                        int bestReq = bestMed.GetLevelReq();
+
+                        if (bestHeal > curHeal || (bestHeal == curHeal && bestReq < curReq))
+                        {
+                            var newSc = new CECSCItem();
+                            newSc.Init(bestPack, bestSlot, bestMed);
+                            sc = newSc;
+                            item = bestMed;
+                        }
                     }
                 }
 

From 089a9764d8c4e4a10fcac935ac54fd2b58e2c6fb Mon Sep 17 00:00:00 2001
From: VuNgocHaiC7 <pro9zuka17@gmail.com>
Date: Wed, 8 Apr 2026 17:38:25 +0700
Subject: [PATCH 3/4] fix coordinates for weapons

---
 .../models/weapons/人物/刀剑/单手单刀/折铁刀/折铁刀.prefab  | 6 +++---
 .../models/weapons/人物/刀剑/单手单刀/斩将刀/斩将刀.prefab  | 6 +++---
 .../models/weapons/人物/刀剑/单手单刀/百战刀/百战刀.prefab  | 6 +++---
 .../models/weapons/人物/刀剑/单手单刀/破阵刀/破阵刀.prefab  | 6 +++---
 .../models/weapons/人物/刀剑/单手单刀/钢刀/钢刀.prefab      | 6 +++---
 .../models/weapons/人物/刀剑/单手单刀/鬼头刀/鬼头刀.prefab  | 6 +++---
 .../models/weapons/人物/刀剑/单手单剑/凝露剑/凝露剑.prefab  | 6 +++---
 .../models/weapons/人物/刀剑/单手单剑/淬铁剑/淬铁剑.prefab  | 6 +++---
 .../models/weapons/人物/刀剑/单手单剑/百炼剑/百炼剑.prefab  | 6 +++---
 .../models/weapons/人物/刀剑/单手单剑/观澜剑/观澜剑.prefab  | 6 +++---
 .../models/weapons/人物/刀剑/单手单剑/青锋剑/青锋剑.prefab  | 6 +++---
 .../models/weapons/人物/刀剑/双手双刀/双掌刀/双掌刀.prefab  | 6 +++---
 .../models/weapons/人物/刀剑/双手双刀/披风刀/披风刀.prefab  | 6 +++---
 .../models/weapons/人物/刀剑/双手双刀/断门刀/断门刀.prefab  | 6 +++---
 .../weapons/人物/刀剑/双手双刀/柳叶双刀/柳叶双刀.prefab     | 6 +++---
 .../models/weapons/人物/刀剑/双手双刀/破煞刀/破煞刀.prefab  | 6 +++---
 .../models/weapons/人物/刀剑/双手双刀/阵雨刀/阵雨刀.prefab  | 6 +++---
 .../weapons/人物/刀剑/双手双剑/流霜剑/流霜剑_右.prefab      | 6 +++---
 .../weapons/人物/刀剑/双手双剑/流霜剑/流霜剑_左.prefab      | 6 +++---
 .../weapons/人物/刀剑/双手双剑/连横剑/连横剑_右.prefab      | 6 +++---
 .../weapons/人物/刀剑/双手双剑/连横剑/连横剑_左.prefab      | 6 +++---
 .../models/weapons/人物/刀剑/双手双剑/阴阳剑/阴阳剑.prefab  | 6 +++---
 .../models/weapons/人物/刀剑/双手双剑/静泉剑/静泉剑.prefab  | 6 +++---
 .../weapons/人物/刀剑/双手双剑/鸳鸯剑/鸳鸯剑_右.prefab      | 6 +++---
 .../weapons/人物/刀剑/双手双剑/鸳鸯剑/鸳鸯剑_左.prefab      | 6 +++---
 .../models/weapons/人物/斧锤/双手双斧/啸风斧/啸风斧.prefab  | 6 +++---
 .../models/weapons/人物/斧锤/双手双斧/断流斧/断流斧.prefab  | 6 +++---
 .../models/weapons/人物/斧锤/双手双斧/板斧/板斧.prefab      | 6 +++---
 .../models/weapons/人物/斧锤/双手双斧/蘸金斧/蘸金斧.prefab  | 6 +++---
 .../models/weapons/人物/斧锤/双手双锤/亮银锤/亮银锤.prefab  | 2 +-
 .../models/weapons/人物/斧锤/双手双锤/手锤/手锤.prefab      | 6 +++---
 .../models/weapons/人物/斧锤/双手双锤/混元锤/混元锤.prefab  | 6 +++---
 .../models/weapons/人物/斧锤/双手双锤/炽焰锤/炽焰锤.prefab  | 6 +++---
 .../models/weapons/人物/斧锤/双手双锤/铁锤/铁锤.prefab      | 6 +++---
 .../models/weapons/人物/斧锤/双手双锤/镏金锤/镏金锤.prefab  | 6 +++---
 .../weapons/人物/斧锤/双手长斧/墨炎长斧/墨炎长斧.prefab     | 6 +++---
 .../models/weapons/人物/斧锤/双手长斧/石钺/石钺.prefab      | 6 +++---
 .../weapons/人物/斧锤/双手长斧/裂地长斧/裂地长斧.prefab     | 6 +++---
 .../weapons/人物/斧锤/双手长锤/啮霜长锤/啮霜长锤.prefab     | 6 +++---
 .../weapons/人物/斧锤/双手长锤/怒雷长锤/怒雷长锤.prefab     | 6 +++---
 .../models/weapons/人物/长兵/枪戟/沥泉之矛/沥泉之矛.prefab  | 6 +++---
 .../models/weapons/人物/长兵/枪戟/浑铁枪/浑铁枪.prefab      | 6 +++---
 .../models/weapons/人物/长兵/枪戟/点钢枪/点钢枪.prefab      | 6 +++---
 .../models/weapons/人物/长兵/枪戟/烂银枪/烂银枪.prefab      | 6 +++---
 .../models/weapons/人物/长兵/枪戟/耀炎之矛/耀炎之矛.prefab  | 6 +++---
 .../Models/models/weapons/人物/长兵/枪戟/蛇矛/蛇矛.prefab   | 6 +++---
 .../models/weapons/人物/长兵/重头/凤翅镗/凤翅镗.prefab      | 6 +++---
 .../models/weapons/人物/长兵/重头/棘木棒/棘木棒.prefab      | 6 +++---
 .../models/weapons/人物/长兵/重头/狼牙棒/狼牙棒.prefab      | 6 +++---
 .../models/weapons/人物/长兵/重头/碎灵镗/碎灵镗.prefab      | 6 +++---
 .../models/weapons/人物/长兵/重头/紫阳槊/紫阳槊.prefab      | 6 +++---
 .../models/weapons/人物/长兵/重头/贪狼镗/贪狼镗.prefab      | 6 +++---
 .../models/weapons/人物/长兵/长刀/劈挂刀/劈挂刀.prefab      | 6 +++---
 .../Models/models/weapons/人物/长兵/长刀/扫刀/扫刀.prefab   | 6 +++---
 .../models/weapons/人物/长兵/长刀/斩马刀/斩马刀.prefab      | 6 +++---
 .../Models/models/weapons/人物/长兵/长刀/朴刀/朴刀.prefab   | 6 +++---
 Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs      | 6 ++----
 Assets/PerfectWorld/Scripts/UI/NPCShopUIManager.cs          | 4 ++++
 58 files changed, 172 insertions(+), 170 deletions(-)

diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/折铁刀/折铁刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/折铁刀/折铁刀.prefab
index 76904481ec..7a9862d53f 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/折铁刀/折铁刀.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/折铁刀/折铁刀.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 521751511619950448}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 854.7991, y: -45.19295, z: 168.2162}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.467, y: -0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &4643159729352802538
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/斩将刀/斩将刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/斩将刀/斩将刀.prefab
index 2f9cff02fd..a2978c0cf0 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/斩将刀/斩将刀.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/斩将刀/斩将刀.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7283797167087943104}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 854.7991, y: -45.19295, z: 168.2162}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.55, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &6689449885943493666
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/百战刀/百战刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/百战刀/百战刀.prefab
index 1c239ef00c..ec10607b72 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/百战刀/百战刀.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/百战刀/百战刀.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9037966901010172822}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 854.7991, y: -45.19295, z: 168.2162}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.52, y: 0.08, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &6431048551573909870
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/破阵刀/破阵刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/破阵刀/破阵刀.prefab
index b58d9a0561..ac7eed401a 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/破阵刀/破阵刀.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/破阵刀/破阵刀.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4146391136452590312}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 854.7991, y: -45.19295, z: 168.2162}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.608, y: 0.03, z: 0.031}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &8380308436026247008
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/钢刀/钢刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/钢刀/钢刀.prefab
index 91463b3dfe..eb6dcb3886 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/钢刀/钢刀.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/钢刀/钢刀.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6005744050955720459}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 854.7991, y: -45.19295, z: 168.2162}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.439, y: -0, z: -0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &2976794322645826365
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/鬼头刀/鬼头刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/鬼头刀/鬼头刀.prefab
index 3ef0d67c7f..7ef984274b 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/鬼头刀/鬼头刀.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单刀/鬼头刀/鬼头刀.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3657562976579592623}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 854.7991, y: -45.19295, z: 168.2162}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.47, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &6576187325239959967
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/凝露剑/凝露剑.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/凝露剑/凝露剑.prefab
index 628bfa3627..deef2ec11d 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/凝露剑/凝露剑.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/凝露剑/凝露剑.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6287696647157729657}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 854.7991, y: -45.19295, z: 168.2162}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.58, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &2542169234980971614
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/淬铁剑/淬铁剑.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/淬铁剑/淬铁剑.prefab
index 27090810dd..3cda5e97df 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/淬铁剑/淬铁剑.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/淬铁剑/淬铁剑.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3072237174258024572}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.42, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &1487446899476086846
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/百炼剑/百炼剑.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/百炼剑/百炼剑.prefab
index 7975cdc3a5..276b2f4502 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/百炼剑/百炼剑.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/百炼剑/百炼剑.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7691330745472418625}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.58, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &3901653839846202411
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/观澜剑/观澜剑.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/观澜剑/观澜剑.prefab
index 40ee246420..182e3740bf 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/观澜剑/观澜剑.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/观澜剑/观澜剑.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4687492501342321793}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.46, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &2934905636045033890
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/青锋剑/青锋剑.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/青锋剑/青锋剑.prefab
index accf4dc9d0..7293309c38 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/青锋剑/青锋剑.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/单手单剑/青锋剑/青锋剑.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4523807140502598285}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.57, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &7671732475859138332
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/双掌刀/双掌刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/双掌刀/双掌刀.prefab
index 0664737e3b..c2746586cd 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/双掌刀/双掌刀.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/双掌刀/双掌刀.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1673886386918577840}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.51, y: -0.08, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &49109103213565591
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/披风刀/披风刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/披风刀/披风刀.prefab
index f85d34a65d..38c813bb1a 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/披风刀/披风刀.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/披风刀/披风刀.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4960158712494693704}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.59, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &103797880579185270
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/断门刀/断门刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/断门刀/断门刀.prefab
index c92193aee9..829250f451 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/断门刀/断门刀.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/断门刀/断门刀.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4514596060253920102}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.44, y: -0.04, z: 0.032}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &5836441970844709889
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/柳叶双刀/柳叶双刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/柳叶双刀/柳叶双刀.prefab
index ec21af8bd9..b2f895204c 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/柳叶双刀/柳叶双刀.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/柳叶双刀/柳叶双刀.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2804193919963264657}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.5, y: 0.06, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &1936149815519356261
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/破煞刀/破煞刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/破煞刀/破煞刀.prefab
index 94e0e030a0..d5403f2c48 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/破煞刀/破煞刀.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/破煞刀/破煞刀.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6024913029217443269}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0.7071068, y: 0.7071068, z: 0, w: 0}
+  m_LocalPosition: {x: 0.45, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 90}
 --- !u!33 &5390486599911108339
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/阵雨刀/阵雨刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/阵雨刀/阵雨刀.prefab
index c7c76a5d2d..5f66c27691 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/阵雨刀/阵雨刀.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双刀/阵雨刀/阵雨刀.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8954426676829949006}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.46, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &3386378493831336341
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/流霜剑/流霜剑_右.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/流霜剑/流霜剑_右.prefab
index 4626944e82..2eb35eff94 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/流霜剑/流霜剑_右.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/流霜剑/流霜剑_右.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8544343499760376834}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.423, y: 0.008, z: 0.009}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &8732503029651716070
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/流霜剑/流霜剑_左.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/流霜剑/流霜剑_左.prefab
index cdfc21612e..7165fab479 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/流霜剑/流霜剑_左.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/流霜剑/流霜剑_左.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9089679423287464323}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.439, y: 0.007, z: -0.014}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &8817967967612133426
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/连横剑/连横剑_右.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/连横剑/连横剑_右.prefab
index 7f6e53437c..6649be793e 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/连横剑/连横剑_右.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/连横剑/连横剑_右.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1750589402820721523}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.44, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &1726312771557601477
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/连横剑/连横剑_左.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/连横剑/连横剑_左.prefab
index 66cc26e3c4..dba528020a 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/连横剑/连横剑_左.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/连横剑/连横剑_左.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7898490744125074255}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.442, y: -0.04, z: 0.027}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &7727499927744400604
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/阴阳剑/阴阳剑.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/阴阳剑/阴阳剑.prefab
index 54d036050c..f0494a8457 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/阴阳剑/阴阳剑.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/阴阳剑/阴阳剑.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 431507536254419338}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.47, y: 0, z: 0.03}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &2070642545782787102
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/静泉剑/静泉剑.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/静泉剑/静泉剑.prefab
index 449c4a512d..59b32adc4d 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/静泉剑/静泉剑.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/静泉剑/静泉剑.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1113794091115841783}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.45, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &7932516146755324214
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/鸳鸯剑/鸳鸯剑_右.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/鸳鸯剑/鸳鸯剑_右.prefab
index 6749f2cb42..3a60d6aed8 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/鸳鸯剑/鸳鸯剑_右.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/鸳鸯剑/鸳鸯剑_右.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6611500696103112802}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.359, y: 0.006, z: 0.006}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &5567964522934692172
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/鸳鸯剑/鸳鸯剑_左.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/鸳鸯剑/鸳鸯剑_左.prefab
index 75e47e2dc3..9f6211e0e2 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/鸳鸯剑/鸳鸯剑_左.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/刀剑/双手双剑/鸳鸯剑/鸳鸯剑_左.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8934191901732488851}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.347, y: -0.012, z: 0.012}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &1458943245607846802
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/啸风斧/啸风斧.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/啸风斧/啸风斧.prefab
index 0f6a36965f..f188778349 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/啸风斧/啸风斧.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/啸风斧/啸风斧.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3843642197624191562}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.27, y: -0.08, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &2942293025938461444
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/断流斧/断流斧.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/断流斧/断流斧.prefab
index b44e9993f4..ca0b917f3b 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/断流斧/断流斧.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/断流斧/断流斧.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5369271364955280410}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.25, y: -0.09, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &3165116075288726831
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/板斧/板斧.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/板斧/板斧.prefab
index 3f0675a619..eed6123bbb 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/板斧/板斧.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/板斧/板斧.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1627728301949147503}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.25, y: 0, z: 0.03}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &7621110774882610367
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/蘸金斧/蘸金斧.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/蘸金斧/蘸金斧.prefab
index 0a463f323d..20006a26a3 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/蘸金斧/蘸金斧.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双斧/蘸金斧/蘸金斧.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4001841694840385047}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.33, y: -0.1, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &805389305525483483
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/亮银锤/亮银锤.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/亮银锤/亮银锤.prefab
index 16982f4b01..4f5ec621bb 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/亮银锤/亮银锤.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/亮银锤/亮银锤.prefab
@@ -27,7 +27,7 @@ Transform:
   m_GameObject: {fileID: 4649913178893672652}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0.14, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/手锤/手锤.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/手锤/手锤.prefab
index d1115511c4..535dcf844d 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/手锤/手锤.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/手锤/手锤.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4296978685365805745}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.09, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &3010680041828916761
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/混元锤/混元锤.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/混元锤/混元锤.prefab
index 96ad6c115c..150f0b4d70 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/混元锤/混元锤.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/混元锤/混元锤.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 114588174620003303}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.24, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &5738622860265099348
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/炽焰锤/炽焰锤.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/炽焰锤/炽焰锤.prefab
index 1a75c83259..ca1e1f7562 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/炽焰锤/炽焰锤.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/炽焰锤/炽焰锤.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1871826936208277503}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.13, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &5622821162627514245
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/铁锤/铁锤.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/铁锤/铁锤.prefab
index 1ab70b0a20..902a921ac9 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/铁锤/铁锤.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/铁锤/铁锤.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6657025351343012753}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.19, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &4710983591303832989
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/镏金锤/镏金锤.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/镏金锤/镏金锤.prefab
index 0a4bb0d2b0..814b0ac7a0 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/镏金锤/镏金锤.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手双锤/镏金锤/镏金锤.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 582524068872390062}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.34, y: 0, z: 0.11}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &551222743829696411
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/墨炎长斧/墨炎长斧.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/墨炎长斧/墨炎长斧.prefab
index 8e689b1856..f2dca68029 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/墨炎长斧/墨炎长斧.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/墨炎长斧/墨炎长斧.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 612928185602746483}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.76, y: -0.14, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &877854830967665102
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/石钺/石钺.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/石钺/石钺.prefab
index f3ac1a1fb3..b3bfe0bec8 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/石钺/石钺.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/石钺/石钺.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 252742027917821622}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.66, y: -0.14, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &2067319665948465769
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/裂地长斧/裂地长斧.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/裂地长斧/裂地长斧.prefab
index edac5aaff0..11dbfb62a6 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/裂地长斧/裂地长斧.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长斧/裂地长斧/裂地长斧.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5251377079602931302}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.98, y: -0.06, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &8337534583944483472
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/啮霜长锤/啮霜长锤.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/啮霜长锤/啮霜长锤.prefab
index ad95e60289..cc50fe14b0 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/啮霜长锤/啮霜长锤.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/啮霜长锤/啮霜长锤.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3632554605594395393}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0.015733898, y: 0.7069317, z: -0.015733898, w: 0.7069317}
+  m_LocalPosition: {x: 0.7, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 2.55, y: 90, z: 0}
 --- !u!33 &5757475931190928569
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/怒雷长锤/怒雷长锤.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/怒雷长锤/怒雷长锤.prefab
index 685afe45a7..9b7038463b 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/怒雷长锤/怒雷长锤.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/斧锤/双手长锤/怒雷长锤/怒雷长锤.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1004382166946238604}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.78, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &7739687131419528944
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/沥泉之矛/沥泉之矛.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/沥泉之矛/沥泉之矛.prefab
index d848c44a41..57c033bb8b 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/沥泉之矛/沥泉之矛.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/沥泉之矛/沥泉之矛.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8118372724377232535}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: -0.40557975, y: 0.579228, z: 0.40557975, w: 0.579228}
+  m_LocalPosition: {x: 2, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: -70, y: 90, z: 0}
 --- !u!33 &7702346965493637044
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/浑铁枪/浑铁枪.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/浑铁枪/浑铁枪.prefab
index 265ed5bf63..1bfbba570a 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/浑铁枪/浑铁枪.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/浑铁枪/浑铁枪.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3708902834663212576}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: -0.45451945, y: 0.54167527, z: 0.45451945, w: 0.54167527}
+  m_LocalPosition: {x: 0.91, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: -80, y: 90, z: 0}
 --- !u!33 &215318870199670359
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/点钢枪/点钢枪.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/点钢枪/点钢枪.prefab
index 4d46b31e94..9801ebe72c 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/点钢枪/点钢枪.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/点钢枪/点钢枪.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3386362935637178495}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: -0.37680045, y: 0.5983489, z: 0.37680045, w: 0.5983489}
+  m_LocalPosition: {x: 1.82, y: 0.049, z: 0.012}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: -64.4, y: 90, z: 0}
 --- !u!33 &2249869016674504523
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/烂银枪/烂银枪.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/烂银枪/烂银枪.prefab
index e9c5cb216d..69c12317c6 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/烂银枪/烂银枪.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/烂银枪/烂银枪.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5744228263443585635}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: -0.4181191, y: 0.57024246, z: 0.4181191, w: 0.57024246}
+  m_LocalPosition: {x: 2, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: -72.5, y: 90, z: 0}
 --- !u!33 &767111472807305304
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/耀炎之矛/耀炎之矛.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/耀炎之矛/耀炎之矛.prefab
index 80db0b9fab..eb28bb6bc0 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/耀炎之矛/耀炎之矛.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/耀炎之矛/耀炎之矛.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2426238636354042165}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: -0.4131269, y: 0.5738695, z: 0.4131269, w: 0.5738695}
+  m_LocalPosition: {x: 2, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: -71.5, y: 90, z: 0}
 --- !u!33 &1817264271704911385
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/蛇矛/蛇矛.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/蛇矛/蛇矛.prefab
index 2155f2b4b3..265e5e3cd4 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/蛇矛/蛇矛.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/枪戟/蛇矛/蛇矛.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8478865665253152939}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: -0.42307937, y: 0.566572, z: 0.42307937, w: 0.566572}
+  m_LocalPosition: {x: 2, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: -73.5, y: 90, z: 0}
 --- !u!33 &1875442124140011855
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/凤翅镗/凤翅镗.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/凤翅镗/凤翅镗.prefab
index 68289a410e..3139307d9f 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/凤翅镗/凤翅镗.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/凤翅镗/凤翅镗.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8787341145026669753}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.652, y: -0, z: -0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &6886144341852739131
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/棘木棒/棘木棒.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/棘木棒/棘木棒.prefab
index 0a0faa5edf..da6b1fb372 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/棘木棒/棘木棒.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/棘木棒/棘木棒.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6078192489162540850}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.64, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &5938416084853196401
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/狼牙棒/狼牙棒.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/狼牙棒/狼牙棒.prefab
index fa13412ac2..f361098fc6 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/狼牙棒/狼牙棒.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/狼牙棒/狼牙棒.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7583996414051340456}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.87, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &5068162253037144888
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/碎灵镗/碎灵镗.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/碎灵镗/碎灵镗.prefab
index 21a9cfc69b..50e462650d 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/碎灵镗/碎灵镗.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/碎灵镗/碎灵镗.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 514324012645713218}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.57, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &6641818280837675681
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/紫阳槊/紫阳槊.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/紫阳槊/紫阳槊.prefab
index e8655406ab..ad97ae65e3 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/紫阳槊/紫阳槊.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/紫阳槊/紫阳槊.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7423421571527749171}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.73, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &7563941420482788221
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/贪狼镗/贪狼镗.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/贪狼镗/贪狼镗.prefab
index 4ef73d5476..5d84e1263b 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/贪狼镗/贪狼镗.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/重头/贪狼镗/贪狼镗.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1125368435937452624}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0.008453601, y: 0.7070563, z: -0.008453601, w: 0.7070563}
+  m_LocalPosition: {x: 0.66, y: -0.14, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 1.37, y: 90, z: 0}
 --- !u!33 &1430035286846886459
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/劈挂刀/劈挂刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/劈挂刀/劈挂刀.prefab
index 2e8cda4d50..eabb960cbf 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/劈挂刀/劈挂刀.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/劈挂刀/劈挂刀.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5812609165759687500}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 1, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &872845287390182096
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/扫刀/扫刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/扫刀/扫刀.prefab
index 5942a4da03..2c7359a2ed 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/扫刀/扫刀.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/扫刀/扫刀.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4202528123455853326}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0.95, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &4574804706647375284
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/斩马刀/斩马刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/斩马刀/斩马刀.prefab
index b5bda1519f..a983d0b66e 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/斩马刀/斩马刀.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/斩马刀/斩马刀.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 120385328447347559}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 1, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &6881055716062663917
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/朴刀/朴刀.prefab b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/朴刀/朴刀.prefab
index 2264b0303b..26f4766a56 100644
--- a/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/朴刀/朴刀.prefab
+++ b/Assets/ModelRenderer/Art/Models/models/weapons/人物/长兵/长刀/朴刀/朴刀.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5641955314571368359}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 1.06, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!33 &5990592806001361267
 MeshFilter:
   m_ObjectHideFlags: 0
diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs b/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs
index c04efa156c..7435db4835 100644
--- a/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs
+++ b/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs
@@ -1133,7 +1133,6 @@ namespace BrewMonster.Scripts.Managers
             {
                 if (button == null || itemData == null)
                 {
-                    Debug.LogWarning("[UpdateCooldownOverlay] Button or itemData is null");
                     return;
                 }
 
@@ -1146,7 +1145,6 @@ namespace BrewMonster.Scripts.Managers
                     {
                         // Cached but destroyed, remove and search again
                         // 已缓存但被销毁，移除并重新查找
-                        Debug.LogWarning($"[UpdateCooldownOverlay] Cached overlay was destroyed for button {button.name}");
                         _overlayImages.Remove(button);
                     }
                 }
@@ -1165,12 +1163,12 @@ namespace BrewMonster.Scripts.Managers
                         }
                         else
                         {
-                            Debug.LogWarning($"[UpdateCooldownOverlay] Found transform but no Image component on image_overlay for button {button.name}");
+
                         }
                     }
                     else
                     {
-                        Debug.LogWarning($"[UpdateCooldownOverlay] Cannot find image_overlay child in button {button.name}");
+
                     }
                 }
 
diff --git a/Assets/PerfectWorld/Scripts/UI/NPCShopUIManager.cs b/Assets/PerfectWorld/Scripts/UI/NPCShopUIManager.cs
index 2090a3d2f0..f4f623bb84 100644
--- a/Assets/PerfectWorld/Scripts/UI/NPCShopUIManager.cs
+++ b/Assets/PerfectWorld/Scripts/UI/NPCShopUIManager.cs
@@ -564,6 +564,10 @@ public class NPCShopUIManager : AUIDialog
             itemsBuyTotalMoneyText.text = string.Empty;
         }
 
+        contentMidBuy.SetActive(true);
+        contentRight.SetActive(true);
+        contentMidSell.SetActive(false);
+
         EC_Game.GetGameRun().GetUIManager().GetInGameUIMan().EndNPCService();
     }
 

From fc38b2199d5930e148262ce19aff2e7792b40420 Mon Sep 17 00:00:00 2001
From: HungDK <>
Date: Thu, 9 Apr 2026 10:53:36 +0700
Subject: [PATCH 4/4] Update select target to nearest everytimes

---
 Assets/Scripts/CECHostPlayer.cs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Assets/Scripts/CECHostPlayer.cs b/Assets/Scripts/CECHostPlayer.cs
index 90efd3e2bf..5a63a0e17b 100644
--- a/Assets/Scripts/CECHostPlayer.cs
+++ b/Assets/Scripts/CECHostPlayer.cs
@@ -63,6 +63,7 @@ namespace BrewMonster
 
         private CECPetCorral m_pPetCorral;
         private List<CECObject> m_aTabSels = new List<CECObject>();
+        private int m_lastAutoSelectNearestId = 0;
         private List<CECSkill> m_aPtSkills = new List<CECSkill>();
         private List<CECSkill> m_aPsSkills = new List<CECSkill>();
         private List<CECSkill> m_aEquipSkills = new List<CECSkill>();
@@ -2812,10 +2813,22 @@ namespace BrewMonster
             int idNewSel = 0;
             if (sorted.Count == 0)
             {
+                m_lastAutoSelectNearestId = 0;
                 idNewSel = idCurSel;
             }
             else
             {
+                int nearestId = sorted[0].id;
+                if (nearestId != 0 && nearestId != m_lastAutoSelectNearestId)
+                {
+                    // If the nearest target changed (movement/spawn/despawn), reset cycle back to nearest
+                    m_lastAutoSelectNearestId = nearestId;
+                    idNewSel = nearestId;
+                }
+                else
+                {
+                    m_lastAutoSelectNearestId = nearestId;
+
                 int idx = -1;
                 for (int i = 0; i < sorted.Count; i++)
                 {
@@ -2827,6 +2840,7 @@ namespace BrewMonster
                 }
                 int nextIdx = idx < 0 ? 0 : (idx + 1) % sorted.Count;
                 idNewSel = sorted[nextIdx].id;
+                }
             }
 
             // Select the target if found / 如果找到目标则选择它