diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 8aa4fbed7..b6adecad8 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -11102,7 +11102,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_483", - "text": "武馆派遣{0}次" + "text": "武馆功夫陪练{0}次" }, "type": 186, "valid": 0, @@ -11124,7 +11124,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_484", - "text": "武馆派遣{0}次" + "text": "武馆功夫陪练{0}次" }, "type": 186, "valid": 0, @@ -11196,7 +11196,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_487", - "text": "武馆派遣{0}次" + "text": "武馆功夫陪练{0}次" }, "type": 186, "valid": 0, @@ -16830,7 +16830,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_720", - "text": "武馆派遣{0}次" + "text": "武馆功夫陪练{0}次" }, "type": 186, "valid": 0, @@ -16900,7 +16900,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_723", - "text": "击退恐惧灵小怪" + "text": "击退豺狼小怪" }, "type": 70, "valid": 0, @@ -17160,14 +17160,14 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_734", - "text": "给阿宝穿5件装备" + "text": "给骇客蛛穿5件装备" }, "type": 5, "valid": 0, "NPC": -102, "value": 5, "filter": [ - 25001 + 44004 ], "filter2": [ "英雄ID", @@ -17373,7 +17373,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_743", - "text": "S" + "text": "击退豺狼小怪" }, "type": 70, "valid": 0, @@ -17397,7 +17397,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_744", - "text": "和梦魇对决" + "text": "和漆黑对决" }, "type": 70, "valid": 0, @@ -18020,7 +18020,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_770", - "text": "战斗16" + "text": "击退豺狼人" }, "type": 70, "valid": 0, @@ -18044,7 +18044,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_771", - "text": "维京远征2难度1" + "text": "冰霜泰坦难度1" }, "type": 73, "valid": 0, @@ -18093,7 +18093,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_773", - "text": "强化装备" + "text": "6件装备+6" }, "type": 43, "valid": 0, @@ -18117,7 +18117,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_774", - "text": "主线【3-1】-【3-4】" + "text": "冒险3-4通关" }, "type": 61, "valid": 0, @@ -18141,7 +18141,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_775", - "text": "装备副本2难度2刷1次" + "text": "冰霜泰坦难度2" }, "type": 73, "valid": 0, @@ -18166,7 +18166,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_776", - "text": "主线【3-5】-【3-8】" + "text": "冒险3-8通关" }, "type": 61, "valid": 0, @@ -18262,7 +18262,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_780", - "text": "战斗17" + "text": "击退豺狼人" }, "type": 70, "valid": 0, @@ -18286,7 +18286,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_781", - "text": "战斗18" + "text": "击退豺狼人" }, "type": 70, "valid": 0, @@ -18310,7 +18310,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_782", - "text": "战斗19" + "text": "击退豺狼人" }, "type": 70, "valid": 0, @@ -18334,7 +18334,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_783", - "text": "装备副本3难度1(开支线，打狩猎)" + "text": "森林泰坦难度1" }, "type": 73, "valid": 0, @@ -18405,7 +18405,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_786", - "text": "战斗20" + "text": "击退豺狼人" }, "type": 70, "valid": 0, @@ -18429,7 +18429,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_787", - "text": "战斗21" + "text": "击退豺狼人" }, "type": 70, "valid": 0, @@ -18477,7 +18477,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_789", - "text": "主线【4-1】-【4-8】" + "text": "冒险4-8通关" }, "type": 61, "valid": 0, @@ -18501,7 +18501,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_790", - "text": "装备副本D 3难度4刷1次" + "text": "森林泰坦难度2" }, "type": 73, "valid": 0, @@ -18509,7 +18509,7 @@ "value": 1, "filter": [ 3, - 4 + 2 ], "filter2": [ "boss类型", @@ -18596,7 +18596,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_794", - "text": "关卡【5-1】-【5-8】" + "text": "冒险5-8通关" }, "type": 61, "valid": 0, @@ -18620,7 +18620,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_795", - "text": "战斗22" + "text": "击退豺狼人" }, "type": 70, "valid": 0, @@ -18644,7 +18644,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_796", - "text": "战斗23" + "text": "击退豺狼人" }, "type": 70, "valid": 0, @@ -18668,7 +18668,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_797", - "text": "穿一套+6的无极神功套装" + "text": "穿+6的无极神功套装" }, "type": 93, "valid": 0, @@ -18693,7 +18693,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_798", - "text": "加入公会" + "text": "加入任意公会" }, "type": 109, "valid": 0, @@ -18715,7 +18715,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_799", - "text": "装备副本D 3难度2刷1次" + "text": "森林泰坦难度3" }, "type": 73, "valid": 0, @@ -18723,7 +18723,7 @@ "value": 1, "filter": [ 3, - 2 + 3 ], "filter2": [ "boss类型", @@ -18740,7 +18740,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_800", - "text": "装备副本D 3难度5刷2次" + "text": "森林泰坦难度4" }, "type": 73, "valid": 0, @@ -18748,7 +18748,7 @@ "value": 1, "filter": [ 3, - 5 + 4 ], "filter2": [ "boss类型", @@ -18809,7 +18809,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_803", - "text": "关卡6-6" + "text": "冒险6-6通关" }, "type": 61, "valid": 0, @@ -18857,7 +18857,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_805", - "text": "竞技场3连胜" + "text": "竞技场3胜" }, "type": 131, "valid": 0, @@ -18879,7 +18879,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_806", - "text": "装备副本boss3难度6刷1次" + "text": "森林泰坦难度5" }, "type": 73, "valid": 0, @@ -18887,7 +18887,7 @@ "value": 1, "filter": [ 3, - 6 + 5 ], "filter2": [ "boss类型", @@ -18926,7 +18926,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_808", - "text": "关卡7-6" + "text": "冒险7-6通关" }, "type": 61, "valid": 0, @@ -18998,7 +18998,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_811", - "text": "关卡8-6" + "text": "冒险8-6通关" }, "type": 61, "valid": 0, @@ -19022,7 +19022,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_812", - "text": "装备副本boss3难度7刷1次" + "text": "森林泰坦难度6" }, "type": 73, "valid": 0, @@ -19030,7 +19030,7 @@ "value": 1, "filter": [ 3, - 7 + 6 ], "filter2": [ "boss类型", @@ -19071,7 +19071,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_814", - "text": "关卡9-6" + "text": "冒险9-6通关" }, "type": 61, "valid": 0, @@ -19117,7 +19117,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_816", - "text": "关卡10-6" + "text": "冒险10-6通关" }, "type": 61, "valid": 0, @@ -19141,7 +19141,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_817", - "text": "装备副本boss3难度8刷1次" + "text": "森林泰坦难度7" }, "type": 73, "valid": 0, @@ -19149,7 +19149,7 @@ "value": 1, "filter": [ 3, - 8 + 7 ], "filter2": [ "boss类型", @@ -19190,7 +19190,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_819", - "text": "关卡11-6" + "text": "冒险11-6通关" }, "type": 61, "valid": 0, @@ -19236,7 +19236,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_821", - "text": "关卡12-6" + "text": "冒险12-6通关" }, "type": 61, "valid": 0, @@ -19260,7 +19260,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_822", - "text": "主线困难1-3" + "text": "冒险关卡困难1-3" }, "type": 61, "valid": 0, @@ -19284,7 +19284,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_823", - "text": "主线困难1-6" + "text": "冒险关卡困难1-6" }, "type": 61, "valid": 0, @@ -19308,7 +19308,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_824", - "text": "主线困难2-3" + "text": "冒险关卡困难2-3" }, "type": 61, "valid": 0, @@ -19332,7 +19332,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_825", - "text": "主线困难2-6" + "text": "冒险关卡困难2-6" }, "type": 61, "valid": 0, @@ -19356,7 +19356,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_826", - "text": "主线困难3-3" + "text": "冒险关卡困难3-3" }, "type": 61, "valid": 0, @@ -19380,7 +19380,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_827", - "text": "主线困难3-6" + "text": "冒险关卡困难3-6" }, "type": 61, "valid": 0, @@ -19404,7 +19404,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_828", - "text": "主线困难4-3" + "text": "冒险关卡困难4-3" }, "type": 61, "valid": 0, @@ -19428,7 +19428,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_829", - "text": "主线困难4-6" + "text": "冒险关卡困难4-6" }, "type": 61, "valid": 0, @@ -19452,7 +19452,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_830", - "text": "主线困难5-3" + "text": "冒险关卡困难5-3" }, "type": 61, "valid": 0, @@ -19476,7 +19476,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_831", - "text": "主线困难5-6" + "text": "冒险关卡困难5-6" }, "type": 61, "valid": 0, @@ -19500,7 +19500,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_832", - "text": "主线困难6-3" + "text": "冒险关卡困难6-3" }, "type": 61, "valid": 0, @@ -19524,7 +19524,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_833", - "text": "主线困难6-6" + "text": "冒险关卡困难6-6" }, "type": 61, "valid": 0, @@ -19548,7 +19548,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_834", - "text": "主线困难7-3" + "text": "冒险关卡困难7-3" }, "type": 61, "valid": 0, @@ -19572,7 +19572,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_835", - "text": "主线困难7-6" + "text": "冒险关卡困难7-6" }, "type": 61, "valid": 0, @@ -19596,7 +19596,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_836", - "text": "主线困难8-3" + "text": "冒险关卡困难8-3" }, "type": 61, "valid": 0, @@ -19620,7 +19620,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_837", - "text": "主线困难8-6" + "text": "冒险关卡困难8-6" }, "type": 61, "valid": 0, @@ -19644,7 +19644,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_838", - "text": "主线困难9-3" + "text": "冒险关卡困难9-3" }, "type": 61, "valid": 0, @@ -19668,7 +19668,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_839", - "text": "主线困难9-6" + "text": "冒险关卡困难9-6" }, "type": 61, "valid": 0, @@ -19692,7 +19692,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_840", - "text": "主线困难10-3" + "text": "冒险关卡困难10-3" }, "type": 61, "valid": 0, @@ -19716,7 +19716,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_841", - "text": "主线困难10-6" + "text": "冒险关卡困难10-6" }, "type": 61, "valid": 0, @@ -19740,7 +19740,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_842", - "text": "主线困难11-3" + "text": "冒险关卡困难11-3" }, "type": 61, "valid": 0, @@ -19764,7 +19764,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_843", - "text": "主线困难11-6" + "text": "冒险关卡困难11-6" }, "type": 61, "valid": 0, @@ -19788,7 +19788,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_844", - "text": "主线困难12-3" + "text": "冒险关卡困难12-3" }, "type": 61, "valid": 0, @@ -19812,7 +19812,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_845", - "text": "主线困难12-6" + "text": "冒险关卡困难12-6" }, "type": 61, "valid": 0, @@ -19836,7 +19836,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_846", - "text": "本周竞技场挑战{1}次" + "text": "本周竞技场挑战{0}次" }, "type": 130, "valid": 10, @@ -19853,7 +19853,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_847", - "text": "本周竞技场挑战{1}次" + "text": "本周竞技场挑战{0}次" }, "type": 130, "valid": 30, @@ -19870,7 +19870,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_848", - "text": "本周竞技场挑战{1}次" + "text": "本周竞技场挑战{0}次" }, "type": 130, "valid": 50, @@ -19887,7 +19887,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_849", - "text": "本周竞技场胜利{1}次" + "text": "本周竞技场胜利{0}次" }, "type": 130, "valid": 10, @@ -19904,7 +19904,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_850", - "text": "本周竞技场胜利{1}次" + "text": "本周竞技场胜利{0}次" }, "type": 130, "valid": 20, @@ -19921,7 +19921,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_851", - "text": "本周竞技场胜利{1}次" + "text": "本周竞技场胜利{0}次" }, "type": 130, "valid": 30, @@ -19938,7 +19938,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_852", - "text": "本周累计经验副本消耗{1}体力" + "text": "本周累计经验副本消耗{0}体力" }, "type": 130, "valid": 300, @@ -19955,7 +19955,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_853", - "text": "本周累计经验副本消耗{1}体力" + "text": "本周累计经验副本消耗{0}体力" }, "type": 130, "valid": 600, @@ -19972,7 +19972,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_854", - "text": "本周累计经验副本消耗{1}体力" + "text": "本周累计经验副本消耗{0}体力" }, "type": 130, "valid": 1000, @@ -19989,7 +19989,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_855", - "text": "本周累计消耗{1}点金币" + "text": "本周累计消耗{0}点金币" }, "type": 130, "valid": 3000000, @@ -20006,7 +20006,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_856", - "text": "本周累计消耗{1}点金币" + "text": "本周累计消耗{0}点金币" }, "type": 130, "valid": 6000000, @@ -20023,7 +20023,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_857", - "text": "本周累计消耗{1}点金币" + "text": "本周累计消耗{0}点金币" }, "type": 130, "valid": 10000000, @@ -20040,7 +20040,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_858", - "text": "本周累计装备副本消耗{1}体力" + "text": "本周累计装备副本消耗{0}体力" }, "type": 130, "valid": 300, @@ -20057,7 +20057,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_859", - "text": "本周累计装备副本消耗{1}体力" + "text": "本周累计装备副本消耗{0}体力" }, "type": 130, "valid": 600, @@ -20074,7 +20074,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_860", - "text": "本周累计装备副本消耗{1}体力" + "text": "本周累计装备副本消耗{0}体力" }, "type": 130, "valid": 1000, @@ -20091,7 +20091,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_861", - "text": "本周累计回响副本消耗{1}体力" + "text": "本周累计回响副本消耗{0}体力" }, "type": 130, "valid": 300, @@ -20108,7 +20108,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_862", - "text": "本周累计回响副本消耗{1}体力" + "text": "本周累计回响副本消耗{0}体力" }, "type": 130, "valid": 600, @@ -20125,7 +20125,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_863", - "text": "本周累计回响副本消耗{1}体力" + "text": "本周累计回响副本消耗{0}体力" }, "type": 130, "valid": 1000, diff --git a/bin/json/game_guildtask.json b/bin/json/game_guildtask.json index 65c5e6b44..e99bf471b 100644 --- a/bin/json/game_guildtask.json +++ b/bin/json/game_guildtask.json @@ -209,7 +209,7 @@ "jump_interface": 10006, "task_display": { "key": "guild_guild_task_task_display_7", - "text": "完成1次功夫派遣任务" + "text": "完成1次功夫陪练任务" }, "reward": [ { diff --git a/bin/json/game_itemlink.json b/bin/json/game_itemlink.json index d03700a75..9bca76835 100644 --- a/bin/json/game_itemlink.json +++ b/bin/json/game_itemlink.json @@ -224,11 +224,11 @@ "id": 10006, "title": { "key": "itemlink_itemlink_title_18", - "text": "熊猫武馆-NPC派遣" + "text": "熊猫武馆-功夫陪练" }, "desc": { "key": "itemlink_itemlink_desc_18", - "text": "熊猫武馆派遣" + "text": "熊猫武馆功夫陪练" }, "jumpid": 10006, "icon": "ty_qp_gsb" diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index 6ad7fad90..e5cbac43b 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -559,8 +559,8 @@ }, "main": [ { - "key": 1, - "param": 1 + "key": 2, + "param": 1100608 } ], "wkqbx": 2, @@ -858,8 +858,8 @@ }, "main": [ { - "key": 1, - "param": 1 + "key": 2, + "param": 1100508 } ], "wkqbx": 0, @@ -1231,7 +1231,7 @@ }, { "key": 2, - "param": 1101208 + "param": 1100408 } ], "wkqbx": 0, @@ -1368,8 +1368,8 @@ }, "main": [ { - "key": 1, - "param": 1 + "key": 2, + "param": 1100107 } ], "wkqbx": 1, @@ -1483,8 +1483,8 @@ }, "main": [ { - "key": 1, - "param": 1 + "key": 2, + "param": 1100208 } ], "wkqbx": 1, @@ -1604,8 +1604,8 @@ }, "main": [ { - "key": 1, - "param": 1 + "key": 2, + "param": 1100204 } ], "wkqbx": 0, @@ -1678,7 +1678,7 @@ }, { "key": 2, - "param": 1201208 + "param": 1100808 } ], "wkqbx": 0, @@ -1727,8 +1727,8 @@ }, "main": [ { - "key": 1, - "param": 1 + "key": 2, + "param": 1100208 } ], "wkqbx": 0, @@ -1750,8 +1750,8 @@ }, "main": [ { - "key": 1, - "param": 1 + "key": 2, + "param": 1100504 } ], "wkqbx": 0, @@ -1773,8 +1773,8 @@ }, "main": [ { - "key": 1, - "param": 1 + "key": 2, + "param": 1100504 } ], "wkqbx": 0, @@ -1796,8 +1796,8 @@ }, "main": [ { - "key": 1, - "param": 1 + "key": 2, + "param": 1100604 } ], "wkqbx": 0, @@ -1819,8 +1819,8 @@ }, "main": [ { - "key": 1, - "param": 1 + "key": 2, + "param": 1100608 } ], "wkqbx": 0, diff --git a/bin/json/game_paypackage.json b/bin/json/game_paypackage.json index 7be3541b3..a18174716 100644 --- a/bin/json/game_paypackage.json +++ b/bin/json/game_paypackage.json @@ -344,7 +344,7 @@ "key": "paypackage_paypackage_pagename_12", "text": "每周礼包7" }, - "packagetype": "week_7", + "packagetype": "week_6", "buy_num": 999, "packagename": { "key": "paypackage_paypackage_packagename_12", @@ -376,7 +376,7 @@ "key": "paypackage_paypackage_pagename_13", "text": "每月礼包1" }, - "packagetype": "month_1", + "packagetype": "month_2", "buy_num": 5, "packagename": { "key": "paypackage_paypackage_packagename_13", @@ -430,7 +430,7 @@ "key": "paypackage_paypackage_pagename_15", "text": "每月礼包3" }, - "packagetype": "month_3", + "packagetype": "month_2", "buy_num": 5, "packagename": { "key": "paypackage_paypackage_packagename_15", @@ -457,7 +457,7 @@ "key": "paypackage_paypackage_pagename_16", "text": "每月礼包4" }, - "packagetype": "month_4", + "packagetype": "month_2", "buy_num": 5, "packagename": { "key": "paypackage_paypackage_packagename_16", diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 7d9ca0e1d..247efc8fd 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -2126,12 +2126,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "豺狼小怪", "901" ], "event": [ - 1, - 116 + 2, + 10750 ], "goto": 0 }, @@ -2140,12 +2140,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", + "20030_熊猫2", "901" ], "event": [ 2, - 10030 + 10760 ], "goto": 0 }, @@ -2154,12 +2154,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "功能入口-维京远征", "901" ], "event": [ 2, - 10030 + 10770 ], "goto": 0 }, @@ -2168,12 +2168,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", + "功能入口-维京远征", "901" ], "event": [ - 2, - 10030 + 10, + 167 ], "goto": 0 }, @@ -2182,12 +2182,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "功能入口-维京远征", "901" ], "event": [ 2, - 10030 + 10790 ], "goto": 0 }, @@ -2195,13 +2195,13 @@ "id": 10460, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "SmithyScene", + "打造", + "139" ], "event": [ 2, - 10030 + 10800 ], "goto": 0 }, @@ -2210,12 +2210,10 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", "901" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -2224,12 +2222,10 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", "901" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -2237,13 +2233,13 @@ "id": 10470, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "SmithyScene", + "打造", + "139" ], "event": [ 2, - 10030 + 10830 ], "goto": 0 }, @@ -2252,12 +2248,10 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", "901" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -2265,13 +2259,12 @@ "id": 10478, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "SmithyScene", + "打造", + "139" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -2279,13 +2272,13 @@ "id": 10480, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 10860 ], "goto": 0 }, @@ -2293,13 +2286,13 @@ "id": 10484, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -2307,13 +2300,13 @@ "id": 10488, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 10880 ], "goto": 0 }, @@ -2322,12 +2315,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "功能入口-维京远征", "901" ], "event": [ 2, - 10030 + 10890 ], "goto": 0 }, @@ -2336,12 +2329,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", + "功能入口-维京远征", "901" ], "event": [ - 2, - 10030 + 10, + 167 ], "goto": 0 }, @@ -2350,12 +2343,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "功能入口-维京远征", "901" ], "event": [ 2, - 10030 + 10910 ], "goto": 0 }, @@ -2363,13 +2356,13 @@ "id": 10500, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 10920 ], "goto": 0 }, @@ -2377,13 +2370,13 @@ "id": 10504, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -2392,12 +2385,10 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", "901" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -2405,13 +2396,13 @@ "id": 10510, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 10950 ], "goto": 0 }, @@ -2419,13 +2410,13 @@ "id": 10514, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -2434,12 +2425,10 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", "901" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -2447,13 +2436,13 @@ "id": 10520, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "WuGuanScene", + "总教习", + "137" ], "event": [ 2, - 10030 + 10980 ], "goto": 0 }, @@ -2461,13 +2450,11 @@ "id": 10524, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "WuGuanScene", + "137" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -2476,12 +2463,10 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", "901" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -2489,13 +2474,13 @@ "id": 10530, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "WuGuanScene", + "总教习", + "137" ], "event": [ 2, - 10030 + 11010 ], "goto": 0 }, @@ -2503,13 +2488,13 @@ "id": 10534, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", + "WuGuanScene", + "总教习", "901" ], "event": [ - 2, - 10030 + 10, + 10004 ], "goto": 0 }, @@ -2517,13 +2502,13 @@ "id": 10538, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "WuGuanScene", + "总教习", + "137" ], "event": [ 2, - 10030 + 11030 ], "goto": 0 }, @@ -2532,12 +2517,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", + "20030_熊猫2", "901" ], "event": [ 2, - 10030 + 11040 ], "goto": 0 }, @@ -2546,12 +2531,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "豺狼小怪1", "901" ], "event": [ - 1, - 117 + 2, + 11050 ], "goto": 0 }, @@ -2560,12 +2545,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", + "20030_熊猫2", "901" ], "event": [ 2, - 10030 + 11060 ], "goto": 0 }, @@ -2574,12 +2559,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "功能入口-狩猎", "901" ], "event": [ 2, - 10030 + 11070 ], "goto": 0 }, @@ -2588,12 +2573,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", + "豺狼小怪2", "901" ], "event": [ - 1, - 118 + 2, + 11080 ], "goto": 0 }, @@ -2602,12 +2587,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "功能入口-狩猎", "901" ], "event": [ 2, - 10030 + 11090 ], "goto": 0 }, @@ -2615,13 +2600,13 @@ "id": 10560, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "SmithyScene", + "打造", + "139" ], "event": [ 2, - 10030 + 11100 ], "goto": 0 }, @@ -2629,13 +2614,13 @@ "id": 10564, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "SmithyScene", + "豺狼小怪3", + "139" ], "event": [ - 1, - 119 + 2, + 11110 ], "goto": 0 }, @@ -2643,13 +2628,13 @@ "id": 10568, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "SmithyScene", + "打造", + "139" ], "event": [ 2, - 10030 + 11120 ], "goto": 0 }, @@ -2658,12 +2643,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", + "功能入口-维京远征", "901" ], "event": [ 2, - 10030 + 11130 ], "goto": 0 }, @@ -2672,12 +2657,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "功能入口-维京远征", "901" ], "event": [ - 2, - 10030 + 10, + 167 ], "goto": 0 }, @@ -2686,12 +2671,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", + "功能入口-维京远征", "901" ], "event": [ 2, - 10030 + 11150 ], "goto": 0 }, @@ -2699,13 +2684,13 @@ "id": 10580, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 11160 ], "goto": 0 }, @@ -2714,12 +2699,10 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", "901" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -2728,12 +2711,10 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", "901" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -2741,13 +2722,13 @@ "id": 10590, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "SmithyScene", + "打造", + "139" ], "event": [ 2, - 10030 + 11190 ], "goto": 0 }, @@ -2756,12 +2737,10 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", "901" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -2770,12 +2749,10 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", "901" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -2784,12 +2761,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", + "20030_熊猫2", "901" ], "event": [ 2, - 10030 + 11220 ], "goto": 0 }, @@ -2798,12 +2775,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "豺狼小怪4", "901" ], "event": [ - 1, - 120 + 2, + 11230 ], "goto": 0 }, @@ -2817,7 +2794,7 @@ ], "event": [ 2, - 10030 + 11240 ], "goto": 0 }, @@ -2826,12 +2803,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", + "20030_熊猫2", "901" ], "event": [ 2, - 10030 + 11250 ], "goto": 0 }, @@ -2840,12 +2817,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "豺狼小怪5", "901" ], "event": [ - 1, - 121 + 2, + 11260 ], "goto": 0 }, @@ -2854,12 +2831,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", + "20030_熊猫2", "901" ], "event": [ 2, - 10030 + 11270 ], "goto": 0 }, @@ -2873,7 +2850,7 @@ ], "event": [ 2, - 10030 + 11280 ], "goto": 0 }, @@ -2882,12 +2859,10 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", "901" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -2896,12 +2871,10 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", "901" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -2909,13 +2882,13 @@ "id": 10630, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 11310 ], "goto": 0 }, @@ -2923,13 +2896,13 @@ "id": 10634, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -2937,13 +2910,13 @@ "id": 10638, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 11330 ], "goto": 0 }, @@ -2952,12 +2925,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", + "功能入口-维京远征", "901" ], "event": [ 2, - 10030 + 11340 ], "goto": 0 }, @@ -2966,12 +2939,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "功能入口-维京远征", "901" ], "event": [ - 2, - 10030 + 10, + 167 ], "goto": 0 }, @@ -2980,12 +2953,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", + "功能入口-维京远征", "901" ], "event": [ 2, - 10030 + 11360 ], "goto": 0 }, @@ -2993,13 +2966,13 @@ "id": 10650, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "SmithyScene", + "打造", + "139" ], "event": [ 2, - 10030 + 11370 ], "goto": 0 }, @@ -3007,13 +2980,11 @@ "id": 10654, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "SmithyScene", + "139" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -3021,13 +2992,13 @@ "id": 10658, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "SmithyScene", + "打造", + "139" ], "event": [ 2, - 10030 + 11390 ], "goto": 0 }, @@ -3035,13 +3006,13 @@ "id": 10660, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "WuGuanScene", + "总教习", + "137" ], "event": [ 2, - 10030 + 11400 ], "goto": 0 }, @@ -3050,12 +3021,10 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", "901" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -3064,12 +3033,10 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", "901" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -3077,13 +3044,13 @@ "id": 10670, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "WuGuanScene", + "总教习", + "137" ], "event": [ 2, - 10030 + 11430 ], "goto": 0 }, @@ -3091,13 +3058,13 @@ "id": 10674, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "WuGuanScene", + "总教习", + "137" ], "event": [ - 2, - 10030 + 10, + 10004 ], "goto": 0 }, @@ -3105,13 +3072,13 @@ "id": 10678, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "WuGuanScene", + "总教习", + "137" ], "event": [ 2, - 10030 + 11450 ], "goto": 0 }, @@ -3119,13 +3086,13 @@ "id": 10680, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 11460 ], "goto": 0 }, @@ -3133,13 +3100,13 @@ "id": 10684, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -3147,13 +3114,13 @@ "id": 10688, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 11480 ], "goto": 0 }, @@ -3167,7 +3134,7 @@ ], "event": [ 2, - 10030 + 11490 ], "goto": 0 }, @@ -3176,12 +3143,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", + "豺狼小怪6", "901" ], "event": [ - 1, - 122 + 2, + 11500 ], "goto": 0 }, @@ -3195,7 +3162,7 @@ ], "event": [ 2, - 10030 + 11510 ], "goto": 0 }, @@ -3209,7 +3176,7 @@ ], "event": [ 2, - 10030 + 11520 ], "goto": 0 }, @@ -3218,12 +3185,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", + "豺狼小怪7", "901" ], "event": [ - 1, - 123 + 2, + 11530 ], "goto": 0 }, @@ -3237,7 +3204,7 @@ ], "event": [ 2, - 10030 + 11540 ], "goto": 0 }, @@ -3245,13 +3212,13 @@ "id": 10710, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "SmithyScene", + "打造", + "139" ], "event": [ 2, - 10030 + 11550 ], "goto": 0 }, @@ -3260,12 +3227,10 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", "901" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -3274,12 +3239,10 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", "901" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -3287,13 +3250,13 @@ "id": 10720, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 11580 ], "goto": 0 }, @@ -3301,13 +3264,13 @@ "id": 10724, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -3315,13 +3278,13 @@ "id": 10728, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 11600 ], "goto": 0 }, @@ -3330,12 +3293,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "功能入口-维京远征", "901" ], "event": [ 2, - 10030 + 11610 ], "goto": 0 }, @@ -3344,12 +3307,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", + "功能入口-维京远征", "901" ], "event": [ - 2, - 10030 + 10, + 167 ], "goto": 0 }, @@ -3358,12 +3321,10 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", "901" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -3372,12 +3333,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", + "功能入口-维京远征", "901" ], "event": [ 2, - 10030 + 11640 ], "goto": 0 }, @@ -3386,12 +3347,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "功能入口-维京远征", "901" ], "event": [ - 2, - 10030 + 10, + 167 ], "goto": 0 }, @@ -3400,12 +3361,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "功能入口-维京远征", "901" ], "event": [ 2, - 10030 + 11660 ], "goto": 0 }, @@ -3413,13 +3374,13 @@ "id": 10750, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 11670 ], "goto": 0 }, @@ -3428,12 +3389,10 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", "901" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -3442,12 +3401,10 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", "901" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -3455,13 +3412,13 @@ "id": 10760, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 11700 ], "goto": 0 }, @@ -3470,12 +3427,11 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", "901" ], "event": [ 2, - 10030 + 11710 ], "goto": 0 }, @@ -3484,12 +3440,11 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", "901" ], "event": [ 2, - 10030 + 11720 ], "goto": 0 }, @@ -3497,13 +3452,13 @@ "id": 10770, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 11730 ], "goto": 0 }, @@ -3511,13 +3466,13 @@ "id": 10774, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -3525,13 +3480,13 @@ "id": 10778, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 11750 ], "goto": 0 }, @@ -3539,13 +3494,13 @@ "id": 10780, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "SmithyScene", + "打造", + "139" ], "event": [ 2, - 10030 + 11760 ], "goto": 0 }, @@ -3554,12 +3509,10 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", "901" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -3567,13 +3520,13 @@ "id": 10788, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "SmithyScene", + "打造", + "139" ], "event": [ 2, - 10030 + 11780 ], "goto": 0 }, @@ -3582,12 +3535,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "功能入口-竞技场", "901" ], "event": [ 2, - 10030 + 11790 ], "goto": 0 }, @@ -3596,12 +3549,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "功能入口-竞技场", "901" ], "event": [ - 2, - 10030 + 10, + 156 ], "goto": 0 }, @@ -3610,12 +3563,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", + "功能入口-竞技场", "901" ], "event": [ 2, - 10030 + 11810 ], "goto": 0 }, @@ -3624,12 +3577,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "功能入口-维京远征", "901" ], "event": [ 2, - 10030 + 11820 ], "goto": 0 }, @@ -3638,12 +3591,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", + "功能入口-维京远征", "901" ], "event": [ - 2, - 10030 + 10, + 167 ], "goto": 0 }, @@ -3652,12 +3605,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "功能入口-维京远征", "901" ], "event": [ 2, - 10030 + 11840 ], "goto": 0 }, @@ -3665,13 +3618,13 @@ "id": 10810, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 11850 ], "goto": 0 }, @@ -3680,12 +3633,10 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", "901" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -3694,12 +3645,10 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", "901" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -3707,13 +3656,13 @@ "id": 10820, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 11880 ], "goto": 0 }, @@ -3721,13 +3670,13 @@ "id": 10824, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -3735,13 +3684,13 @@ "id": 10828, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 11900 ], "goto": 0 }, @@ -3749,13 +3698,13 @@ "id": 10830, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "SmithyScene", + "打造", + "139" ], "event": [ 2, - 10030 + 11910 ], "goto": 0 }, @@ -3763,13 +3712,11 @@ "id": 10834, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "SmithyScene", + "139" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -3777,13 +3724,13 @@ "id": 10838, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "SmithyScene", + "打造", + "139" ], "event": [ 2, - 10030 + 11930 ], "goto": 0 }, @@ -3791,13 +3738,13 @@ "id": 10840, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "WuGuanScene", + "总教习", + "137" ], "event": [ 2, - 10030 + 11940 ], "goto": 0 }, @@ -3805,13 +3752,13 @@ "id": 10844, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "WuGuanScene", + "总教习", + "137" ], "event": [ - 2, - 10030 + 10, + 10004 ], "goto": 0 }, @@ -3819,13 +3766,13 @@ "id": 10848, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "WuGuanScene", + "总教习", + "137" ], "event": [ 2, - 10030 + 11960 ], "goto": 0 }, @@ -3833,13 +3780,13 @@ "id": 10850, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 11970 ], "goto": 0 }, @@ -3847,13 +3794,13 @@ "id": 10854, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -3861,13 +3808,13 @@ "id": 10858, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 11990 ], "goto": 0 }, @@ -3876,12 +3823,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "功能入口-维京远征", "901" ], "event": [ 2, - 10030 + 12000 ], "goto": 0 }, @@ -3890,12 +3837,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "功能入口-维京远征", "901" ], "event": [ - 2, - 10030 + 10, + 167 ], "goto": 0 }, @@ -3904,12 +3851,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", + "功能入口-维京远征", "901" ], "event": [ 2, - 10030 + 12020 ], "goto": 0 }, @@ -3917,13 +3864,13 @@ "id": 10870, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "SmithyScene", + "打造", + "139" ], "event": [ 2, - 10030 + 12030 ], "goto": 0 }, @@ -3931,13 +3878,11 @@ "id": 10874, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "SmithyScene", + "139" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -3945,13 +3890,13 @@ "id": 10878, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "SmithyScene", + "打造", + "139" ], "event": [ 2, - 10030 + 12050 ], "goto": 0 }, @@ -3959,13 +3904,13 @@ "id": 10880, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12060 ], "goto": 0 }, @@ -3973,13 +3918,13 @@ "id": 10884, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -3987,13 +3932,13 @@ "id": 10888, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12080 ], "goto": 0 }, @@ -4001,13 +3946,13 @@ "id": 10890, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12090 ], "goto": 0 }, @@ -4015,13 +3960,13 @@ "id": 10894, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -4029,13 +3974,13 @@ "id": 10898, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12110 ], "goto": 0 }, @@ -4043,13 +3988,13 @@ "id": 10900, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12120 ], "goto": 0 }, @@ -4057,13 +4002,13 @@ "id": 10904, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -4071,13 +4016,13 @@ "id": 10908, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12140 ], "goto": 0 }, @@ -4086,12 +4031,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "功能入口-维京远征", "901" ], "event": [ 2, - 10030 + 12150 ], "goto": 0 }, @@ -4100,12 +4045,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", + "功能入口-维京远征", "901" ], "event": [ - 2, - 10030 + 10, + 167 ], "goto": 0 }, @@ -4114,12 +4059,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "功能入口-维京远征", "901" ], "event": [ 2, - 10030 + 12170 ], "goto": 0 }, @@ -4127,13 +4072,13 @@ "id": 10920, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "SmithyScene", + "打造", + "139" ], "event": [ 2, - 10030 + 12180 ], "goto": 0 }, @@ -4141,13 +4086,11 @@ "id": 10924, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "SmithyScene", + "139" ], "event": [ - 2, - 10030 + 0 ], "goto": 0 }, @@ -4155,13 +4098,13 @@ "id": 10928, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "SmithyScene", + "打造", + "139" ], "event": [ 2, - 10030 + 12200 ], "goto": 0 }, @@ -4169,13 +4112,13 @@ "id": 10930, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12210 ], "goto": 0 }, @@ -4183,13 +4126,13 @@ "id": 10934, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -4197,13 +4140,13 @@ "id": 10938, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12230 ], "goto": 0 }, @@ -4212,12 +4155,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "功能入口-竞技场", "901" ], "event": [ 2, - 10030 + 12240 ], "goto": 0 }, @@ -4226,12 +4169,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_邦尼兔4", + "功能入口-竞技场", "901" ], "event": [ - 2, - 10030 + 10, + 156 ], "goto": 0 }, @@ -4240,12 +4183,12 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "功能入口-竞技场", "901" ], "event": [ 2, - 10030 + 12260 ], "goto": 0 }, @@ -4253,13 +4196,13 @@ "id": 10950, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12270 ], "goto": 0 }, @@ -4267,13 +4210,13 @@ "id": 10954, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -4281,13 +4224,13 @@ "id": 10958, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12290 ], "goto": 0 }, @@ -4295,13 +4238,13 @@ "id": 10960, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12300 ], "goto": 0 }, @@ -4309,13 +4252,13 @@ "id": 10964, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -4323,13 +4266,13 @@ "id": 10968, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12320 ], "goto": 0 }, @@ -4337,13 +4280,13 @@ "id": 10970, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12330 ], "goto": 0 }, @@ -4351,13 +4294,13 @@ "id": 10974, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -4365,13 +4308,13 @@ "id": 10978, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12350 ], "goto": 0 }, @@ -4379,13 +4322,13 @@ "id": 10980, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12360 ], "goto": 0 }, @@ -4393,13 +4336,13 @@ "id": 10984, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -4407,13 +4350,13 @@ "id": 10988, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12380 ], "goto": 0 }, @@ -4421,13 +4364,13 @@ "id": 10990, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12390 ], "goto": 0 }, @@ -4435,13 +4378,13 @@ "id": 10994, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -4449,13 +4392,13 @@ "id": 10998, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12410 ], "goto": 0 }, @@ -4463,13 +4406,13 @@ "id": 11000, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12420 ], "goto": 0 }, @@ -4477,13 +4420,13 @@ "id": 11004, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -4491,13 +4434,13 @@ "id": 11008, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12440 ], "goto": 0 }, @@ -4505,13 +4448,13 @@ "id": 11010, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12450 ], "goto": 0 }, @@ -4519,13 +4462,13 @@ "id": 11014, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -4533,13 +4476,13 @@ "id": 11018, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12470 ], "goto": 0 }, @@ -4547,13 +4490,13 @@ "id": 11020, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12480 ], "goto": 0 }, @@ -4561,13 +4504,13 @@ "id": 11024, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -4575,13 +4518,13 @@ "id": 11028, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12500 ], "goto": 0 }, @@ -4589,13 +4532,13 @@ "id": 11030, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12510 ], "goto": 0 }, @@ -4603,13 +4546,13 @@ "id": 11034, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -4617,13 +4560,13 @@ "id": 11038, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12530 ], "goto": 0 }, @@ -4631,13 +4574,13 @@ "id": 11040, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12540 ], "goto": 0 }, @@ -4645,13 +4588,13 @@ "id": 11044, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -4659,13 +4602,13 @@ "id": 11048, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12560 ], "goto": 0 }, @@ -4673,13 +4616,13 @@ "id": 11050, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12570 ], "goto": 0 }, @@ -4687,13 +4630,13 @@ "id": 11054, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -4701,13 +4644,13 @@ "id": 11058, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12590 ], "goto": 0 }, @@ -4715,13 +4658,13 @@ "id": 11060, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12600 ], "goto": 0 }, @@ -4729,13 +4672,13 @@ "id": 11064, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -4743,13 +4686,13 @@ "id": 11068, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12620 ], "goto": 0 }, @@ -4757,13 +4700,13 @@ "id": 11070, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12630 ], "goto": 0 }, @@ -4771,13 +4714,13 @@ "id": 11074, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -4785,13 +4728,13 @@ "id": 11078, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12650 ], "goto": 0 }, @@ -4799,13 +4742,13 @@ "id": 11080, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12660 ], "goto": 0 }, @@ -4813,13 +4756,13 @@ "id": 11084, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -4827,13 +4770,13 @@ "id": 11088, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12680 ], "goto": 0 }, @@ -4841,13 +4784,13 @@ "id": 11090, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12690 ], "goto": 0 }, @@ -4855,13 +4798,13 @@ "id": 11094, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10030 + 10, + 166 ], "goto": 0 }, @@ -4869,13 +4812,13 @@ "id": 11098, "heroid": 25001, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10030 + 12710 ], "goto": 0 }, @@ -4883,13 +4826,13 @@ "id": 11100, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔4", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10031 + 12720 ], "goto": 0 }, @@ -4897,13 +4840,13 @@ "id": 11104, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔5", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10032 + 10, + 166 ], "goto": 0 }, @@ -4911,13 +4854,13 @@ "id": 11108, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔6", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10033 + 12740 ], "goto": 0 }, @@ -4925,13 +4868,13 @@ "id": 11110, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔7", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10034 + 12750 ], "goto": 0 }, @@ -4939,13 +4882,13 @@ "id": 11114, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔8", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10035 + 10, + 166 ], "goto": 0 }, @@ -4953,13 +4896,13 @@ "id": 11118, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔9", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10036 + 12770 ], "goto": 0 }, @@ -4967,13 +4910,13 @@ "id": 11120, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔10", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10037 + 12780 ], "goto": 0 }, @@ -4981,13 +4924,13 @@ "id": 11124, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔11", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10038 + 10, + 166 ], "goto": 0 }, @@ -4995,13 +4938,13 @@ "id": 11128, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔12", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10039 + 12800 ], "goto": 0 }, @@ -5009,13 +4952,13 @@ "id": 11130, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔13", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10040 + 12810 ], "goto": 0 }, @@ -5023,13 +4966,13 @@ "id": 11134, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔14", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10041 + 10, + 166 ], "goto": 0 }, @@ -5037,13 +4980,13 @@ "id": 11138, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔15", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10042 + 12830 ], "goto": 0 }, @@ -5051,13 +4994,13 @@ "id": 11140, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔16", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10043 + 12840 ], "goto": 0 }, @@ -5065,13 +5008,13 @@ "id": 11144, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔17", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10044 + 10, + 166 ], "goto": 0 }, @@ -5079,13 +5022,13 @@ "id": 11148, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔18", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10045 + 12860 ], "goto": 0 }, @@ -5093,13 +5036,13 @@ "id": 11150, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔19", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10046 + 12870 ], "goto": 0 }, @@ -5107,13 +5050,13 @@ "id": 11154, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔20", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10047 + 10, + 166 ], "goto": 0 }, @@ -5121,13 +5064,13 @@ "id": 11158, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔21", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10048 + 12890 ], "goto": 0 }, @@ -5135,13 +5078,13 @@ "id": 11160, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔22", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10049 + 12900 ], "goto": 0 }, @@ -5149,13 +5092,13 @@ "id": 11164, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔23", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10050 + 10, + 166 ], "goto": 0 }, @@ -5163,13 +5106,13 @@ "id": 11168, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔24", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10051 + 12920 ], "goto": 0 }, @@ -5177,13 +5120,13 @@ "id": 11170, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔25", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10052 + 12930 ], "goto": 0 }, @@ -5191,13 +5134,13 @@ "id": 11174, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔26", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10053 + 10, + 166 ], "goto": 0 }, @@ -5205,13 +5148,13 @@ "id": 11178, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔27", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10054 + 12950 ], "goto": 0 }, @@ -5219,13 +5162,13 @@ "id": 11180, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔28", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10055 + 12960 ], "goto": 0 }, @@ -5233,13 +5176,13 @@ "id": 11184, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔29", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10056 + 10, + 166 ], "goto": 0 }, @@ -5247,13 +5190,13 @@ "id": 11188, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔30", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10057 + 12980 ], "goto": 0 }, @@ -5261,13 +5204,13 @@ "id": 11190, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔31", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10058 + 12990 ], "goto": 0 }, @@ -5275,13 +5218,13 @@ "id": 11194, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔32", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 2, - 10059 + 10, + 166 ], "goto": 0 }, @@ -5289,13 +5232,13 @@ "id": 11198, "heroid": 25001, "datas": [ - "GameMain", - "20030_邦尼兔33", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10060 + 13010 ], "goto": 0 } diff --git a/bin/json/game_recharge.json b/bin/json/game_recharge.json index 335187508..147693397 100644 --- a/bin/json/game_recharge.json +++ b/bin/json/game_recharge.json @@ -9,29 +9,29 @@ { "a": "attr", "t": "vipexp", - "n": 6000 + "n": 60 }, { "a": "attr", "t": "diamond", - "n": 6000 + "n": 60 } ], "diamond_num_double": [ { "a": "attr", "t": "vipexp", - "n": 6000 + "n": 60 }, { "a": "attr", "t": "diamond", - "n": 12000 + "n": 30 } ], "channel": "0", "text": "0", - "show": "$6", + "show": "6元", "image": "cz_zs_01" }, { @@ -44,29 +44,29 @@ { "a": "attr", "t": "vipexp", - "n": 30000 + "n": 300 }, { "a": "attr", "t": "diamond", - "n": 30000 + "n": 300 } ], "diamond_num_double": [ { "a": "attr", "t": "vipexp", - "n": 30000 + "n": 300 }, { "a": "attr", "t": "diamond", - "n": 60000 + "n": 150 } ], "channel": "0", "text": "0", - "show": "$30", + "show": "30元", "image": "cz_zs_02" }, { @@ -79,29 +79,29 @@ { "a": "attr", "t": "vipexp", - "n": 68000 + "n": 680 }, { "a": "attr", "t": "diamond", - "n": 68000 + "n": 680 } ], "diamond_num_double": [ { "a": "attr", "t": "vipexp", - "n": 68000 + "n": 680 }, { "a": "attr", "t": "diamond", - "n": 136000 + "n": 340 } ], "channel": "0", "text": "0", - "show": "$68", + "show": "68元", "image": "cz_zs_02" }, { @@ -114,29 +114,29 @@ { "a": "attr", "t": "vipexp", - "n": 98000 + "n": 980 }, { "a": "attr", "t": "diamond", - "n": 98000 + "n": 980 } ], "diamond_num_double": [ { "a": "attr", "t": "vipexp", - "n": 98000 + "n": 980 }, { "a": "attr", "t": "diamond", - "n": 196000 + "n": 490 } ], "channel": "0", "text": "0", - "show": "$98", + "show": "98元", "image": "cz_zs_02" }, { @@ -149,29 +149,29 @@ { "a": "attr", "t": "vipexp", - "n": 128000 + "n": 1280 }, { "a": "attr", "t": "diamond", - "n": 128000 + "n": 1280 } ], "diamond_num_double": [ { "a": "attr", "t": "vipexp", - "n": 128000 + "n": 1280 }, { "a": "attr", "t": "diamond", - "n": 256000 + "n": 640 } ], "channel": "0", "text": "0", - "show": "$128", + "show": "128元", "image": "cz_zs_03" }, { @@ -184,29 +184,29 @@ { "a": "attr", "t": "vipexp", - "n": 198000 + "n": 1980 }, { "a": "attr", "t": "diamond", - "n": 198000 + "n": 1980 } ], "diamond_num_double": [ { "a": "attr", "t": "vipexp", - "n": 198000 + "n": 1980 }, { "a": "attr", "t": "diamond", - "n": 396000 + "n": 990 } ], "channel": "0", "text": "0", - "show": "$198", + "show": "198元", "image": "cz_zs_03" }, { @@ -219,29 +219,29 @@ { "a": "attr", "t": "vipexp", - "n": 328000 + "n": 3280 }, { "a": "attr", "t": "diamond", - "n": 328000 + "n": 3280 } ], "diamond_num_double": [ { "a": "attr", "t": "vipexp", - "n": 328000 + "n": 3280 }, { "a": "attr", "t": "diamond", - "n": 656000 + "n": 1640 } ], "channel": "0", "text": "0", - "show": "$328", + "show": "328元", "image": "cz_zs_03" }, { @@ -254,29 +254,29 @@ { "a": "attr", "t": "vipexp", - "n": 648000 + "n": 6480 }, { "a": "attr", "t": "diamond", - "n": 648000 + "n": 6480 } ], "diamond_num_double": [ { "a": "attr", "t": "vipexp", - "n": 648000 + "n": 6480 }, { "a": "attr", "t": "diamond", - "n": 1296000 + "n": 3240 } ], "channel": "0", "text": "0", - "show": "$648", + "show": "648元", "image": "cz_zs_03" }, { @@ -289,29 +289,29 @@ { "a": "attr", "t": "vipexp", - "n": 6000 + "n": 60 }, { "a": "attr", "t": "diamond", - "n": 6000 + "n": 60 } ], "diamond_num_double": [ { "a": "attr", "t": "vipexp", - "n": 6000 + "n": 60 }, { "a": "attr", "t": "diamond", - "n": 12000 + "n": 30 } ], "channel": "0", "text": "0", - "show": "$6", + "show": "6元", "image": "" }, { @@ -324,29 +324,13 @@ { "a": "attr", "t": "vipexp", - "n": 6000 - }, - { - "a": "attr", - "t": "diamond", - "n": 6000 - } - ], - "diamond_num_double": [ - { - "a": "attr", - "t": "vipexp", - "n": 6000 - }, - { - "a": "attr", - "t": "diamond", - "n": 12000 + "n": 60 } ], + "diamond_num_double": [], "channel": "0", "text": "0", - "show": "$6", + "show": "6元", "image": "" }, { @@ -354,34 +338,56 @@ "editionid": "debug", "recharge_type": 2, "monetaryunit": "￥", - "amount": 600, + "amount": 3000, "vipexp": [ { "a": "attr", "t": "vipexp", - "n": 6000 - }, - { - "a": "attr", - "t": "diamond", - "n": 6000 + "n": 300 } ], - "diamond_num_double": [ + "diamond_num_double": [], + "channel": "0", + "text": "0", + "show": "30元", + "image": "" + }, + { + "id": "day_3", + "editionid": "debug", + "recharge_type": 2, + "monetaryunit": "￥", + "amount": 6800, + "vipexp": [ { "a": "attr", "t": "vipexp", - "n": 6000 - }, - { - "a": "attr", - "t": "diamond", - "n": 12000 + "n": 680 } ], + "diamond_num_double": [], "channel": "0", "text": "0", - "show": "$6", + "show": "68元", + "image": "" + }, + { + "id": "day_4", + "editionid": "debug", + "recharge_type": 2, + "monetaryunit": "￥", + "amount": 12800, + "vipexp": [ + { + "a": "attr", + "t": "vipexp", + "n": 1280 + } + ], + "diamond_num_double": [], + "channel": "0", + "text": "0", + "show": "128元", "image": "" }, { @@ -394,29 +400,13 @@ { "a": "attr", "t": "vipexp", - "n": 30000 - }, - { - "a": "attr", - "t": "diamond", - "n": 30000 - } - ], - "diamond_num_double": [ - { - "a": "attr", - "t": "vipexp", - "n": 30000 - }, - { - "a": "attr", - "t": "diamond", - "n": 60000 + "n": 300 } ], + "diamond_num_double": [], "channel": "0", "text": "0", - "show": "$30", + "show": "30元", "image": "" }, { @@ -424,34 +414,18 @@ "editionid": "debug", "recharge_type": 2, "monetaryunit": "￥", - "amount": 3000, + "amount": 9800, "vipexp": [ { "a": "attr", "t": "vipexp", - "n": 30000 - }, - { - "a": "attr", - "t": "diamond", - "n": 30000 - } - ], - "diamond_num_double": [ - { - "a": "attr", - "t": "vipexp", - "n": 30000 - }, - { - "a": "attr", - "t": "diamond", - "n": 60000 + "n": 980 } ], + "diamond_num_double": [], "channel": "0", "text": "0", - "show": "$30", + "show": "98元", "image": "" }, { @@ -459,34 +433,18 @@ "editionid": "debug", "recharge_type": 2, "monetaryunit": "￥", - "amount": 3000, + "amount": 19800, "vipexp": [ { "a": "attr", "t": "vipexp", - "n": 30000 - }, - { - "a": "attr", - "t": "diamond", - "n": 30000 - } - ], - "diamond_num_double": [ - { - "a": "attr", - "t": "vipexp", - "n": 30000 - }, - { - "a": "attr", - "t": "diamond", - "n": 60000 + "n": 1980 } ], + "diamond_num_double": [], "channel": "0", "text": "0", - "show": "$30", + "show": "198元", "image": "" }, { @@ -494,34 +452,18 @@ "editionid": "debug", "recharge_type": 2, "monetaryunit": "￥", - "amount": 3000, + "amount": 32800, "vipexp": [ { "a": "attr", "t": "vipexp", - "n": 30000 - }, - { - "a": "attr", - "t": "diamond", - "n": 30000 - } - ], - "diamond_num_double": [ - { - "a": "attr", - "t": "vipexp", - "n": 30000 - }, - { - "a": "attr", - "t": "diamond", - "n": 60000 + "n": 3280 } ], + "diamond_num_double": [], "channel": "0", "text": "0", - "show": "$30", + "show": "328元", "image": "" }, { @@ -529,34 +471,37 @@ "editionid": "debug", "recharge_type": 2, "monetaryunit": "￥", - "amount": 3000, + "amount": 44800, "vipexp": [ { "a": "attr", "t": "vipexp", - "n": 30000 - }, - { - "a": "attr", - "t": "diamond", - "n": 30000 + "n": 4480 } ], - "diamond_num_double": [ + "diamond_num_double": [], + "channel": "0", + "text": "0", + "show": "448元", + "image": "" + }, + { + "id": "week_6", + "editionid": "debug", + "recharge_type": 2, + "monetaryunit": "￥", + "amount": 64800, + "vipexp": [ { "a": "attr", "t": "vipexp", - "n": 30000 - }, - { - "a": "attr", - "t": "diamond", - "n": 60000 + "n": 6480 } ], + "diamond_num_double": [], "channel": "0", "text": "0", - "show": "$30", + "show": "648元", "image": "" }, { @@ -569,29 +514,13 @@ { "a": "attr", "t": "vipexp", - "n": 128000 - }, - { - "a": "attr", - "t": "diamond", - "n": 128000 - } - ], - "diamond_num_double": [ - { - "a": "attr", - "t": "vipexp", - "n": 128000 - }, - { - "a": "attr", - "t": "diamond", - "n": 256000 + "n": 1280 } ], + "diamond_num_double": [], "channel": "0", "text": "0", - "show": "$128", + "show": "128元", "image": "" }, { @@ -604,29 +533,13 @@ { "a": "attr", "t": "vipexp", - "n": 198000 - }, - { - "a": "attr", - "t": "diamond", - "n": 198000 - } - ], - "diamond_num_double": [ - { - "a": "attr", - "t": "vipexp", - "n": 198000 - }, - { - "a": "attr", - "t": "diamond", - "n": 396000 + "n": 1980 } ], + "diamond_num_double": [], "channel": "0", "text": "0", - "show": "$198", + "show": "198元", "image": "" }, { @@ -639,29 +552,13 @@ { "a": "attr", "t": "vipexp", - "n": 328000 - }, - { - "a": "attr", - "t": "diamond", - "n": 328000 - } - ], - "diamond_num_double": [ - { - "a": "attr", - "t": "vipexp", - "n": 328000 - }, - { - "a": "attr", - "t": "diamond", - "n": 656000 + "n": 3280 } ], + "diamond_num_double": [], "channel": "0", "text": "0", - "show": "$328", + "show": "328元", "image": "" }, { @@ -674,18 +571,18 @@ { "a": "attr", "t": "vipexp", - "n": 30000 + "n": 300 }, { "a": "attr", "t": "diamond", - "n": 30000 + "n": 300 } ], "diamond_num_double": [], "channel": "0", "text": "0", - "show": "$30", + "show": "30元", "image": "" }, { @@ -698,18 +595,18 @@ { "a": "attr", "t": "vipexp", - "n": 98000 + "n": 980 }, { "a": "attr", "t": "diamond", - "n": 98000 + "n": 980 } ], "diamond_num_double": [], "channel": "0", "text": "0", - "show": "$98", + "show": "98元", "image": "" } ] \ No newline at end of file diff --git a/bin/json/game_ruledesc.json b/bin/json/game_ruledesc.json index 86e81bc05..8f6746177 100644 --- a/bin/json/game_ruledesc.json +++ b/bin/json/game_ruledesc.json @@ -471,5 +471,16 @@ "key": "ruledesc_ruledesc_content_43", "text": "帮忙测试这个界面是否有帮助信息。" } + }, + { + "id": 10044, + "title": { + "key": "ruledesc_ruledesc_title_44", + "text": "主角个人信息界面说明" + }, + "content": { + "key": "ruledesc_ruledesc_content_44", + "text": "这里可以查看玩家游戏进度，并且可以修改名称与个性签名（名称最多20字符，汉字算2字符），更改角色装扮，还能修改并查看自己的阵容展示。" + } } ] \ No newline at end of file diff --git a/bin/json/game_shop.json b/bin/json/game_shop.json index 8cb562c92..1334e4f9c 100644 --- a/bin/json/game_shop.json +++ b/bin/json/game_shop.json @@ -22,7 +22,7 @@ "n": 1 } ], - "rtype": 1, + "rtype": 2, "rtime": 6, "rnum": 8, "rneed": [ @@ -135,8 +135,8 @@ "n": 1 } ], - "rtype": 3, - "rtime": 1, + "rtype": 2, + "rtime": 7, "rnum": -1, "rneed": [], "shopitem": [ @@ -172,8 +172,8 @@ "n": 1 } ], - "rtype": 3, - "rtime": 1, + "rtype": 2, + "rtime": 7, "rnum": -1, "rneed": [], "shopitem": [ @@ -203,8 +203,8 @@ "n": 1 } ], - "rtype": 4, - "rtime": 1, + "rtype": 2, + "rtime": 21, "rnum": -1, "rneed": [], "shopitem": [ @@ -237,8 +237,8 @@ "n": 1 } ], - "rtype": 3, - "rtime": 1, + "rtype": 2, + "rtime": 7, "rnum": -1, "rneed": [], "shopitem": [ diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 20fd3fe13..acb4c2fa9 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -10040,7 +10040,7 @@ "Argu": [ 414007211, -1, - -1 + 9999 ], "FollowSK": [], "SucFollowSK": [], @@ -16928,7 +16928,7 @@ "Argu": [ 1, 4, - 1500 + 3000 ], "FollowSK": [], "SucFollowSK": [], @@ -16951,7 +16951,7 @@ "Argu": [ 1, 4, - 1500 + 3100 ], "FollowSK": [], "SucFollowSK": [], @@ -16974,7 +16974,7 @@ "Argu": [ 1, 4, - 1500 + 3200 ], "FollowSK": [], "SucFollowSK": [], @@ -16997,7 +16997,7 @@ "Argu": [ 1, 4, - 1500 + 3300 ], "FollowSK": [], "SucFollowSK": [], @@ -17020,7 +17020,7 @@ "Argu": [ 1, 4, - 1500 + 3500 ], "FollowSK": [], "SucFollowSK": [], diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 7af92ce98..a9abdd236 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -12196,7 +12196,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_113002311_1", - "text": "食人鱼先生对敌方1个目标造成攻击力500%的伤害；若目标死亡，则附加1次攻击，对随机1个目标造成攻击力150%的伤害，本次攻击无视防御。追加伤害每回合最多触发2次。" + "text": "食人鱼先生对敌方1个目标造成攻击力500%的伤害；若目标死亡，则附加1次攻击，对随机1个目标造成攻击力300%的伤害，本次攻击无视防御。追加伤害每回合最多触发2次。" }, "buffid": [], "map": "" diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 1876d7192..92ad81873 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -994,7 +994,7 @@ "BuffType": 21, "EffectArgu": [ 1, - 1, + 2, 100 ], "BufParNum": 1, @@ -1026,7 +1026,7 @@ "BuffType": 21, "EffectArgu": [ 1, - 1, + 2, 50 ], "BufParNum": 1, @@ -1086,7 +1086,7 @@ "BuffType": 21, "EffectArgu": [ 2, - 1, + 2, 500 ], "BufParNum": 1, @@ -1238,7 +1238,7 @@ "BuffType": 21, "EffectArgu": [ 1, - 1, + 2, 500 ], "BufParNum": 1, @@ -3587,7 +3587,7 @@ "BuffType": 21, "EffectArgu": [ 1, - 1, + 2, 220 ], "BufParNum": 1, diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index f04653fa1..12770d554 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -199,7 +199,7 @@ }, "task_details": { "key": "worldtask_world_task_task_details_6", - "text": "圣桃树的预言让邦尼兔非常焦虑，他担心邪恶势力随时会卷土重来，为了能和他们并肩作战，我必须获得邦尼兔的信任。" + "text": "圣桃树的预言让邦尼兔非常焦虑，他担心反派势力随时会卷土重来，为了能和他们并肩作战，我必须获得邦尼兔的信任。" }, "npctxt": { "key": "worldtask_world_task_npctxt_6", @@ -276,7 +276,7 @@ }, "task_details": { "key": "worldtask_world_task_task_details_8", - "text": "圣桃树是神圣的的通灵之所，通过它可以召唤梦工场世界所有的守护者来共同对抗邪恶势力。" + "text": "圣桃树是神圣的的通灵之所，通过它可以召唤梦工场世界所有的守护者来共同对抗反派势力。" }, "npctxt": { "key": "worldtask_world_task_npctxt_8", @@ -814,11 +814,11 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_23", - "text": "黑暗梦魇重生" + "text": "黑暗漆黑重生" }, "task_details": { "key": "worldtask_world_task_task_details_23", - "text": "黑暗梦魇在恐惧中再次重生，守护者奋起对抗，最终还是让梦魇逃走。然而，人们内心中的担忧久久不能消散。" + "text": "漆黑在恐惧中再次重生，守护者奋起对抗，最终还是让漆黑逃走。然而，人们内心中的担忧久久不能消散。" }, "npctxt": { "key": "worldtask_world_task_npctxt_23", @@ -854,7 +854,7 @@ }, "task_details": { "key": "worldtask_world_task_task_details_24", - "text": "想要抵御邪恶势力的入侵，守护者也要不断提升自己，前往熊猫武馆接受训练。" + "text": "想要抵御反派势力的入侵，守护者也要不断提升自己，前往熊猫武馆接受训练。" }, "npctxt": { "key": "worldtask_world_task_npctxt_24", @@ -1216,7 +1216,7 @@ }, "task_details": { "key": "worldtask_world_task_task_details_34", - "text": "打开【守护者】界面，进行装备强化" + "text": "打开【守护者】界面，进行装备强化。" }, "npctxt": { "key": "worldtask_world_task_npctxt_34", @@ -1334,7 +1334,7 @@ }, "task_details": { "key": "worldtask_world_task_task_details_37", - "text": "打开【守护者】界面，进行装备穿戴、强化" + "text": "打开【守护者】界面，进行装备穿戴、强化。" }, "npctxt": { "key": "worldtask_world_task_npctxt_37", @@ -1623,7 +1623,7 @@ }, "task_details": { "key": "worldtask_world_task_task_details_45", - "text": "通关冒险关卡【4-1】-【4-8】" + "text": "通关冒险关卡【4-1】-【4-8】。" }, "npctxt": { "key": "worldtask_world_task_npctxt_45", @@ -1655,15 +1655,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_46", - "text": "战斗16" + "text": "击退豺狼人" }, "task_details": { "key": "worldtask_world_task_task_details_46", - "text": "战斗16" + "text": "击退豺狼人" }, "npctxt": { "key": "worldtask_world_task_npctxt_46", - "text": "战斗16" + "text": "击退豺狼人" }, "npc": 10440, "completetask": [ @@ -1691,15 +1691,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_47", - "text": "维京远征boss2难度1" + "text": "冰霜泰坦难度1" }, "task_details": { "key": "worldtask_world_task_task_details_47", - "text": "维京远征boss2难度1" + "text": "冰霜泰坦难度1" }, "npctxt": { "key": "worldtask_world_task_npctxt_47", - "text": "维京远征boss2难度1" + "text": "冰霜泰坦难度1" }, "npc": 10450, "completetask": [ @@ -1739,9 +1739,9 @@ }, "npc": 10460, "completetask": [ - 12070480 + 0 ], - "deliver_npc": 10468, + "deliver_npc": 0, "auto_accept": 0, "reword": [ { @@ -1763,22 +1763,22 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_49", - "text": "强化装备" + "text": "6件装备+6" }, "task_details": { "key": "worldtask_world_task_task_details_49", - "text": "强化装备" + "text": "6件装备+6" }, "npctxt": { "key": "worldtask_world_task_npctxt_49", - "text": "强化装备" + "text": "6件装备+6" }, "npc": 10470, "completetask": [ 12070490 ], "deliver_npc": 10478, - "auto_accept": 0, + "auto_accept": 1, "reword": [ { "a": "attr", @@ -1799,15 +1799,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_50", - "text": "主线【3-1】-【3-4】" + "text": "冒险3-4通关" }, "task_details": { "key": "worldtask_world_task_task_details_50", - "text": "主线【3-1】-【3-4】" + "text": "冒险3-4通关" }, "npctxt": { "key": "worldtask_world_task_npctxt_50", - "text": "主线【3-1】-【3-4】" + "text": "冒险3-4通关" }, "npc": 10480, "completetask": [ @@ -1835,15 +1835,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_51", - "text": "装备副本boss2难度2刷1次" + "text": "冰霜泰坦难度2" }, "task_details": { "key": "worldtask_world_task_task_details_51", - "text": "装备副本boss2难度2刷1次" + "text": "冰霜泰坦难度2" }, "npctxt": { "key": "worldtask_world_task_npctxt_51", - "text": "装备副本boss2难度2刷1次" + "text": "冰霜泰坦难度2" }, "npc": 10490, "completetask": [ @@ -1871,15 +1871,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_52", - "text": "主线【3-5】-【3-8】" + "text": "冒险3-8通关" }, "task_details": { "key": "worldtask_world_task_task_details_52", - "text": "主线【3-5】-【3-8】" + "text": "冒险3-8通关" }, "npctxt": { "key": "worldtask_world_task_npctxt_52", - "text": "主线【3-5】-【3-8】" + "text": "冒险3-8通关" }, "npc": 10500, "completetask": [ @@ -1919,9 +1919,9 @@ }, "npc": 10510, "completetask": [ - 12070530 + 0 ], - "deliver_npc": 10518, + "deliver_npc": 0, "auto_accept": 0, "reword": [ { @@ -1955,9 +1955,9 @@ }, "npc": 10520, "completetask": [ - 12070540 + 0 ], - "deliver_npc": 10528, + "deliver_npc": 0, "auto_accept": 0, "reword": [ { @@ -2015,15 +2015,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_56", - "text": "战斗17" + "text": "击退豺狼人" }, "task_details": { "key": "worldtask_world_task_task_details_56", - "text": "战斗17" + "text": "击退豺狼人" }, "npctxt": { "key": "worldtask_world_task_npctxt_56", - "text": "战斗17" + "text": "击退豺狼人" }, "npc": 10540, "completetask": [ @@ -2051,15 +2051,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_57", - "text": "战斗18" + "text": "击退豺狼人" }, "task_details": { "key": "worldtask_world_task_task_details_57", - "text": "战斗18" + "text": "击退豺狼人" }, "npctxt": { "key": "worldtask_world_task_npctxt_57", - "text": "战斗18" + "text": "击退豺狼人" }, "npc": 10550, "completetask": [ @@ -2087,15 +2087,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_58", - "text": "战斗19" + "text": "击退豺狼人" }, "task_details": { "key": "worldtask_world_task_task_details_58", - "text": "战斗19" + "text": "击退豺狼人" }, "npctxt": { "key": "worldtask_world_task_npctxt_58", - "text": "战斗19" + "text": "击退豺狼人" }, "npc": 10560, "completetask": [ @@ -2123,15 +2123,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_59", - "text": "装备副本boss3难度1(开支线，打狩猎)" + "text": "森林泰坦难度1" }, "task_details": { "key": "worldtask_world_task_task_details_59", - "text": "装备副本boss3难度1(开支线，打狩猎)" + "text": "森林泰坦难度1" }, "npctxt": { "key": "worldtask_world_task_npctxt_59", - "text": "装备副本boss3难度1(开支线，打狩猎)" + "text": "森林泰坦难度1" }, "npc": 10570, "completetask": [ @@ -2173,7 +2173,7 @@ "completetask": [ 12070600 ], - "deliver_npc": 10588, + "deliver_npc": 0, "auto_accept": 0, "reword": [ { @@ -2209,7 +2209,7 @@ "completetask": [ 12070610 ], - "deliver_npc": 10598, + "deliver_npc": 0, "auto_accept": 0, "reword": [ { @@ -2231,15 +2231,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_62", - "text": "战斗20" + "text": "击退豺狼人" }, "task_details": { "key": "worldtask_world_task_task_details_62", - "text": "战斗20" + "text": "击退豺狼人" }, "npctxt": { "key": "worldtask_world_task_npctxt_62", - "text": "战斗20" + "text": "击退豺狼人" }, "npc": 10600, "completetask": [ @@ -2267,15 +2267,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_63", - "text": "战斗21" + "text": "击退豺狼人" }, "task_details": { "key": "worldtask_world_task_task_details_63", - "text": "战斗21" + "text": "击退豺狼人" }, "npctxt": { "key": "worldtask_world_task_npctxt_63", - "text": "战斗21" + "text": "击退豺狼人" }, "npc": 10610, "completetask": [ @@ -2315,9 +2315,9 @@ }, "npc": 10620, "completetask": [ - 12070640 + 0 ], - "deliver_npc": 10628, + "deliver_npc": 0, "auto_accept": 0, "reword": [ { @@ -2339,15 +2339,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_65", - "text": "主线【4-1】-【4-8】" + "text": "冒险4-8通关" }, "task_details": { "key": "worldtask_world_task_task_details_65", - "text": "主线【4-1】-【4-8】" + "text": "冒险4-8通关" }, "npctxt": { "key": "worldtask_world_task_npctxt_65", - "text": "主线【4-1】-【4-8】" + "text": "冒险4-8通关" }, "npc": 10630, "completetask": [ @@ -2375,15 +2375,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_66", - "text": "装备副本boss3难度1刷1次" + "text": "森林泰坦难度2" }, "task_details": { "key": "worldtask_world_task_task_details_66", - "text": "装备副本boss3难度1刷1次" + "text": "森林泰坦难度2" }, "npctxt": { "key": "worldtask_world_task_npctxt_66", - "text": "装备副本boss3难度1刷1次" + "text": "森林泰坦难度2" }, "npc": 10640, "completetask": [ @@ -2461,7 +2461,7 @@ "completetask": [ 12070680 ], - "deliver_npc": 10668, + "deliver_npc": 0, "auto_accept": 0, "reword": [ { @@ -2519,15 +2519,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_70", - "text": "关卡【5-1】-【5-8】" + "text": "冒险5-8通关" }, "task_details": { "key": "worldtask_world_task_task_details_70", - "text": "关卡【5-1】-【5-8】" + "text": "冒险5-8通关" }, "npctxt": { "key": "worldtask_world_task_npctxt_70", - "text": "关卡【5-1】-【5-8】" + "text": "冒险5-8通关" }, "npc": 10680, "completetask": [ @@ -2555,15 +2555,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_71", - "text": "战斗22" + "text": "击退豺狼人" }, "task_details": { "key": "worldtask_world_task_task_details_71", - "text": "战斗22" + "text": "击退豺狼人" }, "npctxt": { "key": "worldtask_world_task_npctxt_71", - "text": "战斗22" + "text": "击退豺狼人" }, "npc": 10690, "completetask": [ @@ -2591,15 +2591,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_72", - "text": "战斗23" + "text": "击退豺狼人" }, "task_details": { "key": "worldtask_world_task_task_details_72", - "text": "战斗23" + "text": "击退豺狼人" }, "npctxt": { "key": "worldtask_world_task_npctxt_72", - "text": "战斗23" + "text": "击退豺狼人" }, "npc": 10700, "completetask": [ @@ -2627,21 +2627,21 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_73", - "text": "穿指定套装2套(从解锁的装备boss套装里选)" + "text": "穿+6的无极神功套装" }, "task_details": { "key": "worldtask_world_task_task_details_73", - "text": "穿指定套装2套(从解锁的装备boss套装里选)" + "text": "穿+6的无极神功套装" }, "npctxt": { "key": "worldtask_world_task_npctxt_73", - "text": "穿指定套装2套(从解锁的装备boss套装里选)" + "text": "穿+6的无极神功套装" }, "npc": 10710, "completetask": [ 12070730 ], - "deliver_npc": 10718, + "deliver_npc": 0, "auto_accept": 0, "reword": [ { @@ -2663,15 +2663,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_74", - "text": "加入公会" + "text": "加入任意公会" }, "task_details": { "key": "worldtask_world_task_task_details_74", - "text": "加入公会" + "text": "加入任意公会" }, "npctxt": { "key": "worldtask_world_task_npctxt_74", - "text": "加入公会" + "text": "加入任意公会" }, "npc": 10720, "completetask": [ @@ -2699,21 +2699,21 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_75", - "text": "装备副本boss3难度2刷1次" + "text": "森林泰坦难度3" }, "task_details": { "key": "worldtask_world_task_task_details_75", - "text": "装备副本boss3难度2刷1次" + "text": "森林泰坦难度3" }, "npctxt": { "key": "worldtask_world_task_npctxt_75", - "text": "装备副本boss3难度2刷1次" + "text": "森林泰坦难度3" }, "npc": 10730, "completetask": [ 12070750 ], - "deliver_npc": 10738, + "deliver_npc": 0, "auto_accept": 0, "reword": [ { @@ -2735,15 +2735,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_76", - "text": "装备副本boss3难度5刷2次" + "text": "森林泰坦难度4" }, "task_details": { "key": "worldtask_world_task_task_details_76", - "text": "装备副本boss3难度5刷2次" + "text": "森林泰坦难度4" }, "npctxt": { "key": "worldtask_world_task_npctxt_76", - "text": "装备副本boss3难度5刷2次" + "text": "森林泰坦难度4" }, "npc": 10740, "completetask": [ @@ -2771,21 +2771,21 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_77", - "text": "守护者星座图解锁次数10次" + "text": "守护者回响解锁次数10次" }, "task_details": { "key": "worldtask_world_task_task_details_77", - "text": "守护者星座图解锁次数10次" + "text": "守护者回响解锁次数10次" }, "npctxt": { "key": "worldtask_world_task_npctxt_77", - "text": "守护者星座图解锁次数10次" + "text": "守护者回响解锁次数10次" }, "npc": 10750, "completetask": [ 12070770 ], - "deliver_npc": 10758, + "deliver_npc": 0, "auto_accept": 0, "reword": [ { @@ -2807,21 +2807,21 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_78", - "text": "守护者星座图解锁次数15次" + "text": "守护者回响解锁次数15次" }, "task_details": { "key": "worldtask_world_task_task_details_78", - "text": "守护者星座图解锁次数15次" + "text": "守护者回响解锁次数15次" }, "npctxt": { "key": "worldtask_world_task_npctxt_78", - "text": "守护者星座图解锁次数15次" + "text": "守护者回响解锁次数15次" }, "npc": 10760, "completetask": [ 12070780 ], - "deliver_npc": 10768, + "deliver_npc": 0, "auto_accept": 0, "reword": [ { @@ -2843,15 +2843,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_79", - "text": "关卡6-6" + "text": "冒险6-6通关" }, "task_details": { "key": "worldtask_world_task_task_details_79", - "text": "关卡6-6" + "text": "冒险6-6通关" }, "npctxt": { "key": "worldtask_world_task_npctxt_79", - "text": "关卡6-6" + "text": "冒险6-6通关" }, "npc": 10770, "completetask": [ @@ -2915,15 +2915,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_81", - "text": "竞技场3连胜" + "text": "竞技场3胜" }, "task_details": { "key": "worldtask_world_task_task_details_81", - "text": "竞技场3连胜" + "text": "竞技场3胜" }, "npctxt": { "key": "worldtask_world_task_npctxt_81", - "text": "竞技场3连胜" + "text": "竞技场3胜" }, "npc": 10790, "completetask": [ @@ -2951,15 +2951,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_82", - "text": "装备副本boss4难度2刷1次" + "text": "森林泰坦难度5" }, "task_details": { "key": "worldtask_world_task_task_details_82", - "text": "装备副本boss4难度2刷1次" + "text": "森林泰坦难度5" }, "npctxt": { "key": "worldtask_world_task_npctxt_82", - "text": "装备副本boss4难度2刷1次" + "text": "森林泰坦难度5" }, "npc": 10800, "completetask": [ @@ -2987,21 +2987,21 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_83", - "text": "守护者星座图解锁解锁30次" + "text": "守护者回响解锁解锁20次" }, "task_details": { "key": "worldtask_world_task_task_details_83", - "text": "守护者星座图解锁解锁30次" + "text": "守护者回响解锁解锁20次" }, "npctxt": { "key": "worldtask_world_task_npctxt_83", - "text": "守护者星座图解锁解锁30次" + "text": "守护者回响解锁解锁20次" }, "npc": 10810, "completetask": [ 12070830 ], - "deliver_npc": 10818, + "deliver_npc": 0, "auto_accept": 0, "reword": [ { @@ -3023,15 +3023,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_84", - "text": "关卡7-6" + "text": "冒险7-6通关" }, "task_details": { "key": "worldtask_world_task_task_details_84", - "text": "关卡7-6" + "text": "冒险7-6通关" }, "npctxt": { "key": "worldtask_world_task_npctxt_84", - "text": "关卡7-6" + "text": "冒险7-6通关" }, "npc": 10820, "completetask": [ @@ -3131,15 +3131,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_87", - "text": "关卡8-6" + "text": "冒险8-6通关" }, "task_details": { "key": "worldtask_world_task_task_details_87", - "text": "关卡8-6" + "text": "冒险8-6通关" }, "npctxt": { "key": "worldtask_world_task_npctxt_87", - "text": "关卡8-6" + "text": "冒险8-6通关" }, "npc": 10850, "completetask": [ @@ -3167,15 +3167,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_88", - "text": "装备副本boss4难度4刷1次" + "text": "森林泰坦难度6" }, "task_details": { "key": "worldtask_world_task_task_details_88", - "text": "装备副本boss4难度4刷1次" + "text": "森林泰坦难度6" }, "npctxt": { "key": "worldtask_world_task_npctxt_88", - "text": "装备副本boss4难度4刷1次" + "text": "森林泰坦难度6" }, "npc": 10860, "completetask": [ @@ -3239,15 +3239,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_90", - "text": "关卡9-6" + "text": "冒险9-6通关" }, "task_details": { "key": "worldtask_world_task_task_details_90", - "text": "关卡9-6" + "text": "冒险9-6通关" }, "npctxt": { "key": "worldtask_world_task_npctxt_90", - "text": "关卡9-6" + "text": "冒险9-6通关" }, "npc": 10880, "completetask": [ @@ -3275,15 +3275,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_91", - "text": "守护者星座图解锁50次" + "text": "守护者回响解锁25次" }, "task_details": { "key": "worldtask_world_task_task_details_91", - "text": "守护者星座图解锁50次" + "text": "守护者回响解锁25次" }, "npctxt": { "key": "worldtask_world_task_npctxt_91", - "text": "守护者星座图解锁50次" + "text": "守护者回响解锁25次" }, "npc": 10890, "completetask": [ @@ -3311,15 +3311,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_92", - "text": "关卡10-6" + "text": "冒险10-6通关" }, "task_details": { "key": "worldtask_world_task_task_details_92", - "text": "关卡10-6" + "text": "冒险10-6通关" }, "npctxt": { "key": "worldtask_world_task_npctxt_92", - "text": "关卡10-6" + "text": "冒险10-6通关" }, "npc": 10900, "completetask": [ @@ -3347,15 +3347,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_93", - "text": "装备副本boss4难度6刷1次" + "text": "森林泰坦难度7" }, "task_details": { "key": "worldtask_world_task_task_details_93", - "text": "装备副本boss4难度6刷1次" + "text": "森林泰坦难度7" }, "npctxt": { "key": "worldtask_world_task_npctxt_93", - "text": "装备副本boss4难度6刷1次" + "text": "森林泰坦难度7" }, "npc": 10910, "completetask": [ @@ -3419,15 +3419,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_95", - "text": "关卡11-6" + "text": "冒险11-6通关" }, "task_details": { "key": "worldtask_world_task_task_details_95", - "text": "关卡11-6" + "text": "冒险11-6通关" }, "npctxt": { "key": "worldtask_world_task_npctxt_95", - "text": "关卡11-6" + "text": "冒险11-6通关" }, "npc": 10930, "completetask": [ @@ -3491,15 +3491,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_97", - "text": "关卡12-6" + "text": "冒险12-6通关" }, "task_details": { "key": "worldtask_world_task_task_details_97", - "text": "关卡12-6" + "text": "冒险12-6通关" }, "npctxt": { "key": "worldtask_world_task_npctxt_97", - "text": "关卡12-6" + "text": "冒险12-6通关" }, "npc": 10950, "completetask": [ @@ -3527,15 +3527,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_98", - "text": "主线困难1-3" + "text": "冒险关卡困难1-3" }, "task_details": { "key": "worldtask_world_task_task_details_98", - "text": "主线困难1-3" + "text": "冒险关卡困难1-3" }, "npctxt": { "key": "worldtask_world_task_npctxt_98", - "text": "主线困难1-3" + "text": "冒险关卡困难1-3" }, "npc": 10960, "completetask": [ @@ -3563,15 +3563,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_99", - "text": "主线困难1-6" + "text": "冒险关卡困难1-6" }, "task_details": { "key": "worldtask_world_task_task_details_99", - "text": "主线困难1-6" + "text": "冒险关卡困难1-6" }, "npctxt": { "key": "worldtask_world_task_npctxt_99", - "text": "主线困难1-6" + "text": "冒险关卡困难1-6" }, "npc": 10970, "completetask": [ @@ -3599,15 +3599,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_100", - "text": "主线困难2-3" + "text": "冒险关卡困难2-3" }, "task_details": { "key": "worldtask_world_task_task_details_100", - "text": "主线困难2-3" + "text": "冒险关卡困难2-3" }, "npctxt": { "key": "worldtask_world_task_npctxt_100", - "text": "主线困难2-3" + "text": "冒险关卡困难2-3" }, "npc": 10980, "completetask": [ @@ -3635,15 +3635,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_101", - "text": "主线困难2-6" + "text": "冒险关卡困难2-6" }, "task_details": { "key": "worldtask_world_task_task_details_101", - "text": "主线困难2-6" + "text": "冒险关卡困难2-6" }, "npctxt": { "key": "worldtask_world_task_npctxt_101", - "text": "主线困难2-6" + "text": "冒险关卡困难2-6" }, "npc": 10990, "completetask": [ @@ -3671,15 +3671,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_102", - "text": "主线困难3-3" + "text": "冒险关卡困难3-3" }, "task_details": { "key": "worldtask_world_task_task_details_102", - "text": "主线困难3-3" + "text": "冒险关卡困难3-3" }, "npctxt": { "key": "worldtask_world_task_npctxt_102", - "text": "主线困难3-3" + "text": "冒险关卡困难3-3" }, "npc": 11000, "completetask": [ @@ -3707,15 +3707,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_103", - "text": "主线困难3-6" + "text": "冒险关卡困难3-6" }, "task_details": { "key": "worldtask_world_task_task_details_103", - "text": "主线困难3-6" + "text": "冒险关卡困难3-6" }, "npctxt": { "key": "worldtask_world_task_npctxt_103", - "text": "主线困难3-6" + "text": "冒险关卡困难3-6" }, "npc": 11010, "completetask": [ @@ -3743,15 +3743,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_104", - "text": "主线困难4-3" + "text": "冒险关卡困难4-3" }, "task_details": { "key": "worldtask_world_task_task_details_104", - "text": "主线困难4-3" + "text": "冒险关卡困难4-3" }, "npctxt": { "key": "worldtask_world_task_npctxt_104", - "text": "主线困难4-3" + "text": "冒险关卡困难4-3" }, "npc": 11020, "completetask": [ @@ -3779,15 +3779,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_105", - "text": "主线困难4-6" + "text": "冒险关卡困难4-6" }, "task_details": { "key": "worldtask_world_task_task_details_105", - "text": "主线困难4-6" + "text": "冒险关卡困难4-6" }, "npctxt": { "key": "worldtask_world_task_npctxt_105", - "text": "主线困难4-6" + "text": "冒险关卡困难4-6" }, "npc": 11030, "completetask": [ @@ -3815,15 +3815,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_106", - "text": "主线困难5-3" + "text": "冒险关卡困难5-3" }, "task_details": { "key": "worldtask_world_task_task_details_106", - "text": "主线困难5-3" + "text": "冒险关卡困难5-3" }, "npctxt": { "key": "worldtask_world_task_npctxt_106", - "text": "主线困难5-3" + "text": "冒险关卡困难5-3" }, "npc": 11040, "completetask": [ @@ -3851,15 +3851,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_107", - "text": "主线困难5-6" + "text": "冒险关卡困难5-6" }, "task_details": { "key": "worldtask_world_task_task_details_107", - "text": "主线困难5-6" + "text": "冒险关卡困难5-6" }, "npctxt": { "key": "worldtask_world_task_npctxt_107", - "text": "主线困难5-6" + "text": "冒险关卡困难5-6" }, "npc": 11050, "completetask": [ @@ -3887,15 +3887,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_108", - "text": "主线困难6-3" + "text": "冒险关卡困难6-3" }, "task_details": { "key": "worldtask_world_task_task_details_108", - "text": "主线困难6-3" + "text": "冒险关卡困难6-3" }, "npctxt": { "key": "worldtask_world_task_npctxt_108", - "text": "主线困难6-3" + "text": "冒险关卡困难6-3" }, "npc": 11060, "completetask": [ @@ -3923,15 +3923,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_109", - "text": "主线困难6-6" + "text": "冒险关卡困难6-6" }, "task_details": { "key": "worldtask_world_task_task_details_109", - "text": "主线困难6-6" + "text": "冒险关卡困难6-6" }, "npctxt": { "key": "worldtask_world_task_npctxt_109", - "text": "主线困难6-6" + "text": "冒险关卡困难6-6" }, "npc": 11070, "completetask": [ @@ -3959,15 +3959,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_110", - "text": "主线困难7-3" + "text": "冒险关卡困难7-3" }, "task_details": { "key": "worldtask_world_task_task_details_110", - "text": "主线困难7-3" + "text": "冒险关卡困难7-3" }, "npctxt": { "key": "worldtask_world_task_npctxt_110", - "text": "主线困难7-3" + "text": "冒险关卡困难7-3" }, "npc": 11080, "completetask": [ @@ -3995,15 +3995,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_111", - "text": "主线困难7-6" + "text": "冒险关卡困难7-6" }, "task_details": { "key": "worldtask_world_task_task_details_111", - "text": "主线困难7-6" + "text": "冒险关卡困难7-6" }, "npctxt": { "key": "worldtask_world_task_npctxt_111", - "text": "主线困难7-6" + "text": "冒险关卡困难7-6" }, "npc": 11090, "completetask": [ @@ -4031,15 +4031,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_112", - "text": "主线困难8-3" + "text": "冒险关卡困难8-3" }, "task_details": { "key": "worldtask_world_task_task_details_112", - "text": "主线困难8-3" + "text": "冒险关卡困难8-3" }, "npctxt": { "key": "worldtask_world_task_npctxt_112", - "text": "主线困难8-3" + "text": "冒险关卡困难8-3" }, "npc": 11100, "completetask": [ @@ -4067,15 +4067,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_113", - "text": "主线困难8-6" + "text": "冒险关卡困难8-6" }, "task_details": { "key": "worldtask_world_task_task_details_113", - "text": "主线困难8-6" + "text": "冒险关卡困难8-6" }, "npctxt": { "key": "worldtask_world_task_npctxt_113", - "text": "主线困难8-6" + "text": "冒险关卡困难8-6" }, "npc": 11110, "completetask": [ @@ -4103,15 +4103,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_114", - "text": "主线困难9-3" + "text": "冒险关卡困难9-3" }, "task_details": { "key": "worldtask_world_task_task_details_114", - "text": "主线困难9-3" + "text": "冒险关卡困难9-3" }, "npctxt": { "key": "worldtask_world_task_npctxt_114", - "text": "主线困难9-3" + "text": "冒险关卡困难9-3" }, "npc": 11120, "completetask": [ @@ -4139,15 +4139,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_115", - "text": "主线困难9-6" + "text": "冒险关卡困难9-6" }, "task_details": { "key": "worldtask_world_task_task_details_115", - "text": "主线困难9-6" + "text": "冒险关卡困难9-6" }, "npctxt": { "key": "worldtask_world_task_npctxt_115", - "text": "主线困难9-6" + "text": "冒险关卡困难9-6" }, "npc": 11130, "completetask": [ @@ -4175,15 +4175,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_116", - "text": "主线困难10-3" + "text": "冒险关卡困难10-3" }, "task_details": { "key": "worldtask_world_task_task_details_116", - "text": "主线困难10-3" + "text": "冒险关卡困难10-3" }, "npctxt": { "key": "worldtask_world_task_npctxt_116", - "text": "主线困难10-3" + "text": "冒险关卡困难10-3" }, "npc": 11140, "completetask": [ @@ -4211,15 +4211,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_117", - "text": "主线困难10-6" + "text": "冒险关卡困难10-6" }, "task_details": { "key": "worldtask_world_task_task_details_117", - "text": "主线困难10-6" + "text": "冒险关卡困难10-6" }, "npctxt": { "key": "worldtask_world_task_npctxt_117", - "text": "主线困难10-6" + "text": "冒险关卡困难10-6" }, "npc": 11150, "completetask": [ @@ -4247,15 +4247,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_118", - "text": "主线困难11-3" + "text": "冒险关卡困难11-3" }, "task_details": { "key": "worldtask_world_task_task_details_118", - "text": "主线困难11-3" + "text": "冒险关卡困难11-3" }, "npctxt": { "key": "worldtask_world_task_npctxt_118", - "text": "主线困难11-3" + "text": "冒险关卡困难11-3" }, "npc": 11160, "completetask": [ @@ -4283,15 +4283,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_119", - "text": "主线困难11-6" + "text": "冒险关卡困难11-6" }, "task_details": { "key": "worldtask_world_task_task_details_119", - "text": "主线困难11-6" + "text": "冒险关卡困难11-6" }, "npctxt": { "key": "worldtask_world_task_npctxt_119", - "text": "主线困难11-6" + "text": "冒险关卡困难11-6" }, "npc": 11170, "completetask": [ @@ -4319,15 +4319,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_120", - "text": "主线困难12-3" + "text": "冒险关卡困难12-3" }, "task_details": { "key": "worldtask_world_task_task_details_120", - "text": "主线困难12-3" + "text": "冒险关卡困难12-3" }, "npctxt": { "key": "worldtask_world_task_npctxt_120", - "text": "主线困难12-3" + "text": "冒险关卡困难12-3" }, "npc": 11180, "completetask": [ @@ -4355,15 +4355,15 @@ "icon": "", "task_name": { "key": "worldtask_world_task_task_name_121", - "text": "主线困难12-6" + "text": "冒险关卡困难12-6" }, "task_details": { "key": "worldtask_world_task_task_details_121", - "text": "主线困难12-6" + "text": "冒险关卡困难12-6" }, "npctxt": { "key": "worldtask_world_task_npctxt_121", - "text": "主线困难12-6" + "text": "冒险关卡困难12-6" }, "npc": 11190, "completetask": [ diff --git a/comm/imodule.go b/comm/imodule.go index 5ea5437e8..eb49be119 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -55,7 +55,7 @@ type ( ///添加单个物品到背包 (可以加物品和减物品) AddItem(session IUserSession, itemid string, addnum int32, bPush bool) (errdata *pb.ErrorData) ///添加多个物品到背包 (可以加物品和减物品) - AddItems(session IUserSession, items map[string]int32, bPush bool) (change []*pb.DB_UserItemData, errdata *pb.ErrorData) + AddItems(session IUserSession, items map[string]int32, bPush bool) (change []*pb.UserAtno, errdata *pb.ErrorData) ///清理道具 CleanItems(session IUserSession) (errdata *pb.ErrorData) ///购买统一入场券 diff --git a/modules/equipment/api_wash.go b/modules/equipment/api_wash.go index 5fe9e5401..6642d9f5b 100644 --- a/modules/equipment/api_wash.go +++ b/modules/equipment/api_wash.go @@ -64,14 +64,18 @@ func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) ( } adverbEntry = make([]*pb.EquipmentAttributeEntry, len(equip.AdverbEntry)) - for i, v := range comm.RandShuffle(len(equip.AdverbEntry)) { - adverbEntry[i] = &pb.EquipmentAttributeEntry{ - Id: attrlibrarys[v].Key, - Libraryid: attrlibrarys[v].Libraryid, - Lv: equip.AdverbEntry[i].Lv, - AttrName: attrlibrarys[v].Attrkey, - BaseValue: attrlibrarys[v].Attrvar, - Value: attrlibrarys[v].Attrvar + int32(float64(attrlibrarys[v].Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrarys[v].AttrvarCorrect)), + for i, v := range comm.RandShuffle(len(attrlibrarys)) { + if i < len(equip.AdverbEntry) { + adverbEntry[i] = &pb.EquipmentAttributeEntry{ + Id: attrlibrarys[v].Key, + Libraryid: attrlibrarys[v].Libraryid, + Lv: equip.AdverbEntry[i].Lv, + AttrName: attrlibrarys[v].Attrkey, + BaseValue: attrlibrarys[v].Attrvar, + Value: attrlibrarys[v].Attrvar + int32(float64(attrlibrarys[v].Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrarys[v].Attrvar)), + } + } else { + break } } // this.module.ModuleRtask.SendToRtask(session, comm.Rtype95, 1) diff --git a/modules/items/modelitems.go b/modules/items/modelitems.go index 2222624e6..ee603a3e4 100644 --- a/modules/items/modelitems.go +++ b/modules/items/modelitems.go @@ -390,10 +390,12 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte num = int64(v.Amount) + int64(leftnum) if num < 0 { leftnum += int64(v.Amount) + v.Change = -1 * int32(v.Amount) v.Amount = 0 del = append(del, v) } else if num > 0 && num < int64(v.Amount) { leftnum = 0 + v.Change = int32(num) - int32(v.Amount) v.Amount = uint32(num) update = append(update, v) break @@ -401,6 +403,7 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte if conf.UpperLimit > 0 { if num <= int64(conf.UpperLimit) { leftnum = 0 + v.Change = int32(num) - int32(v.Amount) v.Amount = uint32(num) update = append(update, v) break @@ -413,6 +416,7 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte } } else { leftnum = 0 + v.Change = int32(num) - int32(v.Amount) v.Amount = uint32(num) update = append(update, v) } @@ -434,6 +438,7 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte GridId: primitive.NewObjectID().Hex(), UId: uid, ItemId: itemId, + Change: int32(leftnum), Amount: uint32(leftnum), CTime: configure.Now().Unix(), IsNewItem: isNew, @@ -451,6 +456,7 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte GridId: primitive.NewObjectID().Hex(), UId: uid, ItemId: itemId, + Change: int32(conf.UpperLimit), Amount: uint32(conf.UpperLimit), CTime: configure.Now().Unix(), IsNewItem: isNew, diff --git a/modules/items/module.go b/modules/items/module.go index 58cf03a3d..06c578421 100644 --- a/modules/items/module.go +++ b/modules/items/module.go @@ -34,19 +34,19 @@ type Items struct { configure *ConfigureComp } -//模块名称 +// 模块名称 func (this *Items) GetType() core.M_Modules { return comm.ModuleItems } -//模块初始化接口 注册用户创建角色事件 +// 模块初始化接口 注册用户创建角色事件 func (this *Items) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { err = this.ModuleBase.Init(service, module, options) this.service = service.(base.IRPCXService) return } -//模块启动 +// 模块启动 func (this *Items) Start() (err error) { err = this.ModuleBase.Start() var module core.IModule @@ -58,7 +58,7 @@ func (this *Items) Start() (err error) { return } -//装备组件 +// 装备组件 func (this *Items) OnInstallComp() { this.ModuleBase.OnInstallComp() this.api = this.RegisterComp(new(apiComp)).(*apiComp) @@ -66,13 +66,13 @@ func (this *Items) OnInstallComp() { this.configure = this.RegisterComp(new(ConfigureComp)).(*ConfigureComp) } -//Event------------------------------------------------------------------------------------------------------------ +// Event------------------------------------------------------------------------------------------------------------ func (this *Items) EventUserOffline(uid, sessionid string) { this.modelItems.BatchDelLists(uid) } -//IItems------------------------------------------------------------------------------------------------------------------------------- -///查询用户背包物品数量 +// IItems------------------------------------------------------------------------------------------------------------------------------- +// /查询用户背包物品数量 func (this *Items) QueryItemAmount(uId string, itemid string) (amount uint32) { defer this.Debugf("获取物品 uId:%s itemid:%s addnum:%d ", uId, itemid, amount) amount = 0 @@ -82,7 +82,7 @@ func (this *Items) QueryItemAmount(uId string, itemid string) (amount uint32) { return } -///查询用户背包多个物品数量 +// /查询用户背包多个物品数量 func (this *Items) QueryItemsAmount(uId string, itemid ...string) (result map[string]uint32) { result = this.modelItems.QueryUserPackItemsAmount(uId, itemid...) return @@ -124,7 +124,7 @@ func (this *Items) AddItemforGrid(session comm.IUserSession, gridid string, addn return } -///添加单个物品到背包 (可以加物品和减物品) +// /添加单个物品到背包 (可以加物品和减物品) func (this *Items) AddItem(session comm.IUserSession, itemid string, addnum int32, bPush bool) (errdata *pb.ErrorData) { var ( err error @@ -161,15 +161,17 @@ func (this *Items) AddItem(session comm.IUserSession, itemid string, addnum int3 return } -///添加多个物品到背包 (可以加物品和减物品) -func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, bPush bool) (change []*pb.DB_UserItemData, errdata *pb.ErrorData) { +// /添加多个物品到背包 (可以加物品和减物品) +func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, bPush bool) (change []*pb.UserAtno, errdata *pb.ErrorData) { var ( - tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0) - err error + tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0) + _change []*pb.DB_UserItemData + err error ) defer this.Debugf("给用户添加物品 uId:%s items:%v items:%v", session.GetUserId(), items, err == nil) - if change, err = this.modelItems.AddItemsToUserPack(session.GetUserId(), items); err != nil { + change = make([]*pb.UserAtno, 0) + if _change, err = this.modelItems.AddItemsToUserPack(session.GetUserId(), items); err != nil { this.Errorf("给用户添加物品 uId:%s items:%v err:%v", session.GetUserId(), items, err) if err == ItemNotEnoughError { errdata = &pb.ErrorData{ @@ -198,8 +200,16 @@ func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, b } return } - if len(change) > 0 && bPush { - this.itemsChangePush(session, change) //推送道具背包变化 + for _, v := range _change { + change = append(change, &pb.UserAtno{ + A: comm.ItemType, + T: v.ItemId, + N: v.Change, + O: v.GridId, + }) + } + if len(_change) > 0 && bPush { + this.itemsChangePush(session, _change) //推送道具背包变化 } for k, v := range items { if v > 0 { @@ -213,12 +223,12 @@ func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, b return } -//使用物品 +// 使用物品 func (this *Items) UseItem(session comm.IUserSession, gid string, amount int32, slt int32) (errdata *pb.ErrorData) { return this.modelItems.useitem(session, gid, amount, slt) } -//清理背包 +// 清理背包 func (this *Items) CleanItems(session comm.IUserSession) (errdata *pb.ErrorData) { var ( err error @@ -236,19 +246,19 @@ func (this *Items) CleanItems(session comm.IUserSession) (errdata *pb.ErrorData) return } -//购买门票道具 +// 购买门票道具 func (this *Items) BuyUnifiedTicket(session comm.IUserSession, buynum int32) (errdata *pb.ErrorData) { _, errdata = this.modelItems.buyTicket(session, buynum) return } -//回复道具 +// 回复道具 func (this *Items) RecoverTicket(session comm.IUserSession) (errdata *pb.ErrorData) { errdata = this.modelItems.recoverTicket(session) return } -//出售道具 +// 出售道具 func (this *Items) SellItem(session comm.IUserSession, items map[string]int32, bPush bool) (errdata *pb.ErrorData, atno []*pb.UserAtno) { var ( grids []string = make([]string, 0, len(items)) @@ -334,8 +344,8 @@ func (this *Items) SellItem(session comm.IUserSession, items map[string]int32, b return } -//Evens-------------------------------------------------------------------------------------------------------------------------------- -//推送道具变化消息 +// Evens-------------------------------------------------------------------------------------------------------------------------------- +// 推送道具变化消息 func (this *Items) itemsChangePush(session comm.IUserSession, items []*pb.DB_UserItemData) (err error) { session.SendMsg(string(this.GetType()), "change", &pb.ItemsChangePush{Grids: items}) return diff --git a/modules/modulebase.go b/modules/modulebase.go index 5306295a8..957f1ef16 100644 --- a/modules/modulebase.go +++ b/modules/modulebase.go @@ -684,16 +684,10 @@ func (this *ModuleBase) DispenseAtno(session comm.IUserSession, res []*cfg.Gamea } } if len(items) > 0 { //道具资源 - addItems, code := this.ModuleItems.AddItems(session, items, bPush) - this.Debugf("发放道具资源: %v [%v]", items, code) - for _, v := range addItems { - atno = append(atno, &pb.UserAtno{ - A: "item", - T: v.ItemId, - N: int32(len(items)), - O: v.GridId, - }) - } + _atno, code := this.ModuleItems.AddItems(session, items, bPush) + errdata = code + atno = append(atno, _atno...) + this.Debugf("发放道具资源: %v [%v]", _atno, code) } if len(heros) > 0 { //卡片资源 hero, atn, code := this.ModuleHero.CreateRepeatHeros(session, heros, bPush) diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index eca9cd0e8..1d450fcf6 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -140,7 +140,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal res = append(res, v) } } - res = append(res, vikingCfg.Manexp...) //给玩家加经验 + if errdata, atno = this.module.DispenseAtno(session, res, true); errdata != nil { return } diff --git a/pb/hero_db.pb.go b/pb/hero_db.pb.go index 2683e9124..c404896a5 100644 --- a/pb/hero_db.pb.go +++ b/pb/hero_db.pb.go @@ -321,8 +321,8 @@ type DBHeroRecord struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID 主键id Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID - Star4 int32 `protobuf:"varint,3,opt,name=star4,proto3" json:"star4"` // 4星保底 -- 新版抽卡废弃字段 - Star5 int32 `protobuf:"varint,4,opt,name=star5,proto3" json:"star5"` // 5星保底 -- 新版抽卡废弃字段 + Star4 int32 `protobuf:"varint,3,opt,name=star4,proto3" json:"star4"` // 4星保底 + Star5 int32 `protobuf:"varint,4,opt,name=star5,proto3" json:"star5"` // 5星保底 Mtime int64 `protobuf:"varint,5,opt,name=mtime,proto3" json:"mtime"` // 修改时间 Drawcount int32 `protobuf:"varint,6,opt,name=drawcount,proto3" json:"drawcount"` // 普通卡牌累计抽取次数 Condition map[string]int32 `protobuf:"bytes,7,rep,name=condition,proto3" json:"condition" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key recharge、login 等 value 累计抽卡次数 @@ -334,9 +334,6 @@ type DBHeroRecord struct { Inevitable int32 `protobuf:"varint,13,opt,name=inevitable,proto3" json:"inevitable"` //第2-30次抽奖必出一个5星英雄 Inevitable1 int32 `protobuf:"varint,14,opt,name=inevitable1,proto3" json:"inevitable1"` //第30-50次抽奖必出一个5星英雄 Race map[int32]int32 `protobuf:"bytes,15,rep,name=race,proto3" json:"race" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 阵营类型 value count - Baodi4 map[int32]int32 `protobuf:"bytes,16,rep,name=baodi4,proto3" json:"baodi4" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 4星保底次数 key 阵营类型 value count - Baodi5 map[int32]int32 `protobuf:"bytes,17,rep,name=baodi5,proto3" json:"baodi5" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 5星保底次数 key 阵营类型 value count - Count map[int32]int32 `protobuf:"bytes,18,rep,name=count,proto3" json:"count" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 抽卡次数 key 阵营类型 value count } func (x *DBHeroRecord) Reset() { @@ -476,27 +473,6 @@ func (x *DBHeroRecord) GetRace() map[int32]int32 { return nil } -func (x *DBHeroRecord) GetBaodi4() map[int32]int32 { - if x != nil { - return x.Baodi4 - } - return nil -} - -func (x *DBHeroRecord) GetBaodi5() map[int32]int32 { - if x != nil { - return x.Baodi5 - } - return nil -} - -func (x *DBHeroRecord) GetCount() map[int32]int32 { - if x != nil { - return x.Count - } - return nil -} - // 英雄天赋系统 type DBHeroTalent struct { state protoimpl.MessageState @@ -658,7 +634,7 @@ var file_hero_hero_db_proto_rawDesc = []byte{ 0x3a, 0x0a, 0x0c, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xde, 0x07, 0x0a, 0x0c, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x98, 0x05, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, @@ -689,54 +665,33 @@ var file_hero_hero_db_proto_rawDesc = []byte{ 0x62, 0x6c, 0x65, 0x31, 0x12, 0x2b, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x72, 0x61, 0x63, - 0x65, 0x12, 0x31, 0x0a, 0x06, 0x62, 0x61, 0x6f, 0x64, 0x69, 0x34, 0x18, 0x10, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, - 0x2e, 0x42, 0x61, 0x6f, 0x64, 0x69, 0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x62, 0x61, - 0x6f, 0x64, 0x69, 0x34, 0x12, 0x31, 0x0a, 0x06, 0x62, 0x61, 0x6f, 0x64, 0x69, 0x35, 0x18, 0x11, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, - 0x6f, 0x72, 0x64, 0x2e, 0x42, 0x61, 0x6f, 0x64, 0x69, 0x35, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, - 0x06, 0x62, 0x61, 0x6f, 0x64, 0x69, 0x35, 0x12, 0x2e, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x18, 0x12, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, - 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x1a, 0x3c, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, - 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, - 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, - 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, - 0x42, 0x61, 0x6f, 0x64, 0x69, 0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, - 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x42, 0x61, 0x6f, 0x64, 0x69, - 0x35, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, - 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, - 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb6, 0x01, 0x0a, - 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, - 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, - 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, - 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, - 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, - 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x52, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, - 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a, 0x2f, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, - 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c, - 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4b, 0x6f, - 0x6e, 0x67, 0x46, 0x75, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x1a, 0x3c, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, + 0x3c, 0x0a, 0x0e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, + 0x09, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb6, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, + 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, + 0x6f, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, + 0x64, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, + 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61, + 0x6c, 0x65, 0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a, + 0x2f, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x48, + 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, + 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x10, 0x01, + 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -752,7 +707,7 @@ func file_hero_hero_db_proto_rawDescGZIP() []byte { } var file_hero_hero_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 16) +var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 13) var file_hero_hero_db_proto_goTypes = []interface{}{ (HeroType)(0), // 0: HeroType (*DBHero)(nil), // 1: DBHero @@ -767,36 +722,30 @@ var file_hero_hero_db_proto_goTypes = []interface{}{ nil, // 10: DBHeroRecord.ConditionEntry nil, // 11: DBHeroRecord.Star5HeroEntry nil, // 12: DBHeroRecord.RaceEntry - nil, // 13: DBHeroRecord.Baodi4Entry - nil, // 14: DBHeroRecord.Baodi5Entry - nil, // 15: DBHeroRecord.CountEntry - nil, // 16: DBHeroTalent.TalentEntry - (*SkillData)(nil), // 17: SkillData - (*DB_EquipmentSuit)(nil), // 18: DB_EquipmentSuit + nil, // 13: DBHeroTalent.TalentEntry + (*SkillData)(nil), // 14: SkillData + (*DB_EquipmentSuit)(nil), // 15: DB_EquipmentSuit } var file_hero_hero_db_proto_depIdxs = []int32{ - 17, // 0: DBHero.normalSkill:type_name -> SkillData + 14, // 0: DBHero.normalSkill:type_name -> SkillData 4, // 1: DBHero.property:type_name -> DBHero.PropertyEntry 5, // 2: DBHero.addProperty:type_name -> DBHero.AddPropertyEntry 6, // 3: DBHero.juexProperty:type_name -> DBHero.JuexPropertyEntry 0, // 4: DBHero.status:type_name -> HeroType - 18, // 5: DBHero.suits:type_name -> DB_EquipmentSuit + 15, // 5: DBHero.suits:type_name -> DB_EquipmentSuit 7, // 6: DBHero.talentProperty:type_name -> DBHero.TalentPropertyEntry - 17, // 7: DBHero.equipSkill:type_name -> SkillData + 14, // 7: DBHero.equipSkill:type_name -> SkillData 8, // 8: DBHero.horoscopeProperty:type_name -> DBHero.HoroscopePropertyEntry 9, // 9: DBHero.fetters:type_name -> DBHero.FettersEntry 10, // 10: DBHeroRecord.condition:type_name -> DBHeroRecord.ConditionEntry 11, // 11: DBHeroRecord.star5Hero:type_name -> DBHeroRecord.Star5HeroEntry 12, // 12: DBHeroRecord.race:type_name -> DBHeroRecord.RaceEntry - 13, // 13: DBHeroRecord.baodi4:type_name -> DBHeroRecord.Baodi4Entry - 14, // 14: DBHeroRecord.baodi5:type_name -> DBHeroRecord.Baodi5Entry - 15, // 15: DBHeroRecord.count:type_name -> DBHeroRecord.CountEntry - 16, // 16: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry - 17, // [17:17] is the sub-list for method output_type - 17, // [17:17] is the sub-list for method input_type - 17, // [17:17] is the sub-list for extension type_name - 17, // [17:17] is the sub-list for extension extendee - 0, // [0:17] is the sub-list for field type_name + 13, // 13: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry + 14, // [14:14] is the sub-list for method output_type + 14, // [14:14] is the sub-list for method input_type + 14, // [14:14] is the sub-list for extension type_name + 14, // [14:14] is the sub-list for extension extendee + 0, // [0:14] is the sub-list for field type_name } func init() { file_hero_hero_db_proto_init() } @@ -850,7 +799,7 @@ func file_hero_hero_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_hero_hero_db_proto_rawDesc, NumEnums: 1, - NumMessages: 16, + NumMessages: 13, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/items_db.pb.go b/pb/items_db.pb.go index de5a87120..1530730aa 100644 --- a/pb/items_db.pb.go +++ b/pb/items_db.pb.go @@ -28,12 +28,13 @@ type DB_UserItemData struct { GridId string `protobuf:"bytes,1,opt,name=gridId,proto3" json:"gridId" bson:"_id"` // 背包格子Id UId string `protobuf:"bytes,2,opt,name=uId,proto3" json:"uId" bson:"uid"` // 用户id - ItemId string `protobuf:"bytes,3,opt,name=itemId,proto3" json:"itemId" bson:"itemId"` // 存放物品的Id + ItemId string `protobuf:"bytes,3,opt,name=itemId,proto3" json:"itemId" bson:"itemId"` // 存放物品的Id Amount uint32 `protobuf:"varint,4,opt,name=amount,proto3" json:"amount" bson:"amount"` // 存放物品的数量 - CTime int64 `protobuf:"varint,5,opt,name=cTime,proto3" json:"cTime" bson:"cTime"` // 物品获取时间 - ETime int64 `protobuf:"varint,6,opt,name=eTime,proto3" json:"eTime" bson:"eTime"` // 物品过期时间 - IsNewItem bool `protobuf:"varint,7,opt,name=isNewItem,proto3" json:"isNewItem" bson:"isNewItem"` // 是否是新的 - Lastopt int64 `protobuf:"varint,8,opt,name=lastopt,proto3" json:"lastopt" bson:"lastopt"` // 最后操作时间 + Change int32 `protobuf:"varint,5,opt,name=change,proto3" json:"change" bson:"change"` // 最后一次变化量 + CTime int64 `protobuf:"varint,6,opt,name=cTime,proto3" json:"cTime" bson:"cTime"` // 物品获取时间 + ETime int64 `protobuf:"varint,7,opt,name=eTime,proto3" json:"eTime" bson:"eTime"` // 物品过期时间 + IsNewItem bool `protobuf:"varint,8,opt,name=isNewItem,proto3" json:"isNewItem" bson:"isNewItem"` // 是否是新的 + Lastopt int64 `protobuf:"varint,9,opt,name=lastopt,proto3" json:"lastopt" bson:"lastopt"` // 最后操作时间 } func (x *DB_UserItemData) Reset() { @@ -96,6 +97,13 @@ func (x *DB_UserItemData) GetAmount() uint32 { return 0 } +func (x *DB_UserItemData) GetChange() int32 { + if x != nil { + return x.Change + } + return 0 +} + func (x *DB_UserItemData) GetCTime() int64 { if x != nil { return x.CTime @@ -128,21 +136,22 @@ var File_items_items_db_proto protoreflect.FileDescriptor var file_items_items_db_proto_rawDesc = []byte{ 0x0a, 0x14, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x5f, 0x64, 0x62, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xcf, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x5f, 0x55, 0x73, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe7, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x5f, 0x55, 0x73, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x72, 0x69, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x67, 0x72, 0x69, 0x64, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x61, 0x6d, - 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, - 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, - 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x4e, 0x65, 0x77, 0x49, 0x74, 0x65, 0x6d, 0x18, 0x07, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x4e, 0x65, 0x77, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x18, - 0x0a, 0x07, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x07, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, + 0x63, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x54, 0x69, + 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x4e, 0x65, + 0x77, 0x49, 0x74, 0x65, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x4e, + 0x65, 0x77, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, + 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x74, + 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/sys/configure/structs/Game.BattleReadyData.go b/sys/configure/structs/Game.BattleReadyData.go index 904f7d592..cea2546c8 100644 --- a/sys/configure/structs/Game.BattleReadyData.go +++ b/sys/configure/structs/Game.BattleReadyData.go @@ -18,6 +18,7 @@ type GameBattleReadyData struct { BattleScenes []string DisableAiCamera int32 DefaultHero int32 + ChoseHero []string DisableHero []string LockSlots []int32 AssistTeam int32 @@ -52,6 +53,20 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["disableAiCamera"].(float64); !_ok_ { err = errors.New("disableAiCamera error"); return }; _v.DisableAiCamera = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DefaultHero"].(float64); !_ok_ { err = errors.New("DefaultHero error"); return }; _v.DefaultHero = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["ChoseHero"].([]interface{}); !_ok_ { err = errors.New("ChoseHero error"); return } + + _v.ChoseHero = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.ChoseHero = append(_v.ChoseHero, _list_v_) + } + } + { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Game.RobotData.go b/sys/configure/structs/Game.RobotData.go index 2dbf0571f..2c08b4d31 100644 --- a/sys/configure/structs/Game.RobotData.go +++ b/sys/configure/structs/Game.RobotData.go @@ -47,7 +47,7 @@ func (_v *GameRobotData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["robotid"].(float64); !_ok_ { err = errors.New("robotid error"); return }; _v.Robotid = int32(_tempNum_) } { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lvshow"].(float64); !_ok_ { err = errors.New("lvshow error"); return }; _v.Lvshow = int32(_tempNum_) } - { var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name error"); return } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hero1"].(float64); !_ok_ { err = errors.New("hero1 error"); return }; _v.Hero1 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lv1"].(float64); !_ok_ { err = errors.New("lv1 error"); return }; _v.Lv1 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star1"].(float64); !_ok_ { err = errors.New("star1 error"); return }; _v.Star1 = int32(_tempNum_) } diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index a41cf396d..41008685c 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -114,6 +114,7 @@ type GameGlobalData struct { ArenaTicketMax int32 ArenaTicketRecoveryTime int32 ArenaTicketCos *Gameatn + ArenaBuy []*Gameatn VikingExpeditionRecoveryTime int32 CopsRecoveryTime int32 CopsInitialNum int32 @@ -492,6 +493,20 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ArenaTicket_max"].(float64); !_ok_ { err = errors.New("ArenaTicket_max error"); return }; _v.ArenaTicketMax = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ArenaTicket_RecoveryTime"].(float64); !_ok_ { err = errors.New("ArenaTicket_RecoveryTime error"); return }; _v.ArenaTicketRecoveryTime = int32(_tempNum_) } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["ArenaTicket_cos"].(map[string]interface{}); !_ok_ { err = errors.New("ArenaTicket_cos error"); return }; if _v.ArenaTicketCos, err = DeserializeGameatn(_x_); err != nil { return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["Arena_buy"].([]interface{}); !_ok_ { err = errors.New("Arena_buy error"); return } + + _v.ArenaBuy = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.ArenaBuy = append(_v.ArenaBuy, _list_v_) + } + } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["VikingExpedition_RecoveryTime"].(float64); !_ok_ { err = errors.New("VikingExpedition_RecoveryTime error"); return }; _v.VikingExpeditionRecoveryTime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cops_RecoveryTime"].(float64); !_ok_ { err = errors.New("cops_RecoveryTime error"); return }; _v.CopsRecoveryTime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cops_InitialNum"].(float64); !_ok_ { err = errors.New("cops_InitialNum error"); return }; _v.CopsInitialNum = int32(_tempNum_) }