Browse Source

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

lzx 1 day ago
parent
commit
4f35cc6661

+ 70 - 70
Assets/Res/Config/FabaoPowerupConfig.json

@@ -3,9 +3,9 @@
     {
       "ID": 1,
       "Power": 100,
-      "HP": 452.63,
+      "HP": 225.0,
       "DEF": 15.0,
-      "ATK": 30.0,
+      "ATK": 37.5,
       "NeedLv": 11,
       "PowerupItemIDs": [
         1001,
@@ -20,9 +20,9 @@
     {
       "ID": 2,
       "Power": 126,
-      "HP": 544.51,
+      "HP": 265.01,
       "DEF": 17.15,
-      "ATK": 34.3,
+      "ATK": 42.88,
       "NeedLv": 21,
       "PowerupItemIDs": [
         1001,
@@ -37,9 +37,9 @@
     {
       "ID": 3,
       "Power": 159,
-      "HP": 722.6,
+      "HP": 344.13,
       "DEF": 21.57,
-      "ATK": 43.14,
+      "ATK": 53.93,
       "NeedLv": 31,
       "PowerupItemIDs": [
         1001,
@@ -54,9 +54,9 @@
     {
       "ID": 4,
       "Power": 200,
-      "HP": 956.33,
+      "HP": 446.43,
       "DEF": 27.13,
-      "ATK": 54.26,
+      "ATK": 67.83,
       "NeedLv": 41,
       "PowerupItemIDs": [
         1001,
@@ -71,9 +71,9 @@
     {
       "ID": 5,
       "Power": 252,
-      "HP": 1721.61,
+      "HP": 789.01,
       "DEF": 46.53,
-      "ATK": 93.06,
+      "ATK": 116.33,
       "NeedLv": 51,
       "PowerupItemIDs": [
         1001,
@@ -88,9 +88,9 @@
     {
       "ID": 6,
       "Power": 318,
-      "HP": 2267.84,
-      "DEF": 58.53,
-      "ATK": 117.05,
+      "HP": 1021.72,
+      "DEF": 58.52,
+      "ATK": 146.31,
       "NeedLv": 61,
       "PowerupItemIDs": [
         1001,
@@ -108,9 +108,9 @@
     {
       "ID": 7,
       "Power": 401,
-      "HP": 2981.0,
+      "HP": 1321.97,
       "DEF": 73.61,
-      "ATK": 147.21,
+      "ATK": 184.02,
       "NeedLv": 71,
       "PowerupItemIDs": [
         1001,
@@ -125,9 +125,9 @@
     {
       "ID": 8,
       "Power": 505,
-      "HP": 5333.64,
+      "HP": 2330.63,
       "DEF": 126.24,
-      "ATK": 252.48,
+      "ATK": 315.61,
       "NeedLv": 81,
       "PowerupItemIDs": [
         1001,
@@ -142,9 +142,9 @@
     {
       "ID": 9,
       "Power": 636,
-      "HP": 6986.32,
+      "HP": 3010.95,
       "DEF": 158.78,
-      "ATK": 317.56,
+      "ATK": 396.95,
       "NeedLv": 91,
       "PowerupItemIDs": [
         1001,
@@ -159,9 +159,9 @@
     {
       "ID": 10,
       "Power": 801,
-      "HP": 9136.28,
+      "HP": 3887.15,
       "DEF": 199.7,
-      "ATK": 399.4,
+      "ATK": 499.25,
       "NeedLv": 101,
       "PowerupItemIDs": [
         1001,
@@ -176,9 +176,9 @@
     {
       "ID": 11,
       "Power": 1009,
-      "HP": 16268.99,
-      "DEF": 342.51,
-      "ATK": 685.01,
+      "HP": 6838.61,
+      "DEF": 342.5,
+      "ATK": 856.26,
       "NeedLv": 111,
       "PowerupItemIDs": [
         1001,
@@ -193,9 +193,9 @@
     {
       "ID": 12,
       "Power": 1271,
-      "HP": 21215.67,
+      "HP": 8817.23,
       "DEF": 430.78,
-      "ATK": 861.55,
+      "ATK": 1076.94,
       "NeedLv": 121,
       "PowerupItemIDs": [
         1001,
@@ -213,9 +213,9 @@
     {
       "ID": 13,
       "Power": 1601,
-      "HP": 27631.8,
+      "HP": 11361.49,
       "DEF": 541.8,
-      "ATK": 1083.6,
+      "ATK": 1354.5,
       "NeedLv": 131,
       "PowerupItemIDs": [
         1001,
@@ -230,9 +230,9 @@
     {
       "ID": 14,
       "Power": 2017,
-      "HP": 49017.15,
-      "DEF": 929.24,
-      "ATK": 1858.47,
+      "HP": 19952.1,
+      "DEF": 929.23,
+      "ATK": 2323.08,
       "NeedLv": 141,
       "PowerupItemIDs": [
         1001,
@@ -247,9 +247,9 @@
     {
       "ID": 15,
       "Power": 2541,
-      "HP": 63695.51,
-      "DEF": 1168.73,
-      "ATK": 2337.45,
+      "HP": 25680.65,
+      "DEF": 1168.72,
+      "ATK": 2921.81,
       "NeedLv": 151,
       "PowerupItemIDs": [
         1001,
@@ -264,9 +264,9 @@
     {
       "ID": 16,
       "Power": 3202,
-      "HP": 82683.84,
+      "HP": 33036.72,
       "DEF": 1469.94,
-      "ATK": 2939.87,
+      "ATK": 3674.84,
       "NeedLv": 161,
       "PowerupItemIDs": [
         1001,
@@ -281,9 +281,9 @@
     {
       "ID": 17,
       "Power": 4035,
-      "HP": 146222.063,
+      "HP": 57925.53,
       "DEF": 2521.07,
-      "ATK": 5042.14,
+      "ATK": 6302.67,
       "NeedLv": 171,
       "PowerupItemIDs": [
         1001,
@@ -298,9 +298,9 @@
     {
       "ID": 18,
       "Power": 5084,
-      "HP": 189456.5,
+      "HP": 74445.33,
       "DEF": 3170.82,
-      "ATK": 6341.64,
+      "ATK": 7927.05,
       "NeedLv": 181,
       "PowerupItemIDs": [
         1001,
@@ -318,9 +318,9 @@
     {
       "ID": 19,
       "Power": 6406,
-      "HP": 245263.844,
+      "HP": 95632.74,
       "DEF": 3988.03,
-      "ATK": 7976.06,
+      "ATK": 9970.08,
       "NeedLv": 191,
       "PowerupItemIDs": [
         1001,
@@ -335,9 +335,9 @@
     {
       "ID": 20,
       "Power": 8072,
-      "HP": 432618.3,
-      "DEF": 6839.82,
-      "ATK": 13679.63,
+      "HP": 167449.609,
+      "DEF": 6839.81,
+      "ATK": 17099.53,
       "NeedLv": 201,
       "PowerupItemIDs": [
         1001,
@@ -352,9 +352,9 @@
     {
       "ID": 21,
       "Power": 10171,
-      "HP": 559170.938,
+      "HP": 214921.938,
       "DEF": 8602.63,
-      "ATK": 17205.26,
+      "ATK": 21506.58,
       "NeedLv": 211,
       "PowerupItemIDs": [
         1001,
@@ -369,9 +369,9 @@
     {
       "ID": 22,
       "Power": 12815,
-      "HP": 722220.3,
+      "HP": 275741.531,
       "DEF": 10819.78,
-      "ATK": 21639.56,
+      "ATK": 27049.45,
       "NeedLv": 221,
       "PowerupItemIDs": [
         1001,
@@ -386,9 +386,9 @@
     {
       "ID": 23,
       "Power": 16147,
-      "HP": 1271143.5,
+      "HP": 482229.6,
       "DEF": 18556.84,
-      "ATK": 37113.68,
+      "ATK": 46392.1,
       "NeedLv": 231,
       "PowerupItemIDs": [
         1001,
@@ -403,9 +403,9 @@
     {
       "ID": 24,
       "Power": 20345,
-      "HP": 1639598.13,
+      "HP": 618222.9,
       "DEF": 23339.48,
-      "ATK": 46678.95,
+      "ATK": 58348.69,
       "NeedLv": 241,
       "PowerupItemIDs": [
         1001,
@@ -423,9 +423,9 @@
     {
       "ID": 25,
       "Power": 25635,
-      "HP": 2113541.0,
-      "DEF": 29354.74,
-      "ATK": 58709.47,
+      "HP": 792283.3,
+      "DEF": 29354.73,
+      "ATK": 73386.84,
       "NeedLv": 251,
       "PowerupItemIDs": [
         1001,
@@ -440,9 +440,9 @@
     {
       "ID": 26,
       "Power": 32300,
-      "HP": 3713007.5,
-      "DEF": 50345.87,
-      "ATK": 100691.727,
+      "HP": 1384090.25,
+      "DEF": 50345.86,
+      "ATK": 125864.656,
       "NeedLv": 261,
       "PowerupItemIDs": [
         1001,
@@ -457,9 +457,9 @@
     {
       "ID": 27,
       "Power": 40698,
-      "HP": 4780769.5,
+      "HP": 1772577.13,
       "DEF": 63321.45,
-      "ATK": 126642.9,
+      "ATK": 158303.625,
       "NeedLv": 271,
       "PowerupItemIDs": [
         1001,
@@ -474,9 +474,9 @@
     {
       "ID": 28,
       "Power": 51279,
-      "HP": 6152284.5,
-      "DEF": 79641.23,
-      "ATK": 159282.453,
+      "HP": 2269375.25,
+      "DEF": 79641.22,
+      "ATK": 199103.063,
       "NeedLv": 281,
       "PowerupItemIDs": [
         1001,
@@ -491,9 +491,9 @@
     {
       "ID": 29,
       "Power": 64612,
-      "HP": 10790726.0,
+      "HP": 3960695.75,
       "DEF": 136591.469,
-      "ATK": 273182.938,
+      "ATK": 341478.656,
       "NeedLv": 291,
       "PowerupItemIDs": [
         1001,
@@ -508,9 +508,9 @@
     {
       "ID": 30,
       "Power": 81411,
-      "HP": 1.387245E+07,
+      "HP": 5067666.5,
       "DEF": 171795.047,
-      "ATK": 343590.1,
+      "ATK": 429487.625,
       "NeedLv": 300,
       "PowerupItemIDs": [
         1001,
@@ -528,9 +528,9 @@
     {
       "ID": 31,
       "Power": 102578,
-      "HP": 17825908.0,
+      "HP": 6482148.0,
       "DEF": 216071.609,
-      "ATK": 432143.219,
+      "ATK": 540179.0,
       "NeedLv": 310,
       "PowerupItemIDs": [
         1001,

+ 36 - 36
Assets/Res/Config/GroupConfig.json

@@ -3,47 +3,13 @@
     {
       "ID": 100001,
       "GroupMonster": [
-        5001,
         1002
-      ],
-      "hpQiangDu": [
-        90,
-        30
-      ],
-      "attQiangDu": [
-        77,
-        26
-      ],
-      "duipingQiangDu": [
-        75,
-        25
-      ],
-      "levelAdd": [
-        0,
-        0
       ]
     },
     {
       "ID": 100002,
       "GroupMonster": [
-        5001,
         1006
-      ],
-      "hpQiangDu": [
-        90,
-        30
-      ],
-      "attQiangDu": [
-        77,
-        26
-      ],
-      "duipingQiangDu": [
-        75,
-        25
-      ],
-      "levelAdd": [
-        0,
-        0
       ]
     },
     {
@@ -73,13 +39,47 @@
     {
       "ID": 100007,
       "GroupMonster": [
-        1003
+        1003,
+        1002
+      ],
+      "hpQiangDu": [
+        90,
+        30
+      ],
+      "attQiangDu": [
+        77,
+        26
+      ],
+      "duipingQiangDu": [
+        75,
+        25
+      ],
+      "levelAdd": [
+        0,
+        0
       ]
     },
     {
       "ID": 100008,
       "GroupMonster": [
-        1004
+        1004,
+        1006
+      ],
+      "hpQiangDu": [
+        90,
+        30
+      ],
+      "attQiangDu": [
+        77,
+        26
+      ],
+      "duipingQiangDu": [
+        75,
+        25
+      ],
+      "levelAdd": [
+        0,
+        0
       ]
     },
     {

+ 70 - 70
Assets/Res/Config/HeroModelConfig.json

@@ -9,9 +9,9 @@
       "isUseGpu": false,
       "heroType": 1,
       "attack": 250,
-      "hp": 252,
+      "hp": 250,
       "def": 100,
-      "shield": 252,
+      "shield": 250,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -66,10 +66,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 248,
-      "hp": 206,
+      "attack": 215,
+      "hp": 215,
       "def": 100,
-      "shield": 206,
+      "shield": 215,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -123,10 +123,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 203,
-      "hp": 252,
+      "attack": 194,
+      "hp": 239,
       "def": 100,
-      "shield": 252,
+      "shield": 239,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -180,10 +180,10 @@
       "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 225,
-      "hp": 227,
+      "attack": 215,
+      "hp": 215,
       "def": 100,
-      "shield": 227,
+      "shield": 215,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -238,10 +238,10 @@
       "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 270,
-      "hp": 189,
+      "attack": 215,
+      "hp": 215,
       "def": 100,
-      "shield": 189,
+      "shield": 215,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -251,14 +251,14 @@
         100
       ],
       "skillID": [
-        9031,
+        1301,
         -1,
-        9032,
+        1304,
         -1,
-        9033,
+        1305,
         -1,
         -1,
-        9033,
+        1304,
         -1,
         -1
       ],
@@ -296,10 +296,10 @@
       "model": "Boss_Tree_xiao",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 90,
-      "hp": 567,
+      "attack": 86,
+      "hp": 538,
       "def": 100,
-      "shield": 567,
+      "shield": 538,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -354,10 +354,10 @@
       "model": "gw_xianhe",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 113,
-      "hp": 681,
+      "attack": 108,
+      "hp": 645,
       "def": 100,
-      "shield": 227,
+      "shield": 215,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -412,10 +412,10 @@
       "model": "gw_huli",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 113,
-      "hp": 454,
+      "attack": 108,
+      "hp": 430,
       "def": 100,
-      "shield": 454,
+      "shield": 430,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -470,10 +470,10 @@
       "model": "Gw_zhizhu",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 236,
-      "hp": 216,
+      "attack": 226,
+      "hp": 205,
       "def": 100,
-      "shield": 216,
+      "shield": 205,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -528,10 +528,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 316,
-      "hp": 264,
+      "attack": 303,
+      "hp": 250,
       "def": 100,
-      "shield": 264,
+      "shield": 250,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -586,10 +586,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 259,
-      "hp": 322,
+      "attack": 248,
+      "hp": 306,
       "def": 100,
-      "shield": 322,
+      "shield": 306,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -644,10 +644,10 @@
       "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 288,
-      "hp": 290,
+      "attack": 275,
+      "hp": 275,
       "def": 100,
-      "shield": 290,
+      "shield": 275,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -702,10 +702,10 @@
       "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 345,
-      "hp": 242,
+      "attack": 330,
+      "hp": 229,
       "def": 100,
-      "shield": 242,
+      "shield": 229,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -760,10 +760,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 230,
-      "hp": 362,
+      "attack": 220,
+      "hp": 344,
       "def": 100,
-      "shield": 362,
+      "shield": 344,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -818,10 +818,10 @@
       "model": "Boss_ShuGuai",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 331,
-      "hp": 252,
+      "attack": 316,
+      "hp": 239,
       "def": 100,
-      "shield": 252,
+      "shield": 239,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -876,10 +876,10 @@
       "model": "Boss_QiongQi",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 302,
-      "hp": 276,
+      "attack": 289,
+      "hp": 262,
       "def": 100,
-      "shield": 276,
+      "shield": 262,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -934,10 +934,10 @@
       "model": "Boss01",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 281,
-      "hp": 350,
+      "attack": 270,
+      "hp": 360,
       "def": 100,
-      "shield": 350,
+      "shield": 244,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -992,11 +992,11 @@
       "model": "Boss_fenghuang",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 125,
-      "hp": 252,
+      "attack": 105,
+      "hp": 240,
       "def": 100,
-      "shield": 157,
-      "speed_atk": 0.0,
+      "shield": 150,
+      "speed_atk": 2.0,
       "Linggen": [
         100,
         100,
@@ -1050,10 +1050,10 @@
       "model": "Boss_BeiHaiGui",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 156,
-      "hp": 283,
+      "attack": 150,
+      "hp": 270,
       "def": 200,
-      "shield": 283,
+      "shield": 270,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1108,10 +1108,10 @@
       "model": "Boss_Tree",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 219,
-      "hp": 283,
+      "attack": 210,
+      "hp": 270,
       "def": 100,
-      "shield": 283,
+      "shield": 270,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1166,10 +1166,10 @@
       "model": "Boss_fenghuang",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 281,
-      "hp": 350,
+      "attack": 270,
+      "hp": 333,
       "def": 100,
-      "shield": 350,
+      "shield": 333,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1224,10 +1224,10 @@
       "model": "Boss_fenghuang",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 281,
-      "hp": 350,
+      "attack": 270,
+      "hp": 333,
       "def": 100,
-      "shield": 350,
+      "shield": 333,
       "speed_atk": 0.0,
       "Linggen": [
         100,

File diff suppressed because it is too large
+ 144 - 144
Assets/Res/Config/HeroPowerUpConfig.json


File diff suppressed because it is too large
+ 234 - 234
Assets/Res/Config/MonsterPowerUpConfig.json


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

@@ -965,7 +965,7 @@
       "level": 1,
       "effectValue": [
         4.0,
-        36.0,
+        35.0,
         100.0
       ],
       "intensifierIndex": [
@@ -990,7 +990,7 @@
       "level": 2,
       "effectValue": [
         4.0,
-        48.0,
+        46.0,
         100.0
       ],
       "intensifierIndex": [
@@ -1018,7 +1018,7 @@
       "level": 3,
       "effectValue": [
         4.0,
-        62.0,
+        60.0,
         100.0
       ],
       "intensifierIndex": [
@@ -1052,7 +1052,7 @@
       "level": 4,
       "effectValue": [
         4.0,
-        82.0,
+        78.0,
         100.0
       ],
       "intensifierIndex": [
@@ -1086,7 +1086,7 @@
       "level": 5,
       "effectValue": [
         4.0,
-        98.0,
+        94.0,
         100.0
       ],
       "intensifierIndex": [
@@ -1120,7 +1120,7 @@
       "level": 6,
       "effectValue": [
         5.0,
-        99.0,
+        94.0,
         100.0
       ],
       "intensifierIndex": [
@@ -1154,7 +1154,7 @@
       "level": 1,
       "effectValue": [
         5.0,
-        29.0,
+        27.0,
         100.0
       ],
       "intensifierIndex": [
@@ -1179,7 +1179,7 @@
       "level": 2,
       "effectValue": [
         5.0,
-        38.0,
+        36.0,
         100.0
       ],
       "intensifierIndex": [
@@ -1207,7 +1207,7 @@
       "level": 3,
       "effectValue": [
         5.0,
-        49.0,
+        47.0,
         100.0
       ],
       "intensifierIndex": [
@@ -1241,7 +1241,7 @@
       "level": 4,
       "effectValue": [
         5.0,
-        65.0,
+        61.0,
         100.0
       ],
       "intensifierIndex": [
@@ -1275,7 +1275,7 @@
       "level": 5,
       "effectValue": [
         5.0,
-        78.0,
+        74.0,
         100.0
       ],
       "intensifierIndex": [
@@ -1309,7 +1309,7 @@
       "level": 6,
       "effectValue": [
         6.0,
-        81.0,
+        76.0,
         100.0
       ],
       "intensifierIndex": [
@@ -10368,7 +10368,7 @@
       "level": 1,
       "effectValue": [
         3.0,
-        49.0
+        47.0
       ],
       "intensifierIndex": [
         2
@@ -10392,7 +10392,7 @@
       "level": 2,
       "effectValue": [
         3.0,
-        65.0
+        63.0
       ],
       "intensifierIndex": [
         2
@@ -10416,7 +10416,7 @@
       "level": 3,
       "effectValue": [
         3.0,
-        84.0
+        81.0
       ],
       "intensifierIndex": [
         2
@@ -10440,7 +10440,7 @@
       "level": 4,
       "effectValue": [
         3.0,
-        110.0
+        107.0
       ],
       "intensifierIndex": [
         2
@@ -10464,7 +10464,7 @@
       "level": 5,
       "effectValue": [
         3.0,
-        133.0
+        128.0
       ],
       "intensifierIndex": [
         2
@@ -10488,7 +10488,7 @@
       "level": 6,
       "effectValue": [
         3.0,
-        168.0
+        163.0
       ],
       "intensifierIndex": [
         2
@@ -10812,7 +10812,7 @@
       "level": 1,
       "effectValue": [
         3.0,
-        98.0
+        94.0
       ],
       "intensifierIndex": [
         2
@@ -10836,7 +10836,7 @@
       "level": 2,
       "effectValue": [
         3.0,
-        130.0
+        126.0
       ],
       "intensifierIndex": [
         2
@@ -10860,7 +10860,7 @@
       "level": 3,
       "effectValue": [
         3.0,
-        168.0
+        162.0
       ],
       "intensifierIndex": [
         2
@@ -10884,7 +10884,7 @@
       "level": 4,
       "effectValue": [
         3.0,
-        220.0
+        214.0
       ],
       "intensifierIndex": [
         2
@@ -10908,7 +10908,7 @@
       "level": 5,
       "effectValue": [
         3.0,
-        266.0
+        256.0
       ],
       "intensifierIndex": [
         2
@@ -10932,7 +10932,7 @@
       "level": 6,
       "effectValue": [
         3.0,
-        336.0
+        326.0
       ],
       "intensifierIndex": [
         2

+ 1 - 1
Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -66,5 +66,5 @@ Material:
     m_Colors:
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
-    - _pos: {r: -4.2020416, g: -5.9337864, b: -30, a: 0}
+    - _pos: {r: -1.8000001, g: -5.3999996, b: -30, a: 0}
   m_BuildTextureStacks: []

+ 1 - 1
Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillConfig
+// Generate From Excel\Skill.xlsx. SheetName: SkillConfig
 
 using System;
 using Fort23.GameData;

+ 1 - 1
Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillConstant
+// Generate From Excel\Skill.xlsx. SheetName: SkillConstant
 
 using System;
 using Fort23.GameData;

+ 1 - 1
Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillPowerupConfig
+// Generate From Excel\Skill.xlsx. SheetName: SkillPowerupConfig
 
 using System;
 using Fort23.GameData;

+ 2 - 2
Assets/Scripts/GameLogic/Combat/Hero/CombatHeroSkillControl.cs

@@ -96,14 +96,14 @@ namespace GameLogic.Combat.Hero
                 float cd = _combatHeroEntity.CurrCombatHeroInfo.powerUpConfig.MaxActiveGongfaNum *
                     PlayerManager.Instance.gameConstantConfig.BasicCDperSkill / 1000;
                 _combatHeroEntity.CurrCombatHeroInfo.SetSkillAttSpeed(
-                    cd + SkillTurntable.skillAddSkillCd);
+                    cd + SkillTurntable.skillAddSkillCd+_combatHeroEntity.CurrCombatHeroInfo.modelConfig.speed_atk);
             }
             else
             {
                 float cd = (SkillTurntable.skillCount * PlayerManager.Instance.gameConstantConfig.BasicCDperSkill) /
                            1000;
                 _combatHeroEntity.CurrCombatHeroInfo.SetSkillAttSpeed(
-                    cd + SkillTurntable.skillAddSkillCd);
+                    cd + SkillTurntable.skillAddSkillCd+_combatHeroEntity.CurrCombatHeroInfo.modelConfig.speed_atk);
             }
         }
 

BIN
Excel2Json/Excel/FabaoConfig.xlsx


BIN
Excel2Json/Excel/GameConstant.xlsx


BIN
Excel2Json/Excel/HeroModel.xlsx


BIN
Excel2Json/Excel/HeroPowerUp.xlsx


BIN
Excel2Json/Excel/LevelBattle.xlsx


BIN
Excel2Json/Excel/MonsterPowerUp.xlsx


BIN
Excel2Json/Excel/skill.xlsx


BIN
Excel2Json/Excel/修仙游戏数据规划表.xlsx


BIN
Excel2Json/Excel/数据验证.xlsx


+ 258 - 149
UserSettings/Layouts/default-2022.dwlt

@@ -1,6 +1,30 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_PixelRect:
+    serializedVersion: 2
+    x: 3051
+    y: 745
+    width: 825
+    height: 618
+  m_ShowMode: 0
+  m_Title: Console
+  m_RootView: {fileID: 4}
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_Maximized: 0
+--- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -15,16 +39,67 @@ MonoBehaviour:
   m_PixelRect:
     serializedVersion: 2
     x: 0
-    y: 32.000004
-    width: 1920.0002
-    height: 1012.0001
+    y: 43
+    width: 2560
+    height: 1349
   m_ShowMode: 4
-  m_Title: "\u68C0\u67E5\u5668"
-  m_RootView: {fileID: 3}
+  m_Title: Inspector
+  m_RootView: {fileID: 6}
   m_MinSize: {x: 875, y: 371}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
---- !u!114 &2
+--- !u!114 &3
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: ConsoleWindow
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 825
+    height: 618
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_ActualView: {fileID: 15}
+  m_Panes:
+  - {fileID: 15}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &4
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 3}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 825
+    height: 618
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  vertical: 0
+  controlID: 1887
+  draggingID: 0
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -40,19 +115,19 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 480.50003
-    width: 665.0001
-    height: 481.50003
+    y: 904
+    width: 587
+    height: 395
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 18}
+  m_ActualView: {fileID: 22}
   m_Panes:
-  - {fileID: 13}
-  - {fileID: 18}
-  - {fileID: 16}
+  - {fileID: 17}
+  - {fileID: 22}
+  - {fileID: 20}
   m_Selected: 1
   m_LastSelected: 0
---- !u!114 &3
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -65,22 +140,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 4}
-  - {fileID: 6}
-  - {fileID: 5}
+  - {fileID: 7}
+  - {fileID: 9}
+  - {fileID: 8}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1920.0001
-    height: 1012.00006
+    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
---- !u!114 &4
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -97,12 +172,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1920.0001
+    width: 2560
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &5
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -118,12 +193,12 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 992.00006
-    width: 1920.0001
+    y: 1329
+    width: 2560
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &6
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -136,22 +211,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 7}
-  - {fileID: 8}
   - {fileID: 10}
   - {fileID: 11}
+  - {fileID: 13}
+  - {fileID: 14}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1920.0001
-    height: 962.00006
+    width: 2560
+    height: 1299
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 42
+  controlID: 193
   draggingID: 0
---- !u!114 &7
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -168,16 +243,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 488.00003
-    height: 962.00006
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 14}
+    width: 950
+    height: 1299
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 18}
   m_Panes:
-  - {fileID: 14}
+  - {fileID: 18}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &8
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -190,20 +265,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 9}
-  - {fileID: 2}
+  - {fileID: 12}
+  - {fileID: 5}
   m_Position:
     serializedVersion: 2
-    x: 488.00003
+    x: 950
     y: 0
-    width: 665.0001
-    height: 962.00006
+    width: 587
+    height: 1299
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 43
+  controlID: 54
   draggingID: 0
---- !u!114 &9
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -220,16 +295,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 665.0001
-    height: 480.50003
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 15}
+    width: 587
+    height: 904
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 19}
   m_Panes:
-  - {fileID: 15}
+  - {fileID: 19}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &10
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -244,18 +319,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1153.0001
+    x: 1537
     y: 0
-    width: 314
-    height: 962.00006
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 17}
+    width: 419
+    height: 1299
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 21}
   m_Panes:
-  - {fileID: 17}
+  - {fileID: 21}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &11
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -270,19 +345,53 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1467.0001
+    x: 1956
     y: 0
-    width: 453
-    height: 962.00006
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 19}
+    width: 604
+    height: 1299
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 23}
   m_Panes:
-  - {fileID: 19}
-  - {fileID: 12}
+  - {fileID: 23}
+  - {fileID: 16}
   m_Selected: 0
   m_LastSelected: 1
---- !u!114 &12
+--- !u!114 &15
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 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: 3051
+    y: 745
+    width: 825
+    height: 597
+  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 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -297,8 +406,8 @@ MonoBehaviour:
   m_MinSize: {x: 390, y: 390}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u7167\u660E"
-    m_Image: {fileID: -1477008817101679558, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Lighting
+    m_Image: {fileID: -1347227620855488341, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
@@ -316,7 +425,7 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
---- !u!114 &13
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -331,8 +440,8 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u52A8\u753B\u5668"
-    m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Animator
+    m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
@@ -420,7 +529,7 @@ MonoBehaviour:
   m_CurrentEditor: 0
   m_LayerEditor:
     m_SelectedLayerIndex: 0
---- !u!114 &14
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -435,15 +544,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u6E38\u620F"
-    m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Game
+    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 62.000008
-    width: 487.00003
-    height: 941.00006
+    y: 19
+    width: 949
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -475,10 +584,10 @@ MonoBehaviour:
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -187.50002
-    m_HBaseRangeMax: 187.50002
-    m_VBaseRangeMin: -406.00006
-    m_VBaseRangeMax: 406.00006
+    m_HBaseRangeMin: -375
+    m_HBaseRangeMax: 375
+    m_VBaseRangeMin: -812
+    m_VBaseRangeMax: 812
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -496,29 +605,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 487.00003
-      height: 920.00006
-    m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 243.50002, y: 460.00003}
+      width: 949
+      height: 1257
+    m_Scale: {x: 0.7740148, y: 0.7740148}
+    m_Translation: {x: 474.5, y: 628.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -243.50002
-      y: -460.00003
-      width: 487.00003
-      height: 920.00006
+      x: -613.0374
+      y: -812
+      width: 1226.0748
+      height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 974, y: 1882}
+  m_defaultScale: 0.7740148
+  m_LastWindowPixelSize: {x: 949, y: 1278}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &15
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -533,15 +642,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u573A\u666F"
-    m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Scene
+    m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 488.00006
-    y: 62.000008
-    width: 663.0001
-    height: 459.50003
+    x: 1
+    y: 19
+    width: 585
+    height: 883
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -882,7 +991,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: -231.00003, y: -145.00003}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0.000030517578}
       snapCorner: 3
       id: Scene View/TrailRenderer
       index: 10
@@ -926,9 +1035,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 3, y: 24.92, z: -9.299999}
+    m_Target: {x: 0.08548516, y: 21.323143, z: 26.123556}
     speed: 2
-    m_Value: {x: 2.9999995, y: 24.919998, z: -9.299997}
+    m_Value: {x: 0.08548516, y: 21.323143, z: 26.123556}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -937,7 +1046,7 @@ MonoBehaviour:
   m_ValidateTrueMetals: 0
   m_DoValidateTrueMetals: 0
   m_SceneViewState:
-    m_AlwaysRefresh: 1
+    m_AlwaysRefresh: 0
     showFog: 1
     showSkybox: 1
     showFlares: 1
@@ -966,7 +1075,7 @@ MonoBehaviour:
       m_Fade:
         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}
@@ -974,13 +1083,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.2802876, y: -0.29669058, z: 0.09223808, w: 0.9082005}
+    m_Target: {x: 0.23996589, y: 0.73502886, z: -0.32502934, w: 0.5449047}
     speed: 2
-    m_Value: {x: 0.2805053, y: -0.29465783, z: 0.09161075, w: 0.90890104}
+    m_Value: {x: 0.23991595, y: 0.7348759, z: -0.3249617, w: 0.54479134}
   m_Size:
-    m_Target: 12.124355
+    m_Target: 6.5325136
     speed: 2
-    m_Value: 12.124355
+    m_Value: 6.5325136
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -1007,7 +1116,7 @@ MonoBehaviour:
   m_SceneVisActive: 1
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
---- !u!114 &16
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1022,8 +1131,8 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u65F6\u95F4\u8F74"
-    m_Image: {fileID: -5401195905404635996, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Timeline
+    m_Image: {fileID: -9173288242387172643, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
@@ -1050,7 +1159,7 @@ MonoBehaviour:
   m_SequencePath:
     m_SelectionRoot: 0
     m_SubElements: []
---- !u!114 &17
+--- !u!114 &21
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1065,15 +1174,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u5C42\u7EA7"
-    m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Hierarchy
+    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1153.0001
-    y: 62.000008
-    width: 312
-    height: 941.00006
+    x: 1538
+    y: 19
+    width: 417
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1087,9 +1196,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 18ca0000
-      m_LastClickedID: 51736
-      m_ExpandedIDs: 7efaffff0ac900007ad3000020d400008ee10000
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: 78f4f9ff7ef4f9ffecfef9fffafef9ff64edfaff6aedfaff78faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -1105,7 +1214,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 10}
+        m_ClientGUIView: {fileID: 13}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -1113,7 +1222,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &18
+--- !u!114 &22
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1128,15 +1237,15 @@ MonoBehaviour:
   m_MinSize: {x: 230, y: 250}
   m_MaxSize: {x: 10000, y: 10000}
   m_TitleContent:
-    m_Text: "\u9879\u76EE"
-    m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Project
+    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 488.00006
-    y: 542.50006
-    width: 663.0001
-    height: 460.50003
+    x: 1
+    y: 923
+    width: 585
+    height: 374
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1158,7 +1267,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Art/Environment
+    - Assets/Editor
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -1166,16 +1275,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Art/Environment
+  - Assets/Editor
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: E:\XY002\XiuXianGame
+  m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 271}
-    m_SelectedIDs: 4c880100
-    m_LastClickedID: 100428
-    m_ExpandedIDs: 000000002c8801002e88010030880100328801003488010036880100388801003a8801003c8801003e88010040880100428801004488010046880100488801004a8801004c8801004e88010050880100528801005488010056880100588801005a8801005c8801005e88010060880100628801006488010066880100688801006a8801006c8801006e88010070880100648901000e8b010000ca9a3b
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: a8f50000
+    m_LastClickedID: 62888
+    m_ExpandedIDs: 00000000d6f20000d8f20000daf20000dcf20000def20000e0f20000e2f20000e4f20000e6f20000e8f20000eaf20000ecf20000eef20000f0f20000f2f20000f4f20000f6f20000f8f20000faf20000fcf20000fef2000000f3000002f3000004f3000006f3000008f300000af3000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1191,7 +1300,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 2}
+      m_ClientGUIView: {fileID: 5}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -1203,7 +1312,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000002c8801002e88010030880100328801003488010036880100388801003a8801003c8801003e88010040880100428801004488010046880100488801004a8801004c8801004e88010050880100528801005488010056880100588801005a8801005c8801005e88010060880100628801006488010066880100688801006a8801006c8801006e88010070880100
+    m_ExpandedIDs: 00000000d6f20000d8f20000daf20000dcf20000def20000e0f20000e2f20000e4f20000e6f20000e8f20000eaf20000ecf20000eef20000f0f20000f2f20000f4f20000f6f20000f8f20000faf20000fcf20000fef2000000f3000002f3000004f3000006f3000008f300000af30000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1247,7 +1356,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 9}
+      m_ClientGUIView: {fileID: 12}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -1255,11 +1364,11 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
     m_NewAssetIndexInList: -1
-    m_ScrollPosition: {x: 0, y: 2.4999695}
+    m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 209
---- !u!114 &19
+--- !u!114 &23
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1274,15 +1383,15 @@ MonoBehaviour:
   m_MinSize: {x: 275, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u68C0\u67E5\u5668"
-    m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Inspector
+    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1467.0001
-    y: 62.000008
-    width: 452
-    height: 941.00006
+    x: 1957
+    y: 19
+    width: 603
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0

Some files were not shown because too many files changed in this diff