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

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

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

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

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

Assets/Res/Config/EventConfig.json

@@ -4606,7 +4606,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 1,
-      "XiantuID": 0,
+      "XiantuID": 2,
       "EventName": 4244,
       "Description": 4326
     },
@@ -4637,7 +4637,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 1,
-      "XiantuID": 0,
+      "XiantuID": 2,
       "EventConditionId": [
         10
       ],
@@ -4672,7 +4672,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 1,
-      "XiantuID": 0,
+      "XiantuID": 2,
       "EventConditionId": [
         10
       ],
@@ -4710,7 +4710,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 1,
-      "XiantuID": 0,
+      "XiantuID": 3,
       "EventConditionId": [
         10
       ],
@@ -4736,7 +4736,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 1,
-      "XiantuID": 0,
+      "XiantuID": 3,
       "EventConditionId": [
         10
       ],
@@ -4786,7 +4786,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 1,
-      "XiantuID": 0,
+      "XiantuID": 3,
       "EventConditionId": [
         1
       ],
@@ -4824,7 +4824,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 2,
-      "XiantuID": 0,
+      "XiantuID": 4,
       "EventName": 4250,
       "Description": 4332
     },
@@ -4856,7 +4856,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 2,
-      "XiantuID": 0,
+      "XiantuID": 4,
       "EventConditionId": [
         10
       ],
@@ -4893,7 +4893,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 2,
-      "XiantuID": 0,
+      "XiantuID": 4,
       "EventConditionId": [
         10
       ],
@@ -4931,7 +4931,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 3,
-      "XiantuID": 0,
+      "XiantuID": 5,
       "EventConditionId": [
         10
       ],
@@ -4961,7 +4961,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 3,
-      "XiantuID": 0,
+      "XiantuID": 5,
       "EventConditionId": [
         10
       ],
@@ -5006,7 +5006,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 3,
-      "XiantuID": 0,
+      "XiantuID": 5,
       "EventConditionId": [
         10
       ],
@@ -5059,7 +5059,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 4,
-      "XiantuID": 0,
+      "XiantuID": 6,
       "EventName": 4256,
       "Description": 4338
     },
@@ -5086,7 +5086,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 4,
-      "XiantuID": 0,
+      "XiantuID": 6,
       "EventConditionId": [
         10
       ],
@@ -5119,7 +5119,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 4,
-      "XiantuID": 0,
+      "XiantuID": 6,
       "EventConditionId": [
         10
       ],
@@ -5153,7 +5153,7 @@
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 4,
-      "XiantuID": 0,
+      "XiantuID": 6,
       "EventConditionId": [
         10
       ],
@@ -5186,7 +5186,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 5,
-      "XiantuID": 0,
+      "XiantuID": 7,
       "EventName": 4260,
       "Description": 4342
     },
@@ -5217,7 +5217,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 5,
-      "XiantuID": 0,
+      "XiantuID": 7,
       "EventConditionId": [
         10
       ],
@@ -5256,7 +5256,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 5,
-      "XiantuID": 0,
+      "XiantuID": 7,
       "EventConditionId": [
         10
       ],
@@ -5293,7 +5293,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 5,
-      "XiantuID": 0,
+      "XiantuID": 8,
       "EventName": 4263,
       "Description": 4345
     },
@@ -5315,7 +5315,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 5,
-      "XiantuID": 0,
+      "XiantuID": 8,
       "EventConditionId": [
         10
       ],
@@ -5358,7 +5358,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 5,
-      "XiantuID": 0,
+      "XiantuID": 8,
       "EventConditionId": [
         10
       ],
@@ -5391,7 +5391,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 6,
-      "XiantuID": 0,
+      "XiantuID": 9,
       "EventName": 4266,
       "Description": 4348
     },
@@ -5432,7 +5432,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 6,
-      "XiantuID": 0,
+      "XiantuID": 10,
       "EventConditionId": [
         10
       ],
@@ -5460,7 +5460,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 6,
-      "XiantuID": 0,
+      "XiantuID": 10,
       "EventConditionId": [
         10
       ],
@@ -5495,7 +5495,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 6,
-      "XiantuID": 0,
+      "XiantuID": 10,
       "EventConditionId": [
         10
       ],
@@ -5526,7 +5526,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 6,
-      "XiantuID": 0,
+      "XiantuID": 10,
       "EventConditionId": [
         10
       ],
@@ -5565,7 +5565,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 6,
-      "XiantuID": 0,
+      "XiantuID": 10,
       "EventConditionId": [
         10
       ],
@@ -5598,7 +5598,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 7,
-      "XiantuID": 0,
+      "XiantuID": 10,
       "EventName": 4272,
       "Description": 4354
     },
@@ -5625,7 +5625,7 @@
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 7,
-      "XiantuID": 0,
+      "XiantuID": 10,
       "EventConditionId": [
         10
       ],
@@ -5657,7 +5657,7 @@
       "RefreshCount": 1,
       "placeID": 3,
       "SmallPlacesId": 8,
-      "XiantuID": 0,
+      "XiantuID": 11,
       "EventName": 4274,
       "Description": 4356
     },
@@ -5687,7 +5687,7 @@
       "RefreshCount": 1,
       "placeID": 3,
       "SmallPlacesId": 8,
-      "XiantuID": 0,
+      "XiantuID": 11,
       "EventConditionId": [
         10
       ],
@@ -5723,7 +5723,7 @@
       "RefreshCount": 1,
       "placeID": 3,
       "SmallPlacesId": 9,
-      "XiantuID": 0,
+      "XiantuID": 12,
       "EventName": 4278,
       "Description": 4358
     },
@@ -5751,7 +5751,7 @@
       "RefreshCount": 1,
       "placeID": 3,
       "SmallPlacesId": 9,
-      "XiantuID": 0,
+      "XiantuID": 12,
       "EventConditionId": [
         10
       ],
@@ -5788,7 +5788,7 @@
       "RefreshCount": 1,
       "placeID": 3,
       "SmallPlacesId": 10,
-      "XiantuID": 0,
+      "XiantuID": 12,
       "EventConditionId": [
         10
       ],
@@ -5829,7 +5829,7 @@
       "RefreshCount": 1,
       "placeID": 3,
       "SmallPlacesId": 10,
-      "XiantuID": 0,
+      "XiantuID": 12,
       "EventConditionId": [
         10
       ],

Assets/Res/Config/LanguageChineseConfig.json

@@ -23790,91 +23790,91 @@
     },
     {
       "ID": 6688,
-      "txt": ""
+      "txt": "渔村异闻录"
     },
     {
       "ID": 6689,
-      "txt": ""
+      "txt": "渔村蓝光异象不断，妖邪以人为引，炼制人肉傀儡"
     },
     {
       "ID": 6690,
-      "txt": ""
+      "txt": "祭魂使命"
     },
     {
       "ID": 6691,
-      "txt": ""
+      "txt": "误入怨魂之地，亡魂躁动妄图破开封印"
     },
     {
       "ID": 6692,
-      "txt": ""
+      "txt": "雾锁云隐信"
     },
     {
       "ID": 6693,
-      "txt": ""
+      "txt": "馨儿相助寻密信，破阵除妖护云隐"
     },
     {
       "ID": 6694,
-      "txt": ""
+      "txt": "云隐仙缘录"
     },
     {
       "ID": 6695,
-      "txt": ""
+      "txt": "听闻浮岛藏宝，却遇盗修拦路"
     },
     {
       "ID": 6696,
-      "txt": ""
+      "txt": "秘钥风云劫"
     },
     {
       "ID": 6697,
-      "txt": ""
+      "txt": "在此初遇柳轻烟，发现血海宗更大的阴谋"
     },
     {
       "ID": 6698,
-      "txt": ""
+      "txt": "云霞丹旅"
     },
     {
       "ID": 6699,
-      "txt": ""
+      "txt": "你偶遇馨儿，一同获取炼制云霞丹的机缘"
     },
     {
       "ID": 6700,
-      "txt": ""
+      "txt": "夺佩记"
     },
     {
       "ID": 6701,
-      "txt": ""
+      "txt": "青狼帮抢夺碧云佩，与馨儿联手击溃敌寇，共赴拍卖会寻得机缘"
     },
     {
       "ID": 6702,
-      "txt": ""
+      "txt": "血海宗的掠夺"
     },
     {
       "ID": 6703,
-      "txt": ""
+      "txt": "看似简单的拦路劫财，却因\"拍卖会\"暴露出更深层的阴谋"
     },
     {
       "ID": 6704,
-      "txt": ""
+      "txt": "血海夺晶"
     },
     {
       "ID": 6705,
-      "txt": ""
+      "txt": "血海宗再度来袭，为夺晶石已经不择手段"
     },
     {
       "ID": 6706,
-      "txt": ""
+      "txt": "紫光灵泉"
     },
     {
       "ID": 6707,
-      "txt": ""
+      "txt": "玄水真人所托，你前去调查被紫光污染的灵泉核心"
     },
     {
       "ID": 6708,
-      "txt": ""
+      "txt": "仙山藏龙纪"
     },
     {
       "ID": 6709,
-      "txt": ""
+      "txt": "妖物清剿完毕，龙族圣地显现"
     },
     {
       "ID": 6710,
@@ -37786,15 +37786,15 @@
     },
     {
       "ID": 10187,
-      "txt": "积分奖励"
+      "txt": "积分"
     },
     {
       "ID": 10188,
-      "txt": "完成次数"
+      "txt": "次数"
     },
     {
       "ID": 10189,
-      "txt": "积分汇总"
+      "txt": "汇总"
     },
     {
       "ID": 10190,

Assets/Res/Config/SkiptoConfig.json

@@ -29,7 +29,7 @@
       "SkipType": 1,
       "SkipID": 4,
       "SkipArguments": [
-        7
+        6
       ],
       "SkipTxt": 10357,
       "UnlockType": 0,
@@ -59,7 +59,7 @@
       "SkipType": 1,
       "SkipID": 4,
       "SkipArguments": [
-        8
+        6
       ],
       "SkipTxt": 10356,
       "UnlockType": 0,
@@ -78,7 +78,7 @@
       "SkipType": 1,
       "SkipID": 4,
       "SkipArguments": [
-        9
+        4
       ],
       "SkipTxt": 10359,
       "UnlockType": 0,
@@ -103,7 +103,7 @@
     {
       "ID": 12,
       "SkipType": 1,
-      "SkipID": 10,
+      "SkipID": 7,
       "SkipTxt": 10362,
       "UnlockType": 0,
       "UnlockPara2": 0

Assets/Res/Config/XianTuLogConfig.json

@@ -10,23 +10,86 @@
     {
       "ID": 2,
       "EventType": 2,
-      "Title": 2088,
-      "Desc": 2090,
+      "Title": 6688,
+      "Desc": 6689,
       "BigMapID": 1
     },
     {
       "ID": 3,
       "EventType": 2,
-      "Title": 2088,
-      "Desc": 2090,
-      "BigMapID": 2
+      "Title": 6690,
+      "Desc": 6691,
+      "BigMapID": 1
     },
     {
       "ID": 4,
       "EventType": 2,
-      "Title": 2088,
-      "Desc": 2090,
-      "BigMapID": 3
+      "Title": 6692,
+      "Desc": 6693,
+      "BigMapID": 1
+    },
+    {
+      "ID": 5,
+      "EventType": 2,
+      "Title": 6694,
+      "Desc": 6695,
+      "BigMapID": 1
+    },
+    {
+      "ID": 6,
+      "EventType": 2,
+      "Title": 6696,
+      "Desc": 6697,
+      "BigMapID": 1
+    },
+    {
+      "ID": 7,
+      "EventType": 2,
+      "Title": 6698,
+      "Desc": 6699,
+      "BigMapID": 1
+    },
+    {
+      "ID": 8,
+      "EventType": 2,
+      "Title": 6700,
+      "Desc": 6701,
+      "BigMapID": 1
+    },
+    {
+      "ID": 9,
+      "EventType": 2,
+      "Title": 6702,
+      "Desc": 6703,
+      "BigMapID": 1
+    },
+    {
+      "ID": 10,
+      "EventType": 2,
+      "Title": 6704,
+      "Desc": 6705,
+      "BigMapID": 1
+    },
+    {
+      "ID": 11,
+      "EventType": 2,
+      "Title": 6706,
+      "Desc": 6707,
+      "BigMapID": 1
+    },
+    {
+      "ID": 12,
+      "EventType": 2,
+      "Title": 6708,
+      "Desc": 6709,
+      "BigMapID": 1
+    },
+    {
+      "ID": 13,
+      "EventType": 2,
+      "Title": 6710,
+      "Desc": 6711,
+      "BigMapID": 1
     }
   ]
 }