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

Assets/Res/Config/EventConditionConfig.json

@@ -83,6 +83,26 @@
         100004
       ],
       "finishCount": 1
+    },
+    {
+      "ID": 10,
+      "message": null,
+      "Operation": null,
+      "ConditionType": 5,
+      "ConditionPara": [
+        100001
+      ],
+      "finishCount": 3
+    },
+    {
+      "ID": 11,
+      "message": null,
+      "Operation": null,
+      "ConditionType": 6,
+      "ConditionPara": [
+        1002
+      ],
+      "finishCount": 3
     }
   ]
 }

Assets/Res/Config/EventLinkConfig.json

@@ -915,7 +915,7 @@
       "LanID": [
         2092
       ],
-      "DialogueType": null,
+      "DialogueType": 3,
       "EventID": 10002,
       "optionType": null,
       "ResultType": 1,
@@ -931,7 +931,7 @@
       "LanID": [
         2093
       ],
-      "DialogueType": null,
+      "DialogueType": 3,
       "EventID": 10002,
       "optionType": null,
       "ResultType": 1,
@@ -1931,10 +1931,10 @@
     {
       "ID": 1001201,
       "conciseEventMessage": 2183,
-      "EventConditionMessage": null,
+      "EventConditionMessage": 2184,
       "NPCID": null,
       "LanID": [
-        2184
+        2185
       ],
       "DialogueType": null,
       "EventID": 10012,
@@ -1947,10 +1947,10 @@
     {
       "ID": 1001202,
       "conciseEventMessage": 2183,
-      "EventConditionMessage": null,
+      "EventConditionMessage": 2184,
       "NPCID": null,
       "LanID": [
-        2185
+        2186
       ],
       "DialogueType": null,
       "EventID": 10012,
@@ -1963,10 +1963,10 @@
     {
       "ID": 1001203,
       "conciseEventMessage": 2183,
-      "EventConditionMessage": null,
+      "EventConditionMessage": 2184,
       "NPCID": null,
       "LanID": [
-        2186
+        2187
       ],
       "DialogueType": null,
       "EventID": 10012,
@@ -1975,17 +1975,17 @@
         1001204
       ],
       "optionPara2": [
-        2187
+        2188
       ],
       "ResultType": null
     },
     {
       "ID": 1001204,
       "conciseEventMessage": 2183,
-      "EventConditionMessage": null,
+      "EventConditionMessage": 2184,
       "NPCID": 105,
       "LanID": [
-        2188
+        2189
       ],
       "DialogueType": null,
       "EventID": 10012,
@@ -1998,10 +1998,10 @@
     {
       "ID": 1001205,
       "conciseEventMessage": 2183,
-      "EventConditionMessage": null,
+      "EventConditionMessage": 2184,
       "NPCID": 105,
       "LanID": [
-        2189
+        2190
       ],
       "DialogueType": null,
       "EventID": 10012,
@@ -2010,18 +2010,18 @@
         1001206
       ],
       "optionPara2": [
-        2190,
-        2191
+        2191,
+        2192
       ],
       "ResultType": null
     },
     {
       "ID": 1001206,
       "conciseEventMessage": 2183,
-      "EventConditionMessage": null,
+      "EventConditionMessage": 2184,
       "NPCID": 105,
       "LanID": [
-        2192
+        2193
       ],
       "DialogueType": null,
       "EventID": 10012,
@@ -2030,17 +2030,17 @@
         1001207
       ],
       "optionPara2": [
-        2193
+        2194
       ],
       "ResultType": null
     },
     {
       "ID": 1001207,
       "conciseEventMessage": 2183,
-      "EventConditionMessage": null,
+      "EventConditionMessage": 2184,
       "NPCID": 105,
       "LanID": [
-        2194
+        2195
       ],
       "DialogueType": null,
       "EventID": 10012,
@@ -2049,17 +2049,17 @@
         1001208
       ],
       "optionPara2": [
-        2195
+        2196
       ],
       "ResultType": null
     },
     {
       "ID": 1001208,
       "conciseEventMessage": 2183,
-      "EventConditionMessage": null,
+      "EventConditionMessage": 2184,
       "NPCID": 105,
       "LanID": [
-        2196
+        2197
       ],
       "DialogueType": null,
       "EventID": 10012,
@@ -2068,17 +2068,17 @@
         1001209
       ],
       "optionPara2": [
-        2197
+        2198
       ],
       "ResultType": null
     },
     {
       "ID": 1001209,
       "conciseEventMessage": 2183,
-      "EventConditionMessage": null,
+      "EventConditionMessage": 2184,
       "NPCID": 105,
       "LanID": [
-        2198
+        2199
       ],
       "DialogueType": null,
       "EventID": 10012,
@@ -2091,10 +2091,10 @@
     {
       "ID": 1001210,
       "conciseEventMessage": 2183,
-      "EventConditionMessage": null,
+      "EventConditionMessage": 2184,
       "NPCID": 105,
       "LanID": [
-        2199
+        2200
       ],
       "DialogueType": null,
       "EventID": 10012,
@@ -2103,26 +2103,342 @@
         1001211
       ],
       "optionPara2": [
-        2200
+        2201
       ],
       "ResultType": null
     },
     {
       "ID": 1001211,
       "conciseEventMessage": 2183,
-      "EventConditionMessage": null,
+      "EventConditionMessage": 2184,
       "NPCID": 105,
       "LanID": [
-        2201
+        2202
       ],
       "DialogueType": null,
       "EventID": 10012,
       "optionType": 1,
+      "optionPara1": [
+        1001212
+      ],
+      "optionPara2": [
+        2203
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001212,
+      "conciseEventMessage": 2183,
+      "EventConditionMessage": 2184,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 10012,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10013
+      ]
+    },
+    {
+      "ID": 1001301,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": null,
+      "LanID": [
+        2206
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001302
+      ]
+    },
+    {
+      "ID": 1001302,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": null,
+      "LanID": [
+        2207
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001303
+      ]
+    },
+    {
+      "ID": 1001303,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": null,
+      "LanID": [
+        2208
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": 1,
+      "optionPara1": [
+        1001304
+      ],
+      "optionPara2": [
+        2209
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001304,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": 106,
+      "LanID": [
+        2210
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001305
+      ]
+    },
+    {
+      "ID": 1001305,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": 100,
+      "LanID": [
+        2211
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001306
+      ]
+    },
+    {
+      "ID": 1001306,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": 106,
+      "LanID": [
+        2212
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001307
+      ]
+    },
+    {
+      "ID": 1001307,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": 106,
+      "LanID": [
+        2213
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": 1,
+      "optionPara1": [
+        1001308
+      ],
+      "optionPara2": [
+        2214
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001308,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": 106,
+      "LanID": [
+        2215
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001309
+      ]
+    },
+    {
+      "ID": 1001309,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": 106,
+      "LanID": [
+        2216
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001310
+      ]
+    },
+    {
+      "ID": 1001310,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": 106,
+      "LanID": [
+        2217
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001311
+      ]
+    },
+    {
+      "ID": 1001311,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": 106,
+      "LanID": [
+        2218
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001312
+      ]
+    },
+    {
+      "ID": 1001312,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": 106,
+      "LanID": [
+        2219
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": 1,
+      "optionPara1": [
+        1001313
+      ],
+      "optionPara2": [
+        2220
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001313,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": 106,
+      "LanID": [
+        2221
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": 1,
+      "optionPara1": [
+        1001314
+      ],
+      "optionPara2": [
+        2222
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001314,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": 106,
+      "LanID": [
+        2223
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001315
+      ]
+    },
+    {
+      "ID": 1001315,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": 106,
+      "LanID": [
+        2224
+      ],
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": 1,
+      "optionPara1": [
+        1001316
+      ],
+      "optionPara2": [
+        2225
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1001316,
+      "conciseEventMessage": 2204,
+      "EventConditionMessage": 2205,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 10013,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10014
+      ]
+    },
+    {
+      "ID": 1001401,
+      "conciseEventMessage": 2226,
+      "EventConditionMessage": null,
+      "NPCID": 106,
+      "LanID": [
+        2227
+      ],
+      "DialogueType": null,
+      "EventID": 10014,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1001402
+      ]
+    },
+    {
+      "ID": 1001402,
+      "conciseEventMessage": 2226,
+      "EventConditionMessage": null,
+      "NPCID": 106,
+      "LanID": [
+        2228
+      ],
+      "DialogueType": null,
+      "EventID": 10014,
+      "optionType": 1,
       "optionPara1": [
         0
       ],
       "optionPara2": [
-        2202
+        2229
       ],
       "ResultType": null
     }

Assets/Res/Config/EventNPC.json

@@ -101,6 +101,12 @@
       "name": null,
       "ID_1": null,
       "DaoyouID": null
+    },
+    {
+      "ID": 106,
+      "name": null,
+      "ID_1": null,
+      "DaoyouID": null
     }
   ]
 }

Assets/Res/Config/LanguageChineseConfig.json

@@ -8310,23 +8310,23 @@
     },
     {
       "ID": 2078,
-      "txt": "拥有金币{0}/{1}"
+      "txt": "- 拥有金币{0}/{1}"
     },
     {
       "ID": 2079,
-      "txt": "达到境界：筑基-中期{0}/{1}"
+      "txt": "- 达到境界：筑基-中期{0}/{1}"
     },
     {
       "ID": 2080,
-      "txt": "击杀魔休{0}/{1}"
+      "txt": "- 击杀魔休{0}/{1}"
     },
     {
       "ID": 2081,
-      "txt": "获得钻石{0}/{1}"
+      "txt": "- 获得钻石{0}/{1}"
     },
     {
       "ID": 2082,
-      "txt": "使用神识{0}/{1}"
+      "txt": "- 使用神识{0}/{1}"
     },
     {
       "ID": 2083,
@@ -8374,7 +8374,7 @@
     },
     {
       "ID": 2094,
-      "txt": "继续飞行一段时间继续飞行一段时间{0}/{1}"
+      "txt": "继续飞行一段时间- 继续飞行一段时间{0}/{1}"
     },
     {
       "ID": 2095,
@@ -8734,187 +8734,187 @@
     },
     {
       "ID": 2184,
-      "txt": "你踏入帝尧治下的仙域——一片祥和之地，灵气充沛，民众安居，仿佛世外桃源。"
+      "txt": "倾听尧帝的烦恼"
     },
     {
       "ID": 2185,
-      "txt": "然而，这位千年帝君，却眉宇间有难掩的忧色。"
+      "txt": "你踏入帝尧治下的仙域——一片祥和之地，灵气充沛，民众安居，仿佛世外桃源。"
     },
     {
       "ID": 2186,
-      "txt": "（你根据逍遥铃的指引，找到了尧）"
+      "txt": "然而，这位千年帝君，却眉宇间有难掩的忧色。"
     },
     {
       "ID": 2187,
-      "txt": "拜见帝尧，晚辈受冲虚真人的指引，游历到此处。"
+      "txt": "（你根据逍遥铃的指引，找到了尧）"
     },
     {
       "ID": 2188,
-      "txt": "（缓缓回头，脸上带着淡淡忧虑）冲虚真人吗？我也许久没见了.."
+      "txt": "拜见帝尧，晚辈受冲虚真人的指引，游历到此处。"
     },
     {
       "ID": 2189,
-      "txt": "(尧帝邀你来到一高处)\n小友，你看此处景致如何？"
+      "txt": "（缓缓回头，脸上带着淡淡忧虑）冲虚真人吗？我也许久没见了.."
     },
     {
       "ID": 2190,
-      "txt": "万象更新，灵气环绕，是修行的福地。"
+      "txt": "(尧帝邀你来到一高处)\n小友，你看此处景致如何？"
     },
     {
       "ID": 2191,
-      "txt": "国泰民安，仙人治理，世间罕见。"
+      "txt": "万象更新，灵气环绕，是修行的福地。"
     },
     {
       "ID": 2192,
-      "txt": "（叹息）是啊，人人自在，唯我不自在。这些年来，我境界难以寸进，已有百年。"
+      "txt": "国泰民安，仙人治理，世间罕见。"
     },
     {
       "ID": 2193,
-      "txt": "帝尧何出此言？"
+      "txt": "（叹息）是啊，人人自在，唯我不自在。这些年来，我境界难以寸进，已有百年。"
     },
     {
       "ID": 2194,
-      "txt": "你等散修，自由自在，来去如风，可曾体会过身负重任的滋味？"
+      "txt": "帝尧何出此言？"
     },
     {
       "ID": 2195,
-      "txt": "也有重担，却未必如帝尧这样复杂。"
+      "txt": "你等散修，自由自在，来去如风，可曾体会过身负重任的滋味？"
     },
     {
       "ID": 2196,
-      "txt": "（微微一笑，摇头）天下如画卷，画卷再美，日夜背负，也终是负担。"
+      "txt": "也有重担，却未必如帝尧这样复杂。"
     },
     {
       "ID": 2197,
-      "txt": "......"
+      "txt": "（微微一笑，摇头）天下如画卷，画卷再美，日夜背负，也终是负担。"
     },
     {
       "ID": 2198,
-      "txt": "（凝望远方云海）深山之中有位贤士，名为许由，素有盛名，我曾多次请他出山，但未成如愿。"
+      "txt": "......"
     },
     {
       "ID": 2199,
-      "txt": "我甚至提出让天下于他，他也不为所动。"
+      "txt": "（凝望远方云海）深山之中有位贤士，名为许由，素有盛名，我曾多次请他出山，但未成如愿。"
     },
     {
       "ID": 2200,
-      "txt": "世间竟然有此奇人？"
+      "txt": "我甚至提出让天下于他，他也不为所动。"
     },
     {
       "ID": 2201,
-      "txt": "我甚至提出让天下于他，他也不为所动。"
+      "txt": "世间竟然有此奇人？"
     },
     {
       "ID": 2202,
-      "txt": "世间竟然有此奇人？"
+      "txt": "（凝望远方云海）若小友有空，帮我再请许由出山，我定当感谢。"
     },
     {
       "ID": 2203,
-      "txt": ""
+      "txt": "好的，既然来了，我就走一趟。"
     },
     {
       "ID": 2204,
-      "txt": ""
+      "txt": "访贤许由"
     },
     {
       "ID": 2205,
-      "txt": ""
+      "txt": "听一听这位尧帝口中的贤士有何说法"
     },
     {
       "ID": 2206,
-      "txt": ""
+      "txt": "你循帝尧所言，御剑前往幽山秘境。此处灵气绵长，古木参天，溪水潺潺。"
     },
     {
       "ID": 2207,
-      "txt": ""
+      "txt": "据说，许由栖身于此，绝迹尘世，已有数百年。"
     },
     {
       "ID": 2208,
-      "txt": ""
+      "txt": "山风徐徐，水声如琴，你踏过青石小径，看见一位白衣道人正倚石观水。"
     },
     {
       "ID": 2209,
-      "txt": ""
+      "txt": "前辈可是许由？"
     },
     {
       "ID": 2210,
-      "txt": ""
+      "txt": "正是，小友何事？"
     },
     {
       "ID": 2211,
-      "txt": ""
+      "txt": "帝尧欲专心修行，求道问玄，又怕耽误世事，特托我前来相请，欲让天下于你。"
     },
     {
       "ID": 2212,
-      "txt": ""
+      "txt": "（静默片刻）昔日帝尧就提过此事，我已辞之。"
     },
     {
       "ID": 2213,
-      "txt": ""
+      "txt": "今日又来，想是道心不定，执念未除。"
     },
     {
       "ID": 2214,
-      "txt": ""
+      "txt": "请前辈出山。"
     },
     {
       "ID": 2215,
-      "txt": ""
+      "txt": "哼，让我去？"
     },
     {
       "ID": 2216,
-      "txt": ""
+      "txt": "那我问你，日月升天，照耀四方。若这时有人手举火把照路，岂不徒劳？"
     },
     {
       "ID": 2217,
-      "txt": ""
+      "txt": "那我再问你，斜风细雨，滋养万物。若这时有人用水桶来灌溉，岂不可笑？"
     },
     {
       "ID": 2218,
-      "txt": ""
+      "txt": "天下在尧的带领下，已经治理得很好了，又何必要我，我是要去混个功成名就吗？"
     },
     {
       "ID": 2219,
-      "txt": ""
+      "txt": "回答我？"
     },
     {
       "ID": 2220,
-      "txt": ""
+      "txt": "就算只得功成名就也不错。"
     },
     {
       "ID": 2221,
-      "txt": ""
+      "txt": "小友，名就像宾客一样，难道我们的一生是为了宾客吗？"
     },
     {
       "ID": 2222,
-      "txt": ""
+      "txt": "（愣住）......"
     },
     {
       "ID": 2223,
-      "txt": ""
+      "txt": "他若真想修道，便该知“道不碍政，心自碍道”。"
     },
     {
       "ID": 2224,
-      "txt": ""
+      "txt": "若心不净，纵避千山万水，又有何用。"
     },
     {
       "ID": 2225,
-      "txt": ""
+      "txt": "（愣住）......"
     },
     {
       "ID": 2226,
-      "txt": ""
+      "txt": "割草喝茶"
     },
     {
       "ID": 2227,
-      "txt": ""
+      "txt": "（转身望向屋后的山坡）你来得也巧，我正想在开辟一块新药田。"
     },
     {
       "ID": 2228,
-      "txt": ""
+      "txt": "后山有一块不错的地，离家有一点远平时我也懒得去打理，正好你来了帮我开辟出来吧。"
     },
     {
       "ID": 2229,
-      "txt": ""
+      "txt": "……前辈是让我干农活吗"
     },
     {
       "ID": 2230,