button添加点击动画

Assets/Res/Config/HeroModelConfig.json

@@ -16,7 +16,7 @@
       "attack": 100,
       "def": 50,
       "shield": 100,
-      "speed_atk": 12.0,
+      "speed_atk": 3.0,
       "skillID": [
         -1,
         -1,
@@ -53,7 +53,7 @@
       "attack": 60,
       "def": 50,
       "shield": 100,
-      "speed_atk": 12.0,
+      "speed_atk": 3.0,
       "skillID": [
         1201,
         2001,
@@ -90,7 +90,7 @@
       "attack": 60,
       "def": 50,
       "shield": 100,
-      "speed_atk": 12.0,
+      "speed_atk": 3.0,
       "skillID": [
         1202,
         2002,
@@ -127,7 +127,7 @@
       "attack": 60,
       "def": 50,
       "shield": 100,
-      "speed_atk": 12.0,
+      "speed_atk": 3.0,
       "skillID": [
         1201,
         2003,
@@ -164,7 +164,7 @@
       "attack": 100,
       "def": 50,
       "shield": 200,
-      "speed_atk": 12.0,
+      "speed_atk": 3.0,
       "skillID": [
         9003,
         9004,

Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab

@@ -32,11 +32,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3370061335406075943}
+  m_Father: {fileID: 3764721290890148754}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0.0000052154, y: 2.9}
+  m_AnchoredPosition: {x: -0, y: 2.9}
   m_SizeDelta: {x: 433.7711, y: 36.0552}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2062974483703860703
@@ -128,11 +128,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9098093879968300551}
-  m_Father: {fileID: 3370061335406075943}
+  m_Father: {fileID: 3764721290890148754}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 6.8, y: -6.0521}
+  m_AnchoredPosition: {x: -165.22783, y: 10.86892}
   m_SizeDelta: {x: 64.56799, y: 28.462402}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5479443627435669674
@@ -173,6 +173,57 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &4038213450023413557
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3764721290890148754}
+  - component: {fileID: 4166089039989576680}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Button
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3764721290890148754
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4038213450023413557}
+  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: 8807649875490934103}
+  - {fileID: 1357522047238736597}
+  - {fileID: 3650536308811846443}
+  - {fileID: 712579681456886399}
+  - {fileID: 6760469126628422357}
+  - {fileID: 3042280114302172752}
+  m_Father: {fileID: 3370061335406075943}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0.0000052452087, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4166089039989576680
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4038213450023413557}
+  m_CullTransparentMesh: 1
 --- !u!1 &4442584923359408203
 GameObject:
   m_ObjectHideFlags: 0
@@ -205,7 +256,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3370061335406075943}
+  m_Father: {fileID: 3764721290890148754}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -300,11 +351,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3370061335406075943}
+  m_Father: {fileID: 3764721290890148754}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0.0000052452087, y: 0}
+  m_AnchoredPosition: {x: 0, y: 16.92102}
   m_SizeDelta: {x: 444, y: 133.84}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &2778409128145198339
@@ -383,12 +434,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8807649875490934103}
-  - {fileID: 1357522047238736597}
-  - {fileID: 3650536308811846443}
-  - {fileID: 712579681456886399}
-  - {fileID: 6760469126628422357}
-  - {fileID: 3042280114302172752}
+  - {fileID: 3764721290890148754}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -457,16 +503,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6161269103075097772}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 3370061335406075943}
+  m_Father: {fileID: 3764721290890148754}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -3.100006, y: -3.0999985}
+  m_AnchoredPosition: {x: 168.92786, y: 13.821144}
   m_SizeDelta: {x: 36.4424, y: 35.969}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &8916865937304356244
@@ -686,12 +732,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3370061335406075943}
+  m_Father: {fileID: 3764721290890148754}
   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: 46.637783}
-  m_SizeDelta: {x: -0.0557, y: -93.2756}
+  m_SizeDelta: {x: 344, y: -59.433495}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8013943971233128026
 CanvasRenderer:

Assets/Res/UI/DivineSence/ShengShiEventWidgetType3.prefab

@@ -32,7 +32,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3370061335406075943}
+  m_Father: {fileID: 8704413967189924930}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -96,6 +96,89 @@ MonoBehaviour:
   m_EffectColor: {r: 0.4811321, g: 0.43347278, b: 0.43347278, a: 0.5}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!1 &2866411676261796578
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8704413967189924930}
+  - component: {fileID: 522430348914269042}
+  - component: {fileID: 9002364251388751492}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Button
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8704413967189924930
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2866411676261796578}
+  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: 8807649875490934103}
+  - {fileID: 1357522047238736597}
+  - {fileID: 3650536308811846443}
+  - {fileID: 712579681456886399}
+  - {fileID: 2581404301119584838}
+  - {fileID: 1928953398721837283}
+  - {fileID: 5700846322996692730}
+  m_Father: {fileID: 3370061335406075943}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &522430348914269042
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2866411676261796578}
+  m_CullTransparentMesh: 1
+--- !u!114 &9002364251388751492
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2866411676261796578}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &2893425264750841484
 GameObject:
   m_ObjectHideFlags: 0
@@ -123,16 +206,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2893425264750841484}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
   m_ConstrainProportionsScale: 1
   m_Children: []
-  m_Father: {fileID: 3370061335406075943}
+  m_Father: {fileID: 8704413967189924930}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 280, y: -18.5}
+  m_AnchoredPosition: {x: 107.97214, y: -18.5}
   m_SizeDelta: {x: 0, y: 86.8594}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7008100311386754448
@@ -215,7 +298,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3370061335406075943}
+  m_Father: {fileID: 8704413967189924930}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -310,11 +393,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3370061335406075943}
+  m_Father: {fileID: 8704413967189924930}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0.0000052452087, y: 0}
+  m_AnchoredPosition: {x: 0, y: 16.92102}
   m_SizeDelta: {x: 444, y: 133.84}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &2778409128145198339
@@ -395,11 +478,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5165619257450353462}
-  m_Father: {fileID: 3370061335406075943}
+  m_Father: {fileID: 8704413967189924930}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 5.1439056, y: -6.052101}
+  m_AnchoredPosition: {x: -166.88393, y: 10.868919}
   m_SizeDelta: {x: 64.56799, y: 28.462402}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &16038596088903780
@@ -470,13 +553,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8807649875490934103}
-  - {fileID: 1357522047238736597}
-  - {fileID: 3650536308811846443}
-  - {fileID: 712579681456886399}
-  - {fileID: 2581404301119584838}
-  - {fileID: 1928953398721837283}
-  - {fileID: 5700846322996692730}
+  - {fileID: 8704413967189924930}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -549,12 +626,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3370061335406075943}
+  m_Father: {fileID: 8704413967189924930}
   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: 46.637783}
-  m_SizeDelta: {x: -0.0557, y: -93.2756}
+  m_SizeDelta: {x: 344, y: -59.433495}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8013943971233128026
 CanvasRenderer:
@@ -826,11 +903,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7117316534246028533}
-  m_Father: {fileID: 3370061335406075943}
+  m_Father: {fileID: 8704413967189924930}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 355.36053, y: -6.052101}
+  m_AnchoredPosition: {x: 183.3327, y: 10.868919}
   m_SizeDelta: {x: 79.4075, y: 28.4624}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &1932774545571088901

Assets/Res/UI/MainHeroPanel/FaBaoWidget.prefab

@@ -1,5 +1,54 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &1197524451346760911
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7201230285343381440}
+  - component: {fileID: 892032992034649656}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Button
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7201230285343381440
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1197524451346760911}
+  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: 3600548847287801475}
+  - {fileID: 6715878191117609555}
+  - {fileID: 1882091923597765978}
+  - {fileID: 8982381730593164203}
+  m_Father: {fileID: 3921069648395711794}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 118}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &892032992034649656
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1197524451346760911}
+  m_CullTransparentMesh: 1
 --- !u!1 &1305485169672742227
 GameObject:
   m_ObjectHideFlags: 0
@@ -31,7 +80,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3921069648395711794}
+  m_Father: {fileID: 7201230285343381440}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -115,11 +164,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3921069648395711794}
+  m_Father: {fileID: 7201230285343381440}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: -0.9999695}
+  m_AnchoredPosition: {x: 0, y: -1.1999817}
   m_SizeDelta: {x: 100, y: 38.0645}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &3372643250122354884
@@ -280,10 +329,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 3600548847287801475}
-  - {fileID: 6715878191117609555}
-  - {fileID: 1882091923597765978}
-  - {fileID: 8982381730593164203}
+  - {fileID: 7201230285343381440}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -398,11 +444,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4359737246862995808}
-  m_Father: {fileID: 3921069648395711794}
+  m_Father: {fileID: 7201230285343381440}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0.2000122}
   m_SizeDelta: {x: 51.0764, y: 23.5821}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &469252788800658108
@@ -482,11 +528,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3921069648395711794}
+  m_Father: {fileID: 7201230285343381440}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0.000030517578}
+  m_AnchoredPosition: {x: 0, y: -0.19998169}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8341102112999275379

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -327,7 +327,7 @@ RectTransform:
   m_LocalScale: {x: 1.000384, y: 1.000384, z: 1.000384}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 953277807175961835}
+  m_Father: {fileID: 8031870718418499362}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1727,6 +1727,82 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u91D1"
+--- !u!1 &1842934790129004593
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2849870254427059589}
+  - component: {fileID: 2979530866879729195}
+  - component: {fileID: 4958411059339131415}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2849870254427059589
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1842934790129004593}
+  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: 8031870718418499362}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2979530866879729195
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1842934790129004593}
+  m_CullTransparentMesh: 1
+--- !u!114 &4958411059339131415
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1842934790129004593}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &2064245649932131244
 GameObject:
   m_ObjectHideFlags: 0
@@ -3498,6 +3574,53 @@ MonoBehaviour:
   isAdaptationWidth: 0
   layoutType: 0
   overflowDistance: 0
+--- !u!1 &4886795217952563313
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8031870718418499362}
+  - component: {fileID: 6141068599693289444}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Button
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8031870718418499362
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4886795217952563313}
+  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: 2849870254427059589}
+  - {fileID: 1774812024264171205}
+  m_Father: {fileID: 953277807175961835}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0.000015258789, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6141068599693289444
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4886795217952563313}
+  m_CullTransparentMesh: 1
 --- !u!1 &5080917074618674990
 GameObject:
   m_ObjectHideFlags: 0
@@ -3638,8 +3761,6 @@ GameObject:
   m_Component:
   - component: {fileID: 953277807175961835}
   - component: {fileID: 7093696459674443853}
-  - component: {fileID: 5763993906558437163}
-  - component: {fileID: 3101040128130302901}
   - component: {fileID: 3208298722536419456}
   m_Layer: 5
   m_HasEditorInfo: 1
@@ -3661,7 +3782,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1774812024264171205}
+  - {fileID: 8031870718418499362}
   - {fileID: 39178269465296759}
   m_Father: {fileID: 8153636129082282834}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3678,50 +3799,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5235669251348932779}
   m_CullTransparentMesh: 1
---- !u!114 &5763993906558437163
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5235669251348932779}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &3101040128130302901
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5235669251348932779}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 660ad2950a2b6054782a5bbfab3ab936, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  isUsePressAndHold: 1
-  holdTime: 1
 --- !u!114 &3208298722536419456
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3741,12 +3818,7 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   - key: myBg
-    gameObject: {fileID: 5763993906558437163}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: myButton
-    gameObject: {fileID: 3101040128130302901}
+    gameObject: {fileID: 4958411059339131415}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
@@ -4698,8 +4770,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -6.8, y: 46.6}
-  m_SizeDelta: {x: 220.841, y: 50.9141}
+  m_AnchoredPosition: {x: 0.8263, y: 46.6}
+  m_SizeDelta: {x: 310.9697, y: 50.9141}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &33174482886512446
 CanvasRenderer:
@@ -4722,7 +4794,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/Res/UI/SkillSelectPanel/SkillWidget.prefab

@@ -26,17 +26,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 494216372642911261}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 142305117687377865}
+  m_Father: {fileID: 7578534503293312128}
   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: -2.3}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: -0.4000244, y: -29.200024}
+  m_SizeDelta: {x: -46.989998, y: -139.0584}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4973722897884048289
 CanvasRenderer:
@@ -153,15 +153,9 @@ RectTransform:
   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_ConstrainProportionsScale: 1
   m_Children:
-  - {fileID: 2558866921916806366}
-  - {fileID: 7896131592767513033}
-  - {fileID: 1608102705727293640}
-  - {fileID: 142305117687377865}
-  - {fileID: 2140549312652121987}
-  - {fileID: 4933297852123740916}
-  - {fileID: 7716599432344587041}
+  - {fileID: 7578534503293312128}
   - {fileID: 271321759498699397}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -259,7 +253,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8817738242950991828}
+  m_Father: {fileID: 7578534503293312128}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -338,17 +332,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1520061693375276812}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 2140549312652121987}
+  m_Father: {fileID: 7578534503293312128}
   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_AnchoredPosition: {x: -45.68695, y: 75.789795}
+  m_SizeDelta: {x: -91.3739, y: -151.5794}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9004169807973307310
 CanvasRenderer:
@@ -418,13 +412,12 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1659073380297634169}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 234782566907562466}
-  m_Father: {fileID: 8817738242950991828}
+  m_Children: []
+  m_Father: {fileID: 7578534503293312128}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -506,7 +499,7 @@ RectTransform:
   - {fileID: 8224044986558415334}
   - {fileID: 488998708127733385}
   - {fileID: 1814687121676452637}
-  m_Father: {fileID: 8817738242950991828}
+  m_Father: {fileID: 7578534503293312128}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
@@ -587,17 +580,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2751874343717437709}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 1608102705727293640}
+  m_Father: {fileID: 7578534503293312128}
   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_AnchoredPosition: {x: 0, y: -71.59717}
+  m_SizeDelta: {x: 0, y: -143.1945}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8199172619172445228
 CanvasRenderer:
@@ -751,13 +744,12 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3266992687204387941}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 8005189183441926883}
-  m_Father: {fileID: 8817738242950991828}
+  m_Children: []
+  m_Father: {fileID: 7578534503293312128}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -841,9 +833,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 5228514600919158430}
-  m_Father: {fileID: 8817738242950991828}
+  m_Children: []
+  m_Father: {fileID: 7578534503293312128}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -993,6 +984,62 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!1 &4626239636474953155
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7578534503293312128}
+  - component: {fileID: 548158904673010507}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Button
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7578534503293312128
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4626239636474953155}
+  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: 1
+  m_Children:
+  - {fileID: 2558866921916806366}
+  - {fileID: 7896131592767513033}
+  - {fileID: 5228514600919158430}
+  - {fileID: 1608102705727293640}
+  - {fileID: 5713321227956047495}
+  - {fileID: 142305117687377865}
+  - {fileID: 8005189183441926883}
+  - {fileID: 2140549312652121987}
+  - {fileID: 234782566907562466}
+  - {fileID: 4933297852123740916}
+  - {fileID: 7716599432344587041}
+  m_Father: {fileID: 8817738242950991828}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 138, y: 170}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &548158904673010507
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4626239636474953155}
+  m_CullTransparentMesh: 1
 --- !u!1 &5661546328325043756
 GameObject:
   m_ObjectHideFlags: 0
@@ -1019,13 +1066,13 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5661546328325043756}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 7442873173985491102}
-  m_Father: {fileID: 8817738242950991828}
+  m_Father: {fileID: 7578534503293312128}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -1100,9 +1147,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 5713321227956047495}
-  m_Father: {fileID: 8817738242950991828}
+  m_Children: []
+  m_Father: {fileID: 7578534503293312128}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -1522,11 +1568,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 7896131592767513033}
+  m_Father: {fileID: 7578534503293312128}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0.00008773804}
+  m_AnchoredPosition: {x: -0.3999939, y: 18.000088}
   m_SizeDelta: {x: 89.5593, y: 89.5593}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6275430535333134801

Assets/Res/UI/WidgetItem.prefab

@@ -31,7 +31,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1515036893769208877}
+  m_Father: {fileID: 6062762002596746888}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -115,7 +115,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1515036893769208877}
+  m_Father: {fileID: 6062762002596746888}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -168,6 +168,54 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
     packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
     lasetJsonGUID: 73bfe54518876535550be496297154c4
+--- !u!1 &3054887198727531086
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6062762002596746888}
+  - component: {fileID: 7059464450879950696}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Button
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6062762002596746888
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3054887198727531086}
+  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: 1835098571422434311}
+  - {fileID: 3545244106223690488}
+  - {fileID: 5126391295778819725}
+  m_Father: {fileID: 1515036893769208877}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7059464450879950696
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3054887198727531086}
+  m_CullTransparentMesh: 1
 --- !u!1 &6624212208645409916
 GameObject:
   m_ObjectHideFlags: 0
@@ -200,7 +248,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1515036893769208877}
+  m_Father: {fileID: 6062762002596746888}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -294,9 +342,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 1
   m_Children:
-  - {fileID: 1835098571422434311}
-  - {fileID: 3545244106223690488}
-  - {fileID: 5126391295778819725}
+  - {fileID: 6062762002596746888}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}

Assets/Scenes/testCombat.scene

@@ -2225,7 +2225,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Scripts/Core/UI/UTool/ButtonAnimation.cs

@@ -14,6 +14,8 @@ public class ButtonAnimation : MonoBehaviour, IPointerDownHandler, IPointerUpHan
     [Header("Settings")] [SerializeField] float duration = 0.07f;
     [SerializeField] Ease ease = Ease.OutQuad;
     [SerializeField] Vector3 animationSizeDelta = new(0.2f, 0.2f);
+    
+    public bool isEnabled = true;
     // [SerializeField] float animationFontSizeDelta = 1f;
 
     Vector3 initialSize;
@@ -35,6 +37,8 @@ public class ButtonAnimation : MonoBehaviour, IPointerDownHandler, IPointerUpHan
 
     public void OnPointerDown(PointerEventData eventData)
     {
+        if(!isEnabled)
+            return;
         motionHandles.Cancel();
 
         LMotion.Create(rectTransform.localScale, initialSize - animationSizeDelta, duration)
@@ -55,6 +59,8 @@ public class ButtonAnimation : MonoBehaviour, IPointerDownHandler, IPointerUpHan
 
     public void OnPointerUp(PointerEventData eventData)
     {
+        if(!isEnabled)
+            return;
         motionHandles.Cancel();
 
         LMotion.Create(rectTransform.localScale, initialSize, duration)

Assets/Scripts/GameLogic/Player/GongFaControl.cs

@@ -65,6 +65,8 @@ namespace GameLogic.Player
         /// </summary>
         public void SaveUseSkill()
         {
+            if(allUseSkill == null)
+                return;
             CombatHeroEntity combatHeroEntity = CombatController.currActiveCombat.playerHeroEntity;
             combatHeroEntity.CombatHeroSkillControl.SetNewSkill(allUseSkill);
             AccountFileInfo.Instance.SavePlayerData();

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

@@ -30,17 +30,6 @@ namespace Fort23.Mono
 	      return _myBg;
 	     }
 	   }
-	  private MyUIButton _myButton;
-	  public MyUIButton myButton
-	   {
-	   get{
-	      if (_myButton == null)
-	       {
-	         _myButton  = GetUIUnit<MyUIButton>("myButton"); 
-	       }
-	      return _myButton;
-	     }
-	   }
 	  private RectTransform _RemovePos;
 	  public RectTransform RemovePos
 	   {

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

@@ -480,7 +480,7 @@ namespace Fort23.Mono
                 skillKongWidget.InitWidget(index, this);
                 skillKongWidget.SetSKill(allUseSkill[index]);
                 skillKongWidget.transform.anchoredPosition = pos;
-                skillKongWidget.onClick = OnClickSkillKongWidget;
+                skillKongWidget.OnClick = OnClickSkillKongWidget;
                 allKongSkill.Add(skillKongWidget);
             }
         }
@@ -641,7 +641,7 @@ namespace Fort23.Mono
             SkillInfo skillInfo = showSkillInfo[index];
             SkillWidget skillWidget = await UIManager.Instance.CreateGComponent<SkillWidget>(null, ContentRoot);
             skillWidget.InitSkillWidget(skillInfo, this);
-            skillWidget.onClick = OnClick;
+            skillWidget.OnClick = OnClick;
             if (allUseSkill.Contains(skillWidget.skillConfigId))
             {
                 skillWidget.Icon_Marsk.SetActive(true);

Assets/Scripts/GameUI/UI/Component/ItemWidgetBasic.cs

@@ -5,26 +5,74 @@ using UnityEngine;
 
 public class ItemWidgetBasic : UIComponent, IScorllListWidget
 {
-
-    
+    public LongPressBtn longPressBtn;
+    public ButtonAnimation animation = null;
     protected RectTransform _rectTransform;
 
 
-    public System.Action<ItemWidgetBasic> onClick;
+    public System.Action<ItemWidgetBasic> OnClick
+    {
+        get { return onClick; }
+        set
+        {
+            onClick = value;
+            if (onContinueClick != null || onClick != null)
+            {
+                if(animation != null) 
+                    animation.isEnabled = true;
+            }
+            else
+            {
+                if(animation != null) 
+                    animation.isEnabled = false;
+            }
+        }
+    }
 
-    public System.Action<ItemWidgetBasic> onContinueClick;
+    private System.Action<ItemWidgetBasic> onClick;
+
+    public System.Action<ItemWidgetBasic> OnContinueClick
+    {
+        get { return onContinueClick; }
+        set
+        {
+            onContinueClick = value;
+
+            if (onContinueClick != null || onClick != null)
+            {
+                if(animation != null) 
+                    animation.isEnabled = true;
+            }
+            else
+            {
+                if(animation != null) 
+                    animation.isEnabled = false;
+            }
+        }
+    }
+
+
+    private System.Action<ItemWidgetBasic> onContinueClick;
 
 
     public override void AddButtonEvent()
     {
-        LongPressBtn longPressBtn = own.GetComponent<LongPressBtn>();
-        if(longPressBtn == null)
+        longPressBtn = own.GetComponent<LongPressBtn>();
+        if (longPressBtn == null)
             longPressBtn = own.AddComponent<LongPressBtn>();
-        longPressBtn.onClick =() => onClick?.Invoke(this);
-        longPressBtn.longPress =() => onContinueClick?.Invoke(this);
-        base.AddButtonEvent();
-     
+        longPressBtn.onClick = () => OnClick?.Invoke(this);
+        longPressBtn.longPress = () => OnContinueClick?.Invoke(this);
+        if (own.transform.Find("Button") != null)
+        {
+            animation = own.transform.Find("Button").gameObject.GetComponent<ButtonAnimation>();
+            if (animation == null)
+                animation = own.transform.Find("Button").gameObject.AddComponent<ButtonAnimation>();
+
+            animation.isEnabled = false;
+        }
 
+
+        base.AddButtonEvent();
     }
 
     public override CTask<bool> AsyncInit(object[] uiData)
@@ -34,12 +82,17 @@ public class ItemWidgetBasic : UIComponent, IScorllListWidget
             _rectTransform = GObjectPoolInterface.GetComponent<RectTransform>();
         }
 
-   
+
         return base.AsyncInit(uiData);
     }
 
 
-    
+    public void SetBtnAnimation(bool isEnable)
+    {
+        if(animation)
+            animation.isEnabled = isEnable;
+    }
+
 
     public RectTransform Transform
     {
@@ -55,24 +108,22 @@ public class ItemWidgetBasic : UIComponent, IScorllListWidget
 
     public override void DormancyObj()
     {
-
-    
         transform.GetComponent<RectTransform>().anchorMax = Vector2.one * 0.5f;
         transform.GetComponent<RectTransform>().anchorMin = Vector2.one * 0.5f;
+        OnContinueClick = null;
+        OnClick = null;
         base.DormancyObj();
     }
-    
+
     public void OnPointerClick()
     {
-        onClick?.Invoke(this);
+        OnClick?.Invoke(this);
     }
 
     public void OnPointerContinueClick()
     {
-        onContinueClick?.Invoke(this);
+        OnContinueClick?.Invoke(this);
     }
-
-
-
-
+    
+  
 }

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs

@@ -53,14 +53,14 @@ namespace Fort23.Mono
             {
                 ShengShiEventWidgetType3 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType3>(null, ContentRoot);
                 shengShiEventWidgetType2.CustomInit(AccountFileInfo.Instance.playerData.eventList[index]);
-                shengShiEventWidgetType2.onClick = ShengShiEventWidgetType3OnClick;
+                shengShiEventWidgetType2.OnClick = ShengShiEventWidgetType3OnClick;
                 return shengShiEventWidgetType2;
             }
             else
             {
                 ShengShiEventWidgetType2 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ContentRoot);
                 shengShiEventWidgetType2.CustomInit(AccountFileInfo.Instance.playerData.eventList[index]);
-                shengShiEventWidgetType2.onClick = OnClick;
+                shengShiEventWidgetType2.OnClick = OnClick;
                 return shengShiEventWidgetType2;
             }
         }

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventResultPanel.cs

@@ -62,14 +62,14 @@ namespace Fort23.Mono
             {
                 ShengShiEventWidgetType3 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType3>(null, ContentRoot);
                 shengShiEventWidgetType2.CustomInit(eventList[index]);
-                shengShiEventWidgetType2.onClick = ShengShiEventWidgetType3OnClick;
+                shengShiEventWidgetType2.OnClick = ShengShiEventWidgetType3OnClick;
                 return shengShiEventWidgetType2;
             }
             else
             {
                 ShengShiEventWidgetType2 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ContentRoot);
                 shengShiEventWidgetType2.CustomInit(eventList[index]);
-                shengShiEventWidgetType2.onClick = OnClick;
+                shengShiEventWidgetType2.OnClick = OnClick;
                 return shengShiEventWidgetType2;
             }
         }

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/SkillRoadSelecPanel.cs

@@ -44,7 +44,7 @@ namespace Fort23.Mono
             {
                 SkillRoadWidget skillRoadWidget = await UIManager.Instance.CreateGComponent<SkillRoadWidget>(null, Content);
                 skillRoadWidget.CustomInti(skillConfig.ID);
-                skillRoadWidget.onClick = OnClick;
+                skillRoadWidget.OnClick = OnClick;
                 _skillRoadWidgets.Add(skillRoadWidget);
             }
 

Assets/Scripts/GameUI/UI/HeroInformationPanel/SelectElixirPanel.cs

@@ -89,7 +89,7 @@ namespace Fort23.Mono
                     }
                 }
 
-                elixirItemWidget.onClick = OnClick;
+                elixirItemWidget.OnClick = OnClick;
                 elixirItems.Add(elixirItemWidget);
             }
 

Assets/Scripts/GameUI/UI/HeroInformationPanel/UseExpElixirPanel.cs

@@ -38,7 +38,7 @@ namespace Fort23.Mono
                 ExpElixirItemWidget elixirItemWidget =
                     await UIManager.Instance.CreateGComponent<ExpElixirItemWidget>(null, Content);
                 elixirItemWidget.CustomInit(itemConfig.ID);
-                elixirItemWidget.onClick = OnClick;
+                elixirItemWidget.OnClick = OnClick;
                 _expElixirItemWidgets.Add(elixirItemWidget);
             }
 

Assets/Scripts/GameUI/UI/MainHeroPnael/MainHeroPanel.cs

@@ -44,7 +44,7 @@ namespace Fort23.Mono
                 BtnFaBaoWidget btnFaBaoWidget =
                     await UIManager.Instance.CreateGComponent<BtnFaBaoWidget>(null, FaBaoRoot);
                 btnFaBaoWidget.CustomInit(i);
-                btnFaBaoWidget.onClick = OnClick;
+                btnFaBaoWidget.OnClick = OnClick;
                 btnFaBaoWidgets.Add(btnFaBaoWidget);
             }
         }

Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanel.cs

@@ -86,7 +86,7 @@ namespace Fort23.Mono
                         }
                     }
 
-                    if (selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum[0] != -1)
+                    if (selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum != null && selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum[0] != -1)
                     {
                         if (!PlayerManager.Instance.BagController.IsEnough(selectedFaBaoInfo.FabaoConfig.ItemID, selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum[0]))
                         {
@@ -257,7 +257,7 @@ namespace Fort23.Mono
 
                     FaBaoWidget faBaoWidget = await UIManager.Instance.CreateGComponent<FaBaoWidget>(null, Content);
                     faBaoWidget.CustomInit(shownFaBaoInfos[i], true);
-                    faBaoWidget.onClick = OnClick;
+                    faBaoWidget.OnClick = OnClick;
                     faBaoWidgets.Add(faBaoWidget);
                 }
 
@@ -304,7 +304,7 @@ namespace Fort23.Mono
                 if (currentFaBaoWidget == null)
                     currentFaBaoWidget = await UIManager.Instance.CreateGComponent<FaBaoWidget>(null, CurrentFaBaoRoot);
 
-                currentFaBaoWidget.onClick = OnClick;
+                currentFaBaoWidget.OnClick = OnClick;
                 currentFaBaoWidget.CustomInit(currentFaBaoInfo, false);
                 equipTipsRoot.gameObject.SetActive(true);
             }
@@ -437,7 +437,7 @@ namespace Fort23.Mono
             }
 
             //大突破需要消耗对应的法宝碎片
-            if (faBaoInfo.FabaoPowerupConfig.PromotePieceNum[0] != -1)
+            if (faBaoInfo.FabaoPowerupConfig.PromotePieceNum != null && faBaoInfo.FabaoPowerupConfig.PromotePieceNum[0] != -1)
             {
                 ItemWidgetType1 itemWidgetType1 = await UIManager.Instance.CreateGComponent<ItemWidgetType1>(null, ItemRoot);
                 itemWidgetType1.CustomInit(faBaoInfo.FabaoConfig.ItemID, faBaoInfo.FabaoPowerupConfig.PromotePieceNum[0]);

ProjectSettings/ProjectSettings.asset

@@ -13,8 +13,8 @@ PlayerSettings:
   targetDevice: 2
   useOnDemandResources: 0
   accelerometerFrequency: 60
-  companyName: mythic heroes' guild
-  productName: mythic heroes' guild
+  companyName: XiuXian
+  productName: XiuXian
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.12156863, g: 0.12156863, b: 0.1254902, a: 1}
@@ -187,7 +187,7 @@ PlayerSettings:
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
     Android: com.fort23.xy001
-    Standalone: com.DefaultCompany.XY001
+    Standalone: com.DefaultCompany.XY002
   buildNumber:
     Standalone: 0
     VisionOS: 0