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

# Conflicts:
#	Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat   resolved by master version

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.99909014
+    - _Alpha: 0.009337337
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.99817175
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Res/Config/EventLinkConfig.json

@@ -7628,7 +7628,7 @@
       "EventID": 30003,
       "optionType": 2,
       "optionPara1": [
-        1003
+        1004
       ],
       "ResultType": 2,
       "ResultOptions": [

Assets/Res/Config/FabaoPowerupConfig.json

@@ -20,7 +20,7 @@
     {
       "ID": 2,
       "Power": 126,
-      "HP": 288.24,
+      "HP": 319.21,
       "DEF": 17.15,
       "ATK": 42.88,
       "NeedLv": 21,
@@ -37,7 +37,7 @@
     {
       "ID": 3,
       "Power": 159,
-      "HP": 405.81,
+      "HP": 488.06,
       "DEF": 21.57,
       "ATK": 53.93,
       "NeedLv": 31,
@@ -54,7 +54,7 @@
     {
       "ID": 4,
       "Power": 200,
-      "HP": 564.84,
+      "HP": 722.73,
       "DEF": 27.13,
       "ATK": 67.83,
       "NeedLv": 41,
@@ -71,7 +71,7 @@
     {
       "ID": 5,
       "Power": 252,
-      "HP": 1062.13,
+      "HP": 1426.29,
       "DEF": 46.53,
       "ATK": 116.33,
       "NeedLv": 51,
@@ -88,7 +88,7 @@
     {
       "ID": 6,
       "Power": 318,
-      "HP": 1453.31,
+      "HP": 2028.76,
       "DEF": 58.52,
       "ATK": 146.31,
       "NeedLv": 61,
@@ -112,7 +112,7 @@
     {
       "ID": 7,
       "Power": 401,
-      "HP": 1975.57,
+      "HP": 2847.04,
       "DEF": 73.61,
       "ATK": 184.02,
       "NeedLv": 71,
@@ -129,7 +129,7 @@
     {
       "ID": 8,
       "Power": 505,
-      "HP": 3641.61,
+      "HP": 5389.58,
       "DEF": 126.24,
       "ATK": 315.61,
       "NeedLv": 81,
@@ -146,7 +146,7 @@
     {
       "ID": 9,
       "Power": 636,
-      "HP": 4898.77,
+      "HP": 7415.87,
       "DEF": 158.78,
       "ATK": 396.95,
       "NeedLv": 91,
@@ -163,7 +163,7 @@
     {
       "ID": 10,
       "Power": 801,
-      "HP": 6562.07,
+      "HP": 10128.63,
       "DEF": 199.7,
       "ATK": 499.25,
       "NeedLv": 101,
@@ -180,7 +180,7 @@
     {
       "ID": 11,
       "Power": 1009,
-      "HP": 11941.8,
+      "HP": 18746.05,
       "DEF": 342.5,
       "ATK": 856.26,
       "NeedLv": 111,
@@ -197,7 +197,7 @@
     {
       "ID": 12,
       "Power": 1271,
-      "HP": 15883.98,
+      "HP": 25306.32,
       "DEF": 430.78,
       "ATK": 1076.94,
       "NeedLv": 121,
@@ -221,7 +221,7 @@
     {
       "ID": 13,
       "Power": 1601,
-      "HP": 21064.97,
+      "HP": 34002.94,
       "DEF": 541.8,
       "ATK": 1354.5,
       "NeedLv": 131,
@@ -238,7 +238,7 @@
     {
       "ID": 14,
       "Power": 2017,
-      "HP": 37992.9,
+      "HP": 62047.29,
       "DEF": 929.23,
       "ATK": 2323.08,
       "NeedLv": 141,
@@ -255,7 +255,7 @@
     {
       "ID": 15,
       "Power": 2541,
-      "HP": 50130.03,
+      "HP": 82729.21,
       "DEF": 1168.72,
       "ATK": 2921.81,
       "NeedLv": 151,
@@ -272,7 +272,7 @@
     {
       "ID": 16,
       "Power": 3202,
-      "HP": 65999.7,
+      "HP": 109950.344,
       "DEF": 1469.94,
       "ATK": 3674.84,
       "NeedLv": 161,
@@ -289,7 +289,7 @@
     {
       "ID": 17,
       "Power": 4035,
-      "HP": 118254.094,
+      "HP": 198692.172,
       "DEF": 2521.07,
       "ATK": 6302.67,
       "NeedLv": 171,
@@ -306,7 +306,7 @@
     {
       "ID": 18,
       "Power": 5084,
-      "HP": 155094.438,
+      "HP": 262626.6,
       "DEF": 3170.82,
       "ATK": 7927.05,
       "NeedLv": 181,
@@ -330,7 +330,7 @@
     {
       "ID": 19,
       "Power": 6406,
-      "HP": 203069.516,
+      "HP": 346318.563,
       "DEF": 3988.03,
       "ATK": 9970.08,
       "NeedLv": 191,
@@ -347,7 +347,7 @@
     {
       "ID": 20,
       "Power": 8072,
-      "HP": 362006.844,
+      "HP": 621416.5,
       "DEF": 6839.81,
       "ATK": 17099.53,
       "NeedLv": 201,
@@ -364,7 +364,7 @@
     {
       "ID": 21,
       "Power": 10171,
-      "HP": 472569.3,
+      "HP": 816099.1,
       "DEF": 8602.63,
       "ATK": 21506.58,
       "NeedLv": 211,
@@ -381,7 +381,7 @@
     {
       "ID": 22,
       "Power": 12815,
-      "HP": 616076.063,
+      "HP": 1069855.38,
       "DEF": 10819.78,
       "ATK": 27049.45,
       "NeedLv": 221,
@@ -398,7 +398,7 @@
     {
       "ID": 23,
       "Power": 16147,
-      "HP": 1093860.63,
+      "HP": 1909368.5,
       "DEF": 18556.84,
       "ATK": 46392.1,
       "NeedLv": 231,
@@ -415,7 +415,7 @@
     {
       "ID": 24,
       "Power": 20345,
-      "HP": 1422615.25,
+      "HP": 2495138.25,
       "DEF": 23339.48,
       "ATK": 58348.69,
       "NeedLv": 241,
@@ -439,7 +439,7 @@
     {
       "ID": 25,
       "Power": 25635,
-      "HP": 1848170.13,
+      "HP": 3256019.25,
       "DEF": 29354.73,
       "ATK": 73386.84,
       "NeedLv": 251,
@@ -456,7 +456,7 @@
     {
       "ID": 26,
       "Power": 32300,
-      "HP": 3270797.25,
+      "HP": 5786407.0,
       "DEF": 50345.86,
       "ATK": 125864.656,
       "NeedLv": 261,
@@ -473,7 +473,7 @@
     {
       "ID": 27,
       "Power": 40698,
-      "HP": 4240843.0,
+      "HP": 7531864.5,
       "DEF": 63321.45,
       "ATK": 158303.625,
       "NeedLv": 271,
@@ -490,7 +490,7 @@
     {
       "ID": 28,
       "Power": 51279,
-      "HP": 5493646.5,
+      "HP": 9792674.0,
       "DEF": 79641.22,
       "ATK": 199103.063,
       "NeedLv": 281,
@@ -507,7 +507,7 @@
     {
       "ID": 29,
       "Power": 64612,
-      "HP": 9696167.0,
+      "HP": 17343462.0,
       "DEF": 136591.469,
       "ATK": 341478.656,
       "NeedLv": 291,
@@ -524,7 +524,7 @@
     {
       "ID": 30,
       "Power": 81411,
-      "HP": 12539889.0,
+      "HP": 22502852.0,
       "DEF": 171795.047,
       "ATK": 429487.625,
       "NeedLv": 300,
@@ -548,7 +548,7 @@
     {
       "ID": 31,
       "Power": 102578,
-      "HP": 1.620537E+07,
+      "HP": 29169666.0,
       "DEF": 216071.609,
       "ATK": 540179.0,
       "NeedLv": 310,

Assets/Res/Config/LanguageChineseConfig.json

@@ -13342,111 +13342,111 @@
     },
     {
       "ID": 4076,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4077,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4078,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4079,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4080,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4081,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4082,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4083,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4084,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4085,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4086,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4087,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4088,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4089,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4090,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4091,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4092,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4093,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4094,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4095,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4096,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4097,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4098,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4099,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4100,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4101,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4102,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4103,
@@ -13494,7 +13494,7 @@
     },
     {
       "ID": 4114,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4115,
@@ -13558,11 +13558,11 @@
     },
     {
       "ID": 4130,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4131,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4132,
@@ -13806,7 +13806,7 @@
     },
     {
       "ID": 4192,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4193,
@@ -21850,7 +21850,7 @@
     },
     {
       "ID": 6203,
-      "txt": "我叫{玩家名字}，幸会！不知道友叫住我有何事？"
+      "txt": "我叫{0}，幸会！不知道友叫住我有何事？"
     },
     {
       "ID": 6204,
@@ -21906,7 +21906,7 @@
     },
     {
       "ID": 6217,
-      "txt": "{玩家名字}道友，你准备好了吧？咱们得先干掉几只妖怪，免得它们捣乱！"
+      "txt": "{0}道友，你准备好了吧？咱们得先干掉几只妖怪，免得它们捣乱！"
     },
     {
       "ID": 6218,
@@ -21970,7 +21970,7 @@
     },
     {
       "ID": 6233,
-      "txt": "我叫{玩家名}"
+      "txt": "我叫{0}"
     },
     {
       "ID": 6234,
@@ -21978,7 +21978,7 @@
     },
     {
       "ID": 6235,
-      "txt": "还好密信完好。{玩家名}道友谢谢你了，这是你的奖励拿着。"
+      "txt": "还好密信完好。{0}道友谢谢你了，这是你的奖励拿着。"
     },
     {
       "ID": 6236,
@@ -21990,7 +21990,7 @@
     },
     {
       "ID": 6238,
-      "txt": "{玩家名}道友，是你！快来帮我一把！"
+      "txt": "{0}道友，是你！快来帮我一把！"
     },
     {
       "ID": 6239,
@@ -22062,7 +22062,7 @@
     },
     {
       "ID": 6256,
-      "txt": "多谢{玩家名}道友相助。"
+      "txt": "多谢{0}道友相助。"
     },
     {
       "ID": 6257,
@@ -22222,7 +22222,7 @@
     },
     {
       "ID": 6296,
-      "txt": "我叫{玩家名}，柳道友先服下这颗丹药"
+      "txt": "我叫{0}，柳道友先服下这颗丹药"
     },
     {
       "ID": 6297,
@@ -22390,7 +22390,7 @@
     },
     {
       "ID": 6338,
-      "txt": "那就没得商量了，{玩家名}道友我们上。"
+      "txt": "那就没得商量了，{0}道友我们上。"
     },
     {
       "ID": 6339,
@@ -22434,7 +22434,7 @@
     },
     {
       "ID": 6349,
-      "txt": "{玩家名}这大个就交给你了，我来结阵。"
+      "txt": "{0}这大个就交给你了，我来结阵。"
     },
     {
       "ID": 6350,
@@ -22450,7 +22450,7 @@
     },
     {
       "ID": 6353,
-      "txt": "在下{玩家名}。这位是馨儿，楚道友伤势怎么样。"
+      "txt": "在下{0}。这位是馨儿，楚道友伤势怎么样。"
     },
     {
       "ID": 6354,
@@ -22466,7 +22466,7 @@
     },
     {
       "ID": 6357,
-      "txt": "{玩家名}道友，那我和楚道友就先行一步告辞。"
+      "txt": "{0}道友，那我和楚道友就先行一步告辞。"
     },
     {
       "ID": 6358,
@@ -22474,7 +22474,7 @@
     },
     {
       "ID": 6359,
-      "txt": "（受伤）：{玩家名}道友！"
+      "txt": "（受伤）：{0}道友！"
     },
     {
       "ID": 6360,
@@ -22498,7 +22498,7 @@
     },
     {
       "ID": 6365,
-      "txt": "{玩家名}道友小心，我伤无大碍，我随后就来。"
+      "txt": "{0}道友小心，我伤无大碍，我随后就来。"
     },
     {
       "ID": 6366,
@@ -22510,7 +22510,7 @@
     },
     {
       "ID": 6368,
-      "txt": "{玩家名}道友，你怎么在这里？"
+      "txt": "{0}道友，你怎么在这里？"
     },
     {
       "ID": 6369,
@@ -22534,7 +22534,7 @@
     },
     {
       "ID": 6374,
-      "txt": "{玩家名}道友，我们上。"
+      "txt": "{0}道友，我们上。"
     },
     {
       "ID": 6375,
@@ -22570,11 +22570,11 @@
     },
     {
       "ID": 6383,
-      "txt": "{玩家名}道友，你也拿着。这也不是什么很值钱的东西。"
+      "txt": "{0}道友，你也拿着。这也不是什么很值钱的东西。"
     },
     {
       "ID": 6384,
-      "txt": "馨儿道友那我们赶快会拍卖会吧，应该马上就要开始了，{玩家名}道友，我们就先走了。"
+      "txt": "馨儿道友那我们赶快会拍卖会吧，应该马上就要开始了，{0}道友，我们就先走了。"
     },
     {
       "ID": 6385,
@@ -22674,11 +22674,11 @@
     },
     {
       "ID": 6409,
-      "txt": "在下{玩家名}"
+      "txt": "在下{0}"
     },
     {
       "ID": 6410,
-      "txt": "{玩家名}道友，在下身受重伤，血海宗的恶贼肯定还是派人来追杀夺走玄冥晶，若道友能护我到百里外的青云镇，我愿献上二阶灵丹，助你修行！"
+      "txt": "{0}道友，在下身受重伤，血海宗的恶贼肯定还是派人来追杀夺走玄冥晶，若道友能护我到百里外的青云镇，我愿献上二阶灵丹，助你修行！"
     },
     {
       "ID": 6411,
@@ -22702,7 +22702,7 @@
     },
     {
       "ID": 6416,
-      "txt": "多谢{玩家名}道友，这丹药你先拿着"
+      "txt": "多谢{0}道友，这丹药你先拿着"
     },
     {
       "ID": 6417,
@@ -22978,7 +22978,7 @@
     },
     {
       "ID": 6485,
-      "txt": "（高兴）：{玩家名}道友，咱们又见面了"
+      "txt": "（高兴）：{0}道友，咱们又见面了"
     },
     {
       "ID": 6486,
@@ -22990,7 +22990,7 @@
     },
     {
       "ID": 6488,
-      "txt": "（打趣）：没想到{玩家名}道友这么有女人缘呀！"
+      "txt": "（打趣）：没想到{0}道友这么有女人缘呀！"
     },
     {
       "ID": 6489,
@@ -23102,7 +23102,7 @@
     },
     {
       "ID": 6516,
-      "txt": "{玩家名}道友，你来输出，我和如烟师姐帮你牵制它！"
+      "txt": "{0}道友，你来输出，我和如烟师姐帮你牵制它！"
     },
     {
       "ID": 6517,
@@ -23114,7 +23114,7 @@
     },
     {
       "ID": 6519,
-      "txt": "哈哈！大妖倒了！这云霄龙鹰还真猛，差点让我飞剑断弦！{玩家名}道友，你太强了！"
+      "txt": "哈哈！大妖倒了！这云霄龙鹰还真猛，差点让我飞剑断弦！{0}道友，你太强了！"
     },
     {
       "ID": 6520,
@@ -38382,7 +38382,7 @@
     },
     {
       "ID": 10336,
-      "txt": "0"
+      "txt": "返回"
     },
     {
       "ID": 10337,

Assets/Res/Config/ShopGroupConfig.json

@@ -3,32 +3,38 @@
     {
       "ID": 1,
       "shopName": 1900,
-      "pageSortNum": 2
+      "pageSortNum": 2,
+      "isShow": true
     },
     {
       "ID": 2,
       "shopName": 1904,
-      "pageSortNum": 4
+      "pageSortNum": 4,
+      "isShow": true
     },
     {
       "ID": 3,
       "shopName": 1905,
-      "pageSortNum": 5
+      "pageSortNum": 5,
+      "isShow": true
     },
     {
       "ID": 4,
       "shopName": 10106,
-      "pageSortNum": 1
+      "pageSortNum": 1,
+      "isShow": true
     },
     {
       "ID": 5,
       "shopName": 10106,
-      "pageSortNum": 6
+      "pageSortNum": 6,
+      "isShow": false
     },
     {
       "ID": 6,
       "shopName": 10330,
-      "pageSortNum": 3
+      "pageSortNum": 3,
+      "isShow": true
     }
   ]
 }

Assets/Res/Config/ShopItemConfig.json

@@ -1869,6 +1869,29 @@
       "itemId": [
         1002
       ],
+      "itemCount": [
+        10
+      ],
+      "costItemId": 1004,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 7,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ]
+    },
+    {
+      "ID": 702,
+      "giftID": "",
+      "itemId": [
+        1002
+      ],
       "itemCount": [
         100
       ],
@@ -1887,16 +1910,16 @@
       ]
     },
     {
-      "ID": 702,
+      "ID": 703,
       "giftID": "",
       "itemId": [
         1002
       ],
       "itemCount": [
-        10
+        10000
       ],
       "costItemId": 1004,
-      "price": 1,
+      "price": 1000,
       "oldPrice": 1,
       "buyCount": -1,
       "maxBuyCount": -1,

Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -245,7 +245,7 @@ MonoBehaviour:
     isLoop: 1
     allTargets:
     - {fileID: 4394259989585503546}
-    TweenAssetInfo: {fileID: 11400000, guid: ad51b724902d50d4a8bfee51c7c2ac05, type: 2}
+    TweenAssetInfo: {fileID: 0}
     TargetFoldout: 0
     maxDuration: 0
     isUpdate: 1
@@ -1857,7 +1857,7 @@ MonoBehaviour:
     isLoop: 1
     allTargets:
     - {fileID: 6614233195307115645}
-    TweenAssetInfo: {fileID: 11400000, guid: ad51b724902d50d4a8bfee51c7c2ac05, type: 2}
+    TweenAssetInfo: {fileID: 0}
     TargetFoldout: 0
     maxDuration: 0
     isUpdate: 1
@@ -2187,7 +2187,7 @@ MonoBehaviour:
     isLoop: 1
     allTargets:
     - {fileID: 5838194811331929845}
-    TweenAssetInfo: {fileID: 11400000, guid: ad51b724902d50d4a8bfee51c7c2ac05, type: 2}
+    TweenAssetInfo: {fileID: 0}
     TargetFoldout: 0
     maxDuration: 0
     isUpdate: 1
@@ -2919,6 +2919,7 @@ GameObject:
   - component: {fileID: 1323129257164695259}
   - component: {fileID: 2475580319306575879}
   - component: {fileID: 6810677379968457547}
+  - component: {fileID: 5388431150151075162}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -2988,3 +2989,16 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5173\u95ED\u5267\u60C5"
+--- !u!114 &5388431150151075162
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9185397062077033591}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10336

Assets/Res/UI/DivineSence/GongFaWidgetType2.prefab

@@ -80,6 +80,95 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "1\u7EA7"
+--- !u!1 &3946302300112563901
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8208259687597390858}
+  - component: {fileID: 4691782949268009187}
+  - component: {fileID: 5461611333477722381}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_FabaoIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8208259687597390858
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3946302300112563901}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 3138042374053727249}
+  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: 60.0992, y: 60.0997}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4691782949268009187
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3946302300112563901}
+  m_CullTransparentMesh: 1
+--- !u!114 &5461611333477722381
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3946302300112563901}
+  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: icon_s3201
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
+  packInfo:
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 1d33824861d7fb9fd50c0d939197e59c
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &6841961338208862055
 GameObject:
   m_ObjectHideFlags: 0
@@ -112,6 +201,7 @@ RectTransform:
   m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 4458728715945139816}
+  - {fileID: 8208259687597390858}
   - {fileID: 3608208511281012576}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -151,6 +241,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_FabaoIcon
+    gameObject: {fileID: 5461611333477722381}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &7546164237769612545
 GameObject:
@@ -170,7 +265,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4458728715945139816
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/TipMessagePanel/TipMessagePanel.controller

@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1102 &-2243743873803255587
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: showTips
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 6338071ae19698349baf2871fb50fc52, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: TipMessagePanel
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 8971930629035168008}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1107 &8971930629035168008
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -2243743873803255587}
+    m_Position: {x: 270, y: 50, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -2243743873803255587}

Assets/Res/UI/TipMessagePanel/TipMessagePanel.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: WXtK4XylU3tM1F/bKTT0SXP8D7QAHxWvqP9t1KYiSYaXmpNq/NqLc+vkxnMV
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/TipMessagePanel/TipMessagePanel.prefab

@@ -10,6 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8939363238171972854}
   - component: {fileID: 6560399385940932289}
+  - component: {fileID: 2256782516058644794}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: TipMessagePanel
@@ -73,6 +74,27 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!95 &2256782516058644794
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 880950410469998858}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: f1edf800366771144b7323c7fe314dd4, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &2463588081883955419
 GameObject:
   m_ObjectHideFlags: 0
@@ -109,8 +131,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 3.4199}
-  m_SizeDelta: {x: 542.1544, y: 76.4785}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 542.1544, y: 49.8192}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &607144206561970494
 CanvasRenderer:
@@ -182,7 +204,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6862210015852255166
 RectTransform:
   m_ObjectHideFlags: 0
@@ -382,6 +404,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 6582327781870859720}
+  - component: {fileID: 2252102652261273102}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: dotPoint
@@ -411,6 +434,18 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!225 &2252102652261273102
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5357924637379588896}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &8464601678468247561
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/TipMessagePanel/showTips.anim

@@ -0,0 +1,196 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: showTips
+  serializedVersion: 9
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.6666666
+        value: 150
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.y
+    path: dotPoint
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.6666666
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Alpha
+    path: dotPoint
+    classID: 225
+    script: {fileID: 0}
+    flags: 0
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 1820862926
+      attribute: 538195251
+      script: {fileID: 0}
+      typeID: 224
+      customType: 28
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 1820862926
+      attribute: 1574349066
+      script: {fileID: 0}
+      typeID: 225
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1.6666666
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.6666666
+        value: 150
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.y
+    path: dotPoint
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.6666666
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Alpha
+    path: dotPoint
+    classID: 225
+    script: {fileID: 0}
+    flags: 0
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
+  m_ACLContext:
+    m_RootBone: {fileID: 0}
+    ACLCompressionLevel: 0
+    ACLCurvePrecision: 0.01
+    UseACLCurve: 0

Assets/Res/UI/TipMessagePanel/showTips.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: CXkcvSqqUioqqed/vA1jIWlqVUuGPIaKk8ROwwBsrWcXzQb8kCXRzl6sKu24
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -144,6 +144,7 @@ namespace Fort23.Core
       /// 更改名称
       /// </summary>
       AlterName,
+      DialoguePanelOpen,
 
     }
 }

Assets/Scripts/Core/UI/Core/UIManager.cs

@@ -128,7 +128,7 @@ namespace Fort23.Mono
         /// <summary>
         /// 展示文字提示长度
         /// </summary>
-        public int ShowTextCount;
+        public long ShowTextTime;
 
         /// <summary>
         /// 展示文字提示最大长度

Assets/Scripts/GameData/ExcelConfig/ShopGroupConfig.cs

@@ -44,6 +44,16 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///是否显示
+		/// </summary>
+#if !COMBAT_SERVER
+		public bool isShow;
+#else
+		public bool isShow{ set; get; }
+#endif
+		
+
 	}
 
 }

Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -135,7 +135,7 @@ public class DialogueManager : Singleton<DialogueManager>
         {
             if (dialogueConfig.LanID != null)
             {
-                DialoguePanel.OpenDialoguePanel(CurrentEventList, dialogueConfig.ID, null, ShowDialogueEventData.MessageShowType.Verbatim,
+                await DialoguePanel.OpenDialoguePanel(CurrentEventList, dialogueConfig.ID, null, ShowDialogueEventData.MessageShowType.Verbatim,
                     FishDialogue);
             }
             else
@@ -199,7 +199,7 @@ public class DialogueManager : Singleton<DialogueManager>
                 //不是一次性事件弹出boss界面
                 if (eventConfig.EventTriggerType != 2)
                 {
-                    bool relust = await BossInfoPanel.OpenPanel(dialogueConfig.optionPara1[0]);
+                    bool relust = await BossInfoPanel.OpenPanel(dialogueConfig.optionPara1[0],CurrentEventList);
                     if (relust)
                     {
                         CTask cTask = CTask.Create();

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -680,13 +680,14 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 {
                     TipMessagePanel tipMessagePanel = await TipMessagePanel.OpenTipMessagePanel(
                         $"该任务需要先解锁[{LanguageManager.Instance.Text(lastSmallPlacesConfig.placeName)}], 完成{lastSmallPlacesConfig.CompletionEventCount}个任务后, 可解锁.");
-                    tipMessagePanel.UIClosed(() =>
+                    // tipMessagePanel.UIClosed(() =>
+                    // {
+                    //   
+                    // });
+                    if (PlayerGuideManager.Instance.GuideIsCanDo(3))
                     {
-                        if (PlayerGuideManager.Instance.GuideIsCanDo(3))
-                        {
-                            PlayerGuideManager.Instance.SetGuid(3);
-                        }
-                    });
+                        PlayerGuideManager.Instance.SetGuid(3);
+                    }
 
                     return;
                 }

Assets/Scripts/GameUI/GameApplction.cs

@@ -116,6 +116,8 @@ public class GameApplction : IGameStart
         //     LogTool.Error("登陆失败");
         //     return;
         // }
+        EventManager.Instance.RemoveEventListener(CustomEventType.DialoguePanelOpen,DialoguePanelOpenEvent);
+        EventManager.Instance.AddEventListener(CustomEventType.DialoguePanelOpen,DialoguePanelOpenEvent);
         UIManager.Instance.Canvas.gameObject.SetActive(true);
         if (PlayerGuideManager.Instance.GuideIsCanDo(1))
         {
@@ -199,14 +201,19 @@ public class GameApplction : IGameStart
         XinShouCombat();
     }
 
-    public async void XinShouCombat()
+    private void DialoguePanelOpenEvent(IEventData e)
     {
         MarskPanel.ClosePanel();
+    }
+
+    public async void XinShouCombat()
+    {
+        // MarskPanel.ClosePanel();
         if (PlayerGuideManager.Instance.GuideIsCanDo(1))
         {
             AccountFileInfo.EventList eventList2 = EventSystemManager.Instance.AddEvent(9999);
             await EventSystemManager.Instance.TriggerEvent(eventList2,
-                uiOpenOverCallBack: () => { MarskPanel.ClosePanel(); });
+                uiOpenOverCallBack: () => { });
 
             CTask cTask = CTask.Create();
             await CombatDrive.Instance.LoadLevelBattleCombat(10001, false, -1,
@@ -232,5 +239,9 @@ public class GameApplction : IGameStart
             // PlayerGuideManager.Instance.NextGuide();
             mainPanel.GetFocus();
         }
+        else
+        {
+            MarskPanel.ClosePanel();
+        }
     }
 }

Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -202,7 +202,7 @@ namespace Fort23.Mono
                 PlayerManager.Instance.gameConstantConfig.DetectEventCount)
             {
                 await DivineSenceRestoredPanel.OpenPanel();
-                await TipMessagePanel.OpenTipMessagePanel("神识值不够！");
+                // await TipMessagePanel.OpenTipMessagePanel("神识值不够！");
                 return;
             }
             

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -45,7 +45,7 @@ namespace Fort23.Mono
 
         private bool isOver;
 
-        public static async void OpenDialoguePanel(AccountFileInfo.EventList CurrentEventList, int id, string[] icon,
+        public static async CTask OpenDialoguePanel(AccountFileInfo.EventList CurrentEventList, int id, string[] icon,
             ShowDialogueEventData.MessageShowType messageShowType,
             Action<int?> finish)
         {
@@ -62,6 +62,12 @@ namespace Fort23.Mono
             dialoguePanel.ShowPanel(LanID, icon, messageShowType, finish);
         }
 
+        public override CTask Show()
+        {
+            EventManager.Instance.Dispatch(CustomEventType.DialoguePanelOpen,null);
+            return base.Show();
+        }
+
         private void Init()
         {
             isAddStack = false;
@@ -299,7 +305,7 @@ namespace Fort23.Mono
 
             _isShowNextButton = false;
             shownextIcon.SetActive(false);
-            string m = LanguageManager.Instance.Text(dialogueMessaga[index]);
+            string m = LanguageManager.Instance.Text(dialogueMessaga[index],PlayerManager.Instance.PlayerName);
 
          
             

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

@@ -18,6 +18,7 @@ namespace Fort23.Mono
 
         private LevelbattleConfig levelbattleConfig;
         private GroupConfig groupConfig;
+
         List<BossInfoHeadWidget> BossInfoHeadWidgets = new List<BossInfoHeadWidget>();
         // private HeroModelConfig heroModelConfig;
         // private MonsterPowerUpConfig heroPowerUpConfig;
@@ -58,28 +59,50 @@ namespace Fort23.Mono
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
-            await CustomInit((int)uiData[0], uiData[1] as CTask<bool>);
+            await CustomInit((int)uiData[0], uiData[2] as AccountFileInfo.EventList, uiData[2] as CTask<bool>);
             return await base.AsyncInit(uiData);
         }
 
 
-        public async CTask CustomInit(int levebattleId, CTask<bool> result)
+        public async CTask CustomInit(int levebattleId, AccountFileInfo.EventList eventList, CTask<bool> result)
         {
             this.result = result;
             levelbattleConfig = ConfigComponent.Instance.Get<LevelbattleConfig>(levebattleId);
             groupConfig = ConfigComponent.Instance.Get<GroupConfig>(levelbattleConfig.Group[0]);
-            foreach (var i in groupConfig.GroupMonster)
+            for (var i = 0; i < groupConfig.GroupMonster.Length; i++)
             {
-                HeroModelConfig heroModelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(i);
-                MonsterPowerUpConfig heroPowerUpConfig = ConfigComponent.Instance.Get<MonsterPowerUpConfig>(PlayerManager.Instance.myHero.level.Value);
+                HeroModelConfig heroModelConfig =
+                    ConfigComponent.Instance.Get<HeroModelConfig>(groupConfig.GroupMonster[i]);
                 CombatHeroInfo combatHeroInfo = new CombatHeroInfo();
-                combatHeroInfo.InitMonster(heroModelConfig.ID, heroPowerUpConfig.ID);
+                //玩家等级
+                if (groupConfig.GroupMonsterLevel[i] == -1)
+                {
+                    MonsterPowerUpConfig heroPowerUpConfig =
+                        ConfigComponent.Instance.Get<MonsterPowerUpConfig>(eventList.heroLevel);
+
+                    combatHeroInfo.InitMonster(heroModelConfig.ID, heroPowerUpConfig.ID);
+                }
+                else
+                {
+                    MonsterPowerUpConfig heroPowerUpConfig =
+                        ConfigComponent.Instance.Get<MonsterPowerUpConfig>(groupConfig.GroupMonsterLevel[i]);
+
+                    combatHeroInfo.InitMonster(heroModelConfig.ID, heroPowerUpConfig.ID);
+                }
 
-                BossInfoHeadWidget bossInfoHeadWidget  = await UIManager.Instance.CreateGComponent<BossInfoHeadWidget>(null,BossInfoHeadRoot);
+
+                BossInfoHeadWidget bossInfoHeadWidget =
+                    await UIManager.Instance.CreateGComponent<BossInfoHeadWidget>(null, BossInfoHeadRoot);
                 bossInfoHeadWidget.CustomInit(combatHeroInfo);
                 bossInfoHeadWidget.OnClick = OnClick;
                 BossInfoHeadWidgets.Add(bossInfoHeadWidget);
             }
+            // foreach (var i in groupConfig.GroupMonster)
+            // {
+            //    
+            //   
+            // }
+
             // heroModelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(groupConfig.GroupMonster[0]);
             // heroPowerUpConfig = ConfigComponent.Instance.Get<MonsterPowerUpConfig>(PlayerManager.Instance.myHero.level.Value);
             //
@@ -92,7 +115,7 @@ namespace Fort23.Mono
         private void OnClick(ItemWidgetBasic obj)
         {
             BossInfoHeadWidget bossInfoHeadWidget = obj as BossInfoHeadWidget;
-            UpdateInfo(2,bossInfoHeadWidget._combatHero);
+            UpdateInfo(2, bossInfoHeadWidget._combatHero);
             Icon_Select.transform.SetParent(bossInfoHeadWidget.transform);
             Icon_Select.transform.SetAsFirstSibling();
             Icon_Select.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0);
@@ -112,14 +135,17 @@ namespace Fort23.Mono
                 Icon_Select.transform.SetParent(Btn_Player.transform);
                 Icon_Select.transform.SetAsFirstSibling();
                 Icon_Select.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0);
-                Text_Name.text = "名称：" + LanguageManager.Instance.Text(PlayerManager.Instance.PlayerName);
+                Text_Name.text = "名称：" + PlayerManager.Instance.PlayerName;
 
 
-                Text_Jingjie.text = "境界：" + LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
-                                    LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
-                                    LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
+                Text_Jingjie.text =
+                    "境界：" +
+                    LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
+                    LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
+                    LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
 
-                Text_Linggen.text = $"金：{PlayerManager.Instance.myHero.Metal} 木：{PlayerManager.Instance.myHero.Wood} 水：{PlayerManager.Instance.myHero.Water} 火：{PlayerManager.Instance.myHero.Fire} 土：{PlayerManager.Instance.myHero.Earth}";
+                Text_Linggen.text =
+                    $"金：{PlayerManager.Instance.myHero.Metal} 木：{PlayerManager.Instance.myHero.Wood} 水：{PlayerManager.Instance.myHero.Water} 火：{PlayerManager.Instance.myHero.Fire} 土：{PlayerManager.Instance.myHero.Earth}";
                 Text_Hp.text = PlayerManager.Instance.myHero.hp.Value.ToString();
 
                 using (CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer())
@@ -159,13 +185,14 @@ namespace Fort23.Mono
             {
                 // Icon_Select.transform.SetParent(Btn_Boss.transform);
                 // Icon_Select.transform.SetAsFirstSibling();
-              
+
                 Text_Name.text = "名称：" + LanguageManager.Instance.Text(combatHeroInfo.modelConfig.name);
 
 
-                Text_Jingjie.text = "境界：" + LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie1) +
-                                    LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie2) +
-                                    LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie3);
+                Text_Jingjie.text =
+                    "境界：" + LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie1) +
+                    LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie2) +
+                    LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie3);
 
                 using (CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer())
                 {
@@ -175,12 +202,19 @@ namespace Fort23.Mono
                         {
                             int index = i;
                             bool isUlock = combatHeroInfo.level >= combatHeroInfo.modelConfig.fabaoActiveLv[i];
-                            cTaskAwaitBuffer.AddTask(UIManager.Instance.CreateGComponent<GongFaWidgetType2>((faBaoWidget) =>
+                            if (isUlock)
                             {
-                                faBaoWidget.CustomInit(new FaBaoInfo(combatHeroInfo.modelConfig.fa_bao_id[index], combatHeroInfo.MonsterPowerUpConfig.FabaoLv, 1),isUlock);
-                                faBaoWidget.OnClick = FaBaoWidgetOnClick;
-                                gongFaWidgetType2s.Add(faBaoWidget);
-                            }, FabaoRoot));
+                                cTaskAwaitBuffer.AddTask(UIManager.Instance.CreateGComponent<GongFaWidgetType2>(
+                                    (faBaoWidget) =>
+                                    {
+                                        faBaoWidget.CustomInit(
+                                            new FaBaoInfo(combatHeroInfo.modelConfig.fa_bao_id[index],
+                                                combatHeroInfo.MonsterPowerUpConfig.FabaoLv,
+                                                combatHeroInfo.MonsterPowerUpConfig.FabaoStar), isUlock);
+                                        faBaoWidget.OnClick = FaBaoWidgetOnClick;
+                                        gongFaWidgetType2s.Add(faBaoWidget);
+                                    }, FabaoRoot));
+                            }
                         }
                     }
 
@@ -190,12 +224,18 @@ namespace Fort23.Mono
                         {
                             int index = i;
                             bool isUlock = combatHeroInfo.level >= combatHeroInfo.modelConfig.skillActiveLv[i];
-                            cTaskAwaitBuffer.AddTask(UIManager.Instance.CreateGComponent<GongFaWidgetType2>((skillWidget) =>
+                            if (isUlock)
                             {
-                                skillWidget.CustomInit(new SkillInfo(combatHeroInfo.modelConfig.skillID[index], combatHeroInfo.MonsterPowerUpConfig.GongfaLv, combatHeroInfo.MonsterPowerUpConfig.GongfaStar));
-                                skillWidget.OnClick = FaBaoWidgetOnClick;
-                                gongFaWidgetType2s.Add(skillWidget);
-                            }, GongfaRoot));
+                                cTaskAwaitBuffer.AddTask(UIManager.Instance.CreateGComponent<GongFaWidgetType2>(
+                                    (skillWidget) =>
+                                    {
+                                        skillWidget.CustomInit(new SkillInfo(combatHeroInfo.modelConfig.skillID[index],
+                                            combatHeroInfo.MonsterPowerUpConfig.GongfaLv,
+                                            combatHeroInfo.MonsterPowerUpConfig.GongfaStar));
+                                        skillWidget.OnClick = FaBaoWidgetOnClick;
+                                        gongFaWidgetType2s.Add(skillWidget);
+                                    }, GongfaRoot));
+                            }
                         }
                     }
 
@@ -203,7 +243,8 @@ namespace Fort23.Mono
                 }
 
 
-                Text_Linggen.text = $"金：{combatHeroInfo.Metal} 木：{combatHeroInfo.Wood} 水：{combatHeroInfo.Water} 火：{combatHeroInfo.Fire} 土：{combatHeroInfo.Earth}";
+                Text_Linggen.text =
+                    $"金：{combatHeroInfo.Metal} 木：{combatHeroInfo.Wood} 水：{combatHeroInfo.Water} 火：{combatHeroInfo.Fire} 土：{combatHeroInfo.Earth}";
                 Text_Hp.text = combatHeroInfo.hp.Value.ToString();
             }
         }
@@ -232,11 +273,12 @@ namespace Fort23.Mono
             }
 
             gongFaWidgetType2s.Clear();
-            
+
             foreach (var bossInfoHeadWidget in BossInfoHeadWidgets)
             {
                 UIManager.Instance.DormancyGComponent(bossInfoHeadWidget);
             }
+
             BossInfoHeadWidgets.Clear();
 
             Icon_Select.transform.SetParent(transform);
@@ -245,11 +287,12 @@ namespace Fort23.Mono
             await base.Close();
         }
 
-        public async static CTask<bool> OpenPanel(int levebattleId)
+        public async static CTask<bool> OpenPanel(int levebattleId, AccountFileInfo.EventList CurrentEventList)
         {
             CTask<bool> result = CTask<bool>.Create();
-            
-            BossInfoPanel bossInfoPanel = await UIManager.Instance.LoadAndOpenPanel<BossInfoPanel>(null, UILayer.Top, uiData: new object[] { levebattleId, result },isShowBG:true);
+
+            BossInfoPanel bossInfoPanel = await UIManager.Instance.LoadAndOpenPanel<BossInfoPanel>(null, UILayer.Top,
+                uiData: new object[] { levebattleId, CurrentEventList, result }, isShowBG: true);
             // bossInfoPanel.CustomInit(levebattleId, result);
             return await result;
         }

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

@@ -25,11 +25,14 @@ namespace Fort23.Mono
         {
         }
 
-        public void CustomInit(FaBaoInfo faBaoInfo,bool isUlock = true)
+        public void CustomInit(FaBaoInfo faBaoInfo, bool isUlock = true)
         {
+            Icon_FabaoIcon.gameObject.SetActive(true);
+            Icon_GongFaIcon.gameObject.SetActive(false);
             this.faBaoInfo = faBaoInfo;
             Text_Level.text = faBaoInfo.FaBaoData.level.ToString() + "级";
-            Icon_GongFaIcon.icon_name = faBaoInfo.SkillConfig.icon;
+            Icon_FabaoIcon.icon_name = faBaoInfo.SkillConfig.icon;
+
             if (isUlock)
             {
                 this.transform.RecoverColor();
@@ -40,8 +43,10 @@ namespace Fort23.Mono
             }
         }
 
-        public void CustomInit(SkillInfo skillInfo,bool isUlock = true)
+        public void CustomInit(SkillInfo skillInfo, bool isUlock = true)
         {
+            Icon_FabaoIcon.gameObject.SetActive(false);
+            Icon_GongFaIcon.gameObject.SetActive(true);
             this.skillInfo = skillInfo;
             Text_Level.text = skillInfo.SkillPowerupConfig.ID.ToString() + "级";
             Icon_GongFaIcon.icon_name = skillInfo.skillConfig.icon;

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

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

Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesInfoPanel.cs

@@ -61,9 +61,31 @@ namespace Fort23.Mono
                 _shopBtnWidgets.Add(shopBtnWidget);
             }
 
+            bool isSelect = false;
+            for (var i = 0; i < _shopBtnWidgets.Count; i++)
+            {
+                if (PlayerManager.Instance.CurrentsmallPlaces.id == _shopBtnWidgets[i].SmallPlacesConfig.ID)
+                {
+                    isSelect = true;
+                    _shopBtnWidgets[i].OnPointerClick();
+                    break;
+                }
+            }
+
+            if (!isSelect)
+            {
+                for (var i = _shopBtnWidgets.Count - 1; i >= _shopBtnWidgets.Count; i--)
+                {
+                    if (_shopBtnWidgets[i].iaUlock)
+                    {
+                        _shopBtnWidgets[i].OnPointerClick();
+                        break;
+                    }
+                }
+            }
 
             // toggleList.GetChildObj();
-            _shopBtnWidgets[0].OnPointerClick();
+
             BigMapConfig bigMapConfig = ConfigComponent.Instance.Get<BigMapConfig>(placesConfig.bigMapID);
             Text_BigMapName.text = LanguageManager.Instance.Text(bigMapConfig.mapName);
             Text_PlacesName.text = LanguageManager.Instance.Text(placesConfig.placeName);
@@ -77,7 +99,7 @@ namespace Fort23.Mono
             // }
 
             AccountFileInfo.PlacesData placesData = PlayerManager.Instance.GetPlacesData(placesConfig.ID);
-            int jindu =placesData == null ? 0 : placesData.progress;
+            int jindu = placesData == null ? 0 : placesData.progress;
             Text_PlacesComplteProgress.text = $"章节事件：{jindu}/{placesConfig.TotalScore}";
             return await base.AsyncInit(uiData);
         }
@@ -247,7 +269,7 @@ namespace Fort23.Mono
                 UIManager.Instance.HideUIUIPanel<LevelChoosePanel>();
                 UIManager.Instance.HideUIUIPanel(this);
                 await PlayerManager.Instance.ChangeMap(smallPlacesConfig.ID);
-                
+
                 callBack?.Invoke(true);
                 callBack = null;
             }

Assets/Scripts/GameUI/UI/ShopPanel/ShopBtnWidget.cs

@@ -12,6 +12,8 @@ namespace Fort23.Mono
 
         public SmallPlacesConfig SmallPlacesConfig;
 
+        public bool iaUlock = false;
+
         private void Init()
         {
         }
@@ -49,6 +51,7 @@ namespace Fort23.Mono
                                              lastSmallPlacesData.completionEventCount <
                                              lastSmallPlacesConfig.CompletionEventCount))
             {
+                iaUlock = false;
                 uiToggle.Hind();
                 // TipMessagePanel.OpenTipMessagePanel(
                 //     $"[{LanguageManager.Instance.Text(shopBtnWidget.SmallPlacesConfig.placeName)}]未解锁, 完成{lastSmallPlacesConfig.CompletionEventCount}个任务后, 可解锁. ");
@@ -63,6 +66,7 @@ namespace Fort23.Mono
                         ce.eventID == lastSmallPlacesConfig.UnlockEnvetid);
                 if (eventList == null || !eventList.isCompleted)
                 {
+                    iaUlock = false;
                     uiToggle.Hind();
                     return;
                 }
@@ -72,10 +76,12 @@ namespace Fort23.Mono
                 PlayerManager.Instance.GetSmallPlacesData(SmallPlacesConfig.ID);
             if (currentSmallPlacesData == null)
             {
+                iaUlock = false;
                 uiToggle.Hind();
                 return;
             }
 
+            iaUlock = true;
             uiToggle.Show();
         }
     }

Assets/Scripts/GameUI/UI/ShopPanel/ShopPanel.cs

@@ -44,7 +44,7 @@ namespace Fort23.Mono
         {
             TitlePanel.OpenPanel(new List<int>() { 1001, 1002 });
             AppBarPanel.OpenPanel(this);
-           
+
             return base.GetFocus();
         }
 
@@ -55,17 +55,21 @@ namespace Fort23.Mono
         }
 
 
-        public int Sort(ShopGroupConfig s,ShopGroupConfig b)
+        public int Sort(ShopGroupConfig s, ShopGroupConfig b)
         {
             return s.pageSortNum.CompareTo(b.pageSortNum);
         }
+
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
-          List<ShopGroupConfig> shopGroupConfigs = ConfigComponent.Instance.GetAll<ShopGroupConfig>().ToList();
-          shopGroupConfigs.Sort(Sort);
-          foreach (var shopGroupConfig in shopGroupConfigs)
-          {
-                ShopBtnWidget shopBtnWidget = await UIManager.Instance.CreateGComponent<ShopBtnWidget>(null, ShopBtnContent);
+            List<ShopGroupConfig> shopGroupConfigs = ConfigComponent.Instance.GetAll<ShopGroupConfig>().ToList();
+            shopGroupConfigs.Sort(Sort);
+            foreach (var shopGroupConfig in shopGroupConfigs)
+            {
+                if (!shopGroupConfig.isShow)
+                    continue;
+                ShopBtnWidget shopBtnWidget =
+                    await UIManager.Instance.CreateGComponent<ShopBtnWidget>(null, ShopBtnContent);
                 shopBtnWidget.CustomInit(shopGroupConfig);
                 shopBtnWidget.OnClick = OnClick;
                 _shopBtnWidgets.Add(shopBtnWidget);
@@ -73,7 +77,7 @@ namespace Fort23.Mono
                 {
                     currentSelectedShopBtnWidget = shopBtnWidget;
                 }
-          }
+            }
 
             ShopBtnContent.GetComponent<UIToggleList>().GetChildObj();
             currentSelectedShopBtnWidget.OnPointerClick();
@@ -86,7 +90,8 @@ namespace Fort23.Mono
         {
             ShopBtnWidget shopBtnWidget = obj as ShopBtnWidget;
             Text_Title.text = LanguageManager.Instance.Text(shopBtnWidget.ShopGroupConfig.shopName);
-            ShopBtnContent.GetComponent<UIToggleList>().ClickWidget(shopBtnWidget.own.GetComponent<UIToggleWidgetBasic>());
+            ShopBtnContent.GetComponent<UIToggleList>()
+                .ClickWidget(shopBtnWidget.own.GetComponent<UIToggleWidgetBasic>());
             currentSelectedShopBtnWidget = shopBtnWidget;
             foreach (var shopGroupWidgetType1 in _shopGroupWidgetType1s)
             {
@@ -104,11 +109,10 @@ namespace Fort23.Mono
                 {
                     if (shopConfig.shopItemGroup == 4)
                     {
-
-                        ShopBoxWidget shopBoxWidget = await UIManager.Instance.CreateGComponent<ShopBoxWidget>(null, Content);
+                        ShopBoxWidget shopBoxWidget =
+                            await UIManager.Instance.CreateGComponent<ShopBoxWidget>(null, Content);
                         shopBoxWidget.CustomInit();
                         _shopGroupWidgetType1s.Add(shopBoxWidget);
-
                     }
                     // if (shopData.id == 1 || shopData.id == 5)
                     // {
@@ -121,7 +125,8 @@ namespace Fort23.Mono
                     else
                     {
                         ShopGroupWidgetType1 shopGroupWidgetType1 =
-                            await UIManager.Instance.CreateGComponentForObject<ShopGroupWidgetType1>(ShopGroupWidgetType2,
+                            await UIManager.Instance.CreateGComponentForObject<ShopGroupWidgetType1>(
+                                ShopGroupWidgetType2,
                                 null, Content, isInstance: true);
                         _shopGroupWidgetType1s.Add(shopGroupWidgetType1);
                         await shopGroupWidgetType1.CustomInit(shopData);
@@ -197,7 +202,9 @@ namespace Fort23.Mono
 
         public static async CTask<ShopPanel> OpenPanel(bool isPauseCombat = false)
         {
-            ShopPanel shopPanel = await UIManager.Instance.LoadAndOpenPanel<ShopPanel>(null, uiData: new object[] { isPauseCombat },isFullUI:true);
+            ShopPanel shopPanel =
+                await UIManager.Instance.LoadAndOpenPanel<ShopPanel>(null, uiData: new object[] { isPauseCombat },
+                    isFullUI: true);
 
             AudioManager.Instance.PlayAudio("ui_shangdian.wav");
             return shopPanel;

Assets/Scripts/GameUI/UI/TipMessagePanel/TipMessagePanel.cs

@@ -6,20 +6,34 @@ using UnityEngine.UI;
 namespace Fort23.Mono
 {
     [UIBinding(prefab = "TipMessagePanel")]
-    public partial class TipMessagePanel : UIPanel
+    public partial class TipMessagePanel : UIComponent
     {
         public static async CTask<TipMessagePanel> OpenTipMessagePanel(string meg, Vector2 worldPos = default)
         {
+            if (PlayerManager.Instance.serverTime - UIManager.Instance.ShowTextTime < 700)
+            {
+                return null;
+            }
+
+            UIManager.Instance.ShowTextTime = PlayerManager.Instance.serverTime;
             TipMessagePanel tipMessagePanel =
-                await UIManager.Instance.LoadAndOpenPanel<TipMessagePanel>(null, UILayer.Top, isFocus: false);
+                await UIManager.Instance.CreateGComponent<TipMessagePanel>(null,
+                    UIManager.Instance.GetLayer(UILayer.Top));
             tipMessagePanel.SetTipMessage(meg, worldPos);
             return tipMessagePanel;
         }
 
         public static async CTask<TipMessagePanel> OpenTipMessagePanel(int meg, Vector2 worldPos = default)
         {
+            if (PlayerManager.Instance.serverTime - UIManager.Instance.ShowTextTime < 700)
+            {
+                return null;
+            }
+
+            UIManager.Instance.ShowTextTime = PlayerManager.Instance.serverTime;
             TipMessagePanel tipMessagePanel =
-                await UIManager.Instance.LoadAndOpenPanel<TipMessagePanel>(null, UILayer.Top, isFocus: false);
+                await UIManager.Instance.CreateGComponent<TipMessagePanel>(null,
+                    UIManager.Instance.GetLayer(UILayer.Top));
             tipMessagePanel.SetTipMessage(LanguageManager.Instance.Text(meg), worldPos);
             return tipMessagePanel;
         }
@@ -32,14 +46,13 @@ namespace Fort23.Mono
 
         private void Init()
         {
-            isAddStack = false;
         }
 
-        protected override void AddEvent()
+        public override void AddEvent()
         {
         }
 
-        protected override void DelEvent()
+        public override void DelEvent()
         {
         }
 
@@ -50,7 +63,7 @@ namespace Fort23.Mono
 
         private void OnClickButton_bg()
         {
-            UIManager.Instance.HideUIUIPanel(this);
+            // UIManager.Instance.HideUIUIPanel(this);
         }
 
         public async void SetTipMessage(string msg, Vector2 pos)
@@ -73,7 +86,7 @@ namespace Fort23.Mono
             LayoutRebuilder.ForceRebuildLayoutImmediate(rectTransform);
             RectTransform bgTran = bg_icon.GetComponent<RectTransform>();
 
-            float y = rectTransform.sizeDelta.y + 40;
+            float y = rectTransform.sizeDelta.y + 20;
             if (y < 100)
             {
                 y = 100;
@@ -96,6 +109,9 @@ namespace Fort23.Mono
 
             dotPoint.anchoredPosition = pos;
             LayoutRebuilder.ForceRebuildLayoutImmediate(bgTran);
+
+            Animator.Play("showTips");
+            TimerComponent.Instance.AddTimer(1450, () => { UIManager.Instance.DormancyGComponent(this); });
         }
     }
 }

UserSettings/Layouts/default-2022.dwlt

@@ -14,16 +14,16 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 0
-    y: 43
-    width: 2560
-    height: 1357
+    x: 179
+    y: 64
+    width: 1004
+    height: 1100
   m_ShowMode: 4
   m_Title: Game
-  m_RootView: {fileID: 2}
+  m_RootView: {fileID: 4}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
-  m_Maximized: 1
+  m_Maximized: 0
 --- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -32,26 +32,25 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: ConsoleWindow
   m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 3}
-  - {fileID: 5}
-  - {fileID: 4}
+  m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 0
-    width: 2560
-    height: 1357
-  m_MinSize: {x: 875, y: 300}
-  m_MaxSize: {x: 10000, y: 10000}
-  m_UseTopView: 1
-  m_TopViewHeight: 30
-  m_UseBottomView: 1
-  m_BottomViewHeight: 20
+    y: 424
+    width: 529
+    height: 626
+  m_MinSize: {x: 101, y: 121}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 10}
+  m_Panes:
+  - {fileID: 11}
+  - {fileID: 10}
+  m_Selected: 1
+  m_LastSelected: 0
 --- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -60,20 +59,24 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0}
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Children: []
+  m_Children:
+  - {fileID: 8}
+  - {fileID: 2}
   m_Position:
     serializedVersion: 2
-    x: 0
+    x: 475
     y: 0
-    width: 2560
-    height: 30
-  m_MinSize: {x: 0, y: 0}
-  m_MaxSize: {x: 0, y: 0}
-  m_LastLoadedLayoutName: 
+    width: 529
+    height: 1050
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 8096, y: 16192}
+  vertical: 1
+  controlID: 42
+  draggingID: 0
 --- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -83,18 +86,25 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 1
-  m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Children: []
+  m_Children:
+  - {fileID: 5}
+  - {fileID: 6}
+  - {fileID: 7}
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1337
-    width: 2560
-    height: 20
-  m_MinSize: {x: 0, y: 0}
-  m_MaxSize: {x: 0, y: 0}
+    y: 0
+    width: 1004
+    height: 1100
+  m_MinSize: {x: 875, y: 300}
+  m_MaxSize: {x: 10000, y: 10000}
+  m_UseTopView: 1
+  m_TopViewHeight: 30
+  m_UseBottomView: 1
+  m_BottomViewHeight: 20
 --- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -104,24 +114,19 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 1
-  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 6}
-  - {fileID: 7}
-  - {fileID: 10}
+  m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 30
-    width: 2560
-    height: 1307
-  m_MinSize: {x: 400, y: 100}
-  m_MaxSize: {x: 32384, y: 16192}
-  vertical: 0
-  controlID: 25
-  draggingID: 0
+    y: 0
+    width: 1004
+    height: 30
+  m_MinSize: {x: 0, y: 0}
+  m_MaxSize: {x: 0, y: 0}
+  m_LastLoadedLayoutName: 
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -131,24 +136,23 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 1
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneView
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
   m_EditorClassIdentifier: 
-  m_Children: []
+  m_Children:
+  - {fileID: 9}
+  - {fileID: 3}
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 0
-    width: 875
-    height: 1307
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 14}
-  m_Panes:
-  - {fileID: 14}
-  - {fileID: 13}
-  m_Selected: 0
-  m_LastSelected: 1
+    y: 30
+    width: 1004
+    height: 1050
+  m_MinSize: {x: 200, y: 100}
+  m_MaxSize: {x: 16192, y: 16192}
+  vertical: 0
+  controlID: 41
+  draggingID: 0
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -157,24 +161,19 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 8}
-  - {fileID: 9}
+  m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 875
-    y: 0
-    width: 745
-    height: 1307
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 8096, y: 16192}
-  vertical: 1
-  controlID: 81
-  draggingID: 0
+    x: 0
+    y: 1080
+    width: 1004
+    height: 20
+  m_MinSize: {x: 0, y: 0}
+  m_MaxSize: {x: 0, y: 0}
 --- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -183,23 +182,24 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 0
+  m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneHierarchyWindow
+  m_Name: ProjectBrowser
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 745
-    height: 872
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 15}
+    width: 529
+    height: 424
+  m_MinSize: {x: 231, y: 271}
+  m_MaxSize: {x: 10001, y: 10021}
+  m_ActualView: {fileID: 13}
   m_Panes:
-  - {fileID: 15}
-  m_Selected: 0
+  - {fileID: 12}
+  - {fileID: 13}
+  m_Selected: 1
   m_LastSelected: 0
 --- !u!114 &9
 MonoBehaviour:
@@ -209,23 +209,24 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 0
+  m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ConsoleWindow
+  m_Name: GameView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 872
-    width: 745
-    height: 435
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 16}
+    y: 0
+    width: 475
+    height: 1050
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 14}
   m_Panes:
-  - {fileID: 16}
-  m_Selected: 0
+  - {fileID: 15}
+  - {fileID: 14}
+  m_Selected: 1
   m_LastSelected: 0
 --- !u!114 &10
 MonoBehaviour:
@@ -236,23 +237,31 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 11}
-  - {fileID: 12}
-  m_Position:
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Console
+    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
     serializedVersion: 2
-    x: 1620
-    y: 0
-    width: 940
-    height: 1307
-  m_MinSize: {x: 200, y: 50}
-  m_MaxSize: {x: 16192, y: 8096}
-  vertical: 0
-  controlID: 193
-  draggingID: 0
+    x: 654
+    y: 518
+    width: 528
+    height: 605
+  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
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -262,23 +271,60 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 1
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectBrowser
+  m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
   m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Hierarchy
+    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 0
-    width: 420
-    height: 1307
-  m_MinSize: {x: 232, y: 271}
-  m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 17}
-  m_Panes:
-  - {fileID: 17}
-  m_Selected: 0
-  m_LastSelected: 0
+    x: 871
+    y: 779
+    width: 537
+    height: 331
+  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_SceneHierarchy:
+    m_TreeViewState:
+      scrollPos: {x: 0, y: 0}
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: bab9fdff7efaffff
+      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_ExpandedScenes: []
+    m_CurrenRootInstanceID: 0
+    m_LockTracker:
+      m_IsLocked: 0
+    m_CurrentSortingName: TransformSorting
+  m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
 --- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -287,24 +333,45 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: InspectorWindow
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
   m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 420
-    y: 0
-    width: 520
-    height: 1307
   m_MinSize: {x: 275, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 18}
-  m_Panes:
-  - {fileID: 18}
-  m_Selected: 0
-  m_LastSelected: 0
+  m_TitleContent:
+    m_Text: Inspector
+    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 871
+    y: 81
+    width: 537
+    height: 403
+  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_ObjectsLockedBeforeSerialization: []
+  m_InstanceIDsLockedBeforeSerialization: 
+  m_PreviewResizer:
+    m_CachedPref: -160
+    m_ControlHash: -371814159
+    m_PrefName: Preview_InspectorPreview
+  m_LastInspectedObjectInstanceID: 44988
+  m_LastVerticalScrollValue: 0
+  m_GlobalObjectId: 
+  m_InspectorMode: 0
+  m_LockTracker:
+    m_IsLocked: 0
+  m_PreviewWindow: {fileID: 0}
 --- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -314,21 +381,21 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 1
-  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 230, y: 250}
+  m_MaxSize: {x: 10000, y: 10000}
   m_TitleContent:
-    m_Text: Game
-    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Project
+    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 73
-    width: 874
-    height: 1286
+    x: 654
+    y: 94
+    width: 528
+    height: 403
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -339,13 +406,158 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
-  m_SerializedViewNames: []
-  m_SerializedViewValues: []
-  m_PlayModeViewName: GameView
-  m_ShowGizmos: 0
-  m_TargetDisplay: 0
-  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 750, y: 1624}
+  m_SearchFilter:
+    m_NameFilter: gameruntime
+    m_ClassNames: []
+    m_AssetLabels: []
+    m_AssetBundleNames: []
+    m_ReferencingInstanceIDs: 
+    m_SceneHandles: 
+    m_ShowAllHits: 0
+    m_SkipHidden: 0
+    m_SearchArea: 1
+    m_Folders: []
+    m_Globs: []
+    m_OriginalText: gameruntime
+    m_ImportLogFlags: 0
+    m_FilterByTypeIntersection: 0
+  m_ViewMode: 1
+  m_StartGridSize: 16
+  m_LastFolders:
+  - Assets/Scenes
+  m_LastFoldersGridSize: 16
+  m_LastProjectPath: D:\UGit\XiuXianGame
+  m_LockTracker:
+    m_IsLocked: 0
+  m_FolderTreeState:
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 03ca9a3b
+    m_LastClickedID: 1000000003
+    m_ExpandedIDs: 000000001ec6000000ca9a3bffffff7f
+    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: 1
+      m_ClientGUIView: {fileID: 0}
+    m_SearchString: 
+    m_CreateAssetUtility:
+      m_EndAction: {fileID: 0}
+      m_InstanceID: 0
+      m_Path: 
+      m_Icon: {fileID: 0}
+      m_ResourceFile: 
+  m_AssetTreeState:
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 
+    m_LastClickedID: 0
+    m_ExpandedIDs: 000000001ec60000
+    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: 1
+      m_ClientGUIView: {fileID: 0}
+    m_SearchString: 
+    m_CreateAssetUtility:
+      m_EndAction: {fileID: 0}
+      m_InstanceID: 0
+      m_Path: 
+      m_Icon: {fileID: 0}
+      m_ResourceFile: 
+  m_ListAreaState:
+    m_SelectedInstanceIDs: 
+    m_LastClickedInstanceID: 0
+    m_HadKeyboardFocusLastEvent: 0
+    m_ExpandedInstanceIDs: 
+    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: 1
+      m_ClientGUIView: {fileID: 0}
+    m_CreateAssetUtility:
+      m_EndAction: {fileID: 0}
+      m_InstanceID: 0
+      m_Path: 
+      m_Icon: {fileID: 0}
+      m_ResourceFile: 
+    m_NewAssetIndexInList: -1
+    m_ScrollPosition: {x: 0, y: 0}
+    m_GridSize: 16
+  m_SkipHiddenPackages: 0
+  m_DirectoriesAreaWidth: 256
+--- !u!114 &14
+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: 1
+  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Game
+    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 179
+    y: 94
+    width: 474
+    height: 1029
+  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_SerializedViewNames: []
+  m_SerializedViewValues: []
+  m_PlayModeViewName: GameView
+  m_ShowGizmos: 0
+  m_TargetDisplay: 0
+  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
+  m_TargetSize: {x: 750, y: 1624}
   m_TextureFilterMode: 0
   m_TextureHideFlags: 61
   m_RenderIMGUI: 1
@@ -354,7 +566,7 @@ MonoBehaviour:
   m_VSyncEnabled: 0
   m_Gizmos: 0
   m_Stats: 0
-  m_SelectedSizes: 07000000000000000000000011000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 08000000000000000000000011000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
     m_HRangeLocked: 0
     m_VRangeLocked: 0
@@ -372,7 +584,7 @@ MonoBehaviour:
     m_HSlider: 0
     m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 0
+    m_EnableMouseInput: 1
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
@@ -381,29 +593,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 874
-      height: 1265
-    m_Scale: {x: 0.77894086, y: 0.7789409}
-    m_Translation: {x: 437, y: 632.49994}
+      width: 474
+      height: 1008
+    m_Scale: {x: 0.62068963, y: 0.62068963}
+    m_Translation: {x: 237, y: 504.00003}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -561.0182
-      y: -811.9999
-      width: 1122.0364
-      height: 1623.9999
+      x: -381.83334
+      y: -812.00006
+      width: 763.6667
+      height: 1624.0001
     m_MinimalGUI: 1
-  m_defaultScale: 0.7789409
-  m_LastWindowPixelSize: {x: 874, y: 1286}
+  m_defaultScale: 0.62068963
+  m_LastWindowPixelSize: {x: 474, y: 1029}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &14
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -423,10 +635,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -32000
-    y: -31970
-    width: 874
-    height: 1286
+    x: 179
+    y: 94
+    width: 465
+    height: 1029
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -787,33 +999,20 @@ MonoBehaviour:
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
-    - dockPosition: 1
-      containerId: overlay-container--right
-      floating: 0
-      collapsed: 0
-      displayed: 1
-      snapOffset: {x: 48, y: 48}
-      snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
-      id: UnityEditor.SceneViewCameraOverlay
-      index: 13
-      layout: 4
-      size: {x: 0, y: 0}
-      sizeOverriden: 0
     m_OverlaysVisible: 1
   m_WindowGUID: 3de2bc164a2229345aaffb3c6f51b287
   m_Gizmos: 1
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
-  m_2DMode: 0
+  m_2DMode: 1
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -37.300003, y: 12.950317, z: 31.899996}
+    m_Target: {x: -35.224968, y: -9494.296, z: -2.4642797}
     speed: 2
-    m_Value: {x: -37.300003, y: 12.950317, z: 31.899996}
+    m_Value: {x: -35.224968, y: -9494.296, z: -2.4642797}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -822,7 +1021,7 @@ MonoBehaviour:
   m_ValidateTrueMetals: 0
   m_DoValidateTrueMetals: 0
   m_SceneViewState:
-    m_AlwaysRefresh: 1
+    m_AlwaysRefresh: 0
     showFog: 1
     showSkybox: 1
     showFlares: 1
@@ -841,17 +1040,17 @@ MonoBehaviour:
       m_Size: {x: 0, y: 0}
     yGrid:
       m_Fade:
-        m_Target: 1
+        m_Target: 0
         speed: 2
-        m_Value: 1
+        m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
     zGrid:
       m_Fade:
-        m_Target: 0
+        m_Target: 1
         speed: 2
-        m_Value: 0
+        m_Value: 1
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
@@ -859,17 +1058,17 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.0794304, y: 0.44317788, z: -0.039462168, w: -0.89203614}
+    m_Target: {x: 0, y: 0, z: 0, w: 1}
     speed: 2
-    m_Value: {x: -0.07943034, y: 0.44317755, z: -0.039462138, w: -0.8920355}
+    m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 75.367714
+    m_Target: 249.34792
     speed: 2
-    m_Value: 75.367714
+    m_Value: 249.34792
   m_Ortho:
-    m_Target: 0
+    m_Target: 1
     speed: 2
-    m_Value: 0
+    m_Value: 1
   m_CameraSettings:
     m_Speed: 1
     m_SpeedNormalized: 0.5
@@ -892,293 +1091,3 @@ MonoBehaviour:
   m_SceneVisActive: 1
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 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: 1
-  m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Hierarchy
-    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: -31125
-    y: -31970
-    width: 743
-    height: 851
-  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_SceneHierarchy:
-    m_TreeViewState:
-      scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
-      m_LastClickedID: 0
-      m_ExpandedIDs: e238feff7cfaffff
-      m_RenameOverlay:
-        m_UserAcceptedRename: 0
-        m_Name: Canvas (Clone)
-        m_OriginalName: Canvas (Clone)
-        m_EditFieldRect:
-          serializedVersion: 2
-          x: 0
-          y: 0
-          width: 0
-          height: 0
-        m_UserData: -119134
-        m_IsWaitingForDelay: 0
-        m_IsRenaming: 0
-        m_OriginalEventType: 0
-        m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 8}
-      m_SearchString: 
-    m_ExpandedScenes: []
-    m_CurrenRootInstanceID: 0
-    m_LockTracker:
-      m_IsLocked: 0
-    m_CurrentSortingName: TransformSorting
-  m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &16
-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: 12003, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Console
-    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: -31125
-    y: -31098
-    width: 743
-    height: 414
-  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
---- !u!114 &17
-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: 1
-  m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 230, y: 250}
-  m_MaxSize: {x: 10000, y: 10000}
-  m_TitleContent:
-    m_Text: Project
-    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: -30380
-    y: -31970
-    width: 418
-    height: 1286
-  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_SearchFilter:
-    m_NameFilter: hpp
-    m_ClassNames: []
-    m_AssetLabels: []
-    m_AssetBundleNames: []
-    m_ReferencingInstanceIDs: 
-    m_SceneHandles: 
-    m_ShowAllHits: 0
-    m_SkipHidden: 0
-    m_SearchArea: 1
-    m_Folders:
-    - Assets/Res/Aduio/UI
-    m_Globs: []
-    m_OriginalText: hpp
-    m_ImportLogFlags: 0
-    m_FilterByTypeIntersection: 0
-  m_ViewMode: 1
-  m_StartGridSize: 16
-  m_LastFolders:
-  - Assets/Res/Aduio/UI
-  m_LastFoldersGridSize: 16
-  m_LastProjectPath: D:\Server\NetServer\NetServer\XiuXianGame
-  m_LockTracker:
-    m_IsLocked: 0
-  m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 72580100
-    m_LastClickedID: 88178
-    m_ExpandedIDs: 00000000346a0000c4c80000c6c80000c8c80000cac80000ccc80000cec80000d0c80000d2c80000d4c80000d6c80000d8c80000dac80000dcc80000dec80000e0c80000e2c80000e4c80000e6c80000e8c8000000c900001ec9000062ca000000ca9a3bffffff7f
-    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: 1
-      m_ClientGUIView: {fileID: 0}
-    m_SearchString: 
-    m_CreateAssetUtility:
-      m_EndAction: {fileID: 0}
-      m_InstanceID: 0
-      m_Path: 
-      m_Icon: {fileID: 0}
-      m_ResourceFile: 
-  m_AssetTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 
-    m_LastClickedID: 0
-    m_ExpandedIDs: 00000000346a0000c4c80000c6c80000c8c80000cac80000ccc80000cec80000d0c80000d2c80000d4c80000d6c80000d8c80000dac80000dcc80000dec80000e0c80000e2c80000e4c80000e6c80000e8c80000
-    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: 1
-      m_ClientGUIView: {fileID: 0}
-    m_SearchString: 
-    m_CreateAssetUtility:
-      m_EndAction: {fileID: 0}
-      m_InstanceID: 0
-      m_Path: 
-      m_Icon: {fileID: 0}
-      m_ResourceFile: 
-  m_ListAreaState:
-    m_SelectedInstanceIDs: 
-    m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: ee570100
-    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: 1
-      m_ClientGUIView: {fileID: 11}
-    m_CreateAssetUtility:
-      m_EndAction: {fileID: 0}
-      m_InstanceID: 0
-      m_Path: 
-      m_Icon: {fileID: 0}
-      m_ResourceFile: 
-    m_NewAssetIndexInList: -1
-    m_ScrollPosition: {x: 0, y: 0}
-    m_GridSize: 16
-  m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 236
---- !u!114 &18
-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: 1
-  m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Inspector
-    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: -29960
-    y: -31970
-    width: 519
-    height: 1286
-  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_ObjectsLockedBeforeSerialization: []
-  m_InstanceIDsLockedBeforeSerialization: 
-  m_PreviewResizer:
-    m_CachedPref: 958
-    m_ControlHash: -371814159
-    m_PrefName: Preview_InspectorPreview
-  m_LastInspectedObjectInstanceID: -1
-  m_LastVerticalScrollValue: 0
-  m_GlobalObjectId: 
-  m_InspectorMode: 0
-  m_LockTracker:
-    m_IsLocked: 0
-  m_PreviewWindow: {fileID: 0}