Merge branch 'master' of http://fort23.cn:3000/ck/XiuXianGame

Assets/Res/Config/EventConfig.json

@@ -628,7 +628,7 @@
         10
       ],
       "RelatedEvents": [
-        30001
+        30003
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
@@ -763,6 +763,9 @@
       "PrizeNums": [
         10
       ],
+      "RelatedEvents": [
+        30004
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "placeID": 2,
@@ -795,6 +798,9 @@
       "PrizeNums": [
         10
       ],
+      "RelatedEvents": [
+        30005
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "placeID": 2,
@@ -832,6 +838,9 @@
       "PrizeNums": [
         10
       ],
+      "RelatedEvents": [
+        30006
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "placeID": 2,
@@ -1023,6 +1032,9 @@
       "PrizeNums": [
         10
       ],
+      "RelatedEvents": [
+        30007
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "placeID": 3,
@@ -1090,6 +1102,9 @@
       "PrizeNums": [
         10
       ],
+      "RelatedEvents": [
+        30008
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "placeID": 3,
@@ -1134,9 +1149,6 @@
     },
     {
       "ID": 10026,
-      "EventLinksId": [
-        1002601
-      ],
       "EventTriggerType": 4,
       "EventTag": 1,
       "EventType": 1,
@@ -1466,9 +1478,9 @@
       "ID": 30001,
       "EventTriggerType": 99,
       "EventTag": 6,
-      "EventType": null,
-      "Score": null,
-      "EventQuality": null,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
       "RefreshProbability": 50,
       "RefreshCount": 5,
       "placeID": null,
@@ -1482,9 +1494,9 @@
       "ID": 30002,
       "EventTriggerType": 99,
       "EventTag": 6,
-      "EventType": null,
-      "Score": null,
-      "EventQuality": null,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
       "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": null,
@@ -1496,14 +1508,17 @@
     },
     {
       "ID": 30003,
+      "EventLinksId": [
+        3000301
+      ],
       "EventTriggerType": 99,
       "EventTag": 6,
-      "EventType": null,
-      "Score": null,
-      "EventQuality": null,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
       "RefreshProbability": 50,
       "RefreshCount": 1,
-      "placeID": null,
+      "placeID": 1,
       "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,
@@ -1512,14 +1527,17 @@
     },
     {
       "ID": 30004,
+      "EventLinksId": [
+        3000401
+      ],
       "EventTriggerType": 99,
       "EventTag": 6,
-      "EventType": null,
-      "Score": null,
-      "EventQuality": null,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
       "RefreshProbability": 50,
       "RefreshCount": 3,
-      "placeID": null,
+      "placeID": 2,
       "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,
@@ -1528,14 +1546,17 @@
     },
     {
       "ID": 30005,
+      "EventLinksId": [
+        3000501
+      ],
       "EventTriggerType": 99,
       "EventTag": 6,
-      "EventType": null,
-      "Score": null,
-      "EventQuality": null,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
       "RefreshProbability": 50,
       "RefreshCount": 1,
-      "placeID": null,
+      "placeID": 2,
       "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,
@@ -1544,14 +1565,17 @@
     },
     {
       "ID": 30006,
+      "EventLinksId": [
+        3000601
+      ],
       "EventTriggerType": 99,
       "EventTag": 6,
-      "EventType": null,
-      "Score": null,
-      "EventQuality": null,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
       "RefreshProbability": 50,
       "RefreshCount": 1,
-      "placeID": null,
+      "placeID": 2,
       "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,
@@ -1560,14 +1584,17 @@
     },
     {
       "ID": 30007,
+      "EventLinksId": [
+        3000701
+      ],
       "EventTriggerType": 99,
       "EventTag": 6,
-      "EventType": null,
-      "Score": null,
-      "EventQuality": null,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
       "RefreshProbability": 50,
       "RefreshCount": 1,
-      "placeID": null,
+      "placeID": 3,
       "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,
@@ -1576,14 +1603,17 @@
     },
     {
       "ID": 30008,
+      "EventLinksId": [
+        3000801
+      ],
       "EventTriggerType": 99,
       "EventTag": 6,
-      "EventType": null,
-      "Score": null,
-      "EventQuality": null,
-      "RefreshProbability": 50,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 15,
       "RefreshCount": 1,
-      "placeID": null,
+      "placeID": 3,
       "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,

Assets/Res/Config/EventLinkConfig.json

@@ -19,7 +19,20 @@
       "EventConditionMessage": null,
       "NPCID": null,
       "LanID": [
-        216
+        3011
+      ],
+      "DialogueType": null,
+      "EventID": null,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 102,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        3012
       ],
       "DialogueType": null,
       "EventID": null,
@@ -4219,14 +4232,112 @@
       ]
     },
     {
-      "ID": 1002601,
+      "ID": 3000301,
       "conciseEventMessage": 2357,
       "EventConditionMessage": null,
       "NPCID": null,
       "DialogueType": null,
-      "EventID": 10026,
+      "EventID": 30003,
+      "optionType": 2,
+      "optionPara1": [
+        1003
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        102,
+        101
+      ]
+    },
+    {
+      "ID": 3000401,
+      "conciseEventMessage": 2358,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 30004,
+      "optionType": 2,
+      "optionPara1": [
+        1004
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        102,
+        101
+      ]
+    },
+    {
+      "ID": 3000501,
+      "conciseEventMessage": 2359,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 30005,
       "optionType": 2,
-      "ResultType": 2
+      "optionPara1": [
+        1005
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        102,
+        101
+      ]
+    },
+    {
+      "ID": 3000601,
+      "conciseEventMessage": 2360,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 30006,
+      "optionType": 2,
+      "optionPara1": [
+        1006
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        102,
+        101
+      ]
+    },
+    {
+      "ID": 3000701,
+      "conciseEventMessage": 2361,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 30007,
+      "optionType": 2,
+      "optionPara1": [
+        1007
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        102,
+        101
+      ]
+    },
+    {
+      "ID": 3000801,
+      "conciseEventMessage": 2362,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 30008,
+      "optionType": 2,
+      "optionPara1": [
+        1008
+      ],
+      "PrizeIDs": [
+        20002
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        102,
+        101
+      ]
     }
   ]
 }

Assets/Res/Config/ItemConfig.json

@@ -3231,8 +3231,8 @@
     },
     {
       "ID": 20001,
-      "itemName": null,
-      "itemDesc": null,
+      "itemName": 3013,
+      "itemDesc": 3015,
       "icon": "icon_item_20001",
       "itemTag": 21,
       "quality": 3,
@@ -3253,6 +3253,31 @@
       "associateID": null,
       "sort": null,
       "itemDesc_1": null
+    },
+    {
+      "ID": 20002,
+      "itemName": 3014,
+      "itemDesc": 3016,
+      "icon": "icon_item_20002",
+      "itemTag": 21,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc_1": null
     }
   ]
 }

Assets/Res/Config/LanguageChineseConfig.json

@@ -9286,167 +9286,167 @@
     },
     {
       "ID": 2322,
-      "txt": ""
+      "txt": "这是我的好朋友庄子送我的，给的时候，还神神秘秘的，说种出来的东西很好玩。"
     },
     {
       "ID": 2323,
-      "txt": ""
+      "txt": "原来如此。\n我游历到这里，是想拜访山中神仙，请道友指路。"
     },
     {
       "ID": 2324,
-      "txt": ""
+      "txt": "又是来找神仙的？\n帮你也不是不行，但是你得先帮我，帮我种葫芦！"
     },
     {
       "ID": 2325,
-      "txt": ""
+      "txt": "我不擅长种植"
     },
     {
       "ID": 2326,
-      "txt": ""
+      "txt": "没事，我非常擅长，哈哈。\n道友只需要帮我找几种肥料即可。"
     },
     {
       "ID": 2327,
-      "txt": ""
+      "txt": "道友请讲…"
     },
     {
       "ID": 2328,
-      "txt": ""
+      "txt": "此葫芦种子，需要2种肥料：“天肥”和“地肥”。"
     },
     {
       "ID": 2329,
-      "txt": ""
+      "txt": "....未曾听闻…"
     },
     {
       "ID": 2330,
-      "txt": ""
+      "txt": "何为“天肥”"
     },
     {
       "ID": 2331,
-      "txt": ""
+      "txt": "天肥很简单，你往上看\n（惠子把手指向云端）"
     },
     {
       "ID": 2332,
-      "txt": ""
+      "txt": "此山附近有许多飞行的灵兽围绕，你去击败几只飞行的灵兽，就有机会拿到了。"
     },
     {
       "ID": 2333,
-      "txt": ""
+      "txt": "何为“地肥”"
     },
     {
       "ID": 2334,
-      "txt": ""
+      "txt": "这地肥就比较麻烦了，需要2000年以上的灵木树枝才能当“地肥”"
     },
     {
       "ID": 2335,
-      "txt": ""
+      "txt": "不过，这千年以上的树木，都会化形，不好找啊，不好找。"
     },
     {
       "ID": 2336,
-      "txt": ""
+      "txt": "好的道友，那我这就去寻。"
     },
     {
       "ID": 2337,
-      "txt": ""
+      "txt": "天肥地肥"
     },
     {
       "ID": 2338,
-      "txt": ""
+      "txt": "你来到飞行的灵兽周围，碰碰运气吧。"
     },
     {
       "ID": 2339,
-      "txt": ""
+      "txt": "天肥搜集到了，关于地肥，你突然想到之前碰到的樗木之灵"
     },
     {
       "ID": 2340,
-      "txt": ""
+      "txt": "前辈，我有一事相求。"
     },
     {
       "ID": 2341,
-      "txt": ""
+      "txt": "小友请说"
     },
     {
       "ID": 2342,
-      "txt": ""
+      "txt": "我在藐姑射山时，遇到有位道友让我帮他找“地肥”来种葫芦...\n不止前辈可否借我一点点树枝。"
     },
     {
       "ID": 2343,
-      "txt": ""
+      "txt": "好说好说，以后多来陪我聊聊天就好。"
     },
     {
       "ID": 2344,
-      "txt": ""
+      "txt": "多谢前辈！  （得到樗木的树枝）"
     },
     {
       "ID": 2345,
-      "txt": ""
+      "txt": "登山"
     },
     {
       "ID": 2346,
-      "txt": ""
+      "txt": "（眼睛一亮）好好好！\n这位道友果然好手段！竟真能找到“地肥”！"
     },
     {
       "ID": 2347,
-      "txt": ""
+      "txt": "（谁管你的葫芦....）\n请道友告知，哪里可以见到神仙，我有事相求。"
     },
     {
       "ID": 2348,
-      "txt": ""
+      "txt": "不瞒道友，我在这藐姑射山的山脚生活多年，并未见过神仙。\n来找神仙的倒是多…"
     },
     {
       "ID": 2349,
-      "txt": ""
+      "txt": "…"
     },
     {
       "ID": 2350,
-      "txt": ""
+      "txt": "不过道友也不要急，我确实听庄子提过，此山有神仙的事迹。"
     },
     {
       "ID": 2351,
-      "txt": ""
+      "txt": "我屋后设有一阵法，隐藏了上山的小路，我一会开启法阵，你从那边上山吧。"
     },
     {
       "ID": 2352,
-      "txt": ""
+      "txt": "我这就启程登山！"
     },
     {
       "ID": 2353,
-      "txt": ""
+      "txt": "道友竟然精通阵法？"
     },
     {
       "ID": 2354,
-      "txt": ""
+      "txt": "去吧，登上山顶，也许能找到你想要的。"
     },
     {
       "ID": 2355,
-      "txt": ""
+      "txt": "好说好说，我确实无心修炼，也对神仙没兴趣。"
     },
     {
       "ID": 2356,
-      "txt": ""
+      "txt": "闲来无事，种种花草，研究研究阵法。\n如果道友有兴趣，可以随时交流。"
     },
     {
       "ID": 2357,
-      "txt": ""
+      "txt": "击杀妖兽"
     },
     {
       "ID": 2358,
-      "txt": ""
+      "txt": "击败后山小妖"
     },
     {
       "ID": 2359,
-      "txt": ""
+      "txt": "击败夜袭的妖兽"
     },
     {
       "ID": 2360,
-      "txt": ""
+      "txt": "击败峰顶的妖王"
     },
     {
       "ID": 2361,
-      "txt": ""
+      "txt": "击败仙山的阵眼妖兽"
     },
     {
       "ID": 2362,
-      "txt": ""
+      "txt": "击杀灵兽获得天肥"
     },
     {
       "ID": 2363,
@@ -11406,7 +11406,7 @@
     },
     {
       "ID": 2852,
-      "txt": ""
+      "txt": "- 击杀灵兽获得天肥{0}/{1}"
     },
     {
       "ID": 2853,
@@ -12042,18 +12042,38 @@
     },
     {
       "ID": 3011,
-      "txt": "0"
+      "txt": "你败下阵来，感到头晕目眩，试图努力回忆起刚才发生的事情。(回到主界面重新触发剧情）"
     },
     {
       "ID": 3012,
-      "txt": "0"
+      "txt": "战斗胜利，你的任务进度增加了。"
     },
     {
       "ID": 3013,
-      "txt": "0"
+      "txt": "樗木之灵的树枝"
     },
     {
       "ID": 3014,
+      "txt": "飞天灵兽的翅膀"
+    },
+    {
+      "ID": 3015,
+      "txt": "用于主线任务天肥地肥中的地肥材料"
+    },
+    {
+      "ID": 3016,
+      "txt": "用于主线任务天肥地肥中的天肥材料"
+    },
+    {
+      "ID": 3017,
+      "txt": "0"
+    },
+    {
+      "ID": 3018,
+      "txt": "0"
+    },
+    {
+      "ID": 3019,
       "txt": "0"
     }
   ]

Assets/Res/Config/PlacesConfig.json

@@ -7,12 +7,19 @@
       "bigMapID": 1,
       "to3DPrefab": "a",
       "placeDesc": null,
-      "TotalScore": 60,
+      "TotalScore": 130,
       "MainTaskID": [
         10001,
         10002,
         10003,
-        10004
+        10004,
+        10005,
+        10006,
+        10007,
+        10008,
+        10009,
+        10010,
+        10011
       ],
       "ZhixianID": [
         3
@@ -32,7 +39,19 @@
       "bigMapID": 1,
       "to3DPrefab": "b",
       "placeDesc": null,
-      "TotalScore": 0,
+      "TotalScore": 100,
+      "MainTaskID": [
+        10012,
+        10013,
+        10014,
+        10015,
+        10016,
+        10017,
+        10018,
+        10019,
+        10020,
+        10021
+      ],
       "DivineSenseGeneralProbability": null
     },
     {
@@ -42,7 +61,13 @@
       "bigMapID": 1,
       "to3DPrefab": "c",
       "placeDesc": null,
-      "TotalScore": 0,
+      "TotalScore": 40,
+      "MainTaskID": [
+        10022,
+        10023,
+        10024,
+        10025
+      ],
       "DivineSenseGeneralProbability": null
     },
     {