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

Assets/Res/Config/EventConfig.json

@@ -6601,16 +6601,16 @@
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,
-      "EventQuality": 2,
+      "EventQuality": 1,
       "PrizeIDs": [
         1001,
         1003
       ],
       "PrizeNums": [
-        -5000,
-        -5000
+        -10000,
+        -6000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -6685,7 +6685,7 @@
       "Score": 0,
       "EventQuality": 2,
       "PrizeIDs": [
-        1402,
+        1401,
         1001,
         1003
       ],
@@ -6734,7 +6734,7 @@
       "Score": 0,
       "EventQuality": 2,
       "PrizeIDs": [
-        1402,
+        1401,
         1001,
         1003
       ],
@@ -6823,16 +6823,14 @@
       "Score": 0,
       "EventQuality": 2,
       "PrizeIDs": [
-        1403,
         1001,
         1003
       ],
       "PrizeNums": [
-        1,
-        -5000,
-        -5000
+        -15000,
+        -9000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -6863,18 +6861,16 @@
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,
-      "EventQuality": 2,
+      "EventQuality": 3,
       "PrizeIDs": [
-        1403,
         1001,
         1003
       ],
       "PrizeNums": [
-        1,
-        -5000,
-        -5000
+        -20000,
+        -12000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -6896,18 +6892,16 @@
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,
-      "EventQuality": 2,
+      "EventQuality": 4,
       "PrizeIDs": [
-        1404,
         1001,
         1003
       ],
       "PrizeNums": [
-        1,
-        -5000,
-        -5000
+        -30000,
+        -20000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -6929,18 +6923,16 @@
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,
-      "EventQuality": 2,
+      "EventQuality": 1,
       "PrizeIDs": [
-        1404,
         1001,
         1003
       ],
       "PrizeNums": [
-        1,
-        -5000,
-        -5000
+        -10000,
+        -6000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -6964,16 +6956,14 @@
       "Score": 0,
       "EventQuality": 2,
       "PrizeIDs": [
-        1404,
         1001,
         1003
       ],
       "PrizeNums": [
-        1,
-        -5000,
-        -5000
+        -15000,
+        -9000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -6996,18 +6986,16 @@
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,
-      "EventQuality": 2,
+      "EventQuality": 3,
       "PrizeIDs": [
-        1404,
         1001,
         1003
       ],
       "PrizeNums": [
-        2,
-        -5000,
-        -5000
+        -20000,
+        -12000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -7030,18 +7018,16 @@
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,
-      "EventQuality": 2,
+      "EventQuality": 4,
       "PrizeIDs": [
-        1404,
         1001,
         1003
       ],
       "PrizeNums": [
-        2,
-        -5000,
-        -5000
+        -30000,
+        -20000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -7066,16 +7052,14 @@
       "Score": 0,
       "EventQuality": 2,
       "PrizeIDs": [
-        1404,
         1001,
         1003
       ],
       "PrizeNums": [
-        2,
-        -5000,
-        -5000
+        -15000,
+        -9000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 0,
       "SmallPlacesId": 0,

Assets/Res/Config/LanguageChineseConfig.json

@@ -13150,47 +13150,47 @@
     },
     {
       "ID": 4028,
-      "txt": "鲲鹏何在"
+      "txt": "鲲鹏何在.神识未灭"
     },
     {
       "ID": 4029,
-      "txt": "北海迷径1"
+      "txt": "北海密径.御剑而行"
     },
     {
       "ID": 4030,
-      "txt": "北海迷径2"
+      "txt": "北海密径.雀笑大鹏"
     },
     {
       "ID": 4031,
-      "txt": "古径阵法"
+      "txt": "古径阵法.击败结界兽"
     },
     {
       "ID": 4032,
-      "txt": "浮空之岛1"
+      "txt": "浮空之岛.初见疯道人"
     },
     {
       "ID": 4033,
-      "txt": "浮空之岛2"
+      "txt": "浮空之岛.达到练气"
     },
     {
       "ID": 4034,
-      "txt": "风中洞府1"
+      "txt": "风中洞府.击败痴道人"
     },
     {
       "ID": 4035,
-      "txt": "风中洞府2"
+      "txt": "风中洞府.疯痴相聚"
     },
     {
       "ID": 4036,
-      "txt": "风灵之力"
+      "txt": "风灵之力.练气后期"
     },
     {
       "ID": 4037,
-      "txt": "北海深处1"
+      "txt": "北海深处.妖兽横行"
     },
     {
       "ID": 4038,
-      "txt": "北海深处2"
+      "txt": "北海深处.遇见鲲鹏"
     },
     {
       "ID": 4039,
@@ -13198,63 +13198,63 @@
     },
     {
       "ID": 4040,
-      "txt": "尧之都"
+      "txt": "尧之都.尧让天下"
     },
     {
       "ID": 4041,
-      "txt": "山林清音"
+      "txt": "山林清音.访贤许由"
     },
     {
       "ID": 4042,
-      "txt": "山中劳作"
+      "txt": "山中劳作.割草喝茶"
     },
     {
       "ID": 4043,
-      "txt": "风起夜战"
+      "txt": "风起夜战.再来一杯"
     },
     {
       "ID": 4044,
-      "txt": "吃茶三问"
+      "txt": "吃茶三问.战胜妖王"
     },
     {
       "ID": 4045,
-      "txt": "尧让天下"
+      "txt": "尧让天下.复命尧帝"
     },
     {
       "ID": 4046,
-      "txt": "无用之树"
+      "txt": "无用之树.树下闲话"
     },
     {
       "ID": 4047,
-      "txt": "樗木之灵"
+      "txt": "樗木之灵.切磋"
     },
     {
       "ID": 4048,
-      "txt": "游尧都"
+      "txt": "游尧都.结丹中期"
     },
     {
       "ID": 4049,
-      "txt": "再见尧帝"
+      "txt": "再见尧帝.仙山传说"
     },
     {
       "ID": 4050,
-      "txt": "云海漫行"
+      "txt": "云海漫行.入山幻阵"
     },
     {
       "ID": 4051,
-      "txt": "初见惠子"
+      "txt": "初见惠子.葫芦种子"
     },
     {
       "ID": 4052,
-      "txt": "葫芦肥料"
+      "txt": "葫芦肥料.天肥地肥"
     },
     {
       "ID": 4053,
-      "txt": "藐姑射山"
+      "txt": "藐姑射山.登山"
     },
     {
       "ID": 4054,
-      "txt": "藐姑射山"
+      "txt": "藐姑射山.雾中幻径"
     },
     {
       "ID": 4055,
@@ -13266,7 +13266,7 @@
     },
     {
       "ID": 4057,
-      "txt": "心魔之战"
+      "txt": "心魔之战.破除枷锁"
     },
     {
       "ID": 4058,
@@ -13450,111 +13450,111 @@
     },
     {
       "ID": 4103,
-      "txt": "神识未灭"
+      "txt": "风铃一响，随它去寻北海鲲鹏。"
     },
     {
       "ID": 4104,
-      "txt": "御剑而行"
+      "txt": "神识所及，古径蜿蜒云雾间，隐有兽影沉浮，气息森然。"
     },
     {
       "ID": 4105,
-      "txt": "雀笑大鹏"
+      "txt": "风过结界开，古径云雾散，前路现。"
     },
     {
       "ID": 4106,
-      "txt": "击败结界兽"
+      "txt": "心意决，战凤鸟，破阻扰，仙途重开。"
     },
     {
       "ID": 4107,
-      "txt": "初见疯道人"
+      "txt": "风停见疯道，赠书修道，静待来日。"
     },
     {
       "ID": 4108,
-      "txt": "筑基中期"
+      "txt": "获赠半珠，承风之志，前往搜寻另一半灵珠。"
     },
     {
       "ID": 4109,
-      "txt": "击败痴道人"
+      "txt": "双珠相引，宿命相逢，此战难免。"
     },
     {
       "ID": 4110,
-      "txt": "疯痴相聚"
+      "txt": "心结解开，灵气自来，师兄携师弟乘风归去。"
     },
     {
       "ID": 4111,
-      "txt": "筑基后期"
+      "txt": "灵珠引路破狂风，七道心境寻鲲踪。"
     },
     {
       "ID": 4112,
-      "txt": "妖兽横行"
+      "txt": "灵珠破浪斩妖途，北海深处现真章。"
     },
     {
       "ID": 4113,
-      "txt": "遇见鲲鹏"
+      "txt": "北海缘已结，携风灵珠，向尧都寻心境。"
     },
     {
       "ID": 4114,
-      "txt": "问道尧都"
+      "txt": "踏出北海，御剑抵尧都，寻一方人间仙境，问道尧都。"
     },
     {
       "ID": 4115,
-      "txt": "尧让天下"
+      "txt": "受帝尧之托，入深山寻访避世贤士许由。"
     },
     {
       "ID": 4116,
-      "txt": "访贤许由"
+      "txt": "许由一言成谶，只得愣在古松下，水声潺潺。"
     },
     {
       "ID": 4117,
-      "txt": "割草喝茶"
+      "txt": "为许由前辈开荒辟地，除草采药，有茶有修行。"
     },
     {
       "ID": 4118,
-      "txt": "再来一杯"
+      "txt": "击退妖兽，又得灵茶一饮"
     },
     {
       "ID": 4119,
-      "txt": "战胜妖王"
+      "txt": "三杯清茶饮尽，了悟心净即是道。"
     },
     {
       "ID": 4120,
-      "txt": "复命尧帝"
+      "txt": "带回许由的话，帝尧听了，低头沉默不语。"
     },
     {
       "ID": 4121,
-      "txt": "树下闲话"
+      "txt": "歪树笑着活了三千年，无用才是大用。"
     },
     {
       "ID": 4122,
-      "txt": "切磋切磋"
+      "txt": "千年树灵想活动，小友陪它过两招。"
     },
     {
       "ID": 4123,
-      "txt": "结丹中期"
+      "txt": "在灵气里泡够了，找尧帝指条明路。"
     },
     {
       "ID": 4124,
-      "txt": "仙山传说"
+      "txt": "尧帝说起那座仙山，心便飘向了云海间。"
     },
     {
       "ID": 4125,
-      "txt": "入山幻阵"
+      "txt": "拨开云海见仙山，循着铃声访隐者。"
     },
     {
       "ID": 4126,
-      "txt": "葫芦种子"
+      "txt": "为种一颗仙葫芦，上天入地去寻觅。"
     },
     {
       "ID": 4127,
-      "txt": "天肥地肥"
+      "txt": "仙种灵根何处寻，再向樗木借春秋。"
     },
     {
       "ID": 4128,
-      "txt": "登山寻神"
+      "txt": "灵肥俱备始开阵，方见云深有路通。"
     },
     {
       "ID": 4129,
-      "txt": "雾中幻径"
+      "txt": "雾中忽闻燕雀语，笑我何必效鲲鹏。"
     },
     {
       "ID": 4130,
@@ -13566,7 +13566,7 @@
     },
     {
       "ID": 4132,
-      "txt": "破除枷锁"
+      "txt": "破妄得逍遥，心御天地宽。"
     },
     {
       "ID": 4133,
@@ -14066,11 +14066,11 @@
     },
     {
       "ID": 4257,
-      "txt": "找到血海宗的人"
+      "txt": "血海丹心护秘钥"
     },
     {
       "ID": 4258,
-      "txt": "找到血海宗的人2"
+      "txt": "北海劫钥"
     },
     {
       "ID": 4259,
@@ -14086,7 +14086,7 @@
     },
     {
       "ID": 4262,
-      "txt": "散修劫掠2"
+      "txt": "劫掠覆来"
     },
     {
       "ID": 4263,
@@ -14130,11 +14130,11 @@
     },
     {
       "ID": 4273,
-      "txt": "夺晶之战2-援军"
+      "txt": "夺晶援军"
     },
     {
       "ID": 4274,
-      "txt": "灵泉"
+      "txt": "探访灵泉"
     },
     {
       "ID": 4275,
@@ -14146,7 +14146,7 @@
     },
     {
       "ID": 4277,
-      "txt": "灵泉异动平息"
+      "txt": "灵泉异动"
     },
     {
       "ID": 4278,
@@ -14170,11 +14170,11 @@
     },
     {
       "ID": 4283,
-      "txt": "发光的鱼2"
+      "txt": "发光的鱼"
     },
     {
       "ID": 4284,
-      "txt": "发光的鱼3"
+      "txt": "发光的鱼"
     },
     {
       "ID": 4285,
@@ -39830,7 +39830,7 @@
     },
     {
       "ID": 10698,
-      "txt": "突破时提升{2}%概率，如果失败会损失当前{3}%修为。"
+      "txt": "突破时提升{2}%概率。"
     },
     {
       "ID": 10699,