Browse Source

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

lzx 5 ngày trước cách đây
mục cha
commit
bd4bcc872c

+ 20 - 20
Assets/Res/Config/DivineSenseConfig.json

@@ -10,7 +10,7 @@
         0.0,
         0.0
       ],
-      "exp": 500,
+      "exp": 400,
       "MaxNum": 2
     },
     {
@@ -23,7 +23,7 @@
         0.0,
         0.0
       ],
-      "exp": 500,
+      "exp": 900,
       "MaxNum": 3
     },
     {
@@ -36,7 +36,7 @@
         0.0,
         0.0
       ],
-      "exp": 500,
+      "exp": 1200,
       "MaxNum": 4
     },
     {
@@ -49,7 +49,7 @@
         0.0,
         0.0
       ],
-      "exp": 500,
+      "exp": 2000,
       "MaxNum": 5
     },
     {
@@ -62,7 +62,7 @@
         0.0,
         0.0
       ],
-      "exp": 1000,
+      "exp": 2400,
       "MaxNum": 6
     },
     {
@@ -75,7 +75,7 @@
         0.0,
         0.0
       ],
-      "exp": 1000,
+      "exp": 3000,
       "MaxNum": 6
     },
     {
@@ -88,7 +88,7 @@
         0.0,
         0.0
       ],
-      "exp": 1000,
+      "exp": 3000,
       "MaxNum": 6
     },
     {
@@ -101,7 +101,7 @@
         0.0,
         0.0
       ],
-      "exp": 1000,
+      "exp": 3000,
       "MaxNum": 6
     },
     {
@@ -114,7 +114,7 @@
         0.0,
         0.0
       ],
-      "exp": 2000,
+      "exp": 3000,
       "MaxNum": 6
     },
     {
@@ -127,7 +127,7 @@
         0.0,
         0.0
       ],
-      "exp": 2000,
+      "exp": 3000,
       "MaxNum": 6
     },
     {
@@ -140,7 +140,7 @@
         6.0,
         0.0
       ],
-      "exp": 2000,
+      "exp": 3000,
       "MaxNum": 6
     },
     {
@@ -153,7 +153,7 @@
         12.0,
         0.0
       ],
-      "exp": 2000,
+      "exp": 3000,
       "MaxNum": 6
     },
     {
@@ -166,7 +166,7 @@
         18.0,
         0.0
       ],
-      "exp": 2000,
+      "exp": 3000,
       "MaxNum": 6
     },
     {
@@ -179,7 +179,7 @@
         24.0,
         0.0
       ],
-      "exp": 2000,
+      "exp": 3000,
       "MaxNum": 6
     },
     {
@@ -192,7 +192,7 @@
         30.0,
         0.0
       ],
-      "exp": 2000,
+      "exp": 3000,
       "MaxNum": 6
     },
     {
@@ -205,7 +205,7 @@
         36.0,
         0.0
       ],
-      "exp": 2000,
+      "exp": 3000,
       "MaxNum": 6
     },
     {
@@ -218,7 +218,7 @@
         42.0,
         0.0
       ],
-      "exp": 2000,
+      "exp": 3000,
       "MaxNum": 6
     },
     {
@@ -231,7 +231,7 @@
         48.0,
         0.0
       ],
-      "exp": 2000,
+      "exp": 3000,
       "MaxNum": 6
     },
     {
@@ -244,7 +244,7 @@
         54.0,
         0.0
       ],
-      "exp": 2000,
+      "exp": 3000,
       "MaxNum": 6
     },
     {
@@ -257,7 +257,7 @@
         60.0,
         0.0
       ],
-      "exp": 1000000,
+      "exp": 3000000,
       "MaxNum": 6
     }
   ]

+ 65 - 65
Assets/Res/Config/EventConfig.json

@@ -1425,7 +1425,7 @@
       "Score": 1,
       "EventQuality": 1,
       "PrizeIDs": [
-        12019,
+        12020,
         1702,
         1003
       ],
@@ -1493,7 +1493,7 @@
       "Score": 1,
       "EventQuality": 1,
       "PrizeIDs": [
-        12014,
+        12015,
         1702,
         1003
       ],
@@ -1601,7 +1601,7 @@
       "Score": 1,
       "EventQuality": 1,
       "PrizeIDs": [
-        12009,
+        12010,
         1702,
         1003
       ],
@@ -1707,7 +1707,7 @@
       "Score": 1,
       "EventQuality": 1,
       "PrizeIDs": [
-        12010,
+        12025,
         1702,
         1003
       ],
@@ -1813,13 +1813,13 @@
       "Score": 1,
       "EventQuality": 1,
       "PrizeIDs": [
-        12005,
+        12004,
         1702,
         1003
       ],
       "PrizeNums": [
         1,
-        1,
+        2,
         4170
       ],
       "RefreshProbability": 0,
@@ -1859,7 +1859,7 @@
       ],
       "PrizeNums": [
         1,
-        1,
+        2,
         4290
       ],
       "RefreshProbability": 0,
@@ -1903,7 +1903,7 @@
       ],
       "PrizeNums": [
         1,
-        1,
+        2,
         4470
       ],
       "RefreshProbability": 0,
@@ -1933,13 +1933,13 @@
       "Score": 1,
       "EventQuality": 1,
       "PrizeIDs": [
-        12015,
+        12014,
         1702,
         1003
       ],
       "PrizeNums": [
         1,
-        1,
+        2,
         4710
       ],
       "RefreshProbability": 0,
@@ -1975,7 +1975,7 @@
       ],
       "PrizeNums": [
         1,
-        1,
+        2,
         4950
       ],
       "RefreshProbability": 0,
@@ -2016,7 +2016,7 @@
       ],
       "PrizeNums": [
         1,
-        1,
+        2,
         5220
       ],
       "RefreshProbability": 0,
@@ -2048,13 +2048,13 @@
       "Score": 1,
       "EventQuality": 1,
       "PrizeIDs": [
-        12004,
+        12009,
         1702,
         1003
       ],
       "PrizeNums": [
         1,
-        1,
+        2,
         5460
       ],
       "RefreshProbability": 0,
@@ -2096,13 +2096,13 @@
       "Score": 1,
       "EventQuality": 1,
       "PrizeIDs": [
-        12509,
+        12504,
         1702,
         1003
       ],
       "PrizeNums": [
         1,
-        1,
+        2,
         5700
       ],
       "RefreshProbability": 0,
@@ -2132,7 +2132,7 @@
       ],
       "PrizeNums": [
         1,
-        1,
+        2,
         5940
       ],
       "RefreshProbability": 0,
@@ -2158,13 +2158,13 @@
       "Score": 1,
       "EventQuality": 1,
       "PrizeIDs": [
-        12020,
+        12019,
         1702,
         1003
       ],
       "PrizeNums": [
         1,
-        1,
+        2,
         6060
       ],
       "RefreshProbability": 0,
@@ -2204,7 +2204,7 @@
       ],
       "PrizeNums": [
         1,
-        1,
+        2,
         6690
       ],
       "RefreshProbability": 0,
@@ -2230,7 +2230,7 @@
       "EventQuality": 1,
       "PrizeIDs": [
         1303,
-        1702,
+        1703,
         1003
       ],
       "PrizeNums": [
@@ -2271,7 +2271,7 @@
       "EventQuality": 1,
       "PrizeIDs": [
         12024,
-        1702,
+        1703,
         1003
       ],
       "PrizeNums": [
@@ -2307,7 +2307,7 @@
       "EventQuality": 1,
       "PrizeIDs": [
         12510,
-        1702,
+        1703,
         1003
       ],
       "PrizeNums": [
@@ -2344,7 +2344,7 @@
       "EventQuality": 1,
       "PrizeIDs": [
         1304,
-        1702,
+        1703,
         1003
       ],
       "PrizeNums": [
@@ -2408,7 +2408,7 @@
       "EventQuality": 1,
       "PrizeIDs": [
         10010,
-        1702,
+        1703,
         1003
       ],
       "PrizeNums": [
@@ -2437,7 +2437,7 @@
       "EventQuality": 1,
       "PrizeIDs": [
         12025,
-        1702,
+        1703,
         1003
       ],
       "PrizeNums": [
@@ -2484,8 +2484,8 @@
       "Score": 1,
       "EventQuality": 1,
       "PrizeIDs": [
-        12504,
-        1702,
+        12509,
+        1703,
         1003
       ],
       "PrizeNums": [
@@ -2521,7 +2521,7 @@
       "EventQuality": 1,
       "PrizeIDs": [
         1305,
-        1702,
+        1703,
         1003
       ],
       "PrizeNums": [
@@ -2565,7 +2565,7 @@
       "EventQuality": 1,
       "PrizeIDs": [
         22001,
-        1702,
+        1703,
         1003
       ],
       "PrizeNums": [
@@ -3275,7 +3275,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 13,
       "EventConditionId": [
         10
       ],
@@ -3315,7 +3315,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 13,
       "EventConditionId": [
         10
       ],
@@ -3364,7 +3364,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 13,
       "EventConditionId": [
         10
       ],
@@ -3407,7 +3407,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 13,
       "EventConditionId": [
         10
       ],
@@ -3447,7 +3447,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 13,
       "EventConditionId": [
         10
       ],
@@ -3490,7 +3490,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 13,
       "EventConditionId": [
         10
       ],
@@ -3531,7 +3531,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 14,
       "EventConditionId": [
         10,
         3
@@ -3579,7 +3579,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 14,
       "EventConditionId": [
         10
       ],
@@ -3623,7 +3623,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 14,
       "EventConditionId": [
         10
       ],
@@ -3667,7 +3667,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 14,
       "EventConditionId": [
         10
       ],
@@ -3712,7 +3712,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 14,
       "EventConditionId": [
         10
       ],
@@ -3751,7 +3751,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 14,
       "EventConditionId": [
         10
       ],
@@ -3789,7 +3789,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 15,
       "EventConditionId": [
         3
       ],
@@ -3829,7 +3829,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 15,
       "EventConditionId": [
         10
       ],
@@ -3866,7 +3866,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 15,
       "EventConditionId": [
         10
       ],
@@ -3904,7 +3904,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 15,
       "EventConditionId": [
         10
       ],
@@ -3941,7 +3941,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 15,
       "EventConditionId": [
         10
       ],
@@ -3982,7 +3982,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 15,
       "EventConditionId": [
         10
       ],
@@ -4024,7 +4024,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 16,
       "EventConditionId": [
         3
       ],
@@ -4062,7 +4062,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 16,
       "EventConditionId": [
         10
       ],
@@ -4101,7 +4101,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 16,
       "EventConditionId": [
         10
       ],
@@ -4138,7 +4138,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 16,
       "EventConditionId": [
         10
       ],
@@ -4175,7 +4175,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 16,
       "EventConditionId": [
         10
       ],
@@ -4215,7 +4215,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 16,
       "EventConditionId": [
         10
       ],
@@ -4253,7 +4253,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 17,
       "EventConditionId": [
         3
       ],
@@ -4291,7 +4291,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 17,
       "EventConditionId": [
         10
       ],
@@ -4328,7 +4328,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 17,
       "EventConditionId": [
         10
       ],
@@ -4366,7 +4366,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 17,
       "EventConditionId": [
         10
       ],
@@ -4404,7 +4404,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 17,
       "EventConditionId": [
         10
       ],
@@ -4440,7 +4440,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 17,
       "EventConditionId": [
         10
       ],
@@ -4478,7 +4478,7 @@
       "RefreshCount": 1,
       "placeID": 3,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 18,
       "EventConditionId": [
         3
       ],
@@ -4516,7 +4516,7 @@
       "RefreshCount": 1,
       "placeID": 3,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 18,
       "EventConditionId": [
         10
       ],
@@ -4554,7 +4554,7 @@
       "RefreshCount": 1,
       "placeID": 3,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 18,
       "EventConditionId": [
         10
       ],
@@ -4592,7 +4592,7 @@
       "RefreshCount": 1,
       "placeID": 3,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 18,
       "EventConditionId": [
         10
       ],
@@ -4632,7 +4632,7 @@
       "RefreshCount": 1,
       "placeID": 3,
       "SmallPlacesId": 0,
-      "XiantuID": 0,
+      "XiantuID": 18,
       "EventConditionId": [
         10
       ],

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 112 - 112
Assets/Res/Config/FabaoPowerupConfig.json


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

@@ -395,7 +395,7 @@
     {
       "ID": 10001,
       "GroupMonsterLevel": [
-        200
+        250
       ],
       "GroupMonster": [
         9005

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

@@ -124,10 +124,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 95,
-      "hp": 95,
+      "attack": 109,
+      "hp": 83,
       "def": 100,
-      "shield": 95,
+      "shield": 83,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -181,10 +181,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 86,
-      "hp": 106,
+      "attack": 100,
+      "hp": 90,
       "def": 100,
-      "shield": 106,
+      "shield": 90,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -238,10 +238,10 @@
       "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 95,
-      "hp": 95,
+      "attack": 90,
+      "hp": 100,
       "def": 100,
-      "shield": 95,
+      "shield": 100,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -291,15 +291,15 @@
     {
       "ID": 1004,
       "nickName": -1,
-      "name": 4,
+      "name": 5,
       "headicon": "icon_tx1004",
       "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 95,
-      "hp": 95,
+      "attack": 81,
+      "hp": 112,
       "def": 100,
-      "shield": 95,
+      "shield": 112,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -349,15 +349,15 @@
     {
       "ID": 1005,
       "nickName": -1,
-      "name": 4,
+      "name": 6,
       "headicon": "icon_tx1005",
       "model": "Boss_Tree_xiao",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 38,
-      "hp": 95,
+      "attack": 67,
+      "hp": 136,
       "def": 100,
-      "shield": 95,
+      "shield": 136,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -407,15 +407,15 @@
     {
       "ID": 1006,
       "nickName": -1,
-      "name": 4,
+      "name": 7,
       "headicon": "icon_tx1006",
       "model": "gw_xianhe",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 57,
-      "hp": 114,
+      "attack": 86,
+      "hp": 106,
       "def": 100,
-      "shield": 190,
+      "shield": 106,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -465,15 +465,15 @@
     {
       "ID": 1007,
       "nickName": -1,
-      "name": 4,
+      "name": 8,
       "headicon": "icon_tx1007",
       "model": "gw_huli",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 57,
-      "hp": 114,
+      "attack": 105,
+      "hp": 86,
       "def": 100,
-      "shield": 190,
+      "shield": 86,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -523,15 +523,15 @@
     {
       "ID": 1008,
       "nickName": -1,
-      "name": 4,
+      "name": 9,
       "headicon": "icon_tx1008",
       "model": "Gw_zhizhu",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 100,
-      "hp": 90,
+      "attack": 124,
+      "hp": 73,
       "def": 100,
-      "shield": 90,
+      "shield": 73,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -581,7 +581,7 @@
     {
       "ID": 5001,
       "nickName": -1,
-      "name": 4,
+      "name": 10,
       "headicon": "icon_tx5001",
       "model": "Gw_Man",
       "isUseGpu": false,
@@ -639,7 +639,7 @@
     {
       "ID": 5002,
       "nickName": -1,
-      "name": 4,
+      "name": 11,
       "headicon": "icon_tx5002",
       "model": "Gw_Man",
       "isUseGpu": false,
@@ -697,7 +697,7 @@
     {
       "ID": 5003,
       "nickName": -1,
-      "name": 4,
+      "name": 12,
       "headicon": "icon_tx5003",
       "model": "Gw_Woman",
       "isUseGpu": false,
@@ -755,7 +755,7 @@
     {
       "ID": 5004,
       "nickName": -1,
-      "name": 4,
+      "name": 13,
       "headicon": "icon_tx5004",
       "model": "Gw_Woman",
       "isUseGpu": false,
@@ -813,7 +813,7 @@
     {
       "ID": 5005,
       "nickName": -1,
-      "name": 4,
+      "name": 14,
       "headicon": "icon_tx5005",
       "model": "Gw_Man",
       "isUseGpu": false,
@@ -871,7 +871,7 @@
     {
       "ID": 5006,
       "nickName": -1,
-      "name": 4,
+      "name": 15,
       "headicon": "icon_tx5006",
       "model": "Boss_ShuGuai",
       "isUseGpu": false,
@@ -929,7 +929,7 @@
     {
       "ID": 5007,
       "nickName": -1,
-      "name": 4,
+      "name": 16,
       "headicon": "icon_tx5007",
       "model": "Boss_QiongQi",
       "isUseGpu": false,
@@ -987,7 +987,7 @@
     {
       "ID": 9001,
       "nickName": -1,
-      "name": 5,
+      "name": 17,
       "headicon": "icon_tx9001",
       "model": "Boss01",
       "isUseGpu": false,
@@ -1045,7 +1045,7 @@
     {
       "ID": 9002,
       "nickName": -1,
-      "name": 5,
+      "name": 18,
       "headicon": "icon_tx9002",
       "model": "Boss_fenghuang",
       "isUseGpu": false,
@@ -1103,7 +1103,7 @@
     {
       "ID": 9003,
       "nickName": -1,
-      "name": 5,
+      "name": 19,
       "headicon": "icon_tx9003",
       "model": "Boss_BeiHaiGui",
       "isUseGpu": false,
@@ -1161,7 +1161,7 @@
     {
       "ID": 9004,
       "nickName": -1,
-      "name": 5,
+      "name": 20,
       "headicon": "icon_tx9004",
       "model": "Boss_Tree",
       "isUseGpu": false,
@@ -1219,7 +1219,7 @@
     {
       "ID": 9005,
       "nickName": -1,
-      "name": 5,
+      "name": 21,
       "headicon": "icon_tx9005",
       "model": "Nanzhu",
       "isUseGpu": false,
@@ -1277,7 +1277,7 @@
     {
       "ID": 9006,
       "nickName": -1,
-      "name": 5,
+      "name": 22,
       "headicon": "icon_tx9006",
       "model": "Boss_fenghuang",
       "isUseGpu": false,

+ 3 - 3
Assets/Res/Config/InitialPlayerConfig.json

@@ -15,12 +15,12 @@
         1
       ],
       "fabaoId": [
-        10002
+        10010
       ],
       "gongfaId": [
-        1501
+        1105
       ],
-      "shenshiPoint": 200
+      "shenshiPoint": 400
     }
   ]
 }

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

@@ -6,87 +6,87 @@
     },
     {
       "ID": 2,
-      "txt": "-小怪1"
+      "txt": "-蒙面男子"
     },
     {
       "ID": 3,
-      "txt": "-小怪2"
+      "txt": "-蒙面男子"
     },
     {
       "ID": 4,
-      "txt": "-小怪3"
+      "txt": "-蒙面女子"
     },
     {
       "ID": 5,
-      "txt": "-BOSS1"
+      "txt": "-蒙面女子"
     },
     {
       "ID": 6,
-      "txt": "伊莉莎白·月影"
+      "txt": "-树精"
     },
     {
       "ID": 7,
-      "txt": "馬修·星辰"
+      "txt": "-飞鹤"
     },
     {
       "ID": 8,
-      "txt": "卡特琳娜·霜語"
+      "txt": "-灵狐"
     },
     {
       "ID": 9,
-      "txt": "西蒙·玄光"
+      "txt": "-蜘蛛"
     },
     {
       "ID": 10,
-      "txt": "艾琳娜·靈風"
+      "txt": "-金修精英"
     },
     {
       "ID": 11,
-      "txt": "加百利·聖心"
+      "txt": "-水修精英"
     },
     {
       "ID": 12,
-      "txt": "索菲亞·慈恩"
+      "txt": "-木修精英"
     },
     {
       "ID": 13,
-      "txt": "盧克·淨魂"
+      "txt": "-火修精英"
     },
     {
       "ID": 14,
-      "txt": "安娜貝爾·光耀"
+      "txt": "-土系怪"
     },
     {
       "ID": 15,
-      "txt": "伊莎貝拉·恩典"
+      "txt": "-鼠先锋 "
     },
     {
       "ID": 16,
-      "txt": "萊恩·影蹤"
+      "txt": "-穷奇"
     },
     {
       "ID": 17,
-      "txt": "艾米麗·翠羽"
+      "txt": "-boss"
     },
     {
       "ID": 18,
-      "txt": "德裏克·疾風"
+      "txt": "-凤凰"
     },
     {
       "ID": 19,
-      "txt": "維多利亞·夜刃"
+      "txt": "-北海神龟"
     },
     {
       "ID": 20,
-      "txt": "諾亞·林蹤"
+      "txt": "-樗木之灵"
     },
     {
       "ID": 21,
-      "txt": "生命值"
+      "txt": "-心魔"
     },
     {
       "ID": 22,
-      "txt": "攻擊力"
+      "txt": "-仙山飞鸟"
     },
     {
       "ID": 23,
@@ -13642,7 +13642,7 @@
     },
     {
       "ID": 4151,
-      "txt": "树间闲聊"
+      "txt": "树间闲聊.灵儿"
     },
     {
       "ID": 4152,
@@ -13650,7 +13650,7 @@
     },
     {
       "ID": 4153,
-      "txt": "风铃寻趣"
+      "txt": "风铃寻趣.灵儿"
     },
     {
       "ID": 4154,
@@ -13658,7 +13658,7 @@
     },
     {
       "ID": 4155,
-      "txt": "守护雀巢"
+      "txt": "守护雀巢.灵儿"
     },
     {
       "ID": 4156,
@@ -13666,7 +13666,7 @@
     },
     {
       "ID": 4157,
-      "txt": "小飞试胆"
+      "txt": "小飞试胆.灵儿"
     },
     {
       "ID": 4158,
@@ -13674,7 +13674,7 @@
     },
     {
       "ID": 4159,
-      "txt": "风涡营救"
+      "txt": "风涡营救.灵儿"
     },
     {
       "ID": 4160,
@@ -13682,7 +13682,7 @@
     },
     {
       "ID": 4161,
-      "txt": "雀侣同行"
+      "txt": "雀侣同行.灵儿"
     },
     {
       "ID": 4162,
@@ -13698,27 +13698,27 @@
     },
     {
       "ID": 4165,
-      "txt": "绿林试探"
+      "txt": "绿林试探.云枝"
     },
     {
       "ID": 4166,
-      "txt": "风林除妖"
+      "txt": "风林除妖.云枝"
     },
     {
       "ID": 4167,
-      "txt": "琴音守护"
+      "txt": "琴音守护.云枝"
     },
     {
       "ID": 4168,
-      "txt": "往事如风"
+      "txt": "往事如风.云枝"
     },
     {
       "ID": 4169,
-      "txt": "大风危机"
+      "txt": "大风危机.云枝"
     },
     {
       "ID": 4170,
-      "txt": "枝侣同行"
+      "txt": "枝侣同行.云枝"
     },
     {
       "ID": 4171,
@@ -13754,27 +13754,27 @@
     },
     {
       "ID": 4179,
-      "txt": "1. 浮岛边缘.初遇风瑶"
+      "txt": "浮岛边缘.风瑶"
     },
     {
       "ID": 4180,
-      "txt": "2. 风灵碎片.岛间搜寻"
+      "txt": "风灵碎片.风瑶"
     },
     {
       "ID": 4181,
-      "txt": "3. 风中疑云.探听消息"
+      "txt": "风中疑云.风瑶"
     },
     {
       "ID": 4182,
-      "txt": "4. 隐秘信物.追踪残片"
+      "txt": "隐秘信物.风瑶"
     },
     {
       "ID": 4183,
-      "txt": "5. 风中密信.截获情报"
+      "txt": "风中密信.风瑶"
     },
     {
       "ID": 4184,
-      "txt": "6. 兄妹密谈.初步真相"
+      "txt": "兄妹密谈.风瑶"
     },
     {
       "ID": 4185,
@@ -13842,27 +13842,27 @@
     },
     {
       "ID": 4201,
-      "txt": "1. 山溪小屋.初遇婉溪"
+      "txt": "山溪小屋.婉溪"
     },
     {
       "ID": 4202,
-      "txt": "2. 溪边劳作.浇灌灵田"
+      "txt": "溪边劳作.婉溪"
     },
     {
       "ID": 4203,
-      "txt": "3. 清茶闲话.品茗论道"
+      "txt": "清茶闲话.婉溪"
     },
     {
       "ID": 4204,
-      "txt": "4. 玉佩稳灵.收集信物"
+      "txt": "玉佩稳灵.婉溪"
     },
     {
       "ID": 4205,
-      "txt": "5. 溪水异动.驱散干扰"
+      "txt": "溪水异动.婉溪"
     },
     {
       "ID": 4206,
-      "txt": "6. 兄妹心语.隐秘初现"
+      "txt": "兄妹心语.婉溪"
     },
     {
       "ID": 4207,
@@ -13898,27 +13898,27 @@
     },
     {
       "ID": 4215,
-      "txt": "1. 山林重逢.隐士闲谈"
+      "txt": "山林重逢.许由"
     },
     {
       "ID": 4216,
-      "txt": "2. 山野采草.炼丹初助"
+      "txt": "山野采草.许由"
     },
     {
       "ID": 4217,
-      "txt": "3. 丹炉论道.火候之悟"
+      "txt": "丹炉论道.许由"
     },
     {
       "ID": 4218,
-      "txt": "4. 玉佩镇丹.稳气寻材"
+      "txt": "玉佩镇丹.许由"
     },
     {
       "ID": 4219,
-      "txt": "5. 茶丹相融.品味山林"
+      "txt": "茶丹相融.许由"
     },
     {
       "ID": 4220,
-      "txt": "6. 隐士心语.道在山林"
+      "txt": "隐士心语.许由"
     },
     {
       "ID": 4221,
@@ -13962,23 +13962,23 @@
     },
     {
       "ID": 4231,
-      "txt": "1. 随风偶遇.风中疑问"
+      "txt": "随风偶遇.疯道人"
     },
     {
       "ID": 4232,
-      "txt": "2. 途中解乏"
+      "txt": "途中解乏.疯道人"
     },
     {
       "ID": 4233,
-      "txt": "3.  游乐论道.评判之辨"
+      "txt": "游乐论道.疯道人"
     },
     {
       "ID": 4234,
-      "txt": "4. 灵石稳身.自在寻味"
+      "txt": "灵石稳身.疯道人"
     },
     {
       "ID": 4235,
-      "txt": "5. 沉迷赌博.有借无还"
+      "txt": "沉迷赌博.疯道人"
     },
     {
       "ID": 4236,
@@ -23878,51 +23878,51 @@
     },
     {
       "ID": 6710,
-      "txt": ""
+      "txt": "松风携雀跃青霄"
     },
     {
       "ID": 6711,
-      "txt": ""
+      "txt": "‌北海树梢间,遇灵儿拽袖邀戏,追风铃斗风妖,共织仙灵奇缘。"
     },
     {
       "ID": 6712,
-      "txt": ""
+      "txt": "松语邀风"
     },
     {
       "ID": 6713,
-      "txt": ""
+      "txt": "北海古松下,冷峻树灵与天真雀妖,共守风中往事"
     },
     {
       "ID": 6714,
-      "txt": ""
+      "txt": "青岚绕月云隐深"
     },
     {
       "ID": 6715,
-      "txt": ""
+      "txt": "浮空岛边,碎片微光映照着风瑶眼中的忧思,云隐宗的秘密,正随风而来。"
     },
     {
       "ID": 6716,
-      "txt": ""
+      "txt": "溪烟暗锁故人踪"
     },
     {
       "ID": 6717,
-      "txt": ""
+      "txt": "暮色染溪,偶遇婉溪,茶香氤氲间,照见前世剑影如烟。"
     },
     {
       "ID": 6718,
-      "txt": ""
+      "txt": "青烟炉畔问道心"
     },
     {
       "ID": 6719,
-      "txt": ""
+      "txt": "访隐士,采灵草,品茶论道间,悟得大小皆逍遥。"
     },
     {
       "ID": 6720,
-      "txt": ""
+      "txt": "疯道人的赌债风云"
     },
     {
       "ID": 6721,
-      "txt": ""
+      "txt": "借钱给疯道人逛赌楼,前去讨债反被耍‌"
     },
     {
       "ID": 6722,
@@ -37626,11 +37626,11 @@
     },
     {
       "ID": 10147,
-      "txt": "功法可放入功法盘的任意空位"
+      "txt": "功法前期只可放置在对应五行的绿圈内,后期则可以放置在任意位置"
     },
     {
       "ID": 10148,
-      "txt": "这是火系功法,将它放在功法盘的火属性附近,会优先释放"
+      "txt": "这是火系功法,将它放在功法盘的火属性附近"
     },
     {
       "ID": 10149,

+ 35 - 0
Assets/Res/Config/XianTuLogConfig.json

@@ -90,6 +90,41 @@
       "Title": 6710,
       "Desc": 6711,
       "BigMapID": 1
+    },
+    {
+      "ID": 14,
+      "EventType": 2,
+      "Title": 6712,
+      "Desc": 6713,
+      "BigMapID": 1
+    },
+    {
+      "ID": 15,
+      "EventType": 2,
+      "Title": 6714,
+      "Desc": 6715,
+      "BigMapID": 1
+    },
+    {
+      "ID": 16,
+      "EventType": 2,
+      "Title": 6716,
+      "Desc": 6717,
+      "BigMapID": 1
+    },
+    {
+      "ID": 17,
+      "EventType": 2,
+      "Title": 6718,
+      "Desc": 6719,
+      "BigMapID": 1
+    },
+    {
+      "ID": 18,
+      "EventType": 2,
+      "Title": 6720,
+      "Desc": 6721,
+      "BigMapID": 1
     }
   ]
 }

BIN
Excel2Json/Excel/EventConfig.xlsx


BIN
Excel2Json/Excel/HeroModel.xlsx


BIN
Excel2Json/Excel/HeroPowerUp.xlsx


BIN
Excel2Json/Excel/InitialPlayer.xlsx


BIN
Excel2Json/Excel/Language.xlsx


BIN
Excel2Json/Excel/LevelBattle.xlsx


BIN
Excel2Json/Excel/MonsterPowerUp.xlsx


BIN
Excel2Json/Excel/skill.xlsx


BIN
美术/art_use_ui/bg/bg_appicon.png


Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác