转繁体，加升级引导和装备小红点

Assets/Res/Config/LanguageChineseConfig.json

@@ -2,35 +2,35 @@
   "configList": [
     {
       "ID": 1,
-      "txt": "亚瑟·龙焰"
+      "txt": "亞瑟·龍焰"
     },
     {
       "ID": 2,
-      "txt": "莱恩·天戟"
+      "txt": "萊恩·天戟"
     },
     {
       "ID": 3,
-      "txt": "达米安·虎啸"
+      "txt": "達米安·虎嘯"
     },
     {
       "ID": 4,
-      "txt": "维克多·铁拳"
+      "txt": "維克多·鐵拳"
     },
     {
       "ID": 5,
-      "txt": "加雷斯·风暴"
+      "txt": "加雷斯·風暴"
     },
     {
       "ID": 6,
-      "txt": "伊丽莎白·月影"
+      "txt": "伊莉莎白·月影"
     },
     {
       "ID": 7,
-      "txt": "马修·星辰"
+      "txt": "馬修·星辰"
     },
     {
       "ID": 8,
-      "txt": "卡特琳娜·霜语"
+      "txt": "卡特琳娜·霜語"
     },
     {
       "ID": 9,
@@ -38,47 +38,47 @@
     },
     {
       "ID": 10,
-      "txt": "艾琳娜·灵风"
+      "txt": "艾琳娜·靈風"
     },
     {
       "ID": 11,
-      "txt": "加百利·圣心"
+      "txt": "加百利·聖心"
     },
     {
       "ID": 12,
-      "txt": "索菲亚·慈恩"
+      "txt": "索菲亞·慈恩"
     },
     {
       "ID": 13,
-      "txt": "卢克·净魂"
+      "txt": "盧克·淨魂"
     },
     {
       "ID": 14,
-      "txt": "安娜贝尔·光耀"
+      "txt": "安娜貝爾·光耀"
     },
     {
       "ID": 15,
-      "txt": "伊莎贝拉·恩典"
+      "txt": "伊莎貝拉·恩典"
     },
     {
       "ID": 16,
-      "txt": "莱恩·影踪"
+      "txt": "萊恩·影蹤"
     },
     {
       "ID": 17,
-      "txt": "艾米丽·翠羽"
+      "txt": "艾米麗·翠羽"
     },
     {
       "ID": 18,
-      "txt": "德里克·疾风"
+      "txt": "德裏克·疾風"
     },
     {
       "ID": 19,
-      "txt": "维多利亚·夜刃"
+      "txt": "維多利亞·夜刃"
     },
     {
       "ID": 20,
-      "txt": "诺亚·林踪"
+      "txt": "諾亞·林蹤"
     },
     {
       "ID": 21,
@@ -86,27 +86,27 @@
     },
     {
       "ID": 22,
-      "txt": "攻击力"
+      "txt": "攻擊力"
     },
     {
       "ID": 23,
-      "txt": "防御力"
+      "txt": "防禦力"
     },
     {
       "ID": 24,
-      "txt": "攻击速度"
+      "txt": "攻擊速度"
     },
     {
       "ID": 25,
-      "txt": "暴击几率"
+      "txt": "暴擊幾率"
     },
     {
       "ID": 26,
-      "txt": "暴击伤害"
+      "txt": "暴擊傷害"
     },
     {
       "ID": 27,
-      "txt": "闪避几率"
+      "txt": "閃避幾率"
     },
     {
       "ID": 28,
@@ -118,11 +118,11 @@
     },
     {
       "ID": 30,
-      "txt": "传说"
+      "txt": "傳說"
     },
     {
       "ID": 31,
-      "txt": "史诗"
+      "txt": "史詩"
     },
     {
       "ID": 32,
@@ -130,131 +130,131 @@
     },
     {
       "ID": 33,
-      "txt": "向前方释放1道剑气，造成<color=#7AC180>{0}%</color>攻击力的伤害。"
+      "txt": "向前方釋放1道劍氣，造成<color=#7AC180>{0}%</color>攻擊力的傷害。"
     },
     {
       "ID": 34,
-      "txt": "造成的伤害提升至<color=#7AC180>{0}%</color>。"
+      "txt": "造成的傷害提升至<color=#7AC180>{0}%</color>。"
     },
     {
       "ID": 35,
-      "txt": "造成的伤害提升至<color=#7AC180>{0}%</color>。"
+      "txt": "造成的傷害提升至<color=#7AC180>{0}%</color>。"
     },
     {
       "ID": 36,
-      "txt": "造成的伤害提升至<color=#7AC180>{0}%</color>。"
+      "txt": "造成的傷害提升至<color=#7AC180>{0}%</color>。"
     },
     {
       "ID": 37,
-      "txt": "英雄提升至{0}级强化该技能"
+      "txt": "英雄提升至{0}級強化該技能"
     },
     {
       "ID": 38,
-      "txt": "英雄提升至{0}级解锁该技能"
+      "txt": "英雄提升至{0}級解鎖該技能"
     },
     {
       "ID": 39,
-      "txt": "英雄提升至{0}星强化该技能"
+      "txt": "英雄提升至{0}星強化該技能"
     },
     {
       "ID": 40,
-      "txt": "英雄提升至{0}星解锁该技能"
+      "txt": "英雄提升至{0}星解鎖該技能"
     },
     {
       "ID": 41,
-      "txt": "{0}级："
+      "txt": "{0}級："
     },
     {
       "ID": 42,
-      "txt": "({0}级解锁)"
+      "txt": "({0}級解鎖)"
     },
     {
       "ID": 43,
-      "txt": "({0}星解锁)"
+      "txt": "({0}星解鎖)"
     },
     {
       "ID": 44,
-      "txt": "技能已达最高等级"
+      "txt": "技能已達最高等級"
     },
     {
       "ID": 45,
-      "txt": "旋风斩"
+      "txt": "旋風斬"
     },
     {
       "ID": 46,
-      "txt": "对前方范围释放火焰，对范围内的敌人进行多次灼烧，每次造成<color=#7AC180>{0}%</color>攻击力的伤害，持续<color=#7AC180>{1}秒</color>"
+      "txt": "對前方範圍釋放火焰，對範圍內的敵人進行多次灼燒，每次造成<color=#7AC180>{0}%</color>攻擊力的傷害，持續<color=#7AC180>{1}秒</color>"
     },
     {
       "ID": 47,
-      "txt": "每次造成的伤害提升至<color=#7AC180>{0}%</color>。"
+      "txt": "每次造成的傷害提升至<color=#7AC180>{0}%</color>。"
     },
     {
       "ID": 48,
-      "txt": "每次造成的伤害提升至<color=#7AC180>{0}%</color>。"
+      "txt": "每次造成的傷害提升至<color=#7AC180>{0}%</color>。"
     },
     {
       "ID": 49,
-      "txt": "持续时间提升至<color=#7AC180>{1}秒</color>。"
+      "txt": "持續時間提升至<color=#7AC180>{1}秒</color>。"
     },
     {
       "ID": 50,
-      "txt": "烈焰喷涌"
+      "txt": "烈焰噴湧"
     },
     {
       "ID": 51,
-      "txt": "对生命值最低的英雄，恢复<color=#7AC180>{0}%</color>攻击力的血量。"
+      "txt": "對生命值最低的英雄，恢復<color=#7AC180>{0}%</color>攻擊力的血量。"
     },
     {
       "ID": 52,
-      "txt": "恢复的血量提升至<color=#7AC180>{0}%</color>。"
+      "txt": "恢復的血量提升至<color=#7AC180>{0}%</color>。"
     },
     {
       "ID": 53,
-      "txt": "恢复的血量提升至<color=#7AC180>{0}%</color>。"
+      "txt": "恢復的血量提升至<color=#7AC180>{0}%</color>。"
     },
     {
       "ID": 54,
-      "txt": "恢复的血量提升至<color=#7AC180>{0}%</color>。"
+      "txt": "恢復的血量提升至<color=#7AC180>{0}%</color>。"
     },
     {
       "ID": 55,
-      "txt": "光辉治愈"
+      "txt": "光輝治癒"
     },
     {
       "ID": 56,
-      "txt": "向前方连续射出多支魔法箭，造成<color=#7AC180>{0}%</color>攻击力的伤害。"
+      "txt": "向前方連續射出多支魔法箭，造成<color=#7AC180>{0}%</color>攻擊力的傷害。"
     },
     {
       "ID": 57,
-      "txt": "造成的伤害提升至<color=#7AC180>{0}%</color>。"
+      "txt": "造成的傷害提升至<color=#7AC180>{0}%</color>。"
     },
     {
       "ID": 58,
-      "txt": "造成的伤害提升至<color=#7AC180>{0}%</color>。"
+      "txt": "造成的傷害提升至<color=#7AC180>{0}%</color>。"
     },
     {
       "ID": 59,
-      "txt": "造成的伤害提升至<color=#7AC180>{0}%</color>。"
+      "txt": "造成的傷害提升至<color=#7AC180>{0}%</color>。"
     },
     {
       "ID": 60,
-      "txt": "箭羽风暴"
+      "txt": "箭羽風暴"
     },
     {
       "ID": 61,
-      "txt": "解锁"
+      "txt": "解鎖"
     },
     {
       "ID": 62,
-      "txt": "等级{0}>>{1}"
+      "txt": "等級{0}>>{1}"
     },
     {
       "ID": 63,
-      "txt": "主力英雄等级差不得超过10级"
+      "txt": "主力英雄等級差不得超過10級"
     },
     {
       "ID": 64,
-      "txt": "主力英雄等级：{0}"
+      "txt": "主力英雄等級：{0}"
     },
     {
       "ID": 65,
@@ -262,11 +262,11 @@
     },
     {
       "ID": 66,
-      "txt": "钢铁意志"
+      "txt": "鋼鐵意志"
     },
     {
       "ID": 67,
-      "txt": "斩风之力"
+      "txt": "斬風之力"
     },
     {
       "ID": 68,
@@ -278,19 +278,19 @@
     },
     {
       "ID": 70,
-      "txt": "提高<color=#7AC180>{0}%</color>%的防御值"
+      "txt": "提高<color=#7AC180>{0}%</color>%的防禦值"
     },
     {
       "ID": 71,
-      "txt": "额外释放<color=#7AC180>{0}</color>道[旋风斩]的剑气"
+      "txt": "額外釋放<color=#7AC180>{0}</color>道[旋風斬]的劍氣"
     },
     {
       "ID": 72,
-      "txt": "降低<color=#7AC180>{0}%</color>的暴击伤害"
+      "txt": "降低<color=#7AC180>{0}%</color>的暴擊傷害"
     },
     {
       "ID": 73,
-      "txt": "提升<color=#7AC180>{0}%</color>%的攻击力"
+      "txt": "提升<color=#7AC180>{0}%</color>%的攻擊力"
     },
     {
       "ID": 74,
@@ -298,15 +298,15 @@
     },
     {
       "ID": 75,
-      "txt": "延长<color=#7AC180>{0}</color>秒[烈焰喷涌]的持续时间"
+      "txt": "延長<color=#7AC180>{0}</color>秒[烈焰噴湧]的持續時間"
     },
     {
       "ID": 76,
-      "txt": "提升<color=#7AC180>{0}%</color>%的技能暴击率"
+      "txt": "提升<color=#7AC180>{0}%</color>%的技能暴擊率"
     },
     {
       "ID": 77,
-      "txt": "神圣力量"
+      "txt": "神聖力量"
     },
     {
       "ID": 78,
@@ -318,11 +318,11 @@
     },
     {
       "ID": 80,
-      "txt": "光辉复苏"
+      "txt": "光輝復蘇"
     },
     {
       "ID": 81,
-      "txt": "提升<color=#7AC180>{0}%</color>%的攻击力"
+      "txt": "提升<color=#7AC180>{0}%</color>%的攻擊力"
     },
     {
       "ID": 82,
@@ -330,11 +330,11 @@
     },
     {
       "ID": 83,
-      "txt": "对生命值低于<color=#7AC180>{0}%</color>%的英雄，额外提高<color=#7AC180>{0}%</color>%的治疗量"
+      "txt": "對生命值低於<color=#7AC180>{0}%</color>%的英雄，額外提高<color=#7AC180>{0}%</color>%的治療量"
     },
     {
       "ID": 84,
-      "txt": "同时治疗<color=#7AC180>{0}</color>名英雄"
+      "txt": "同時治療<color=#7AC180>{0}</color>名英雄"
     },
     {
       "ID": 85,
@@ -346,15 +346,15 @@
     },
     {
       "ID": 87,
-      "txt": "无尽射击"
+      "txt": "無盡射擊"
     },
     {
       "ID": 88,
-      "txt": "终结射击"
+      "txt": "終結射擊"
     },
     {
       "ID": 89,
-      "txt": "提升<color=#7AC180>{0}%</color>%的攻击力"
+      "txt": "提升<color=#7AC180>{0}%</color>%的攻擊力"
     },
     {
       "ID": 90,
@@ -362,11 +362,11 @@
     },
     {
       "ID": 91,
-      "txt": "增加<color=#7AC180>{0}</color>支[连续射击]的魔法箭"
+      "txt": "增加<color=#7AC180>{0}</color>支[連續射擊]的魔法箭"
     },
     {
       "ID": 92,
-      "txt": "对生命值低于<color=#7AC180>{0}%</color>的敌人，额外造成<color=#7AC180>{0}%</color>伤害"
+      "txt": "對生命值低於<color=#7AC180>{0}%</color>的敵人，額外造成<color=#7AC180>{0}%</color>傷害"
     },
     {
       "ID": 93,
@@ -378,27 +378,247 @@
     },
     {
       "ID": 95,
-      "txt": "烈焰持续"
+      "txt": "烈焰持續"
     },
     {
       "ID": 96,
-      "txt": "超凡暴击"
+      "txt": "超凡暴擊"
     },
     {
       "ID": 97,
-      "txt": "战士装备"
+      "txt": "戰士裝備"
     },
     {
       "ID": 98,
-      "txt": "法师装备"
+      "txt": "法師裝備"
     },
     {
       "ID": 99,
-      "txt": "牧师装备"
+      "txt": "牧師裝備"
     },
     {
       "ID": 100,
-      "txt": "游侠装备"
+      "txt": "遊俠裝備"
+    },
+    {
+      "ID": 101,
+      "txt": "專屬裝備（敬請期待）"
+    },
+    {
+      "ID": 102,
+      "txt": "金幣不足"
+    },
+    {
+      "ID": 103,
+      "txt": "資源不足"
+    },
+    {
+      "ID": 104,
+      "txt": "英雄經驗，可用於升級英雄等級<color=#ff0000>（每殺死一個小怪能獲得經驗，擊殺boss能獲得大量經驗）</color>"
+    },
+    {
+      "ID": 105,
+      "txt": "金幣，用於抽取英雄寶箱<color=#ff0000>（每殺死一個小怪有幾率獲得金幣，擊殺boss能獲得大量金幣）</color>"
+    },
+    {
+      "ID": 106,
+      "txt": "紫鑽（敬請期待）"
+    },
+    {
+      "ID": 107,
+      "txt": "點擊螢幕空白處從天空中召喚一個隕石，對怪物造成1點傷害，並有<color=#ff0000>30%</color>概率獲得1枚金幣（boss怪<color=#ff0000>40%</color>掉落，金幣數量<color=#ff0000>+2</color>）"
+    },
+    {
+      "ID": 108,
+      "txt": "裝備"
+    },
+    {
+      "ID": 109,
+      "txt": "替補英雄"
+    },
+    {
+      "ID": 110,
+      "txt": "主力英雄"
+    },
+    {
+      "ID": 111,
+      "txt": "英雄背包"
+    },
+    {
+      "ID": 112,
+      "txt": "大自然的恩惠.寶箱"
+    },
+    {
+      "ID": 113,
+      "txt": "消耗對應的金幣開啟寶箱，獲得大自然的恩惠，有概率能獲得以下物品（英雄進階材料、 各種品質的武器）"
+    },
+    {
+      "ID": 114,
+      "txt": "友情提示10連抽更划算"
+    },
+    {
+      "ID": 115,
+      "txt": "失 敗"
+    },
+    {
+      "ID": 116,
+      "txt": "你太弱了，請提升實力再來挑戰"
+    },
+    {
+      "ID": 117,
+      "txt": "重新開始"
+    },
+    {
+      "ID": 118,
+      "txt": "....."
+    },
+    {
+      "ID": 119,
+      "txt": "發生了什麼事...."
+    },
+    {
+      "ID": 120,
+      "txt": "前方好像出現了超強怪物，大家做好準備。"
+    },
+    {
+      "ID": 121,
+      "txt": "越往深林深處走怪物越強大了，這裏的怪我有點招架不足了，我能不能加入你們一起探險？"
+    },
+    {
+      "ID": 122,
+      "txt": "沒問題，我們正缺你這樣的勇士。"
+    },
+    {
+      "ID": 123,
+      "txt": "歡迎加入我們的隊伍，讓我們一起看看深林深處是什麼在作怪。"
+    },
+    {
+      "ID": 124,
+      "txt": "（喘息著）這該死的怪物怎麼殺也殺不完！"
+    },
+    {
+      "ID": 125,
+      "txt": "怎麼辦要先回村莊嗎？"
+    },
+    {
+      "ID": 126,
+      "txt": "救命呀~"
+    },
+    {
+      "ID": 127,
+      "txt": "救命~~~"
+    },
+    {
+      "ID": 128,
+      "txt": "我名艾爾溫。這裏充滿了黑暗的氣息，我無法袖手旁觀."
+    },
+    {
+      "ID": 129,
+      "txt": "讓它們試試我的火焰~"
+    },
+    {
+      "ID": 130,
+      "txt": "太好了艾爾溫，感謝你的加入！"
+    },
+    {
+      "ID": 131,
+      "txt": "兄弟們，我堅持不住了，這一波怪物太猛了！"
+    },
+    {
+      "ID": 132,
+      "txt": "天空中突然閃出一個人影。"
+    },
+    {
+      "ID": 133,
+      "txt": "我是來自教堂的牧師，我來為你治療！"
+    },
+    {
+      "ID": 134,
+      "txt": "裝備回收"
+    },
+    {
+      "ID": 135,
+      "txt": "僅分解低級裝備，放心使用"
+    },
+    {
+      "ID": 136,
+      "txt": "回收獎勵"
+    },
+    {
+      "ID": 137,
+      "txt": "確認回收"
+    },
+    {
+      "ID": 138,
+      "txt": "升級"
+    },
+    {
+      "ID": 139,
+      "txt": "升星"
+    },
+    {
+      "ID": 140,
+      "txt": "生命"
+    },
+    {
+      "ID": 141,
+      "txt": "攻擊"
+    },
+    {
+      "ID": 142,
+      "txt": "防禦"
+    },
+    {
+      "ID": 143,
+      "txt": "等級"
+    },
+    {
+      "ID": 144,
+      "txt": "本次升級將大幅提升屬性"
+    },
+    {
+      "ID": 145,
+      "txt": "解鎖"
+    },
+    {
+      "ID": 146,
+      "txt": "冷卻{0}秒"
+    },
+    {
+      "ID": 147,
+      "txt": "職業裝備"
+    },
+    {
+      "ID": 148,
+      "txt": "戰士"
+    },
+    {
+      "ID": 149,
+      "txt": "法師"
+    },
+    {
+      "ID": 150,
+      "txt": "牧師"
+    },
+    {
+      "ID": 151,
+      "txt": "遊俠"
+    },
+    {
+      "ID": 152,
+      "txt": "獲得獎勵"
+    },
+    {
+      "ID": 153,
+      "txt": "一鍵裝備"
+    },
+    {
+      "ID": 154,
+      "txt": "點這裏, 提升英雄"
+    },
+    {
+      "ID": 155,
+      "txt": "技能"
     }
   ]
 }

Assets/Res/UI/BoxPanel.prefab

@@ -44,7 +44,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -3563, y: -182}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8965272612517638377
 MonoBehaviour:
@@ -521,6 +521,7 @@ GameObject:
   - component: {fileID: 1395504526245340398}
   - component: {fileID: 7498556988576361376}
   - component: {fileID: 4062822801457872003}
+  - component: {fileID: 7623264381688979618}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -620,6 +621,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
   m_EffectDistance: {x: 3.03, y: -2.77}
   m_UseGraphicAlpha: 1
+--- !u!114 &7623264381688979618
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2480383054228350462}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 112
 --- !u!1 &2972985852202581853
 GameObject:
   m_ObjectHideFlags: 0
@@ -632,6 +646,7 @@ GameObject:
   - component: {fileID: 8313633874709827031}
   - component: {fileID: 7002168581208769732}
   - component: {fileID: 3505250749968322634}
+  - component: {fileID: 2944033596006560952}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: message
@@ -717,6 +732,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &2944033596006560952
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2972985852202581853}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 113
 --- !u!1 &3049841431087626111
 GameObject:
   m_ObjectHideFlags: 0
@@ -920,6 +948,7 @@ GameObject:
   - component: {fileID: 2683536534778087535}
   - component: {fileID: 3403599604496558754}
   - component: {fileID: 7811836410668786241}
+  - component: {fileID: 789590480390429455}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: message (1)
@@ -989,6 +1018,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u53CB\u60C5\u63D0\u793A10\u8FDE\u62BD\u66F4\u5212\u7B97"
+--- !u!114 &789590480390429455
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5492516986451035646}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 114
 --- !u!1 &5523729796495235583
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/CombatHeroDiePanel.prefab

@@ -410,6 +410,7 @@ GameObject:
   - component: {fileID: 4732789714552782586}
   - component: {fileID: 2086373568043157529}
   - component: {fileID: 1089079095720410397}
+  - component: {fileID: 6364203268772396206}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -479,6 +480,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4F60\u592A\u5F31\u4E86\uFF0C\u8BF7\u63D0\u5347\u5B9E\u529B\u518D\u6765\u6311\u6218"
+--- !u!114 &6364203268772396206
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5614495180248260428}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 116
 --- !u!1 &5723808475305056174
 GameObject:
   m_ObjectHideFlags: 0
@@ -492,6 +506,7 @@ GameObject:
   - component: {fileID: 2143477766085887442}
   - component: {fileID: 3750531416279218773}
   - component: {fileID: 6257030161071468826}
+  - component: {fileID: 8496282919989923649}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_shibai
@@ -591,6 +606,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.6784314}
   m_EffectDistance: {x: 2.73, y: -3.39}
   m_UseGraphicAlpha: 1
+--- !u!114 &8496282919989923649
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5723808475305056174}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 115
 --- !u!1 &6238981342543973910
 GameObject:
   m_ObjectHideFlags: 0
@@ -769,7 +797,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -2603, y: 1760}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &5576121568784299897
 MonoBehaviour:
@@ -807,6 +835,7 @@ GameObject:
   - component: {fileID: 1885857017647533627}
   - component: {fileID: 2617230386661053475}
   - component: {fileID: 4747770431483140316}
+  - component: {fileID: 9167164044077474587}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -891,6 +920,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.08, g: 0.0517647, b: 0.009411764, a: 0.56078434}
   m_EffectDistance: {x: 1.65, y: -1.39}
   m_UseGraphicAlpha: 1
+--- !u!114 &9167164044077474587
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7178446007438412160}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 117
 --- !u!1 &7363585873547743305
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/EqRecyclePanel.prefab

@@ -38,7 +38,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 4}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1521278904985518640
 CanvasRenderer:
@@ -1121,6 +1121,7 @@ GameObject:
   - component: {fileID: 3183235745019377269}
   - component: {fileID: 2264125635943602183}
   - component: {fileID: 7218787915082947762}
+  - component: {fileID: 8796050205555064360}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: txt (2)
@@ -1190,6 +1191,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u56DE\u6536\u5956\u52B1"
+--- !u!114 &8796050205555064360
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5203825452665584381}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 136
 --- !u!1 &5431136514239763981
 GameObject:
   m_ObjectHideFlags: 0
@@ -1281,6 +1295,7 @@ GameObject:
   - component: {fileID: 1496120003778871479}
   - component: {fileID: 2923867478086025204}
   - component: {fileID: 8045144202109628541}
+  - component: {fileID: 6550394267263367428}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: txt
@@ -1350,6 +1365,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u786E\u8BA4\u56DE\u6536"
+--- !u!114 &6550394267263367428
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5675119288573334327}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 137
 --- !u!1 &5686360776868574338
 GameObject:
   m_ObjectHideFlags: 0
@@ -1363,6 +1391,7 @@ GameObject:
   - component: {fileID: 9067907664054521920}
   - component: {fileID: 8026688102264174980}
   - component: {fileID: 6158524179197130018}
+  - component: {fileID: 8840081653085843912}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: txtTitle
@@ -1462,6 +1491,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
   m_EffectDistance: {x: 5.18, y: -1.99}
   m_UseGraphicAlpha: 1
+--- !u!114 &8840081653085843912
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5686360776868574338}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 134
 --- !u!1 &6824848771942569640
 GameObject:
   m_ObjectHideFlags: 0
@@ -2149,6 +2191,7 @@ GameObject:
   - component: {fileID: 6865387838043282277}
   - component: {fileID: 6651184113478907773}
   - component: {fileID: 6521442048751020219}
+  - component: {fileID: 5263659972284783852}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: txtIntro
@@ -2218,6 +2261,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4EC5\u5206\u89E3\u4F4E\u7EA7\u88C5\u5907\uFF0C\u653E\u5FC3\u4F7F\u7528"
+--- !u!114 &5263659972284783852
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8925161061321938877}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 135
 --- !u!1 &9092576328284559768
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/HeroBagPanel.prefab

@@ -460,6 +460,7 @@ GameObject:
   - component: {fileID: 863734795245060117}
   - component: {fileID: 8781756907137386836}
   - component: {fileID: 8503848391182889331}
+  - component: {fileID: 8579598388852140971}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: txtMainHero
@@ -529,6 +530,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4E3B\u529B\u82F1\u96C4"
+--- !u!114 &8579598388852140971
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 316911648012210599}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 110
 --- !u!1 &345376244727652275
 GameObject:
   m_ObjectHideFlags: 0
@@ -1559,6 +1573,7 @@ GameObject:
   - component: {fileID: 6612398528495129329}
   - component: {fileID: 1000815139933130389}
   - component: {fileID: 8187823210225154571}
+  - component: {fileID: 5717688604492870297}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: txt
@@ -1628,6 +1643,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u88C5\u5907"
+--- !u!114 &5717688604492870297
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 878113137905382508}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 108
 --- !u!1 &896807601340215817
 GameObject:
   m_ObjectHideFlags: 0
@@ -4423,6 +4451,7 @@ RectTransform:
   m_Children:
   - {fileID: 2961649901238549022}
   - {fileID: 6612398528495129329}
+  - {fileID: 1492814802000151354}
   m_Father: {fileID: 7111392178285703134}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -5312,7 +5341,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &67843362433966437
 MonoBehaviour:
@@ -5448,6 +5477,15 @@ MonoBehaviour:
     - gameObject: {fileID: 633043608376079090}
     - gameObject: {fileID: 2353568671963198049}
     - gameObject: {fileID: 2092809658225085607}
+  - key: AlerRed
+    gameObject: {fileID: 8956633222987790951}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1004509144920360798}
+    - gameObject: {fileID: 633043608376079090}
+    - gameObject: {fileID: 2353568671963198049}
+    - gameObject: {fileID: 2092809658225085607}
   isAssetBundle: 1
 --- !u!222 &3181852693172486306
 CanvasRenderer:
@@ -6312,6 +6350,7 @@ GameObject:
   - component: {fileID: 186689008419371845}
   - component: {fileID: 5593879167665457478}
   - component: {fileID: 1802240029462561780}
+  - component: {fileID: 2304399620597805954}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: txt (1)
@@ -6381,6 +6420,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u82F1\u96C4\u80CC\u5305"
+--- !u!114 &2304399620597805954
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4396018671665237587}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 111
 --- !u!1 &4425828469231899128
 GameObject:
   m_ObjectHideFlags: 0
@@ -7139,6 +7191,7 @@ GameObject:
   - component: {fileID: 4898319999670949978}
   - component: {fileID: 2240972726940887036}
   - component: {fileID: 9038113785189193125}
+  - component: {fileID: 7080083969320597490}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: txtBackHero
@@ -7208,6 +7261,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u66FF\u8865\u82F1\u96C4"
+--- !u!114 &7080083969320597490
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4828009758064597117}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 109
 --- !u!1 &4831317832591357862
 GameObject:
   m_ObjectHideFlags: 0
@@ -10507,6 +10573,90 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &7017446781705700495
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8903143059705671292}
+  - component: {fileID: 6123971060029580183}
+  - component: {fileID: 1646396364899761708}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8903143059705671292
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7017446781705700495}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1492814802000151354}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 6.26, y: 18.21}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6123971060029580183
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7017446781705700495}
+  m_CullTransparentMesh: 1
+--- !u!114 &1646396364899761708
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7017446781705700495}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_Alert_Circle_Icon_Exclamation
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 8e0fed06f6e134745d1fa1d786d61cbc
 --- !u!1 &7031409575537508775
 GameObject:
   m_ObjectHideFlags: 0
@@ -11102,6 +11252,90 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &7542437920910971018
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 555403185309931461}
+  - component: {fileID: 1682663878527223360}
+  - component: {fileID: 5613197380064496064}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Border
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &555403185309931461
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7542437920910971018}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1492814802000151354}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 30, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1682663878527223360
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7542437920910971018}
+  m_CullTransparentMesh: 1
+--- !u!114 &5613197380064496064
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7542437920910971018}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.3254902, g: 0.02745098, b: 0.05882353, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_Alert_Dot_Border
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 8e0fed06f6e134745d1fa1d786d61cbc
 --- !u!1 &7569975971492849229
 GameObject:
   m_ObjectHideFlags: 0
@@ -12760,6 +12994,92 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &8956633222987790951
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1492814802000151354}
+  - component: {fileID: 3074674538658140675}
+  - component: {fileID: 8389735525832534630}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Alert_Circle_Red (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1492814802000151354
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8956633222987790951}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8903143059705671292}
+  - {fileID: 555403185309931461}
+  m_Father: {fileID: 5541557250004592871}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 112, y: 43}
+  m_SizeDelta: {x: 28, y: 28}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3074674538658140675
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8956633222987790951}
+  m_CullTransparentMesh: 1
+--- !u!114 &8389735525832534630
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8956633222987790951}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.14117648, b: 0.24313726, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_Alert_Dot_Bg
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 8e0fed06f6e134745d1fa1d786d61cbc
 --- !u!1 &9046605817717828056
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/HeroDetailPanel.prefab

@@ -2333,6 +2333,7 @@ GameObject:
   - component: {fileID: 3576122129308486182}
   - component: {fileID: 4183961599139102957}
   - component: {fileID: 1159709775352773754}
+  - component: {fileID: 9049499679575702490}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: txtATK
@@ -2402,6 +2403,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u653B\u51FB"
+--- !u!114 &9049499679575702490
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1193903211735709433}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 141
 --- !u!1 &1211914252015833888
 GameObject:
   m_ObjectHideFlags: 0
@@ -2884,7 +2898,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -262, y: 48}
+  m_AnchoredPosition: {x: -262, y: 44}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3706764971069285189
@@ -3657,6 +3671,7 @@ GameObject:
   - component: {fileID: 718013610571428534}
   - component: {fileID: 6596697034086753241}
   - component: {fileID: 5906903864409113999}
+  - component: {fileID: 5342522612103542597}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: txtATK
@@ -3726,6 +3741,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u653B\u51FB"
+--- !u!114 &5342522612103542597
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1750529055048167448}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 141
 --- !u!1 &1798815564222463499
 GameObject:
   m_ObjectHideFlags: 0
@@ -4961,6 +4989,7 @@ GameObject:
   - component: {fileID: 333391965270795153}
   - component: {fileID: 8308810646396870343}
   - component: {fileID: 5426429406347955672}
+  - component: {fileID: 7348330343590057412}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: txtUpLvTips
@@ -5030,6 +5059,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u672C\u6B21\u5347\u7EA7\u5C06\u5927\u5E45\u63D0\u5347\u5C5E\u6027"
+--- !u!114 &7348330343590057412
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2369454066282298022}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 144
 --- !u!1 &2371704308230078451
 GameObject:
   m_ObjectHideFlags: 0
@@ -6008,6 +6050,7 @@ GameObject:
   - component: {fileID: 3326998736707446761}
   - component: {fileID: 8602721786518079912}
   - component: {fileID: 5389224752589133892}
+  - component: {fileID: 5921447090008859708}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: txt
@@ -6077,6 +6120,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5347\u7EA7"
+--- !u!114 &5921447090008859708
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2847304729143399522}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 138
 --- !u!1 &2868155219921467775
 GameObject:
   m_ObjectHideFlags: 0
@@ -8660,7 +8716,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7666796405045906089
 RectTransform:
   m_ObjectHideFlags: 0
@@ -9387,6 +9443,7 @@ GameObject:
   - component: {fileID: 2610608290071308305}
   - component: {fileID: 1160505306441662046}
   - component: {fileID: 527210349870208158}
+  - component: {fileID: 2001721587530006819}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: txt (1)
@@ -9456,6 +9513,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u7B49\u7EA7"
+--- !u!114 &2001721587530006819
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4225900038361094376}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 143
 --- !u!1 &4235540343541642625
 GameObject:
   m_ObjectHideFlags: 0
@@ -10287,9 +10357,9 @@ RectTransform:
   - {fileID: 3875893009412036452}
   m_Father: {fileID: 2920983210776913852}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 50, y: -96.6}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &4515796977380946822
@@ -10730,9 +10800,9 @@ RectTransform:
   - {fileID: 3238627385522138459}
   m_Father: {fileID: 3048653569318868344}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 50, y: -143.2}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &4724093761989566166
@@ -10833,7 +10903,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8494072435471062741
 RectTransform:
   m_ObjectHideFlags: 0
@@ -11129,9 +11199,9 @@ RectTransform:
   - {fileID: 2714858469072854325}
   m_Father: {fileID: 2920983210776913852}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 50, y: -143.2}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &4970468942560128240
@@ -11345,6 +11415,7 @@ GameObject:
   - component: {fileID: 3775778195469110210}
   - component: {fileID: 6541850966166253640}
   - component: {fileID: 3497477194425018052}
+  - component: {fileID: 4073048446937200799}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: TextSkill
@@ -11444,6 +11515,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1.83, y: -1.61}
   m_UseGraphicAlpha: 1
+--- !u!114 &4073048446937200799
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4990842854640410597}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 155
 --- !u!1 &5008413077809334098
 GameObject:
   m_ObjectHideFlags: 0
@@ -11841,9 +11925,9 @@ RectTransform:
   - {fileID: 6378568511483276108}
   m_Father: {fileID: 2920983210776913852}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 50, y: -50}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5188900526901306069
@@ -12928,9 +13012,9 @@ RectTransform:
   - {fileID: 1658771382462724868}
   m_Father: {fileID: 3048653569318868344}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 50, y: -50}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5457974619554868345
@@ -13700,9 +13784,9 @@ RectTransform:
   - {fileID: 6357081816506317440}
   m_Father: {fileID: 3048653569318868344}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 50, y: -96.6}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5734839009975372419
@@ -14371,6 +14455,7 @@ GameObject:
   - component: {fileID: 4409036237301418959}
   - component: {fileID: 4392017711145144604}
   - component: {fileID: 2112872975954836944}
+  - component: {fileID: 1137931259910873441}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: txtDEF
@@ -14440,6 +14525,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u9632\u5FA1"
+--- !u!114 &1137931259910873441
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6088236847350139630}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 142
 --- !u!1 &6116769799066756832
 GameObject:
   m_ObjectHideFlags: 0
@@ -16152,6 +16250,7 @@ GameObject:
   - component: {fileID: 6849964104307720021}
   - component: {fileID: 3566573195513001171}
   - component: {fileID: 2298052617001389203}
+  - component: {fileID: 7712461246936646189}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text
@@ -16221,6 +16320,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u7B49\u7EA7"
+--- !u!114 &7712461246936646189
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6602399037357372283}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 143
 --- !u!1 &6618761418717672493
 GameObject:
   m_ObjectHideFlags: 0
@@ -17968,6 +18080,7 @@ GameObject:
   - component: {fileID: 7148220926560266532}
   - component: {fileID: 7111028755855836172}
   - component: {fileID: 4288687308355067519}
+  - component: {fileID: 3243938198388057792}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: txt_up
@@ -18037,6 +18150,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u89E3\u9501"
+--- !u!114 &3243938198388057792
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7132007572503008048}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 145
 --- !u!1 &7152450143418491404
 GameObject:
   m_ObjectHideFlags: 0
@@ -18437,6 +18563,7 @@ GameObject:
   - component: {fileID: 5223800849228381480}
   - component: {fileID: 8918545210496389262}
   - component: {fileID: 7925234302589811569}
+  - component: {fileID: 5799433561726808593}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: txtHP
@@ -18506,6 +18633,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u751F\u547D"
+--- !u!114 &5799433561726808593
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7274030717640320613}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 140
 --- !u!1 &7282303635767211505
 GameObject:
   m_ObjectHideFlags: 0
@@ -19665,6 +19805,7 @@ GameObject:
   - component: {fileID: 3942752845785457892}
   - component: {fileID: 3871893794044576661}
   - component: {fileID: 4030050886871702320}
+  - component: {fileID: 2563793830233841141}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: txt (2)
@@ -19734,6 +19875,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u7B49\u7EA7"
+--- !u!114 &2563793830233841141
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7777860473046166092}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 143
 --- !u!1 &7786295750093721047
 GameObject:
   m_ObjectHideFlags: 0
@@ -21243,6 +21397,7 @@ GameObject:
   - component: {fileID: 1927863073632766206}
   - component: {fileID: 7668524206320049605}
   - component: {fileID: 5100336500503189401}
+  - component: {fileID: 8977556063050897454}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: txt
@@ -21312,6 +21467,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5347\u661F"
+--- !u!114 &8977556063050897454
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8226637605373966731}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 139
 --- !u!1 &8261649815796101814
 GameObject:
   m_ObjectHideFlags: 0
@@ -22385,6 +22553,7 @@ GameObject:
   - component: {fileID: 1211666869759507067}
   - component: {fileID: 5314918936222466316}
   - component: {fileID: 8532233976930465036}
+  - component: {fileID: 4601195492138373528}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: txtDEF
@@ -22454,6 +22623,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u9632\u5FA1"
+--- !u!114 &4601195492138373528
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8521442728305496995}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 142
 --- !u!1 &8572752872672063475
 GameObject:
   m_ObjectHideFlags: 0
@@ -22545,6 +22727,7 @@ GameObject:
   - component: {fileID: 4633144368778128099}
   - component: {fileID: 3344562053117740157}
   - component: {fileID: 3484110603225493752}
+  - component: {fileID: 2827296790330716138}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: txtHP
@@ -22614,6 +22797,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u751F\u547D"
+--- !u!114 &2827296790330716138
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8685766881361288323}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 140
 --- !u!1 &8718314518203138270
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/MainUIPanel.prefab

@@ -612,6 +612,90 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: 7f6af24b7e68d556cab4cc7ac439f1bb
+--- !u!1 &648841150146322101
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6414013126349034669}
+  - component: {fileID: 2060325606194171688}
+  - component: {fileID: 5092724009326319237}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Border
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6414013126349034669
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 648841150146322101}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 776199856319949212}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 30, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2060325606194171688
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 648841150146322101}
+  m_CullTransparentMesh: 1
+--- !u!114 &5092724009326319237
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 648841150146322101}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.3254902, g: 0.02745098, b: 0.05882353, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_Alert_Dot_Border
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 8e0fed06f6e134745d1fa1d786d61cbc
 --- !u!1 &709490475292508899
 GameObject:
   m_ObjectHideFlags: 0
@@ -1642,6 +1726,90 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\box.txt
     packgSpritePath: Assets/Res/UIAtlas/box.spriteatlasv2
     lasetJsonGUID: 400626ea8d256573f3183ae708817184
+--- !u!1 &2139610971110346833
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5512379658101088413}
+  - component: {fileID: 5401355373180777487}
+  - component: {fileID: 1664677966461117756}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5512379658101088413
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2139610971110346833}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 776199856319949212}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 6.26, y: 18.21}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5401355373180777487
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2139610971110346833}
+  m_CullTransparentMesh: 1
+--- !u!114 &1664677966461117756
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2139610971110346833}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_Alert_Circle_Icon_Exclamation
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 8e0fed06f6e134745d1fa1d786d61cbc
 --- !u!1 &2269232146240751079
 GameObject:
   m_ObjectHideFlags: 0
@@ -1752,6 +1920,7 @@ RectTransform:
   m_Children:
   - {fileID: 7362160405140399304}
   - {fileID: 4391858190883622590}
+  - {fileID: 776199856319949212}
   m_Father: {fileID: 5407905478464383173}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -4707,6 +4876,15 @@ MonoBehaviour:
     - gameObject: {fileID: 6107101496507914859}
     - gameObject: {fileID: 397899105639740}
     - gameObject: {fileID: 3469845461661622283}
+  - key: alterObj1
+    gameObject: {fileID: 7018803262902258246}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
   isAssetBundle: 1
 --- !u!1 &6750499123037776255
 GameObject:
@@ -4979,6 +5157,92 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &7018803262902258246
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 776199856319949212}
+  - component: {fileID: 8787417790543212270}
+  - component: {fileID: 2037980894803636943}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Alert_Circle_Red (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &776199856319949212
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7018803262902258246}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 5512379658101088413}
+  - {fileID: 6414013126349034669}
+  m_Father: {fileID: 8091112176597121872}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 40, y: 46}
+  m_SizeDelta: {x: 28, y: 28}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8787417790543212270
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7018803262902258246}
+  m_CullTransparentMesh: 1
+--- !u!114 &2037980894803636943
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7018803262902258246}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.14117648, b: 0.24313726, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_Alert_Dot_Bg
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 8e0fed06f6e134745d1fa1d786d61cbc
 --- !u!1 &7222906580796130637
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/RewardsPanel.prefab

@@ -275,6 +275,7 @@ GameObject:
   - component: {fileID: 6223258105488711688}
   - component: {fileID: 107777712894178491}
   - component: {fileID: 9079335746802258409}
+  - component: {fileID: 8875649337987708000}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: txtItem
@@ -344,6 +345,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u83B7\u5F97\u5956\u52B1"
+--- !u!114 &8875649337987708000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4688934361147581867}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 152
 --- !u!1 &4791404325002115125
 GameObject:
   m_ObjectHideFlags: 0
@@ -816,7 +830,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -2037, y: 1755}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9111758787558866785
 CanvasRenderer:

Assets/Res/UI/SpecificProfessionEquipmentPanel.prefab

@@ -116,6 +116,7 @@ GameObject:
   - component: {fileID: 8050209327598571131}
   - component: {fileID: 2728628990419375058}
   - component: {fileID: 1037328333759933566}
+  - component: {fileID: 3091160066146502917}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: txt
@@ -185,6 +186,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4E00\u952E\u88C5\u5907"
+--- !u!114 &3091160066146502917
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 481060752254444518}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 153
 --- !u!1 &521588013225577960
 GameObject:
   m_ObjectHideFlags: 0
@@ -3147,7 +3161,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6233062318384769739
 CanvasRenderer:
@@ -3311,6 +3325,16 @@ MonoBehaviour:
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
+  - key: altertRed
+    gameObject: {fileID: 8571375606261511009}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 345039711155953141}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
   isAssetBundle: 1
 --- !u!114 &3602538398910660699
 MonoBehaviour:
@@ -4294,6 +4318,90 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5781329795660419199
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7107138172511073483}
+  - component: {fileID: 3842325015807851395}
+  - component: {fileID: 7032642820532147702}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7107138172511073483
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5781329795660419199}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7254188222621113221}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 6.26, y: 18.21}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3842325015807851395
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5781329795660419199}
+  m_CullTransparentMesh: 1
+--- !u!114 &7032642820532147702
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5781329795660419199}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_Alert_Circle_Icon_Exclamation
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 8e0fed06f6e134745d1fa1d786d61cbc
 --- !u!1 &5867689955393555865
 GameObject:
   m_ObjectHideFlags: 0
@@ -4413,6 +4521,7 @@ RectTransform:
   m_Children:
   - {fileID: 4907610926646643840}
   - {fileID: 8050209327598571131}
+  - {fileID: 7254188222621113221}
   m_Father: {fileID: 797304816984919772}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -5460,6 +5569,90 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6811245108857508326
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6995301407316791008}
+  - component: {fileID: 6537295489475053452}
+  - component: {fileID: 5933255998763299585}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Border
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6995301407316791008
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6811245108857508326}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7254188222621113221}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 30, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6537295489475053452
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6811245108857508326}
+  m_CullTransparentMesh: 1
+--- !u!114 &5933255998763299585
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6811245108857508326}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.3254902, g: 0.02745098, b: 0.05882353, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_Alert_Dot_Border
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 8e0fed06f6e134745d1fa1d786d61cbc
 --- !u!1 &6968682011410392739
 GameObject:
   m_ObjectHideFlags: 0
@@ -6696,6 +6889,92 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: ad234b510c8665e34d281ca3122c266c
+--- !u!1 &8571375606261511009
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7254188222621113221}
+  - component: {fileID: 7249301087807600231}
+  - component: {fileID: 6077954800850811341}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Alert_Circle_Red (5)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7254188222621113221
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8571375606261511009}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7107138172511073483}
+  - {fileID: 6995301407316791008}
+  m_Father: {fileID: 5431682905573327978}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 288, y: 22}
+  m_SizeDelta: {x: 28, y: 28}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7249301087807600231
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8571375606261511009}
+  m_CullTransparentMesh: 1
+--- !u!114 &6077954800850811341
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8571375606261511009}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.14117648, b: 0.24313726, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_Alert_Dot_Bg
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 8e0fed06f6e134745d1fa1d786d61cbc
 --- !u!1 &8821399684194774375
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/Core/Event/Event/CustomEventType.cs

@@ -71,6 +71,10 @@ namespace Fort23.Core
       /// 玩家使用技能
       /// </summary>
       PlayerUseSkill,
+      /// <summary>
+      /// 关闭英雄面板
+      /// </summary>
+      OnCloseHeroPanel,
       
     }
 }

Assets/Scripts/GameLogic/Combat/CombatGuide/Guide_Boss.cs

@@ -1,4 +1,5 @@
 using Common.Utility.CombatEvent;
+using Core.Language;
 using Fort23.Core;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.CombatType;
@@ -36,7 +37,10 @@ namespace GameLogic.Combat.CombatGuide
                     CombatGuideManager.Instance.NextGuide();
                    
                 };
-                showDialogueEventData.dialogueMessaga = new string[] {".....", "发生了什么事....","前方好像出现了超强怪物，大家做好准备。" };
+                // LanguageManager.Instance.Text()
+                showDialogueEventData.dialogueMessaga = new string[] {LanguageManager.Instance.Text(118), 
+                    LanguageManager.Instance.Text(119),
+                    LanguageManager.Instance.Text(120) };
                 showDialogueEventData.icon = new string[] { "icon_tx105", "icon_tx105", "icon_tx105" };
                 showDialogueEventData.messageShowType = ShowDialogueEventData.MessageShowType.Verbatim;
                 EventManager.Instance.Dispatch(CustomEventType.ShowDialogue, showDialogueEventData);

Assets/Scripts/GameLogic/Combat/CombatGuide/Guide_GongJiang.cs

@@ -1,4 +1,5 @@
 using Common.Utility.CombatEvent;
+using Core.Language;
 using Fort23.Core;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.CombatType;
@@ -88,7 +89,8 @@ namespace GameLogic.Combat.CombatGuide
                 state = 1;
                 isTrgger = false;
             };
-            showDialogueEventData.dialogueMessaga = new string[] { "救命呀~", "救命~~~" };
+            showDialogueEventData.dialogueMessaga = new string[] { LanguageManager.Instance.Text(126),
+                LanguageManager.Instance.Text(127) };
             showDialogueEventData.icon = new string[] { "icon_tx116", "icon_tx116" };
             showDialogueEventData.messageShowType = ShowDialogueEventData.MessageShowType.Verbatim;
             EventManager.Instance.Dispatch(CustomEventType.ShowDialogue, showDialogueEventData);
@@ -101,7 +103,7 @@ namespace GameLogic.Combat.CombatGuide
             CombatController.currActiveCombat.isStopAi = true;
             ShowDialogueEventData showDialogueEventData = ShowDialogueEventData.Create();
             showDialogueEventData.finish = Guide2_2;
-            showDialogueEventData.dialogueMessaga = new string[] { "越往深林深处走怪物越强大了，这里的怪我有点招架不足了，我能不能加入你们一起探险？" };
+            showDialogueEventData.dialogueMessaga = new string[] { LanguageManager.Instance.Text(121) };
             showDialogueEventData.icon = new string[] { "icon_tx116"};
             showDialogueEventData.messageShowType = ShowDialogueEventData.MessageShowType.Verbatim;
             EventManager.Instance.Dispatch(CustomEventType.ShowDialogue, showDialogueEventData);
@@ -120,7 +122,7 @@ namespace GameLogic.Combat.CombatGuide
                     CombatController.currActiveCombat.isStopAi = false;
                     CombatGuideManager.Instance.NextGuide();
                   };
-            showDialogueEventData.dialogueMessaga = new string[] { "没问题，我们正缺你这样的勇士。","欢迎加入我们的队伍，让我们一起看看深林深处是什么在作怪。" };
+            showDialogueEventData.dialogueMessaga = new string[] { LanguageManager.Instance.Text(122), LanguageManager.Instance.Text(123) };
             showDialogueEventData.icon = new string[] { "icon_tx105"};
             showDialogueEventData.messageShowType = ShowDialogueEventData.MessageShowType.Verbatim;
             EventManager.Instance.Dispatch(CustomEventType.ShowDialogue, showDialogueEventData);

Assets/Scripts/GameLogic/Combat/CombatGuide/Guide_JiaRuFaShi.cs

@@ -1,4 +1,5 @@
 using Common.Utility.CombatEvent;
+using Core.Language;
 using Fort23.Core;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Hero;
@@ -52,7 +53,8 @@ namespace GameLogic.Combat.CombatGuide
             ShowDialogueEventData showDialogueEventData = ShowDialogueEventData.Create();
             showDialogueEventData.finish = Guide1_1;
           
-            showDialogueEventData.dialogueMessaga = new string[] { "（喘息着）这该死的怪物怎么杀也杀不完！","怎么办要先会村庄吗？" };
+            showDialogueEventData.dialogueMessaga = new string[] { LanguageManager.Instance.Text(124), 
+                LanguageManager.Instance.Text(125) };
             showDialogueEventData.icon = new string[] { "icon_tx105"};
             showDialogueEventData.messageShowType = ShowDialogueEventData.MessageShowType.Verbatim;
             EventManager.Instance.Dispatch(CustomEventType.ShowDialogue, showDialogueEventData);
@@ -91,7 +93,8 @@ namespace GameLogic.Combat.CombatGuide
             // heroEntity.GameObject.SetActive(true);
             ShowDialogueEventData showDialogueEventData = ShowDialogueEventData.Create();
             showDialogueEventData.finish = Guide1_2;
-            showDialogueEventData.dialogueMessaga = new string[] { "我名艾尔温。这里充满了黑暗的气息，我无法袖手旁观.","让它们常常我的火焰~"};
+            showDialogueEventData.dialogueMessaga = new string[] { LanguageManager.Instance.Text(128),
+                LanguageManager.Instance.Text(129)};
             showDialogueEventData.icon = new string[] { "icon_tx107"};
             showDialogueEventData.messageShowType = ShowDialogueEventData.MessageShowType.Verbatim;
             EventManager.Instance.Dispatch(CustomEventType.ShowDialogue, showDialogueEventData);
@@ -108,7 +111,7 @@ namespace GameLogic.Combat.CombatGuide
                 CombatController.currActiveCombat.isStopAi = false;
                 CombatGuideManager.Instance.NextGuide();
             };
-            showDialogueEventData.dialogueMessaga = new string[] { "太好了艾尔温，感谢你的加入！"};
+            showDialogueEventData.dialogueMessaga = new string[] { LanguageManager.Instance.Text(130)};
             showDialogueEventData.icon = new string[] { "icon_tx105"};
             showDialogueEventData.messageShowType = ShowDialogueEventData.MessageShowType.Verbatim;
             EventManager.Instance.Dispatch(CustomEventType.ShowDialogue, showDialogueEventData);

Assets/Scripts/GameLogic/Combat/CombatGuide/Guide_MuShi.cs

@@ -1,4 +1,5 @@
 using Common.Utility.CombatEvent;
+using Core.Language;
 using Fort23.Core;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Hero;
@@ -38,7 +39,7 @@ namespace GameLogic.Combat.CombatGuide
                     CombatController.currActiveCombat.isStopAi = true;
                     ShowDialogueEventData showDialogueEventData = ShowDialogueEventData.Create();
                     showDialogueEventData.finish = Guide3_1;
-                    showDialogueEventData.dialogueMessaga = new string[] { "兄弟们，我坚持不住了，这一波怪物太猛了！" };
+                    showDialogueEventData.dialogueMessaga = new string[] { LanguageManager.Instance.Text(131)};
                     showDialogueEventData.icon = new string[] { "icon_tx105"};
                     showDialogueEventData.messageShowType = ShowDialogueEventData.MessageShowType.Verbatim;
                     EventManager.Instance.Dispatch(CustomEventType.ShowDialogue,
@@ -82,7 +83,8 @@ namespace GameLogic.Combat.CombatGuide
                 AccountFileInfo.Instance.playerData.combatGuideIndex =4;
                 AccountFileInfo.Instance.SavePlayerData();
             };
-            showDialogueEventData.dialogueMessaga = new string[] { "天空中突然闪出一个人影。","我是来自教堂的牧师，我来为你治疗！" };
+            showDialogueEventData.dialogueMessaga = new string[] { LanguageManager.Instance.Text(132), 
+                LanguageManager.Instance.Text(133) };
             showDialogueEventData.icon = new string[] { "icon_tx113"};
             showDialogueEventData.messageShowType = ShowDialogueEventData.MessageShowType.Verbatim;
             EventManager.Instance.Dispatch(CustomEventType.ShowDialogue, showDialogueEventData);

Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -104,6 +104,11 @@ namespace GameLogic.Combat.CombatType
             List<ItemInfo> equipmentList =
                 DropManager.Instance.DropEquipment(_levelBattleConfig, combatHeroEntity.CurrCombatHeroInfo.heroType);
 
+            if (equipmentList.Count <= 0)
+            {
+                return;
+            }
+
             Combat_EquipFallEventData combatEquipFallEventData = Combat_EquipFallEventData.Create();
             //allEquip存放特效标记
             List<string> allEquip = new List<string>();

Assets/Scripts/GameLogic/Equipment/EquipmentController.cs

@@ -158,9 +158,120 @@ namespace GameLogic.Equipment
             return info;
         }
 
+        /// <summary>
+        /// 是否有更好的装备
+        /// </summary>
+        /// <param name="isReCal">是否重新计算最好的装备</param>
+        /// <returns></returns>
+        public bool IsBetterEqs(bool isReCal = true)
+        {
+            if (isReCal)
+            {
+                UpdateAllBestEqs();
+            }
+            
+            foreach (KeyValuePair<int,Dictionary<int,ItemInfo>> keyValuePair in allBestEqDic)
+            {
+                int zy = keyValuePair.Key;
+                Dictionary<int, ItemInfo> bwDic = keyValuePair.Value;
+                if (bwDic.Count > 0)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// 具体职业是否有更好装备
+        /// </summary>
+        /// <param name="zy"></param>
+        /// <returns></returns>
+        public bool IsBetterEqs4OneZy(int zy, bool isReCal = false)
+        {
+            if (isReCal)
+            {
+                UpdateAllBestEqs();
+            }
+            if (allBestEqDic != null)
+            {
+                if (allBestEqDic.TryGetValue(zy, out var bwDic))
+                {
+                    if (bwDic.Count > 0)
+                    {
+                        return true;
+                    }
+                } 
+                
+            }
+
+            return false;
+        }
+
+
+        public Dictionary<int, Dictionary<int, ItemInfo>> allBestEqDic;
+        /// <summary>
+        /// 计算所有职业最好的装备，用于小红点
+        /// allBestEqDic里面存的，就是所有职业，最好的装备
+        /// </summary>
+        /// <returns></returns>
+        public Dictionary<int, Dictionary<int, ItemInfo>> UpdateAllBestEqs()
+        {
+            allBestEqDic = new Dictionary<int, Dictionary<int, ItemInfo>>();
+
+            allBestEqDic.Add(1, GetZyBestEqs(1));
+            allBestEqDic.Add(2, GetZyBestEqs(2));
+            allBestEqDic.Add(3, GetZyBestEqs(3));
+            allBestEqDic.Add(4, GetZyBestEqs(4));
+            return allBestEqDic;
+        }
+
+        public Dictionary<int, ItemInfo> GetZyBestEqs(int zy)
+        {
+            Dictionary<int, ItemInfo> bestEqDic = new Dictionary<int, ItemInfo>();
+            bool changed = false;
+            //拿到这个职业的所有部位的装备，bwDic就是一个按部位划分的字典key=部位，value=这个部位下的所有装备
+            if (allZyEqDic.TryGetValue(zy, out var bwDic))
+            {
+                foreach (KeyValuePair<int, List<ItemInfo>> keyValuePair in bwDic)
+                {
+                    ItemInfo bestBwEq = null;
+                    foreach (ItemInfo bwItem in keyValuePair.Value)
+                    {
+                        // if (bwItem.eqInfo.isWear)
+                        // {
+                        //     continue;
+                        // }
+                        // bwItem.eqInfo.isEquip = false;
+                        if (bestBwEq == null)
+                        {
+                            bestBwEq = bwItem;
+                            continue;
+                        }
+
+                        if (bwItem.eqInfo.Attack > bestBwEq.eqInfo.Attack ||
+                            bwItem.eqInfo.Defense > bestBwEq.eqInfo.Defense ||
+                            bwItem.eqInfo.Hp > bestBwEq.eqInfo.Hp)
+                        {
+                            bestBwEq = bwItem;
+                        }
+                    }
+
+                    if (bestBwEq != null)
+                    {
+                        if(!bestBwEq.eqInfo.isWear)
+                            bestEqDic.Add(keyValuePair.Key, bestBwEq);
+                    }
+                }
+            }
+            
+            return bestEqDic;
+        }
+
         /// <summary>
         /// 一键穿职业装备
-        /// 把对应职业，对应部位的，最好的装备找出来 牵肠挂肚
+        /// 把对应职业，对应部位的，最好的装备找出来
         /// </summary>
         /// <param name="zy"></param>
         /// <returns>true = 有装备变动 </returns>
@@ -175,6 +286,10 @@ namespace GameLogic.Equipment
                     ItemInfo bestBwEq = null;
                     foreach (ItemInfo bwItem in keyValuePair.Value)
                     {
+                        // if (bwItem.eqInfo.isWear)
+                        // {
+                        //     continue;
+                        // }
                         // bwItem.eqInfo.isEquip = false;
                         if (bestBwEq == null)
                         {

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -301,7 +301,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         
         ItemData diamond = new ItemData(GlobalParam.Item_Diamond_ID);
         
-        ItemData heroExp = new ItemData(GlobalParam.Item_HeroExp_ID, 50000);
+        ItemData heroExp = new ItemData(GlobalParam.Item_HeroExp_ID, 5000);
         
         playerData.ItemListData.Add(coin);
         playerData.ItemListData.Add(diamond);

Assets/Scripts/GameUI/Combat/CombatEquipFallManager.cs

@@ -127,6 +127,12 @@ namespace GameLogic.CombatScenesTool
 
         protected void Combat_EquipFall(IEventData ievetEquia)
         {
+
+            if (ievetEquia == null)
+            {
+                return;
+            }
+            
             Combat_EquipFallEventData combatEquipFallEventData = ievetEquia as Combat_EquipFallEventData;
             Fall(combatEquipFallEventData.fallEquip, combatEquipFallEventData.startPos_WorldPos);
         }
@@ -139,6 +145,11 @@ namespace GameLogic.CombatScenesTool
 
         public void Fall(string[] allEquip, Vector3 worldPos)
         {
+            if (allEquip == null)
+            {
+                return;
+            }
+            
             for (int i = 0; i < allEquip.Length; i++)
             {
                 GObjectPool.Instance.FetchAsync<GameObjectPool>(allEquip[i], delegate(GameObjectPool pool)

Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs

@@ -1,6 +1,8 @@
 using System.Collections.Generic;
+using Core.Language;
 using Core.Utility;
 using Excel2Json;
+using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Bag;
 using GameLogic.Player;
@@ -52,10 +54,12 @@ namespace Fort23.Mono
                 {
                     panel.InitRewardsPanel(allIitem, CloseButtonCallBack);
                 }, layer: UILayer.Top);
+                
             }
             else
             {
-                TipMessagePanel.OpenTipMessagePanel("金币不足", Vector2.zero);
+                // TipMessagePanel.OpenTipMessagePanel("金币不足", Vector2.zero);
+                TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(102), Vector2.zero);
             }
             
         }
@@ -78,16 +82,20 @@ namespace Fort23.Mono
                 UIManager.Instance.LoadAndOpenPanel<RewardsPanel>(
                     delegate(RewardsPanel panel) { panel.InitRewardsPanel(allIitem, CloseButtonCallBack); },
                     layer: UILayer.Top);
+                
+                
             }
             else
             {
-                TipMessagePanel.OpenTipMessagePanel("金币不足", Vector2.zero);
+                TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(102), Vector2.zero);
             }
         }
 
         private void CloseButtonCallBack()
         {
             UIManager.Instance.HideUIUIPanel(this);
+            
+            EventManager.Instance.Dispatch(CustomEventType.Combat_EquipFall, null);
         }
 
         public void OpenPanel()

Assets/Scripts/GameUI/UI/Hero/HeroBagPanel.cs

@@ -16,11 +16,13 @@ namespace Fort23.Mono
         protected override void AddEvent()
         {
             EventManager.Instance.AddEventListener(CustomEventType.MainLvUp, OnMainLvUp);
+            EventManager.Instance.AddEventListener(CustomEventType.HeroEquip, CheckAlterRed);
         }
 
         protected override void DelEvent()
         {
             EventManager.Instance.RemoveEventListener(CustomEventType.MainLvUp, OnMainLvUp);
+            EventManager.Instance.RemoveEventListener(CustomEventType.HeroEquip, CheckAlterRed);
         }
         public override void AddButtonEvent()
         {
@@ -50,12 +52,24 @@ namespace Fort23.Mono
         {
             txtMainLv.text = LanguageManager.Instance.Text(64, PlayerManager.Instance.heroController.mainLevel);
         }
+
+        private void CheckAlterRed(IEventData e = null)
+        {
+            if (PlayerManager.Instance.eqController.IsBetterEqs(false))
+            {
+                AlerRed.SetActive(true);
+            }
+            else
+            {
+                AlerRed.SetActive(false);
+            }
+        }
         
         public void InitPanel()
         {
             InitMainHeroWidget();
             UpdateMainLv();
-
+            CheckAlterRed();
         }
         public List<WidgetHero> widgetHeroes = new List<WidgetHero>();
         private async void InitMainHeroWidget()

Assets/Scripts/GameUI/UI/Hero/HeroBagPanelData.cs

@@ -52,6 +52,17 @@ namespace Fort23.Mono
 	      return _txtMainLv;
 	     }
 	   }
+	  private GameObject _AlerRed;
+	  public GameObject AlerRed
+	   {
+	   get{
+	      if (_AlerRed == null)
+	       {
+	         _AlerRed  = GetUIUnit<GameObject>("AlerRed"); 
+	       }
+	      return _AlerRed;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/Hero/HeroDetailPanel.cs

@@ -44,7 +44,10 @@ namespace Fort23.Mono
             
             btnSpecailEquip.onClick.AddListener(delegate
             {
-                TipMessagePanel.OpenTipMessagePanel("专属装备（敬请期待）",
+                // TipMessagePanel.OpenTipMessagePanel("专属装备（敬请期待）",
+                //     new Vector2(btnSpecailEquip.transform.position.x, btnSpecailEquip.transform.position.y + 0.5f));
+                
+                TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(101),
                     new Vector2(btnSpecailEquip.transform.position.x, btnSpecailEquip.transform.position.y + 0.5f));
             });
             
@@ -174,7 +177,7 @@ namespace Fort23.Mono
                 }
                 else
                 {
-                    TipMessagePanel.OpenTipMessagePanel("资源不足", Vector2.zero);
+                    TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(103), Vector2.zero);
                 }
 
                 // if (PlayerManager.Instance.heroController.CanPromote(heroInfo) == HeroUpResultType.Success)
@@ -392,6 +395,8 @@ namespace Fort23.Mono
             {
                 GObjectPool.Instance.Recycle(modelObj);
                 UIManager.Instance.HideUIUIPanel(this);
+                
+                EventManager.Instance.Dispatch(CustomEventType.OnCloseHeroPanel, new SimpleEventData(){ intData = heroInfo.modelID});
             }
         }
         

Assets/Scripts/GameUI/UI/Hero/HeroUITools.cs

@@ -61,6 +61,27 @@ namespace Fort23.Mono
 
             return data;
         }
+
+        /// <summary>
+        /// 是否显示职业装备的小红点
+        /// </summary>
+        /// <param name="zy"></param>
+        /// <returns></returns>
+        public static bool IsShowRedPointProEq(int zy)
+        {
+            if (PlayerManager.Instance.eqController.allBestEqDic != null)
+            {
+                if (PlayerManager.Instance.eqController.allBestEqDic.TryGetValue(zy, out var bestEq))
+                {
+                    if (bestEq.Count > 0)
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
         
         /// <summary>
         /// 更新对应职业的装备图标
@@ -180,6 +201,11 @@ namespace Fort23.Mono
             }
         }
 
+        /// <summary>
+        /// 是否展示"去升级"的引导
+        /// </summary>
+        /// <param name="heroInfo"></param>
+        /// <returns></returns>
         public static bool IsLvUpShowGuild(HeroInfo heroInfo)
         {
 

Assets/Scripts/GameUI/UI/Hero/ProfessionEquipmentPanel.cs

@@ -83,6 +83,7 @@ namespace Fort23.Mono
 
         public void UpdateAllEq()
         {
+            PlayerManager.Instance.eqController.UpdateAllBestEqs();
             UpdateZyEqs(1);
             UpdateZyEqs(2);
             UpdateZyEqs(3);
@@ -91,6 +92,7 @@ namespace Fort23.Mono
 
         public void UpdateZyEqs(int zy)
         {
+            bool show = false;
             switch (zy)
             {
                 case 1:
@@ -106,7 +108,9 @@ namespace Fort23.Mono
                     HeroUITools.UpdateZyEqIcon(4, yxEqs, action:OnclickYX);
                     break;
             }
+            
+            show = HeroUITools.IsShowRedPointProEq(zy);
+            (allAlterObj[zy - 1] as GameObject)?.SetActive(show);
         }
-        
     }
 }

Assets/Scripts/GameUI/UI/Hero/ProfessionEquipmentPanelData.cs

@@ -162,6 +162,17 @@ namespace Fort23.Mono
 	      return _btnInZs;
 	     }
 	   }
+	  private List<object> _allAlterObj;
+	  public List<object> allAlterObj
+	   {
+	   get{
+	      if (_allAlterObj == null)
+	       {
+	         _allAlterObj  = GetUIUnit<List<object>>("allAlterObj"); 
+	       }
+	      return _allAlterObj;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/Hero/SkillUIComponent.cs

@@ -196,7 +196,7 @@ namespace Fort23.Mono
             
             txtSkillName.text = LanguageManager.Instance.Text(maxSkillUnLock.skillConfig.name);
             txtLv.text = maxSkillUnLock.skillConfig.level.ToString();
-            txtCD.text = "冷却" + maxSkillUnLock.skillConfig.cd + "秒";
+            txtCD.text = LanguageManager.Instance.Text(146, maxSkillUnLock.skillConfig.cd);//"冷却" + maxSkillUnLock.skillConfig.cd + "秒";
 
             //第一个技能就没有解锁时
             if (firstSkillLock != null)

Assets/Scripts/GameUI/UI/Hero/SpecificProfessionEquipmentPanel.cs

@@ -87,6 +87,8 @@ namespace Fort23.Mono
                 
                 UIManager.Instance.DormancyAllGComponent<WidgetItem>(poolName : SpecificEqsPoolName);
                 HeroUITools.UpdateZyEqIcon(curZy, eqs, poolName : SpecificEqsPoolName);
+                
+                altertRed.SetActive(false);
             }
         }
 
@@ -126,6 +128,15 @@ namespace Fort23.Mono
             SetZyInfo();
             UIManager.Instance.DormancyAllGComponent<WidgetItem>(SpecificEqsPoolName);
             HeroUITools.UpdateZyEqIcon(zy, eqs, poolName : SpecificEqsPoolName);
+
+            if (PlayerManager.Instance.eqController.IsBetterEqs4OneZy(curZy))
+            {
+                altertRed.SetActive(true);
+            }
+            else
+            {
+                altertRed.SetActive(false);
+            }
         }
 
         private void SetZyInfo()

Assets/Scripts/GameUI/UI/Hero/SpecificProfessionEquipmentPanelData.cs

@@ -140,6 +140,17 @@ namespace Fort23.Mono
 	      return _zyBg;
 	     }
 	   }
+	  private GameObject _altertRed;
+	  public GameObject altertRed
+	   {
+	   get{
+	      if (_altertRed == null)
+	       {
+	         _altertRed  = GetUIUnit<GameObject>("altertRed"); 
+	       }
+	      return _altertRed;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/MainUIPanel.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Common.Utility.CombatEvent;
+using Core.Language;
 using Core.Utility;
 using Excel2Json;
 using Fort23.Core;
@@ -24,6 +25,8 @@ namespace Fort23.Mono
             InitRes();
             InitBattleHeroWidget();
             LevelUpdate(null);
+
+            CheckEquipAlterPoint(null);
         }
 
         protected override void AddEvent()
@@ -39,6 +42,78 @@ namespace Fort23.Mono
             EventManager.Instance.AddEventListener(CustomEventType.ShowDialogue, ShowDialogue);
             EventManager.Instance.AddEventListener(CustomEventType.AlterCombatHero, AlterCombatHero);
             EventManager.Instance.AddEventListener(CustomEventType.PlayerUseSkill, PlayerUseSkill);
+            EventManager.Instance.AddEventListener(CustomEventType.OnCloseHeroPanel, OnHeroPanelClose);
+            
+            EventManager.Instance.AddEventListener(CustomEventType.Combat_EquipFall, CheckEquipAlterPoint);
+            EventManager.Instance.AddEventListener(CustomEventType.HeroEquip, CheckEquipAlterPoint);
+        }
+
+ 
+
+        protected override void DelEvent()
+        {
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.CombatExpAlter, CombatExpAlter);
+            // EventManager.Instance.RemoveEventListener(CustomEventType.HeroPowerUp, OnHeroPowerUp);
+            EventManager.Instance.RemoveEventListener(CustomEventType.ItemUpdate, OnItemUpdate);
+            EventManager.Instance.RemoveEventListener(CustomEventType.ShowBossHp, ShowBossHp);
+            EventManager.Instance.RemoveEventListener(CustomEventType.LevelUpdate, LevelUpdate);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.HeroHpUpdate, HeroHpUpdateEventData);
+            EventManager.Instance.RemoveEventListener(CustomEventType.ShowBattleExp, ShowBattleExp);
+            EventManager.Instance.RemoveEventListener(CustomEventType.ShowDialogue, ShowDialogue);
+            EventManager.Instance.RemoveEventListener(CustomEventType.AlterCombatHero, AlterCombatHero);
+            EventManager.Instance.RemoveEventListener(CustomEventType.OnCloseHeroPanel, OnHeroPanelClose);
+            
+            EventManager.Instance.RemoveEventListener(CustomEventType.Combat_EquipFall, CheckEquipAlterPoint);
+            EventManager.Instance.RemoveEventListener(CustomEventType.HeroEquip, CheckEquipAlterPoint);
+        }
+        
+        /// <summary>
+        /// 检查装备小红点
+        /// </summary>
+        /// <param name="e"></param>
+        private void CheckEquipAlterPoint(IEventData e)
+        {
+            // Combat_EquipFallEventData data = e as Combat_EquipFallEventData;
+            bool betterEqs = PlayerManager.Instance.eqController.IsBetterEqs();
+
+            if (betterEqs)
+            {
+                alterObj1.SetActive(true);
+            }
+            else
+            {
+                alterObj1.SetActive(false);
+            }
+        }
+
+        private void OnHeroPanelClose(IEventData e)
+        {
+            int i = 0;
+            bool b = false;
+            
+            foreach (WidgetHero widgetHero in widgetHeroes)
+            {
+                if (b)
+                {
+                    break;
+                }
+                if (HeroUITools.IsLvUpShowGuild(widgetHero.heroInfo))
+                {
+                    RectTransform rectTransform = hero_battle[i] as RectTransform;
+                    TxtGuildPanel.OpenTxtGuildPanel(LanguageManager.Instance.Text(154), new Vector2(rectTransform.position.x, 
+                        rectTransform.position.y + 0.6f));
+
+                    b = true;
+                }
+                i++;
+            }
+
+            if (!b)
+            {
+                TxtGuildPanel.CloseTxtGuildPanel();
+            }
+
+           
         }
 
         private void PlayerUseSkill(IEventData iEventData)
@@ -79,18 +154,7 @@ namespace Fort23.Mono
         }
 
 
-        protected override void DelEvent()
-        {
-            CombatEventManager.Instance.RemoveEventListener(CombatEventType.CombatExpAlter, CombatExpAlter);
-            // EventManager.Instance.RemoveEventListener(CustomEventType.HeroPowerUp, OnHeroPowerUp);
-            EventManager.Instance.RemoveEventListener(CustomEventType.ItemUpdate, OnItemUpdate);
-            EventManager.Instance.RemoveEventListener(CustomEventType.ShowBossHp, ShowBossHp);
-            EventManager.Instance.RemoveEventListener(CustomEventType.LevelUpdate, LevelUpdate);
-            CombatEventManager.Instance.RemoveEventListener(CombatEventType.HeroHpUpdate, HeroHpUpdateEventData);
-            EventManager.Instance.RemoveEventListener(CustomEventType.ShowBattleExp, ShowBattleExp);
-            EventManager.Instance.RemoveEventListener(CustomEventType.ShowDialogue, ShowDialogue);
-            EventManager.Instance.RemoveEventListener(CustomEventType.AlterCombatHero, AlterCombatHero);
-        }
+    
 
         public override void AddButtonEvent()
         {
@@ -105,19 +169,23 @@ namespace Fort23.Mono
 
         private void OnClickIcon_HeroExp_button()
         {
-            TipMessagePanel.OpenTipMessagePanel("英雄经验，可用于升级英雄等级<color=#ff0000>（每杀死一个小怪能获得经验，击杀boss能获得大量经验）</color>",
+            // TipMessagePanel.OpenTipMessagePanel("英雄经验，可用于升级英雄等级<color=#ff0000>（每杀死一个小怪能获得经验，击杀boss能获得大量经验）</color>",
+            //     new Vector2(Icon_HeroExp_button.transform.position.x, Icon_HeroExp_button.transform.position.y - 0.5f));
+            TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(104),
                 new Vector2(Icon_HeroExp_button.transform.position.x, Icon_HeroExp_button.transform.position.y - 0.5f));
         }
 
         private void OnClickIcon_Coin_button()
         {
-            TipMessagePanel.OpenTipMessagePanel("金币，用于抽取英雄宝箱<color=#ff0000>（每杀死一个小怪有几率获得金币，击杀boss能获得大量金币）</color>",
+            // TipMessagePanel.OpenTipMessagePanel("金币，用于抽取英雄宝箱<color=#ff0000>（每杀死一个小怪有几率获得金币，击杀boss能获得大量金币）</color>",
+            //     new Vector2(Icon_Coin_button.transform.position.x, Icon_Coin_button.transform.position.y - 0.5f));
+            TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(105),
                 new Vector2(Icon_Coin_button.transform.position.x, Icon_Coin_button.transform.position.y - 0.5f));
         }
 
         private void OnClickIcon_Diamon_button()
         {
-            TipMessagePanel.OpenTipMessagePanel("紫砖（敬请期待）",
+            TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(106),
                 new Vector2(Icon_Diamon_button.transform.position.x, Icon_Diamon_button.transform.position.y - 0.5f));
         }
 
@@ -141,7 +209,9 @@ namespace Fort23.Mono
         {
             Debug.Log("显示描述");
             RectTransform huoQiu = Button_huiQiu.GetComponent<RectTransform>();
-            TipMessagePanel.OpenTipMessagePanel("点击屏幕空白处从天空中召唤一个陨石，对怪物造成1点伤害，并有<color=#ff0000>30%</color>概率获得1枚金币（boss怪<color=#ff0000>40%</color>掉落，金币数量<color=#ff0000>+2</color>）",
+            // TipMessagePanel.OpenTipMessagePanel("点击屏幕空白处从天空中召唤一个陨石，对怪物造成1点伤害，并有<color=#ff0000>30%</color>概率获得1枚金币（boss怪<color=#ff0000>40%</color>掉落，金币数量<color=#ff0000>+2</color>）",
+            //     new Vector2(huoQiu.position.x, huoQiu.position.y + 0.5f));
+            TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(107),
                 new Vector2(huoQiu.position.x, huoQiu.position.y + 0.5f));
         }
 
@@ -297,14 +367,16 @@ namespace Fort23.Mono
                 itemHero.own.gameObject.name= "hero_battle"+i;
                 widgetHeroes.Add(itemHero);
 
-                if (HeroUITools.IsLvUpShowGuild(keyValuePair.Value))
-                {
-                    TxtGuildPanel.OpenTxtGuildPanel("点这里提升英雄", new Vector2(rectTransform.position.x, 
-                        rectTransform.position.y + 0.6f));    
-                }
+                // if (HeroUITools.IsLvUpShowGuild(keyValuePair.Value))
+                // {
+                //     TxtGuildPanel.OpenTxtGuildPanel("点这里提升英雄", new Vector2(rectTransform.position.x, 
+                //         rectTransform.position.y + 0.6f));    
+                // }
                 
                 i++;
             }
+
+            OnHeroPanelClose(null);
         }
 
         private void InitRes()

Assets/Scripts/GameUI/UI/MainUIPanelData.cs

@@ -144,7 +144,6 @@ namespace Fort23.Mono
 	     }
 	   }
 	  private TextMeshProUGUI _txtDiamond;
-        
 	  public TextMeshProUGUI txtDiamond
 	   {
 	   get{
@@ -298,6 +297,17 @@ namespace Fort23.Mono
 	      return _Icon_Diamon_button;
 	     }
 	   }
+	  private GameObject _alterObj1;
+	  public GameObject alterObj1
+	   {
+	   get{
+	      if (_alterObj1 == null)
+	       {
+	         _alterObj1  = GetUIUnit<GameObject>("alterObj1"); 
+	       }
+	      return _alterObj1;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

UserSettings/Layouts/default-2022.dwlt

@@ -14,92 +14,17 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 452
-    y: 313
-    width: 950
-    height: 559
-  m_ShowMode: 0
-  m_Title: Search (757)
-  m_RootView: {fileID: 4}
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_Maximized: 0
---- !u!114 &2
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_PixelRect:
-    serializedVersion: 2
-    x: 144
-    y: 67
-    width: 1511
+    x: 146
+    y: 66
+    width: 1528
     height: 978
   m_ShowMode: 4
-  m_Title: Scene
-  m_RootView: {fileID: 5}
+  m_Title: Console
+  m_RootView: {fileID: 2}
   m_MinSize: {x: 875, y: 321}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 0
---- !u!114 &3
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: QuickSearch
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 950
-    height: 559
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_ActualView: {fileID: 15}
-  m_Panes:
-  - {fileID: 15}
-  m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &4
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 3}
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 950
-    height: 559
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  vertical: 0
-  controlID: 21
-  draggingID: 0
---- !u!114 &5
+--- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -112,14 +37,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 6}
-  - {fileID: 8}
-  - {fileID: 7}
+  - {fileID: 3}
+  - {fileID: 5}
+  - {fileID: 4}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1511
+    width: 1528
     height: 978
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -127,7 +52,7 @@ MonoBehaviour:
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &6
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -144,12 +69,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1511
+    width: 1528
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &7
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -166,11 +91,11 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 958
-    width: 1511
+    width: 1528
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &8
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -183,22 +108,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
+  - {fileID: 6}
   - {fileID: 9}
-  - {fileID: 12}
-  - {fileID: 13}
-  - {fileID: 14}
+  - {fileID: 10}
+  - {fileID: 11}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1511
+    width: 1528
     height: 928
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 63
+  controlID: 19
   draggingID: 0
---- !u!114 &9
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -211,20 +136,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 10}
-  - {fileID: 11}
+  - {fileID: 7}
+  - {fileID: 8}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 387
+    width: 454.5
     height: 928
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 64
+  controlID: 20
   draggingID: 0
---- !u!114 &10
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -241,20 +166,20 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 387
-    height: 662
+    width: 454.5
+    height: 719
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 16}
+  m_ActualView: {fileID: 12}
   m_Panes:
-  - {fileID: 16}
-  - {fileID: 23}
-  - {fileID: 17}
-  - {fileID: 18}
+  - {fileID: 12}
   - {fileID: 19}
+  - {fileID: 13}
+  - {fileID: 14}
+  - {fileID: 15}
   m_Selected: 0
   m_LastSelected: 1
---- !u!114 &11
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -270,17 +195,17 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 662
-    width: 387
-    height: 266
+    y: 719
+    width: 454.5
+    height: 209
   m_MinSize: {x: 101, y: 121}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 20}
+  m_ActualView: {fileID: 16}
   m_Panes:
-  - {fileID: 20}
+  - {fileID: 16}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &12
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -295,18 +220,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 387
+    x: 454.5
     y: 0
-    width: 322.5
+    width: 253
     height: 928
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 21}
+  m_ActualView: {fileID: 17}
   m_Panes:
-  - {fileID: 21}
+  - {fileID: 17}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &13
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -321,18 +246,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 709.5
+    x: 707.5
     y: 0
-    width: 385.5
+    width: 383
     height: 928
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 22}
+  m_ActualView: {fileID: 18}
   m_Panes:
-  - {fileID: 22}
+  - {fileID: 18}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &14
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -347,258 +272,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1095
+    x: 1090.5
     y: 0
-    width: 416
+    width: 437.5
     height: 928
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 24}
+  m_ActualView: {fileID: 20}
   m_Panes:
-  - {fileID: 24}
+  - {fileID: 20}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &15
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 13984, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Search (1128)
-    m_Image: {fileID: -7008343138469552579, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 452
-    y: 313
-    width: 950
-    height: 538
-  m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
-  m_QueryTreeViewState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 36f0c696
-    m_LastClickedID: -1765347274
-    m_ExpandedIDs: 
-    m_RenameOverlay:
-      m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
-      m_EditFieldRect:
-        serializedVersion: 2
-        x: 0
-        y: 0
-        width: 0
-        height: 0
-      m_UserData: 0
-      m_IsWaitingForDelay: 0
-      m_IsRenaming: 0
-      m_OriginalEventType: 11
-      m_IsRenamingFilename: 0
-      m_ClientGUIView: {fileID: 0}
-    m_SearchString: 
-  m_ViewState:
-    providerIds:
-    - calculator
-    - asset
-    - find
-    - scene
-    - menu
-    - settings
-    - component
-    - system
-    - nodehierarchy
-    - archetype
-    - journal
-    searchFlags: 943718402
-    searchText: p:arrow
-    forceViewMode: 0
-    m_SelectHandler:
-      stream: 
-    m_TrackingHandler:
-      stream: 
-    m_FilterHandler:
-      stream: 
-    m_GroupChanged:
-      stream: 
-    m_ActiveQueryGuid: 
-    hideTabs: 0
-    sessionId: 7ab7367af3124aeeac052950135355c3
-    sessionName: 
-    excludeClearItem: 0
-    tableConfig:
-      id: 
-      name: 
-      columns: []
-    ignoreSaveSearches: 1
-    hideAllGroup: 0
-    windowTitle:
-      m_Text: 
-      m_Image: {fileID: 0}
-      m_Tooltip: 
-    title: project, files
-    itemSize: 32
-    position:
-      serializedVersion: 2
-      x: 0
-      y: 0
-      width: 950
-      height: 538
-    flags: 0
-    group: asset
-    queryBuilderEnabled: 0
-    m_ContextUseExplicitProvidersAsNormalProviders: 0
-  m_LastFocusedWindow: {fileID: 22}
-  m_SearchBoxFocus: 0
-  m_ContextHash: 0
-  searchEventStatus: 1
-  m_FilterSearchQueryToggle: 0
-  activeSearchQuery:
-    m_GUID: e194cc1b99a642929ff0f5156ad2df2c
-    m_Thumbnail: {fileID: 0}
-    m_IsSearchTemplate: 0
-    description: 
-    name: 
-    viewState:
-      providerIds:
-      - calculator
-      - asset
-      - find
-      - scene
-      - menu
-      - settings
-      - component
-      - system
-      - nodehierarchy
-      - archetype
-      - journal
-      searchFlags: -1744830464
-      searchText: 
-      forceViewMode: 0
-      m_SelectHandler:
-        stream: 
-      m_TrackingHandler:
-        stream: 
-      m_FilterHandler:
-        stream: 
-      m_GroupChanged:
-        stream: 
-      m_ActiveQueryGuid: 
-      hideTabs: 0
-      sessionId: 14aa8eaa9fbb458ea3cd60b4911cd650
-      sessionName: 
-      excludeClearItem: 0
-      tableConfig:
-        id: 
-        name: 
-        columns: []
-      ignoreSaveSearches: 0
-      hideAllGroup: 0
-      windowTitle:
-        m_Text: 
-        m_Image: {fileID: 0}
-        m_Tooltip: 
-      title: item
-      itemSize: 96
-      position:
-        serializedVersion: 2
-        x: 0
-        y: 0
-        width: 0
-        height: 0
-      flags: 0
-      group: 
-      queryBuilderEnabled: 0
-      m_ContextUseExplicitProvidersAsNormalProviders: 0
-  m_LeftPanelScrollPosition: {x: 0, y: 0}
-  m_FocusSavedSearchField: 0
-  m_UndoManager:
-    m_UndoStack:
-      m_Buffer:
-      - text: p:arrow
-        cursorPos: 7
-        selectPos: 7
-      - text: 
-        cursorPos: 0
-        selectPos: 0
-      - text: 
-        cursorPos: 0
-        selectPos: 0
-      - text: 
-        cursorPos: 0
-        selectPos: 0
-      - text: 
-        cursorPos: 0
-        selectPos: 0
-      - text: 
-        cursorPos: 0
-        selectPos: 0
-      - text: 
-        cursorPos: 0
-        selectPos: 0
-      - text: 
-        cursorPos: 0
-        selectPos: 0
-      - text: 
-        cursorPos: 0
-        selectPos: 0
-      - text: 
-        cursorPos: 0
-        selectPos: 0
-      - text: 
-        cursorPos: 0
-        selectPos: 0
-      - text: 
-        cursorPos: 0
-        selectPos: 0
-      - text: 
-        cursorPos: 0
-        selectPos: 0
-      - text: 
-        cursorPos: 0
-        selectPos: 0
-      - text: 
-        cursorPos: 0
-        selectPos: 0
-      - text: 
-        cursorPos: 0
-        selectPos: 0
-      - text: 
-        cursorPos: 0
-        selectPos: 0
-      - text: 
-        cursorPos: 0
-        selectPos: 0
-      - text: 
-        cursorPos: 0
-        selectPos: 0
-      - text: 
-        cursorPos: 0
-        selectPos: 0
-      m_HeadIndex: 1
-      m_TailIndex: 0
-      m_CurrentIndex: 0
-    m_UndoLastTime: 0
-    m_RecentSearchIndex: -1
-    m_CurrentText: p:arrow
---- !u!114 &16
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -618,10 +303,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 144
-    y: 97
-    width: 386
-    height: 641
+    x: 146
+    y: 96
+    width: 453.5
+    height: 698
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -636,7 +321,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -171, y: -26}
+      snapOffset: {x: -174, y: -26}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Tool Settings
@@ -676,7 +361,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 1
       id: unity-search-toolbar
       index: 1
@@ -728,7 +413,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Light Settings
       index: 2
@@ -754,7 +439,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Cloth Constraints
       index: 3
@@ -767,7 +452,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Cloth Collisions
       index: 4
@@ -819,7 +504,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Occlusion Culling
       index: 5
@@ -832,7 +517,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Physics Debugger
       index: 6
@@ -845,7 +530,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Scene Visibility
       index: 7
@@ -858,7 +543,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: -387, y: -197}
-      snapOffsetDelta: {x: 1, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Scene View/Particles
       index: 8
@@ -985,17 +670,17 @@ MonoBehaviour:
     m_OverlaysVisible: 1
   m_WindowGUID: 6ec4b650245f86f4b853159290a53aa0
   m_Gizmos: 1
-  m_OverrideSceneCullingMask: 0
-  m_SceneIsLit: 0
+  m_OverrideSceneCullingMask: 6917529027641081856
+  m_SceneIsLit: 1
   m_SceneLighting: 1
   m_2DMode: 1
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 332.6846, y: 306.8442, z: -4.0294333}
+    m_Target: {x: 354.57095, y: 603.8095, z: -20.604296}
     speed: 2
-    m_Value: {x: 332.6846, y: 306.8442, z: -4.0294333}
+    m_Value: {x: 354.57095, y: 603.8095, z: -20.604296}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1004,9 +689,9 @@ MonoBehaviour:
   m_ValidateTrueMetals: 0
   m_DoValidateTrueMetals: 0
   m_SceneViewState:
-    m_AlwaysRefresh: 0
+    m_AlwaysRefresh: 1
     showFog: 1
-    showSkybox: 0
+    showSkybox: 1
     showFlares: 1
     showImageEffects: 1
     showParticleSystems: 1
@@ -1045,9 +730,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 590.6873
+    m_Target: 453.4021
     speed: 2
-    m_Value: 590.6873
+    m_Value: 453.4021
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -1074,7 +759,7 @@ MonoBehaviour:
   m_SceneVisActive: 1
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
---- !u!114 &17
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1212,7 +897,7 @@ MonoBehaviour:
   m_CurrentEditor: 0
   m_LayerEditor:
     m_SelectedLayerIndex: 0
---- !u!114 &18
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1342,7 +1027,7 @@ MonoBehaviour:
       type: {class: TransitionLibraryAliasesPage, ns: Animancer.Editor.TransitionLibraries, asm: Kybernetik.Animancer.Editor}
       data:
         _ScrollPosition: {x: 0, y: 0}
---- !u!114 &19
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1385,7 +1070,7 @@ MonoBehaviour:
   m_SequencePath:
     m_SelectionRoot: 0
     m_SubElements: []
---- !u!114 &20
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1405,10 +1090,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 144
-    y: 759
-    width: 386
-    height: 245
+    x: 146
+    y: 815
+    width: 453.5
+    height: 188
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1419,7 +1104,7 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
---- !u!114 &21
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1439,9 +1124,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 531
-    y: 97
-    width: 320.5
+    x: 600.5
+    y: 96
+    width: 251
     height: 907
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1456,25 +1141,25 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 56b40300
-      m_LastClickedID: 242774
-      m_ExpandedIDs: 7ceff0ff14f1f0ff16af0300eaaf030054b0030092b00300deb2030018b30300eeb3030056b40300e0b50300acb60300
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: 84faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: GetSkillObj
-        m_OriginalName: GetSkillObj
+        m_Name: 
+        m_OriginalName: 
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 228978
+        m_UserData: 0
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 0
+        m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 12}
+        m_ClientGUIView: {fileID: 9}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -1482,7 +1167,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 9cd1477dbcc46d642bdb31d35b82cd83
---- !u!114 &22
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1503,8 +1188,8 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 853.5
-    y: 97
-    width: 383.5
+    y: 96
+    width: 381
     height: 907
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1517,7 +1202,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: herode
+    m_NameFilter: 
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -1527,24 +1212,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets
+    - Assets/Editor
     m_Globs: []
-    m_OriginalText: herode
+    m_OriginalText: 
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets
+  - Assets/Editor
   m_LastFoldersGridSize: 16
   m_LastProjectPath: /Users/lcn/0Fort23Projects/XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: c4eb0000
-    m_LastClickedID: 60356
-    m_ExpandedIDs: 00000000c4eb0000c6eb0000c8eb0000caeb0000cceb0000ceeb0000d0eb0000d2eb0000d4eb0000d6eb0000d8eb0000daeb0000dceb000000ca9a3b
+    m_SelectedIDs: 90a80000
+    m_LastClickedID: 43152
+    m_ExpandedIDs: 000000009ca600009ea60000a0a60000a2a60000a4a60000a6a60000a8a60000aaa60000aca60000aea60000b0a60000b2a60000b4a6000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1560,7 +1245,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 13}
+      m_ClientGUIView: {fileID: 10}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -1572,7 +1257,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000c4eb0000c6eb0000c8eb0000caeb0000cceb0000ceeb0000d0eb0000d2eb0000d4eb0000d6eb0000d8eb0000daeb0000dceb0000
+    m_ExpandedIDs: 000000009ca600009ea60000a0a60000a2a60000a4a60000a6a60000a8a60000aaa60000aca60000aea60000b0a60000b2a60000b4a60000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1616,7 +1301,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 13}
+      m_ClientGUIView: {fileID: 10}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -1628,7 +1313,7 @@ MonoBehaviour:
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 205
---- !u!114 &23
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1648,10 +1333,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 144
-    y: 97
-    width: 386
-    height: 641
+    x: 146
+    y: 96
+    width: 453.5
+    height: 698
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1704,29 +1389,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 386
-      height: 620
-    m_Scale: {x: 0.9295352, y: 0.9295352}
-    m_Translation: {x: 193, y: 310}
+      width: 453.5
+      height: 677
+    m_Scale: {x: 1, y: 1}
+    m_Translation: {x: 226.75, y: 338.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -207.63065
-      y: -333.5
-      width: 415.2613
-      height: 667
+      x: -226.75
+      y: -338.5
+      width: 453.5
+      height: 677
     m_MinimalGUI: 1
-  m_defaultScale: 0.9295352
-  m_LastWindowPixelSize: {x: 772, y: 1282}
+  m_defaultScale: 1
+  m_LastWindowPixelSize: {x: 907, y: 1396}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &24
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1746,9 +1431,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1239
-    y: 97
-    width: 415
+    x: 1236.5
+    y: 96
+    width: 436.5
     height: 907
   m_SerializedDataModeController:
     m_DataMode: 0