diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index ad7d952d8..07ead7916 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -24719,7 +24719,9 @@ "id": 50000001, "rtype": 2, "ctype": 3, - "notify": [], + "notify": [ + "sociaty" + ], "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_869", @@ -24741,7 +24743,9 @@ "id": 50000002, "rtype": 2, "ctype": 3, - "notify": [], + "notify": [ + "sociaty" + ], "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_870", @@ -24763,7 +24767,9 @@ "id": 50000003, "rtype": 2, "ctype": 3, - "notify": [], + "notify": [ + "sociaty" + ], "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_871", @@ -24785,7 +24791,9 @@ "id": 50000004, "rtype": 2, "ctype": 3, - "notify": [], + "notify": [ + "sociaty" + ], "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_872", @@ -24807,7 +24815,9 @@ "id": 50000005, "rtype": 2, "ctype": 3, - "notify": [], + "notify": [ + "sociaty" + ], "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_873", @@ -24829,7 +24839,9 @@ "id": 50000006, "rtype": 2, "ctype": 3, - "notify": [], + "notify": [ + "sociaty" + ], "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_874", @@ -24851,7 +24863,9 @@ "id": 50000007, "rtype": 2, "ctype": 3, - "notify": [], + "notify": [ + "sociaty" + ], "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_875", @@ -24873,7 +24887,9 @@ "id": 50000008, "rtype": 2, "ctype": 3, - "notify": [], + "notify": [ + "sociaty" + ], "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_876", @@ -24895,7 +24911,9 @@ "id": 50000009, "rtype": 2, "ctype": 3, - "notify": [], + "notify": [ + "sociaty" + ], "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_877", @@ -24917,7 +24935,9 @@ "id": 50000010, "rtype": 2, "ctype": 3, - "notify": [], + "notify": [ + "sociaty" + ], "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_878", diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 4eb44a230..2417930ed 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -2045,7 +2045,7 @@ "Levelid": 0, "datas": [ "GameMain", - "功能入口-魔药", + "20380-菲奥娜", "901" ], "event": [ diff --git a/bin/json/game_shop.json b/bin/json/game_shop.json index 017afc1e8..d9b5e142c 100644 --- a/bin/json/game_shop.json +++ b/bin/json/game_shop.json @@ -22,8 +22,8 @@ "n": 1 } ], - "rtype": 2, - "rtime": 6, + "rtype": 1, + "rtime": 8, "rnum": 8, "rneed": [ { diff --git a/bin/json/game_stoneevent.json b/bin/json/game_stoneevent.json index 68e1f3817..9167e8fc3 100644 --- a/bin/json/game_stoneevent.json +++ b/bin/json/game_stoneevent.json @@ -150,7 +150,7 @@ "text": "商店" }, "EventType": 11, - "EventResource": "event_battle_51004", + "EventResource": "event_store", "Value1": 0, "Value2": 0, "Value3": 0, @@ -182,7 +182,7 @@ "text": "打开" }, "EventType": 17, - "EventResource": "event_rewardbox_1", + "EventResource": "event_rewardbox_2", "Value1": 200, "Value2": 3, "Value3": 0, @@ -374,7 +374,7 @@ "text": "剧情(首领战必出)" }, "EventType": 12, - "EventResource": "100001", + "EventResource": "event_story", "Value1": 0, "Value2": 0, "Value3": 0, @@ -390,7 +390,7 @@ "text": "剧情(常规)" }, "EventType": 12, - "EventResource": "100002", + "EventResource": "event_story", "Value1": 0, "Value2": 0, "Value3": 0, @@ -406,7 +406,7 @@ "text": "剧情(常规)" }, "EventType": 12, - "EventResource": "100003", + "EventResource": "event_story", "Value1": 0, "Value2": 0, "Value3": 0, @@ -422,7 +422,7 @@ "text": "剧情(常规)" }, "EventType": 12, - "EventResource": "100004", + "EventResource": "event_story", "Value1": 0, "Value2": 0, "Value3": 0, @@ -438,7 +438,7 @@ "text": "剧情(常规)" }, "EventType": 12, - "EventResource": "100005", + "EventResource": "event_story", "Value1": 0, "Value2": 0, "Value3": 0, @@ -454,7 +454,7 @@ "text": "剧情(常规)" }, "EventType": 12, - "EventResource": "100006", + "EventResource": "event_story", "Value1": 0, "Value2": 0, "Value3": 0, diff --git a/bin/json/game_stoneprivilege.json b/bin/json/game_stoneprivilege.json new file mode 100644 index 000000000..98eace06f --- /dev/null +++ b/bin/json/game_stoneprivilege.json @@ -0,0 +1,32 @@ +[ + { + "PrivilegeId": 1, + "Desc": { + "key": "stonehenge_privilege_Desc_1", + "text": "解锁“事件商店”中,复活事件" + }, + "Value1": 0, + "Value2": 0, + "Value3": 0 + }, + { + "PrivilegeId": 2, + "Desc": { + "key": "stonehenge_privilege_Desc_2", + "text": "解锁“事件商店”中,支援事件" + }, + "Value1": 0, + "Value2": 0, + "Value3": 0 + }, + { + "PrivilegeId": 3, + "Desc": { + "key": "stonehenge_privilege_Desc_3", + "text": "解锁“事件商店”中,更换符文事件" + }, + "Value1": 0, + "Value2": 0, + "Value3": 0 + } +] \ No newline at end of file diff --git a/bin/json/game_stonestore.json b/bin/json/game_stonestore.json index e6ec1a297..35e4c2b42 100644 --- a/bin/json/game_stonestore.json +++ b/bin/json/game_stonestore.json @@ -1,52 +1,32 @@ [ { "Id": 1, - "EventId": 0, + "EventId": 20000000, "EventDesc": { - "key": "", - "text": "" + "key": "stonehenge_eventstore_EventDesc_1", + "text": "支援" }, - "LimitTime": 0, + "LimitTime": 1, "PrivilegeId": 0 }, { "Id": 2, - "EventId": 0, + "EventId": 21000000, "EventDesc": { - "key": "", - "text": "" + "key": "stonehenge_eventstore_EventDesc_2", + "text": "选择一名英雄,可进行复活并将其血量恢复至100%" }, - "LimitTime": 0, - "PrivilegeId": 0 + "LimitTime": 1, + "PrivilegeId": 1 }, { "Id": 3, - "EventId": 0, + "EventId": 18000001, "EventDesc": { - "key": "", - "text": "" + "key": "stonehenge_eventstore_EventDesc_3", + "text": "回血" }, - "LimitTime": 0, - "PrivilegeId": 0 - }, - { - "Id": 4, - "EventId": 0, - "EventDesc": { - "key": "", - "text": "" - }, - "LimitTime": 0, - "PrivilegeId": 0 - }, - { - "Id": 5, - "EventId": 0, - "EventDesc": { - "key": "", - "text": "" - }, - "LimitTime": 0, - "PrivilegeId": 0 + "LimitTime": 2, + "PrivilegeId": 2 } ] \ No newline at end of file diff --git a/bin/json/game_stonestory.json b/bin/json/game_stonestory.json index 0cfb1d07b..44abe70ae 100644 --- a/bin/json/game_stonestory.json +++ b/bin/json/game_stonestory.json @@ -22,7 +22,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_1", + "key": "", "text": "" } }, @@ -49,7 +49,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_2", + "key": "", "text": "" } }, @@ -76,7 +76,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_3", + "key": "", "text": "" } }, @@ -103,7 +103,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_4", + "key": "", "text": "" } }, @@ -130,7 +130,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_5", + "key": "", "text": "" } }, @@ -157,7 +157,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_6", + "key": "", "text": "" } }, @@ -184,7 +184,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_7", + "key": "", "text": "" } }, @@ -211,7 +211,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_8", + "key": "", "text": "" } }, @@ -224,7 +224,7 @@ "text": "“来吧,告诉我,我们该从哪儿下手。”" }, "OptionEventIdGroup1": [ - "10" + "25100001,50,10" ], "EndEventId1": 0, "OptionDesc1": { @@ -232,7 +232,7 @@ "text": "拎起皮带猴抖一抖。(从随机三枚红色符文中选择一枚)" }, "OptionEventIdGroup2": [ - "13" + "25100001,50,13" ], "EndEventId2": 0, "OptionDesc2": { @@ -240,12 +240,12 @@ "text": "放珊迪!(战斗开始时,首领的体力下降20%)" }, "OptionEventIdGroup3": [ - "15" + "25100001,50,15" ], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_9", - "text": "不急,先磨磨枪。(随机强化2枚符文)" + "key": "", + "text": "" } }, { @@ -271,7 +271,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_10", + "key": "", "text": "" } }, @@ -298,7 +298,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_11", + "key": "", "text": "" } }, @@ -325,7 +325,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_12", + "key": "", "text": "" } }, @@ -352,7 +352,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_13", + "key": "", "text": "" } }, @@ -379,7 +379,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_14", + "key": "", "text": "" } }, @@ -406,7 +406,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_15", + "key": "", "text": "" } }, @@ -433,7 +433,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_16", + "key": "", "text": "" } }, @@ -460,7 +460,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_17", + "key": "", "text": "" } }, @@ -487,7 +487,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_18", + "key": "", "text": "" } }, @@ -514,7 +514,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_19", + "key": "", "text": "" } }, @@ -541,7 +541,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_20", + "key": "", "text": "" } }, @@ -568,7 +568,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_21", + "key": "", "text": "" } }, @@ -595,7 +595,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_22", + "key": "", "text": "" } }, @@ -622,7 +622,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_23", + "key": "", "text": "" } }, @@ -649,7 +649,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_24", + "key": "", "text": "" } }, @@ -676,7 +676,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_25", + "key": "", "text": "" } }, @@ -703,7 +703,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_26", + "key": "", "text": "" } }, @@ -716,7 +716,7 @@ "text": "“好吧,我犹豫了很久,还没下定决心。”菲尔按着太阳穴,“让我参考一下你的想法,你支持哪一只?”" }, "OptionEventIdGroup1": [ - "10" + "25100001,50,10" ], "EndEventId1": 0, "OptionDesc1": { @@ -724,7 +724,7 @@ "text": "支持挥舞小爪爪的那只。(随机获得1-2枚紫色品质攻击符文)" }, "OptionEventIdGroup2": [ - "12" + "25100001,50,12" ], "EndEventId2": 0, "OptionDesc2": { @@ -734,7 +734,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_27", + "key": "", "text": "" } }, @@ -761,7 +761,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_28", + "key": "", "text": "" } }, @@ -788,7 +788,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_29", + "key": "", "text": "" } }, @@ -815,7 +815,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_30", + "key": "", "text": "" } }, @@ -842,7 +842,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_31", + "key": "", "text": "" } }, @@ -869,7 +869,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_32", + "key": "", "text": "" } }, @@ -896,7 +896,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_33", + "key": "", "text": "" } }, @@ -923,7 +923,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_34", + "key": "", "text": "" } }, @@ -950,7 +950,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_35", + "key": "", "text": "" } }, @@ -977,7 +977,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_36", + "key": "", "text": "" } }, @@ -1004,7 +1004,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_37", + "key": "", "text": "" } }, @@ -1031,7 +1031,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_38", + "key": "", "text": "" } }, @@ -1044,7 +1044,7 @@ "text": "" }, "OptionEventIdGroup1": [ - "9" + "25100001,50,9" ], "EndEventId1": 0, "OptionDesc1": { @@ -1052,7 +1052,7 @@ "text": "这很简单。(随机获得1-2枚紫色品质辅助符文)" }, "OptionEventIdGroup2": [ - "11" + "25100001,50,11" ], "EndEventId2": 0, "OptionDesc2": { @@ -1062,7 +1062,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_39", + "key": "", "text": "" } }, @@ -1089,7 +1089,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_40", + "key": "", "text": "" } }, @@ -1116,7 +1116,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_41", + "key": "", "text": "" } }, @@ -1143,7 +1143,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_42", + "key": "", "text": "" } }, @@ -1170,7 +1170,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_43", + "key": "", "text": "" } }, @@ -1197,7 +1197,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_44", + "key": "", "text": "" } }, @@ -1224,7 +1224,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_45", + "key": "", "text": "" } }, @@ -1251,7 +1251,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_46", + "key": "", "text": "" } }, @@ -1278,7 +1278,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_47", + "key": "", "text": "" } }, @@ -1305,7 +1305,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_48", + "key": "", "text": "" } }, @@ -1332,7 +1332,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_49", + "key": "", "text": "" } }, @@ -1359,7 +1359,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_50", + "key": "", "text": "" } }, @@ -1372,7 +1372,7 @@ "text": "" }, "OptionEventIdGroup1": [ - "9" + "25100001,50,9" ], "EndEventId1": 0, "OptionDesc1": { @@ -1380,7 +1380,7 @@ "text": "这很简单。(随机获得1-2枚紫色品质辅助符文)" }, "OptionEventIdGroup2": [ - "11" + "25100001,50,11" ], "EndEventId2": 0, "OptionDesc2": { @@ -1390,7 +1390,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_51", + "key": "", "text": "" } }, @@ -1417,7 +1417,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_52", + "key": "", "text": "" } }, @@ -1446,7 +1446,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_53", + "key": "", "text": "" } }, @@ -1473,7 +1473,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_54", + "key": "", "text": "" } }, @@ -1502,7 +1502,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_55", + "key": "", "text": "" } }, @@ -1529,7 +1529,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_56", + "key": "", "text": "" } }, @@ -1556,7 +1556,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_57", + "key": "", "text": "" } }, @@ -1583,7 +1583,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_58", + "key": "", "text": "" } }, @@ -1610,7 +1610,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_59", + "key": "", "text": "" } }, @@ -1637,7 +1637,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_60", + "key": "", "text": "" } }, @@ -1664,7 +1664,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_61", + "key": "", "text": "" } }, @@ -1691,7 +1691,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_62", + "key": "", "text": "" } }, @@ -1718,7 +1718,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_63", + "key": "", "text": "" } }, @@ -1731,7 +1731,7 @@ "text": "" }, "OptionEventIdGroup1": [ - "10" + "25100001,50,10" ], "EndEventId1": 0, "OptionDesc1": { @@ -1739,7 +1739,7 @@ "text": "用长木棍。(随机强化2个已经获得的攻击符文)" }, "OptionEventIdGroup2": [ - "13" + "25100001,50,13" ], "EndEventId2": 0, "OptionDesc2": { @@ -1749,7 +1749,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_64", + "key": "", "text": "" } }, @@ -1776,7 +1776,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_65", + "key": "", "text": "" } }, @@ -1803,7 +1803,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_66", + "key": "", "text": "" } }, @@ -1830,7 +1830,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_67", + "key": "", "text": "" } }, @@ -1857,7 +1857,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_68", + "key": "", "text": "" } }, @@ -1884,7 +1884,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_69", + "key": "", "text": "" } }, @@ -1911,7 +1911,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_70", + "key": "", "text": "" } }, @@ -1938,7 +1938,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_71", + "key": "", "text": "" } }, @@ -1965,7 +1965,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_72", + "key": "", "text": "" } }, @@ -1992,7 +1992,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_73", + "key": "", "text": "" } }, @@ -2019,7 +2019,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_74", + "key": "", "text": "" } }, @@ -2046,7 +2046,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_75", + "key": "", "text": "" } }, @@ -2073,7 +2073,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_76", + "key": "", "text": "" } }, @@ -2100,7 +2100,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_77", + "key": "", "text": "" } }, @@ -2127,7 +2127,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_78", + "key": "", "text": "" } }, @@ -2154,7 +2154,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_79", + "key": "", "text": "" } }, @@ -2181,7 +2181,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_80", + "key": "", "text": "" } }, @@ -2208,7 +2208,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_81", + "key": "", "text": "" } }, @@ -2235,7 +2235,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_82", + "key": "", "text": "" } }, @@ -2262,7 +2262,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_83", + "key": "", "text": "" } }, @@ -2289,7 +2289,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_84", + "key": "", "text": "" } }, @@ -2316,7 +2316,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_85", + "key": "", "text": "" } }, @@ -2343,7 +2343,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_86", + "key": "", "text": "" } }, @@ -2356,7 +2356,7 @@ "text": "" }, "OptionEventIdGroup1": [ - "12" + "25100001,50,12" ], "EndEventId1": 0, "OptionDesc1": { @@ -2364,7 +2364,7 @@ "text": "爬上去!(随机强化2个已经获得的防御符文)" }, "OptionEventIdGroup2": [ - "17" + "25100001,50,17" ], "EndEventId2": 0, "OptionDesc2": { @@ -2374,7 +2374,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_87", + "key": "", "text": "" } }, @@ -2401,7 +2401,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_88", + "key": "", "text": "" } }, @@ -2428,7 +2428,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_89", + "key": "", "text": "" } }, @@ -2455,7 +2455,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_90", + "key": "", "text": "" } }, @@ -2482,7 +2482,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_91", + "key": "", "text": "" } }, @@ -2509,7 +2509,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_92", + "key": "", "text": "" } }, @@ -2536,7 +2536,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_93", + "key": "", "text": "" } }, @@ -2563,7 +2563,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_94", + "key": "", "text": "" } }, @@ -2590,7 +2590,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_95", + "key": "", "text": "" } }, @@ -2617,7 +2617,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_96", + "key": "", "text": "" } }, @@ -2644,7 +2644,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_97", + "key": "", "text": "" } }, @@ -2671,7 +2671,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_98", + "key": "", "text": "" } }, @@ -2698,7 +2698,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_99", + "key": "", "text": "" } }, @@ -2725,7 +2725,7 @@ "OptionEventIdGroup3": [], "EndEventId3": 0, "OptionDesc3": { - "key": "stonehenge_buffconfig_OptionDesc3_100", + "key": "", "text": "" } } diff --git a/bin/json/game_stonetalent.json b/bin/json/game_stonetalent.json index 0637a088a..46292f1ff 100644 --- a/bin/json/game_stonetalent.json +++ b/bin/json/game_stonetalent.json @@ -1 +1,360 @@ -[] \ No newline at end of file +[ + { + "Id": 1, + "NodeType": 2, + "NodeIcon": "", + "listIndex": 1, + "Front": [ + 0 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 50 + } + ], + "PrivilegeId": 0, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_1", + "text": "全局生命提升{0},全局攻击提升{1}" + }, + "Attribute": [ + { + "a": "hp", + "n": 75 + }, + { + "a": "atk", + "n": 100 + } + ] + }, + { + "Id": 2, + "NodeType": 1, + "NodeIcon": "", + "listIndex": 1, + "Front": [ + 1 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 51 + } + ], + "PrivilegeId": 0, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_2", + "text": "全局生命提升{0}" + }, + "Attribute": [ + { + "a": "hp", + "n": 150 + } + ] + }, + { + "Id": 3, + "NodeType": 1, + "NodeIcon": "", + "listIndex": 1, + "Front": [ + 1 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 52 + } + ], + "PrivilegeId": 0, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_3", + "text": "全局生命提升{0}" + }, + "Attribute": [ + { + "a": "hp", + "n": 225 + } + ] + }, + { + "Id": 4, + "NodeType": 2, + "NodeIcon": "", + "listIndex": 1, + "Front": [ + 2, + 3 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 54 + } + ], + "PrivilegeId": 1, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_4", + "text": "全局攻击提升{0}" + }, + "Attribute": [ + { + "a": "atk", + "n": 20 + } + ] + }, + { + "Id": 5, + "NodeType": 2, + "NodeIcon": "", + "listIndex": 2, + "Front": [ + 4 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 54 + } + ], + "PrivilegeId": 2, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_5", + "text": "全局攻击提升{0}" + }, + "Attribute": [ + { + "a": "atk", + "n": 40 + } + ] + }, + { + "Id": 6, + "NodeType": 1, + "NodeIcon": "", + "listIndex": 2, + "Front": [ + 5 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 54 + } + ], + "PrivilegeId": 0, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_6", + "text": "全局攻击提升{0}" + }, + "Attribute": [ + { + "a": "atk", + "n": 60 + } + ] + }, + { + "Id": 7, + "NodeType": 1, + "NodeIcon": "", + "listIndex": 2, + "Front": [ + 5 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 54 + } + ], + "PrivilegeId": 0, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_7", + "text": "全局生命提升{0}" + }, + "Attribute": [ + { + "a": "hp", + "n": 200 + } + ] + }, + { + "Id": 8, + "NodeType": 2, + "NodeIcon": "", + "listIndex": 2, + "Front": [ + 6, + 7 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 54 + } + ], + "PrivilegeId": 3, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_8", + "text": "全局生命提升{0}" + }, + "Attribute": [ + { + "a": "hp", + "n": 600 + } + ] + }, + { + "Id": 9, + "NodeType": 1, + "NodeIcon": "", + "listIndex": 3, + "Front": [ + 8 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 54 + } + ], + "PrivilegeId": 0, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_9", + "text": "全局生命提升{0}" + }, + "Attribute": [ + { + "a": "hp", + "n": 300 + } + ] + }, + { + "Id": 10, + "NodeType": 1, + "NodeIcon": "", + "listIndex": 3, + "Front": [ + 8 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 54 + } + ], + "PrivilegeId": 0, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_10", + "text": "全局生命提升{0}" + }, + "Attribute": [ + { + "a": "hp", + "n": 300 + } + ] + }, + { + "Id": 11, + "NodeType": 1, + "NodeIcon": "", + "listIndex": 3, + "Front": [ + 9 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 54 + } + ], + "PrivilegeId": 0, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_11", + "text": "全局生命提升{0}" + }, + "Attribute": [ + { + "a": "hp", + "n": 300 + } + ] + }, + { + "Id": 12, + "NodeType": 1, + "NodeIcon": "", + "listIndex": 3, + "Front": [ + 10 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 54 + } + ], + "PrivilegeId": 0, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_12", + "text": "全局生命提升{0}" + }, + "Attribute": [ + { + "a": "hp", + "n": 300 + } + ] + }, + { + "Id": 13, + "NodeType": 2, + "NodeIcon": "", + "listIndex": 3, + "Front": [ + 11, + 12 + ], + "CostItem": [ + { + "a": "attr", + "t": "diamond", + "n": 54 + } + ], + "PrivilegeId": 0, + "AttributeDesc": { + "key": "stonehenge_talenttree_AttributeDesc_13", + "text": "全局生命提升{0}" + }, + "Attribute": [ + { + "a": "hp", + "n": 1100 + } + ] + } +] \ No newline at end of file diff --git a/bin/json/game_uigameminer.json b/bin/json/game_uigameminer.json index 4700fb06a..7564cf15f 100644 --- a/bin/json/game_uigameminer.json +++ b/bin/json/game_uigameminer.json @@ -8,8 +8,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 100 + "x": 1518, + "y": 600 }, "itemjpg": "item_10000001" }, @@ -22,8 +22,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 101 + "x": 1090, + "y": 638 }, "itemjpg": "item_10000001" }, @@ -36,8 +36,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 102 + "x": 1881, + "y": 537 }, "itemjpg": "item_10000001" }, @@ -50,8 +50,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 103 + "x": 1229, + "y": 499 }, "itemjpg": "item_10000001" }, @@ -64,8 +64,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 104 + "x": 1707, + "y": 463 }, "itemjpg": "item_10000001" }, @@ -78,8 +78,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 105 + "x": 1518, + "y": 600 }, "itemjpg": "item_10000001" }, @@ -92,8 +92,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 106 + "x": 1090, + "y": 638 }, "itemjpg": "item_10000001" }, @@ -106,8 +106,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 107 + "x": 1881, + "y": 537 }, "itemjpg": "item_10000001" }, @@ -120,8 +120,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 108 + "x": 1229, + "y": 499 }, "itemjpg": "item_10000001" }, @@ -134,8 +134,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 109 + "x": 1707, + "y": 463 }, "itemjpg": "item_10000001" }, @@ -148,8 +148,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 110 + "x": 1518, + "y": 600 }, "itemjpg": "item_10000001" }, @@ -162,8 +162,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 111 + "x": 1090, + "y": 638 }, "itemjpg": "item_10000001" }, @@ -176,8 +176,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 112 + "x": 1881, + "y": 537 }, "itemjpg": "item_10000001" }, @@ -190,8 +190,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 113 + "x": 1229, + "y": 499 }, "itemjpg": "item_10000001" }, @@ -204,8 +204,8 @@ "n": 1 }, "itempos": { - "x": 100, - "y": 114 + "x": 1707, + "y": 463 }, "itemjpg": "item_10000001" } diff --git a/modules/stonehenge/api_activatetalent.go b/modules/stonehenge/api_activatetalent.go index f428daf21..8f8c6e6d9 100644 --- a/modules/stonehenge/api_activatetalent.go +++ b/modules/stonehenge/api_activatetalent.go @@ -3,6 +3,7 @@ package stonehenge import ( "go_dreamfactory/comm" "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" ) //参数校验 @@ -13,13 +14,68 @@ func (this *apiComp) ActivateTalentCheck(session comm.IUserSession, req *pb.Ston func (this *apiComp) ActivateTalent(session comm.IUserSession, req *pb.StonehengeActivateTalentReq) (errdata *pb.ErrorData) { var ( - stone *pb.DBStonehenge - err error + info *pb.DBStonehenge + conf *cfg.GameStoneTalentData + ok bool + err error ) if errdata = this.ActivateTalentCheck(session, req); errdata != nil { return } - if stone, err = this.module.modelStonehenge.GetStonehengeData(session.GetUserId()); err != nil { + if info, err = this.module.modelStonehenge.GetStonehengeData(session.GetUserId()); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.String(), + Message: err.Error(), + } + return + } + if conf, err = this.module.configure.getGameStoneTalentData(req.Node); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.String(), + Message: err.Error(), + } + return + } + + for _, v := range conf.Front { + if _, ok := info.Talent[v]; !ok { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.String(), + Message: "Front no unlock", + } + return + } + } + + if errdata = this.module.ConsumeRes(session, conf.CostItem, true); errdata != nil { + return + } + + info.Talent[req.Node] = true + for _, v := range conf.Attribute { + info.Talentproperty[v.A] += v.N + } + ok = false + if conf.PrivilegeId != 0 { + for _, v := range info.Privilege { + if int32(v) == conf.PrivilegeId { + ok = true + break + } + } + } + if !ok { + info.Privilege = append(info.Privilege, pb.StonehengePrivilege(conf.PrivilegeId)) + } + + if err = this.module.modelStonehenge.Change(session.GetUserId(), map[string]interface{}{ + "talent": info.Talent, + "talentproperty": info.Talentproperty, + "privilege": info.Privilege, + }); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, Title: pb.ErrorCode_DBError.String(), @@ -30,9 +86,9 @@ func (this *apiComp) ActivateTalent(session comm.IUserSession, req *pb.Stoneheng session.SendMsg(string(this.module.GetType()), "activatetalent", &pb.StonehengeActivateTalentResp{ Node: req.Node, - Talent: stone.Talent, - Talentproperty: stone.Talentproperty, - Privilege: stone.Privilege, + Talent: info.Talent, + Talentproperty: info.Talentproperty, + Privilege: info.Privilege, }) return } diff --git a/modules/stonehenge/configure.go b/modules/stonehenge/configure.go index dd852a58a..50f6c3904 100644 --- a/modules/stonehenge/configure.go +++ b/modules/stonehenge/configure.go @@ -21,6 +21,7 @@ const ( game_eventconf = "game_stoneevent.json" game_bossconf = "game_stoneboss.json" game_battleconf = "game_stonebattle.json" + game_stonetalent = "game_stonetalent.json" ) ///背包配置管理组件 @@ -84,7 +85,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp err = this.LoadConfigure(game_roomconf, cfg.NewGameStoneRoom) err = this.LoadConfigure(game_bossconf, cfg.NewGameStoneBoss) err = this.LoadConfigure(game_battleconf, cfg.NewGameStoneBattle) - + err = this.LoadConfigure(game_stonetalent, cfg.NewGameStoneTalent) configure.RegisterConfigure(game_stageconf, cfg.NewGameStoneStage, this.LoadGameStoneStage) configure.RegisterConfigure(game_buffconf, cfg.NewGameStoneBuff, this.LoadGameStoneBuff) @@ -671,3 +672,21 @@ func (this *configureComp) GetBattleConfById(id int32) (data *cfg.GameStoneBattl err = comm.NewNotFoundConfErr(moduleName, game_battleconf, id) return } + +// 读取任务配置表 +func (this *configureComp) getGameStoneTalentData(id int32) (conf *cfg.GameStoneTalentData, err error) { + var ( + v interface{} + ok bool + ) + if v, err = this.GetConfigure(game_stonetalent); err != nil { + return + } else { + if conf, ok = v.(*cfg.GameStoneTalent).GetDataMap()[id]; !ok { + err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_stonetalent, id) + this.module.Errorln(err) + return + } + } + return +}