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

Assets/Res/Config/EventLinkConfig.json

@@ -7569,7 +7569,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 119,
+      "NPCID": 155,
       "LanID": [
         5544
       ],
@@ -17730,7 +17730,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6318
       ],
@@ -17766,7 +17766,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6320
       ],
@@ -17784,7 +17784,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6321
       ],
@@ -20273,7 +20273,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6486
       ],
@@ -20309,7 +20309,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6488
       ],
@@ -20363,7 +20363,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6491
       ],
@@ -20399,7 +20399,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6493
       ],
@@ -20435,7 +20435,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6495
       ],
@@ -20526,7 +20526,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6502
       ],
@@ -20562,7 +20562,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6504
       ],
@@ -20577,7 +20577,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6506
       ],
@@ -20613,7 +20613,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6508
       ],
@@ -20649,7 +20649,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6510
       ],
@@ -20703,7 +20703,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6513
       ],
@@ -20848,7 +20848,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6524
       ],
@@ -20866,7 +20866,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6525
       ],
@@ -20956,7 +20956,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 134,
+      "NPCID": 156,
       "LanID": [
         6530
       ],

Assets/Res/Config/EventNPC.json

@@ -75,13 +75,13 @@
     {
       "ID": 101,
       "name": 3001,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_chouniao",
       "DaoyouID": 0
     },
     {
       "ID": 102,
       "name": 3002,
-      "icon": "bg_lh_quelinger",
+      "icon": "bg_lh_xiaomaque",
       "DaoyouID": 0
     },
     {
@@ -111,19 +111,19 @@
     {
       "ID": 107,
       "name": 3007,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_cunminjia",
       "DaoyouID": 0
     },
     {
       "ID": 108,
       "name": 3008,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_cunminjia",
       "DaoyouID": 0
     },
     {
       "ID": 109,
       "name": 3009,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_cunminjia",
       "DaoyouID": 0
     },
     {
@@ -141,37 +141,37 @@
     {
       "ID": 112,
       "name": 3021,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_yaoshou",
       "DaoyouID": 0
     },
     {
       "ID": 113,
       "name": 3034,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_yaoshou",
       "DaoyouID": 0
     },
     {
       "ID": 114,
       "name": 3067,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_yaoshou",
       "DaoyouID": 0
     },
     {
       "ID": 115,
       "name": 2091,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_xmqhuanying",
       "DaoyouID": 0
     },
     {
       "ID": 116,
       "name": 2092,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_chidaorenhuanying",
       "DaoyouID": 0
     },
     {
       "ID": 117,
       "name": 2093,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_emuzhilinghy",
       "DaoyouID": 0
     },
     {
@@ -183,19 +183,19 @@
     {
       "ID": 119,
       "name": 2095,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_kunpeng1",
       "DaoyouID": 0
     },
     {
       "ID": 120,
       "name": 2096,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_yaoshou",
       "DaoyouID": 0
     },
     {
       "ID": 121,
       "name": 2097,
-      "icon": "bg_lh_zhiyao",
+      "icon": "bg_lh_yunzhi",
       "DaoyouID": 0
     },
     {
@@ -207,193 +207,205 @@
     {
       "ID": 123,
       "name": 2099,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_xhzdiziA",
       "DaoyouID": 0
     },
     {
       "ID": 124,
       "name": 2100,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_xhzdiziA",
       "DaoyouID": 0
     },
     {
       "ID": 125,
       "name": 2101,
-      "icon": "bg_lh_chidaoren",
+      "icon": "bg_lh_xhzdiziA",
       "DaoyouID": 0
     },
     {
       "ID": 126,
       "name": 2102,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_laozhang",
       "DaoyouID": 0
     },
     {
       "ID": 127,
       "name": 2103,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_laoli",
       "DaoyouID": 0
     },
     {
       "ID": 128,
       "name": 2104,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_xhzdiziA",
       "DaoyouID": 0
     },
     {
       "ID": 129,
       "name": 2105,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_lingji",
       "DaoyouID": 0
     },
     {
       "ID": 130,
       "name": 2106,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_yuanhun",
       "DaoyouID": 0
     },
     {
       "ID": 131,
       "name": 2107,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_xiner",
       "DaoyouID": 0
     },
     {
       "ID": 132,
       "name": 2108,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_xinshi",
       "DaoyouID": 0
     },
     {
       "ID": 133,
       "name": 2109,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_xhzdiziA",
       "DaoyouID": 0
     },
     {
       "ID": 134,
       "name": 2110,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_liuqingyan1",
       "DaoyouID": 0
     },
     {
       "ID": 135,
       "name": 2111,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_xhzdiziB",
       "DaoyouID": 0
     },
     {
       "ID": 136,
       "name": 2112,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_xhzdiziB",
       "DaoyouID": 0
     },
     {
       "ID": 137,
       "name": 2113,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_chongxu",
       "DaoyouID": 0
     },
     {
       "ID": 138,
       "name": 2114,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_xhzdiziA",
       "DaoyouID": 0
     },
     {
       "ID": 139,
       "name": 2115,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_mengmianjingying",
       "DaoyouID": 0
     },
     {
       "ID": 140,
       "name": 2116,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_chuyunmiao",
       "DaoyouID": 0
     },
     {
       "ID": 141,
       "name": 2117,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_qinglangsanren",
       "DaoyouID": 0
     },
     {
       "ID": 142,
       "name": 2118,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_linfeng",
       "DaoyouID": 0
     },
     {
       "ID": 143,
       "name": 2119,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_liuqingqing",
       "DaoyouID": 0
     },
     {
       "ID": 144,
       "name": 2120,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_xuanshui",
       "DaoyouID": 0
     },
     {
       "ID": 145,
       "name": 2121,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_yunxiaolongying",
       "DaoyouID": 0
     },
     {
       "ID": 146,
       "name": 2122,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_yuguai",
       "DaoyouID": 0
     },
     {
       "ID": 147,
       "name": 2123,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_shitoujing",
       "DaoyouID": 0
     },
     {
       "ID": 148,
       "name": 2124,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_xiaoleitingshou",
       "DaoyouID": 0
     },
     {
       "ID": 149,
       "name": 2125,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_wenzi",
       "DaoyouID": 0
     },
     {
       "ID": 150,
       "name": 2126,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_lingque",
       "DaoyouID": 0
     },
     {
       "ID": 151,
       "name": 2127,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_laoquan",
       "DaoyouID": 0
     },
     {
       "ID": 152,
       "name": 2128,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_yinghuochong",
       "DaoyouID": 0
     },
     {
       "ID": 153,
       "name": 2129,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_diaoyaxiaoyao",
       "DaoyouID": 0
     },
     {
       "ID": 154,
       "name": 2130,
-      "icon": "bg_lh_huizi",
+      "icon": "bg_lh_laowugui",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 155,
+      "name": 2131,
+      "icon": "bg_lh_kunpeng2",
+      "DaoyouID": 0
+    },
+    {
+      "ID": 156,
+      "name": 2132,
+      "icon": "bg_lh_liuqingyan2",
       "DaoyouID": 0
     }
   ]