浏览代码

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

# Conflicts:
#	UserSettings/Layouts/default-2022.dwlt   resolved by origin/master(远端) version
lzx 1 天之前
父节点
当前提交
154ad23aad

+ 30 - 30
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,

+ 24 - 24
Assets/Res/Config/LanguageChineseConfig.json

@@ -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,

+ 26 - 3
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,

二进制
Excel2Json/Excel/EventConfig.xlsx


二进制
Excel2Json/Excel/FabaoConfig.xlsx


二进制
Excel2Json/Excel/Language.xlsx


二进制
Excel2Json/Excel/OpenBox.xlsx


二进制
Excel2Json/Excel/Shop.xlsx


+ 187 - 167
UserSettings/Layouts/default-2022.dwlt

@@ -14,16 +14,16 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 0
-    y: 43
-    width: 2560
-    height: 1349
+    x: 179
+    y: 64
+    width: 1004
+    height: 1100
   m_ShowMode: 4
-  m_Title: Project
-  m_RootView: {fileID: 2}
+  m_Title: Game
+  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: 4}
-  - {fileID: 5}
+  m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 0
-    width: 2560
-    height: 1349
-  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,25 +86,25 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 1
-  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 9}
+  - {fileID: 5}
   - {fileID: 6}
   - {fileID: 7}
-  - {fileID: 8}
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 30
-    width: 2560
-    height: 1299
-  m_MinSize: {x: 400, y: 50}
-  m_MaxSize: {x: 32384, y: 8096}
-  vertical: 0
-  controlID: 18
-  draggingID: 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
@@ -111,18 +114,19 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 1
-  m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1329
-    width: 2560
-    height: 20
+    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
@@ -132,23 +136,23 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 1
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  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: 1209
-    y: 0
-    width: 411
-    height: 1299
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 10}
-  m_Panes:
-  - {fileID: 10}
-  m_Selected: 0
-  m_LastSelected: 0
+    x: 0
+    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
@@ -158,23 +162,18 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 1
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1620
-    y: 0
-    width: 552
-    height: 1299
-  m_MinSize: {x: 232, y: 271}
-  m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 12}
-  m_Panes:
-  - {fileID: 12}
-  m_Selected: 0
-  m_LastSelected: 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
@@ -185,21 +184,22 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
+  m_Name: ProjectBrowser
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 2172
+    x: 0
     y: 0
-    width: 388
-    height: 1299
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 11}
+    width: 529
+    height: 424
+  m_MinSize: {x: 231, y: 271}
+  m_MaxSize: {x: 10001, y: 10021}
+  m_ActualView: {fileID: 13}
   m_Panes:
-  - {fileID: 11}
-  m_Selected: 0
+  - {fileID: 12}
+  - {fileID: 13}
+  m_Selected: 1
   m_LastSelected: 0
 --- !u!114 &9
 MonoBehaviour:
@@ -218,17 +218,51 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1209
-    height: 1299
+    width: 475
+    height: 1050
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 13}
+  m_ActualView: {fileID: 14}
   m_Panes:
-  - {fileID: 13}
+  - {fileID: 15}
   - {fileID: 14}
-  m_Selected: 0
-  m_LastSelected: 1
+  m_Selected: 1
+  m_LastSelected: 0
 --- !u!114 &10
+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: 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
   m_CorrespondingSourceObject: {fileID: 0}
@@ -248,10 +282,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1209
-    y: 73
-    width: 409
-    height: 1278
+    x: 871
+    y: 779
+    width: 537
+    height: 331
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -267,7 +301,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: a089f3ffa489f3ffb289f3ff402ff5ff0232f5ff1232f5ff7e32f5ff8432f5ffba32f5ffd438f5ff7c33f6ff804bf6ffbc4bf6ffc24bf6ffd24cf6ff184df6ff1c4df6ff204df6ff244df6ff2e4df6ff3c8af6ff468af6ffca0bf7ffd80bf7ff46faffff60faffff6efaffff78faffff
+      m_ExpandedIDs: bab9fdff7efaffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -283,7 +317,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 6}
+        m_ClientGUIView: {fileID: 0}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -291,7 +325,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &11
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -311,10 +345,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 2172
-    y: 73
-    width: 387
-    height: 1278
+    x: 871
+    y: 81
+    width: 537
+    height: 403
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -328,17 +362,17 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: 304
+    m_CachedPref: -160
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
-  m_LastInspectedObjectInstanceID: -1
+  m_LastInspectedObjectInstanceID: 44988
   m_LastVerticalScrollValue: 0
   m_GlobalObjectId: 
   m_InspectorMode: 0
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &12
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -358,10 +392,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1620
-    y: 73
-    width: 550
-    height: 1278
+    x: 654
+    y: 94
+    width: 528
+    height: 403
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -373,7 +407,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: gamerun
+    m_NameFilter: gameruntime
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -382,25 +416,24 @@ MonoBehaviour:
     m_ShowAllHits: 0
     m_SkipHidden: 0
     m_SearchArea: 1
-    m_Folders:
-    - Assets/Res/UI/DaoYouPanel
+    m_Folders: []
     m_Globs: []
-    m_OriginalText: gamerun
+    m_OriginalText: gameruntime
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
-  m_StartGridSize: 69
+  m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Res/UI/DaoYouPanel
+  - Assets/Scenes
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: D:\FB\XiuXianGame
+  m_LastProjectPath: D:\UGit\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 90}
-    m_SelectedIDs: 32c90000
-    m_LastClickedID: 51506
-    m_ExpandedIDs: 000000003ec6000040c6000042c6000044c6000046c6000048c600004ac600004cc600004ec6000050c6000052c6000054c6000000ca9a3b
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 03ca9a3b
+    m_LastClickedID: 1000000003
+    m_ExpandedIDs: 000000001ec6000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -428,7 +461,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000003ec6000040c6000042c6000044c6000046c6000048c600004ac600004cc600004ec6000050c6000052c6000054c60000
+    m_ExpandedIDs: 000000001ec60000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -455,24 +488,24 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: f092020000000000b07bf2ff
+    m_HadKeyboardFocusLastEvent: 0
+    m_ExpandedInstanceIDs: 
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: GongFaUpgradePanel
-      m_OriginalName: GongFaUpgradePanel
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 65934
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 7}
+      m_ClientGUIView: {fileID: 0}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -481,10 +514,10 @@ MonoBehaviour:
       m_ResourceFile: 
     m_NewAssetIndexInList: -1
     m_ScrollPosition: {x: 0, y: 0}
-    m_GridSize: 69
+    m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 205
---- !u!114 &13
+  m_DirectoriesAreaWidth: 256
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -504,10 +537,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 73
-    width: 1208
-    height: 1278
+    x: 179
+    y: 94
+    width: 474
+    height: 1029
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -533,7 +566,7 @@ MonoBehaviour:
   m_VSyncEnabled: 0
   m_Gizmos: 0
   m_Stats: 0
-  m_SelectedSizes: 08000000000000000000000012000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 08000000000000000000000011000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
     m_HRangeLocked: 0
     m_VRangeLocked: 0
@@ -551,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
@@ -560,29 +593,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 1208
-      height: 1257
-    m_Scale: {x: 0.7740148, y: 0.7740148}
-    m_Translation: {x: 604, y: 628.5}
+      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: -780.34686
-      y: -812
-      width: 1560.6937
-      height: 1624
+      x: -381.83334
+      y: -812.00006
+      width: 763.6667
+      height: 1624.0001
     m_MinimalGUI: 1
-  m_defaultScale: 0.7740148
-  m_LastWindowPixelSize: {x: 1208, y: 1278}
+  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}
@@ -602,10 +635,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 73
-    width: 1208
-    height: 1278
+    x: 179
+    y: 94
+    width: 465
+    height: 1029
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -620,7 +653,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -179, y: -26}
+      snapOffset: {x: -174, y: -26}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Tool Settings
@@ -841,7 +874,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 0
-      snapOffset: {x: 0, y: 25}
+      snapOffset: {x: 0, y: 0}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Particles
@@ -966,19 +999,6 @@ 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
@@ -990,9 +1010,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0.31287473, y: 0.4255154, z: 0.013240214}
+    m_Target: {x: -35.224968, y: -9494.296, z: -2.4642797}
     speed: 2
-    m_Value: {x: 0.31287473, y: 0.4255154, z: 0.013240214}
+    m_Value: {x: -35.224968, y: -9494.296, z: -2.4642797}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1042,9 +1062,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 3.6499612
+    m_Target: 249.34792
     speed: 2
-    m_Value: 3.6499612
+    m_Value: 249.34792
   m_Ortho:
     m_Target: 1
     speed: 2