liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
meixiongfeng 2024-01-08 17:17:54 +08:00
commit 16ed4231ec
44 changed files with 2351 additions and 846 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

271
bin/json/game_annulartask_library.json
View File

@ -4,134 +4,287 @@
"assembleid": 60000010, "assembleid": 60000010,
"lvstart": 1, "lvstart": 1,
"lvend": 999, "lvend": 999,
"itemid": 1130, "itemid": 1010,
"itemwt": 400, "itemwt": 100,
"min": 0 "min": 0
}, },
{ {
"id": 3, "id": 3,
"assembleid": 60000010,
"lvstart": 1,
"lvend": 999,
"itemid": 1180,
"itemwt": 300,
"min": 0
},
{
"id": 5,
"assembleid": 60000010,
"lvstart": 1,
"lvend": 999,
"itemid": 1290,
"itemwt": 300,
"min": 0
},
{
"id": 7,
"assembleid": 60000020,
"lvstart": 1,
"lvend": 999,
"itemid": 1010,
"itemwt": 400,
"min": 0
},
{
"id": 9,
"assembleid": 60000020, "assembleid": 60000020,
"lvstart": 1, "lvstart": 1,
"lvend": 999, "lvend": 999,
"itemid": 1020, "itemid": 1020,
"itemwt": 400, "itemwt": 100,
"min": 0
},
{
"id": 5,
"assembleid": 60000030,
"lvstart": 1,
"lvend": 999,
"itemid": 1030,
"itemwt": 100,
"min": 0
},
{
"id": 7,
"assembleid": 60000040,
"lvstart": 1,
"lvend": 999,
"itemid": 1040,
"itemwt": 100,
"min": 0
},
{
"id": 9,
"assembleid": 60000050,
"lvstart": 1,
"lvend": 999,
"itemid": 1050,
"itemwt": 100,
"min": 0 "min": 0
}, },
{ {
"id": 11, "id": 11,
"assembleid": 60000020, "assembleid": 60000060,
"lvstart": 1, "lvstart": 1,
"lvend": 999, "lvend": 999,
"itemid": 1190, "itemid": 1060,
"itemwt": 300, "itemwt": 100,
"min": 0 "min": 0
}, },
{ {
"id": 13, "id": 13,
"assembleid": 60000020, "assembleid": 60000070,
"lvstart": 1, "lvstart": 1,
"lvend": 999, "lvend": 999,
"itemid": 1300, "itemid": 1080,
"itemwt": 300, "itemwt": 100,
"min": 0 "min": 0
}, },
{ {
"id": 15, "id": 15,
"assembleid": 60000030, "assembleid": 60000080,
"lvstart": 1, "lvstart": 1,
"lvend": 999, "lvend": 999,
"itemid": 1200, "itemid": 1090,
"itemwt": 400, "itemwt": 100,
"min": 0 "min": 0
}, },
{ {
"id": 17, "id": 17,
"assembleid": 60000030, "assembleid": 60000090,
"lvstart": 1, "lvstart": 1,
"lvend": 999, "lvend": 999,
"itemid": 1260, "itemid": 1100,
"itemwt": 300, "itemwt": 100,
"min": 0 "min": 0
}, },
{ {
"id": 19, "id": 19,
"assembleid": 60000030, "assembleid": 60000100,
"lvstart": 1, "lvstart": 1,
"lvend": 999, "lvend": 999,
"itemid": 1310, "itemid": 1110,
"itemwt": 300, "itemwt": 100,
"min": 0 "min": 0
}, },
{ {
"id": 21, "id": 21,
"assembleid": 60000040, "assembleid": 60000110,
"lvstart": 1, "lvstart": 1,
"lvend": 999, "lvend": 999,
"itemid": 1210, "itemid": 1120,
"itemwt": 400, "itemwt": 100,
"min": 0 "min": 0
}, },
{ {
"id": 23, "id": 23,
"assembleid": 60000040, "assembleid": 60000120,
"lvstart": 1, "lvstart": 1,
"lvend": 999, "lvend": 999,
"itemid": 1120, "itemid": 1130,
"itemwt": 300, "itemwt": 100,
"min": 0 "min": 0
}, },
{ {
"id": 25, "id": 25,
"assembleid": 60000040, "assembleid": 60000130,
"lvstart": 1, "lvstart": 1,
"lvend": 999, "lvend": 999,
"itemid": 1320, "itemid": 1140,
"itemwt": 300, "itemwt": 100,
"min": 0 "min": 0
}, },
{ {
"id": 27, "id": 27,
"assembleid": 60000050, "assembleid": 60000140,
"lvstart": 1, "lvstart": 1,
"lvend": 999, "lvend": 999,
"itemid": 1220, "itemid": 1150,
"itemwt": 500, "itemwt": 100,
"min": 0 "min": 0
}, },
{ {
"id": 29, "id": 29,
"assembleid": 60000050, "assembleid": 60000150,
"lvstart": 1,
"lvend": 999,
"itemid": 1160,
"itemwt": 100,
"min": 0
},
{
"id": 30,
"assembleid": 60000160,
"lvstart": 1,
"lvend": 999,
"itemid": 1170,
"itemwt": 100,
"min": 0
},
{
"id": 31,
"assembleid": 60000170,
"lvstart": 1,
"lvend": 999,
"itemid": 1180,
"itemwt": 100,
"min": 0
},
{
"id": 32,
"assembleid": 60000180,
"lvstart": 1,
"lvend": 999,
"itemid": 1190,
"itemwt": 100,
"min": 0
},
{
"id": 33,
"assembleid": 60000190,
"lvstart": 1,
"lvend": 999,
"itemid": 1200,
"itemwt": 100,
"min": 0
},
{
"id": 34,
"assembleid": 60000200,
"lvstart": 1,
"lvend": 999,
"itemid": 1210,
"itemwt": 100,
"min": 0
},
{
"id": 35,
"assembleid": 60000210,
"lvstart": 1,
"lvend": 999,
"itemid": 1220,
"itemwt": 100,
"min": 0
},
{
"id": 36,
"assembleid": 60000220,
"lvstart": 1,
"lvend": 999,
"itemid": 1230,
"itemwt": 100,
"min": 0
},
{
"id": 37,
"assembleid": 60000230,
"lvstart": 1,
"lvend": 999,
"itemid": 1240,
"itemwt": 100,
"min": 0
},
{
"id": 38,
"assembleid": 60000240,
"lvstart": 1,
"lvend": 999,
"itemid": 1250,
"itemwt": 100,
"min": 0
},
{
"id": 39,
"assembleid": 60000250,
"lvstart": 1,
"lvend": 999,
"itemid": 1260,
"itemwt": 100,
"min": 0
},
{
"id": 40,
"assembleid": 60000260,
"lvstart": 1,
"lvend": 999,
"itemid": 1270,
"itemwt": 100,
"min": 0
},
{
"id": 41,
"assembleid": 60000270,
"lvstart": 1,
"lvend": 999,
"itemid": 1280,
"itemwt": 100,
"min": 0
},
{
"id": 42,
"assembleid": 60000280,
"lvstart": 1,
"lvend": 999,
"itemid": 1290,
"itemwt": 100,
"min": 0
},
{
"id": 44,
"assembleid": 60000300,
"lvstart": 1,
"lvend": 999,
"itemid": 1300,
"itemwt": 100,
"min": 0
},
{
"id": 46,
"assembleid": 60000320,
"lvstart": 1,
"lvend": 999,
"itemid": 1310,
"itemwt": 100,
"min": 0
},
{
"id": 48,
"assembleid": 60000340,
"lvstart": 1,
"lvend": 999,
"itemid": 1320,
"itemwt": 100,
"min": 0
},
{
"id": 49,
"assembleid": 60000350,
"lvstart": 1, "lvstart": 1,
"lvend": 999, "lvend": 999,
"itemid": 1330, "itemid": 1330,
"itemwt": 500, "itemwt": 100,
"min": 0 "min": 0
} }
] ]

116
bin/json/game_annulartaskall.json
View File

@ -6,7 +6,34 @@
60000020, 60000020,
60000030, 60000030,
60000040, 60000040,
60000050 60000050,
60000060,
60000070,
60000080,
60000090,
60000100,
60000110,
60000120,
60000130,
60000140,
60000150,
60000160,
60000170,
60000180,
60000190,
60000200,
60000210,
60000220,
60000230,
60000240,
60000250,
60000260,
60000270,
60000280,
60000300,
60000320,
60000340,
60000350
], ],
"weight": 2500, "weight": 2500,
"reward": [ "reward": [
@ -29,7 +56,34 @@
60000020, 60000020,
60000030, 60000030,
60000040, 60000040,
60000050 60000050,
60000060,
60000070,
60000080,
60000090,
60000100,
60000110,
60000120,
60000130,
60000140,
60000150,
60000160,
60000170,
60000180,
60000190,
60000200,
60000210,
60000220,
60000230,
60000240,
60000250,
60000260,
60000270,
60000280,
60000300,
60000320,
60000340,
60000350
], ],
"weight": 2500, "weight": 2500,
"reward": [ "reward": [
@ -52,7 +106,34 @@
60000020, 60000020,
60000030, 60000030,
60000040, 60000040,
60000050 60000050,
60000060,
60000070,
60000080,
60000090,
60000100,
60000110,
60000120,
60000130,
60000140,
60000150,
60000160,
60000170,
60000180,
60000190,
60000200,
60000210,
60000220,
60000230,
60000240,
60000250,
60000260,
60000270,
60000280,
60000300,
60000320,
60000340,
60000350
], ],
"weight": 2500, "weight": 2500,
"reward": [ "reward": [
@ -75,7 +156,34 @@
60000020, 60000020,
60000030, 60000030,
60000040, 60000040,
60000050 60000050,
60000060,
60000070,
60000080,
60000090,
60000100,
60000110,
60000120,
60000130,
60000140,
60000150,
60000160,
60000170,
60000180,
60000190,
60000200,
60000210,
60000220,
60000230,
60000240,
60000250,
60000260,
60000270,
60000280,
60000300,
60000320,
60000340,
60000350
], ],
"weight": 2500, "weight": 2500,
"reward": [ "reward": [

10
bin/json/game_chatsystem.json
View File

@ -193,7 +193,7 @@
"key": "chat_system_text_12", "key": "chat_system_text_12",
"text": "【传闻】{0}已经将{1}培养至6星！" "text": "【传闻】{0}已经将{1}培养至6星！"
}, },
"data": 5, "data": 6,
"data2": 0, "data2": 0,
"week": [], "week": [],
"time_h": 0, "time_h": 0,
@ -238,8 +238,8 @@
"key": "chat_system_text_15", "key": "chat_system_text_15",
"text": "【传闻】{0}已经将{1}觉醒至满级！" "text": "【传闻】{0}已经将{1}觉醒至满级！"
}, },
"data": 5, "data": 6,
"data2": 0, "data2": 5,
"week": [], "week": [],
"time_h": 0, "time_h": 0,
"time_m": 0 "time_m": 0
@ -251,9 +251,9 @@
"datatype": 1, "datatype": 1,
"text": { "text": {
"key": "chat_system_text_16", "key": "chat_system_text_16",
"text": "【传闻】{0}已经达到了60级!" "text": "【传闻】{0}已经达到了50级!"
}, },
"data": 60, "data": 50,
"data2": 0, "data2": 0,
"week": [], "week": [],
"time_h": 0, "time_h": 0,

12
bin/json/game_drawpool.json
View File

@ -345,11 +345,7 @@
"key": "drawcard_drawpool_baodihelp_8", "key": "drawcard_drawpool_baodihelp_8",
"text": "1.召唤中，可选择指定守护者作为许愿守护者<br>2.每次召唤将消耗[color=#37d8a9]100圣桃[/color]，必出许愿守护者<br>3.召唤出许愿守护者后，[color=#37d8a9]60天[/color]内无法再对该守护者进行许愿召唤<br>4.随抽取次数增加，而解锁其他守护者的许愿机会" "text": "1.召唤中，可选择指定守护者作为许愿守护者<br>2.每次召唤将消耗[color=#37d8a9]100圣桃[/color]，必出许愿守护者<br>3.召唤出许愿守护者后，[color=#37d8a9]60天[/color]内无法再对该守护者进行许愿召唤<br>4.随抽取次数增加，而解锁其他守护者的许愿机会"
}, },
"weightreadonly": [ "weightreadonly": [],
"2%",
"20%",
"78%"
],
"upweight": 0 "upweight": 0
}, },
{ {
@ -377,11 +373,7 @@
"key": "drawcard_drawpool_baodihelp_9", "key": "drawcard_drawpool_baodihelp_9",
"text": "待补充" "text": "待补充"
}, },
"weightreadonly": [ "weightreadonly": [],
"2%",
"20%",
"78%"
],
"upweight": 0 "upweight": 0
} }
] ]

112
bin/json/game_fightglobalevent.json
View File

@ -2,7 +2,7 @@
{ {
"Id": 1, "Id": 1,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "fightevent_fight_global_event_desc_1", "key": "fightevent_fight_global_event_desc_1",
"text": "使用<img src='ui://icon/jn_icon_x003' width='20' height='20'/>攻击全体敌人，并吸收敌人的行动值。" "text": "使用<img src='ui://icon/jn_icon_x003' width='20' height='20'/>攻击全体敌人，并吸收敌人的行动值。"
@ -21,7 +21,7 @@
{ {
"Id": 2, "Id": 2,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "fightevent_fight_global_event_desc_2", "key": "fightevent_fight_global_event_desc_2",
"text": "使用<img src='ui://icon/jn_icon_x001' width='20' height='20'/>击杀首领，并获得生命值恢复。" "text": "使用<img src='ui://icon/jn_icon_x001' width='20' height='20'/>击杀首领，并获得生命值恢复。"
@ -40,7 +40,7 @@
{ {
"Id": 3, "Id": 3,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "fightevent_fight_global_event_desc_3", "key": "fightevent_fight_global_event_desc_3",
"text": "获得本次战斗胜利。" "text": "获得本次战斗胜利。"
@ -59,7 +59,7 @@
{ {
"Id": 4, "Id": 4,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "fightevent_fight_global_event_desc_4", "key": "fightevent_fight_global_event_desc_4",
"text": "使用<img src='ui://icon/jn_icon_x003' width='20' height='20'/>攻击全体敌人，并吸收敌人的行动值。" "text": "使用<img src='ui://icon/jn_icon_x003' width='20' height='20'/>攻击全体敌人，并吸收敌人的行动值。"
@ -78,7 +78,7 @@
{ {
"Id": 5, "Id": 5,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "fightevent_fight_global_event_desc_5", "key": "fightevent_fight_global_event_desc_5",
"text": "使用<img src='ui://icon/jn_icon_x001' width='20' height='20'/>击杀首领，并获得生命值恢复。" "text": "使用<img src='ui://icon/jn_icon_x001' width='20' height='20'/>击杀首领，并获得生命值恢复。"
@ -97,7 +97,7 @@
{ {
"Id": 6, "Id": 6,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "fightevent_fight_global_event_desc_6", "key": "fightevent_fight_global_event_desc_6",
"text": "获得本次战斗胜利。" "text": "获得本次战斗胜利。"
@ -116,7 +116,7 @@
{ {
"Id": 7, "Id": 7,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "fightevent_fight_global_event_desc_7", "key": "fightevent_fight_global_event_desc_7",
"text": "使用<img src='ui://icon/jn_icon_x003' width='20' height='20'/>攻击全体敌人，并吸收敌人的行动值。" "text": "使用<img src='ui://icon/jn_icon_x003' width='20' height='20'/>攻击全体敌人，并吸收敌人的行动值。"
@ -135,7 +135,7 @@
{ {
"Id": 8, "Id": 8,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "fightevent_fight_global_event_desc_8", "key": "fightevent_fight_global_event_desc_8",
"text": "使用<img src='ui://icon/jn_icon_x001' width='20' height='20'/>击杀首领，并获得生命值恢复。" "text": "使用<img src='ui://icon/jn_icon_x001' width='20' height='20'/>击杀首领，并获得生命值恢复。"
@ -154,7 +154,7 @@
{ {
"Id": 9, "Id": 9,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "fightevent_fight_global_event_desc_9", "key": "fightevent_fight_global_event_desc_9",
"text": "获得本次战斗胜利。" "text": "获得本次战斗胜利。"
@ -173,7 +173,7 @@
{ {
"Id": 10, "Id": 10,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "fightevent_fight_global_event_desc_10", "key": "fightevent_fight_global_event_desc_10",
"text": "使用<img src='ui://icon/jn_icon_x003' width='20' height='20'/>攻击全体敌人，并吸收敌人的行动值。" "text": "使用<img src='ui://icon/jn_icon_x003' width='20' height='20'/>攻击全体敌人，并吸收敌人的行动值。"
@ -192,7 +192,7 @@
{ {
"Id": 11, "Id": 11,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "fightevent_fight_global_event_desc_11", "key": "fightevent_fight_global_event_desc_11",
"text": "使用<img src='ui://icon/jn_icon_x001' width='20' height='20'/>击杀首领，并获得生命值恢复。" "text": "使用<img src='ui://icon/jn_icon_x001' width='20' height='20'/>击杀首领，并获得生命值恢复。"
@ -211,7 +211,7 @@
{ {
"Id": 12, "Id": 12,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "fightevent_fight_global_event_desc_12", "key": "fightevent_fight_global_event_desc_12",
"text": "使用<img src='ui://icon/jn_icon_x001' width='20' height='20'/>击杀首领，并获得生命值恢复。" "text": "使用<img src='ui://icon/jn_icon_x001' width='20' height='20'/>击杀首领，并获得生命值恢复。"
@ -232,7 +232,7 @@
{ {
"Id": 13, "Id": 13,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "fightevent_fight_global_event_desc_13", "key": "fightevent_fight_global_event_desc_13",
"text": "使用<img src='ui://icon/jn_icon_x001' width='20' height='20'/>击杀首领，并获得生命值恢复。" "text": "使用<img src='ui://icon/jn_icon_x001' width='20' height='20'/>击杀首领，并获得生命值恢复。"
@ -253,7 +253,7 @@
{ {
"Id": 14, "Id": 14,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "fightevent_fight_global_event_desc_14", "key": "fightevent_fight_global_event_desc_14",
"text": "使用<img src='ui://icon/jn_icon_x001' width='20' height='20'/>击杀首领，并获得生命值恢复。" "text": "使用<img src='ui://icon/jn_icon_x001' width='20' height='20'/>击杀首领，并获得生命值恢复。"
@ -276,7 +276,7 @@
{ {
"Id": 15, "Id": 15,
"Count": 1, "Count": 1,
"LoopTime": 1, "LoopTime": true,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -303,7 +303,7 @@
{ {
"Id": 16, "Id": 16,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -322,7 +322,7 @@
{ {
"Id": 17, "Id": 17,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -341,7 +341,7 @@
{ {
"Id": 18, "Id": 18,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -360,7 +360,7 @@
{ {
"Id": 19, "Id": 19,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -379,7 +379,7 @@
{ {
"Id": 20, "Id": 20,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -398,7 +398,7 @@
{ {
"Id": 21, "Id": 21,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -419,7 +419,7 @@
{ {
"Id": 22, "Id": 22,
"Count": 2, "Count": 2,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -440,7 +440,7 @@
{ {
"Id": 101, "Id": 101,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "fightevent_fight_global_event_desc_15", "key": "fightevent_fight_global_event_desc_15",
"text": "使用<img src='ui://icon/jn_icon_005' width='20' height='20'/>给我方增加【攻击提升】状态。" "text": "使用<img src='ui://icon/jn_icon_005' width='20' height='20'/>给我方增加【攻击提升】状态。"
@ -459,7 +459,7 @@
{ {
"Id": 102, "Id": 102,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "fightevent_fight_global_event_desc_16", "key": "fightevent_fight_global_event_desc_16",
"text": "使用<img src='ui://icon/jn_icon_056' width='20' height='20'/>给敌方增加【防御下降】状态。" "text": "使用<img src='ui://icon/jn_icon_056' width='20' height='20'/>给敌方增加【防御下降】状态。"
@ -478,7 +478,7 @@
{ {
"Id": 103, "Id": 103,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "fightevent_fight_global_event_desc_17", "key": "fightevent_fight_global_event_desc_17",
"text": "使用<img src='ui://icon/jn_icon_020' width='20' height='22'/>击杀首领。" "text": "使用<img src='ui://icon/jn_icon_020' width='20' height='22'/>击杀首领。"
@ -497,7 +497,7 @@
{ {
"Id": 104, "Id": 104,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "fightevent_fight_global_event_desc_18", "key": "fightevent_fight_global_event_desc_18",
"text": "使用<img src='ui://icon/jn_icon_024' width='20' height='20'/>给我方增加【护盾】和【免疫】状态。" "text": "使用<img src='ui://icon/jn_icon_024' width='20' height='20'/>给我方增加【护盾】和【免疫】状态。"
@ -516,7 +516,7 @@
{ {
"Id": 105, "Id": 105,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "fightevent_fight_global_event_desc_19", "key": "fightevent_fight_global_event_desc_19",
"text": "使用<img src='ui://icon/jn_icon_012' width='20' height='20'/>给敌方增加【冰冻】状态。" "text": "使用<img src='ui://icon/jn_icon_012' width='20' height='20'/>给敌方增加【冰冻】状态。"
@ -535,7 +535,7 @@
{ {
"Id": 106, "Id": 106,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "fightevent_fight_global_event_desc_20", "key": "fightevent_fight_global_event_desc_20",
"text": "使用<img src='ui://icon/jn_icon_018' width='20' height='22'/>击杀首领。" "text": "使用<img src='ui://icon/jn_icon_018' width='20' height='22'/>击杀首领。"
@ -554,7 +554,7 @@
{ {
"Id": 107, "Id": 107,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "fightevent_fight_global_event_desc_15", "key": "fightevent_fight_global_event_desc_15",
"text": "使用<img src='ui://icon/jn_icon_005' width='20' height='20'/>给敌方增加【眩晕】状态。" "text": "使用<img src='ui://icon/jn_icon_005' width='20' height='20'/>给敌方增加【眩晕】状态。"
@ -573,7 +573,7 @@
{ {
"Id": 108, "Id": 108,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "fightevent_fight_global_event_desc_16", "key": "fightevent_fight_global_event_desc_16",
"text": "使用<img src='ui://icon/jn_icon_056' width='20' height='20'/>给敌方增加【无法获得增益】状态。" "text": "使用<img src='ui://icon/jn_icon_056' width='20' height='20'/>给敌方增加【无法获得增益】状态。"
@ -592,7 +592,7 @@
{ {
"Id": 109, "Id": 109,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -615,7 +615,7 @@
{ {
"Id": 110, "Id": 110,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -636,7 +636,7 @@
{ {
"Id": 111, "Id": 111,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -657,7 +657,7 @@
{ {
"Id": 112, "Id": 112,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -678,7 +678,7 @@
{ {
"Id": 113, "Id": 113,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -699,7 +699,7 @@
{ {
"Id": 114, "Id": 114,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -720,7 +720,7 @@
{ {
"Id": 120, "Id": 120,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -741,7 +741,7 @@
{ {
"Id": 121, "Id": 121,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -764,7 +764,7 @@
{ {
"Id": 122, "Id": 122,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -787,7 +787,7 @@
{ {
"Id": 123, "Id": 123,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -808,7 +808,7 @@
{ {
"Id": 124, "Id": 124,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -831,7 +831,7 @@
{ {
"Id": 125, "Id": 125,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -852,7 +852,7 @@
{ {
"Id": 126, "Id": 126,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -875,7 +875,7 @@
{ {
"Id": 130, "Id": 130,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -898,7 +898,7 @@
{ {
"Id": 131, "Id": 131,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -919,7 +919,7 @@
{ {
"Id": 132, "Id": 132,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -940,7 +940,7 @@
{ {
"Id": 133, "Id": 133,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -963,7 +963,7 @@
{ {
"Id": 134, "Id": 134,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -986,7 +986,7 @@
{ {
"Id": 135, "Id": 135,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -1007,7 +1007,7 @@
{ {
"Id": 136, "Id": 136,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -1028,7 +1028,7 @@
{ {
"Id": 137, "Id": 137,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -1052,7 +1052,7 @@
{ {
"Id": 138, "Id": 138,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -1076,7 +1076,7 @@
{ {
"Id": 139, "Id": 139,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -1100,7 +1100,7 @@
{ {
"Id": 140, "Id": 140,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -1124,7 +1124,7 @@
{ {
"Id": 141, "Id": 141,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""
@ -1148,7 +1148,7 @@
{ {
"Id": 142, "Id": 142,
"Count": 1, "Count": 1,
"LoopTime": 0, "LoopTime": false,
"desc": { "desc": {
"key": "", "key": "",
"text": "" "text": ""

4
bin/json/game_gamesummarytab.json
View File

@ -9,7 +9,7 @@
"icon": "hkz_wftj_mj", "icon": "hkz_wftj_mj",
"mapPos": { "mapPos": {
"x": 0, "x": 0,
"y": 657 "y": 557
}, },
"scale": 1.3, "scale": 1.3,
"usetext": { "usetext": {
@ -26,7 +26,7 @@
}, },
"icon": "hkz_wftj_sl02", "icon": "hkz_wftj_sl02",
"mapPos": { "mapPos": {
"x": -551, "x": -451,
"y": 1955 "y": 1955
}, },
"scale": 1.3, "scale": 1.3,

640
bin/json/game_guide.json
View File

File diff suppressed because it is too large Load Diff

16
bin/json/game_guildbossroulette.json
View File

@ -16,7 +16,7 @@
"n": 1 "n": 1
} }
], ],
"push": 1 "push": true
}, },
{ {
"id": 2, "id": 2,
@ -35,7 +35,7 @@
"n": 1 "n": 1
} }
], ],
"push": 0 "push": false
}, },
{ {
"id": 3, "id": 3,
@ -54,7 +54,7 @@
"n": 1 "n": 1
} }
], ],
"push": 1 "push": true
}, },
{ {
"id": 4, "id": 4,
@ -73,7 +73,7 @@
"n": 1 "n": 1
} }
], ],
"push": 0 "push": false
}, },
{ {
"id": 5, "id": 5,
@ -92,7 +92,7 @@
"n": 1 "n": 1
} }
], ],
"push": 1 "push": true
}, },
{ {
"id": 6, "id": 6,
@ -111,7 +111,7 @@
"n": 1 "n": 1
} }
], ],
"push": 0 "push": false
}, },
{ {
"id": 7, "id": 7,
@ -130,7 +130,7 @@
"n": 1 "n": 1
} }
], ],
"push": 1 "push": true
}, },
{ {
"id": 8, "id": 8,
@ -149,6 +149,6 @@
"n": 1 "n": 1
} }
], ],
"push": 0 "push": false
} }
] ]

424
bin/json/game_hero.json
View File

File diff suppressed because it is too large Load Diff

126
bin/json/game_integralboss.json
View File

@ -4,17 +4,20 @@
"hdid": 10001, "hdid": 10001,
"difficulty": 1, "difficulty": 1,
"itype": 1, "itype": 1,
"difficultytext": "简单", "difficultytext": {
"key": "IntegralBoss_Integralboss_difficultytext_01",
"text": "简单"
},
"coefficient": 1, "coefficient": 1,
"unlock": 101, "unlock": 101,
"unlockval": 0, "unlockval": 0,
"name": { "name": {
"key": "Integralboss_boss_name_1", "key": "IntegralBoss_Integralboss_name_1",
"text": "火龙" "text": "火龙"
}, },
"introduce": { "introduce": {
"key": "Integralboss_bossskill_introduce_1", "key": "IntegralBoss_Integralboss_introduce_1",
"text": "熔岩泰坦巨人来自于遥远的火山，它的火焰属性使得所到之处，一片荒芜。" "text": "巨大的身躯，通体覆盖着燃烧着的鲜红火焰，散发出炽热的气息"
}, },
"BattleReadyID": 11804001, "BattleReadyID": 11804001,
"firstprize": [ "firstprize": [
@ -35,30 +38,34 @@
} }
], ],
"drop": 10001001, "drop": 10001001,
"heroexp": 10, "heroexp": 0,
"spine": "bossShow_bingshuangtaitan", "spine": "bossShow_huolong",
"HeroId": 55001, "HeroId": 55001,
"boss": [ "boss": [
1420003 1420003
], ],
"bossIcon": "" "bossIcon": "gl_img_55001",
"back_png": "hl_img_bg"
}, },
{ {
"id": 10001002, "id": 10001002,
"hdid": 10001, "hdid": 10001,
"difficulty": 2, "difficulty": 2,
"itype": 1, "itype": 1,
"difficultytext": "普通", "difficultytext": {
"key": "IntegralBoss_Integralboss_difficultytext_02",
"text": "普通"
},
"coefficient": 1.2, "coefficient": 1.2,
"unlock": 102, "unlock": 102,
"unlockval": 1000, "unlockval": 1000,
"name": { "name": {
"key": "Integralboss_boss_name_2", "key": "IntegralBoss_Integralboss_name_2",
"text": "火龙" "text": "火龙"
}, },
"introduce": { "introduce": {
"key": "Integralboss_bossskill_introduce_2", "key": "IntegralBoss_Integralboss_introduce_2",
"text": "冰霜泰坦巨人从极寒之地而来，没有什么比它更寒冷了。" "text": "巨大的身躯，通体覆盖着燃烧着的鲜红火焰，散发出炽热的气息"
}, },
"BattleReadyID": 11804001, "BattleReadyID": 11804001,
"firstprize": [ "firstprize": [
@ -74,30 +81,34 @@
} }
], ],
"drop": 10001002, "drop": 10001002,
"heroexp": 10, "heroexp": 0,
"spine": "bossShow_bingshuangtaitan", "spine": "bossShow_huolong",
"HeroId": 55001, "HeroId": 55001,
"boss": [ "boss": [
1420006 1420006
], ],
"bossIcon": "" "bossIcon": "gl_img_55001",
"back_png": "hl_img_bg"
}, },
{ {
"id": 10001003, "id": 10001003,
"hdid": 10001, "hdid": 10001,
"difficulty": 3, "difficulty": 3,
"itype": 1, "itype": 1,
"difficultytext": "困难", "difficultytext": {
"key": "IntegralBoss_Integralboss_difficultytext_03",
"text": "困难"
},
"coefficient": 1.4, "coefficient": 1.4,
"unlock": 102, "unlock": 102,
"unlockval": 2000, "unlockval": 2000,
"name": { "name": {
"key": "Integralboss_boss_name_3", "key": "IntegralBoss_Integralboss_name_3",
"text": "火龙" "text": "火龙"
}, },
"introduce": { "introduce": {
"key": "Integralboss_bossskill_introduce_3", "key": "IntegralBoss_Integralboss_introduce_3",
"text": "森林泰坦诞生于广袤的森林之中，是所有动物们的守护神。" "text": "巨大的身躯，通体覆盖着燃烧着的鲜红火焰，散发出炽热的气息"
}, },
"BattleReadyID": 11804001, "BattleReadyID": 11804001,
"firstprize": [ "firstprize": [
@ -118,30 +129,34 @@
} }
], ],
"drop": 10001003, "drop": 10001003,
"heroexp": 10, "heroexp": 0,
"spine": "bossShow_bingshuangtaitan", "spine": "bossShow_huolong",
"HeroId": 55001, "HeroId": 55001,
"boss": [ "boss": [
1420009 1420009
], ],
"bossIcon": "" "bossIcon": "gl_img_55001",
"back_png": "hl_img_bg"
}, },
{ {
"id": 10001004, "id": 10001004,
"hdid": 10001, "hdid": 10001,
"difficulty": 4, "difficulty": 4,
"itype": 1, "itype": 1,
"difficultytext": "精英", "difficultytext": {
"key": "IntegralBoss_Integralboss_difficultytext_04",
"text": "精英"
},
"coefficient": 1.6, "coefficient": 1.6,
"unlock": 102, "unlock": 102,
"unlockval": 3000, "unlockval": 3000,
"name": { "name": {
"key": "Integralboss_boss_name_4", "key": "IntegralBoss_Integralboss_name_4",
"text": "火龙" "text": "火龙"
}, },
"introduce": { "introduce": {
"key": "Integralboss_bossskill_introduce_4", "key": "IntegralBoss_Integralboss_introduce_4",
"text": "熔岩泰坦巨人来自于遥远的火山，它的火焰属性使得所到之处，一片荒芜。" "text": "巨大的身躯，通体覆盖着燃烧着的鲜红火焰，散发出炽热的气息"
}, },
"BattleReadyID": 11804001, "BattleReadyID": 11804001,
"firstprize": [ "firstprize": [
@ -157,30 +172,34 @@
} }
], ],
"drop": 10001004, "drop": 10001004,
"heroexp": 10, "heroexp": 0,
"spine": "bossShow_bingshuangtaitan", "spine": "bossShow_huolong",
"HeroId": 55001, "HeroId": 55001,
"boss": [ "boss": [
1420012 1420012
], ],
"bossIcon": "" "bossIcon": "gl_img_55001",
"back_png": "hl_img_bg"
}, },
{ {
"id": 10001005, "id": 10001005,
"hdid": 10001, "hdid": 10001,
"difficulty": 5, "difficulty": 5,
"itype": 1, "itype": 1,
"difficultytext": "地狱", "difficultytext": {
"key": "IntegralBoss_Integralboss_difficultytext_05",
"text": "地狱"
},
"coefficient": 1.8, "coefficient": 1.8,
"unlock": 102, "unlock": 102,
"unlockval": 4000, "unlockval": 4000,
"name": { "name": {
"key": "Integralboss_boss_name_5", "key": "IntegralBoss_Integralboss_name_5",
"text": "火龙" "text": "火龙"
}, },
"introduce": { "introduce": {
"key": "Integralboss_bossskill_introduce_5", "key": "IntegralBoss_Integralboss_introduce_5",
"text": "熔岩泰坦巨人来自于遥远的火山，它的火焰属性使得所到之处，一片荒芜。" "text": "巨大的身躯，通体覆盖着燃烧着的鲜红火焰，散发出炽热的气息"
}, },
"BattleReadyID": 11804001, "BattleReadyID": 11804001,
"firstprize": [ "firstprize": [
@ -201,30 +220,34 @@
} }
], ],
"drop": 10001005, "drop": 10001005,
"heroexp": 10, "heroexp": 0,
"spine": "bossShow_bingshuangtaitan", "spine": "bossShow_huolong",
"HeroId": 55001, "HeroId": 55001,
"boss": [ "boss": [
1420015 1420015
], ],
"bossIcon": "" "bossIcon": "gl_img_55001",
"back_png": "hl_img_bg"
}, },
{ {
"id": 10001006, "id": 10001006,
"hdid": 10001, "hdid": 10001,
"difficulty": 6, "difficulty": 6,
"itype": 1, "itype": 1,
"difficultytext": "噩梦", "difficultytext": {
"key": "IntegralBoss_Integralboss_difficultytext_06",
"text": "噩梦"
},
"coefficient": 2, "coefficient": 2,
"unlock": 102, "unlock": 102,
"unlockval": 5000, "unlockval": 5000,
"name": { "name": {
"key": "Integralboss_boss_name_6", "key": "IntegralBoss_Integralboss_name_6",
"text": "火龙" "text": "火龙"
}, },
"introduce": { "introduce": {
"key": "Integralboss_bossskill_introduce_6", "key": "IntegralBoss_Integralboss_introduce_6",
"text": "梦境回廊，产出经验材料" "text": "巨大的身躯，通体覆盖着燃烧着的鲜红火焰，散发出炽热的气息"
}, },
"BattleReadyID": 11804001, "BattleReadyID": 11804001,
"firstprize": [ "firstprize": [
@ -240,30 +263,34 @@
} }
], ],
"drop": 10001006, "drop": 10001006,
"heroexp": 10, "heroexp": 0,
"spine": "bossShow_bingshuangtaitan", "spine": "bossShow_huolong",
"HeroId": 55001, "HeroId": 55001,
"boss": [ "boss": [
1420018 1420018
], ],
"bossIcon": "" "bossIcon": "gl_img_55001",
"back_png": "hl_img_bg"
}, },
{ {
"id": 20001001, "id": 20001001,
"hdid": 20001, "hdid": 20001,
"difficulty": 1, "difficulty": 1,
"itype": 2, "itype": 2,
"difficultytext": "", "difficultytext": {
"key": "",
"text": ""
},
"coefficient": 1, "coefficient": 1,
"unlock": 101, "unlock": 101,
"unlockval": 0, "unlockval": 0,
"name": { "name": {
"key": "Integralboss_boss_name_7", "key": "IntegralBoss_Integralboss_name_7",
"text": "火龙" "text": "火龙"
}, },
"introduce": { "introduce": {
"key": "Integralboss_bossskill_introduce_7", "key": "IntegralBoss_Integralboss_introduce_7",
"text": "熔岩泰坦巨人来自于遥远的火山，它的火焰属性使得所到之处，一片荒芜。" "text": "巨大的身躯，通体覆盖着燃烧着的鲜红火焰，散发出炽热的气息"
}, },
"BattleReadyID": 11804002, "BattleReadyID": 11804002,
"firstprize": [ "firstprize": [
@ -279,12 +306,13 @@
} }
], ],
"drop": 10001006, "drop": 10001006,
"heroexp": 10, "heroexp": 0,
"spine": "bossShow_bingshuangtaitan", "spine": "bossShow_huolong",
"HeroId": 55001, "HeroId": 55001,
"boss": [ "boss": [
1420021 1420021
], ],
"bossIcon": "" "bossIcon": "gl_img_55001",
"back_png": "hl_img_bg"
} }
] ]

120
bin/json/game_integralcondition.json
View File

@ -1,110 +1,182 @@
[ [
{ {
"id": 1001, "id": 1001,
"condition": "完成俱乐部任务3次", "condition": {
"key": "IntegralBoss_Integralcondition_condition_01",
"text": "完成俱乐部任务3次"
},
"TaskId": 17100001, "TaskId": 17100001,
"iType": 1, "iType": 1,
"jumpto": 166, "jumpto": 166,
"des": "[敌方]暴击伤害降低10%", "des": {
"key": "IntegralBoss_Integralcondition_des_01",
"text": "[敌方]暴击伤害降低10%"
},
"skillid": 310001001 "skillid": 310001001
}, },
{ {
"id": 1002, "id": 1002,
"condition": "累计消费3000钻石", "condition": {
"key": "IntegralBoss_Integralcondition_condition_02",
"text": "累计消费3000钻石"
},
"TaskId": 17100002, "TaskId": 17100002,
"iType": 1, "iType": 1,
"jumpto": 166, "jumpto": 166,
"des": "[敌方]防御降低10%", "des": {
"key": "IntegralBoss_Integralcondition_des_02",
"text": "[敌方]防御降低10%"
},
"skillid": 310001002 "skillid": 310001002
}, },
{ {
"id": 1003, "id": 1003,
"condition": "传承者达到20级", "condition": {
"key": "IntegralBoss_Integralcondition_condition_03",
"text": "传承者达到20级"
},
"TaskId": 17100003, "TaskId": 17100003,
"iType": 1, "iType": 1,
"jumpto": 0, "jumpto": 0,
"des": "[敌方]攻击降低10%", "des": {
"key": "IntegralBoss_Integralcondition_des_03",
"text": "[敌方]攻击降低10%"
},
"skillid": 310001003 "skillid": 310001003
}, },
{ {
"id": 1004, "id": 1004,
"condition": "累计召唤20次守护者", "condition": {
"key": "IntegralBoss_Integralcondition_condition_04",
"text": "累计召唤20次守护者"
},
"TaskId": 17100004, "TaskId": 17100004,
"iType": 1, "iType": 1,
"jumpto": 0, "jumpto": 0,
"des": "[敌方]速度降低10%", "des": {
"key": "IntegralBoss_Integralcondition_des_04",
"text": "[敌方]速度降低10%"
},
"skillid": 310001004 "skillid": 310001004
}, },
{ {
"id": 1005, "id": 1005,
"condition": "完成5个日常任务", "condition": {
"key": "IntegralBoss_Integralcondition_condition_05",
"text": "完成5个日常任务"
},
"TaskId": 17100005, "TaskId": 17100005,
"iType": 1, "iType": 1,
"jumpto": 0, "jumpto": 0,
"des": "[敌方]命中降低10%", "des": {
"key": "IntegralBoss_Integralcondition_des_05",
"text": "[敌方]命中降低10%"
},
"skillid": 310001005 "skillid": 310001005
}, },
{ {
"id": 1006, "id": 1006,
"condition": "在任意商店购买5次商品", "condition": {
"key": "IntegralBoss_Integralcondition_condition_06",
"text": "在任意商店购买5次商品"
},
"TaskId": 17100006, "TaskId": 17100006,
"iType": 1, "iType": 1,
"jumpto": 0, "jumpto": 0,
"des": "[敌方]暴击降低10%", "des": {
"key": "IntegralBoss_Integralcondition_des_06",
"text": "[敌方]暴击降低10%"
},
"skillid": 310001006 "skillid": 310001006
}, },
{ {
"id": 1007, "id": 1007,
"condition": "进行10次竞技挑战", "condition": {
"key": "IntegralBoss_Integralcondition_condition_07",
"text": "进行10次竞技挑战"
},
"TaskId": 17100007, "TaskId": 17100007,
"iType": 1, "iType": 1,
"jumpto": 0, "jumpto": 0,
"des": "[敌方]受到增益效果持续回合数-1", "des": {
"key": "IntegralBoss_Integralcondition_des_07",
"text": "[敌方]受到增益效果持续回合数-1"
},
"skillid": 310001007 "skillid": 310001007
}, },
{ {
"id": 1008, "id": 1008,
"condition": "参加3次捕羊大赛", "condition": {
"key": "IntegralBoss_Integralcondition_condition_08",
"text": "参加3次捕羊大赛"
},
"TaskId": 17100008, "TaskId": 17100008,
"iType": 1, "iType": 1,
"jumpto": 0, "jumpto": 0,
"des": "[敌方]所有减益效果持续回合数+1", "des": {
"key": "IntegralBoss_Integralcondition_des_08",
"text": "[敌方]所有减益效果持续回合数+1"
},
"skillid": 310001008 "skillid": 310001008
}, },
{ {
"id": 1009, "id": 1009,
"condition": "辉月等级达到3级", "condition": {
"key": "IntegralBoss_Integralcondition_condition_09",
"text": "辉月等级达到3级"
},
"TaskId": 17100009, "TaskId": 17100009,
"iType": 1, "iType": 1,
"jumpto": 0, "jumpto": 0,
"des": "[敌方]受到持续伤害增加50%", "des": {
"key": "IntegralBoss_Integralcondition_des_09",
"text": "[敌方]受到持续伤害增加50%"
},
"skillid": 310001009 "skillid": 310001009
}, },
{ {
"id": 1010, "id": 1010,
"condition": "完成3次每日一练", "condition": {
"key": "IntegralBoss_Integralcondition_condition_10",
"text": "完成3次每日一练"
},
"TaskId": 17100010, "TaskId": 17100010,
"iType": 1, "iType": 1,
"jumpto": 0, "jumpto": 0,
"des": "[敌方]无法触发会心", "des": {
"key": "IntegralBoss_Integralcondition_des_10",
"text": "[敌方]无法触发会心"
},
"skillid": 310001010 "skillid": 310001010
}, },
{ {
"id": 1011, "id": 1011,
"condition": "上阵2个属性为感官之林的继承者", "condition": {
"key": "IntegralBoss_Integralcondition_condition_11",
"text": "上阵2个属性为感官之林的继承者"
},
"TaskId": 0, "TaskId": 0,
"iType": 2, "iType": 2,
"jumpto": 0, "jumpto": 0,
"des": "[敌方]所有技能冷却回合+1", "des": {
"key": "IntegralBoss_Integralcondition_des_11",
"text": "[敌方]所有技能冷却回合+1"
},
"skillid": 310001011 "skillid": 310001011
}, },
{ {
"id": 1012, "id": 1012,
"condition": "上阵1名攻击型守护者", "condition": {
"key": "IntegralBoss_Integralcondition_condition_12",
"text": "上阵1名攻击型守护者"
},
"TaskId": 0, "TaskId": 0,
"iType": 2, "iType": 2,
"jumpto": 0, "jumpto": 0,
"des": "[敌方]身上每有一个减益效果受到伤害增加5%", "des": {
"key": "IntegralBoss_Integralcondition_des_12",
"text": "[敌方]身上每有一个减益效果受到伤害增加5%"
},
"skillid": 310001012 "skillid": 310001012
} }
] ]

64
bin/json/game_item.json
View File

@ -5227,7 +5227,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_14002",
"intr": { "intr": {
"key": "item_item_intr_12014002", "key": "item_item_intr_12014002",
"text": "大龙守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "大龙守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -5325,7 +5325,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_14004",
"intr": { "intr": {
"key": "item_item_intr_12014004", "key": "item_item_intr_12014004",
"text": "克莱尔·努涅斯守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "克莱尔·努涅斯守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -5423,7 +5423,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_14006",
"intr": { "intr": {
"key": "item_item_intr_12014006", "key": "item_item_intr_12014006",
"text": "布兰奇守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "布兰奇守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -5521,7 +5521,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_15001",
"intr": { "intr": {
"key": "item_item_intr_12015001", "key": "item_item_intr_12015001",
"text": "吉姆·莱克守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "吉姆·莱克守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -5766,7 +5766,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_23001",
"intr": { "intr": {
"key": "item_item_intr_12023001", "key": "item_item_intr_12023001",
"text": "斯梅克船长守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "斯梅克船长守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -5815,7 +5815,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_23002",
"intr": { "intr": {
"key": "item_item_intr_12023002", "key": "item_item_intr_12023002",
"text": "警卫队长守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "警卫队长守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -5864,7 +5864,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_23003",
"intr": { "intr": {
"key": "item_item_intr_12023003", "key": "item_item_intr_12023003",
"text": "黛塔黛恩守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "黛塔黛恩守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -6060,7 +6060,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_24003",
"intr": { "intr": {
"key": "item_item_intr_12024003", "key": "item_item_intr_12024003",
"text": "睡神沙人守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "睡神沙人守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -6207,7 +6207,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_24006",
"intr": { "intr": {
"key": "item_item_intr_12024006", "key": "item_item_intr_12024006",
"text": "凯尔守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "凯尔守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -6256,7 +6256,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_24007",
"intr": { "intr": {
"key": "item_item_intr_12024007", "key": "item_item_intr_12024007",
"text": "小钱守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "小钱守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -6452,7 +6452,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_25002",
"intr": { "intr": {
"key": "item_item_intr_12025002", "key": "item_item_intr_12025002",
"text": "沃尔夫先生守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "沃尔夫先生守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -6501,7 +6501,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_25003",
"intr": { "intr": {
"key": "item_item_intr_12025003", "key": "item_item_intr_12025003",
"text": "羊仙姑守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "羊仙姑守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -6550,7 +6550,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_25004",
"intr": { "intr": {
"key": "item_item_intr_12025004", "key": "item_item_intr_12025004",
"text": "波比守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "波比守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -6599,7 +6599,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_33001",
"intr": { "intr": {
"key": "item_item_intr_12033001", "key": "item_item_intr_12033001",
"text": "巫嘎守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "巫嘎守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -6746,7 +6746,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_33004",
"intr": { "intr": {
"key": "item_item_intr_12033004", "key": "item_item_intr_12033004",
"text": "普鲁格兰杰守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "普鲁格兰杰守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -6795,7 +6795,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_33005",
"intr": { "intr": {
"key": "item_item_intr_12033005", "key": "item_item_intr_12033005",
"text": "鼻涕粗守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "鼻涕粗守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -6844,7 +6844,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_33006",
"intr": { "intr": {
"key": "item_item_intr_12033006", "key": "item_item_intr_12033006",
"text": "珍妮丝·邓普顿守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "珍妮丝·邓普顿守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -6893,7 +6893,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_34001",
"intr": { "intr": {
"key": "item_item_intr_12034001", "key": "item_item_intr_12034001",
"text": "贫嘴驴守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "贫嘴驴守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -6991,7 +6991,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_34003",
"intr": { "intr": {
"key": "item_item_intr_12034003", "key": "item_item_intr_12034003",
"text": "圣诞老人守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "圣诞老人守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -7040,7 +7040,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_34004",
"intr": { "intr": {
"key": "item_item_intr_12034004", "key": "item_item_intr_12034004",
"text": "瓜哥守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "瓜哥守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -7138,7 +7138,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_34006",
"intr": { "intr": {
"key": "item_item_intr_12034006", "key": "item_item_intr_12034006",
"text": "冰霜杰克守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "冰霜杰克守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -7187,7 +7187,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_34007",
"intr": { "intr": {
"key": "item_item_intr_12034007", "key": "item_item_intr_12034007",
"text": "菲奥娜守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "菲奥娜守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -7383,7 +7383,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_35003",
"intr": { "intr": {
"key": "item_item_intr_12035003", "key": "item_item_intr_12035003",
"text": "漆黑守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "漆黑守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -7432,7 +7432,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_35004",
"intr": { "intr": {
"key": "item_item_intr_12035004", "key": "item_item_intr_12035004",
"text": "黛安·福克斯顿守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "黛安·福克斯顿守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -7726,7 +7726,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_43004",
"intr": { "intr": {
"key": "item_item_intr_12043004", "key": "item_item_intr_12043004",
"text": "姜饼人守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "姜饼人守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -7775,7 +7775,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_43005",
"intr": { "intr": {
"key": "item_item_intr_12043005", "key": "item_item_intr_12043005",
"text": "瓦希尔指挥官守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "瓦希尔指挥官守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -7873,7 +7873,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_43007",
"intr": { "intr": {
"key": "item_item_intr_12043007", "key": "item_item_intr_12043007",
"text": "戈伯守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "戈伯守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -7922,7 +7922,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_44001",
"intr": { "intr": {
"key": "item_item_intr_12044001", "key": "item_item_intr_12044001",
"text": "美肚鲨守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "美肚鲨守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -8020,7 +8020,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_44003",
"intr": { "intr": {
"key": "item_item_intr_12044003", "key": "item_item_intr_12044003",
"text": "匹诺曹守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "匹诺曹守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -8216,7 +8216,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_45001",
"intr": { "intr": {
"key": "item_item_intr_12045001", "key": "item_item_intr_12045001",
"text": "乌龟大师守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "乌龟大师守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -8265,7 +8265,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_45002",
"intr": { "intr": {
"key": "item_item_intr_12045002", "key": "item_item_intr_12045002",
"text": "梅林守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "梅林守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@ -8363,7 +8363,7 @@
], ],
"use_skip": 166, "use_skip": 166,
"upper_limit": 0, "upper_limit": 0,
"img": "xxtx_js_25001", "img": "xxtx_js_45004",
"intr": { "intr": {
"key": "item_item_intr_12045004", "key": "item_item_intr_12045004",
"text": "穿靴子的猫守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。" "text": "穿靴子的猫守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"

44
bin/json/game_monsterformat.json
View File

@ -5113,12 +5113,12 @@
"newskill": [], "newskill": [],
"lv": 11, "lv": 11,
"hppro": 2, "hppro": 2,
"atkpro": 5, "atkpro": 2,
"defpro": 0.83, "defpro": 0.5,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
"speed": 180, "speed": 90,
"modelsize": 1 "modelsize": 1
}, },
{ {
@ -5133,7 +5133,7 @@
"newskill": [], "newskill": [],
"lv": 11, "lv": 11,
"hppro": 2, "hppro": 2,
"atkpro": 2.4, "atkpro": 2,
"defpro": 0.73, "defpro": 0.73,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -5153,8 +5153,8 @@
"newskill": [], "newskill": [],
"lv": 11, "lv": 11,
"hppro": 2, "hppro": 2,
"atkpro": 2.4, "atkpro": 2,
"defpro": 1, "defpro": 0.5,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
@ -5173,7 +5173,7 @@
"newskill": [], "newskill": [],
"lv": 11, "lv": 11,
"hppro": 2, "hppro": 2,
"atkpro": 2.4, "atkpro": 2,
"defpro": 0.85, "defpro": 0.85,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
@ -5194,7 +5194,7 @@
"lv": 11, "lv": 11,
"hppro": 2, "hppro": 2,
"atkpro": 1.2, "atkpro": 1.2,
"defpro": 1, "defpro": 0.5,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
@ -367078,7 +367078,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 51025, "heroid": 51015,
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
@ -367118,7 +367118,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 51026, "heroid": 51016,
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
@ -367378,7 +367378,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 51025, "heroid": 51015,
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
@ -367418,7 +367418,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 51026, "heroid": 51016,
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
@ -367678,7 +367678,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 51025, "heroid": 51015,
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
@ -367718,7 +367718,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 51026, "heroid": 51016,
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
@ -367978,7 +367978,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 51025, "heroid": 51015,
"star": 4, "star": 4,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
@ -368018,7 +368018,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 51026, "heroid": 51016,
"star": 4, "star": 4,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
@ -368278,7 +368278,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 51025, "heroid": 51015,
"star": 5, "star": 5,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
@ -368318,7 +368318,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 51026, "heroid": 51016,
"star": 5, "star": 5,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
@ -368578,7 +368578,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 51025, "heroid": 51015,
"star": 5, "star": 5,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
@ -368618,7 +368618,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 51026, "heroid": 51016,
"star": 5, "star": 5,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
@ -368878,7 +368878,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 51025, "heroid": 51015,
"star": 5, "star": 5,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
@ -368918,7 +368918,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 51026, "heroid": 51016,
"star": 5, "star": 5,
"equip": [], "equip": [],
"newskill": [], "newskill": [],

23
bin/json/game_skillafteratk.json
View File

@ -59168,6 +59168,29 @@
"RevisiCondition": "", "RevisiCondition": "",
"RevisiParams": [] "RevisiParams": []
}, },
{
"Id": 844001215,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
484400123,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{ {
"Id": 835004211, "Id": 835004211,
"EmitPR": 1000, "EmitPR": 1000,

18
bin/json/game_skillatk.json
View File

@ -45956,11 +45956,11 @@
"Target": 0, "Target": 0,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
815004115 815004215
] ]
}, },
"passSkill": [ "passSkill": [
815004115 815004215
], ],
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_815004412_1", "key": "skill_skill_atk_Desc_815004412_1",
@ -52076,7 +52076,9 @@
844001211 844001211
] ]
}, },
"passSkill": [], "passSkill": [
844001211
],
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_844001421_1", "key": "skill_skill_atk_Desc_844001421_1",
"text": "2技能造成暴击后有30%概率追加1次1技能" "text": "2技能造成暴击后有30%概率追加1次1技能"
@ -52109,7 +52111,9 @@
844001212 844001212
] ]
}, },
"passSkill": [], "passSkill": [
844001212
],
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_844001422_1", "key": "skill_skill_atk_Desc_844001422_1",
"text": "造成击杀后立即回复自身20%最大血量" "text": "造成击杀后立即回复自身20%最大血量"
@ -52139,10 +52143,12 @@
"Target": 0, "Target": 0,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
844001211 844001215
] ]
}, },
"passSkill": [], "passSkill": [
844001215
],
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_844001423_1", "key": "skill_skill_atk_Desc_844001423_1",
"text": "2技能造成暴击后额外附加2回合【流血】" "text": "2技能造成暴击后额外附加2回合【流血】"

380
bin/json/game_skillbuff.json
View File

File diff suppressed because it is too large Load Diff

538
bin/json/game_skillpassive.json
View File

File diff suppressed because it is too large Load Diff

23
modules/chat/modelChat.go
View File

@ -8,6 +8,7 @@ import (
"go_dreamfactory/lego/sys/redis" "go_dreamfactory/lego/sys/redis"
"go_dreamfactory/modules" "go_dreamfactory/modules"
"go_dreamfactory/pb" "go_dreamfactory/pb"
"go_dreamfactory/sys/db"
"strings" "strings"
"go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson"
@ -75,19 +76,19 @@ func (this *modelChatComp) getChatQueue(channel pb.ChatChannel, stag, union stri
switch channel { switch channel {
case pb.ChatChannel_World: case pb.ChatChannel_World:
// key = worldchatkey // key = worldchatkey
key = fmt.Sprintf("%s-%s", worldchatkey, stag) key = fmt.Sprintf("%s-%s-%s", db.CrossTag(), worldchatkey, stag)
find = bson.M{"channel": channel} find = bson.M{"channel": channel}
break break
case pb.ChatChannel_Union: case pb.ChatChannel_Union:
key = fmt.Sprintf("%s-%s", unionchatkey, union) key = fmt.Sprintf("%s-%s-%s", db.CrossTag(), unionchatkey, union)
find = bson.M{"channel": channel, "unionId": union} find = bson.M{"channel": channel, "unionId": union}
break break
case pb.ChatChannel_CrossServer: case pb.ChatChannel_CrossServer:
key = fmt.Sprintf("%s-%d", crosschatkey, area) key = fmt.Sprintf("%s-%s-%d", db.CrossTag(), crosschatkey, area)
find = bson.M{"channel": channel, "areaId": area} find = bson.M{"channel": channel, "areaId": area}
break break
case pb.ChatChannel_System: case pb.ChatChannel_System:
key = systemchatkey key = fmt.Sprintf("%s-%s", db.CrossTag(), systemchatkey)
find = bson.M{"channel": channel} find = bson.M{"channel": channel}
break break
} }
@ -141,7 +142,7 @@ func (this *modelChatComp) addCrossChannelMember(session comm.IUserSession) (cha
return return
} }
for { for {
key := fmt.Sprintf("%s-%d-member", crosschatkey, channel) key := fmt.Sprintf("%s-%s-%d-member", db.CrossTag(), crosschatkey, channel)
if count, err = this.Redis.Hlen(key); err != nil { if count, err = this.Redis.Hlen(key); err != nil {
this.module.Errorf("err:%v", err) this.module.Errorf("err:%v", err)
return return
@ -171,7 +172,7 @@ func (this *modelChatComp) chanageChannel(session comm.IUserSession, channel int
var ( var (
maxnum int32 maxnum int32
) )
key := fmt.Sprintf("%s-%d-member", crosschatkey, channel) key := fmt.Sprintf("%s-%s-%d-member", db.CrossTag(), crosschatkey, channel)
count := 0 count := 0
if maxnum, err = this.module.configure.GetChanageChannelMax(); err != nil { if maxnum, err = this.module.configure.GetChanageChannelMax(); err != nil {
return return
@ -192,7 +193,7 @@ func (this *modelChatComp) chanageChannel(session comm.IUserSession, channel int
// 读取跨服聊天频道下成员 // 读取跨服聊天频道下成员
func (this *modelChatComp) getCrossChannelMember(channel int32) (result []*pb.CacheUser, err error) { func (this *modelChatComp) getCrossChannelMember(channel int32) (result []*pb.CacheUser, err error) {
key := fmt.Sprintf("%s-%d-member", crosschatkey, channel) key := fmt.Sprintf("%s-%s-%d-member", db.CrossTag(), crosschatkey, channel)
temp := make(map[string]*pb.CacheUser, 0) temp := make(map[string]*pb.CacheUser, 0)
if err = this.Redis.HGetAll(key, &temp); err != nil { if err = this.Redis.HGetAll(key, &temp); err != nil {
this.module.Errorf("err:%v", err) this.module.Errorf("err:%v", err)
@ -217,7 +218,7 @@ func (this *modelChatComp) removeCrossChannelMember(uid string) (err error) {
return return
} }
key := fmt.Sprintf("%s-%d-member", crosschatkey, result.Chatchannel) key := fmt.Sprintf("%s-%s-%d-member", db.CrossTag(), crosschatkey, result.Chatchannel)
if err = this.Redis.HDel(key, uid); err != nil { if err = this.Redis.HDel(key, uid); err != nil {
this.module.Errorf("err:%v", err) this.module.Errorf("err:%v", err)
return return
@ -322,7 +323,7 @@ func (this *modelChatComp) addChatMsg(key string, count int64, msgs ...*pb.DBCha
// 发送聊天消息到世界频道 // 发送聊天消息到世界频道
func (this *modelChatComp) sendChatToWorld(chat *pb.DBChat, queuecount int32) (err error) { func (this *modelChatComp) sendChatToWorld(chat *pb.DBChat, queuecount int32) (err error) {
if err = this.module.modelChat.addChatMsg(fmt.Sprintf("%s-%s", worldchatkey, chat.Stag), int64(queuecount), chat); err != nil { if err = this.module.modelChat.addChatMsg(fmt.Sprintf("%s-%s-%s", db.CrossTag(), worldchatkey, chat.Stag), int64(queuecount), chat); err != nil {
this.module.Errorln(err) this.module.Errorln(err)
return return
} }
@ -338,7 +339,7 @@ func (this *modelChatComp) sendChatToUnion(chat *pb.DBChat, queuecount int32) (e
var ( var (
err error err error
) )
if err = this.module.modelChat.addChatMsg(fmt.Sprintf("%s-%s", unionchatkey, chat.UnionId), int64(queuecount), chat); err != nil { if err = this.module.modelChat.addChatMsg(fmt.Sprintf("%s-%s-%s", db.CrossTag(), unionchatkey, chat.UnionId), int64(queuecount), chat); err != nil {
this.module.Errorln(err) this.module.Errorln(err)
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError, Code: pb.ErrorCode_DBError,
@ -356,7 +357,7 @@ func (this *modelChatComp) sendChatToUnion(chat *pb.DBChat, queuecount int32) (e
// 发送聊天消息到工会频道 // 发送聊天消息到工会频道
func (this *modelChatComp) sendChatToCrossServer(chat *pb.DBChat, queuecount int32) (err error) { func (this *modelChatComp) sendChatToCrossServer(chat *pb.DBChat, queuecount int32) (err error) {
if err = this.module.modelChat.addChatMsg(fmt.Sprintf("%s-%d", crosschatkey, chat.ChannelId), int64(queuecount), chat); err != nil { if err = this.module.modelChat.addChatMsg(fmt.Sprintf("%s-%s-%d", db.CrossTag(), crosschatkey, chat.ChannelId), int64(queuecount), chat); err != nil {
this.module.Errorln(err) this.module.Errorln(err)
return return
} }

2
modules/chat/module.go
View File

@ -278,6 +278,7 @@ func (this *Chat) SendSysChatToWorld(session comm.IUserSession, ctype comm.ChatS
if appenddata != nil { if appenddata != nil {
if jsonStr, err = json.Marshal(appenddata); err != nil { if jsonStr, err = json.Marshal(appenddata); err != nil {
this.Errorf("err:%v", err) this.Errorf("err:%v", err)
return
} else { } else {
data := map[string]interface{}{ data := map[string]interface{}{
agrs[1]: map[string]interface{}{ agrs[1]: map[string]interface{}{
@ -295,6 +296,7 @@ func (this *Chat) SendSysChatToWorld(session comm.IUserSession, ctype comm.ChatS
if appenddata != nil { if appenddata != nil {
if jsonStr, err = json.Marshal(appenddata); err != nil { if jsonStr, err = json.Marshal(appenddata); err != nil {
this.Errorf("err:%v", err) this.Errorf("err:%v", err)
return
} else { } else {
data := map[string]interface{}{ data := map[string]interface{}{
agrs[1]: map[string]interface{}{ agrs[1]: map[string]interface{}{

4
modules/gm/module.go
View File

@ -146,7 +146,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er
} }
data := this.configure.GetHeroConfigData() data := this.configure.GetHeroConfigData()
for _, v := range data { for _, v := range data {
if v.Handbook != -1 { if v.Handbook {
res = append(res, &cfg.Gameatn{ res = append(res, &cfg.Gameatn{
A: "hero", A: "hero",
T: v.Hid, T: v.Hid,
@ -328,7 +328,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er
) )
data := this.configure.GetHeroConfigData() data := this.configure.GetHeroConfigData()
for _, v := range data { for _, v := range data {
if v.Handbook != -1 { if v.Handbook {
res = append(res, &cfg.Gameatn{ res = append(res, &cfg.Gameatn{
A: "hero", A: "hero",
T: v.Hid, T: v.Hid,

2
modules/guildgve/api_roulette.go
View File

@ -67,7 +67,7 @@ func (this *apiComp) Roulette(session comm.IUserSession, req *pb.GuildGveRoulett
return return
} }
if confs[index].Push == 1 { //推送通知 if confs[index].Push { //推送通知
go this.module.modelUnionroulette.roulettechangePush(req.Guildid, session.GetUserId(), user.Name, confs[index].Id, award) go this.module.modelUnionroulette.roulettechangePush(req.Guildid, session.GetUserId(), user.Name, confs[index].Id, award)
} }
session.SendMsg(string(this.module.GetType()), "roulette", &pb.GuildGveRouletteResp{Cid: confs[index].Id, Award: award}) session.SendMsg(string(this.module.GetType()), "roulette", &pb.GuildGveRouletteResp{Cid: confs[index].Id, Award: award})

2
modules/hero/module.go
View File

@ -420,7 +420,7 @@ func (this *Hero) GetAllMaxHero(session comm.IUserSession, bTalent bool) (errdat
changeHero []*pb.DBHero changeHero []*pb.DBHero
) )
for _, v := range data { for _, v := range data {
if v.Handbook != -1 { if v.Handbook {
cid := v.Hid cid := v.Hid
maxStar := v.Star maxStar := v.Star
starConf, _ := this.configure.GetHeroStarupConfig(cid, v.Star) starConf, _ := this.configure.GetHeroStarupConfig(cid, v.Star)

18
sys/configure/structs/Game.BattleExecutionType.go Normal file
View File

@ -0,0 +1,18 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
const (
GameBattleExecutionType_NoExecute = 0
GameBattleExecutionType_Executive = 1
GameBattleExecutionType_Story = 2
GameBattleExecutionType_Assist = 3
GameBattleExecutionType_Guide = 4
GameBattleExecutionType_NextWave = 5
)

4
sys/configure/structs/Game.FightGlobalEventData.go
View File

@ -13,7 +13,7 @@ import "errors"
type GameFightGlobalEventData struct { type GameFightGlobalEventData struct {
Id int32 Id int32
Count int32 Count int32
LoopTime int32 LoopTime bool
Desc string Desc string
When int32 When int32
FromCheck string FromCheck string
@ -36,7 +36,7 @@ func (*GameFightGlobalEventData) GetTypeId() int32 {
func (_v *GameFightGlobalEventData)Deserialize(_buf map[string]interface{}) (err error) { func (_v *GameFightGlobalEventData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Id"].(float64); !_ok_ { err = errors.New("Id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Id"].(float64); !_ok_ { err = errors.New("Id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Count"].(float64); !_ok_ { err = errors.New("Count error"); return }; _v.Count = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Count"].(float64); !_ok_ { err = errors.New("Count error"); return }; _v.Count = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["LoopTime"].(float64); !_ok_ { err = errors.New("LoopTime error"); return }; _v.LoopTime = int32(_tempNum_) } { var _ok_ bool; if _v.LoopTime, _ok_ = _buf["LoopTime"].(bool); !_ok_ { err = errors.New("LoopTime error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["desc"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["desc"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["When"].(float64); !_ok_ { err = errors.New("When error"); return }; _v.When = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["When"].(float64); !_ok_ { err = errors.New("When error"); return }; _v.When = int32(_tempNum_) }
{ var _ok_ bool; if _v.FromCheck, _ok_ = _buf["FromCheck"].(string); !_ok_ { err = errors.New("FromCheck error"); return } } { var _ok_ bool; if _v.FromCheck, _ok_ = _buf["FromCheck"].(string); !_ok_ { err = errors.New("FromCheck error"); return } }

16
sys/configure/structs/Game.GuideData.go
View File

@ -30,12 +30,12 @@ type GameGuideData struct {
Txtoffset serialization.Vector2 Txtoffset serialization.Vector2
Speakerface int32 Speakerface int32
Sound string Sound string
Mask int32 Mask bool
Lock int32 Lock bool
Uishow int32 Uishow bool
Skiptime int32 Skiptime int32
Skip int32 Skip int32
Skipgroup int32 Skipgroup bool
Reward []*Gameatn Reward []*Gameatn
} }
@ -101,12 +101,12 @@ func (_v *GameGuideData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["speakerface"].(float64); !_ok_ { err = errors.New("speakerface error"); return }; _v.Speakerface = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["speakerface"].(float64); !_ok_ { err = errors.New("speakerface error"); return }; _v.Speakerface = int32(_tempNum_) }
{ var _ok_ bool; if _v.Sound, _ok_ = _buf["sound"].(string); !_ok_ { err = errors.New("sound error"); return } } { var _ok_ bool; if _v.Sound, _ok_ = _buf["sound"].(string); !_ok_ { err = errors.New("sound error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["mask"].(float64); !_ok_ { err = errors.New("mask error"); return }; _v.Mask = int32(_tempNum_) } { var _ok_ bool; if _v.Mask, _ok_ = _buf["mask"].(bool); !_ok_ { err = errors.New("mask error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lock"].(float64); !_ok_ { err = errors.New("lock error"); return }; _v.Lock = int32(_tempNum_) } { var _ok_ bool; if _v.Lock, _ok_ = _buf["lock"].(bool); !_ok_ { err = errors.New("lock error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["uishow"].(float64); !_ok_ { err = errors.New("uishow error"); return }; _v.Uishow = int32(_tempNum_) } { var _ok_ bool; if _v.Uishow, _ok_ = _buf["uishow"].(bool); !_ok_ { err = errors.New("uishow error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skiptime"].(float64); !_ok_ { err = errors.New("skiptime error"); return }; _v.Skiptime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skiptime"].(float64); !_ok_ { err = errors.New("skiptime error"); return }; _v.Skiptime = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skip"].(float64); !_ok_ { err = errors.New("skip error"); return }; _v.Skip = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skip"].(float64); !_ok_ { err = errors.New("skip error"); return }; _v.Skip = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skipgroup"].(float64); !_ok_ { err = errors.New("skipgroup error"); return }; _v.Skipgroup = int32(_tempNum_) } { var _ok_ bool; if _v.Skipgroup, _ok_ = _buf["skipgroup"].(bool); !_ok_ { err = errors.New("skipgroup error"); return } }
{ {
var _arr_ []interface{} var _arr_ []interface{}
var _ok_ bool var _ok_ bool

4
sys/configure/structs/Game.GuildBossRouletteData.go
View File

@ -15,7 +15,7 @@ type GameGuildBossRouletteData struct {
Reward []*Gameatn Reward []*Gameatn
Weight int32 Weight int32
Need []*Gameatn Need []*Gameatn
Push int32 Push bool
} }
const TypeId_GameGuildBossRouletteData = 797473250 const TypeId_GameGuildBossRouletteData = 797473250
@ -55,7 +55,7 @@ func (_v *GameGuildBossRouletteData)Deserialize(_buf map[string]interface{}) (er
} }
} }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["push"].(float64); !_ok_ { err = errors.New("push error"); return }; _v.Push = int32(_tempNum_) } { var _ok_ bool; if _v.Push, _ok_ = _buf["push"].(bool); !_ok_ { err = errors.New("push error"); return } }
return return
} }

4
sys/configure/structs/Game.IntegralBossData.go
View File

@ -29,6 +29,7 @@ type GameIntegralBossData struct {
HeroId int32 HeroId int32
Boss []int32 Boss []int32
BossIcon string BossIcon string
BackPng string
} }
const TypeId_GameIntegralBossData = 1191591167 const TypeId_GameIntegralBossData = 1191591167
@ -42,7 +43,7 @@ func (_v *GameIntegralBossData)Deserialize(_buf map[string]interface{}) (err err
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hdid"].(float64); !_ok_ { err = errors.New("hdid error"); return }; _v.Hdid = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hdid"].(float64); !_ok_ { err = errors.New("hdid error"); return }; _v.Hdid = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["difficulty"].(float64); !_ok_ { err = errors.New("difficulty error"); return }; _v.Difficulty = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["difficulty"].(float64); !_ok_ { err = errors.New("difficulty error"); return }; _v.Difficulty = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["itype"].(float64); !_ok_ { err = errors.New("itype error"); return }; _v.Itype = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["itype"].(float64); !_ok_ { err = errors.New("itype error"); return }; _v.Itype = int32(_tempNum_) }
{ var _ok_ bool; if _v.Difficultytext, _ok_ = _buf["difficultytext"].(string); !_ok_ { err = errors.New("difficultytext error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["difficultytext"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Difficultytext error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Difficultytext, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["coefficient"].(float64); !_ok_ { err = errors.New("coefficient error"); return }; _v.Coefficient = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["coefficient"].(float64); !_ok_ { err = errors.New("coefficient error"); return }; _v.Coefficient = float32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["unlock"].(float64); !_ok_ { err = errors.New("unlock error"); return }; _v.Unlock = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["unlock"].(float64); !_ok_ { err = errors.New("unlock error"); return }; _v.Unlock = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["unlockval"].(float64); !_ok_ { err = errors.New("unlockval error"); return }; _v.Unlockval = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["unlockval"].(float64); !_ok_ { err = errors.New("unlockval error"); return }; _v.Unlockval = int32(_tempNum_) }
@ -82,6 +83,7 @@ func (_v *GameIntegralBossData)Deserialize(_buf map[string]interface{}) (err err
} }
{ var _ok_ bool; if _v.BossIcon, _ok_ = _buf["bossIcon"].(string); !_ok_ { err = errors.New("bossIcon error"); return } } { var _ok_ bool; if _v.BossIcon, _ok_ = _buf["bossIcon"].(string); !_ok_ { err = errors.New("bossIcon error"); return } }
{ var _ok_ bool; if _v.BackPng, _ok_ = _buf["back_png"].(string); !_ok_ { err = errors.New("back_png error"); return } }
return return
} }

4
sys/configure/structs/Game.IntegralConditionData.go
View File

@ -28,11 +28,11 @@ func (*GameIntegralConditionData) GetTypeId() int32 {
func (_v *GameIntegralConditionData)Deserialize(_buf map[string]interface{}) (err error) { func (_v *GameIntegralConditionData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; if _v.Condition, _ok_ = _buf["condition"].(string); !_ok_ { err = errors.New("condition error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["condition"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Condition error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Condition, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["TaskId"].(float64); !_ok_ { err = errors.New("TaskId error"); return }; _v.TaskId = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["TaskId"].(float64); !_ok_ { err = errors.New("TaskId error"); return }; _v.TaskId = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["iType"].(float64); !_ok_ { err = errors.New("iType error"); return }; _v.IType = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["iType"].(float64); !_ok_ { err = errors.New("iType error"); return }; _v.IType = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["jumpto"].(float64); !_ok_ { err = errors.New("jumpto error"); return }; _v.Jumpto = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["jumpto"].(float64); !_ok_ { err = errors.New("jumpto error"); return }; _v.Jumpto = int32(_tempNum_) }
{ var _ok_ bool; if _v.Des, _ok_ = _buf["des"].(string); !_ok_ { err = errors.New("des error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["des"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Des error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Des, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skillid"].(float64); !_ok_ { err = errors.New("skillid error"); return }; _v.Skillid = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skillid"].(float64); !_ok_ { err = errors.New("skillid error"); return }; _v.Skillid = int32(_tempNum_) }
return return
} }

14
sys/configure/structs/TEnum.EAddGroup.go Normal file
View File

@ -0,0 +1,14 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
const (
TEnumEAddGroup_All = 1
TEnumEAddGroup_Appoint = 2
)

14
sys/configure/structs/TEnum.ECheckType.go Normal file
View File

@ -0,0 +1,14 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
const (
TEnumECheckType_Server = 1
TEnumECheckType_Client = 2
)

2
sys/configure/structs/TEnum.EEquipPos.go
View File

@ -9,7 +9,7 @@
package cfg package cfg
const ( const (
TEnumEEquipPos_None = -1 TEnumEEquipPos_All = -1
TEnumEEquipPos_Zero = 0 TEnumEEquipPos_Zero = 0
TEnumEEquipPos_One = 1 TEnumEEquipPos_One = 1
TEnumEEquipPos_Two = 2 TEnumEEquipPos_Two = 2

14
sys/configure/structs/TEnum.EGameRewardType.go Normal file
View File

@ -0,0 +1,14 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
const (
TEnumEGameRewardType_Week = 1
TEnumEGameRewardType_History = 2
)

17
sys/configure/structs/TEnum.EGuideType.go Normal file
View File

@ -0,0 +1,17 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
const (
TEnumEGuideType_Bubble = 1
TEnumEGuideType_Jump = 2
TEnumEGuideType_Click = 3
TEnumEGuideType_Story = 4
TEnumEGuideType_Rocker = 5
)

15
sys/configure/structs/TEnum.EHeroShowType.go Normal file
View File

@ -0,0 +1,15 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
const (
TEnumEHeroShowType_First = 1
TEnumEHeroShowType_All = 2
TEnumEHeroShowType_Not = 3
)

18
sys/configure/structs/TEnum.EHeroType.go Normal file
View File

@ -0,0 +1,18 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
const (
TEnumEHeroType_All = 0
TEnumEHeroType_HeroCard = 1
TEnumEHeroType_StarUpCard = 2
TEnumEHeroType_LevelUpCard = 3
TEnumEHeroType_SkillLevelCard = 4
TEnumEHeroType_MonsterCard = 5
)

17
sys/configure/structs/TEnum.EHeroUpStoryType.go Normal file
View File

@ -0,0 +1,17 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
const (
TEnumEHeroUpStoryType_Story = 1
TEnumEHeroUpStoryType_Fight = 2
TEnumEHeroUpStoryType_Box = 3
TEnumEHeroUpStoryType_Portal = 4
TEnumEHeroUpStoryType_Hide = 5
)

14
sys/configure/structs/TEnum.EIntegralBossType.go Normal file
View File

@ -0,0 +1,14 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
const (
TEnumEIntegralBossType_Difficulty = 1
TEnumEIntegralBossType_Event = 2
)

14
sys/configure/structs/TEnum.EIntegralRewardType.go Normal file
View File

@ -0,0 +1,14 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
const (
TEnumEIntegralRewardType_Rating = 1
TEnumEIntegralRewardType_Accumulate = 2
)

18
sys/configure/structs/TEnum.EJob.go Normal file
View File

@ -0,0 +1,18 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
const (
TEnumEJob_All = 0
TEnumEJob_Output = 1
TEnumEJob_Defense = 2
TEnumEJob_Auxiliary = 3
TEnumEJob_Control = 4
TEnumEJob_Material = 5
)

17
sys/configure/structs/TEnum.ERace.go Normal file
View File

@ -0,0 +1,17 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
const (
TEnumERace_All = 0
TEnumERace_Fire = 1
TEnumERace_Forest = 2
TEnumERace_Water = 3
TEnumERace_Light = 4
)

14
sys/configure/structs/TEnum.ESex.go Normal file
View File

@ -0,0 +1,14 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
const (
TEnumESex_Male = 1
TEnumESex_Female = 2
)

4
sys/configure/structs/game.heroData.go
View File

@ -21,7 +21,7 @@ type GameHeroData struct {
Type int32 Type int32
Ip int32 Ip int32
Sd int32 Sd int32
Handbook int32 Handbook bool
Prefab string Prefab string
Rotation string Rotation string
Revolve int32 Revolve int32
@ -71,7 +71,7 @@ func (_v *GameHeroData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ip"].(float64); !_ok_ { err = errors.New("ip error"); return }; _v.Ip = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ip"].(float64); !_ok_ { err = errors.New("ip error"); return }; _v.Ip = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sd"].(float64); !_ok_ { err = errors.New("sd error"); return }; _v.Sd = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sd"].(float64); !_ok_ { err = errors.New("sd error"); return }; _v.Sd = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["handbook"].(float64); !_ok_ { err = errors.New("handbook error"); return }; _v.Handbook = int32(_tempNum_) } { var _ok_ bool; if _v.Handbook, _ok_ = _buf["handbook"].(bool); !_ok_ { err = errors.New("handbook error"); return } }
{ var _ok_ bool; if _v.Prefab, _ok_ = _buf["prefab"].(string); !_ok_ { err = errors.New("prefab error"); return } } { var _ok_ bool; if _v.Prefab, _ok_ = _buf["prefab"].(string); !_ok_ { err = errors.New("prefab error"); return } }
{ var _ok_ bool; if _v.Rotation, _ok_ = _buf["rotation"].(string); !_ok_ { err = errors.New("rotation error"); return } } { var _ok_ bool; if _v.Rotation, _ok_ = _buf["rotation"].(string); !_ok_ { err = errors.New("rotation error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["revolve"].(float64); !_ok_ { err = errors.New("revolve error"); return }; _v.Revolve = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["revolve"].(float64); !_ok_ { err = errors.New("revolve error"); return }; _v.Revolve = int32(_tempNum_) }

2
sys/configure/structs/game.skillBuffData.go
View File

@ -32,6 +32,7 @@ type GameSkillBuffData struct {
Buffpos string Buffpos string
TriggerEffect string TriggerEffect string
TriggerPos string TriggerPos string
TriggerAnim string
ForbidFloat int32 ForbidFloat int32
ReplaceBuffID int32 ReplaceBuffID int32
} }
@ -116,6 +117,7 @@ func (_v *GameSkillBuffData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; if _v.Buffpos, _ok_ = _buf["buffpos"].(string); !_ok_ { err = errors.New("buffpos error"); return } } { var _ok_ bool; if _v.Buffpos, _ok_ = _buf["buffpos"].(string); !_ok_ { err = errors.New("buffpos error"); return } }
{ var _ok_ bool; if _v.TriggerEffect, _ok_ = _buf["TriggerEffect"].(string); !_ok_ { err = errors.New("TriggerEffect error"); return } } { var _ok_ bool; if _v.TriggerEffect, _ok_ = _buf["TriggerEffect"].(string); !_ok_ { err = errors.New("TriggerEffect error"); return } }
{ var _ok_ bool; if _v.TriggerPos, _ok_ = _buf["TriggerPos"].(string); !_ok_ { err = errors.New("TriggerPos error"); return } } { var _ok_ bool; if _v.TriggerPos, _ok_ = _buf["TriggerPos"].(string); !_ok_ { err = errors.New("TriggerPos error"); return } }
{ var _ok_ bool; if _v.TriggerAnim, _ok_ = _buf["TriggerAnim"].(string); !_ok_ { err = errors.New("TriggerAnim error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["forbidFloat"].(float64); !_ok_ { err = errors.New("forbidFloat error"); return }; _v.ForbidFloat = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["forbidFloat"].(float64); !_ok_ { err = errors.New("forbidFloat error"); return }; _v.ForbidFloat = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ReplaceBuffID"].(float64); !_ok_ { err = errors.New("ReplaceBuffID error"); return }; _v.ReplaceBuffID = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ReplaceBuffID"].(float64); !_ok_ { err = errors.New("ReplaceBuffID error"); return }; _v.ReplaceBuffID = int32(_tempNum_) }
return return

2
sys/configure/structs/game.skillPassiveData.go
View File

@ -22,6 +22,7 @@ type GameSkillPassiveData struct {
AddCon []string AddCon []string
PasPr int32 PasPr int32
PasCorrection int32 PasCorrection int32
TriggerAnim string
Type string Type string
MaxEmitTimesInRoundByRole int32 MaxEmitTimesInRoundByRole int32
MaxEmitTimes int32 MaxEmitTimes int32
@ -60,6 +61,7 @@ func (_v *GameSkillPassiveData)Deserialize(_buf map[string]interface{}) (err err
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["PasPr"].(float64); !_ok_ { err = errors.New("PasPr error"); return }; _v.PasPr = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["PasPr"].(float64); !_ok_ { err = errors.New("PasPr error"); return }; _v.PasPr = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["PasCorrection"].(float64); !_ok_ { err = errors.New("PasCorrection error"); return }; _v.PasCorrection = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["PasCorrection"].(float64); !_ok_ { err = errors.New("PasCorrection error"); return }; _v.PasCorrection = int32(_tempNum_) }
{ var _ok_ bool; if _v.TriggerAnim, _ok_ = _buf["TriggerAnim"].(string); !_ok_ { err = errors.New("TriggerAnim error"); return } }
{ var _ok_ bool; if _v.Type, _ok_ = _buf["Type"].(string); !_ok_ { err = errors.New("Type error"); return } } { var _ok_ bool; if _v.Type, _ok_ = _buf["Type"].(string); !_ok_ { err = errors.New("Type error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MaxEmitTimesInRoundByRole"].(float64); !_ok_ { err = errors.New("MaxEmitTimesInRoundByRole error"); return }; _v.MaxEmitTimesInRoundByRole = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MaxEmitTimesInRoundByRole"].(float64); !_ok_ { err = errors.New("MaxEmitTimesInRoundByRole error"); return }; _v.MaxEmitTimesInRoundByRole = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MaxEmitTimes"].(float64); !_ok_ { err = errors.New("MaxEmitTimes error"); return }; _v.MaxEmitTimes = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MaxEmitTimes"].(float64); !_ok_ { err = errors.New("MaxEmitTimes error"); return }; _v.MaxEmitTimes = int32(_tempNum_) }