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

# Conflicts:
#	Assets/Scripts/GameLogic/Player/PlayerManager.cs   resolved by master version

Assets/Res/Config/FabaoConfig.json

@@ -2,475 +2,122 @@
   "configList": [
     {
       "ID": 10001,
-      "ItemID": 10020,
-      "name": "玉瓶",
+      "ItemID": 10002,
+      "name": "翡翠葫芦",
       "Type": 1,
       "magicAttribute": 1,
-      "model": "fb_yuping",
-      "cd": 5.0,
-      "fragmentID": 11001,
-      "Star": 3,
+      "model": "fb_feicuihulu",
+      "cd": 12.0,
+      "fragmentID": 11002,
       "ShuxingIDs": [
-        1,
-        2
+        1
       ],
       "ShuxingPara": [
-        90,
-        10
-      ],
-      "SkillGroupID": 901001,
-      "StarupItemCost": [
-        10,
-        20,
-        40,
-        60,
-        90,
-        120,
-        150
-      ],
-      "StarupShuxingIDs": [
-        106,
-        101,
-        106,
-        102,
-        106,
-        103,
-        106,
-        101
+        100
       ],
-      "StarupShuxingValues": [
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3
-      ]
+      "SkillGroupID": 901002
     },
     {
       "ID": 10002,
-      "ItemID": 10021,
-      "name": "破天斧",
+      "ItemID": 10003,
+      "name": "玄龟盾",
       "Type": 1,
       "magicAttribute": 1,
-      "model": "fb_dao1",
-      "cd": 7.0,
-      "fragmentID": 11002,
-      "Star": 3,
+      "model": "fb_xuanguidun",
+      "cd": 12.0,
+      "fragmentID": 11003,
       "ShuxingIDs": [
         2
       ],
       "ShuxingPara": [
         100
       ],
-      "SkillGroupID": 901001,
-      "StarupItemCost": [
-        10,
-        20,
-        40,
-        60,
-        90,
-        120,
-        150
-      ],
-      "StarupShuxingIDs": [
-        107,
-        102,
-        107,
-        103,
-        107,
-        101,
-        107,
-        102
-      ],
-      "StarupShuxingValues": [
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3
-      ]
+      "SkillGroupID": 901003
     },
     {
       "ID": 10003,
-      "ItemID": 10022,
-      "name": "神龙鼎",
+      "ItemID": 10004,
+      "name": "九幽镇魂瓶",
       "Type": 1,
       "magicAttribute": 1,
       "model": "fb_ding1",
-      "cd": 3.0,
-      "fragmentID": 11003,
-      "Star": 3,
+      "cd": 12.0,
+      "fragmentID": 11004,
       "ShuxingIDs": [
         3
       ],
       "ShuxingPara": [
         100
       ],
-      "SkillGroupID": 901003,
-      "StarupItemCost": [
-        10,
-        20,
-        40,
-        60,
-        90,
-        120,
-        150
-      ],
-      "StarupShuxingIDs": [
-        108,
-        103,
-        108,
-        101,
-        108,
-        102,
-        108,
-        103
-      ],
-      "StarupShuxingValues": [
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3
-      ]
+      "SkillGroupID": 901004
     },
     {
       "ID": 10004,
-      "ItemID": 10023,
-      "name": "葫芦",
+      "ItemID": 10005,
+      "name": "神龙鼎",
       "Type": 1,
       "magicAttribute": 1,
-      "model": "fb_feicuihulu",
-      "cd": 8.0,
-      "fragmentID": 11004,
-      "Star": 4,
+      "model": "fb_huohulu",
+      "cd": 12.0,
+      "fragmentID": 11005,
       "ShuxingIDs": [
         1
       ],
       "ShuxingPara": [
         100
       ],
-      "SkillGroupID": 901002,
-      "StarupItemCost": [
-        10,
-        20,
-        40,
-        60,
-        90,
-        120,
-        150
-      ],
-      "StarupShuxingIDs": [
-        109,
-        101,
-        109,
-        102,
-        109,
-        103,
-        109,
-        101
-      ],
-      "StarupShuxingValues": [
-        4,
-        4,
-        4,
-        4,
-        4,
-        4,
-        4,
-        4
-      ]
+      "SkillGroupID": 901005
     },
     {
       "ID": 10005,
-      "ItemID": 10024,
-      "name": "天殇血刃剑",
+      "ItemID": 10006,
+      "name": "破天斧",
       "Type": 1,
       "magicAttribute": 1,
       "model": "fb_jian1",
-      "cd": 3.0,
-      "fragmentID": 11005,
-      "Star": 4,
+      "cd": 12.0,
+      "fragmentID": 11006,
       "ShuxingIDs": [
         2
       ],
       "ShuxingPara": [
         100
       ],
-      "SkillGroupID": 901001,
-      "StarupItemCost": [
-        10,
-        20,
-        40,
-        60,
-        90,
-        120,
-        150
-      ],
-      "StarupShuxingIDs": [
-        110,
-        102,
-        110,
-        103,
-        110,
-        101,
-        110,
-        102
-      ],
-      "StarupShuxingValues": [
-        4,
-        4,
-        4,
-        4,
-        4,
-        4,
-        4,
-        4
-      ]
+      "SkillGroupID": 901006
     },
     {
       "ID": 10006,
-      "ItemID": 10025,
-      "name": "玉瓶",
+      "ItemID": 10007,
+      "name": "琉璃宝塔",
       "Type": 1,
       "magicAttribute": 1,
       "model": "fb_jian2",
-      "cd": 5.0,
-      "fragmentID": 11006,
-      "Star": 4,
+      "cd": 12.0,
+      "fragmentID": 11007,
       "ShuxingIDs": [
         3
       ],
       "ShuxingPara": [
         100
       ],
-      "SkillGroupID": 901001,
-      "StarupItemCost": [
-        10,
-        20,
-        40,
-        60,
-        90,
-        120,
-        150
-      ],
-      "StarupShuxingIDs": [
-        106,
-        103,
-        106,
-        101,
-        106,
-        102,
-        106,
-        103
-      ],
-      "StarupShuxingValues": [
-        4,
-        4,
-        4,
-        4,
-        4,
-        4,
-        4,
-        4
-      ]
+      "SkillGroupID": 901007
     },
     {
       "ID": 10007,
-      "ItemID": 10026,
-      "name": "五龙轮",
+      "ItemID": 10008,
+      "name": "玉莲守心灯",
       "Type": 1,
       "magicAttribute": 1,
       "model": "fb_wulonglun",
-      "cd": 7.0,
-      "fragmentID": 11007,
-      "Star": 5,
-      "ShuxingIDs": [
-        1
-      ],
-      "ShuxingPara": [
-        100
-      ],
-      "SkillGroupID": 901001,
-      "StarupItemCost": [
-        10,
-        20,
-        40,
-        60,
-        90,
-        120,
-        150
-      ],
-      "StarupShuxingIDs": [
-        107,
-        101,
-        107,
-        102,
-        107,
-        101,
-        107,
-        101
-      ],
-      "StarupShuxingValues": [
-        5,
-        5,
-        5,
-        5,
-        5,
-        5,
-        5,
-        5
-      ]
-    },
-    {
-      "ID": 10008,
-      "ItemID": 10027,
-      "name": "琉璃宝塔",
-      "Type": 1,
-      "magicAttribute": 1,
-      "model": "fb_linglongta",
-      "cd": 7.0,
+      "cd": 12.0,
       "fragmentID": 11008,
-      "Star": 5,
-      "ShuxingIDs": [
-        2
-      ],
-      "ShuxingPara": [
-        100
-      ],
-      "SkillGroupID": 901001,
-      "StarupItemCost": [
-        10,
-        20,
-        40,
-        60,
-        90,
-        120,
-        150
-      ],
-      "StarupShuxingIDs": [
-        108,
-        102,
-        108,
-        101,
-        108,
-        102,
-        108,
-        102
-      ],
-      "StarupShuxingValues": [
-        5,
-        5,
-        5,
-        5,
-        5,
-        5,
-        5,
-        5
-      ]
-    },
-    {
-      "ID": 10009,
-      "ItemID": 10023,
-      "name": "九幽镇魂瓶",
-      "Type": 1,
-      "magicAttribute": 1,
-      "model": "fb_BossPing",
-      "cd": 8.0,
-      "fragmentID": 11009,
-      "Star": 4,
       "ShuxingIDs": [
         1
       ],
       "ShuxingPara": [
         100
       ],
-      "SkillGroupID": 901004,
-      "StarupItemCost": [
-        10,
-        20,
-        40,
-        60,
-        90,
-        120,
-        150
-      ],
-      "StarupShuxingIDs": [
-        109,
-        101,
-        109,
-        102,
-        109,
-        103,
-        109,
-        101
-      ],
-      "StarupShuxingValues": [
-        4,
-        4,
-        4,
-        4,
-        4,
-        4,
-        4,
-        4
-      ]
-    },
-    {
-      "ID": 10010,
-      "ItemID": 10022,
-      "name": "玄龟盾",
-      "Type": 1,
-      "magicAttribute": 1,
-      "model": "fb_xuanguidun",
-      "cd": 3.0,
-      "fragmentID": 11003,
-      "Star": 3,
-      "ShuxingIDs": [
-        3
-      ],
-      "ShuxingPara": [
-        100
-      ],
-      "SkillGroupID": 901003,
-      "StarupItemCost": [
-        10,
-        20,
-        40,
-        60,
-        90,
-        120,
-        150
-      ],
-      "StarupShuxingIDs": [
-        108,
-        103,
-        108,
-        101,
-        108,
-        102,
-        108,
-        103
-      ],
-      "StarupShuxingValues": [
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3
-      ]
+      "SkillGroupID": 901008
     }
   ]
 }

Assets/Res/UI/MainHeroPanel/BtnFaBaoWidget.prefab

@@ -0,0 +1,315 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &21721280625406477
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4530474433833993076}
+  - component: {fileID: 1573209486526979868}
+  - component: {fileID: 6311924752779876632}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_OnClick
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4530474433833993076
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 21721280625406477}
+  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: 5438064346362230487}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 50, y: -50}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1573209486526979868
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 21721280625406477}
+  m_CullTransparentMesh: 1
+--- !u!114 &6311924752779876632
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 21721280625406477}
+  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: 0.003921569}
+  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 &3727712782042117659
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5438064346362230487}
+  - component: {fileID: 3423600382099007957}
+  - component: {fileID: 6807793869742803418}
+  - component: {fileID: 3581569104862614048}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: BtnFaBaoWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5438064346362230487
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3727712782042117659}
+  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: 8156380050520585067}
+  - {fileID: 1790657340758011659}
+  - {fileID: 4530474433833993076}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 121, y: -1340.7}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3423600382099007957
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3727712782042117659}
+  m_CullTransparentMesh: 1
+--- !u!114 &6807793869742803418
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3727712782042117659}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.8000001, g: 0.8000001, b: 0.8000001, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+--- !u!114 &3581569104862614048
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3727712782042117659}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: FaBaoRoot
+    gameObject: {fileID: 1790657340758011659}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Tips
+    gameObject: {fileID: 4528226286090984067}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &4528226286090984067
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8156380050520585067}
+  - component: {fileID: 3524983628540556875}
+  - component: {fileID: 6357025073236552224}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Tips
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8156380050520585067
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4528226286090984067}
+  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: 5438064346362230487}
+  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 &3524983628540556875
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4528226286090984067}
+  m_CullTransparentMesh: 1
+--- !u!114 &6357025073236552224
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4528226286090984067}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 35
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Null
+--- !u!1 &7055209374934089222
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1790657340758011659}
+  - component: {fileID: 2811671220144649283}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: FaBaoRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1790657340758011659
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7055209374934089222}
+  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: 5438064346362230487}
+  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: -9.2}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2811671220144649283
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7055209374934089222}
+  m_CullTransparentMesh: 1

Assets/Res/UI/MainHeroPanel/BtnFaBaoWidget.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: C3sXvS2lU3IVexsP8IWLSQOA74ppvFSn3TE+GXCPNrGEZaWo9itclZpxX2GJ
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/MainHeroPanel/FaBaoWidget.prefab

@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 3600548847287801475}
   - component: {fileID: 2176209277412620002}
   - component: {fileID: 2770940956415629337}
-  - component: {fileID: 1028235191169311421}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Icon_FaBaoIcon
@@ -85,50 +84,6 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
     packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
     lasetJsonGUID: 151dde130cdc5228de9614f608886409
---- !u!114 &1028235191169311421
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1305485169672742227}
-  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: 2770940956415629337}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &1870278890380576931
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -1,5 +1,85 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &15965205127464240
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5068679856164019425}
+  - component: {fileID: 2840349042557368767}
+  - component: {fileID: 4424263710677833150}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5068679856164019425
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 15965205127464240}
+  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: 1723988732018600186}
+  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 &2840349042557368767
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 15965205127464240}
+  m_CullTransparentMesh: 1
+--- !u!114 &4424263710677833150
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 15965205127464240}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 30
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5347\u7EA7"
 --- !u!1 &874494411597815018
 GameObject:
   m_ObjectHideFlags: 0
@@ -293,6 +373,95 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &1597840459203571142
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7973274776071248274}
+  - component: {fileID: 6326345466183093196}
+  - component: {fileID: 3325898222821596553}
+  - component: {fileID: 8607039444451436728}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: BtnChangeRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &7973274776071248274
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1597840459203571142}
+  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: 4734313281934727207}
+  - {fileID: 4451777815596004657}
+  m_Father: {fileID: 3478042439320372479}
+  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.0007019, y: -369.42}
+  m_SizeDelta: {x: 509.06323, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6326345466183093196
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1597840459203571142}
+  m_CullTransparentMesh: 1
+--- !u!114 &3325898222821596553
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1597840459203571142}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 72.49
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &8607039444451436728
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1597840459203571142}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &1615724450522545208
 GameObject:
   m_ObjectHideFlags: 0
@@ -326,7 +495,7 @@ RectTransform:
   m_Children:
   - {fileID: 941763478475368210}
   - {fileID: 2240684388682547072}
-  m_Father: {fileID: 3478042439320372479}
+  m_Father: {fileID: 6108060668469187376}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -730,12 +899,12 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2553166258935284350}
-  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: 3478042439320372479}
+  m_Father: {fileID: 6108060668469187376}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -784,6 +953,86 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6CD5\u5B9D\u540D\u79F0 Lv.1"
+--- !u!1 &2595298695553378453
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4516305854009966259}
+  - component: {fileID: 7716397206816543063}
+  - component: {fileID: 992624799067297683}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_NoFabaoTips
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &4516305854009966259
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2595298695553378453}
+  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: 3478042439320372479}
+  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: -2.6725006, y: 3.1658}
+  m_SizeDelta: {x: 744.65, y: 93.3149}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7716397206816543063
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2595298695553378453}
+  m_CullTransparentMesh: 1
+--- !u!114 &992624799067297683
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2595298695553378453}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 28
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5C1A\u672A\u9009\u4E2D\u4EFB\u4F55\u6CD5\u5B9D"
 --- !u!1 &2818405479463266363
 GameObject:
   m_ObjectHideFlags: 0
@@ -860,6 +1109,53 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2864272361358652452
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3878043637437832509}
+  - component: {fileID: 6922482407468544096}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: BtnUpGradeRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3878043637437832509
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2864272361358652452}
+  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: 2758136446838127516}
+  - {fileID: 1723988732018600186}
+  m_Father: {fileID: 3478042439320372479}
+  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: 27.5752, y: -353.77}
+  m_SizeDelta: {x: 543.1503, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6922482407468544096
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2864272361358652452}
+  m_CullTransparentMesh: 1
 --- !u!1 &3149521884711883608
 GameObject:
   m_ObjectHideFlags: 0
@@ -972,7 +1268,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3478042439320372479}
+  m_Father: {fileID: 6108060668469187376}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
@@ -1215,7 +1511,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u706B"
---- !u!1 &3931340268851502278
+--- !u!1 &3908091618312269019
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1223,33 +1519,163 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 4776823611480169892}
-  - component: {fileID: 6151773998871783578}
-  - component: {fileID: 5917461037037484268}
+  - component: {fileID: 1723988732018600186}
+  - component: {fileID: 8390928313110045558}
+  - component: {fileID: 1087691984517513849}
+  - component: {fileID: 4188353976954862433}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: FabaoBagRoot
+  m_Name: Btn_UpGrade
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &4776823611480169892
+--- !u!224 &1723988732018600186
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3931340268851502278}
+  m_GameObject: {fileID: 3908091618312269019}
   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: 7999646528679349448}
-  - {fileID: 2641489887301634299}
-  - {fileID: 4323141330538414364}
-  m_Father: {fileID: 9037135992368401232}
+  - {fileID: 5068679856164019425}
+  m_Father: {fileID: 3878043637437832509}
+  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: 119, y: -3.2299805}
+  m_SizeDelta: {x: 218.2866, y: 78.1464}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8390928313110045558
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3908091618312269019}
+  m_CullTransparentMesh: 1
+--- !u!114 &1087691984517513849
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3908091618312269019}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.25882354, g: 0.8117648, b: 0.48627454, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+--- !u!114 &4188353976954862433
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3908091618312269019}
+  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: 1087691984517513849}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &3931340268851502278
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4776823611480169892}
+  - component: {fileID: 6151773998871783578}
+  - component: {fileID: 5917461037037484268}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: FabaoBagRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4776823611480169892
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3931340268851502278}
+  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: 7999646528679349448}
+  - {fileID: 2641489887301634299}
+  - {fileID: 4323141330538414364}
+  m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1334,16 +1760,11 @@ RectTransform:
   m_Children:
   - {fileID: 6031040329968517707}
   - {fileID: 4961536466157608292}
-  - {fileID: 6411118506608553955}
-  - {fileID: 4599103558216846144}
-  - {fileID: 4656301576404878008}
-  - {fileID: 5788500819222458158}
-  - {fileID: 8695863786727674304}
-  - {fileID: 3562230635030506916}
+  - {fileID: 6108060668469187376}
   - {fileID: 7798673800670633331}
-  - {fileID: 7897417943919571100}
-  - {fileID: 4734313281934727207}
-  - {fileID: 4451777815596004657}
+  - {fileID: 4516305854009966259}
+  - {fileID: 3878043637437832509}
+  - {fileID: 7973274776071248274}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1738,6 +2159,58 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u7B49\u7EA740"
+--- !u!1 &5066664650193207248
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6108060668469187376}
+  - component: {fileID: 3419441115482588242}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: FaBaoInfoRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6108060668469187376
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5066664650193207248}
+  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: 6411118506608553955}
+  - {fileID: 4599103558216846144}
+  - {fileID: 4656301576404878008}
+  - {fileID: 5788500819222458158}
+  - {fileID: 8695863786727674304}
+  - {fileID: 3562230635030506916}
+  - {fileID: 7897417943919571100}
+  m_Father: {fileID: 3478042439320372479}
+  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: 750, y: 838.83}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3419441115482588242
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5066664650193207248}
+  m_CullTransparentMesh: 1
 --- !u!1 &5305674097407371432
 GameObject:
   m_ObjectHideFlags: 0
@@ -1771,7 +2244,7 @@ RectTransform:
   m_Children:
   - {fileID: 8809334176112050903}
   - {fileID: 1190734598949856288}
-  m_Father: {fileID: 3478042439320372479}
+  m_Father: {fileID: 6108060668469187376}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1855,7 +2328,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3478042439320372479}
+  m_Father: {fileID: 6108060668469187376}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2097,11 +2570,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6776340291218870123}
-  m_Father: {fileID: 3478042439320372479}
+  m_Father: {fileID: 7973274776071248274}
   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: 178, y: -357}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 399.91992, y: -39.0732}
   m_SizeDelta: {x: 218.2866, y: 78.1464}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &781565039073399761
@@ -2388,7 +2861,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3009156575819840620}
-  m_Father: {fileID: 3478042439320372479}
+  m_Father: {fileID: 6108060668469187376}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
@@ -2513,6 +2986,86 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
+--- !u!1 &6855930046191711767
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3771938791572529975}
+  - component: {fileID: 6674707642684229937}
+  - component: {fileID: 6169273498034197456}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3771938791572529975
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6855930046191711767}
+  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: 2758136446838127516}
+  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 &6674707642684229937
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6855930046191711767}
+  m_CullTransparentMesh: 1
+--- !u!114 &6169273498034197456
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6855930046191711767}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 30
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u53D6\u6D88"
 --- !u!1 &7007869723404515456
 GameObject:
   m_ObjectHideFlags: 0
@@ -2592,7 +3145,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u57F9\u517B"
+  m_Text: "\u66F4\u6362"
 --- !u!1 &7897947665373750767
 GameObject:
   m_ObjectHideFlags: 0
@@ -2626,11 +3179,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4856613907254511130}
-  m_Father: {fileID: 3478042439320372479}
+  m_Father: {fileID: 7973274776071248274}
   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: -116, y: -357}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 109.1433, y: -39.0732}
   m_SizeDelta: {x: 218.2866, y: 78.1464}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &405865854687704222
@@ -2925,7 +3478,177 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_UpGrade
+    gameObject: {fileID: 4188353976954862433}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_PeiYang
+    gameObject: {fileID: 284704070319449970}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Change
+    gameObject: {fileID: 2934430960029227933}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: FaBaoInfoRoot
+    gameObject: {fileID: 5066664650193207248}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_NoFabaoTips
+    gameObject: {fileID: 992624799067297683}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Cancel
+    gameObject: {fileID: 7159301952731043819}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: BtnUpGradeRoot
+    gameObject: {fileID: 2864272361358652452}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: BtnChangeRoot
+    gameObject: {fileID: 1597840459203571142}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
+--- !u!1 &9056821549282551153
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2758136446838127516}
+  - component: {fileID: 5534412852682778287}
+  - component: {fileID: 3217534402310447278}
+  - component: {fileID: 7159301952731043819}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Cancel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2758136446838127516
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9056821549282551153}
+  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: 3771938791572529975}
+  m_Father: {fileID: 3878043637437832509}
+  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: -173, y: -3.2299805}
+  m_SizeDelta: {x: 218.2866, y: 78.1464}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5534412852682778287
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9056821549282551153}
+  m_CullTransparentMesh: 1
+--- !u!114 &3217534402310447278
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9056821549282551153}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.7411765, g: 0.7411765, b: 0.7411765, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+--- !u!114 &7159301952731043819
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9056821549282551153}
+  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: 3217534402310447278}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &9111287373956877969
 GameObject:
   m_ObjectHideFlags: 0
@@ -2952,12 +3675,12 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9111287373956877969}
-  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: 3478042439320372479}
+  m_Father: {fileID: 6108060668469187376}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}

Assets/Scripts/GameLogic/Hero/FaBaoInfo.cs

@@ -21,13 +21,52 @@ namespace GameLogic.Hero
         public long qiangDu;
 
         public Dictionary<int, long> attriButedIC = new Dictionary<int, long>();
+        
+        public AccountFileInfo.FaBaoData FaBaoData; 
+
+        public FaBaoInfo(AccountFileInfo.FaBaoData faBaoData)
+        {
+            CustomInit(faBaoData);
+        }
+
+        public void UpGrade()
+        {
+            FaBaoData.level++;
+            CustomInit(FaBaoData);
+            AccountFileInfo.Instance.SavePlayerData();
+        }
 
         public FaBaoInfo(int id, int powerupId, int start = 1)
         {
-            star = 1;
+          
             FabaoConfig = ConfigComponent.Instance.Get<FabaoConfig>(id);
             FabaoPowerupConfig = ConfigComponent.Instance.Get<FabaoPowerupConfig>(powerupId);
-            SkillConfig = ConfigComponent.Instance.Get<SkillConfig>(FabaoConfig.SkillGroupID * 10 + start - 1);
+            SkillConfig = ConfigComponent.Instance.Get<SkillConfig>(FabaoConfig.SkillGroupID * 10 + FabaoPowerupConfig.SkillLevel - 1);
+
+            effectValue = new float[SkillConfig.effectValue.Length];
+            Array.Copy(SkillConfig.effectValue, effectValue, SkillConfig.effectValue.Length);
+
+            attriButedIC.Clear();
+
+            //计算加得属性
+            for (var i = 0; i < FabaoConfig.ShuxingIDs.Length; i++)
+            {
+                long attribute = GetAttriBute(FabaoConfig.ShuxingIDs[i]);
+                long value = (long)(attribute * FabaoConfig.ShuxingPara[0] * 0.01f);
+                attriButedIC.Add(FabaoConfig.ShuxingIDs[i], value);
+            }
+
+            qiangDu = (long)(FabaoPowerupConfig.Power * SkillConfig.power * 0.01f);
+        }
+
+        public void CustomInit(AccountFileInfo.FaBaoData faBaoData)
+        {
+            FaBaoData = faBaoData;
+            
+        
+            FabaoConfig = ConfigComponent.Instance.Get<FabaoConfig>(faBaoData.id);
+            FabaoPowerupConfig = ConfigComponent.Instance.Get<FabaoPowerupConfig>(faBaoData.level);
+            SkillConfig = ConfigComponent.Instance.Get<SkillConfig>(FabaoConfig.SkillGroupID * 10 + FabaoPowerupConfig.SkillLevel - 1);
 
             effectValue = new float[SkillConfig.effectValue.Length];
             Array.Copy(SkillConfig.effectValue, effectValue, SkillConfig.effectValue.Length);

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -28,9 +28,13 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
     [System.Serializable]
     public class PlayerData
     {
-        public SkillData[] usrSkill = new SkillData[10];
+        // public SkillData[] usrSkill = new SkillData[10];
+        //
+        // public FaBaoData[] UseFaBaoDatas = new FaBaoData[4];
 
         public List<SkillData> AllSkillDatas = new List<SkillData>();
+        
+        public List<FaBaoData> AllFaBaoDatas = new List<FaBaoData>();
 
         //每天刷新时间
         public long nextRefence;
@@ -81,6 +85,16 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         // public List<HeroData> HeroListInBackDatas = new List<HeroData>();
     }
 
+    [System.Serializable]
+    public class FaBaoData
+    {
+        public int id;
+
+        public int level;
+        
+
+        public int useIndex;
+    }
 
     [System.Serializable]
     public class SkillData
@@ -360,6 +374,17 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
             skillData.useIndex = -1;
             playerData.AllSkillDatas.Add(skillData);
         }
+        
+        var allFaBao = new[] { 10001, 10002, 10003, 10004, 10005, 10006, 10007 };
+        
+        foreach (var i in allFaBao)
+        {
+           FaBaoData faaData = new FaBaoData(); 
+           faaData.id = i;
+           faaData.level = 1;
+           faaData.useIndex = -1;
+           playerData.AllFaBaoDatas.Add(faaData);
+        }
 
 
         HeroData heroData = new HeroData();

Assets/Scripts/GameLogic/Player/FaBaoControl.cs

@@ -18,6 +18,28 @@ namespace GameLogic.Player
         public void AddFaBao(FaBaoInfo faBaoInfo)
         {
             myAllFaBao.Add(faBaoInfo);
+            if (faBaoInfo.FaBaoData.useIndex != -1)
+            {
+                ChangeUseFaBao(faBaoInfo.FaBaoData.useIndex, faBaoInfo);
+            }
+        }
+
+        public void ChangeUseFaBao(int index, FaBaoInfo faBaoInfo)
+        {
+            if (index >= 4)
+            {
+                return;
+            }
+
+            if (faBaoInfo.FaBaoData.useIndex != -1)
+            {
+                FightFaBao[faBaoInfo.FaBaoData.useIndex] = null;
+            }
+
+            FightFaBao[index] = faBaoInfo;
+            faBaoInfo.FaBaoData.useIndex = index;
+
+            AccountFileInfo.Instance.SavePlayerData();
         }
     }
 }

Assets/Scripts/GameUI/GameApplction.cs

@@ -132,6 +132,17 @@ public class GameApplction : IGameStart
             skillInfo.index = playerDataAllSkillData.useIndex;
             PlayerManager.Instance.GongFaControl.AddSkillInfo(skillInfo);
         }
+
+        foreach (var playerDataAllSkillData in AccountFileInfo.Instance.playerData.AllFaBaoDatas)
+        {
+            FaBaoInfo faBaoInfo = new FaBaoInfo(playerDataAllSkillData);
+            PlayerManager.Instance.FaBaoControl.AddFaBao(faBaoInfo);
+        }
+        
+        // for (int i = 1; i < 4; i++)
+        // {
+        //     PlayerManager.Instance.FaBaoControl.FightFaBao[i] = PlayerManager.Instance.FaBaoControl.myAllFaBao[i];
+        // }
         // PlayerManager.Instance.InitTestHero();
 
         await CombatDrive.Instance.Init();
@@ -141,7 +152,7 @@ public class GameApplction : IGameStart
         TestCombatHeroConfig testCombatHeroConfig = GameObject.FindObjectOfType<TestCombatHeroConfig>();
         if (testCombatHeroConfig != null)
         {
-            startCombatInfo.CombatType = CombatType.TestCombat;
+            startCombatInfo.CombatType = CombatType.LevelBattle;
             TestCombatHeroConfig.TestHeroInfoConfig testHeroInfoConfig = testCombatHeroConfig.myHeroInfo[0];
             PlayerManager.Instance.AddTestHeroInfo(testHeroInfoConfig.heroID, testHeroInfoConfig.level,
                 testHeroInfoConfig.skill, testHeroInfoConfig.magicWeaponId);
@@ -154,7 +165,8 @@ public class GameApplction : IGameStart
         gameStartUIPanel.SetSlider(0.95f);
         await CombatDrive.Instance.StartCombat(startCombatInfo);
         PlayerManager.Instance.GongFaControl.SaveUseSkill();
-        PlayerManager.Instance.GongFaControl.SetTaoismSkillIndex(AccountFileInfo.Instance.playerData.heroData.TaoismSkillId);
+        PlayerManager.Instance.GongFaControl.SetTaoismSkillIndex(AccountFileInfo.Instance.playerData.heroData
+            .TaoismSkillId);
         if (startCombatInfo.CombatType != CombatType.TestCombat)
         {
             await MainPanel.OpenPanel();

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

@@ -0,0 +1,49 @@
+using GameLogic.Hero;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "BtnFaBaoWidget")]
+    public partial class BtnFaBaoWidget : ItemWidgetBasic
+    {
+        public int index;
+        private FaBaoWidget faBaoWidget;
+        private void Init()
+        {
+        }
+
+        public override void AddEvent()
+        {
+        }
+
+        public override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+            base.AddButtonEvent();
+        }
+
+        public async void CustomInit(int index)
+        {
+            UIManager.Instance.DormancyGComponent(faBaoWidget);
+            this.index = index;
+            FaBaoInfo faBaoInfo = PlayerManager.Instance.FaBaoControl.FightFaBao[index];
+            if (faBaoInfo != null)
+            {
+                faBaoWidget = await UIManager.Instance.CreateGComponent<FaBaoWidget>(null, FaBaoRoot);
+                faBaoWidget.CustomInit(faBaoInfo);
+            }
+            else
+            {
+                UIManager.Instance.DormancyGComponent(faBaoWidget);
+            }
+        }
+
+        public override void DormancyObj()
+        {
+            UIManager.Instance.DormancyGComponent(faBaoWidget);
+            base.DormancyObj();
+        }
+    }
+}

Assets/Scripts/GameUI/UI/MainHeroPnael/BtnFaBaoWidget.cs.meta

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

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

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

Assets/Scripts/GameUI/UI/MainHeroPnael/BtnFaBaoWidgetData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: WXsWsi2lVig3/AV8a0nXfv8dZr+HSZAf7fpNnEh+DguRXxNW0r6he85/9jIV
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -5,9 +5,8 @@ namespace Fort23.Mono
     [UIBinding(prefab = "FaBaoWidget")]
     public partial class FaBaoWidget : ItemWidgetBasic
     {
-
         public FaBaoInfo faoInfo;
-        
+
         private void Init()
         {
         }
@@ -27,7 +26,9 @@ namespace Fort23.Mono
 
         public void CustomInit(FaBaoInfo faoInfo)
         {
-            
+            this.faoInfo = faoInfo;
+            Text_Level.text = faoInfo.FaBaoData.level.ToString() + "级";
+            Icon_FaBaoIcon.icon_name = faoInfo.SkillConfig.icon;
         }
     }
 }

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

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using Fort23.Core;
 
 namespace Fort23.Mono
@@ -5,6 +6,8 @@ namespace Fort23.Mono
     [UIBinding(prefab = "MainHeroPanel")]
     public partial class MainHeroPanel : UIPanel
     {
+        List<BtnFaBaoWidget> btnFaBaoWidgets = new List<BtnFaBaoWidget>();
+
         private void Init()
         {
         }
@@ -19,19 +22,32 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
-            Bnt_FaBao1.onClick.AddListener(() =>
-            {
-                SelectFaBaoPanel.OpenPanel(0);
-            });
-            
-            Btn_Close.onClick.AddListener(() =>
+           
+
+            Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+        }
+
+        public async void CustomInit()
+        {
+            for (int i = 0; i < 4; i++)
             {
-                UIManager.Instance.HideUIUIPanel(this);
-            });
+                BtnFaBaoWidget btnFaBaoWidget =
+                    await UIManager.Instance.CreateGComponent<BtnFaBaoWidget>(null, FaBaoRoot);
+                btnFaBaoWidget.CustomInit(i);
+                btnFaBaoWidget.onClick = OnClick;
+                btnFaBaoWidgets.Add(btnFaBaoWidget);
+            }
         }
 
-        public void CustomInit()
+        private async void OnClick(ItemWidgetBasic obj)
         {
+            BtnFaBaoWidget btnFaBaoWidget = obj as BtnFaBaoWidget;
+            SelectFaBaoPanel selectFaBaoPanel = await SelectFaBaoPanel.OpenPanel(btnFaBaoWidget.index);
+            await selectFaBaoPanel.UIClosed();
+            foreach (var b in btnFaBaoWidgets)
+            {
+                b.CustomInit(b.index);
+            }
         }
 
         public async static CTask<MainHeroPanel> OpenPanel()
@@ -40,5 +56,16 @@ namespace Fort23.Mono
             mainHeroPanel.CustomInit();
             return mainHeroPanel;
         }
+
+        public override void Close()
+        {
+            foreach (var btnFaBaoWidget in btnFaBaoWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(btnFaBaoWidget);
+            }
+
+            btnFaBaoWidgets.Clear();
+            base.Close();
+        }
     }
 }

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

@@ -30,59 +30,26 @@ namespace Fort23.Mono
 	      return _Text_JIngJieName;
 	     }
 	   }
-	  private Button _Bnt_FaBao1;
-	  public Button Bnt_FaBao1
-	   {
-	   get{
-	      if (_Bnt_FaBao1 == null)
-	       {
-	         _Bnt_FaBao1  = GetUIUnit<Button>("Bnt_FaBao1"); 
-	       }
-	      return _Bnt_FaBao1;
-	     }
-	   }
-	  private Button _Bnt_FaBao2;
-	  public Button Bnt_FaBao2
-	   {
-	   get{
-	      if (_Bnt_FaBao2 == null)
-	       {
-	         _Bnt_FaBao2  = GetUIUnit<Button>("Bnt_FaBao2"); 
-	       }
-	      return _Bnt_FaBao2;
-	     }
-	   }
-	  private GameObject _Bnt_FaBao3;
-	  public GameObject Bnt_FaBao3
-	   {
-	   get{
-	      if (_Bnt_FaBao3 == null)
-	       {
-	         _Bnt_FaBao3  = GetUIUnit<GameObject>("Bnt_FaBao3"); 
-	       }
-	      return _Bnt_FaBao3;
-	     }
-	   }
-	  private GameObject _Bnt_FaBao4;
-	  public GameObject Bnt_FaBao4
+	  private Button _Btn_Close;
+	  public Button Btn_Close
 	   {
 	   get{
-	      if (_Bnt_FaBao4 == null)
+	      if (_Btn_Close == null)
 	       {
-	         _Bnt_FaBao4  = GetUIUnit<GameObject>("Bnt_FaBao4"); 
+	         _Btn_Close  = GetUIUnit<Button>("Btn_Close"); 
 	       }
-	      return _Bnt_FaBao4;
+	      return _Btn_Close;
 	     }
 	   }
-	  private Button _Btn_Close;
-	  public Button Btn_Close
+	  private RectTransform _FaBaoRoot;
+	  public RectTransform FaBaoRoot
 	   {
 	   get{
-	      if (_Btn_Close == null)
+	      if (_FaBaoRoot == null)
 	       {
-	         _Btn_Close  = GetUIUnit<Button>("Btn_Close"); 
+	         _FaBaoRoot  = GetUIUnit<RectTransform>("FaBaoRoot"); 
 	       }
-	      return _Btn_Close;
+	      return _FaBaoRoot;
 	     }
 	   }
 	  #endregion 自定义数据结束 

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

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using Core.Language;
 using Fort23.Core;
 using GameLogic.Hero;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 using Utility;
 
 namespace Fort23.Mono
@@ -24,27 +25,72 @@ namespace Fort23.Mono
         public override void AddButtonEvent()
         {
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+
+            Btn_Change.onClick.AddListener(() =>
+            {
+                PlayerManager.Instance.FaBaoControl.ChangeUseFaBao(selectIndex, selectedFaBaoInfo);
+                currentFaBaoInfo = selectedFaBaoInfo;
+                selectedFaBaoInfo = null;
+                CustomInit(selectIndex);
+            });
+
+            Btn_UpGrade.onClick.AddListener(() =>
+            {
+                if (selectedFaBaoInfo != null)
+                {
+                    selectedFaBaoInfo.UpGrade();
+                    UpadaFabaoBag();
+                    UpdateUI(selectedFaBaoInfo);
+                }
+            });
+
+            Btn_PeiYang.onClick.AddListener(() =>
+            {
+                BtnUpGradeRoot.SetActive(true);
+                BtnChangeRoot.SetActive(false);
+            });
+            Btn_Cancel.onClick.AddListener(() =>
+            {
+                BtnUpGradeRoot.SetActive(false);
+                BtnChangeRoot.SetActive(true);
+            });
         }
 
         List<FaBaoAttributeWidget> faBaoAttributeWidgets = new List<FaBaoAttributeWidget>();
 
         List<FaBaoWidget> faBaoWidgets = new List<FaBaoWidget>();
 
+        FaBaoWidget currentFaBaoWidget = null;
         FaBaoInfo currentFaBaoInfo;
         FaBaoInfo selectedFaBaoInfo;
         int selectIndex;
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
+            // await UpadaFabaoBag();
+            return await base.AsyncInit(uiData);
+        }
+
+        private async CTask UpadaFabaoBag()
+        {
+            foreach (var faBaoAttributeWidget in faBaoWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(faBaoAttributeWidget);
+            }
+
+            faBaoWidgets.Clear();
             for (var i = 0; i < PlayerManager.Instance.FaBaoControl.myAllFaBao.Count; i++)
             {
+                if (PlayerManager.Instance.FaBaoControl.myAllFaBao[i] == currentFaBaoInfo)
+                {
+                    continue;
+                }
+
                 FaBaoWidget faBaoWidget = await UIManager.Instance.CreateGComponent<FaBaoWidget>(null, Content);
                 faBaoWidget.CustomInit(PlayerManager.Instance.FaBaoControl.myAllFaBao[i]);
                 faBaoWidget.onClick = OnClick;
                 faBaoWidgets.Add(faBaoWidget);
             }
-
-            return await base.AsyncInit(uiData);
         }
 
         private void OnClick(ItemWidgetBasic obj)
@@ -52,26 +98,59 @@ namespace Fort23.Mono
             FaBaoWidget faBao = obj as FaBaoWidget;
             selectedFaBaoInfo = faBao.faoInfo;
             UpdateFaBaoUI(selectedFaBaoInfo);
+            FaBaoInfoRoot.SetActive(true);
+            Text_NoFabaoTips.gameObject.gameObject.SetActive(false);
         }
 
         public async void CustomInit(int selectIndex)
         {
             this.selectIndex = selectIndex;
+
+            BtnUpGradeRoot.SetActive(false);
+            BtnChangeRoot.SetActive(true);
             currentFaBaoInfo = PlayerManager.Instance.FaBaoControl.FightFaBao[selectIndex];
-            if (currentFaBaoInfo != null)
+            selectedFaBaoInfo = currentFaBaoInfo;
+            UpdateUI(selectedFaBaoInfo);
+            UpadaFabaoBag();
+        }
+
+        private async void UpdateUI(FaBaoInfo faBaoInfo)
+        {
+            if (faBaoInfo != null)
             {
-                UpdateFaBaoUI(currentFaBaoInfo);
+                if (currentFaBaoWidget == null)
+                    currentFaBaoWidget = await UIManager.Instance.CreateGComponent<FaBaoWidget>(null, CurrentFaBaoRoot);
+                currentFaBaoWidget.CustomInit(faBaoInfo);
+                UpdateFaBaoUI(faBaoInfo);
+                FaBaoInfoRoot.SetActive(true);
+                Text_NoFabaoTips.gameObject.gameObject.SetActive(false);
+                Btn_PeiYang.gameObject.SetActive(true);
+                equipTipsRoot.gameObject.SetActive(true);
+            }
+            else
+            {
+                FaBaoInfoRoot.SetActive(false);
+                Text_NoFabaoTips.gameObject.gameObject.SetActive(true);
+                Btn_PeiYang.gameObject.SetActive(false);
+                equipTipsRoot.gameObject.SetActive(false);
             }
         }
 
         private async void UpdateFaBaoUI(FaBaoInfo faBaoInfo)
         {
-            FaBaoWidget faBaoWidget = await UIManager.Instance.CreateGComponent<FaBaoWidget>(null, CurrentFaBaoRoot);
-            faBaoWidget.CustomInit(faBaoInfo);
+            foreach (var faBaoAttributeWidget in faBaoAttributeWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(faBaoAttributeWidget);
+            }
+
+            faBaoAttributeWidgets.Clear();
 
-            Text_FaBaoName.text = LanguageManager.Instance.Text(faBaoInfo.FabaoConfig.name) + " Lv." + faBaoInfo.FabaoPowerupConfig.ID;
+
+            Text_FaBaoName.text = LanguageManager.Instance.Text(faBaoInfo.FabaoConfig.name) + " Lv." +
+                                  faBaoInfo.FabaoPowerupConfig.ID;
             Text_Power.text = $"强度：{faBaoInfo.qiangDu}";
-            Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(faBaoInfo.SkillConfig.dec), faBaoInfo.effectValue);
+            Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(faBaoInfo.SkillConfig.dec),
+                faBaoInfo.effectValue);
 
             switch (faBaoInfo.FabaoConfig.magicAttribute)
             {
@@ -99,16 +178,46 @@ namespace Fort23.Mono
 
             foreach (var keyValuePair in faBaoInfo.attriButedIC)
             {
-                FaBaoAttributeWidget faBaoAttributeWidget = await UIManager.Instance.CreateGComponent<FaBaoAttributeWidget>(null, FaBaoAttributeWidgetRoot);
+                FaBaoAttributeWidget faBaoAttributeWidget =
+                    await UIManager.Instance.CreateGComponent<FaBaoAttributeWidget>(null, FaBaoAttributeWidgetRoot);
                 faBaoAttributeWidget.CusomtInit(keyValuePair.Key, keyValuePair.Value);
                 faBaoAttributeWidgets.Add(faBaoAttributeWidget);
             }
         }
 
-        public async static void OpenPanel(int selectIndex)
+        public async static CTask<SelectFaBaoPanel> OpenPanel(int selectIndex)
         {
             SelectFaBaoPanel selectFaBaoPanel = await UIManager.Instance.LoadAndOpenPanel<SelectFaBaoPanel>(null);
             selectFaBaoPanel.CustomInit(selectIndex);
+            return selectFaBaoPanel;
+        }
+
+
+        public override void Close()
+        {
+            foreach (var faBaoAttributeWidget in faBaoAttributeWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(faBaoAttributeWidget);
+            }
+
+            faBaoAttributeWidgets.Clear();
+
+            foreach (var faBaoAttributeWidget in faBaoWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(faBaoAttributeWidget);
+            }
+
+            faBaoWidgets.Clear();
+
+            UIManager.Instance.DormancyGComponent(currentFaBaoWidget);
+            currentFaBaoWidget = null;
+
+            BtnUpGradeRoot.SetActive(false);
+            BtnChangeRoot.SetActive(true);
+            currentFaBaoInfo = null;
+            selectedFaBaoInfo = null;
+
+            base.Close();
         }
     }
 }

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

@@ -129,6 +129,94 @@ namespace Fort23.Mono
 	      return _FaBaoAttributeWidgetRoot;
 	     }
 	   }
+	  private Button _Btn_UpGrade;
+	  public Button Btn_UpGrade
+	   {
+	   get{
+	      if (_Btn_UpGrade == null)
+	       {
+	         _Btn_UpGrade  = GetUIUnit<Button>("Btn_UpGrade"); 
+	       }
+	      return _Btn_UpGrade;
+	     }
+	   }
+	  private Button _Btn_PeiYang;
+	  public Button Btn_PeiYang
+	   {
+	   get{
+	      if (_Btn_PeiYang == null)
+	       {
+	         _Btn_PeiYang  = GetUIUnit<Button>("Btn_PeiYang"); 
+	       }
+	      return _Btn_PeiYang;
+	     }
+	   }
+	  private Button _Btn_Change;
+	  public Button Btn_Change
+	   {
+	   get{
+	      if (_Btn_Change == null)
+	       {
+	         _Btn_Change  = GetUIUnit<Button>("Btn_Change"); 
+	       }
+	      return _Btn_Change;
+	     }
+	   }
+	  private GameObject _FaBaoInfoRoot;
+	  public GameObject FaBaoInfoRoot
+	   {
+	   get{
+	      if (_FaBaoInfoRoot == null)
+	       {
+	         _FaBaoInfoRoot  = GetUIUnit<GameObject>("FaBaoInfoRoot"); 
+	       }
+	      return _FaBaoInfoRoot;
+	     }
+	   }
+	  private Text _Text_NoFabaoTips;
+	  public Text Text_NoFabaoTips
+	   {
+	   get{
+	      if (_Text_NoFabaoTips == null)
+	       {
+	         _Text_NoFabaoTips  = GetUIUnit<Text>("Text_NoFabaoTips"); 
+	       }
+	      return _Text_NoFabaoTips;
+	     }
+	   }
+	  private Button _Btn_Cancel;
+	  public Button Btn_Cancel
+	   {
+	   get{
+	      if (_Btn_Cancel == null)
+	       {
+	         _Btn_Cancel  = GetUIUnit<Button>("Btn_Cancel"); 
+	       }
+	      return _Btn_Cancel;
+	     }
+	   }
+	  private GameObject _BtnUpGradeRoot;
+	  public GameObject BtnUpGradeRoot
+	   {
+	   get{
+	      if (_BtnUpGradeRoot == null)
+	       {
+	         _BtnUpGradeRoot  = GetUIUnit<GameObject>("BtnUpGradeRoot"); 
+	       }
+	      return _BtnUpGradeRoot;
+	     }
+	   }
+	  private GameObject _BtnChangeRoot;
+	  public GameObject BtnChangeRoot
+	   {
+	   get{
+	      if (_BtnChangeRoot == null)
+	       {
+	         _BtnChangeRoot  = GetUIUnit<GameObject>("BtnChangeRoot"); 
+	       }
+	      return _BtnChangeRoot;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{