diff --git a/assets/bundles/battleHero/prefab/weapon/武器.prefab b/assets/bundles/battleHero/prefab/weapon/武器.prefab
index 7aa14b7..173417b 100644
--- a/assets/bundles/battleHero/prefab/weapon/武器.prefab
+++ b/assets/bundles/battleHero/prefab/weapon/武器.prefab
@@ -25,20 +25,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 16
-      },
-      {
-        "__id__": 18
+        "__id__": 14
       },
       {
-        "__id__": 20
+        "__id__": 16
       },
       {
-        "__id__": 22
+        "__id__": 18
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 20
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -85,14 +82,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 11
+        "__id__": 9
       },
       {
-        "__id__": 13
+        "__id__": 11
       }
     ],
     "_prefab": {
-      "__id__": 15
+      "__id__": 13
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -109,8 +106,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
+      "x": 0.5,
+      "y": 0.5,
       "z": 1
     },
     "_mobility": 0,
@@ -139,18 +136,15 @@
       },
       {
         "__id__": 6
-      },
-      {
-        "__id__": 8
       }
     ],
     "_prefab": {
-      "__id__": 10
+      "__id__": 8
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 35.092,
-      "y": 14.945,
+      "x": 75.092,
+      "y": 76.945,
       "z": 0
     },
     "_lrot": {
@@ -249,42 +243,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "a1SideMarkSp01"
   },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 3
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 9
-    },
-    "_alignFlags": 33,
-    "_target": null,
-    "_left": 0,
-    "_right": -19.092,
-    "_top": -6.9449999999999985,
-    "_bottom": 0,
-    "_horizontalCenter": 0,
-    "_verticalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 0,
-    "_originalHeight": 0,
-    "_alignMode": 1,
-    "_lockFlags": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "13cuE53/9Oa7G3WvpiiwQJ"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -308,12 +266,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 12
+      "__id__": 10
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 68,
-      "height": 35
+      "width": 148,
+      "height": 159
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -336,7 +294,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 14
+      "__id__": 12
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -391,12 +349,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 17
+      "__id__": 15
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 88,
-      "height": 48
+      "width": 101,
+      "height": 101
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -419,7 +377,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 19
+      "__id__": 17
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -434,7 +392,7 @@
     "_spriteFrame": null,
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 1,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -461,7 +419,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 21
+      "__id__": 19
     },
     "bundleName": "icons",
     "SpriteNode": null,
@@ -472,44 +430,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "fdG72hvtxL5KIJS0cLCD+q"
   },
-  {
-    "__type__": "cc.Layout",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 23
-    },
-    "_resizeMode": 1,
-    "_layoutType": 1,
-    "_cellSize": {
-      "__type__": "cc.Size",
-      "width": 40,
-      "height": 40
-    },
-    "_startAxis": 0,
-    "_paddingLeft": 10,
-    "_paddingRight": 10,
-    "_paddingTop": 0,
-    "_paddingBottom": 0,
-    "_spacingX": 0,
-    "_spacingY": 0,
-    "_verticalDirection": 1,
-    "_horizontalDirection": 0,
-    "_constraint": 0,
-    "_constraintNum": 2,
-    "_affectedByScale": false,
-    "_isAlign": false,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "ddC68KlNdDXb6cUApjvONA"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
diff --git a/assets/bundles/first/config/Battlebuff.json b/assets/bundles/first/config/Battlebuff.json
index 9e2a09b..1391298 100644
--- a/assets/bundles/first/config/Battlebuff.json
+++ b/assets/bundles/first/config/Battlebuff.json
@@ -1,117 +1,117 @@
 [
     {
         "id": 1,
-        "name": "人参果",
-        "desc": "获得后体力+10",
-        "icon": "人参果",
-        "quality": 1,
-        "type": 3,
+        "name": "灾厄盒",
+        "desc": "对方Boss出现几率翻倍",
+        "icon": "灾厄盒",
+        "quality": 2,
+        "type": 2,
         "functiontype": 1,
-        "functionpar": 10,
+        "functionpar": 10000,
         "weight": 1,
-        "price": 40
+        "price": 90
     },
     {
         "id": 2,
-        "name": "封神榜",
-        "desc": "拖到我方单位后，升一级。",
-        "icon": "封神榜",
+        "name": "倍率卡",
+        "desc": "一定几率召唤出倍率卡，拖到数字上升1级或2级",
+        "icon": "倍率卡",
         "quality": 4,
         "type": 1,
         "functiontype": 2,
-        "functionpar": "65,1",
+        "functionpar": "1000,80,20",
         "weight": 1,
         "price": 150
     },
     {
         "id": 3,
-        "name": "蟠桃树",
-        "desc": "每20秒产生1个蟠桃，升级翻倍。",
-        "icon": "蟠桃树",
+        "name": "攻速符",
+        "desc": "我方所有数字攻速+40%",
+        "icon": "攻速符",
         "quality": 3,
         "type": 2,
         "functiontype": 3,
-        "functionpar": "30,102",
+        "functionpar": 4000,
         "weight": 1,
         "price": 120
     },
     {
         "id": 4,
-        "name": "缚仙网",
-        "desc": "拖到道路上，敌人接触后无法挣脱",
-        "icon": "缚仙网",
-        "quality": 1,
-        "type": 1,
+        "name": "赏金令",
+        "desc": "击杀怪物后，20%概率多获得一个金币",
+        "icon": "赏金令",
+        "quality": 2,
+        "type": 2,
         "functiontype": 4,
-        "functionpar": "60,5",
+        "functionpar": 2000,
         "weight": 1,
-        "price": 40
+        "price": 90
     },
     {
         "id": 5,
-        "name": "乾坤袋",
-        "desc": "拖到要回收的字上，回收换成蟠桃",
-        "icon": "乾坤袋",
-        "quality": 4,
-        "type": 1,
+        "name": "倍增卡",
+        "desc": "召唤出的数字，一定几率*2",
+        "icon": "倍增卡",
+        "quality": 2,
+        "type": 2,
         "functiontype": 5,
-        "functionpar": "0,1",
+        "functionpar": 1000,
         "weight": 1,
-        "price": 150
+        "price": 90
     },
     {
         "id": 6,
-        "name": "镇宅牌",
-        "desc": "我方出兵点血量+3",
-        "icon": "镇宅牌",
-        "quality": 1,
+        "name": "幸运石",
+        "desc": "宝石掉落几率+50%",
+        "icon": "幸运石",
+        "quality": 3,
         "type": 2,
         "functiontype": 6,
-        "functionpar": "3",
+        "functionpar": 5000,
         "weight": 1,
-        "price": 40
+        "price": 120
     },
     {
         "id": 7,
-        "name": "授仙箓",
-        "desc": "拖到我方单位后，有概率升1级或降1级",
-        "icon": "授仙箓",
+        "name": "鏖战册",
+        "desc": "我方攻速+50%，对方攻速+30%",
+        "icon": "鏖战册",
         "quality": 3,
-        "type": 1,
+        "type": 2,
         "functiontype": 7,
-        "functionpar": "60,10000,9000,7500,6500",
+        "functionpar": 50003000,
         "weight": 1,
         "price": 120
     },
     {
         "id": 8,
-        "name": "召神令",
-        "desc": "召唤出神将的概率提升2倍",
-        "icon": "召神令",
-        "quality": 3,
+        "name": "气血丸",
+        "desc": "我方π的血量+3",
+        "icon": "气血丸",
+        "quality": 2,
         "type": 2,
         "functiontype": 8,
-        "functionpar": "10",
+        "functionpar": 3,
         "weight": 1,
-        "price": 120
+        "price": 90
     },
     {
         "id": 9,
-        "name": "化龙铲",
-        "desc": "每60秒自动产生一把铲子",
-        "icon": "化龙铲",
-        "quality": 4,
+        "name": "双生盾",
+        "desc": "我方π血量+5，对方+3",
+        "icon": "双生盾",
+        "quality": 3,
         "type": 2,
         "functiontype": 9,
-        "functionpar": "60",
+        "functionpar": "5,3",
         "weight": 1,
-        "price": 150
+        "price": 120
     },
     {
         "id": 10,
-        "name": "掘宝仙铲",
-        "desc": "所有铲子变成掘宝铲，可以挖出蟠桃",
-        "icon": "掘宝仙铲",
+        "name": "寻金尺",
+        "desc": "解锁地块时额外产生金币",
+        "icon": "寻金尺",
         "quality": 4,
         "type": 2,
         "functiontype": 10,
@@ -121,206 +121,74 @@
     },
     {
         "id": 11,
-        "name": "文昌笔",
-        "desc": "指定改写我方一个字，随机变成别的字",
-        "icon": "文昌笔",
-        "quality": 3,
-        "type": 1,
+        "name": "御雷珠",
+        "desc": "怪物接近我方π时降下雷电消灭怪物",
+        "icon": "御雷珠",
+        "quality": 4,
+        "type": 2,
         "functiontype": 11,
-        "functionpar": "60",
+        "functionpar": "1,10000,10000,3,10",
         "weight": 1,
-        "price": 120
+        "price": 150
     },
     {
         "id": 12,
-        "name": "云麾号角",
-        "desc": "提振士气，行军速度+15%",
-        "icon": "云麾号角",
+        "name": "省金契",
+        "desc": "召唤数字消耗的金币-10%",
+        "icon": "省金契",
         "quality": 2,
         "type": 2,
         "functiontype": 12,
-        "functionpar": "1500",
+        "functionpar": 1000,
         "weight": 1,
         "price": 90
     },
     {
         "id": 13,
-        "name": "万神幡",
-        "desc": "拖到我方出兵点，额外征兆一名出兵将领",
-        "icon": "万神幡",
-        "quality": 3,
-        "type": 1,
+        "name": "滞行牌",
+        "desc": "我方怪物行进速度-10%",
+        "icon": "滞行牌",
+        "quality": 1,
+        "type": 2,
         "functiontype": 13,
-        "functionpar": "120",
+        "functionpar": 1000,
         "weight": 1,
-        "price": 120
+        "price": 40
     },
     {
         "id": 14,
-        "name": "还魂丹",
-        "desc": "我方出征兵将死亡后，20%概率原地复活",
-        "icon": "还魂丹",
-        "quality": 2,
+        "name": "金矿",
+        "desc": "每10S生产一枚金币",
+        "icon": "金矿",
+        "quality": 3,
         "type": 2,
         "functiontype": 14,
-        "functionpar": "2000",
+        "functionpar": 10,
         "weight": 1,
         "price": 90
     },
     {
         "id": 15,
-        "name": "补元丹",
-        "desc": "我方出征兵将血量提升10%",
-        "icon": "补元丹",
-        "quality": 2,
-        "type": 2,
+        "name": "能量石",
+        "desc": "体力+15",
+        "icon": "能量石",
+        "quality": 1,
+        "type": 3,
         "functiontype": 15,
-        "functionpar": "1000",
+        "functionpar": 15,
         "weight": 1,
-        "price": 90
+        "price": 40
     },
     {
         "id": 16,
-        "name": "妙手神偷",
-        "desc": "指定偷取敌方一个未合成的字",
-        "icon": "妙手神偷",
-        "quality": 4,
-        "type": 1,
-        "functiontype": 16,
-        "functionpar": "180",
-        "weight": 1,
-        "price": 150
-    },
-    {
-        "id": 17,
-        "name": "攻速符",
-        "desc": "指定我方单位攻速+40%",
-        "icon": "攻速符",
+        "name": "属性卡",
+        "desc": "一定几率召唤出属性卡，拖到数字上随机变换一个属性",
+        "icon": "属性卡",
         "quality": 3,
         "type": 1,
-        "functiontype": 17,
-        "functionpar": "60,4000",
-        "weight": 1,
-        "price": 120
-    },
-    {
-        "id": 18,
-        "name": "九天天鼓",
-        "desc": "我方所有单位攻速+10%",
-        "icon": "九天天鼓",
-        "quality": 2,
-        "type": 2,
-        "functiontype": 27,
-        "functionpar": "1000",
-        "weight": 1,
-        "price": 90
-    },
-    {
-        "id": 19,
-        "name": "千里眼",
-        "desc": "拖到我方远程单位使用，攻击距离翻倍",
-        "icon": "千里眼",
-        "quality": 1,
-        "type": 1,
-        "functiontype": 18,
-        "functionpar": "60",
-        "weight": 1,
-        "price": 40
-    },
-    {
-        "id": 20,
-        "name": "七十二变",
-        "desc": "每使用一次会随机变成任意一种主动道具",
-        "icon": "七十二变",
-        "quality": 4,
-        "type": 1,
-        "functiontype": 19,
-        "functionpar": "60",
-        "weight": 1,
-        "price": 150
-    },
-    {
-        "id": 21,
-        "name": "九霄神雷",
-        "desc": "敌人接近我方出兵点时降下雷电消灭敌人",
-        "icon": "九霄神雷",
-        "quality": 4,
-        "type": 2,
-        "functiontype": 20,
-        "functionpar": "1,10000,5000,3,10",
-        "weight": 1,
-        "price": 150
-    },
-    {
-        "id": 22,
-        "name": "碎法帝钟",
-        "desc": "50%概率打断boss施法，并反噬boss血量",
-        "icon": "碎法帝钟",
-        "quality": 3,
-        "type": 2,
-        "functiontype": 21,
-        "functionpar": "5000,3300",
+        "functiontype": 16,
+        "functionpar": 1000,
         "weight": 1,
         "price": 120
-    },
-    {
-        "id": 23,
-        "name": "幻魂镜",
-        "desc": "指定迷惑敌方1名神将，使其暂停攻击3秒",
-        "icon": "幻魂镜",
-        "quality": 2,
-        "type": 1,
-        "functiontype": 22,
-        "functionpar": "60,3",
-        "weight": 1,
-        "price": 90
-    },
-    {
-        "id": 24,
-        "name": "弱水",
-        "desc": "弱水沉重，敌方士兵移动速度-20%",
-        "icon": "弱水",
-        "quality": 1,
-        "type": 2,
-        "functiontype": 23,
-        "functionpar": "2000",
-        "weight": 1,
-        "price": 40
-    },
-    {
-        "id": 25,
-        "name": "三昧真火",
-        "desc": "拖到道路上，触碰敌人爆发伤害",
-        "icon": "三昧真火",
-        "quality": 1,
-        "type": 1,
-        "functiontype": 24,
-        "functionpar": "60,200000,300",
-        "weight": 1,
-        "price": 40
-    },
-    {
-        "id": 26,
-        "name": "武财神",
-        "desc": "杀敌后，20%概率多获得一个蟠桃",
-        "icon": "武财神",
-        "quality": 2,
-        "type": 2,
-        "functiontype": 25,
-        "functionpar": "2000,1",
-        "weight": 1,
-        "price": 90
-    },
-    {
-        "id": 27,
-        "name": "文财神",
-        "desc": "召唤消耗蟠桃数量-10%",
-        "icon": "文财神",
-        "quality": 2,
-        "type": 2,
-        "functiontype": 26,
-        "functionpar": "1000",
-        "weight": 1,
-        "price": 90
     }
 ]
\ No newline at end of file
diff --git a/assets/bundles/gemstone/prefab/PanelGemstone.prefab b/assets/bundles/gemstone/prefab/PanelGemstone.prefab
index 14daeaf..5c2b83d 100644
--- a/assets/bundles/gemstone/prefab/PanelGemstone.prefab
+++ b/assets/bundles/gemstone/prefab/PanelGemstone.prefab
@@ -28,17 +28,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 306
+        "__id__": 276
       },
       {
-        "__id__": 308
+        "__id__": 278
       },
       {
-        "__id__": 310
+        "__id__": 280
       }
     ],
     "_prefab": {
-      "__id__": 312
+      "__id__": 282
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -315,23 +315,23 @@
         "__id__": 145
       },
       {
-        "__id__": 175
+        "__id__": 159
       },
       {
-        "__id__": 291
+        "__id__": 261
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 301
+        "__id__": 271
       },
       {
-        "__id__": 303
+        "__id__": 273
       }
     ],
     "_prefab": {
-      "__id__": 305
+      "__id__": 275
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3311,7 +3311,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "ScrollView",
+    "_name": "ui_content",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -3325,19 +3325,19 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 170
+        "__id__": 154
       },
       {
-        "__id__": 172
+        "__id__": 156
       }
     ],
     "_prefab": {
-      "__id__": 174
+      "__id__": 158
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -22.638,
+      "y": -22.638000000000034,
       "z": 0
     },
     "_lrot": {
@@ -3365,133 +3365,19 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "view",
     "_objFlags": 0,
-    "__editorExtras__": {},
     "_parent": {
       "__id__": 145
     },
-    "_children": [
-      {
-        "__id__": 147
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 161
-      },
-      {
-        "__id__": 163
-      },
-      {
-        "__id__": 165
-      },
-      {
-        "__id__": 167
-      }
-    ],
-    "_prefab": {
-      "__id__": 169
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "ui_content",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 146
-    },
-    "_children": [
-      {
-        "__id__": 148
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 156
-      },
-      {
-        "__id__": 158
-      }
-    ],
     "_prefab": {
-      "__id__": 160
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_objFlags": 0,
-    "_parent": {
       "__id__": 147
     },
-    "_prefab": {
-      "__id__": 149
-    },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 148
+      "__id__": 146
     },
     "asset": {
       "__uuid__": "4fbd0ba7-162d-4cf5-aa2d-f70e894dc750",
@@ -3499,7 +3385,7 @@
     },
     "fileId": "4dFXetvaVEeIOJ7mZ9flfE",
     "instance": {
-      "__id__": 150
+      "__id__": 148
     },
     "targetOverrides": null
   },
@@ -3513,16 +3399,16 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 151
+        "__id__": 149
       },
       {
-        "__id__": 153
+        "__id__": 151
       },
       {
-        "__id__": 154
+        "__id__": 152
       },
       {
-        "__id__": 155
+        "__id__": 153
       }
     ],
     "removedComponents": []
@@ -3530,7 +3416,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 152
+      "__id__": 150
     },
     "propertyPath": [
       "_name"
@@ -3546,7 +3432,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 152
+      "__id__": 150
     },
     "propertyPath": [
       "_lpos"
@@ -3561,7 +3447,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 152
+      "__id__": 150
     },
     "propertyPath": [
       "_lrot"
@@ -3577,7 +3463,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 152
+      "__id__": 150
     },
     "propertyPath": [
       "_euler"
@@ -3595,11 +3481,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 147
+      "__id__": 145
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 157
+      "__id__": 155
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3623,11 +3509,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 147
+      "__id__": 145
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 159
+      "__id__": 157
     },
     "_resizeMode": 1,
     "_layoutType": 3,
@@ -3642,7 +3528,7 @@
     "_paddingTop": 0,
     "_paddingBottom": 30,
     "_spacingX": 20,
-    "_spacingY": 30,
+    "_spacingY": 20,
     "_verticalDirection": 1,
     "_horizontalDirection": 0,
     "_constraint": 0,
@@ -3668,13 +3554,120 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "tags",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 14
+    },
+    "_children": [
+      {
+        "__id__": 160
+      },
+      {
+        "__id__": 166
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 256
+      },
+      {
+        "__id__": 258
+      }
+    ],
+    "_prefab": {
+      "__id__": 260
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -549.89,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "ui_tagBtnBg",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 159
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 161
+      },
+      {
+        "__id__": 163
+      }
+    ],
+    "_prefab": {
+      "__id__": 165
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -250,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 146
+      "__id__": 160
     },
     "_enabled": true,
     "__prefab": {
@@ -3682,54 +3675,32 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 700,
-      "height": 460
+      "width": 113,
+      "height": 64
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 1
+      "y": 0.5
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "861OQMBNtPVaCqIgBdM3TZ"
+    "fileId": "33mdzJRQNEAq4qZfcnptRR"
   },
   {
-    "__type__": "cc.Mask",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 146
+      "__id__": 160
     },
     "_enabled": true,
     "__prefab": {
       "__id__": 164
     },
-    "_type": 0,
-    "_inverted": false,
-    "_segments": 64,
-    "_alphaThreshold": 0.1,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "68ti2RGPhGeYt6Ea1AfEYE"
-  },
-  {
-    "__type__": "cc.Graphics",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 146
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 166
-    },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
     "_dstBlendFactor": 4,
@@ -3740,733 +3711,28 @@
       "b": 255,
       "a": 255
     },
-    "_lineWidth": 1,
-    "_strokeColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_lineJoin": 2,
-    "_lineCap": 0,
-    "_fillColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 0
-    },
-    "_miterLimit": 10,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "e15j98G2FO3qxfzs38W1rk"
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 146
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 168
-    },
-    "_alignFlags": 45,
-    "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
-    "_horizontalCenter": 0,
-    "_verticalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 240,
-    "_originalHeight": 250,
-    "_alignMode": 2,
-    "_lockFlags": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "6adYxKnVhOPpIylERJxPMn"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "1dXWF39/NLOZ7W4UCIoG85",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 145
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 171
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 700,
-      "height": 460
+    "_spriteFrame": {
+      "__uuid__": "1d264c4d-4e20-4942-8557-eecfde1025cd@f9941",
+      "__expectedType__": "cc.SpriteFrame"
     },
-    "_anchorPoint": {
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
       "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 1
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "9eSnWAXSBGTK7s+MPPMmoQ"
-  },
-  {
-    "__type__": "cc.ScrollView",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 145
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 173
-    },
-    "bounceDuration": 0.23,
-    "brake": 0.75,
-    "elastic": true,
-    "inertia": true,
-    "horizontal": false,
-    "vertical": true,
-    "cancelInnerEvents": true,
-    "scrollEvents": [],
-    "_content": {
-      "__id__": 147
-    },
-    "_horizontalScrollBar": null,
-    "_verticalScrollBar": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "04X12DzodDdbBkWwDbJlfy"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "fcyRWsUN9CKo2p9D+/FnQJ",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "tags",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 14
-    },
-    "_children": [
-      {
-        "__id__": 176
-      },
-      {
-        "__id__": 182
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 286
-      },
-      {
-        "__id__": 288
-      }
-    ],
-    "_prefab": {
-      "__id__": 290
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": -520,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "ui_tagBtnBg",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 175
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 177
-      },
-      {
-        "__id__": 179
-      }
-    ],
-    "_prefab": {
-      "__id__": 181
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": -300,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
       "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 176
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 178
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 113,
-      "height": 64
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "33mdzJRQNEAq4qZfcnptRR"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 176
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 180
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "1d264c4d-4e20-4942-8557-eecfde1025cd@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 1,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
+      "y": 0
     },
     "_fillStart": 0,
     "_fillRange": 0,
     "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a8zBIZJuRGHIuy04CdOh5n"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "23DqK0T0ZED7fWxfkrBSop",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "ui_tagBtns",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 175
-    },
-    "_children": [
-      {
-        "__id__": 183
-      },
-      {
-        "__id__": 197
-      },
-      {
-        "__id__": 211
-      },
-      {
-        "__id__": 225
-      },
-      {
-        "__id__": 239
-      },
-      {
-        "__id__": 253
-      },
-      {
-        "__id__": 267
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 281
-      },
-      {
-        "__id__": 283
-      }
-    ],
-    "_prefab": {
-      "__id__": 285
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "btnAll",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 182
-    },
-    "_children": [
-      {
-        "__id__": 184
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 190
-      },
-      {
-        "__id__": 192
-      },
-      {
-        "__id__": 194
-      }
-    ],
-    "_prefab": {
-      "__id__": 196
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": -300,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "Label",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 183
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 185
-      },
-      {
-        "__id__": 187
-      }
-    ],
-    "_prefab": {
-      "__id__": 189
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 184
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 186
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 64,
-      "height": 54.4
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "57aL5WTA1Djp/xPGHqMA4a"
-  },
-  {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 184
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 188
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_string": "全部",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 30,
-    "_fontSize": 30,
-    "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": true,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": true,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_outlineWidth": 2,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_shadowOffset": {
-      "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
-    },
-    "_shadowBlur": 2,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "b6mNOEdfBOIrSGnRRzJZEE"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "f52ZT4j5NIMoqgjXit7GhA",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 183
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 191
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "depJgRRYFExqMObRz3Lj1d"
-  },
-  {
-    "__type__": "cc.Button",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 183
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 193
-    },
-    "clickEvents": [],
-    "_interactable": true,
-    "_transition": 0,
-    "_normalColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_hoverColor": {
-      "__type__": "cc.Color",
-      "r": 211,
-      "g": 211,
-      "b": 211,
-      "a": 255
-    },
-    "_pressedColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_disabledColor": {
-      "__type__": "cc.Color",
-      "r": 124,
-      "g": 124,
-      "b": 124,
-      "a": 255
-    },
-    "_normalSprite": null,
-    "_hoverSprite": null,
-    "_pressedSprite": null,
-    "_disabledSprite": null,
-    "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "d6khCJf8lAgYXh3mSxxGep"
-  },
-  {
-    "__type__": "01072pOfZNI5LNG77/ogzuD",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 183
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 195
-    },
+    "_useGrayscale": false,
+    "_atlas": null,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d4ZPN2/6tF7bt6A6/5BEeV"
+    "fileId": "a8zBIZJuRGHIuy04CdOh5n"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4476,42 +3742,111 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "d2NKz6/ClHNL0zceSzAC7Y",
+    "fileId": "23DqK0T0ZED7fWxfkrBSop",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "ui_tagBtns",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 159
+    },
+    "_children": [
+      {
+        "__id__": 167
+      },
+      {
+        "__id__": 181
+      },
+      {
+        "__id__": 195
+      },
+      {
+        "__id__": 209
+      },
+      {
+        "__id__": 223
+      },
+      {
+        "__id__": 237
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 251
+      },
+      {
+        "__id__": 253
+      }
+    ],
+    "_prefab": {
+      "__id__": 255
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
   {
     "__type__": "cc.Node",
     "_name": "btn0",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 182
+      "__id__": 166
     },
     "_children": [
       {
-        "__id__": 198
+        "__id__": 168
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 204
+        "__id__": 174
       },
       {
-        "__id__": 206
+        "__id__": 176
       },
       {
-        "__id__": 208
+        "__id__": 178
       }
     ],
     "_prefab": {
-      "__id__": 210
+      "__id__": 180
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -200,
+      "x": -250,
       "y": 0,
       "z": 0
     },
@@ -4544,20 +3879,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 197
+      "__id__": 167
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 199
+        "__id__": 169
       },
       {
-        "__id__": 201
+        "__id__": 171
       }
     ],
     "_prefab": {
-      "__id__": 203
+      "__id__": 173
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -4594,11 +3929,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 198
+      "__id__": 168
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 200
+      "__id__": 170
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4622,11 +3957,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 198
+      "__id__": 168
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 202
+      "__id__": 172
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -4703,11 +4038,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 197
+      "__id__": 167
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 205
+      "__id__": 175
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4731,11 +4066,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 197
+      "__id__": 167
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 207
+      "__id__": 177
     },
     "clickEvents": [],
     "_interactable": true,
@@ -4787,11 +4122,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 197
+      "__id__": 167
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 209
+      "__id__": 179
     },
     "_id": ""
   },
@@ -4818,31 +4153,31 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 182
+      "__id__": 166
     },
     "_children": [
       {
-        "__id__": 212
+        "__id__": 182
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 218
+        "__id__": 188
       },
       {
-        "__id__": 220
+        "__id__": 190
       },
       {
-        "__id__": 222
+        "__id__": 192
       }
     ],
     "_prefab": {
-      "__id__": 224
+      "__id__": 194
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -100,
+      "x": -150,
       "y": 0,
       "z": 0
     },
@@ -4875,20 +4210,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 211
+      "__id__": 181
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 213
+        "__id__": 183
       },
       {
-        "__id__": 215
+        "__id__": 185
       }
     ],
     "_prefab": {
-      "__id__": 217
+      "__id__": 187
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -4925,11 +4260,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 212
+      "__id__": 182
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 214
+      "__id__": 184
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4953,11 +4288,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 212
+      "__id__": 182
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 216
+      "__id__": 186
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -5034,11 +4369,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 211
+      "__id__": 181
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 219
+      "__id__": 189
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -5062,11 +4397,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 211
+      "__id__": 181
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 221
+      "__id__": 191
     },
     "clickEvents": [],
     "_interactable": true,
@@ -5118,11 +4453,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 211
+      "__id__": 181
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 223
+      "__id__": 193
     },
     "_id": ""
   },
@@ -5149,31 +4484,31 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 182
+      "__id__": 166
     },
     "_children": [
       {
-        "__id__": 226
+        "__id__": 196
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 232
+        "__id__": 202
       },
       {
-        "__id__": 234
+        "__id__": 204
       },
       {
-        "__id__": 236
+        "__id__": 206
       }
     ],
     "_prefab": {
-      "__id__": 238
+      "__id__": 208
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": -50,
       "y": 0,
       "z": 0
     },
@@ -5206,20 +4541,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 225
+      "__id__": 195
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 227
+        "__id__": 197
       },
       {
-        "__id__": 229
+        "__id__": 199
       }
     ],
     "_prefab": {
-      "__id__": 231
+      "__id__": 201
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -5256,11 +4591,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 226
+      "__id__": 196
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 228
+      "__id__": 198
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -5284,11 +4619,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 226
+      "__id__": 196
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 230
+      "__id__": 200
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -5365,11 +4700,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 225
+      "__id__": 195
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 233
+      "__id__": 203
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -5393,11 +4728,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 225
+      "__id__": 195
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 235
+      "__id__": 205
     },
     "clickEvents": [],
     "_interactable": true,
@@ -5449,11 +4784,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 225
+      "__id__": 195
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 237
+      "__id__": 207
     },
     "_id": ""
   },
@@ -5480,31 +4815,31 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 182
+      "__id__": 166
     },
     "_children": [
       {
-        "__id__": 240
+        "__id__": 210
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 246
+        "__id__": 216
       },
       {
-        "__id__": 248
+        "__id__": 218
       },
       {
-        "__id__": 250
+        "__id__": 220
       }
     ],
     "_prefab": {
-      "__id__": 252
+      "__id__": 222
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 100,
+      "x": 50,
       "y": 0,
       "z": 0
     },
@@ -5537,20 +4872,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 239
+      "__id__": 209
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 241
+        "__id__": 211
       },
       {
-        "__id__": 243
+        "__id__": 213
       }
     ],
     "_prefab": {
-      "__id__": 245
+      "__id__": 215
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -5587,11 +4922,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 240
+      "__id__": 210
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 242
+      "__id__": 212
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -5615,11 +4950,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 240
+      "__id__": 210
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 244
+      "__id__": 214
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -5696,11 +5031,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 239
+      "__id__": 209
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 247
+      "__id__": 217
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -5724,11 +5059,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 239
+      "__id__": 209
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 249
+      "__id__": 219
     },
     "clickEvents": [],
     "_interactable": true,
@@ -5780,11 +5115,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 239
+      "__id__": 209
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 251
+      "__id__": 221
     },
     "_id": ""
   },
@@ -5811,31 +5146,31 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 182
+      "__id__": 166
     },
     "_children": [
       {
-        "__id__": 254
+        "__id__": 224
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 260
+        "__id__": 230
       },
       {
-        "__id__": 262
+        "__id__": 232
       },
       {
-        "__id__": 264
+        "__id__": 234
       }
     ],
     "_prefab": {
-      "__id__": 266
+      "__id__": 236
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 200,
+      "x": 150,
       "y": 0,
       "z": 0
     },
@@ -5868,20 +5203,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 253
+      "__id__": 223
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 255
+        "__id__": 225
       },
       {
-        "__id__": 257
+        "__id__": 227
       }
     ],
     "_prefab": {
-      "__id__": 259
+      "__id__": 229
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -5918,11 +5253,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 254
+      "__id__": 224
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 256
+      "__id__": 226
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -5946,11 +5281,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 254
+      "__id__": 224
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 258
+      "__id__": 228
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -6027,11 +5362,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 253
+      "__id__": 223
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 261
+      "__id__": 231
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -6055,11 +5390,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 253
+      "__id__": 223
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 263
+      "__id__": 233
     },
     "clickEvents": [],
     "_interactable": true,
@@ -6111,11 +5446,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 253
+      "__id__": 223
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 265
+      "__id__": 235
     },
     "_id": ""
   },
@@ -6142,31 +5477,31 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 182
+      "__id__": 166
     },
     "_children": [
       {
-        "__id__": 268
+        "__id__": 238
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 274
+        "__id__": 244
       },
       {
-        "__id__": 276
+        "__id__": 246
       },
       {
-        "__id__": 278
+        "__id__": 248
       }
     ],
     "_prefab": {
-      "__id__": 280
+      "__id__": 250
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 300,
+      "x": 250,
       "y": 0,
       "z": 0
     },
@@ -6199,20 +5534,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 267
+      "__id__": 237
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 269
+        "__id__": 239
       },
       {
-        "__id__": 271
+        "__id__": 241
       }
     ],
     "_prefab": {
-      "__id__": 273
+      "__id__": 243
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -6249,11 +5584,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 268
+      "__id__": 238
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 270
+      "__id__": 240
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -6277,11 +5612,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 268
+      "__id__": 238
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 272
+      "__id__": 242
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -6358,11 +5693,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 267
+      "__id__": 237
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 275
+      "__id__": 245
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -6386,11 +5721,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 267
+      "__id__": 237
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 277
+      "__id__": 247
     },
     "clickEvents": [],
     "_interactable": true,
@@ -6442,11 +5777,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 267
+      "__id__": 237
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 279
+      "__id__": 249
     },
     "_id": ""
   },
@@ -6473,15 +5808,15 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 182
+      "__id__": 166
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 282
+      "__id__": 252
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 700,
+      "width": 600,
       "height": 100
     },
     "_anchorPoint": {
@@ -6501,11 +5836,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 182
+      "__id__": 166
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 284
+      "__id__": 254
     },
     "_resizeMode": 1,
     "_layoutType": 1,
@@ -6552,15 +5887,15 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 175
+      "__id__": 159
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 287
+      "__id__": 257
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 700,
+      "width": 600,
       "height": 54
     },
     "_anchorPoint": {
@@ -6580,11 +5915,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 175
+      "__id__": 159
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 289
+      "__id__": 259
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -6602,7 +5937,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -6644,25 +5979,25 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 292
+        "__id__": 262
       },
       {
-        "__id__": 294
+        "__id__": 264
       },
       {
-        "__id__": 296
+        "__id__": 266
       },
       {
-        "__id__": 298
+        "__id__": 268
       }
     ],
     "_prefab": {
-      "__id__": 300
+      "__id__": 270
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -628.463,
+      "y": -660.111,
       "z": 0
     },
     "_lrot": {
@@ -6694,11 +6029,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 291
+      "__id__": 261
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 293
+      "__id__": 263
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -6722,11 +6057,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 291
+      "__id__": 261
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 295
+      "__id__": 265
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -6767,11 +6102,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 291
+      "__id__": 261
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 297
+      "__id__": 267
     },
     "clickEvents": [],
     "_interactable": true,
@@ -6823,11 +6158,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 291
+      "__id__": 261
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 299
+      "__id__": 269
     },
     "_id": ""
   },
@@ -6858,7 +6193,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 302
+      "__id__": 272
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -6886,7 +6221,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 304
+      "__id__": 274
     },
     "_alignFlags": 45,
     "_target": null,
@@ -6935,7 +6270,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 307
+      "__id__": 277
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -6963,7 +6298,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 309
+      "__id__": 279
     },
     "_alignFlags": 45,
     "_target": null,
@@ -6999,7 +6334,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 311
+      "__id__": 281
     },
     "_id": ""
   },
@@ -7020,7 +6355,7 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 148
+        "__id__": 146
       }
     ]
   }
diff --git a/assets/bundles/popBattle/battleGameResult/prefab/BattleWeaponDescHero.prefab b/assets/bundles/popBattle/battleGameResult/prefab/BattleWeaponDescHero.prefab
index 550ff79..1f6fcd7 100644
--- a/assets/bundles/popBattle/battleGameResult/prefab/BattleWeaponDescHero.prefab
+++ b/assets/bundles/popBattle/battleGameResult/prefab/BattleWeaponDescHero.prefab
@@ -28,17 +28,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 160
+        "__id__": 132
       },
       {
-        "__id__": 162
+        "__id__": 134
       },
       {
-        "__id__": 164
+        "__id__": 136
       }
     ],
     "_prefab": {
-      "__id__": 166
+      "__id__": 138
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -278,10 +278,10 @@
         "__id__": 13
       },
       {
-        "__id__": 17
+        "__id__": 19
       },
       {
-        "__id__": 35
+        "__id__": 23
       },
       {
         "__id__": 41
@@ -309,49 +309,16 @@
       },
       {
         "__id__": 89
-      },
-      {
-        "__id__": 95
-      },
-      {
-        "__id__": 101
-      },
-      {
-        "__id__": 107
-      },
-      {
-        "__id__": 113
-      },
-      {
-        "__id__": 119
-      },
-      {
-        "__id__": 125
-      },
-      {
-        "__id__": 131
-      },
-      {
-        "__id__": 137
-      },
-      {
-        "__id__": 143
-      },
-      {
-        "__id__": 149
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 155
-      },
-      {
-        "__id__": 157
+        "__id__": 129
       }
     ],
     "_prefab": {
-      "__id__": 159
+      "__id__": 131
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -384,7 +351,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "ui_node",
+    "_name": "英雄信息框",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -395,15 +362,18 @@
     "_components": [
       {
         "__id__": 14
+      },
+      {
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 18
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -157,
-      "y": 126,
+      "x": 0,
+      "y": -164.642,
       "z": 0
     },
     "_lrot": {
@@ -441,6 +411,139 @@
     "__prefab": {
       "__id__": 15
     },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 517,
+      "height": 822
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "a9P0f6NNNGx7e2xuGJ1cTm"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 13
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 17
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "b9319e63-3d94-4217-86cf-e3716fab5f2e@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "d3KffiPjdMZ46jUf9fZb7+"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "d3oZ4qZ+9PaY9XYaJRcDkk",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "ui_node",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 12
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 20
+      }
+    ],
+    "_prefab": {
+      "__id__": 22
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -179.955,
+      "y": 170.762,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1.2,
+      "y": 1.2,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 19
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 21
+    },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 80,
@@ -480,23 +583,23 @@
     },
     "_children": [
       {
-        "__id__": 18
+        "__id__": 24
       },
       {
-        "__id__": 24
+        "__id__": 30
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 30
+        "__id__": 36
       },
       {
-        "__id__": 32
+        "__id__": 38
       }
     ],
     "_prefab": {
-      "__id__": 34
+      "__id__": 40
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -533,20 +636,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 17
+      "__id__": 23
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 19
+        "__id__": 25
       },
       {
-        "__id__": 21
+        "__id__": 27
       }
     ],
     "_prefab": {
-      "__id__": 23
+      "__id__": 29
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -583,11 +686,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 18
+      "__id__": 24
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 20
+      "__id__": 26
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -611,11 +714,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 18
+      "__id__": 24
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 22
+      "__id__": 28
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -692,20 +795,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 17
+      "__id__": 23
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 25
+        "__id__": 31
       },
       {
-        "__id__": 27
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 29
+      "__id__": 35
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -742,11 +845,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 24
+      "__id__": 30
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 26
+      "__id__": 32
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -770,11 +873,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 24
+      "__id__": 30
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 28
+      "__id__": 34
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -851,11 +954,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 23
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 31
+      "__id__": 37
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -879,11 +982,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 23
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 33
+      "__id__": 39
     },
     "_resizeMode": 1,
     "_layoutType": 1,
@@ -936,14 +1039,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 36
+        "__id__": 42
       },
       {
-        "__id__": 38
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 46
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -980,11 +1083,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 35
+      "__id__": 41
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 37
+      "__id__": 43
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1008,11 +1111,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 35
+      "__id__": 41
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 39
+      "__id__": 45
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1095,14 +1198,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 42
+        "__id__": 48
       },
       {
-        "__id__": 44
+        "__id__": 50
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 52
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1139,11 +1242,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 41
+      "__id__": 47
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 43
+      "__id__": 49
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1167,11 +1270,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 41
+      "__id__": 47
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 45
+      "__id__": 51
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1254,14 +1357,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 54
       },
       {
-        "__id__": 50
+        "__id__": 56
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 58
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1298,11 +1401,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 47
+      "__id__": 53
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 49
+      "__id__": 55
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1326,11 +1429,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 47
+      "__id__": 53
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 51
+      "__id__": 57
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1413,14 +1516,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 54
+        "__id__": 60
       },
       {
-        "__id__": 56
+        "__id__": 62
       }
     ],
     "_prefab": {
-      "__id__": 58
+      "__id__": 64
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1457,11 +1560,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 53
+      "__id__": 59
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 61
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1485,11 +1588,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 53
+      "__id__": 59
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 57
+      "__id__": 63
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1572,14 +1675,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 60
+        "__id__": 66
       },
       {
-        "__id__": 62
+        "__id__": 68
       }
     ],
     "_prefab": {
-      "__id__": 64
+      "__id__": 70
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1616,11 +1719,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 65
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 61
+      "__id__": 67
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1644,11 +1747,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 65
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 63
+      "__id__": 69
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1721,7 +1824,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "label-002",
+    "_name": "label",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -1731,19 +1834,19 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 66
+        "__id__": 72
       },
       {
-        "__id__": 68
+        "__id__": 74
       }
     ],
     "_prefab": {
-      "__id__": 70
+      "__id__": 76
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 168.715,
-      "y": -128.715,
+      "x": -199,
+      "y": 90.343,
       "z": 0
     },
     "_lrot": {
@@ -1775,15 +1878,15 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 65
+      "__id__": 71
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 67
+      "__id__": 73
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 80,
+      "width": 72,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -1795,7 +1898,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d6mZvol7lHxphhPUaHNOTO"
+    "fileId": "f2XgSIo8RH+rBQuf1B/AhL"
   },
   {
     "__type__": "cc.Label",
@@ -1803,11 +1906,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 65
+      "__id__": 71
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 69
+      "__id__": 75
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1819,11 +1922,11 @@
       "b": 207,
       "a": 255
     },
-    "_string": "攻击力：",
+    "_string": "技能：",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
+    "_actualFontSize": 24,
+    "_fontSize": 24,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
     "_overflow": 0,
@@ -1832,7 +1935,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_isItalic": false,
-    "_isBold": false,
+    "_isBold": true,
     "_isUnderline": false,
     "_underlineHeight": 2,
     "_cacheMode": 0,
@@ -1863,7 +1966,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "92sEZoikRKoJAY7bEWOiFj"
+    "fileId": "32jUIUUF9IIqxEX3557sqs"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1873,14 +1976,14 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "c2r7aHNYxAXI2tCnAyfHsK",
+    "fileId": "90muH7fTBDwK9o0o2VHeNS",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.Node",
-    "_name": "label-003",
+    "_name": "lb_skillName",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -1890,19 +1993,19 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 72
+        "__id__": 78
       },
       {
-        "__id__": 74
+        "__id__": 80
       }
     ],
     "_prefab": {
-      "__id__": 76
+      "__id__": 82
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -27,
-      "y": 72,
+      "x": -169,
+      "y": 90.343,
       "z": 0
     },
     "_lrot": {
@@ -1934,27 +2037,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 71
+      "__id__": 77
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 79
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 72,
+      "width": 0,
       "height": 50.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.5,
+      "x": 0,
       "y": 0.5
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "65PrIqdxpI0J3XzuN4J17w"
+    "fileId": "8dg5JlQdNGe6x+DCUsPkix"
   },
   {
     "__type__": "cc.Label",
@@ -1962,11 +2065,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 71
+      "__id__": 77
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 75
+      "__id__": 81
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1978,7 +2081,7 @@
       "b": 207,
       "a": 255
     },
-    "_string": "经验：",
+    "_string": "",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 24,
@@ -2022,7 +2125,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "01GnwXheNMCavUL/HodivZ"
+    "fileId": "0a12xFUOJNErE6Kwv8lVNj"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2032,14 +2135,14 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "f3T3lUjhBFFJKZtSbtdeDY",
+    "fileId": "07x1QeV6tI/Ii5x9T2lee4",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.Node",
-    "_name": "label",
+    "_name": "lb_skillDesc",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -2049,19 +2152,19 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 78
+        "__id__": 84
       },
       {
-        "__id__": 80
+        "__id__": 86
       }
     ],
     "_prefab": {
-      "__id__": 82
+      "__id__": 88
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -199,
-      "y": 18,
+      "x": 0,
+      "y": 69.628,
       "z": 0
     },
     "_lrot": {
@@ -2093,27 +2196,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 77
+      "__id__": 83
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 79
+      "__id__": 85
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 72,
-      "height": 50.4
+      "width": 470,
+      "height": 50
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0.5
+      "y": 1
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "f2XgSIo8RH+rBQuf1B/AhL"
+    "fileId": "72YkprvdtNqrBl9jZZDnHm"
   },
   {
     "__type__": "cc.Label",
@@ -2121,30 +2224,30 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 77
+      "__id__": 83
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 81
+      "__id__": 87
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 234,
-      "g": 223,
-      "b": 207,
+      "r": 124,
+      "g": 120,
+      "b": 113,
       "a": 255
     },
-    "_string": "技能：",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 24,
-    "_fontSize": 24,
+    "_string": "",
+    "_horizontalAlign": 0,
+    "_verticalAlign": 0,
+    "_actualFontSize": 22,
+    "_fontSize": 22,
     "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 0,
+    "_lineHeight": 24,
+    "_overflow": 1,
     "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,
@@ -2157,9 +2260,9 @@
     "_enableOutline": false,
     "_outlineColor": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 133,
+      "g": 99,
+      "b": 5,
       "a": 255
     },
     "_outlineWidth": 2,
@@ -2181,7 +2284,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "32jUIUUF9IIqxEX3557sqs"
+    "fileId": "0e5YyGpZlL/ZB2EKIndWw0"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2191,36 +2294,153 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "90muH7fTBDwK9o0o2VHeNS",
+    "fileId": "1eAQ43HbJBRJhdUCwAA2YE",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.Node",
-    "_name": "lb_skillName",
+    "_name": "ui_gemList",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 12
     },
+    "_children": [
+      {
+        "__id__": 90
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 124
+      },
+      {
+        "__id__": 126
+      }
+    ],
+    "_prefab": {
+      "__id__": 128
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -38.71,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "gtemplate",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 89
+    },
+    "_children": [
+      {
+        "__id__": 91
+      },
+      {
+        "__id__": 97
+      },
+      {
+        "__id__": 103
+      },
+      {
+        "__id__": 109
+      },
+      {
+        "__id__": 115
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 121
+      }
+    ],
+    "_prefab": {
+      "__id__": 123
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -54.5,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "lb",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 90
+    },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 84
+        "__id__": 92
       },
       {
-        "__id__": 86
+        "__id__": 94
       }
     ],
     "_prefab": {
-      "__id__": 88
+      "__id__": 96
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -169,
-      "y": 18,
+      "x": -90.486,
+      "y": 4.111,
       "z": 0
     },
     "_lrot": {
@@ -2252,16 +2472,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 83
+      "__id__": 91
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 85
+      "__id__": 93
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 0,
-      "height": 50.4
+      "width": 333.464,
+      "height": 66.163
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2272,7 +2492,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "8dg5JlQdNGe6x+DCUsPkix"
+    "fileId": "b78lpsndRAW5IgeWyDjlI0"
   },
   {
     "__type__": "cc.Label",
@@ -2280,30 +2500,30 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 83
+      "__id__": 91
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 87
+      "__id__": 95
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 234,
-      "g": 223,
-      "b": 207,
-      "a": 255
+      "r": 168,
+      "g": 183,
+      "b": 191,
+      "a": 168
     },
-    "_string": "",
+    "_string": "尚未镶嵌宝石",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 24,
-    "_fontSize": 24,
+    "_actualFontSize": 21,
+    "_fontSize": 20,
     "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 0,
+    "_lineHeight": 24,
+    "_overflow": 2,
     "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,
@@ -2340,7 +2560,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "0a12xFUOJNErE6Kwv8lVNj"
+    "fileId": "7acnVgFbBJgaZXe8bK3Tnn"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2350,36 +2570,36 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "07x1QeV6tI/Ii5x9T2lee4",
+    "fileId": "d5TVHARKRI94L6pTzLN+d1",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.Node",
-    "_name": "lb_skillDesc",
+    "_name": "lblv",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 90
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 90
+        "__id__": 98
       },
       {
-        "__id__": 92
+        "__id__": 100
       }
     ],
     "_prefab": {
-      "__id__": 94
+      "__id__": 102
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
-      "y": -2.7150000000000034,
+      "x": -231.202,
+      "y": 52.365,
       "z": 0
     },
     "_lrot": {
@@ -2411,27 +2631,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 89
+      "__id__": 97
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 91
+      "__id__": 99
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 470,
-      "height": 50
+      "width": 0,
+      "height": 40.32
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 1
+      "x": 0,
+      "y": 0.5
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "72YkprvdtNqrBl9jZZDnHm"
+    "fileId": "8dW+5eIzVBKLhNPGtdUhbG"
   },
   {
     "__type__": "cc.Label",
@@ -2439,30 +2659,30 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 89
+      "__id__": 97
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 93
+      "__id__": 101
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 124,
-      "g": 120,
-      "b": 113,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_string": "",
     "_horizontalAlign": 0,
-    "_verticalAlign": 0,
-    "_actualFontSize": 22,
-    "_fontSize": 22,
+    "_verticalAlign": 1,
+    "_actualFontSize": 24,
+    "_fontSize": 24,
     "_fontFamily": "Arial",
-    "_lineHeight": 24,
-    "_overflow": 1,
+    "_lineHeight": 32,
+    "_overflow": 0,
     "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,
@@ -2475,9 +2695,9 @@
     "_enableOutline": false,
     "_outlineColor": {
       "__type__": "cc.Color",
-      "r": 133,
-      "g": 99,
-      "b": 5,
+      "r": 0,
+      "g": 0,
+      "b": 0,
       "a": 255
     },
     "_outlineWidth": 2,
@@ -2499,7 +2719,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "0e5YyGpZlL/ZB2EKIndWw0"
+    "fileId": "67egLyiexOXrJE4ekJ5DJU"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2509,36 +2729,36 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "1eAQ43HbJBRJhdUCwAA2YE",
+    "fileId": "c8/uAOCEJKFLXDhqZBvIwj",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.Node",
-    "_name": "lb_weaponAtk",
+    "_name": "icon",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 90
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 96
+        "__id__": 104
       },
       {
-        "__id__": 98
+        "__id__": 106
       }
     ],
     "_prefab": {
-      "__id__": 100
+      "__id__": 108
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 202.715,
-      "y": -128.715,
+      "x": -165,
+      "y": 0,
       "z": 0
     },
     "_lrot": {
@@ -2550,8 +2770,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
+      "x": 0.5,
+      "y": 0.5,
       "z": 1
     },
     "_mobility": 0,
@@ -2570,95 +2790,69 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 95
+      "__id__": 103
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 97
+      "__id__": 105
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 11.123046875,
-      "height": 50.4
+      "width": 159,
+      "height": 156
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0,
+      "x": 0.5,
       "y": 0.5
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "3cUvIQEE5L4YsaZ/o5gZIJ"
+    "fileId": "ad85SRKGZDu4DwtE5ctub2"
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 95
+      "__id__": 103
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 99
+      "__id__": 107
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 234,
-      "g": 223,
-      "b": 207,
-      "a": 255
-    },
-    "_string": "0",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
-    "_fontFamily": "Arial",
-    "_lineHeight": 40,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": true,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": false,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_outlineWidth": 2,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
-    "_shadowOffset": {
+    "_spriteFrame": null,
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
       "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
+      "x": 0,
+      "y": 0
     },
-    "_shadowBlur": 2,
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "b5qI6UyU5Gj6dB5AbzRIUW"
+    "fileId": "e2V0i7BWhAk6MnUq3tgiXU"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2668,36 +2862,36 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "4d71wciv1GMLdhsIBOdhc/",
+    "fileId": "8aGl84YzpE24mcgRyZF4gc",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.Node",
-    "_name": "lb_weaponName",
+    "_name": "lbName",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 90
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 102
+        "__id__": 110
       },
       {
-        "__id__": 104
+        "__id__": 112
       }
     ],
     "_prefab": {
-      "__id__": 106
+      "__id__": 114
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -63.285,
-      "y": -128.715,
+      "x": -90.486,
+      "y": 36.73,
       "z": 0
     },
     "_lrot": {
@@ -2729,16 +2923,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 101
+      "__id__": 109
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 103
+      "__id__": 111
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 4,
-      "height": 54.4
+      "width": 0,
+      "height": 40.32
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2749,7 +2943,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "a3SX6p5wxH/aErcty+VO2G"
+    "fileId": "0aaiSVfbBEXqJgP8ZcgSK5"
   },
   {
     "__type__": "cc.Label",
@@ -2757,29 +2951,29 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 101
+      "__id__": 109
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 105
+      "__id__": 113
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 168,
+      "g": 183,
+      "b": 191,
       "a": 255
     },
     "_string": "",
-    "_horizontalAlign": 1,
+    "_horizontalAlign": 0,
     "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
+    "_actualFontSize": 24,
+    "_fontSize": 24,
     "_fontFamily": "Arial",
-    "_lineHeight": 40,
+    "_lineHeight": 32,
     "_overflow": 0,
     "_enableWrapText": true,
     "_font": null,
@@ -2790,12 +2984,12 @@
     "_isUnderline": false,
     "_underlineHeight": 2,
     "_cacheMode": 0,
-    "_enableOutline": true,
+    "_enableOutline": false,
     "_outlineColor": {
       "__type__": "cc.Color",
-      "r": 133,
-      "g": 99,
-      "b": 5,
+      "r": 0,
+      "g": 0,
+      "b": 0,
       "a": 255
     },
     "_outlineWidth": 2,
@@ -2817,7 +3011,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "43JKh++2VFkb8FWQoYWZwV"
+    "fileId": "b8l9C3h9VGOaTc3Q5I1zWb"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2827,36 +3021,36 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "5b+ZNhjkpCyKVWQP/0wypj",
+    "fileId": "a1z4lQbWlJubm3DhVc/vao",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.Node",
-    "_name": "lb_weaponDesc",
+    "_name": "lbDesc",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 90
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 108
+        "__id__": 116
       },
       {
-        "__id__": 110
+        "__id__": 118
       }
     ],
     "_prefab": {
-      "__id__": 112
+      "__id__": 120
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 77.715,
-      "y": -152.715,
+      "x": -90.486,
+      "y": -16.511499999999998,
       "z": 0
     },
     "_lrot": {
@@ -2888,27 +3082,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 107
+      "__id__": 115
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 109
+      "__id__": 117
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 280,
-      "height": 80
+      "width": 333.464,
+      "height": 66.163
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 1
+      "x": 0,
+      "y": 0.5
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "605/qMQBRNCIpcL5Xm+FJ5"
+    "fileId": "5fSise6mtJ3K0d2tbjSqJ5"
   },
   {
     "__type__": "cc.Label",
@@ -2916,30 +3110,30 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 107
+      "__id__": 115
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 111
+      "__id__": 119
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 124,
-      "g": 120,
-      "b": 113,
+      "r": 168,
+      "g": 183,
+      "b": 191,
       "a": 255
     },
     "_string": "",
     "_horizontalAlign": 0,
-    "_verticalAlign": 0,
-    "_actualFontSize": 20,
+    "_verticalAlign": 1,
+    "_actualFontSize": 21,
     "_fontSize": 20,
     "_fontFamily": "Arial",
     "_lineHeight": 24,
-    "_overflow": 1,
+    "_overflow": 2,
     "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,
@@ -2952,9 +3146,9 @@
     "_enableOutline": false,
     "_outlineColor": {
       "__type__": "cc.Color",
-      "r": 133,
-      "g": 99,
-      "b": 5,
+      "r": 0,
+      "g": 0,
+      "b": 0,
       "a": 255
     },
     "_outlineWidth": 2,
@@ -2976,7 +3170,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d9XKfdYdRAdac4Z3v9mcuF"
+    "fileId": "621JmP6SJLHJVR75LKOpnJ"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2986,60 +3180,51 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "95qBq29plBbqAzXel2yQG2",
+    "fileId": "cfEGXq7fRCcaHknw5y/eo7",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
-    "__type__": "cc.Node",
-    "_name": "经验底",
+    "__type__": "cc.UITransform",
+    "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
-    "_parent": {
-      "__id__": 12
+    "node": {
+      "__id__": 90
     },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 114
-      },
-      {
-        "__id__": 116
-      }
-    ],
-    "_prefab": {
-      "__id__": 118
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 122
     },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 124.621,
-      "y": 68.619,
-      "z": 0
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 500,
+      "height": 109
     },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
     },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "02mvi4f5FONakQDh1i67W/"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
     },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
+    "asset": {
+      "__id__": 0
     },
-    "_id": ""
+    "fileId": "817U1MsQFJMKimufNGDcBr",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.UITransform",
@@ -3047,911 +3232,65 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 113
+      "__id__": 89
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 115
+      "__id__": 125
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 229,
-      "height": 15
+      "width": 500,
+      "height": 109
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0.5
+      "y": 1
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "64sZjrjiVHq7zD8Bwgo85t"
+    "fileId": "50GKhkR3hM7L4WKW+rmrAq"
   },
   {
-    "__type__": "cc.Sprite",
+    "__type__": "cc.Layout",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 113
+      "__id__": 89
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 117
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "1c2d9beb-1f68-44f4-a4ba-f5aeab5c447e@f9941",
-      "__expectedType__": "cc.SpriteFrame"
+      "__id__": 127
     },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 1,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "8e6IXBVQNMs5WEvkFpYvDc"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "98EkHvW1pKsIROOOaLdtrf",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "ui_progress",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 12
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 120
-      },
-      {
-        "__id__": 122
-      }
-    ],
-    "_prefab": {
-      "__id__": 124
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 10,
-      "y": 69,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 119
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 121
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 225,
-      "height": 11
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a9z32GVvVBbraPXLCwuN8X"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 119
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 123
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "35ba11fd-6aa9-4f31-9802-5a7fbb4ad25b@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 2,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "14YT4mT0dBKbAIxYEvvl2U"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "afRuO4CMdBR6QUhczmymOG",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "lb_progress",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 12
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 126
-      },
-      {
-        "__id__": 128
-      }
-    ],
-    "_prefab": {
-      "__id__": 130
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 126.527,
-      "y": 71.102,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 125
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 127
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 31.802734375,
-      "height": 34.24
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "b1hPfRAXxIy5u0vEHC2Kuj"
-  },
-  {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 125
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 129
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_string": "0/0",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
-    "_fontFamily": "Arial",
-    "_lineHeight": 24,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": true,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": true,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 55,
-      "g": 55,
-      "b": 55,
-      "a": 255
-    },
-    "_outlineWidth": 2,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_shadowOffset": {
-      "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
-    },
-    "_shadowBlur": 2,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "b2Ytcfs11ATKxrDvjjq8Rk"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "ee7lMvLdlKdaosrIVo90CK",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "ui_type1",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 12
-    },
-    "_children": [],
-    "_active": false,
-    "_components": [
-      {
-        "__id__": 132
-      },
-      {
-        "__id__": 134
-      }
-    ],
-    "_prefab": {
-      "__id__": 136
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": -162.338,
-      "y": -164.861,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 131
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 133
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 57.31999969482422,
-      "height": 72.4000015258789
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.7964061718234958,
-      "y": 0.6709944862872701
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "32Y/nWg+hAn4nRy7ZS3DHQ"
-  },
-  {
-    "__type__": "sp.Skeleton",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 131
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 135
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_skeletonData": {
-      "__uuid__": "9c69d408-77e1-4b47-aba2-683633311baf",
-      "__expectedType__": "sp.SkeletonData"
-    },
-    "defaultSkin": "七星宝刀",
-    "defaultAnimation": "待机",
-    "_premultipliedAlpha": true,
-    "_timeScale": 1,
-    "_preCacheMode": 0,
-    "_cacheMode": 0,
-    "_sockets": [],
-    "_useTint": false,
-    "_debugMesh": false,
-    "_debugBones": false,
-    "_debugSlots": false,
-    "_enableBatch": false,
-    "loop": true,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "0dmFj5S8pBhaYfdVLggcyd"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "0fKjoY/gJLFb4xRrIPlkVt",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "ui_type3",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 12
-    },
-    "_children": [],
-    "_active": false,
-    "_components": [
-      {
-        "__id__": 138
-      },
-      {
-        "__id__": 140
-      }
-    ],
-    "_prefab": {
-      "__id__": 142
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": -159.002,
-      "y": -154.599,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 137
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 139
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 44.5,
-      "height": 69.5
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.6579775435201237,
-      "y": 0.47683452359206385
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "01Bju1tpNGq75nmCpzIL1s"
-  },
-  {
-    "__type__": "sp.Skeleton",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 137
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 141
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_skeletonData": {
-      "__uuid__": "0fcecd47-bebe-44ba-a253-c75caa557ef3",
-      "__expectedType__": "sp.SkeletonData"
-    },
-    "defaultSkin": "木棍",
-    "defaultAnimation": "待机",
-    "_premultipliedAlpha": true,
-    "_timeScale": 1,
-    "_preCacheMode": 0,
-    "_cacheMode": 0,
-    "_sockets": [],
-    "_useTint": false,
-    "_debugMesh": false,
-    "_debugBones": false,
-    "_debugSlots": false,
-    "_enableBatch": false,
-    "loop": true,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "f5P7M9nmtJ7Zc9P+meShNg"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "34EQMweHlLbqhdoNKE5EeY",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "ui_type2",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 12
-    },
-    "_children": [],
-    "_active": false,
-    "_components": [
-      {
-        "__id__": 144
-      },
-      {
-        "__id__": 146
-      }
-    ],
-    "_prefab": {
-      "__id__": 148
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": -163.338,
-      "y": -170.861,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 143
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 145
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 58,
-      "height": 92
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5594827717748182,
-      "y": 0.39749999668287195
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "19PNvMK39Ke5h7lgnvgFjl"
-  },
-  {
-    "__type__": "sp.Skeleton",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 143
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 147
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_skeletonData": {
-      "__uuid__": "86336081-4b76-421f-b5b5-b41d4bdb2569",
-      "__expectedType__": "sp.SkeletonData"
-    },
-    "defaultSkin": "大戟",
-    "defaultAnimation": "待机",
-    "_premultipliedAlpha": true,
-    "_timeScale": 1,
-    "_preCacheMode": 0,
-    "_cacheMode": 0,
-    "_sockets": [],
-    "_useTint": false,
-    "_debugMesh": false,
-    "_debugBones": false,
-    "_debugSlots": false,
-    "_enableBatch": false,
-    "loop": true,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "6eGCHwp2JBlL9TdaNO0EH/"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "12AdcclwFOAJu48zltysC0",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "ui_type4",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 12
-    },
-    "_children": [],
-    "_active": false,
-    "_components": [
-      {
-        "__id__": 150
-      },
-      {
-        "__id__": 152
-      }
-    ],
-    "_prefab": {
-      "__id__": 154
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": -163.338,
-      "y": -170.861,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 149
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 151
-    },
-    "_contentSize": {
+    "_resizeMode": 1,
+    "_layoutType": 2,
+    "_cellSize": {
       "__type__": "cc.Size",
-      "width": 74.19999694824219,
-      "height": 98.69999694824219
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.8017520771592986,
-      "y": 0.5265451147678956
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "bbwA3NWW5BFbcSFN1tVRDf"
-  },
-  {
-    "__type__": "sp.Skeleton",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 149
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 153
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_skeletonData": {
-      "__uuid__": "32148d60-1f8e-40c6-b41a-aef8b48fd5d9",
-      "__expectedType__": "sp.SkeletonData"
+      "width": 40,
+      "height": 40
     },
-    "defaultSkin": "乾坤弓",
-    "defaultAnimation": "待机",
-    "_premultipliedAlpha": true,
-    "_timeScale": 1,
-    "_preCacheMode": 0,
-    "_cacheMode": 0,
-    "_sockets": [],
-    "_useTint": false,
-    "_debugMesh": false,
-    "_debugBones": false,
-    "_debugSlots": false,
-    "_enableBatch": false,
-    "loop": true,
+    "_startAxis": 0,
+    "_paddingLeft": 0,
+    "_paddingRight": 0,
+    "_paddingTop": 0,
+    "_paddingBottom": 0,
+    "_spacingX": 0,
+    "_spacingY": 20,
+    "_verticalDirection": 1,
+    "_horizontalDirection": 0,
+    "_constraint": 0,
+    "_constraintNum": 2,
+    "_affectedByScale": false,
+    "_isAlign": false,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "f9qs4sOmFJFZQrEfDBnJzd"
+    "fileId": "78BzW/Df9OkaFfUE1bkTG/"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3961,7 +3300,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "50vST9ohBMPJQ4117tDLvR",
+    "fileId": "82d7DGkRNOpLn2vTDadAQl",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3976,12 +3315,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 156
+      "__id__": 130
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 517,
-      "height": 501
+      "height": 822
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3994,51 +3333,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "deba6yu3dOX6PmiOax2hx3"
   },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 12
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 158
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "3ff38a40-eee5-4cc0-9fc4-0162074b873c@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 1,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "bbngTYiQ9Ce4zJ7+AmGFrd"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -4062,7 +3356,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 161
+      "__id__": 133
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4090,7 +3384,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 163
+      "__id__": 135
     },
     "_alignFlags": 45,
     "_target": null,
@@ -4126,7 +3420,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 165
+      "__id__": 137
     },
     "_id": ""
   },
diff --git a/assets/bundles/popCommon/popGemInfo.meta b/assets/bundles/popCommon/popGemInfo.meta
new file mode 100644
index 0000000..be3b068
--- /dev/null
+++ b/assets/bundles/popCommon/popGemInfo.meta
@@ -0,0 +1 @@
+{"ver":"1.2.0","importer":"directory","imported":true,"uuid":"f9c11b7b-02d2-4c9e-ae88-d6d3a6585102","files":[],"subMetas":{},"userData":{}}
diff --git a/assets/bundles/popCommon/popGemInfo/prefab.meta b/assets/bundles/popCommon/popGemInfo/prefab.meta
new file mode 100644
index 0000000..440548d
--- /dev/null
+++ b/assets/bundles/popCommon/popGemInfo/prefab.meta
@@ -0,0 +1 @@
+{"ver":"1.2.0","importer":"directory","imported":true,"uuid":"e67dabc8-8016-454d-8c48-ab138e4b241e","files":[],"subMetas":{},"userData":{}}
diff --git a/assets/bundles/popCommon/popGemInfo/prefab/PopGemInfo.prefab b/assets/bundles/popCommon/popGemInfo/prefab/PopGemInfo.prefab
new file mode 100644
index 0000000..57b6f00
--- /dev/null
+++ b/assets/bundles/popCommon/popGemInfo/prefab/PopGemInfo.prefab
@@ -0,0 +1,1669 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "PopGemInfo",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "PopGemInfo",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 16
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 66
+      },
+      {
+        "__id__": 68
+      },
+      {
+        "__id__": 70
+      },
+      {
+        "__id__": 72
+      }
+    ],
+    "_prefab": {
+      "__id__": 74
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "bgMask",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      },
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 9
+      },
+      {
+        "__id__": 11
+      },
+      {
+        "__id__": 13
+      }
+    ],
+    "_prefab": {
+      "__id__": 15
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 4
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 750,
+      "height": 1600
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "6d2U8HsAZBwpgBOqiVJUbw"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 6
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "91W7iGbRtIGaBQe6UHLynU"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 8
+    },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 100,
+    "_originalHeight": 100,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b1E2GYSlNDbp4aZ8Etl4Gp"
+  },
+  {
+    "__type__": "cc.UIOpacity",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 10
+    },
+    "_opacity": 180,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "74aK8C+bhHn44L8rJfMZF0"
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 12
+    },
+    "clickEvents": [],
+    "_interactable": true,
+    "_transition": 3,
+    "_normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_hoverColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_pressedColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_normalSprite": null,
+    "_hoverSprite": null,
+    "_pressedSprite": null,
+    "_disabledSprite": null,
+    "_duration": 0.1,
+    "_zoomScale": 1.2,
+    "_target": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "820iWSo/tEUoatrBYaQmop"
+  },
+  {
+    "__type__": "01072pOfZNI5LNG77/ogzuD",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 14
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "qcHeme4ibAO0YUN2qMzKjp"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "f2hf8LeFtNt53yG5Oh4r5T",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "center",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 17
+      },
+      {
+        "__id__": 23
+      },
+      {
+        "__id__": 29
+      },
+      {
+        "__id__": 35
+      },
+      {
+        "__id__": 41
+      },
+      {
+        "__id__": 47
+      },
+      {
+        "__id__": 53
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 63
+      }
+    ],
+    "_prefab": {
+      "__id__": 65
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "bg",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 16
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 18
+      },
+      {
+        "__id__": 20
+      }
+    ],
+    "_prefab": {
+      "__id__": 22
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 17
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 19
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 385,
+      "height": 379
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "62iCLfSuFDjIRTFBfAFiWu"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 17
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 21
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "79e51b01-9825-46c4-95ee-02950d511a9b@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "e418MtD3ROc6VupKsKX98Q"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "c33rKqyGZClLYMqkqlfPwf",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "iconbg",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 16
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 24
+      },
+      {
+        "__id__": 26
+      }
+    ],
+    "_prefab": {
+      "__id__": 28
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 79.21,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 23
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 25
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 242,
+      "height": 243
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "929SwMOdtFJLAbeyky7s/i"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 23
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 27
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": null,
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "9bioiyNptCpaLEl8sxa9dg"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "d1HxJMnxVHspcTbbqGxgJF",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "icon",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 16
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 30
+      },
+      {
+        "__id__": 32
+      }
+    ],
+    "_prefab": {
+      "__id__": 34
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 79.21,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 0.5,
+      "y": 0.5,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 29
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 31
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 174,
+      "height": 162
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b3WBeXG15PYarItJInHC90"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 29
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 33
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": null,
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "543g1iL7dBHp5ZVJlfj7Bd"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "69lvgqr5hOBbxOKUk6DB5V",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "lb_name",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 16
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 36
+      },
+      {
+        "__id__": 38
+      }
+    ],
+    "_prefab": {
+      "__id__": 40
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -4.857,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 35
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 37
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 168.021484375,
+      "height": 54.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b7c6wm7ppAYosQYq34TJXW"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 35
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 39
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_string": "火龙击2级",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 36,
+    "_fontSize": 36,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 0,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": true,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_enableOutline": true,
+    "_outlineColor": {
+      "__type__": "cc.Color",
+      "r": 108,
+      "g": 63,
+      "b": 3,
+      "a": 255
+    },
+    "_outlineWidth": 2,
+    "_enableShadow": false,
+    "_shadowColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_shadowOffset": {
+      "__type__": "cc.Vec2",
+      "x": 2,
+      "y": 2
+    },
+    "_shadowBlur": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "970BXctF1Na6y1pUdtv9Uk"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "4fYx3ArUNBN4GpOqha6l0Q",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "lb_lv",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 16
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 42
+      },
+      {
+        "__id__": 44
+      }
+    ],
+    "_prefab": {
+      "__id__": 46
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -146.435,
+      "y": 159.9,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 41
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 43
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 57.802734375,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "f8gMMy965Ka52GoceVo2l7"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 41
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 45
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_string": "Lv.5",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 30,
+    "_fontSize": 30,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 0,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": true,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_enableOutline": false,
+    "_outlineColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_outlineWidth": 2,
+    "_enableShadow": false,
+    "_shadowColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_shadowOffset": {
+      "__type__": "cc.Vec2",
+      "x": 2,
+      "y": 2
+    },
+    "_shadowBlur": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "ecJWQELYFOIaU+FtsgEP5k"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "db+TFhIZBD6IiV3tyyqd+7",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "lb_desc",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 16
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 48
+      },
+      {
+        "__id__": 50
+      }
+    ],
+    "_prefab": {
+      "__id__": 52
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -100,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 47
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 49
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 300,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "5fShncvFFNpp7MALaXMW3K"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 47
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 51
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 179,
+      "g": 175,
+      "b": 167,
+      "a": 255
+    },
+    "_string": "每隔一定时间自动发射2道飞剑攻击",
+    "_horizontalAlign": 0,
+    "_verticalAlign": 1,
+    "_actualFontSize": 26,
+    "_fontSize": 25,
+    "_fontFamily": "Arial",
+    "_lineHeight": 30,
+    "_overflow": 2,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": true,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_enableOutline": false,
+    "_outlineColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_outlineWidth": 2,
+    "_enableShadow": false,
+    "_shadowColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_shadowOffset": {
+      "__type__": "cc.Vec2",
+      "x": 2,
+      "y": 2
+    },
+    "_shadowBlur": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "6d4Db+x+VLpKAHa2BDbM+X"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "5aXpvDBH5AjIdTm3SLtCot",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "btnClose",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 16
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 54
+      },
+      {
+        "__id__": 56
+      },
+      {
+        "__id__": 58
+      },
+      {
+        "__id__": 60
+      }
+    ],
+    "_prefab": {
+      "__id__": 62
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 162.586,
+      "y": 161.368,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 53
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 55
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 33,
+      "height": 33
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "f1BcrS1QRNE7HkDjNz5zb7"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 53
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 57
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "d66bbf34-9fd7-40b7-8da9-97ba0266c83e@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "60X+Z7clNPmpvXO/OVgl/7"
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 53
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 59
+    },
+    "clickEvents": [],
+    "_interactable": true,
+    "_transition": 3,
+    "_normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_hoverColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_pressedColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_normalSprite": null,
+    "_hoverSprite": null,
+    "_pressedSprite": null,
+    "_disabledSprite": null,
+    "_duration": 0.1,
+    "_zoomScale": 1.2,
+    "_target": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "7fRKlXnXNNX7Th8aAaptMk"
+  },
+  {
+    "__type__": "01072pOfZNI5LNG77/ogzuD",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 53
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 61
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "17+VFrjFxMb5P2kZk3kLLZ"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "10VaHgnK9H3LzWEO+NmRY2",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 16
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 64
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "38efZ7YFVJ+L4Iw6x67QiU"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "d5jCaNC8BIiZCV+nUkW4LA",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 67
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 750,
+      "height": 1600
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "86mfD4UNNAo4FgXo0aZBe0"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 69
+    },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 100,
+    "_originalHeight": 100,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b2NGFtX0BKC6CY2Pl6u/u7"
+  },
+  {
+    "__type__": "cc.BlockInputEvents",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 71
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "5fvzPIawpA/rZjNS2LBki6"
+  },
+  {
+    "__type__": "7f13fqc5BhJYKGA0WYzouyp",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 73
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "96lcyOcNhH5Kk+3HYrhIvA"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "1eYdMdeEpB55IvH1dPT4cM",
+    "instance": null,
+    "targetOverrides": null
+  }
+]
\ No newline at end of file
diff --git a/assets/bundles/popCommon/popGemInfo/prefab/PopGemInfo.prefab.meta b/assets/bundles/popCommon/popGemInfo/prefab/PopGemInfo.prefab.meta
new file mode 100644
index 0000000..36ead5f
--- /dev/null
+++ b/assets/bundles/popCommon/popGemInfo/prefab/PopGemInfo.prefab.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.50",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "8f6d72a3-b4d7-4186-ac66-329ae38c8651",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "PopGemInfo"
+  }
+}
diff --git a/assets/bundles/popCommon/popGetGem/prefab/PopGetGem.prefab b/assets/bundles/popCommon/popGetGem/prefab/PopGetGem.prefab
index 5bfcd63..20ded64 100644
--- a/assets/bundles/popCommon/popGetGem/prefab/PopGetGem.prefab
+++ b/assets/bundles/popCommon/popGetGem/prefab/PopGetGem.prefab
@@ -35,6 +35,9 @@
       },
       {
         "__id__": 72
+      },
+      {
+        "__id__": 75
       }
     ],
     "_prefab": {
@@ -1491,5 +1494,23 @@
         "__id__": 28
       }
     ]
+  },
+  {
+    "__type__": "b23e9blLAVI7bsjEad+g/s+",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 76
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b8KpGetGemUiSc01abCdEf"
   }
 ]
\ No newline at end of file
diff --git a/assets/mx/module/redDot/RedDotComp.ts b/assets/mx/module/redDot/RedDotComp.ts
index 35f770b..d00c9c4 100644
--- a/assets/mx/module/redDot/RedDotComp.ts
+++ b/assets/mx/module/redDot/RedDotComp.ts
@@ -141,7 +141,8 @@ export const checkRedDotShow = (id: RedDotID) => {
     }
 
     if (id == RedDotID.主界面_武器) {
-        return gg.equip.hasNewWeaponBadgeRedDot() ? 1 : 0;
+        // 宝石库：有可合成宝石时显示
+        return gg.gem.canFuseAny() ? 1 : 0;
     }
 
     if (id == RedDotID.主界面_挂机) {
diff --git a/assets/res/comm/texture/bg/英雄信息框.png b/assets/res/comm/texture/bg/英雄信息框.png
new file mode 100644
index 0000000..487de5b
Binary files /dev/null and b/assets/res/comm/texture/bg/英雄信息框.png differ
diff --git a/assets/res/gemstone/texture/矩形 798 拷贝 2-1.png.meta b/assets/res/comm/texture/bg/英雄信息框.png.meta
similarity index 70%
rename from assets/res/gemstone/texture/矩形 798 拷贝 2-1.png.meta
rename to assets/res/comm/texture/bg/英雄信息框.png.meta
index c2a206c..e84a539 100644
--- a/assets/res/gemstone/texture/矩形 798 拷贝 2-1.png.meta	
+++ b/assets/res/comm/texture/bg/英雄信息框.png.meta
@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "abf7f345-5a6f-4efe-ace1-5cb998f610d8",
+  "uuid": "b9319e63-3d94-4217-86cf-e3716fab5f2e",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "abf7f345-5a6f-4efe-ace1-5cb998f610d8@6c48a",
-      "displayName": "矩形 798 拷贝 2-1",
+      "uuid": "b9319e63-3d94-4217-86cf-e3716fab5f2e@6c48a",
+      "displayName": "英雄信息框",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "abf7f345-5a6f-4efe-ace1-5cb998f610d8",
+        "imageUuidOrDatabaseUri": "b9319e63-3d94-4217-86cf-e3716fab5f2e",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "abf7f345-5a6f-4efe-ace1-5cb998f610d8@f9941",
-      "displayName": "矩形 798 拷贝 2-1",
+      "uuid": "b9319e63-3d94-4217-86cf-e3716fab5f2e@f9941",
+      "displayName": "英雄信息框",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 62,
-        "height": 62,
-        "rawWidth": 62,
-        "rawHeight": 62,
+        "width": 517,
+        "height": 822,
+        "rawWidth": 517,
+        "rawHeight": 822,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -31,
-            -31,
+            -258.5,
+            -411,
             0,
-            31,
-            -31,
+            258.5,
+            -411,
             0,
-            -31,
-            31,
+            -258.5,
+            411,
             0,
-            31,
-            31,
+            258.5,
+            411,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            62,
-            62,
-            62,
+            822,
+            517,
+            822,
             0,
             0,
-            62,
+            517,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -31,
-            -31,
+            -258.5,
+            -411,
             0
           ],
           "maxPos": [
-            31,
-            31,
+            258.5,
+            411,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "abf7f345-5a6f-4efe-ace1-5cb998f610d8@6c48a",
+        "imageUuidOrDatabaseUri": "b9319e63-3d94-4217-86cf-e3716fab5f2e@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "fixAlphaTransparencyArtifacts": false,
     "hasAlpha": true,
-    "redirect": "abf7f345-5a6f-4efe-ace1-5cb998f610d8@6c48a"
+    "redirect": "b9319e63-3d94-4217-86cf-e3716fab5f2e@6c48a"
   }
 }
diff --git a/assets/res/font/str.txt b/assets/res/font/str.txt
index b7d183e..e867ae3 100644
--- a/assets/res/font/str.txt
+++ b/assets/res/font/str.txt
@@ -1,2 +1,2 @@
 [
- {"_type:c.Prfab,nmgGidojFls0Ex}v1zNuh2846]3V-5Qw背包格开启7UITSC9KRqAMB@JHYOD+未LWk文字选项框X/待Z一倍速二资产第波怪物来袭底部出砚台召唤金币视频标图点石成自动合置灰线<=>引导手指上箭头加宝箱秒杀斩受击刀痕光效特果禁止跳拖尾暴子锁定死亡营地血条量长兵走路吹号角猴虾机魂小六耳皮肤千里眼发阴影哮天犬太白技能奔儿灞将帅敖广牛魔王猩猿无常蟹谛听顺风黑龟丞相冰恶鬼下层攻晕眩流火电粘液护盾睡觉鼻涕泡呼噜限万神幡三味真持续九霄雷乾坤袋桃封榜授仙箓幻镜施法弱水危提示升级符昌笔碎帝钟偷缚网捕获门向左退土齐落剑阵目束杨戬身术悟空放复活干扰迷雾挑飞砸损毁李靖塔棍气红弹行治疗混乱玉生簿母大招普通疾直龙矢葫芦画追踪射体降雨缨枪武器敌方景系花山静态障碍片口木宫河桥府岩浆编辑时到中查看状蓝虚紫色橙闪#让我们替换它保存清除设等战斗和关闭汽炸窗题确取消力人参得后单位，。蟠树每个翻道接触挣脱要回收的镇宅牌有概率或令化铲把掘所变可以挖改写随别云麾振士军度%额外征兆名领还丹原补元妙鼓远程使用距离七十次会任意种主具近灭打断并反噬惑其暂停沉重移昧碰爆伤害财多耗数北京津西内蒙古辽宁吉林江海苏浙安徽福建东南湖庆四川贵州藏陕甘肃青夏新疆湾香港澳初始最值恢间（：）刷递增转盘几告购买权助经验隔首匹配段少星于对需被连胜玩家达那档场败(局现终展推日进奖励应当前为*整超过不游戏公容好！正式见面了欢迎何问馈必幅失利期默认解巡妖骨精女·阶唐僧嫦娥哪吒尖两孙如箍棒猪八戒轩辕国乙铁锋诛银戟钢铜黄镔菩灵弓弯毒穿舌齿钉耙杖刃莫邪玲珑吴钩双震狠锥雪分裂燃烧冲刺|魅魈幼园班凡修高圆满学年五玄罗硕博讲师教劈砍扇形带抡圈携扩范围球抛散透戳添横扫瞬作造交错丢旋挥舞循环表专属枚冻根据释区域减考族命在扔但占输独立调装\帮快捷入延闯更易!笑美割仓库返页全组桌赠送钻礼商店已免费券充月卡词及副本荡张马激卸载彩虹功章节即基累计没仅性观请先完品今登录制误异检剧情够摧抽结足吧径堵余剩备是困难模狱明再他该兑码绿英雄斧沙阎吸尘酷炫赏猎运与素材搭质益锐比极投掷贯处卷残般猛显握审判众操纵寒签铂耀宗者稀享友尽叫森漠优摆)蜘蛛禽漩涡狐狸巫注响知刮起狂给你临继工版础轮择、敬戴折拥荐饿…吃桀怕温柔滚菜食类末逃撕统短冷却兽语靠强往弃只差至虽然也音乐侧边栏都甲城挂越积务列否？己丰厚预览世站传说堆唯丧尸言简宠邀培养钥匙馨感着低℃浓逐渐覆盖抵抗昼夜许些此筑?排描述农牢笼劳算男刻支援榴莲理且屏幕右滑就哦恭喜您去块哈奇螃乌梅鹿狗焰狮猫熊鹰烈羊驼押雇佣闹帘蓬拘周伸腾而之急漫针池链吞君巨归心百掌叶圣同牙留住啃半逻父深协瑶赐共庭娘霆轰顶掣切缉拿承祝从脚梭×&唔溜痛赢醒永久鉴步私货噻称售罄惊矩拷贝糕客料喽爱繁한국어にほんごñçрускийязыí像论遮罩件';曲代控坐境构求夹^$~`🚫➡️报允缓密息例压缩适缺尺寸居监事颜；则忽略宽拐平采样绘帧端议～总避遍历非固旧截实沿播竖管记板索克隆擦案轴储维供渲染各函须致若按含象垂倾斜填跟偏附惯执型拟省布＜殊裁剪毕册这某义印信序因约负摸抬肯准做创话删竟驱粗怼防哎呢候才想善啊艹坑👈👉罕况套志识钮依赖销证界粒擎核阻纹─缘浮跃衰→老烟傻掉撒奥斯刚尝试集源串废址拉隐摘仍读跑缀早跨逆赋访插联键邻骤弦↔谁煮肉饭找滤均洗拽很突声锚欧析策价寻拓扑纯测热氏钳署照由航途朝业规轻「」溯旁曼顿估假塞校恰桶赶拦服聚嵌迟抑硬绑卖荷挡扣绪兜栈勿尚队零—另互槽询稍叠爪囚际飘污芭蕉乘派划汇墙毫竞撞拍漏盒威胁≤°筛贪济扁决垮史莱姆厂典宿责订阅迭螺倒漂爬匀涉兼车腰亦批举架抖微份职演绕络户探厅偿≥便绎聊钱智警慢佳译¥₩﷼坏句棋–仿抢棵拆拒绝骰饰撤疫恒遗挪斥答“亮”晋闩闲驻磁峰拼泵贴壳曾纠脏剔诊Σ伪较欠挤姿淡旦孤委托辨律踢丁露故幂晚稳员鸿付脑裸亿垓秭穰沟涧阿祇思什么似科季尔弧耦浏虑	【】诗椭抓暗珊瑚座墨朵浪扭书喷骼宵摊婆饼霜芒晶御灯破糊§©®™←↑↓●■◆▲▼★☆○《》『』〈〉‘’￥£¢∞℉村匠铺枝柳凑净搬孩岂肆犯脉畏惧碧侵溃捍卫幽冥踏讨伐泉奈忘彻旗扬鸣辈秩严辱踩崩蓄驭驰祭颗伙蔓践群陷吼猜藤叹伞幸臂烁缝臭草袈裟禅救帽嘴泪啦鹅姐奶荧溅巴筒赫柱摔炮雹甜窜陀昨款掰野练习削罢捡趁棉昊田既险紧账冤募鼋鱼犀腿掏粪熔炉涂僵焊研矿洞拳皇丑潮冠珍淇淋鼍虎贼鼠蛮豕卒鳝貉貂豹鲤鳌蜃戾煞魄伥蟾蚌蛇螭守魇怨祟夔犼欲蝎魉魍魑魃猊狼獐獾猢獬蚣盗凶蛊嗔痴胖锤鬃毛颚祥育抱富爷呆妇拾荒壮髦病丝珠糖贸市堂翅篮摇俑厨烤夫吐虫猕劫涌鹏宴刘洪寅岭峦佛祖寇潜渊焚罴傲猁兔丈鳞蟒梁凰妄赛岁辟尊眉袍膀俯隼弄洛阳陨仇捞粮滋杆催铃勾详坊荆撑睛街陋搜厉努医船锅胳膊梯阱楼希望攀松阈悬瞄崖鸡哥蝉兹蔽遭贬胎亲逢叉陡渡庄捎銮殿摄赌祛兴遇伏婚琵琶苦棘吟咏诸柿衕秽朱拯疲癃脸＞油 奏竹蜻蜓罚最叆（¤šº¾è¡¨‰˜­¯ªé»Œä¸Žž½±‹³‡‚¹Ÿ„Šƒã•µ²¿¦›«´¬�纳¶借肩摩裙室烂药洁骑磨稻拇彪院氛蜂窝睁汤缸苗骷髅粉呜又究怎灾丘房卧凤郡钯捉竺凌遥席噼啪丸脆捆办央馆谷社郊民隧宾炼溶峡坝碑坟煤酒葬寺庙坍塌艺舍蔬棚钓洲豪华邮赴糟谢训勤吗穷怀疑她迹嗯垃圾肥米杂锻拣冶堡细软锯廓颠尬泄司咪簇匕溢灼沫镖秘坚椅炒床煎娃械茶筝票雕塑凉亭乒乓柜筋桩墩篓纸枯凳韩伯✅🌍菱橘蛙鸟∈映盆栽砖躺毯闸吊泥坛厢舰琴瓷咨筐茅屋岗弥勒饵灶植恐蛋裹墓棺烛罐帐篷介绍赚衣嫌喇叭梦媚玻璃傅咸绳赎罪慌汗坠忆担挽念蒸弗兰伦裤梨斑斓啥晓闻囤顾宣柴秀滩腐蚀畜淬晃喝爽噩团曝砧壁沾瘦矮陆帆鞋察筷哇桂鸭媒咖啡麻辣蜜盛聘企洽谈佬诚彼悔恨逼妹骗惨亏篑捧爸俊杰董宏伟碗瓶膏纫秋扳醋翡翠檀唱仪偶洋饮鲜簪杯镯谱剂抹轿芯壶党胶冬苁蓉枸杞茸漱皂苷杉醇凝奢健宋酿啤斛燕午餐麦脂豆芝墅麝胆杏铸膜蚕瑞沈舟珩楚慕萧婉疏秦阮禾辞官溪陈沐桐翊辰赵予郑冯眠沅曦邓曹宇泽峻熙嘉铭彦郭春棠芽雀柚瓮琛郁柠徐叙舒胡袁吕卢蒋蔡贾魏薛潘杜澄奕尧弈敢嚣扛搞霞蹭斤兄弟饶痒喉咙捏饥渴耐喊滥谨慎阀崛争霸淘违迫扶融埃碾瓜汪康娱叮蚁休迪驾驶讯宙酱蚂契堪钞暖拜泰窦诉郎砒焖肝晦贱股陪俩谋祸眨誓妈瘫艾吓贷懂轨敲呀踹姓债骂篡忙扯淑芬郝丫惹歹屈胸哼撩耍嘛羞嘿祈奋耻聪挺欺叔尴茬良奸谍殴崽葱嘞麒麟赔瞧肾蚝咱辆佩势荣苛抚咬劝泼烦屁挨揍跪孕嗨愿卑鄙厕掐脖稽扎仔甩忍刹砰嫂妮拱磕逞醉薇胞恩槌袒宜耽撬丽莎暧愉渣骆蹲昂朴贿赂瞎廊妻夺嫩卓祎悄浑捣租掩啰衡遣辛盯趴凭蹋辅劲窃纪涨趋氓馁恼犒磊噪舵筹瞒趟德缠患裕舅涩菲揽矛谅趣朋寨懒促恙憋咎懈怠犊谓呗唧届躲勇拭夸鞠躬瘁癖傍巧芸叛囊蠢舆熟酵织搅搁措诺眈颈幺蛾薪妨跌犹豫乞丐俱嘲掺撼逛忧怒奠伍枉惜昏寄冒雅觑喘呈瓢吵娜惠峥嵘耕塘芳桑柄槛盈衔渍嘟愤浴巾咔肘咚暑衅膝皱馒咀嚼撇盔铠莉搂捂袱盹讶肿龇杠鸦肚嘻挠旅侦呲羽掸酥掳椒玫瑰滕巅浩孟夕疼悉缮窍拎裆靡萌辉煌倡廉擘亨寡滨劣掀萨噶歌伴革殖侄腻愁姨诽谤甚仁悦栋诅咒缴瘟屎诬诱谣灌澡嫣蟑螂猖呦逾潇洒诈妥碳唉湘刁爹辜庞嫁贤牺牲垄愧乖逮惺怜乎嘱咐貌恳疯伎霉兮崴踝绷妞蕾勉瞌仆苍坯贫漆笨纽遵驳悠酸揉捶伺哭嘎绩晨赞愣渠屉肺昆仑炎ÄÖÜöüßàùêâîôûаАЯЁёìÍÌÁÀáÉÈÒÓòóŐőÙÚŰúűÑÆÃÂÔõěčřýůťďňĚČŘŤżźśńłę湯ŹŚŃŁĘĆĄảạăắằẳẵặấầẩẫậẻẽẹếềểễệỉĩịỏọốồổỗộơớờởỡợủũụưứừửữựỳỷỹỵđẢẠĂẮẰẲẴẶẤẦẨẪẬẺẼẸÊẾỀỂỄỆỈĨỊỎÕỌỐỒỔỖỘƠỚỜỞỠỢỦŨỤƯỨỪỬỮỰÝỲỶỸỴĐ😉🚗哟噢井玛喂弊括祗仕戈盲≈沼披畅÷敏隙蝇酣漓昵汉鞭θ怖咩评锹苹飙⚠❌👇⚡🔄💡級镂穴窄矫①②惩逗迁综惰滴尤侣拧∩−仰皆褐③④挫盟枭埋羁绊滞岛≠瓣膨胀泛俸禄政吾擂徒・庐揭薄篇≫哨佐瞻蹦Δ浅凸掠垫拢擅匿碌剥申
\ No newline at end of file
+ {"_type:c.Prfab,nmgGidojFls0Ex}v1zNuh2846]3V-5Qw背包格开启7UITSC9KRqAMB@JHYOD+未LWk文字选项框X/待Z一倍速二资产第波怪物来袭底部出砚台召唤金币视频标图点石成自动合置灰线<=>引导手指上箭头加宝箱秒杀斩受击刀痕光效特果禁止跳拖尾暴子锁定死亡营地血条量长兵走路吹号角猴虾机魂小六耳皮肤千里眼发阴影哮天犬太白技能奔儿灞将帅敖广牛魔王猩猿无常蟹谛听顺风黑龟丞相冰恶鬼下层攻晕眩流火电粘液护盾睡觉鼻涕泡呼噜限万神幡三味真持续九霄雷乾坤袋桃封榜授仙箓幻镜施法弱水危提示升级符昌笔碎帝钟偷缚网捕获门向左退土齐落剑阵目束杨戬身术悟空放复活干扰迷雾挑飞砸损毁李靖塔棍气红弹行治疗混乱玉生簿母大招普通疾直龙矢葫芦画追踪射体降雨缨枪武器敌方景系花山静态障碍片口木宫河桥府岩浆编辑时到中查看状蓝虚紫色橙闪#让我们替换它保存清除设等战斗和关闭汽炸窗题确取消力灾厄盒对现几率翻卡，数或所有%赏令后概多得个增的*幸运掉鏖册丸π双寻尺解块额外御珠接近灭省契耗滞牌进度矿每枚属性随变北京津西内蒙古辽宁吉林江海苏浙安徽福建东南湖重庆四川贵州云藏陕甘肃青夏新疆湾香港澳初始最值恢间（单位：）刷递转盘道具告购买权助经验次隔首匹配段少星于主需要被连胜玩家达那档场触败(局铲离终展推使用日奖励应当前为整超过不游戏公容好！正式见面了欢迎程任何问反馈。必幅失利期默认巡妖骨精女·阶唐僧嫦娥哪吒尖两孙如意箍棒猪八戒轩辕国乙铁锋七诛银戟钢铜黄镔菩灵弓弯毒穿舌齿钉耙杖刃莫邪玲珑吴钩震爆伤狠锥雪分裂燃烧冲刺|魅魈幼园班凡修高圆满人学年五玄罗元硕士博讲师教劈砍扇形带抡圈携扩范围球抛散透戳添横扫并瞬作造害交错丢旋挥舞循环表专冻根据释区域减参考族命距在扔但占输独立调装\帮快捷入延闯更易!笑美割仓库返回页组桌赠送钻礼商店已领免费券充月词及副本荡可张马激卸载彩虹功章节即基累计还没仅观请先完品今登录制误异检剧情够摧抽结足吧径堵补余剩备是困难模狱明再其他该兑码绿英雄斧沙阎吸尘酷炫猎以与素材搭质全收益把锐比极军投掷贯远处卷残般猛显握审判众操纵寒签铂耀宗者稀享友尽叫森漠优摆)蜘蛛禽漩涡狐狸巫注会响知刮起狂给惑你临继工版础轮择、敬戴十折拥荐饿…吃桀别怕温柔滚菜食类末逃撕统短冷却兽语靠强往暂停弃只差至虽然也音乐侧边栏都甲移城挂越打积务列否？己丰厚预览世站传说堆唯丧尸言简宠邀培养钥匙馨感着低℃浓逐渐覆盖抵抗昼夜许些此筑?排名描述农牢笼劳算男刻支援榴莲理且屏幕右滑就哦恭喜您去哈奇螃乌梅鹿狗焰狮猫熊鹰烈羊驼押雇佣闹帘蓬拘周伸腾而之断急漫针池链吞噬君巨归心百掌叶圣同原牙留住啃化半逻父深协瑶赐共庭娘霆轰顶掣切缉拿承祝从脚梭×&征唔溜痛赢种信息尚镶嵌醒永久鉴步私货噻称售罄惊矩拷贝糕客料喽爱繁한국어にほんごñçрускийязыí像论遮罩件';曲代控坐境构求夹^$~`🚫➡️报允缓密例压缩适缺寸居监事颜；则忽略宽拐平采样绘帧端议～总避遍历非固旧截实沿播竖管记板索克隆擦案轴储维供渲染各函须致若按改含象垂倾斜填跟偏附惯执型拟布＜殊裁剪毕这写某义印序因约负摸抬肯准做创话删竟驱粗怼防哎呢候才想善啊艹坑👈👉罕况套志识钮依赖销证界粒擎核阻纹─缘浮跃衰→老烟傻撒奥斯刚尝试集源串废址拉隐摘仍读跑缀早跨逆赋访插联键邻骤弦↔谁煮肉饭找滤均洗拽很突声锚欧析策价拓扑纯测热氏钳署照由航途朝业规轻「」溯旁曼顿估假塞校恰桶赶拦服聚迟抑硬绑卖荷挡扣绪兜栈勿队零—另互槽询丹稍叠爪囚际飘污芭蕉乘派划汇墙毫竞碰撞拍漏脱威胁蟠树≤°筛贪济扁决垮史莱姆厂典宿责订阅迭螺倒漂爬匀涉兼车昧腰亦批举架抖微份职演绕络户探厅偿≥便绎聊钱智警慢佳译¥₩﷼坏句棋挖–仿抢棵拆拒绝骰饰撤疫妙恒遗挪斥答“亮”晋闩闲驻磁峰拼泵贴壳曾纠脏剔诊Σ伪较欠挤姿淡旦孤委托辨律踢丁露故幂晚稳员鸿付脑裸亿兆垓秭穰沟涧阿祇思什么似科季尔弧耦浏虑	【】诗椭抓暗珊瑚座墨朵浪扭书喷骼宵摊婆饼霜芒晶财灯破糊§©®™←↑↓●■◆▲▼★☆○《》『』〈〉‘’￥£¢∞℉挣镇宅掘麾振鼓沉村匠铺枝柳凑净搬孩岂肆犯脉畏惧碧侵溃捍卫幽冥踏讨伐泉奈忘彻旗扬鸣辈秩严辱踩崩蓄驭驰祭颗伙蔓践群陷吼猜藤叹伞臂烁缝臭草袈裟禅救帽嘴泪啦鹅姐奶荧溅巴筒赫柱摔炮雹甜窜陀昨款掰野练习削罢捡趁棉昊田既险紧账冤募鼋鱼犀腿掏粪熔炉涂僵焊研洞拳皇丑潮冠珍淇淋鼍虎贼鼠蛮豕卒鳝貉貂豹鲤鳌蜃戾煞魄伥蟾蚌蛇螭守魇怨祟夔犼欲蝎魉魍魑魃猊狼獐獾猢獬蚣盗凶蛊嗔痴胖锤鬃毛颚祥育抱富爷呆妇拾荒壮髦病丝糖贸市堂翅篮摇俑厨烤夫吐虫猕劫涌鹏宴刘洪寅岭峦佛祖寇潜渊焚罴傲猁兔丈鳞蟒梁凰妄赛岁辟尊眉袍膀俯隼弄洛阳陨仇捞粮滋杆催铃勾详坊荆撑睛街陋搜厉努医船锅胳膊梯阱楼希望攀松阈悬瞄崖鸡哥蝉兹蔽遭贬胎亲逢叉陡渡庄捎銮殿摄赌祛兴遇伏婚琵琶苦棘吟咏诸柿衕秽朱拯疲癃脸＞油 奏竹蜻蜓罚最叆（¤šº¾è¡¨‰˜­¯ªé»Œä¸Žž½±‹³‡‚¹Ÿ„Šƒã•µ²¿¦›«´¬�纳¶借肩摩裙室烂药洁骑磨稻拇彪院氛蜂窝睁汤缸苗骷髅粉呜又究怎丘房卧凤郡钯捉竺凌遥席噼啪脆捆办央馆谷社郊民隧宾炼溶峡坝碑坟煤酒葬寺庙坍塌艺舍蔬棚钓洲豪华邮赴糟谢训勤吗穷怀疑她迹嗯垃圾肥米杂锻拣冶堡细软锯廓颠尬泄司咪簇匕溢灼沫镖秘坚椅炒床煎娃械茶筝票雕塑凉亭乒乓柜筋桩墩篓纸枯凳韩伯✅🌍菱橘蛙鸟∈映盆栽砖躺毯闸吊泥坛厢舰琴瓷咨筐茅屋岗弥勒饵灶植恐蛋裹墓棺烛罐帐篷介绍赚衣嫌喇叭梦媚玻璃傅咸绳赎罪慌汗坠忆担挽念蒸弗兰伦裤梨斑斓啥晓闻囤顾宣柴秀滩腐蚀畜淬晃喝爽噩团曝砧壁沾瘦矮陆帆鞋察筷哇桂鸭媒咖啡麻辣蜜盛聘企洽谈佬诚彼悔恨逼妹骗惨亏篑捧爸俊杰董宏伟碗瓶膏纫秋扳醋翡翠檀唱仪偶洋饮鲜簪杯镯谱剂抹轿芯壶党胶冬苁蓉枸杞茸漱皂苷杉醇凝奢健宋酿啤斛燕午餐麦脂豆芝墅麝胆杏铸膜蚕瑞沈舟珩楚慕萧婉疏秦阮禾辞官溪陈沐桐翊辰赵予郑冯眠沅曦邓曹宇泽峻熙嘉铭彦郭春棠芽雀柚瓮琛郁柠徐叙舒胡袁吕卢蒋蔡贾魏薛潘杜澄奕尧弈敢嚣扛搞霞蹭斤兄弟饶痒喉咙捏饥渴耐喊滥谨慎阀崛争霸淘违迫扶融埃碾瓜汪康娱叮蚁休迪驾驶讯宙酱蚂堪钞暖拜泰窦诉郎砒焖肝晦贱股陪俩谋祸眨誓妈瘫艾吓贷懂轨敲呀踹姓债骂篡忙扯淑芬郝丫惹歹屈胸哼撩耍嘛羞嘿祈奋耻聪挺欺叔尴茬良奸谍殴崽葱嘞麒麟赔瞧肾蚝咱辆佩势荣苛抚咬劝泼烦屁挨揍跪孕嗨愿卑鄙厕掐脖稽扎仔甩忍刹砰嫂妮拱磕逞醉薇胞恩槌袒宜耽撬丽莎暧愉渣骆蹲昂朴贿赂瞎廊妻夺嫩卓祎悄浑捣租掩啰衡遣辛盯趴凭蹋辅劲窃纪涨趋氓馁恼犒磊噪舵筹瞒趟德缠患裕舅涩菲揽矛谅趣朋寨懒促恙憋咎懈怠犊谓呗唧届躲勇拭夸鞠躬瘁癖傍巧芸叛囊蠢舆熟酵织搅搁措诺眈颈幺蛾薪妨跌犹豫乞丐俱嘲掺撼逛忧怒奠伍枉惜昏寄冒雅觑喘呈瓢吵娜惠峥嵘耕塘芳桑柄槛盈衔渍嘟愤浴巾咔肘咚暑衅膝皱馒咀嚼撇盔铠莉搂捂袱盹讶肿龇杠鸦肚嘻挠旅侦呲羽掸酥掳椒玫瑰滕巅浩孟夕疼悉缮窍拎裆靡萌辉煌倡廉擘亨寡滨劣掀萨噶歌伴革殖侄腻愁姨诽谤甚仁悦栋诅咒缴瘟屎诬诱谣灌澡嫣蟑螂猖呦逾潇洒诈妥碳唉湘刁爹辜庞嫁贤牺牲垄愧乖逮惺怜乎嘱咐貌恳疯伎霉兮崴踝绷妞蕾勉瞌仆苍坯贫漆笨纽遵驳悠酸揉捶伺哭嘎绩晨赞愣渠屉肺昆仑炎ÄÖÜöüßàùêâîôûаАЯЁёìÍÌÁÀáÉÈÒÓòóŐőÙÚŰúűÑÆÃÂÔõěčřýůťďňĚČŘŤżźśńłę湯ŹŚŃŁĘĆĄảạăắằẳẵặấầẩẫậẻẽẹếềểễệỉĩịỏọốồổỗộơớờởỡợủũụưứừửữựỳỷỹỵđẢẠĂẮẰẲẴẶẤẦẨẪẬẺẼẸÊẾỀỂỄỆỈĨỊỎÕỌỐỒỔỖỘƠỚỜỞỠỢỦŨỤƯỨỪỬỮỰÝỲỶỸỴĐ😉🚗哟噢井玛喂弊括祗仕戈盲≈沼披畅÷敏隙蝇酣漓昵汉鞭θ怖咩评锹苹飙⚠❌👇⚡🔄💡級镂穴窄矫①②惩逗迁综惰滴尤侣拧∩−仰皆褐③④挫盟枭埋羁绊岛≠瓣膨胀泛俸禄政吾擂徒・庐揭薄篇≫哨佐瞻蹦Δ浅凸掠垫拢擅匿碌剥申
\ No newline at end of file
diff --git a/assets/res/gemstone/texture/武器信息图标底框--绿.png b/assets/res/gemstone/texture/武器信息图标底框--绿.png
deleted file mode 100644
index 8423c32..0000000
Binary files a/assets/res/gemstone/texture/武器信息图标底框--绿.png and /dev/null differ
diff --git a/assets/res/gemstone/texture/武器信息图标底框--绿.png.meta b/assets/res/gemstone/texture/武器信息图标底框--绿.png.meta
deleted file mode 100644
index 348e44b..0000000
--- a/assets/res/gemstone/texture/武器信息图标底框--绿.png.meta
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "8e6253a0-a91d-49e1-bbb9-aa09d3e7e05b",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "8e6253a0-a91d-49e1-bbb9-aa09d3e7e05b@6c48a",
-      "displayName": "武器信息图标底框--绿",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "8e6253a0-a91d-49e1-bbb9-aa09d3e7e05b",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "8e6253a0-a91d-49e1-bbb9-aa09d3e7e05b@f9941",
-      "displayName": "武器信息图标底框--绿",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 242,
-        "height": 243,
-        "rawWidth": 242,
-        "rawHeight": 243,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -121,
-            -121.5,
-            0,
-            121,
-            -121.5,
-            0,
-            -121,
-            121.5,
-            0,
-            121,
-            121.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            243,
-            242,
-            243,
-            0,
-            0,
-            242,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -121,
-            -121.5,
-            0
-          ],
-          "maxPos": [
-            121,
-            121.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "8e6253a0-a91d-49e1-bbb9-aa09d3e7e05b@6c48a",
-        "atlasUuid": "",
-        "trimType": "auto"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "fixAlphaTransparencyArtifacts": false,
-    "hasAlpha": true,
-    "redirect": "8e6253a0-a91d-49e1-bbb9-aa09d3e7e05b@6c48a"
-  }
-}
diff --git a/assets/res/gemstone/texture/武器信息图标底框-橙.png b/assets/res/gemstone/texture/武器信息图标底框-橙.png
deleted file mode 100644
index b3072c6..0000000
Binary files a/assets/res/gemstone/texture/武器信息图标底框-橙.png and /dev/null differ
diff --git a/assets/res/gemstone/texture/武器信息图标底框-橙.png.meta b/assets/res/gemstone/texture/武器信息图标底框-橙.png.meta
deleted file mode 100644
index e4951cc..0000000
--- a/assets/res/gemstone/texture/武器信息图标底框-橙.png.meta
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "d4c1af99-1106-478e-9c7c-a1b75097d966",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "d4c1af99-1106-478e-9c7c-a1b75097d966@6c48a",
-      "displayName": "武器信息图标底框-橙",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "d4c1af99-1106-478e-9c7c-a1b75097d966",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "d4c1af99-1106-478e-9c7c-a1b75097d966@f9941",
-      "displayName": "武器信息图标底框-橙",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 242,
-        "height": 243,
-        "rawWidth": 242,
-        "rawHeight": 243,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -121,
-            -121.5,
-            0,
-            121,
-            -121.5,
-            0,
-            -121,
-            121.5,
-            0,
-            121,
-            121.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            243,
-            242,
-            243,
-            0,
-            0,
-            242,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -121,
-            -121.5,
-            0
-          ],
-          "maxPos": [
-            121,
-            121.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "d4c1af99-1106-478e-9c7c-a1b75097d966@6c48a",
-        "atlasUuid": "",
-        "trimType": "auto"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "fixAlphaTransparencyArtifacts": false,
-    "hasAlpha": true,
-    "redirect": "d4c1af99-1106-478e-9c7c-a1b75097d966@6c48a"
-  }
-}
diff --git a/assets/res/gemstone/texture/武器信息图标底框-紫.png b/assets/res/gemstone/texture/武器信息图标底框-紫.png
deleted file mode 100644
index 28f5f86..0000000
Binary files a/assets/res/gemstone/texture/武器信息图标底框-紫.png and /dev/null differ
diff --git a/assets/res/gemstone/texture/武器信息图标底框-紫.png.meta b/assets/res/gemstone/texture/武器信息图标底框-紫.png.meta
deleted file mode 100644
index f2ce122..0000000
--- a/assets/res/gemstone/texture/武器信息图标底框-紫.png.meta
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "eff7397b-07f2-4843-b660-d491f2da6928",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "eff7397b-07f2-4843-b660-d491f2da6928@6c48a",
-      "displayName": "武器信息图标底框-紫",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "eff7397b-07f2-4843-b660-d491f2da6928",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "eff7397b-07f2-4843-b660-d491f2da6928@f9941",
-      "displayName": "武器信息图标底框-紫",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 242,
-        "height": 243,
-        "rawWidth": 242,
-        "rawHeight": 243,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -121,
-            -121.5,
-            0,
-            121,
-            -121.5,
-            0,
-            -121,
-            121.5,
-            0,
-            121,
-            121.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            243,
-            242,
-            243,
-            0,
-            0,
-            242,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -121,
-            -121.5,
-            0
-          ],
-          "maxPos": [
-            121,
-            121.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "eff7397b-07f2-4843-b660-d491f2da6928@6c48a",
-        "atlasUuid": "",
-        "trimType": "auto"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "fixAlphaTransparencyArtifacts": false,
-    "hasAlpha": true,
-    "redirect": "eff7397b-07f2-4843-b660-d491f2da6928@6c48a"
-  }
-}
diff --git a/assets/res/gemstone/texture/武器信息图标底框-红.png b/assets/res/gemstone/texture/武器信息图标底框-红.png
deleted file mode 100644
index f71eaf6..0000000
Binary files a/assets/res/gemstone/texture/武器信息图标底框-红.png and /dev/null differ
diff --git a/assets/res/gemstone/texture/武器信息图标底框-红.png.meta b/assets/res/gemstone/texture/武器信息图标底框-红.png.meta
deleted file mode 100644
index 0c94a5e..0000000
--- a/assets/res/gemstone/texture/武器信息图标底框-红.png.meta
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "c3597ab8-38c4-4667-bf19-9e5279928276",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "c3597ab8-38c4-4667-bf19-9e5279928276@6c48a",
-      "displayName": "武器信息图标底框-红",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "c3597ab8-38c4-4667-bf19-9e5279928276",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "c3597ab8-38c4-4667-bf19-9e5279928276@f9941",
-      "displayName": "武器信息图标底框-红",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 242,
-        "height": 243,
-        "rawWidth": 242,
-        "rawHeight": 243,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -121,
-            -121.5,
-            0,
-            121,
-            -121.5,
-            0,
-            -121,
-            121.5,
-            0,
-            121,
-            121.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            243,
-            242,
-            243,
-            0,
-            0,
-            242,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -121,
-            -121.5,
-            0
-          ],
-          "maxPos": [
-            121,
-            121.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "c3597ab8-38c4-4667-bf19-9e5279928276@6c48a",
-        "atlasUuid": "",
-        "trimType": "auto"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "fixAlphaTransparencyArtifacts": false,
-    "hasAlpha": true,
-    "redirect": "c3597ab8-38c4-4667-bf19-9e5279928276@6c48a"
-  }
-}
diff --git a/assets/res/gemstone/texture/武器信息图标底框-蓝.png b/assets/res/gemstone/texture/武器信息图标底框-蓝.png
deleted file mode 100644
index fb8e2ae..0000000
Binary files a/assets/res/gemstone/texture/武器信息图标底框-蓝.png and /dev/null differ
diff --git a/assets/res/gemstone/texture/武器信息图标底框-蓝.png.meta b/assets/res/gemstone/texture/武器信息图标底框-蓝.png.meta
deleted file mode 100644
index 10fd485..0000000
--- a/assets/res/gemstone/texture/武器信息图标底框-蓝.png.meta
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "b8402838-97ca-49f8-a800-9ac9f59d710f",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "b8402838-97ca-49f8-a800-9ac9f59d710f@6c48a",
-      "displayName": "武器信息图标底框-蓝",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "b8402838-97ca-49f8-a800-9ac9f59d710f",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "b8402838-97ca-49f8-a800-9ac9f59d710f@f9941",
-      "displayName": "武器信息图标底框-蓝",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 242,
-        "height": 243,
-        "rawWidth": 242,
-        "rawHeight": 243,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -121,
-            -121.5,
-            0,
-            121,
-            -121.5,
-            0,
-            -121,
-            121.5,
-            0,
-            121,
-            121.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            243,
-            242,
-            243,
-            0,
-            0,
-            242,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -121,
-            -121.5,
-            0
-          ],
-          "maxPos": [
-            121,
-            121.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "b8402838-97ca-49f8-a800-9ac9f59d710f@6c48a",
-        "atlasUuid": "",
-        "trimType": "auto"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "fixAlphaTransparencyArtifacts": false,
-    "hasAlpha": true,
-    "redirect": "b8402838-97ca-49f8-a800-9ac9f59d710f@6c48a"
-  }
-}
diff --git a/assets/res/gemstone/texture/矩形 798 拷贝 2-1.png b/assets/res/gemstone/texture/矩形 798 拷贝 2-1.png
deleted file mode 100644
index 452fe68..0000000
Binary files a/assets/res/gemstone/texture/矩形 798 拷贝 2-1.png and /dev/null differ
diff --git a/assets/res/gemstone/texture/矩形 798 拷贝 2.png b/assets/res/gemstone/texture/矩形 798 拷贝 2.png
deleted file mode 100644
index 4e8cbd1..0000000
Binary files a/assets/res/gemstone/texture/矩形 798 拷贝 2.png and /dev/null differ
diff --git a/assets/res/gemstone/texture/矩形 798 拷贝 2.png.meta b/assets/res/gemstone/texture/矩形 798 拷贝 2.png.meta
deleted file mode 100644
index 4d967ef..0000000
--- a/assets/res/gemstone/texture/矩形 798 拷贝 2.png.meta	
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "025c6b9d-1242-40ed-9d79-96e7bc953c29",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "025c6b9d-1242-40ed-9d79-96e7bc953c29@6c48a",
-      "displayName": "矩形 798 拷贝 2",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "025c6b9d-1242-40ed-9d79-96e7bc953c29",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "025c6b9d-1242-40ed-9d79-96e7bc953c29@f9941",
-      "displayName": "矩形 798 拷贝 2",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 63,
-        "height": 62,
-        "rawWidth": 63,
-        "rawHeight": 62,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -31.5,
-            -31,
-            0,
-            31.5,
-            -31,
-            0,
-            -31.5,
-            31,
-            0,
-            31.5,
-            31,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            62,
-            63,
-            62,
-            0,
-            0,
-            63,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -31.5,
-            -31,
-            0
-          ],
-          "maxPos": [
-            31.5,
-            31,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "025c6b9d-1242-40ed-9d79-96e7bc953c29@6c48a",
-        "atlasUuid": "",
-        "trimType": "auto"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "fixAlphaTransparencyArtifacts": false,
-    "hasAlpha": true,
-    "redirect": "025c6b9d-1242-40ed-9d79-96e7bc953c29@6c48a"
-  }
-}
diff --git a/assets/res/gemstone/texture/矩形 798 拷贝 3-1.png b/assets/res/gemstone/texture/矩形 798 拷贝 3-1.png
deleted file mode 100644
index e0c278e..0000000
Binary files a/assets/res/gemstone/texture/矩形 798 拷贝 3-1.png and /dev/null differ
diff --git a/assets/res/gemstone/texture/矩形 798 拷贝 3-1.png.meta b/assets/res/gemstone/texture/矩形 798 拷贝 3-1.png.meta
deleted file mode 100644
index 0991559..0000000
--- a/assets/res/gemstone/texture/矩形 798 拷贝 3-1.png.meta	
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "ea4d4f68-8b22-44c5-8a22-6dcf096e80c8",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "ea4d4f68-8b22-44c5-8a22-6dcf096e80c8@6c48a",
-      "displayName": "矩形 798 拷贝 3-1",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "ea4d4f68-8b22-44c5-8a22-6dcf096e80c8",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "ea4d4f68-8b22-44c5-8a22-6dcf096e80c8@f9941",
-      "displayName": "矩形 798 拷贝 3-1",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 62,
-        "height": 62,
-        "rawWidth": 62,
-        "rawHeight": 62,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -31,
-            -31,
-            0,
-            31,
-            -31,
-            0,
-            -31,
-            31,
-            0,
-            31,
-            31,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            62,
-            62,
-            62,
-            0,
-            0,
-            62,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -31,
-            -31,
-            0
-          ],
-          "maxPos": [
-            31,
-            31,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "ea4d4f68-8b22-44c5-8a22-6dcf096e80c8@6c48a",
-        "atlasUuid": "",
-        "trimType": "auto"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "fixAlphaTransparencyArtifacts": false,
-    "hasAlpha": true,
-    "redirect": "ea4d4f68-8b22-44c5-8a22-6dcf096e80c8@6c48a"
-  }
-}
diff --git a/assets/res/gemstone/texture/矩形 798 拷贝 3.png b/assets/res/gemstone/texture/矩形 798 拷贝 3.png
deleted file mode 100644
index 351399b..0000000
Binary files a/assets/res/gemstone/texture/矩形 798 拷贝 3.png and /dev/null differ
diff --git a/assets/res/gemstone/texture/矩形 798 拷贝 3.png.meta b/assets/res/gemstone/texture/矩形 798 拷贝 3.png.meta
deleted file mode 100644
index c786860..0000000
--- a/assets/res/gemstone/texture/矩形 798 拷贝 3.png.meta	
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "8bce9335-cd65-40a4-9c1f-72c084304fff",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "8bce9335-cd65-40a4-9c1f-72c084304fff@6c48a",
-      "displayName": "矩形 798 拷贝 3",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "8bce9335-cd65-40a4-9c1f-72c084304fff",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "8bce9335-cd65-40a4-9c1f-72c084304fff@f9941",
-      "displayName": "矩形 798 拷贝 3",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 62,
-        "height": 62,
-        "rawWidth": 62,
-        "rawHeight": 62,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -31,
-            -31,
-            0,
-            31,
-            -31,
-            0,
-            -31,
-            31,
-            0,
-            31,
-            31,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            62,
-            62,
-            62,
-            0,
-            0,
-            62,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -31,
-            -31,
-            0
-          ],
-          "maxPos": [
-            31,
-            31,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "8bce9335-cd65-40a4-9c1f-72c084304fff@6c48a",
-        "atlasUuid": "",
-        "trimType": "auto"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "fixAlphaTransparencyArtifacts": false,
-    "hasAlpha": true,
-    "redirect": "8bce9335-cd65-40a4-9c1f-72c084304fff@6c48a"
-  }
-}
diff --git a/assets/res/gemstone/texture/矩形 798 拷贝-1.png b/assets/res/gemstone/texture/矩形 798 拷贝-1.png
deleted file mode 100644
index ff912c5..0000000
Binary files a/assets/res/gemstone/texture/矩形 798 拷贝-1.png and /dev/null differ
diff --git a/assets/res/gemstone/texture/矩形 798 拷贝-1.png.meta b/assets/res/gemstone/texture/矩形 798 拷贝-1.png.meta
deleted file mode 100644
index eb56c2f..0000000
--- a/assets/res/gemstone/texture/矩形 798 拷贝-1.png.meta	
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "5a1adc0b-057a-4c1f-9361-138325e51bb1",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "5a1adc0b-057a-4c1f-9361-138325e51bb1@6c48a",
-      "displayName": "矩形 798 拷贝-1",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "5a1adc0b-057a-4c1f-9361-138325e51bb1",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "5a1adc0b-057a-4c1f-9361-138325e51bb1@f9941",
-      "displayName": "矩形 798 拷贝-1",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 62,
-        "height": 62,
-        "rawWidth": 62,
-        "rawHeight": 62,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -31,
-            -31,
-            0,
-            31,
-            -31,
-            0,
-            -31,
-            31,
-            0,
-            31,
-            31,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            62,
-            62,
-            62,
-            0,
-            0,
-            62,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -31,
-            -31,
-            0
-          ],
-          "maxPos": [
-            31,
-            31,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "5a1adc0b-057a-4c1f-9361-138325e51bb1@6c48a",
-        "atlasUuid": "",
-        "trimType": "auto"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "fixAlphaTransparencyArtifacts": false,
-    "hasAlpha": true,
-    "redirect": "5a1adc0b-057a-4c1f-9361-138325e51bb1@6c48a"
-  }
-}
diff --git a/assets/res/gemstone/texture/矩形 798 拷贝.png b/assets/res/gemstone/texture/矩形 798 拷贝.png
deleted file mode 100644
index 1ab297b..0000000
Binary files a/assets/res/gemstone/texture/矩形 798 拷贝.png and /dev/null differ
diff --git a/assets/res/gemstone/texture/矩形 798 拷贝.png.meta b/assets/res/gemstone/texture/矩形 798 拷贝.png.meta
deleted file mode 100644
index d05d56b..0000000
--- a/assets/res/gemstone/texture/矩形 798 拷贝.png.meta	
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "8d14085d-8f15-4d38-8419-7cb5f82614fb",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "8d14085d-8f15-4d38-8419-7cb5f82614fb@6c48a",
-      "displayName": "矩形 798 拷贝",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "8d14085d-8f15-4d38-8419-7cb5f82614fb",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "8d14085d-8f15-4d38-8419-7cb5f82614fb@f9941",
-      "displayName": "矩形 798 拷贝",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 63,
-        "height": 62,
-        "rawWidth": 63,
-        "rawHeight": 62,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -31.5,
-            -31,
-            0,
-            31.5,
-            -31,
-            0,
-            -31.5,
-            31,
-            0,
-            31.5,
-            31,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            62,
-            63,
-            62,
-            0,
-            0,
-            63,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -31.5,
-            -31,
-            0
-          ],
-          "maxPos": [
-            31.5,
-            31,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "8d14085d-8f15-4d38-8419-7cb5f82614fb@6c48a",
-        "atlasUuid": "",
-        "trimType": "auto"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "fixAlphaTransparencyArtifacts": false,
-    "hasAlpha": true,
-    "redirect": "8d14085d-8f15-4d38-8419-7cb5f82614fb@6c48a"
-  }
-}
diff --git a/assets/script/battle/combat/GemBattleEffect.ts b/assets/script/battle/combat/GemBattleEffect.ts
new file mode 100644
index 0000000..c54b8a8
--- /dev/null
+++ b/assets/script/battle/combat/GemBattleEffect.ts
@@ -0,0 +1,160 @@
+import type { BattleSession } from 'db://assets/mx/module/battle';
+import type { EntityId } from 'db://assets/mx/module/ecs';
+import { AttrId, AttributeComp } from 'db://assets/mx/module/battle/ecs/Components';
+import type { Player } from '../../game/Player';
+import { TableNames } from '../../game/ConfigTableData';
+import { parseEntryBaseAttr } from '../skill/SkillEntryParse';
+
+const LOG = '[GemBattle]';
+/** modifier.source 前缀，刷新时整批清除 */
+const SOURCE_PREFIX = 'gem_';
+
+/** 五行镶嵌解析结果（局内用） */
+export interface IGemBattleResolve {
+    /** 提供技能的宝石 id（0=无） */
+    skillGemId: number;
+    /** Skill.id（0=无） */
+    skillId: number;
+    /** 各槽属性条目（含来源槽，便于 source 去重） */
+    attrs: IGemBattleAttr[];
+}
+
+/** 单条宝石属性 */
+export interface IGemBattleAttr {
+    /** Weapon.attritubes 类型 1~5 */
+    type: number;
+    /** 万分比值 */
+    value: number;
+    /** 宝石 id */
+    gemId: number;
+    /** 槽位 0~3 */
+    slot: number;
+}
+
+/**
+ * 局内宝石生效：读镶嵌 → 属性 modifier → 技能宝石 id。
+ * 仅本机玩家；AI 返回空。
+ */
+export class GemBattleEffect {
+    /**
+     * 解析某五行已镶嵌宝石。
+     * @param element Hero.herotype / 镶嵌 element（1~5）
+     * @param player 部署所属玩家
+     */
+    static resolve(element: number, player: Player | null | undefined): IGemBattleResolve {
+        const empty: IGemBattleResolve = { skillGemId: 0, skillId: 0, attrs: [] };
+        if (!player || !player.isLocal) return empty;
+        const e = Math.floor(Number(element) || 0);
+        if (e < 1 || e > 5) return empty;
+
+        let slots: number[];
+        try {
+            slots = gg.gem.getElementSlots(e);
+        } catch (err) {
+            console.warn(LOG, 'getElementSlots 失败', e, err);
+            return empty;
+        }
+
+        const attrs: IGemBattleAttr[] = [];
+        let skillGemId = 0;
+        let skillId = 0;
+        let skillQuality = -1;
+
+        for (let slot = 0; slot < slots.length; slot++) {
+            const gemId = Math.floor(Number(slots[slot]) || 0);
+            if (gemId <= 0) continue;
+            const row = gg.data.table.getTableData<ITableWeapon>(TableNames.Weapon, gemId);
+            if (!row) {
+                console.warn(LOG, '宝石配表缺失', gemId, 'element', e, 'slot', slot);
+                continue;
+            }
+            const parsed = parseEntryBaseAttr(String(row.attritubes ?? ''));
+            for (let i = 0; i < parsed.length; i++) {
+                const p = parsed[i];
+                if (p.type < 1 || p.type > 5) {
+                    console.warn(LOG, 'attritubes 类型非法', gemId, p.type, row.attritubes);
+                    continue;
+                }
+                if (!(p.value > 0)) {
+                    console.warn(LOG, 'attritubes 参数非法', gemId, row.attritubes);
+                    continue;
+                }
+                attrs.push({ type: p.type, value: p.value, gemId, slot });
+            }
+            const sid = Math.floor(Number(row.act_skill) || 0);
+            if (sid <= 0) continue;
+            const q = Math.floor(Number(row.quality) || 0);
+            if (skillId > 0) {
+                console.warn(LOG, '同五行多颗技能宝石，取品质更高者', e, 'prev', skillGemId, 'next', gemId);
+            }
+            if (skillId <= 0 || q > skillQuality || (q === skillQuality && gemId > skillGemId)) {
+                skillGemId = gemId;
+                skillId = sid;
+                skillQuality = q;
+            }
+        }
+        return { skillGemId, skillId, attrs };
+    }
+
+    /**
+     * 清除实体上全部宝石属性 modifier。
+     * @param session 战斗会话
+     * @param entityId 塔实体
+     */
+    static clear(session: BattleSession, entityId: EntityId): void {
+        const attr = session.world.getComponent(entityId, AttributeComp);
+        if (!attr) return;
+        attr.modifiers = attr.modifiers.filter(m => !String(m.source ?? '').startsWith(SOURCE_PREFIX));
+    }
+
+    /**
+     * 将解析结果写入属性（先 clear 再挂）。
+     * @param session 战斗会话
+     * @param entityId 塔实体
+     * @param resolved 镶嵌解析
+     */
+    static apply(session: BattleSession, entityId: EntityId, resolved: IGemBattleResolve): void {
+        this.clear(session, entityId);
+        if (!resolved.attrs.length) return;
+        if (!session.world.isAlive(entityId)) return;
+        if (!session.world.getComponent(entityId, AttributeComp)) {
+            session.world.addComponent(entityId, new AttributeComp());
+        }
+        const attrSvc = session.attributes;
+        for (let i = 0; i < resolved.attrs.length; i++) {
+            const a = resolved.attrs[i];
+            const source = `${SOURCE_PREFIX}${a.gemId}_s${a.slot}_${i}`;
+            const wan = a.value;
+            switch (a.type) {
+                case 1:
+                    attrSvc.addModifier(entityId, {
+                        attr: AttrId.Attack, op: 'Mul', value: 1 + wan / 10000, source,
+                    });
+                    break;
+                case 2:
+                    attrSvc.addModifier(entityId, {
+                        attr: AttrId.CritRate, op: 'Add', value: wan / 10000, source,
+                    });
+                    break;
+                case 3:
+                    attrSvc.addModifier(entityId, {
+                        attr: AttrId.CritDamage, op: 'Add', value: wan / 10000, source,
+                    });
+                    break;
+                case 4:
+                    attrSvc.addModifier(entityId, {
+                        attr: 'aspd_add', op: 'Add', value: wan, source,
+                    });
+                    break;
+                case 5:
+                    attrSvc.addModifier(entityId, {
+                        attr: 'dmg_mul', op: 'Add', value: wan / 10000, source,
+                    });
+                    break;
+                default:
+                    console.warn(LOG, '未处理属性类型', a.type, a.gemId);
+                    break;
+            }
+        }
+    }
+}
diff --git a/assets/script/battle/combat/GemBattleEffect.ts.meta b/assets/script/battle/combat/GemBattleEffect.ts.meta
new file mode 100644
index 0000000..d3c9a72
--- /dev/null
+++ b/assets/script/battle/combat/GemBattleEffect.ts.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.24",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "e16eb3f3-e692-45bb-98db-a0bdf813113f",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/assets/script/battle/combat/TowerLoadoutService.ts b/assets/script/battle/combat/TowerLoadoutService.ts
index f746274..a2264ef 100644
--- a/assets/script/battle/combat/TowerLoadoutService.ts
+++ b/assets/script/battle/combat/TowerLoadoutService.ts
@@ -25,6 +25,7 @@ import { isAtkDebugWeapon } from '../debug/AtkDebugConstants';
 import { getPassiveSkillHost } from './PassiveSkillRuntime';
 import { SkillAtkBuffExecutor } from './SkillAtkBuffExecutor';
 import { TableAnomaly } from '../../game/TableAnomaly';
+import { GemBattleEffect } from './GemBattleEffect';
 
 /** AI 侧武将武器解析（由 AiBattleBridge start/stop 注册，避免循环 require） */
 let _aiHeroWeaponResolver: ((heroId: number) => number | null) | null = null;
@@ -37,10 +38,18 @@ export function setAiHeroWeaponResolver(resolver: ((heroId: number) => number |
     _aiHeroWeaponResolver = resolver;
 }
 
-/** 解析英雄当前战斗武器 id（本机走装备；AI 走匹配档案掷骰）。五行数字只用 herotype 预制体，不查 Weapon 表。 */
+/**
+ * 解析英雄当前战斗武器/技能宝石 id。
+ * 五行数字：本机读镶嵌技能宝石；非五行：本机装备 / AI 掷骰。
+ */
 export function resolveHeroBattleWeaponId(heroId: number, player?: Player | null): number {
     const hero = gg.data.table.getTableData<ITableHero>(TableNames.Hero, heroId);
-    if (isElementHero(hero)) return 0;
+    if (isElementHero(hero)) {
+        if (player?.isLocal) {
+            return GemBattleEffect.resolve(Math.floor(Number(hero!.herotype)), player).skillGemId;
+        }
+        return 0;
+    }
     if (player && !player.isLocal) {
         if (_aiHeroWeaponResolver) {
             const aiId = _aiHeroWeaponResolver(heroId);
@@ -68,11 +77,19 @@ export class TowerLoadoutService {
     initEntity(entityId: EntityId, heroId: number, level: number, player: Player): void {
         const hero = gg.data.table.getTableData<ITableHero>(TableNames.Hero, heroId);
         if (!hero) return;
-        const weaponId = resolveHeroBattleWeaponId(heroId, player);
-        const weaponRow = weaponId > 0
-            ? gg.data.table.getTableData<ITableWeapon>(TableNames.Weapon, weaponId)
-            : null;
-        const weaponSkillId = Number(weaponRow?.act_skill) || 0;
+        let weaponId = 0;
+        let weaponSkillId = 0;
+        if (isElementHero(hero)) {
+            const gem = GemBattleEffect.resolve(Math.floor(Number(hero.herotype)), player);
+            weaponId = gem.skillGemId;
+            weaponSkillId = gem.skillId;
+        } else {
+            weaponId = resolveHeroBattleWeaponId(heroId, player);
+            const weaponRow = weaponId > 0
+                ? gg.data.table.getTableData<ITableWeapon>(TableNames.Weapon, weaponId)
+                : null;
+            weaponSkillId = Number(weaponRow?.act_skill) || 0;
+        }
         let weaponSkillActive = false;
         if (weaponSkillId > 0) {
             const sk = gg.data.table.getTableData<ITableSkill>(TableNames.Skill, weaponSkillId);
@@ -406,6 +423,12 @@ export class TowerLoadoutService {
 
         this.initEntity(entityId, weapon1Id, lv, player);
         const loadout = this.getLoadout(entityId)!;
+        if (isElementHero(hero)) {
+            const gem = GemBattleEffect.resolve(Math.floor(Number(hero.herotype)), player);
+            GemBattleEffect.apply(session, entityId, gem);
+        } else {
+            GemBattleEffect.clear(session, entityId);
+        }
         this.applyAbilities(session, entityId, loadout);
 
         if (!isRefresh && loadout.weaponSkillId > 0 && !loadout.weaponSkillActive) {
diff --git a/assets/script/battle/combat/TowerQueryTypes.ts b/assets/script/battle/combat/TowerQueryTypes.ts
index 777dd77..3fac390 100644
--- a/assets/script/battle/combat/TowerQueryTypes.ts
+++ b/assets/script/battle/combat/TowerQueryTypes.ts
@@ -8,7 +8,7 @@ export interface TowerLoadout {
     weapon1Id: number;
     /** 合成等级 */
     level: number;
-    /** 当前装备武器 id（穿戴或 startweapon） */
+    /** 武器/技能宝石 id（名将：穿戴或 startweapon；五行：镶嵌技能宝石） */
     weaponId: number;
     /** 普攻 Skill.id */
     normalBaseAtkId: number;
diff --git a/assets/script/battle/combat/TowerStatResolver.ts b/assets/script/battle/combat/TowerStatResolver.ts
index 87c3483..ff679f0 100644
--- a/assets/script/battle/combat/TowerStatResolver.ts
+++ b/assets/script/battle/combat/TowerStatResolver.ts
@@ -180,6 +180,8 @@ export function deriveTowerSetupStats(w1: ITableHero, composeLevel: number, batt
  */
 function resolveSetupWeaponId(w1: ITableHero, battleWeaponId?: number): number {
     if (typeof battleWeaponId === 'number' && battleWeaponId > 0) return battleWeaponId;
+    // 五行数字：技能宝石由调用方传入；无则 0，禁止回落到名将装备
+    if (isElementHero(w1)) return 0;
     const wornId = gg.equip.getHeroEquipId(w1.id);
     if (wornId > 0) return wornId;
     return Number(w1.startweapon) || 0;
diff --git a/assets/script/battle/view/CocosBagBoardView.ts b/assets/script/battle/view/CocosBagBoardView.ts
index 8f0481c..7d058ab 100644
--- a/assets/script/battle/view/CocosBagBoardView.ts
+++ b/assets/script/battle/view/CocosBagBoardView.ts
@@ -6273,10 +6273,10 @@ if (weapon2Id === GRID_WEAPON2_ID) return true;
         this._textInteractDedupKey = dedupKey;
 
         const data = this._resolveTextGridData(grid);
-        const isSingleType = data.tileType === Weapon2TileType.Single;
         const isPeachTree = grid.isPeachTreeTile();
-        const opensDesc1 = isSingleType || isPeachTree;
-        const hasHeroDesc = !!(data.tower && data.weapon1Id > 0 && !isSingleType && !isPeachTree);
+        // 五行数字与旧 Single=1 编号重叠，数字格子一律 Hero，勿再开 Desc1
+        const opensDesc1 = isPeachTree;
+        const hasHeroDesc = !isPeachTree && !!(data.tower && data.weapon1Id > 0);
         const canRange = this._canShowType1Range(grid);
 
         if (
@@ -6483,7 +6483,6 @@ if (weapon2Id === GRID_WEAPON2_ID) return true;
     private _gridCanShowWeaponDesc(grid: TextGrid): boolean {
         const data = this._resolveTextGridData(grid);
         if (grid.isPeachTreeTile()) return !!data.tile;
-        if (data.tileType === Weapon2TileType.Single) return !!data.tile;
         return !!(data.tower && data.weapon1Id > 0);
     }
 
diff --git a/assets/script/com/GemGrid.ts b/assets/script/com/GemGrid.ts
index 8a6c958..6a1335e 100644
--- a/assets/script/com/GemGrid.ts
+++ b/assets/script/com/GemGrid.ts
@@ -1,17 +1,22 @@
-import { _decorator, Component, Label, Node, Sprite } from 'cc';
+import { _decorator, Component, EventTouch, Label, Node, Sprite, Vec2 } from 'cc';
 import { SpriteLoad } from 'db://assets/mx/components/SpriteLoad';
-import { GBundle } from '../game/ConfigRes';
+import { GBundle, UIID } from '../game/ConfigRes';
 const { ccclass } = _decorator;
 
 const LOG = '[GemGrid]';
+/** 超过此位移视为拖拽，不弹信息 */
+const TAP_THRESHOLD = 18;
 
 /**
  * 宝石格子：仓库 / 获得弹窗共用。
- * bg=宝石框小{quality}；icon=Weapon.icon；lbNum=数量。
+ * bg=宝石框大{quality}；icon=Weapon.icon；lbNum=数量。
+ * 轻点打开 PopGemInfo（拖拽不触发）。
  */
 @ccclass('GemGrid')
 export class GemGrid extends Component {
 
+    /** 是否响应轻点打开信息 */
+    canClick = true;
     /** 品质框 */
     bg: Node = null!;
     /** 宝石图标 */
@@ -21,10 +26,36 @@ export class GemGrid extends Component {
     /** 当前宝石配表 */
     data: ITableWeapon | null = null;
 
+    private _pressing = false;
+    private _pressStart = new Vec2();
+
     protected onLoad(): void {
         this._bindNodes();
     }
 
+    protected onEnable(): void {
+        this.node.on(Node.EventType.TOUCH_START, this._onTouchStart, this);
+        this.node.on(Node.EventType.TOUCH_END, this._onTouchEnd, this);
+        this.node.on(Node.EventType.TOUCH_CANCEL, this._onTouchCancel, this);
+    }
+
+    protected onDisable(): void {
+        this.node.off(Node.EventType.TOUCH_START, this._onTouchStart, this);
+        this.node.off(Node.EventType.TOUCH_END, this._onTouchEnd, this);
+        this.node.off(Node.EventType.TOUCH_CANCEL, this._onTouchCancel, this);
+        this._pressing = false;
+    }
+
+    /**
+     * 打开宝石信息弹窗。
+     * @param gemId Weapon.id
+     */
+    static openInfo(gemId: number): void {
+        const id = Math.floor(Number(gemId) || 0);
+        if (id <= 0) return;
+        void gg.ui.openPanel(UIID.PopGemInfo, { data: id });
+    }
+
     /**
      * 绑定展示数据。
      * @param data Weapon 行；null 表示空
@@ -34,12 +65,18 @@ export class GemGrid extends Component {
         this._bindNodes();
         this.data = data;
         const quality = data ? Math.floor(Number(data.quality) || 0) : 0;
-        if (quality < 0 || quality > 5) console.warn(LOG, '品质越界', data?.id, quality);
-        this._setSprite(this.bg, `weapon/宝石框小${Math.max(0, Math.min(5, quality))}`);
-        const iconName = data ? String(data.icon || '').trim() : '';
-        if (data && !iconName) console.warn(LOG, 'icon 缺失', data.id);
-        this._setSprite(this.icon, iconName ? `weapon/${iconName}` : '');
-        if (this.icon?.isValid) this.icon.active = !!iconName;
+        if (!data) {
+            this._setSprite(this.bg, '', false);
+            this._setSprite(this.icon, '', true);
+            if (this.icon?.isValid) this.icon.active = false;
+        } else {
+            if (quality < 1 || quality > 5) console.warn(LOG, '品质无对应宝石框大', data.id, quality);
+            this._setSprite(this.bg, `weapon/宝石框大${quality}`, false);
+            const iconName = String(data.icon || '').trim();
+            if (!iconName) console.warn(LOG, 'icon 缺失', data.id);
+            this._setSprite(this.icon, iconName ? `weapon/${iconName}` : '', true);
+            if (this.icon?.isValid) this.icon.active = !!iconName;
+        }
         if (this.lbNum?.isValid) {
             const showNum = count >= 0;
             this.lbNum.node.active = showNum;
@@ -47,6 +84,29 @@ export class GemGrid extends Component {
         }
     }
 
+    /** 按下 */
+    private _onTouchStart(e: EventTouch): void {
+        this._pressing = true;
+        this._pressStart.set(e.getUILocation());
+    }
+
+    /** 抬起：位移未超阈值则打开信息 */
+    private _onTouchEnd(e: EventTouch): void {
+        if (!this._pressing) return;
+        this._pressing = false;
+        if (!this.canClick || !this.data) return;
+        const loc = e.getUILocation();
+        const dx = loc.x - this._pressStart.x;
+        const dy = loc.y - this._pressStart.y;
+        if (dx * dx + dy * dy >= TAP_THRESHOLD * TAP_THRESHOLD) return;
+        GemGrid.openInfo(Number(this.data.id) || 0);
+    }
+
+    /** 取消按下 */
+    private _onTouchCancel(): void {
+        this._pressing = false;
+    }
+
     /** 绑定子节点 */
     private _bindNodes(): void {
         if (!this.bg?.isValid) this.bg = this.node.getChildByName('bg')!;
@@ -55,18 +115,31 @@ export class GemGrid extends Component {
             const n = this.node.getChildByName('lbNum');
             this.lbNum = n?.getComponent(Label) ?? null!;
         }
+        if (!this.bg) console.warn(LOG, 'bg 节点缺失', this.node?.name);
     }
 
-    /** icons/weapon 下图 */
-    private _setSprite(node: Node | null, path: string): void {
+    /**
+     * icons/weapon 下图。
+     * @param nativeSize true=按贴图原始尺寸（不拉伸）；false=铺满节点 UITransform
+     */
+    private _setSprite(node: Node | null, path: string, nativeSize: boolean): void {
         if (!node?.isValid) return;
         if (!path) {
+            node.active = false;
             node.getComponent(SpriteLoad)?.clear();
             const sp = node.getComponent(Sprite);
             if (sp) sp.spriteFrame = null;
             return;
         }
+        node.active = true;
         if (!node.getComponent(Sprite)) node.addComponent(Sprite);
-        node.getOrAddComponent(SpriteLoad).setSprite(path, GBundle.Items);
+        const sp = node.getComponent(Sprite)!;
+        sp.type = Sprite.Type.SIMPLE;
+        // icon 用 TRIMMED 跟贴图尺寸，避免 CUSTOM 拉伸变形
+        sp.sizeMode = nativeSize ? Sprite.SizeMode.TRIMMED : Sprite.SizeMode.CUSTOM;
+        node.getOrAddComponent(SpriteLoad).setSprite(path, GBundle.Items, () => {
+            if (!node.isValid || !sp.isValid) return;
+            sp.sizeMode = nativeSize ? Sprite.SizeMode.TRIMMED : Sprite.SizeMode.CUSTOM;
+        });
     }
 }
diff --git a/assets/script/game/ConfigRes.ts b/assets/script/game/ConfigRes.ts
index a0ed4a0..d803c64 100644
--- a/assets/script/game/ConfigRes.ts
+++ b/assets/script/game/ConfigRes.ts
@@ -334,6 +334,8 @@ export enum UIID {
     PanelGemstone = 691,
     /** 获得新宝石弹窗 */
     PopGetGem = 692,
+    /** 宝石信息弹窗 */
+    PopGemInfo = 693,
 }
 
 
@@ -407,6 +409,8 @@ export const UIConfigs: { [key: number]: IUIConfig } = {
     [UIID.PanelGemstone]: { desc: "宝石仓库页面", layer: UILayer.Page, bundle: GBundle.Gemstone, path: GPath.UIPrefab, name: "PanelGemstone" },
     /**获得新宝石弹窗 */
     [UIID.PopGetGem]: { desc: "获得新宝石", layer: UILayer.Pop, bundle: GBundle.PopCommon, path: GPath.popPrefab('popGetGem'), name: "PopGetGem", popAnim: POP_ANIM.standard },
+    /**宝石信息弹窗 */
+    [UIID.PopGemInfo]: { desc: "宝石信息", layer: UILayer.Pop, bundle: GBundle.PopCommon, path: GPath.popPrefab('popGemInfo'), name: "PopGemInfo", popAnim: POP_ANIM.standard },
 }
 
 /** @deprecated 请从 db://assets/mx/module/res/ResPkgName 导入 */
diff --git a/assets/script/game/GM.ts b/assets/script/game/GM.ts
index a46d875..af76ffc 100644
--- a/assets/script/game/GM.ts
+++ b/assets/script/game/GM.ts
@@ -246,6 +246,7 @@ export class GM extends Component {
         '今日首次登录（每日重置）',
         '复制存档',
         '一键获取所有武器',
+        '一键添加所有宝石',
         '设置武器等级',
         '设置武器和技能',
         '清除指定背包文字',
@@ -349,6 +350,15 @@ export class GM extends Component {
                 })();
                 break;
             }
+            case '一键添加所有宝石': {
+                void (async () => {
+                    const added = await gg.gem.gmGrantAllGems();
+                    gg.data.saveToServer();
+                    gg.ui.showToast(added > 0 ? `已再发宝石 ${added} 种` : 'Weapon 表无宝石');
+                    GM.show();
+                })();
+                break;
+            }
             case '设置武器和技能':
                 gg.ui.openPanel(UIID.PopGM, { data: 2 });
                 GM.show();
@@ -753,6 +763,7 @@ export class GM extends Component {
 · 今日首次登录：触发每日重置逻辑
 · 复制存档：复制当前 doc JSON 到剪贴板
 · 一键获取所有武器：Weapon 全表成品各发 1 把（含 isshow=1 与新增；新武器保留弹窗/角标）
+· 一键添加所有宝石：Weapon 全表每颗再发 1 颗（每次点击叠加一套）
 · 设置武器等级 / 设置武器和技能：打开 PopGM 面板
 · 清除指定背包文字：恢复随机
 · 快速胜利 / 关闭快速胜利：调试通关
diff --git a/assets/script/manager/GemDataManager.ts b/assets/script/manager/GemDataManager.ts
index 9f4846f..717127b 100644
--- a/assets/script/manager/GemDataManager.ts
+++ b/assets/script/manager/GemDataManager.ts
@@ -198,6 +198,21 @@ export class GemDataManager extends Singleton {
         return true;
     }
 
+    /** 是否有可用宝石达到合成门槛（free ≥ synthesisnumber 且有目标） */
+    canFuseAny(): boolean {
+        const all = this.getAllGemList();
+        for (let i = 0; i < all.length; i++) {
+            const conf = all[i];
+            const fromId = Math.floor(Number(conf?.id) || 0);
+            if (fromId <= 0) continue;
+            const need = Math.floor(Number(conf.synthesisnumber) || 0);
+            const targets = conf.synthesisitem ?? [];
+            if (need <= 0 || !targets.length) continue;
+            if (this.getFreeCount(fromId) >= need) return true;
+        }
+        return false;
+    }
+
     /**
      * 多轮一键合成；返回净增可用数 >0 的宝石。
      */
@@ -248,6 +263,28 @@ export class GemDataManager extends Singleton {
         return list;
     }
 
+    /**
+     * GM：Weapon 全表每颗宝石再发 1 颗（Item 库存）。每次点击叠加一套。
+     * @returns 本次发放的宝石种数
+     */
+    async gmGrantAllGems(): Promise<number> {
+        await this.ensureTable();
+        const list = this.getAllGemList();
+        if (!list.length) {
+            console.warn(LOG, 'GM 一键发宝石：Weapon 表为空或未加载');
+            return 0;
+        }
+        let added = 0;
+        for (let i = 0; i < list.length; i++) {
+            const id = Math.floor(Number(list[i]?.id) || 0);
+            const itemId = Math.floor(Number(list[i]?.itemid) || 0);
+            if (id <= 0 || itemId <= 0) continue;
+            gg.data.addItemNum(itemId, 1);
+            added++;
+        }
+        return added;
+    }
+
     /** 类型 + 专属上限（slot 上原宝石不计入专属占用） */
     private _canWearType(element: number, conf: ITableWeapon, slot: number): boolean {
         const t = Math.floor(Number(conf.type) || 0);
diff --git a/assets/script/ui/BattleWeaponDescHero/Auto_BattleWeaponDescHero.ts b/assets/script/ui/BattleWeaponDescHero/Auto_BattleWeaponDescHero.ts
index da03e96..d154ee5 100644
--- a/assets/script/ui/BattleWeaponDescHero/Auto_BattleWeaponDescHero.ts
+++ b/assets/script/ui/BattleWeaponDescHero/Auto_BattleWeaponDescHero.ts
@@ -32,15 +32,7 @@ export class Auto_BattleWeaponDescHero extends UIBase {
   lb_attckSpeed:Label;
   lb_skillName:Label;
   lb_skillDesc:Label;
-  lb_weaponAtk:Label;
-  lb_weaponName:Label;
-  lb_weaponDesc:Label;
-  ui_progress:Node;
-  lb_progress:Label;
-  ui_type1:Node;
-  ui_type3:Node;
-  ui_type2:Node;
-  ui_type4:Node;
+  ui_gemList:Node;
   onLoad(){
     super.onLoad();
     this.ui_bgMask = find("ui_bgMask",this.node);
@@ -52,15 +44,7 @@ export class Auto_BattleWeaponDescHero extends UIBase {
     this.lb_attckSpeed = find("弹窗主体/lb_attckSpeed",this.node)?.getComponent(Label);
     this.lb_skillName = find("弹窗主体/lb_skillName",this.node)?.getComponent(Label);
     this.lb_skillDesc = find("弹窗主体/lb_skillDesc",this.node)?.getComponent(Label);
-    this.lb_weaponAtk = find("弹窗主体/lb_weaponAtk",this.node)?.getComponent(Label);
-    this.lb_weaponName = find("弹窗主体/lb_weaponName",this.node)?.getComponent(Label);
-    this.lb_weaponDesc = find("弹窗主体/lb_weaponDesc",this.node)?.getComponent(Label);
-    this.ui_progress = find("弹窗主体/ui_progress",this.node);
-    this.lb_progress = find("弹窗主体/lb_progress",this.node)?.getComponent(Label);
-    this.ui_type1 = find("弹窗主体/ui_type1",this.node);
-    this.ui_type3 = find("弹窗主体/ui_type3",this.node);
-    this.ui_type2 = find("弹窗主体/ui_type2",this.node);
-    this.ui_type4 = find("弹窗主体/ui_type4",this.node);
+    this.ui_gemList = find("弹窗主体/ui_gemList",this.node);
   }
   onEnable() {
   }
diff --git a/assets/script/ui/BattleWeaponDescHero/UIBattleWeaponDescHero.ts b/assets/script/ui/BattleWeaponDescHero/UIBattleWeaponDescHero.ts
index a90a023..19197c3 100644
--- a/assets/script/ui/BattleWeaponDescHero/UIBattleWeaponDescHero.ts
+++ b/assets/script/ui/BattleWeaponDescHero/UIBattleWeaponDescHero.ts
@@ -2,26 +2,26 @@
 //*********************
 // create by 流云
 // time: Sat Sep 05 2026
-// desc: 战斗内点击组合字武将 — 详情弹窗
+// desc: 战斗内点击五行数字 — 详情弹窗（数字皮 / 普攻技能 / 镶嵌宝石）
 //*********************
 import {
     _decorator,
-    Color,
     EventTouch,
     instantiate,
     Label,
+    Layout,
     Node,
-    Prefab,
-    sp,
     Sprite,
     Tween,
     UITransform,
     UIOpacity,
     UIRenderer,
     Vec3,
+    sp,
 } from 'cc';
 import { type IPopAnimConfig, type IPopAnimSession } from '../../../mx/module/ui/popAnim';
 import { ensureSpineSkeletonDataRuntime } from 'db://assets/mx/module/lang/spineRuntimePatch';
+import { SpriteLoad } from 'db://assets/mx/components/SpriteLoad';
 import { BATTLE_EVENT_ALL, BattleEventType, type BattleEvent } from 'db://assets/mx/module/battle';
 import type { EntityId } from 'db://assets/mx/module/ecs';
 import { GEvent } from '../../../mx/module/event/GEvent';
@@ -29,59 +29,37 @@ import { Auto_BattleWeaponDescHero } from './Auto_BattleWeaponDescHero';
 import type { TileEntitySnapshot, TowerRuntimeSnapshot } from '../../battle/combat/TowerQueryTypes';
 import { TowerQueryService } from '../../battle/combat/TowerQueryService';
 import { deriveTowerSetupStats, TowerStatDisplay } from '../../battle/combat/TowerStatResolver';
-import { getTowerExpHost, needTowerExpForLevel } from '../../battle/combat/TowerExpHost';
-import { resolveHeroBattleWeaponId } from '../../battle/combat/TowerLoadoutService';
-import { HeroSkin } from '../../battle/view/HeroSkin';
-import { Skill } from '../../battle/skill/Skill';
-import { heroUltSkillId } from '../../battle/config/BattleHeroTable';
-import { applyWeaponSpineSkin } from '../../battle/view/GlyphSpineSkin';
-import { BattleSpinePlayback } from '../../battle/presentation/BattleSpinePlayback';
-import { GBundle, GPath } from '../../game/ConfigRes';
+import { heroNormalSkillId, isElementHero } from '../../battle/config/BattleHeroTable';
+import { BATTLE_HERO_NUM_PATH } from '../../battle/res/BattleHeroResCollector';
+import { glyphSpineHasSkin } from '../../battle/view/GlyphSpineSkin';
+import { GBundle } from '../../game/ConfigRes';
 import { TableNames } from '../../game/ConfigTableData';
-import type { Player } from '../../game/Player';
 const { ccclass } = _decorator;
 
 const LOG = '[UIBattleWeaponDescHero]';
-/** 品质 → 武器名字体色 */
-const WEAPON_NAME_FONT_HEX: Record<number, string> = {
-    0: '#D8D8D8',
-    1: '#6FA86F',
-    2: '#6FA2A8',
-    3: '#B390D9',
-    4: '#F9C948',
-};
-/** 品质 → 武器名描边色 */
-const WEAPON_NAME_OUTLINE_HEX: Record<number, string> = {
-    0: '#4A4A4A',
-    1: '#386c42',
-    2: '#285c6d',
-    3: '#623073',
-    4: '#734930',
-};
-
-/** 组合武将详情弹窗入参 */
+/** 空镶嵌提示文案（与预制体 gtemplate/lb 默认一致） */
+const GEM_EMPTY_TIP = '尚未镶嵌宝石';
+const NUM_IDLE = '待机';
+
+/** 五行数字详情弹窗入参 */
 export interface BattleWeaponDescHeroPanelData {
     entity: TileEntitySnapshot;
     runtime?: TowerRuntimeSnapshot | null;
-    /** 敌方阵营皮肤（组合字 皮肤字2_*） */
+    /** 敌方阵营（敌方不读本机镶嵌） */
     enemyCamp?: boolean;
-    /** 已解析的展示武器 id（敌方优先 AI 档案） */
+    /** 已解析的展示武器/技能宝石 id（兼容旧入参） */
     weaponId?: number;
     weaponWorldPos?: { x: number; y: number; z?: number };
     gridStep?: number;
     trySwitchAtUiPos?: (uiPos: { x: number; y: number }) => boolean;
-    /** 监视中的地图/背包格（切换选中格时随 prema 更新） */
+    /** 监视中的地图/背包格 */
     watchTarget?: { kind: 'map' | 'bag'; index: number } | null;
-    /** 已部署 ECS 实体（地图格实时刷新 fallback） */
+    /** 已部署 ECS 实体 */
     watchEntityId?: EntityId;
-    /** 从棋盘重新读取 entity/runtime（击杀加经验后刷新数值） */
+    /** 从棋盘重新读取 entity/runtime */
     resolveLiveData?: () => Pick<BattleWeaponDescHeroPanelData, 'entity' | 'runtime' | 'weaponId'> | null;
 }
 
-/** 经验条满宽（像素） */
-const PROGRESS_MAX_WIDTH = 225;
-const WEAPON_SPINE_IDLE = '待机';
-
 @ccclass('UIBattleWeaponDescHero')
 export class UIBattleWeaponDescHero extends Auto_BattleWeaponDescHero {
     private static readonly PANEL_GAP_GRIDS = 1.7;
@@ -89,11 +67,13 @@ export class UIBattleWeaponDescHero extends Auto_BattleWeaponDescHero {
     private _popupBody: Node | null = null;
     /** 递增时取消尚未完成的关窗销毁 */
     private _panelLifeGen = 0;
-    /** ui_node 下挂的武将展示节点 */
-    private _heroNode: Node | null = null;
-    /** 当前面板已解析的展示武器（defer 复用，避免二次解析失败把 ui_type 隐藏） */
-    private _displayWeaponRow: ITableWeapon | null = null;
-    /** 静态区（武将/技能/武器名等）缓存键；切换仅刷新数值区时不重建 */
+    /** ui_node 下挂的数字预制体节点 */
+    private _numNode: Node | null = null;
+    /** 宝石列表模板 */
+    private _gemTpl: Node | null = null;
+    /** 已克隆的宝石行 */
+    private readonly _gemRows: Node[] = [];
+    /** 静态区缓存键 */
     private _staticViewKey = '';
     /** 战斗事件监听是否已绑定 */
     private _battleEventBound = false;
@@ -103,6 +83,7 @@ export class UIBattleWeaponDescHero extends Auto_BattleWeaponDescHero {
     onLoad(): void {
         super.onLoad();
         this._popupBody = this.node.getChildByName('弹窗主体');
+        this._cacheGemTemplate();
     }
 
     onEnable(): void {
@@ -116,10 +97,10 @@ export class UIBattleWeaponDescHero extends Auto_BattleWeaponDescHero {
             this.ui_bgMask.off(Node.EventType.TOUCH_END, this.click_ui_bgMask, this);
         }
         this._unbindLiveRefresh();
-        this.unschedule(this._deferRefreshWeaponType);
         this.unschedule(this._deferredRefreshDynamic);
         this._staticViewKey = '';
-        this._clearHeroNode();
+        this._clearNumNode();
+        this._clearGemRows();
         super.onDisable();
     }
 
@@ -173,41 +154,40 @@ export class UIBattleWeaponDescHero extends Auto_BattleWeaponDescHero {
         this._panelLifeGen++;
         this._ensurePanelVisible();
         this._bindLiveRefresh();
+        this._cacheGemTemplate();
 
         const ctx = this._resolveRefreshContext();
         if (!ctx) {
             this._staticViewKey = '';
             this._clearLabels();
-            this._clearHeroNode();
-            this._hideWeaponTypes();
+            this._clearNumNode();
+            this._clearGemRows();
             return;
         }
 
-        const { data, w1, level, levelLimit, stats, weaponRow, runtime, enemyCamp } = ctx;
-        const staticViewKey = this._buildStaticViewKey(w1.id, weaponRow?.id ?? 0, enemyCamp);
-        const needStaticRefresh = staticViewKey !== this._staticViewKey || !this._heroNode?.isValid;
+        const { data, w1, level, levelLimit, stats, runtime, enemyCamp } = ctx;
+        const element = Math.floor(Number(w1.herotype) || 0);
+        const staticViewKey = this._buildStaticViewKey(w1.id, level, element, enemyCamp);
+        const needStaticRefresh = staticViewKey !== this._staticViewKey || !this._numNode?.isValid;
 
         if (needStaticRefresh) {
             this._staticViewKey = staticViewKey;
-            this._displayWeaponRow = weaponRow;
-            this._refreshHero(w1, level, enemyCamp);
-            this._refreshStaticLabels(w1, level, levelLimit, weaponRow);
-            this._refreshWeaponType(weaponRow);
-            this._scheduleRefreshWeaponType(weaponRow);
+            this._refreshNumber(w1);
+            this._refreshStaticLabels(w1, level, levelLimit);
+            this._refreshGemList(element, enemyCamp);
         }
 
-        this._refreshDynamicStats(w1, level, levelLimit, stats, weaponRow, runtime);
+        this._refreshDynamicStats(w1, level, stats);
         this._applyPanelPosition(data);
     }
 
-    /** 合并 prema 与 resolveLiveData，得到最新等级/属性 */
+    /** 合并 prema 与 resolveLiveData */
     private _resolveRefreshContext(): {
         data: BattleWeaponDescHeroPanelData;
         w1: ITableHero;
         level: number;
         levelLimit: number;
         stats: TowerRuntimeSnapshot['stats'] | undefined;
-        weaponRow: ITableWeapon | null;
         runtime: TowerRuntimeSnapshot | null;
         enemyCamp: boolean;
     } | null {
@@ -228,6 +208,9 @@ export class UIBattleWeaponDescHero extends Auto_BattleWeaponDescHero {
 
         const w1 = data.entity.tower?.config ?? null;
         if (!w1) return null;
+        if (!isElementHero(w1)) {
+            console.warn(LOG, '非五行数字，详情仅支持五行', w1.id, w1.herotype);
+        }
 
         let runtime = data.runtime ?? null;
         const watchEntityId = data.watchEntityId ?? runtime?.entityId ?? 0;
@@ -245,30 +228,24 @@ export class UIBattleWeaponDescHero extends Auto_BattleWeaponDescHero {
             : null;
         const stats = liveStats ?? runtime?.stats ?? data.entity.tower?.stats;
         const enemyCamp = !!data.enemyCamp;
-        const weaponRow = this._resolveWeaponRow(w1.id, runtime, enemyCamp, data.weaponId ?? 0);
 
-        return { data, w1, level, levelLimit, stats, weaponRow, runtime, enemyCamp };
+        return { data, w1, level, levelLimit, stats, runtime, enemyCamp };
     }
 
-    /** 击杀/升级后仅刷新 lb_level 等数值区 */
+    /** 击杀/升级后仅刷新数值区 */
     private _refreshDynamicFromLive(): void {
         if (!this.node?.isValid || !this.node.active) return;
         const ctx = this._resolveRefreshContext();
         if (!ctx) return;
-        const { w1, level, levelLimit, stats, weaponRow, runtime, enemyCamp } = ctx;
-        const staticViewKey = this._buildStaticViewKey(w1.id, weaponRow?.id ?? 0, enemyCamp);
+        const { w1, level, levelLimit, stats, enemyCamp } = ctx;
+        const element = Math.floor(Number(w1.herotype) || 0);
+        const staticViewKey = this._buildStaticViewKey(w1.id, level, element, enemyCamp);
         if (staticViewKey !== this._staticViewKey) {
             this.onInit();
             return;
         }
-        this._refreshDynamicStats(w1, level, levelLimit, stats, weaponRow, runtime);
-    }
-
-    /** 入场动效结束后再刷一次武器 Spine（避免首帧节点未就绪） */
-    protected onPopOpenRevealEnd(): void {
-        if (this._displayWeaponRow) {
-            this._refreshWeaponType(this._displayWeaponRow);
-        }
+        this._refreshDynamicStats(w1, level, stats);
+        if (this.lb_lvMax) this.lb_lvMax.string = `满级${levelLimit}级`;
     }
 
     destroyPanel(tweenType = 1) {
@@ -303,135 +280,117 @@ export class UIBattleWeaponDescHero extends Auto_BattleWeaponDescHero {
         this.close(2);
     }
 
-    /** ui_node：heroTemplate + HeroSkin 播待机 */
-    private _refreshHero(w1: ITableHero, level: number, enemyCamp = false): void {
+    /** 静态区缓存键 */
+    private _buildStaticViewKey(heroId: number, level: number, element: number, enemyCamp: boolean): string {
+        return `${Math.floor(Number(heroId) || 0)}|${Math.floor(Number(level) || 0)}|${element}|${enemyCamp ? 1 : 0}`;
+    }
+
+    /**
+     * ui_node：按 Hero.number 加载数字预制体，并切五行皮肤。
+     * @param w1 当前数字对应 Hero
+     */
+    private _refreshNumber(w1: ITableHero): void {
         if (!this.ui_node?.isValid) return;
-        this._clearHeroNode();
+        this._clearNumNode();
 
-        const prefab = gg.res.getRes<Prefab>('heroTemplate', GPath.Prefab, GBundle.Heros, Prefab);
-        if (!prefab) {
-            console.log('[UIBattleWeaponDescHero] heroTemplate 预制体缺失', w1.id);
+        const num = Math.floor(Number(w1.number) || 0);
+        if (!(num > 0)) {
+            console.warn(LOG, 'Hero.number 无效', w1.id, w1.number);
+            this.ui_node.active = false;
+            return;
+        }
+        const skinName = this._elementSkinName(Math.floor(Number(w1.herotype) || 0));
+        if (!skinName) {
+            console.warn(LOG, '五行皮肤未定义', w1.id, w1.herotype);
             this.ui_node.active = false;
             return;
         }
 
-        const heroNode = instantiate(prefab);
-        heroNode.parent = this.ui_node;
-        heroNode.setPosition(0, 0, 0);
-        heroNode.setScale(1, 1, 1);
-        this._heroNode = heroNode;
-        this.ui_node.active = true;
-
-        const skill = heroNode.getComponent(Skill);
-        if (skill) skill.enabled = false;
-
-        const heroSkin = heroNode.getComponent(HeroSkin);
-        if (!heroSkin) {
-            console.log('[UIBattleWeaponDescHero] HeroSkin 缺失', w1.id);
+        let node: Node | null = null;
+        try {
+            node = gg.res.getNode(BATTLE_HERO_NUM_PATH, String(num), GBundle.BattleHero);
+        } catch (e) {
+            console.warn(LOG, '数字预制体加载失败', num, String(e));
+            this.ui_node.active = false;
+            return;
+        }
+        if (!node?.isValid) {
+            console.warn(LOG, '数字预制体缺失', num);
+            this.ui_node.active = false;
             return;
         }
-        heroSkin.setQualityFrameVisible(false);
-        heroSkin.setEnemyCamp(enemyCamp);
-        heroSkin.setData(w1);
-        heroSkin.setSkinByLevelAndQuality(level, enemyCamp);
-        heroSkin.playIdleAnim();
-    }
-
-    private _clearHeroNode(): void {
-        if (this._heroNode?.isValid) {
-            const heroSkin = this._heroNode.getComponent(HeroSkin);
-            heroSkin?.releaseDisplay();
-            this._heroNode.destroy();
-        }
-        this._heroNode = null;
-        if (this.ui_node?.isValid) {
-            this.ui_node.removeAllChildren();
-        }
-    }
-
-    /** 可展示的武器配表行（Weapon 表且 type 1~4） */
-    private _tryDisplayWeaponRow(weaponId: number): ITableWeapon | null {
-        const id = Math.floor(Number(weaponId) || 0);
-        if (id <= 0) return null;
-        const row = gg.equip.getEquip(id)
-            ?? gg.data.table.getTableData<ITableWeapon>(TableNames.Weapon, id);
-        if (!row) return null;
-        const type = Number(row.type) | 0;
-        if (type < 1 || type > 4) return null;
-        return row;
-    }
-
-    private _resolveWeaponRow(
-        heroId: number,
-        runtime?: TowerRuntimeSnapshot | null,
-        enemyCamp = false,
-        presetWeaponId = 0,
-    ): ITableWeapon | null {
-        const fromPreset = this._tryDisplayWeaponRow(presetWeaponId);
-        if (fromPreset) return fromPreset;
-
-        const loadout = runtime?.loadout;
-        if (loadout && loadout.weapon1Id === heroId) {
-            const fromRuntime = this._tryDisplayWeaponRow(loadout.weaponId ?? 0);
-            if (fromRuntime) return fromRuntime;
-        }
-
-        const fallbackId = enemyCamp
-            ? resolveHeroBattleWeaponId(heroId, this._resolveEnemyPlayer())
-            : gg.equip.getHeroDisplayWeaponId(heroId);
-        const fromFallback = this._tryDisplayWeaponRow(fallbackId);
-        if (fromFallback) return fromFallback;
-
-        console.log(
-            LOG,
-            enemyCamp ? '敌方武器 id 缺失' : '武器 id 缺失',
-            heroId,
-            'preset=',
-            presetWeaponId,
-            'runtime=',
-            loadout?.weaponId ?? 0,
-            'fallback=',
-            fallbackId,
-        );
-        return null;
-    }
 
-    /** 弹窗入场后再刷一次武器 Spine（使用 onInit 缓存，避免二次解析失败清空 ui_type） */
-    private _deferRefreshWeaponType = (): void => {
-        if (!this.node?.isValid) return;
-        const weaponRow = this._displayWeaponRow;
-        if (!weaponRow) return;
-        this._refreshWeaponType(weaponRow);
-    };
+        node.parent = this.ui_node;
+        node.layer = this.ui_node.layer;
+        node.setPosition(0, 0, 0);
+        node.setScale(1, 1, 1);
+        node.active = true;
+        this._numNode = node;
+        this.ui_node.active = true;
+        this._playElementSkin(node, skinName, w1.id);
+    }
 
-    /** 延后刷新武器 Spine（本帧末 + 下一帧各一次） */
-    private _scheduleRefreshWeaponType(weaponRow: ITableWeapon | null): void {
-        this.unschedule(this._deferRefreshWeaponType);
-        if (!weaponRow) return;
-        this.scheduleOnce(this._deferRefreshWeaponType, 0);
-        this.scheduleOnce(this._deferRefreshWeaponType, 0.05);
+    /** Hero.herotype → 数字 Spine 皮肤名 */
+    private _elementSkinName(herotype: number): string {
+        switch (herotype) {
+            case 1: return '金';
+            case 2: return '木';
+            case 3: return '水';
+            case 4: return '火';
+            case 5: return '土';
+            default: return '';
+        }
     }
 
-    /** 敌方 Player（与 TowerLoadout 解析同源） */
-    private _resolveEnemyPlayer(): Player | null {
-        const battle = gg.game.CurentBattle;
-        if (!battle) return null;
-        const localPid = battle.player?.playerId ?? 0;
-        return battle.getPlayer(localPid === 0 ? 1 : 0) ?? null;
+    /**
+     * 数字节点切五行皮并播待机。
+     * @param node 数字预制体
+     * @param skinName 金木水火土
+     * @param heroId 日志用
+     */
+    private _playElementSkin(node: Node, skinName: string, heroId: number): void {
+        const sk = node.getComponent(sp.Skeleton);
+        if (!sk?.isValid) {
+            console.warn(LOG, '数字节点缺少 Skeleton', node.name, heroId);
+            return;
+        }
+        const sd = sk.skeletonData;
+        if (!sd?.isValid) {
+            sk.enabled = false;
+            console.warn(LOG, '数字节点 skeletonData 无效', node.name, heroId);
+            return;
+        }
+        sk.enabled = true;
+        sk.setAnimationCacheMode(sp.SpineAnimationCacheMode.REALTIME);
+        ensureSpineSkeletonDataRuntime(sd);
+        if (!glyphSpineHasSkin(sk, skinName)) {
+            console.warn(LOG, '数字皮不存在', skinName, node.name, heroId);
+            return;
+        }
+        sk.setSkin(skinName);
+        sk.setSlotsToSetupPose();
+        const runtime = sd.getRuntimeData?.(true);
+        if (runtime?.findAnimation?.(NUM_IDLE)) {
+            sk.setAnimation(0, NUM_IDLE, true);
+        }
     }
 
-    /** 静态区缓存键：同武将+武器+阵营切换时仅刷新数值 */
-    private _buildStaticViewKey(heroId: number, weaponId: number, enemyCamp: boolean): string {
-        return `${Math.floor(Number(heroId) || 0)}|${Math.floor(Number(weaponId) || 0)}|${enemyCamp ? 1 : 0}`;
+    /** 归还数字预制体 */
+    private _clearNumNode(): void {
+        const held = this._numNode;
+        this._numNode = null;
+        if (!held?.isValid) {
+            if (this.ui_node?.isValid) this.ui_node.removeAllChildren();
+            return;
+        }
+        Tween.stopAllByTarget(held);
+        if (held['resKey']) gg.res.putNode(held);
+        else held.destroy();
+        if (this.ui_node?.isValid) this.ui_node.removeAllChildren();
     }
 
-    /** 武将名/满级/技能/武器文案与 Spine（打开或切换武将时刷新） */
-    private _refreshStaticLabels(
-        w1: ITableHero,
-        level: number,
-        levelLimit: number,
-        weaponRow: ITableWeapon | null,
-    ): void {
+    /** 名称 / 满级 / 普攻技能文案 */
+    private _refreshStaticLabels(w1: ITableHero, level: number, levelLimit: number): void {
         if (this.lb_name) {
             this.lb_name.string = gg.lang.get(w1.name);
         }
@@ -439,37 +398,43 @@ export class UIBattleWeaponDescHero extends Auto_BattleWeaponDescHero {
             this.lb_lvMax.string = `满级${levelLimit}级`;
         }
         this._refreshSkillLabels(w1, level);
+    }
 
-        if (!weaponRow) {
-            if (this.lb_weaponName) {
-                this.lb_weaponName.string = '';
-                this._resetWeaponNameStyle();
-            }
-            if (this.lb_weaponDesc) this.lb_weaponDesc.string = '';
-            return;
+    /**
+     * lb_skillName / lb_skillDesc：读 Hero.atk_id 对应 Skill。
+     * Skill.name 配表常为空时，名称回退为 desc，避免「技能：」右侧空白。
+     * @param w1 Hero
+     * @param level 合成等级
+     */
+    private _refreshSkillLabels(w1: ITableHero, level: number): void {
+        const skillId = heroNormalSkillId(w1, level);
+        const skill = skillId > 0
+            ? gg.data.table.getTableData<ITableSkill>(TableNames.Skill, skillId)
+            : null;
+        if (skillId > 0 && !skill) {
+            console.warn(LOG, 'Skill 缺失', skillId, w1.id, level);
         }
-
-        if (this.lb_weaponName) {
-            this.lb_weaponName.string = gg.lang.get(weaponRow.name);
-            this._applyWeaponNameStyle(weaponRow.quality);
+        const nameKey = skill ? String(skill.name ?? '').trim() : '';
+        const descKey = skill ? String(skill.desc ?? '').trim() : '';
+        if (skill && !nameKey) {
+            console.warn(LOG, 'Skill.name 为空，名称回退 desc', skillId, w1.id);
         }
-        if (this.lb_weaponDesc) {
-            this.lb_weaponDesc.string = gg.lang.get(weaponRow.desc);
+        if (this.lb_skillName) {
+            const nameText = nameKey ? gg.lang.get(nameKey) : (descKey ? gg.lang.get(descKey) : '');
+            this.lb_skillName.string = nameText;
+        }
+        if (this.lb_skillDesc) {
+            this.lb_skillDesc.string = descKey ? gg.lang.get(descKey) : '';
         }
     }
 
-    /**
-     * 实时数值：等级、攻击、攻速、武器攻击、经验条（每次打开/切换格子都读最新 runtime）
-     */
+    /** 等级 / 攻击 / 攻速 */
     private _refreshDynamicStats(
         w1: ITableHero,
         level: number,
-        levelLimit: number,
         stats: TowerRuntimeSnapshot['stats'] | undefined,
-        weaponRow: ITableWeapon | null,
-        runtime?: TowerRuntimeSnapshot | null,
     ): void {
-        const setup = deriveTowerSetupStats(w1, level, weaponRow?.id);
+        const setup = deriveTowerSetupStats(w1, level, 0);
         const attack = stats?.attack ?? setup.attack;
         const attackSpeed = stats?.attackSpeed ?? setup.attackSpeed;
 
@@ -482,170 +447,157 @@ export class UIBattleWeaponDescHero extends Auto_BattleWeaponDescHero {
         if (this.lb_attckSpeed) {
             this.lb_attckSpeed.string = TowerStatDisplay.attackSpeed(attackSpeed);
         }
-        if (this.lb_weaponAtk) {
-            if (!weaponRow) {
-                this.lb_weaponAtk.string = '';
-            } else {
-                const exclusiveMul = gg.equip.getEquipExclusiveMul(w1.id, weaponRow);
-                const weaponAtk = Math.floor((weaponRow.atk ?? 0) * exclusiveMul);
-                this.lb_weaponAtk.string = `${weaponAtk}`;
-            }
-        }
-        this._refreshExpProgress(w1, level, levelLimit, runtime);
     }
 
-    /** 刷新当前等级武将技能名与描述 */
-    private _refreshSkillLabels(w1: ITableHero, level: number): void {
-        const skillId = heroUltSkillId(w1, level);
-        const skill = skillId > 0
-            ? gg.data.table.getTableData<ITableSkill>(TableNames.Skill, skillId)
-            : null;
-        if (skillId > 0 && !skill) {
-            console.log(LOG, 'Skill 缺失', skillId, w1.id, level);
-        }
-        if (this.lb_skillName) {
-            this.lb_skillName.string = skill ? gg.lang.get(skill.name) : '';
-        }
-        if (this.lb_skillDesc) {
-            this.lb_skillDesc.string = skill ? gg.lang.get(skill.desc) : '';
-        }
-    }
-
-    /** 按武器品质设置武器名字体色与描边 */
-    private _applyWeaponNameStyle(quality: number): void {
-        const label = this.lb_weaponName;
-        if (!label) return;
-        const q = Math.floor(Number(quality) || 0);
-        const fontHex = WEAPON_NAME_FONT_HEX[q];
-        const outlineHex = WEAPON_NAME_OUTLINE_HEX[q];
-        if (!fontHex || !outlineHex) {
-            console.log(LOG, '未知武器品质色', quality);
-            this._resetWeaponNameStyle();
+    /** 缓存 gtemplate */
+    private _cacheGemTemplate(): void {
+        if (this._gemTpl?.isValid) return;
+        const list = this.ui_gemList;
+        if (!list?.isValid) return;
+        const tpl = list.getChildByName('gtemplate');
+        if (!tpl?.isValid) {
+            console.warn(LOG, 'ui_gemList/gtemplate 缺失');
             return;
         }
-        label.color = Color.fromHEX(new Color(), fontHex);
-        label.enableOutline = true;
-        label.outlineColor = Color.fromHEX(new Color(), outlineHex);
-    }
-
-    /** 重置武器名样式 */
-    private _resetWeaponNameStyle(): void {
-        const label = this.lb_weaponName;
-        if (!label) return;
-        label.color = Color.WHITE;
-        label.enableOutline = false;
-    }
-
-    /** 从弹窗主体取 ui_type 节点（不依赖 Auto 缓存引用） */
-    private _getWeaponTypeNode(weaponType: number): Node | null {
-        const body = this._popupBody ?? this.node.getChildByName('弹窗主体');
-        if (!body?.isValid) return null;
-        const t = Math.floor(Number(weaponType) || 0);
-        if (t < 1 || t > 4) return null;
-        return body.getChildByName(`ui_type${t}`);
-    }
-
-    /** 同步 Auto 节点引用（供外部工具链；展示以 _getWeaponTypeNode 为准） */
-    private _ensureWeaponTypeNodes(): void {
-        if (!this.ui_type1?.isValid) this.ui_type1 = this._getWeaponTypeNode(1);
-        if (!this.ui_type2?.isValid) this.ui_type2 = this._getWeaponTypeNode(2);
-        if (!this.ui_type3?.isValid) this.ui_type3 = this._getWeaponTypeNode(3);
-        if (!this.ui_type4?.isValid) this.ui_type4 = this._getWeaponTypeNode(4);
+        this._gemTpl = tpl;
+        tpl.active = false;
     }
 
-    /** ui_type1~4：按武器 type 显隐并切肤 */
-    private _refreshWeaponType(weaponRow: ITableWeapon | null): void {
-        this._ensureWeaponTypeNodes();
-        this._hideWeaponTypes();
-        if (!weaponRow) return;
-
-        const weaponType = Number(weaponRow.type) | 0;
-        const skin = String(weaponRow.skin ?? '').trim();
-        if (weaponType < 1 || weaponType > 4) {
-            console.log(LOG, '武器 type 无效', weaponRow.id, weaponType);
-            return;
-        }
-        if (!skin) {
-            console.log(LOG, '武器 skin 缺失', weaponRow.id);
+    /**
+     * 固定刷新 4 个镶嵌槽：有宝石画完整行，空槽只显示 lb。
+     * @param element Hero.herotype 1~5
+     * @param enemyCamp 敌方不读本机镶嵌（四槽皆空）
+     */
+    private _refreshGemList(element: number, enemyCamp: boolean): void {
+        this._cacheGemTemplate();
+        this._clearGemRows();
+        const list = this.ui_gemList;
+        const tpl = this._gemTpl;
+        if (!list?.isValid || !tpl?.isValid) return;
+
+        const slots = [0, 0, 0, 0];
+        if (!enemyCamp && element >= 1 && element <= 5) {
+            try {
+                const raw = gg.gem.getElementSlots(element);
+                for (let i = 0; i < 4; i++) {
+                    slots[i] = Math.floor(Number(raw[i]) || 0);
+                }
+            } catch (err) {
+                console.warn(LOG, 'getElementSlots 失败', element, err);
+            }
         }
 
-        const node = this._getWeaponTypeNode(weaponType);
-        if (!node?.isValid) {
-            console.log(LOG, '武器类型节点缺失', weaponType, weaponRow.id);
-            return;
+        for (let i = 0; i < 4; i++) {
+            const row = instantiate(tpl);
+            row.parent = list;
+            row.active = true;
+            const gemId = slots[i];
+            if (gemId > 0) {
+                const conf = gg.gem.getGem(gemId);
+                if (!conf) {
+                    console.warn(LOG, '镶嵌宝石配表缺失', gemId, 'element', element, 'slot', i);
+                    this._paintEmptyGemSlot(row);
+                } else {
+                    this._paintGemRow(row, conf);
+                }
+            } else {
+                this._paintEmptyGemSlot(row);
+            }
+            this._gemRows.push(row);
         }
-
-        node.active = true;
-        node.setScale(1, 1, 1);
-        this._applyWeaponSpine(node, skin, weaponRow.id);
+        this._updateGemLayout(list);
     }
 
-    private _hideWeaponTypes(): void {
-        for (let t = 1; t <= 4; t++) {
-            const node = this._getWeaponTypeNode(t);
-            if (node?.isValid) node.active = false;
-        }
-    }
+    /** 填充一颗已镶嵌宝石行 */
+    private _paintGemRow(row: Node, conf: ITableWeapon): void {
+        const lbEmpty = row.getChildByName('lb');
+        if (lbEmpty?.isValid) lbEmpty.active = false;
 
-    private _applyWeaponSpine(typeNode: Node, skin: string, weaponId: number): void {
-        typeNode.active = true;
-        const skel = typeNode.getComponent(sp.Skeleton) ?? typeNode.getComponentInChildren(sp.Skeleton);
-        if (!skel?.isValid) {
-            console.log(LOG, '武器 Spine 缺失', typeNode.name, weaponId);
-            return;
+        const quality = Math.floor(Number(conf.quality) || 0);
+        const lblv = row.getChildByName('lblv')?.getComponent(Label);
+        if (lblv) {
+            lblv.node.active = true;
+            lblv.string = `Lv.${quality}`;
         }
-        if (skel.node?.isValid) skel.node.active = true;
-        skel.enabled = true;
-        if (skel.skeletonData) ensureSpineSkeletonDataRuntime(skel.skeletonData);
-
-        const resolvedSkin = applyWeaponSpineSkin(skel, skin, LOG);
-        if (skin && !resolvedSkin) {
-            console.log(LOG, '武器 skin 不可用', weaponId, skin);
+        const icon = row.getChildByName('icon');
+        if (icon?.isValid) {
+            icon.active = true;
+            const iconName = String(conf.icon || '').trim();
+            if (!iconName) console.warn(LOG, '宝石 icon 缺失', conf.id);
+            this._setItemSprite(icon, iconName ? `weapon/${iconName}` : '');
         }
-
-        BattleSpinePlayback.resetTracks(skel);
-        try {
-            skel.setAnimation(0, WEAPON_SPINE_IDLE, true);
-        } catch (e) {
-            console.log(LOG, 'setAnimation 失败', WEAPON_SPINE_IDLE, typeNode.name, weaponId, String(e));
+        const lbName = row.getChildByName('lbName')?.getComponent(Label);
+        if (lbName) {
+            lbName.node.active = true;
+            lbName.string = this._gemBaseName(conf);
         }
-
-        const renderers = typeNode.getComponentsInChildren(UIRenderer);
-        for (let i = 0; i < renderers.length; i++) {
-            const r = renderers[i];
-            if (r?.isValid) r.enabled = true;
+        const lbDesc = row.getChildByName('lbDesc')?.getComponent(Label);
+        if (lbDesc) {
+            lbDesc.node.active = true;
+            lbDesc.string = gg.lang.get(conf.desc);
         }
-        const op = typeNode.getComponent(UIOpacity) ?? typeNode.getComponentInChildren(UIOpacity);
-        if (op?.isValid) op.opacity = 255;
     }
 
-    private _refreshExpProgress(
-        w1: ITableHero,
-        level: number,
-        levelLimit: number,
-        runtime?: TowerRuntimeSnapshot | null,
-    ): void {
-        const progressUt = this.ui_progress?.getComponent(UITransform);
-        if (!progressUt?.isValid) return;
+    /**
+     * 宝石展示名：去掉配表名尾部「N级」，等级改由 lblv 的 Lv.N 展示。
+     * @param conf Weapon 行
+     */
+    private _gemBaseName(conf: ITableWeapon): string {
+        const raw = gg.lang.get(conf.name);
+        const stripped = String(raw).replace(/\d+级\s*$/, '').trim();
+        return stripped || raw;
+    }
 
-        if (level >= levelLimit) {
-            progressUt.setContentSize(PROGRESS_MAX_WIDTH, progressUt.contentSize.height);
-            if (this.lb_progress) this.lb_progress.string = '满级';
-            if (this.ui_progress) this.ui_progress.active = true;
+    /**
+     * 空槽：只显示 lb，文案固定「尚未镶嵌宝石」。
+     * @param row 槽位行
+     */
+    private _paintEmptyGemSlot(row: Node): void {
+        const lbEmpty = row.getChildByName('lb')?.getComponent(Label);
+        if (lbEmpty) {
+            lbEmpty.node.active = true;
+            lbEmpty.string = GEM_EMPTY_TIP;
+        }
+        const lblv = row.getChildByName('lblv');
+        if (lblv?.isValid) lblv.active = false;
+        const icon = row.getChildByName('icon');
+        if (icon?.isValid) {
+            icon.active = false;
+            this._setItemSprite(icon, '');
+        }
+        const lbName = row.getChildByName('lbName');
+        if (lbName?.isValid) lbName.active = false;
+        const lbDesc = row.getChildByName('lbDesc');
+        if (lbDesc?.isValid) lbDesc.active = false;
+    }
+
+    /** Items bundle 图集 */
+    private _setItemSprite(node: Node | null, path: string): void {
+        if (!node?.isValid) return;
+        if (!path) {
+            node.getComponent(SpriteLoad)?.clear();
+            const spComp = node.getComponent(Sprite);
+            if (spComp) spComp.spriteFrame = null;
             return;
         }
+        if (!node.getComponent(Sprite)) node.addComponent(Sprite);
+        node.getOrAddComponent(SpriteLoad).setSprite(path, GBundle.Items);
+    }
 
-        const need = needTowerExpForLevel(w1, level);
-        const curRaw = runtime?.entityId ? getTowerExpHost().getExp(runtime.entityId) : 0;
-        const ratio = need > 0 ? Math.min(1, Math.max(0, curRaw / need)) : 0;
-        progressUt.setContentSize(PROGRESS_MAX_WIDTH * ratio, progressUt.contentSize.height);
-
-        if (this.lb_progress) {
-            const curText = TowerStatDisplay.oneDecimal(curRaw);
-            const needText = TowerStatDisplay.oneDecimal(need);
-            this.lb_progress.string = need > 0 ? `${curText}/${needText}` : `${curText}/0`;
+    /** 清理宝石克隆行（保留模板） */
+    private _clearGemRows(): void {
+        for (let i = 0; i < this._gemRows.length; i++) {
+            const n = this._gemRows[i];
+            if (n?.isValid) n.destroy();
         }
-        if (this.ui_progress) this.ui_progress.active = true;
+        this._gemRows.length = 0;
+        if (this._gemTpl?.isValid) this._gemTpl.active = false;
+    }
+
+    /** 触发布局 */
+    private _updateGemLayout(list: Node): void {
+        const lay = list.getComponent(Layout);
+        if (lay) lay.updateLayout();
     }
 
     private _clearLabels(): void {
@@ -654,19 +606,8 @@ export class UIBattleWeaponDescHero extends Auto_BattleWeaponDescHero {
         if (this.lb_lvMax) this.lb_lvMax.string = '';
         if (this.lb_attck) this.lb_attck.string = '';
         if (this.lb_attckSpeed) this.lb_attckSpeed.string = '';
-        if (this.lb_weaponName) {
-            this.lb_weaponName.string = '';
-            this._resetWeaponNameStyle();
-        }
-        if (this.lb_weaponAtk) this.lb_weaponAtk.string = '';
-        if (this.lb_weaponDesc) this.lb_weaponDesc.string = '';
         if (this.lb_skillName) this.lb_skillName.string = '';
         if (this.lb_skillDesc) this.lb_skillDesc.string = '';
-        if (this.lb_progress) this.lb_progress.string = '';
-        if (this.ui_progress?.isValid) {
-            const ut = this.ui_progress.getComponent(UITransform);
-            if (ut) ut.setContentSize(0, ut.contentSize.height);
-        }
     }
 
     private _applyPanelPosition(data: BattleWeaponDescHeroPanelData | null): void {
diff --git a/assets/script/ui/PanelGemstone/Auto_PanelGemstone.ts b/assets/script/ui/PanelGemstone/Auto_PanelGemstone.ts
index 98b3850..9d26979 100644
--- a/assets/script/ui/PanelGemstone/Auto_PanelGemstone.ts
+++ b/assets/script/ui/PanelGemstone/Auto_PanelGemstone.ts
@@ -29,7 +29,6 @@ export class Auto_PanelGemstone extends UIBase {
   ui_content:Node;
   ui_tagBtnBg:Node;
   ui_tagBtns:Node;
-  btnAll:Node;
   btn0:Node;
   btn1:Node;
   btn2:Node;
@@ -42,10 +41,9 @@ export class Auto_PanelGemstone extends UIBase {
     this.ui_center = find("ui_center",this.node);
     this.ui_list = find("ui_center/ui_list",this.node);
     this.btnClose = find("ui_center/btnClose",this.node);
-    this.ui_content = find("ui_center/ScrollView/view/ui_content",this.node);
+    this.ui_content = find("ui_center/ui_content",this.node);
     this.ui_tagBtnBg = find("ui_center/tags/ui_tagBtnBg",this.node);
     this.ui_tagBtns = find("ui_center/tags/ui_tagBtns",this.node);
-    this.btnAll = find("ui_center/tags/ui_tagBtns/btnAll",this.node);
     this.btn0 = find("ui_center/tags/ui_tagBtns/btn0",this.node);
     this.btn1 = find("ui_center/tags/ui_tagBtns/btn1",this.node);
     this.btn2 = find("ui_center/tags/ui_tagBtns/btn2",this.node);
@@ -56,7 +54,6 @@ export class Auto_PanelGemstone extends UIBase {
   }
   onEnable() {
     this.btnClose.on(Node.EventType.TOUCH_END, this.click_btnClose, this);
-    this.btnAll.on(Node.EventType.TOUCH_END, this.click_btnAll, this);
     this.btn0.on(Node.EventType.TOUCH_END, this.click_btn0, this);
     this.btn1.on(Node.EventType.TOUCH_END, this.click_btn1, this);
     this.btn2.on(Node.EventType.TOUCH_END, this.click_btn2, this);
@@ -67,7 +64,6 @@ export class Auto_PanelGemstone extends UIBase {
   }
   onDisable() {
     this.btnClose.off(Node.EventType.TOUCH_END, this.click_btnClose, this);
-    this.btnAll.off(Node.EventType.TOUCH_END, this.click_btnAll, this);
     this.btn0.off(Node.EventType.TOUCH_END, this.click_btn0, this);
     this.btn1.off(Node.EventType.TOUCH_END, this.click_btn1, this);
     this.btn2.off(Node.EventType.TOUCH_END, this.click_btn2, this);
@@ -77,7 +73,6 @@ export class Auto_PanelGemstone extends UIBase {
     this.btnFuse.off(Node.EventType.TOUCH_END, this.click_btnFuse, this);
   }
   click_btnClose() {}
-  click_btnAll() {}
   click_btn0() {}
   click_btn1() {}
   click_btn2() {}
diff --git a/assets/script/ui/PanelGemstone/UIPanelGemstone.ts b/assets/script/ui/PanelGemstone/UIPanelGemstone.ts
index dc8107a..acbbf94 100644
--- a/assets/script/ui/PanelGemstone/UIPanelGemstone.ts
+++ b/assets/script/ui/PanelGemstone/UIPanelGemstone.ts
@@ -2,26 +2,33 @@
 //*********************
 // create by 流云
 // time: Wed Oct 07 2026
-// desc: 宝石镶嵌 / 仓库 / 一键合成
+// desc: 宝石镶嵌 / 页签仓库 / 一键合成
 //*********************
-import { _decorator, EventMouse, EventTouch, Input, input, instantiate, Node, ScrollView, sp, Sprite, UIOpacity, UITransform, Vec2, Vec3 } from 'cc';
+import { _decorator, EventMouse, EventTouch, Input, input, instantiate, Node, sp, Sprite, UIOpacity, UITransform, Vec2, Vec3 } from 'cc';
 import { SpriteLoad } from 'db://assets/mx/components/SpriteLoad';
 import { ensureSpineSkeletonDataRuntime } from 'db://assets/mx/module/lang/spineRuntimePatch';
 import { GemGrid } from '../../com/GemGrid';
+import { FrameFlowHost } from '../../game/FrameFlowHost';
 import { GBundle, UIID } from '../../game/ConfigRes';
 import { GEM_SLOT_COUNT, IGemBagEntry } from '../../game/GameDataEnums';
 import { Auto_PanelGemstone } from './Auto_PanelGemstone';
 const { ccclass } = _decorator;
 
 const LOG = '[PanelGemstone]';
+/** 按下后移动超过此值开始拖 */
 const DRAG_THRESHOLD = 18;
 const GHOST_OPACITY = 180;
 const ELEMENT_COUNT = 5;
 const SLOT_NAMES = ['g1', 'g2', 'g3', 'g4'];
 const ELEMENT_SKINS = ['', '金', '木', '水', '火', '土'];
+/** 仓库每帧实例化数量 */
+const BAG_PER_FRAME = 6;
+/** 默认页签：通用 Weapon.type=1 */
+const DEFAULT_FILTER = 1;
 
 /**
- * 宝石页：五行镶嵌 + 仓库筛选 + 拖拽装备/卸下 + 一键合成。
+ * 宝石页：五行镶嵌 + 页签仓库（无滚动）+ 拖拽镶嵌/卸下 + 一键合成。
+ * 页签 btn0~btn5 → type 1~6（通用/金/木/水/火/土），默认通用。
  */
 @ccclass('UIPanelGemstone')
 export class UIPanelGemstone extends Auto_PanelGemstone {
@@ -34,12 +41,16 @@ export class UIPanelGemstone extends Auto_PanelGemstone {
     private _elementItems: Node[] = [];
     /** 仓库动态格 */
     private _bagItems: Node[] = [];
-    /** 当前筛选：0全部 1通用 2~6五行 */
-    private _filterType = 0;
+    /** 当前筛选：1 通用；2~6 金木水火土 */
+    private _filterType = DEFAULT_FILTER;
     /** 仓库数据 */
     private _bagList: IGemBagEntry[] = [];
-    /** ScrollView 节点（卸下命中区） */
-    private _scrollNode: Node | null = null;
+    /** 仓库分帧 */
+    private _flow: FrameFlowHost | null = null;
+    /** 仓库填充代数 */
+    private _bagToken = 0;
+    /** 已分帧填充下标 */
+    private _bagFillIndex = 0;
 
     private _pressing = false;
     private _dragging = false;
@@ -58,14 +69,9 @@ export class UIPanelGemstone extends Auto_PanelGemstone {
     onLoad(): void {
         super.onLoad();
         this._itemTpl = this.ui_list?.getChildByName('itemTemplate') ?? null;
-        if (this._itemTpl) {
-            this._itemTpl.active = false;
-        }
+        if (this._itemTpl) this._itemTpl.active = false;
         this._bagTpl = this.ui_content?.getChildByName('bagItemTemplate') ?? null;
-        if (this._bagTpl) {
-            this._bagTpl.active = false;
-        }
-        this._scrollNode = this.ui_content?.parent?.parent ?? null;
+        if (this._bagTpl) this._bagTpl.active = false;
         this._bindDrag(true);
     }
 
@@ -77,12 +83,13 @@ export class UIPanelGemstone extends Auto_PanelGemstone {
     onDisable(): void {
         this._bindDrag(false);
         this._endDrag();
+        this._stopBagFill();
         super.onDisable();
     }
 
     onInit(): void {
-        this._filterType = 0;
-        this._selectTag(this.btnAll);
+        this._filterType = DEFAULT_FILTER;
+        this._selectTag(this.btn0);
         void this._refresh();
     }
 
@@ -90,7 +97,6 @@ export class UIPanelGemstone extends Auto_PanelGemstone {
         void this.close(2);
     }
 
-    click_btnAll(): void { this._onTag(0, this.btnAll); }
     click_btn0(): void { this._onTag(1, this.btn0); }
     click_btn1(): void { this._onTag(2, this.btn1); }
     click_btn2(): void { this._onTag(3, this.btn2); }
@@ -100,7 +106,7 @@ export class UIPanelGemstone extends Auto_PanelGemstone {
 
     click_btnFuse(): void {
         const gains = gg.gem.fuseAll();
-        this._refreshBag();
+        this._rebuildBag();
         this._refreshAllSlots();
         if (!gains.length) {
             gg.ui.showToast('没有可合成的宝石');
@@ -109,11 +115,12 @@ export class UIPanelGemstone extends Auto_PanelGemstone {
         void gg.ui.openPanel(UIID.PopGetGem, { data: gains });
     }
 
-    /** 筛选切换 */
+    /** 页签切换 */
     private _onTag(filterType: number, btn: Node): void {
+        if (this._filterType === filterType) return;
         this._filterType = filterType;
         this._selectTag(btn);
-        this._refreshBag();
+        this._rebuildBag();
     }
 
     /** 标签底移到当前按钮 */
@@ -127,7 +134,7 @@ export class UIPanelGemstone extends Auto_PanelGemstone {
         await gg.gem.ensureTable();
         if (!this.isValid) return;
         this._buildElements();
-        this._refreshBag();
+        this._rebuildBag();
     }
 
     /** 实例化五行 */
@@ -213,28 +220,107 @@ export class UIPanelGemstone extends Auto_PanelGemstone {
         if (icon?.isValid) icon.active = !!iconName;
     }
 
-    /** 刷新仓库 */
-    private _refreshBag(): void {
+    /**
+     * 重建当前页签仓库（打开 / 切页签 / 合成）。
+     * 镶嵌成败勿调用。
+     */
+    private _rebuildBag(): void {
         if (!this.ui_content?.isValid || !this._bagTpl?.isValid) {
             console.warn(LOG, 'ui_content/bagItemTemplate 缺失');
             return;
         }
+        this._stopBagFill();
         for (let i = 0; i < this._bagItems.length; i++) {
             const n = this._bagItems[i];
             if (n?.isValid) n.destroy();
         }
         this._bagItems.length = 0;
         this._bagList = gg.gem.getBagList(this._filterType);
-        for (let i = 0; i < this._bagList.length; i++) {
-            const entry = this._bagList[i];
-            const node = instantiate(this._bagTpl);
-            node.parent = this.ui_content;
-            node.active = true;
-            const grid = node.getComponent(GemGrid) || node.addComponent(GemGrid);
-            grid.setData(gg.gem.getGem(entry.gemId), entry.count);
-            (node as any)._gemId = entry.gemId;
-            this._bagItems.push(node);
+        this._bagFillIndex = 0;
+        this._bagToken++;
+        this._pumpBagFill(this._bagToken);
+    }
+
+    /** 停掉仓库分帧 */
+    private _stopBagFill(): void {
+        this._bagToken++;
+        this._flow?.dispose();
+        this._flow = null;
+    }
+
+    /** 分帧填充仓库格 */
+    private _pumpBagFill(token: number): void {
+        if (!this.isValid || token !== this._bagToken) return;
+        if (!this.ui_content?.isValid || !this._bagTpl?.isValid) return;
+        const end = Math.min(this._bagFillIndex + BAG_PER_FRAME, this._bagList.length);
+        for (let i = this._bagFillIndex; i < end; i++) {
+            this._bagItems.push(this._spawnBagItem(this._bagList[i]));
+        }
+        this._bagFillIndex = end;
+        if (this._bagFillIndex >= this._bagList.length) return;
+        if (!this._flow) this._flow = new FrameFlowHost();
+        this._flow.waitFrames(1, () => this._pumpBagFill(token));
+    }
+
+    /** 创建一格仓库项 */
+    private _spawnBagItem(entry: IGemBagEntry): Node {
+        const node = instantiate(this._bagTpl!);
+        node.parent = this.ui_content;
+        node.active = true;
+        const grid = node.getComponent(GemGrid) || node.addComponent(GemGrid);
+        grid.setData(gg.gem.getGem(entry.gemId), entry.count);
+        (node as any)._gemId = entry.gemId;
+        return node;
+    }
+
+    /**
+     * 镶嵌/卸下后局部同步仓库数量。
+     * @param gemIds 涉及的宝石 id
+     */
+    private _patchBagGems(gemIds: readonly number[]): void {
+        for (let i = 0; i < gemIds.length; i++) {
+            const gemId = Math.floor(Number(gemIds[i]) || 0);
+            if (gemId <= 0) continue;
+            const free = gg.gem.getFreeCount(gemId);
+            const conf = gg.gem.getGem(gemId);
+            const matchFilter = this._matchFilter(conf);
+            const idx = this._findBagItemIndex(gemId);
+            if (free <= 0 || !matchFilter) {
+                if (idx >= 0) this._removeBagItemAt(idx);
+                continue;
+            }
+            if (idx >= 0) {
+                const node = this._bagItems[idx];
+                node.getComponent(GemGrid)?.setData(conf, free);
+                this._bagList[idx] = { gemId, count: free };
+                continue;
+            }
+            const entry: IGemBagEntry = { gemId, count: free };
+            this._bagList.push(entry);
+            this._bagItems.push(this._spawnBagItem(entry));
+        }
+    }
+
+    /** 当前页签是否应展示该宝石 */
+    private _matchFilter(conf: ITableWeapon | null): boolean {
+        if (!conf) return false;
+        return Math.floor(Number(conf.type) || 0) === this._filterType;
+    }
+
+    /** 查找仓库格下标 */
+    private _findBagItemIndex(gemId: number): number {
+        for (let i = 0; i < this._bagItems.length; i++) {
+            if (Number((this._bagItems[i] as any)._gemId) === gemId) return i;
         }
+        return -1;
+    }
+
+    /** 移除一格仓库 */
+    private _removeBagItemAt(idx: number): void {
+        const node = this._bagItems[idx];
+        if (node?.isValid) node.destroy();
+        this._bagItems.splice(idx, 1);
+        this._bagList.splice(idx, 1);
     }
 
     /** icons/weapon */
@@ -250,7 +336,7 @@ export class UIPanelGemstone extends Auto_PanelGemstone {
         node.getOrAddComponent(SpriteLoad).setSprite(path, GBundle.Items);
     }
 
-    // ---------- 拖拽 ----------
+    // ---------- 拖拽镶嵌 ----------
 
     private _bindDrag(on: boolean): void {
         if (this._dragListening === on) return;
@@ -332,12 +418,15 @@ export class UIPanelGemstone extends Auto_PanelGemstone {
             this._finishDrag(loc);
             return;
         }
+        // 镶嵌槽轻点看信息；仓库格由 GemGrid 自行处理
+        const gemId = this._dragGemId;
+        const fromSlot = this._dragFromElement > 0 && this._dragFromSlot >= 0;
         this._endDrag();
+        if (fromSlot && gemId > 0) GemGrid.openInfo(gemId);
     }
 
     private _beginDrag(loc: Vec2): void {
         this._dragging = true;
-        this._setScrollEnabled(false);
         this._spawnGhost(loc);
         this._moveGhost(loc);
     }
@@ -359,21 +448,29 @@ export class UIPanelGemstone extends Auto_PanelGemstone {
                 if (fromE === te && fromS === ts) return;
                 if (!gg.gem.swapSlots(fromE, fromS, te, ts)) {
                     gg.ui.showToast('无法镶嵌到该位置');
+                    return;
                 }
-            } else {
-                if (!gg.gem.wearFromBag(te, ts, gemId)) {
-                    gg.ui.showToast('无法镶嵌到该位置');
-                }
+                this._refreshAllSlots();
+                return;
+            }
+            const before = gg.gem.getSlotGem(te, ts);
+            if (!gg.gem.wearFromBag(te, ts, gemId)) {
+                gg.ui.showToast('无法镶嵌到该位置');
+                return;
             }
             this._refreshAllSlots();
-            this._refreshBag();
+            const patch = [gemId];
+            if (before > 0 && before !== gemId) patch.push(before);
+            this._patchBagGems(patch);
             return;
         }
 
         if (fromE > 0 && fromS >= 0 && toBag) {
-            gg.gem.unequip(fromE, fromS);
+            const worn = gg.gem.getSlotGem(fromE, fromS);
+            if (worn <= 0) return;
+            if (!gg.gem.unequip(fromE, fromS)) return;
             this._refreshAllSlots();
-            this._refreshBag();
+            this._patchBagGems([worn]);
         }
     }
 
@@ -387,6 +484,7 @@ export class UIPanelGemstone extends Auto_PanelGemstone {
         ghost.parent = this.node;
         ghost.active = true;
         const grid = ghost.getComponent(GemGrid) || ghost.addComponent(GemGrid);
+        grid.canClick = false;
         grid.setData(conf, -1);
         const op = ghost.getComponent(UIOpacity) || ghost.addComponent(UIOpacity);
         op.opacity = GHOST_OPACITY;
@@ -409,16 +507,9 @@ export class UIPanelGemstone extends Auto_PanelGemstone {
 
     private _endDrag(): void {
         this._clearGhost();
-        this._setScrollEnabled(true);
         this._resetDrag();
     }
 
-    /** 拖拽时禁用仓库滚动 */
-    private _setScrollEnabled(on: boolean): void {
-        const sv = this._scrollNode?.getComponent(ScrollView);
-        if (sv) sv.enabled = on;
-    }
-
     private _resetDrag(): void {
         this._pressing = false;
         this._dragging = false;
@@ -430,9 +521,8 @@ export class UIPanelGemstone extends Auto_PanelGemstone {
     private _hitBag(loc: Vec2): Node | null {
         if (!this.ui_content?.isValid) return null;
         this._hitPos.set(loc.x, loc.y);
-        const kids = this._bagItems;
-        for (let i = kids.length - 1; i >= 0; i--) {
-            const child = kids[i];
+        for (let i = this._bagItems.length - 1; i >= 0; i--) {
+            const child = this._bagItems[i];
             if (!child?.activeInHierarchy) continue;
             const ut = child.getComponent(UITransform);
             if (ut?.getBoundingBoxToWorld().contains(this._hitPos)) return child;
@@ -455,9 +545,9 @@ export class UIPanelGemstone extends Auto_PanelGemstone {
         return null;
     }
 
-    /** 是否落在仓库 ScrollView 区域 */
+    /** 是否落在仓库区（卸下） */
     private _hitBagArea(loc: Vec2): boolean {
-        const root = this._scrollNode;
+        const root = this.ui_content;
         if (!root?.isValid) return false;
         this._hitPos.set(loc.x, loc.y);
         const ut = root.getComponent(UITransform);
diff --git a/assets/script/ui/PopGemInfo.meta b/assets/script/ui/PopGemInfo.meta
new file mode 100644
index 0000000..7e9332d
--- /dev/null
+++ b/assets/script/ui/PopGemInfo.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "63f51f60-1b58-4be0-bd82-dc19fbfe2f41",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/assets/script/ui/PopGemInfo/Auto_PopGemInfo.ts b/assets/script/ui/PopGemInfo/Auto_PopGemInfo.ts
new file mode 100644
index 0000000..6905574
--- /dev/null
+++ b/assets/script/ui/PopGemInfo/Auto_PopGemInfo.ts
@@ -0,0 +1,49 @@
+
+//*********************
+// create by 流云
+// 插件自动生成的节点脚本
+// 请勿修改（自动生成会覆盖）
+// 请通过子类继承使用
+// 如何生成可直接调用的UI节点和组件？
+// 1.在场景节点树中选中要生成的UI根节点
+// 2.点击菜单"tool"->“生成UI脚本”  或者使用快捷键(快捷键：Ctrl+Shift+C)
+// 3.点击后会在script/ui/目录中生成一个以选中节点命名的文件夹，文件夹中会生成两个脚本文件，“Auto_”开头的就是本文件，不可修改，另一个是“UI”+选中节点名称命名的脚本文件，可修改，是需要挂载到选中节点的脚本文件，给用户使用的写逻辑的脚本，只会生成一次
+// 4.找到第3步描述的“UI”+选中节点名称命名的脚本文件，将其挂载到选中节点上(第一生成需要挂载，后续修改场景，重复生成的时候，该脚本不会再生成，不用担心会覆盖逻辑脚本)
+// 下面是类型示例
+// 1.按钮，节点名以“btn_”或者“Btn_”开头或者节点添加了Button组件， 例：btn_Close，会生成btn_Close节点和click_btn_Close()方法
+// 2.标签，节点名以“lb_”开头， 例：lb_title，会生成lb_title的Label组件
+// 3.输入框，节点名以“eb_”开头， 例：eb_input，会生成eb_input的EditBox组件
+// 4.滚动视图，节点名以“sv_”开头， 例：sv_list，会生成sv_list的ScrollView组件
+// 5.图片，节点名以“img_”或者sp_“”开头， 例：img_Icon，会生成img_Icon的Sprite组件
+// 6.普通节点，节点名以“ui_”或者“Ui_”或者“UI_”开头， 例：ui_Content，会生成ui_Content的Node节点
+//*********************
+import { _decorator, Component, Node, find, Sprite, Label, Button, ScrollView, EditBox, RichText } from 'cc';
+import { UIBase } from '../../../mx/module/ui/UIBase';
+const { ccclass } = _decorator;
+
+@ccclass('Auto_PopGemInfo')
+export class Auto_PopGemInfo extends UIBase {
+  bgMask:Node;
+  lb_name:Label;
+  lb_lv:Label;
+  lb_desc:Label;
+  btnClose:Node;
+  onLoad(){
+    super.onLoad();
+    this.bgMask = find("bgMask",this.node);
+    this.lb_name = find("center/lb_name",this.node)?.getComponent(Label);
+    this.lb_lv = find("center/lb_lv",this.node)?.getComponent(Label);
+    this.lb_desc = find("center/lb_desc",this.node)?.getComponent(Label);
+    this.btnClose = find("center/btnClose",this.node);
+  }
+  onEnable() {
+    this.bgMask.on(Node.EventType.TOUCH_END, this.click_bgMask, this);
+    this.btnClose.on(Node.EventType.TOUCH_END, this.click_btnClose, this);
+  }
+  onDisable() {
+    this.bgMask.off(Node.EventType.TOUCH_END, this.click_bgMask, this);
+    this.btnClose.off(Node.EventType.TOUCH_END, this.click_btnClose, this);
+  }
+  click_bgMask() {}
+  click_btnClose() {}
+}
\ No newline at end of file
diff --git a/assets/script/ui/PopGemInfo/Auto_PopGemInfo.ts.meta b/assets/script/ui/PopGemInfo/Auto_PopGemInfo.ts.meta
new file mode 100644
index 0000000..ee169f2
--- /dev/null
+++ b/assets/script/ui/PopGemInfo/Auto_PopGemInfo.ts.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.24",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "6650cdaf-d5a0-4bde-83d0-a568532780ee",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/assets/script/ui/PopGemInfo/UIPopGemInfo.ts b/assets/script/ui/PopGemInfo/UIPopGemInfo.ts
new file mode 100644
index 0000000..7d02062
--- /dev/null
+++ b/assets/script/ui/PopGemInfo/UIPopGemInfo.ts
@@ -0,0 +1,90 @@
+
+//*********************
+// create by 流云
+// time: Thu Oct 08 2026
+// desc: 宝石信息弹窗
+//*********************
+import { _decorator, find, Node, Sprite } from 'cc';
+import { SpriteLoad } from 'db://assets/mx/components/SpriteLoad';
+import { GBundle } from '../../game/ConfigRes';
+import { Auto_PopGemInfo } from './Auto_PopGemInfo';
+const { ccclass } = _decorator;
+
+const LOG = '[PopGemInfo]';
+
+/**
+ * 宝石信息：iconbg=武器信息图标底框{quality}；icon=Weapon.icon；
+ * lb_name / lb_desc 多语言；lb_lv=Lv.{quality}。
+ */
+@ccclass('UIPopGemInfo')
+export class UIPopGemInfo extends Auto_PopGemInfo {
+
+    /** 品质底框 */
+    private _iconbg: Node | null = null;
+    /** 宝石图标 */
+    private _icon: Node | null = null;
+
+    onLoad(): void {
+        super.onLoad();
+        this._iconbg = find('center/iconbg', this.node);
+        this._icon = find('center/icon', this.node);
+        if (!this._iconbg) console.warn(LOG, 'iconbg 缺失');
+        if (!this._icon) console.warn(LOG, 'icon 缺失');
+    }
+
+    onInit(): void {
+        this._fill(this._resolveGemId());
+    }
+
+    click_bgMask(): void {
+        void this.close(2);
+    }
+
+    click_btnClose(): void {
+        void this.close(2);
+    }
+
+    /** 解析打开参数：数字 gemId 或 { gemId } */
+    private _resolveGemId(): number {
+        const raw = this.prema;
+        if (raw !== null && typeof raw === 'object') {
+            return Math.floor(Number((raw as { gemId?: number }).gemId) || 0);
+        }
+        return Math.floor(Number(raw) || 0);
+    }
+
+    /** 按宝石 id 刷新 */
+    private _fill(gemId: number): void {
+        const conf = gemId > 0 ? gg.gem.getGem(gemId) : null;
+        if (!conf) {
+            console.warn(LOG, '宝石配表缺失', gemId);
+            return;
+        }
+        const quality = Math.floor(Number(conf.quality) || 0);
+        if (quality < 1 || quality > 5) console.warn(LOG, '品质无对应底框', gemId, quality);
+
+        this._setWeaponSprite(this._iconbg, `weapon/武器信息图标底框${quality}`);
+        const iconName = String(conf.icon || '').trim();
+        if (!iconName) console.warn(LOG, 'icon 缺失', gemId);
+        this._setWeaponSprite(this._icon, iconName ? `weapon/${iconName}` : '');
+
+        if (this.lb_name) this.lb_name.string = gg.lang.get(conf.name);
+        if (this.lb_lv) this.lb_lv.string = `Lv.${quality}`;
+        if (this.lb_desc) this.lb_desc.string = gg.lang.get(conf.desc);
+    }
+
+    /** icons/weapon 下图 */
+    private _setWeaponSprite(node: Node | null, path: string): void {
+        if (!node?.isValid) return;
+        if (!path) {
+            node.active = false;
+            node.getComponent(SpriteLoad)?.clear();
+            const sp = node.getComponent(Sprite);
+            if (sp) sp.spriteFrame = null;
+            return;
+        }
+        node.active = true;
+        if (!node.getComponent(Sprite)) node.addComponent(Sprite);
+        node.getOrAddComponent(SpriteLoad).setSprite(path, GBundle.Items);
+    }
+}
diff --git a/assets/script/ui/PopGemInfo/UIPopGemInfo.ts.meta b/assets/script/ui/PopGemInfo/UIPopGemInfo.ts.meta
new file mode 100644
index 0000000..1236438
--- /dev/null
+++ b/assets/script/ui/PopGemInfo/UIPopGemInfo.ts.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.24",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "7f13fa9c-e418-4960-a180-d16633a2eca9",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/docs/需求-宝石装备合成.md b/docs/需求-宝石装备合成.md
index 6c83319..411b4c2 100644
--- a/docs/需求-宝石装备合成.md
+++ b/docs/需求-宝石装备合成.md
@@ -1,6 +1,6 @@
 # 需求：宝石装备与合成
 
-> 状态：局外 UI / 存档 / 合成本期实现；局内属性与技能生效后续切片。
+> 状态：局外 UI / 存档 / 合成已实现；局内属性与技能已接入战斗。
 
 ## 背景
 
@@ -38,6 +38,30 @@
 3. 多轮直到无可合成。
 4. 弹窗展示：各宝石「合成后可用数 − 合成前可用数」中 `delta > 0` 的条目。
 
-## 局内（后续）
+## UI 注意
 
-通过 `gg.gem.getElementSlots(elementType)` 读取镶嵌，再叠加 `attritubes` / `act_skill`。本期不接入战斗。
+- 仓库按页签展示，无「全部」、无滚动：`btn0~btn5` → `Weapon.type` 1~6（通用/金木水火土），默认通用。
+- 仓库格分帧实例化进 `ui_content`（Layout 排布）；交互为直接拖拽镶嵌/卸下。
+- 仓库全量重建仅：打开页 / 切页签 / 一键合成。镶嵌成功只局部改数量与槽位；失败不刷列表。
+- 仓库项 `bg` 用 `宝石框大{quality}`；镶嵌位 `g1~g4` 仍用 `宝石框小`。
+
+## 局内（已接入）
+
+五行数字上阵时（`TowerLoadoutService.setupCombat`）：
+
+1. 本机玩家：`gg.gem.getElementSlots(Hero.herotype)` 读该五行最多 4 槽宝石。
+2. 每颗 `attritubes` 写入该数字属性（多槽累加）；刷新上阵前清除旧 `gem_` modifier。
+3. 有 `act_skill` 的宝石接到原有武器技能槽（主动 / 被动 / atk_buff）；同五行多颗技能宝石时取品质更高者（配表异常时 warn）。
+4. AI 对手不读本机镶嵌。
+
+### `attritubes` 类型
+
+| type | 含义 | 战斗写入 |
+|------|------|----------|
+| 1 | 攻击万分比 | Attack Mul |
+| 2 | 暴击万分比 | CritRate Add |
+| 3 | 暴击伤害万分比 | CritDamage Add |
+| 4 | 攻速万分比 | aspd_add |
+| 5 | 伤害加成万分比 | dmg_mul |
+
+实现：`assets/script/battle/combat/GemBattleEffect.ts`。
diff --git a/配置表/excelList/~$关卡表.xlsx b/配置表/excelList/~$关卡表.xlsx
deleted file mode 100644
index 6e7142c..0000000
Binary files a/配置表/excelList/~$关卡表.xlsx and /dev/null differ
diff --git a/配置表/excelList/~$武器表.xlsx b/配置表/excelList/~$武器表.xlsx
deleted file mode 100644
index 6e7142c..0000000
Binary files a/配置表/excelList/~$武器表.xlsx and /dev/null differ
diff --git a/配置表/excelList/~$随机buff.xlsx b/配置表/excelList/~$随机buff.xlsx
deleted file mode 100644
index 6e7142c..0000000
Binary files a/配置表/excelList/~$随机buff.xlsx and /dev/null differ
diff --git a/配置表/策划配置/~$数字2048资源.xlsx b/配置表/策划配置/~$数字2048资源.xlsx
deleted file mode 100644
index 6e7142c..0000000
Binary files a/配置表/策划配置/~$数字2048资源.xlsx and /dev/null differ