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

上传装备修改

Browse Source
This commit is contained in:
liwei1dao 2023-06-07 17:55:58 +08:00
parent 48255abe2b
commit f085ffb5a1
30 changed files with 6816 additions and 3062 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
bin/json/game_bubblegroup.json
View File

@ -730,5 +730,53 @@
"key": "bubblegroup_bubblegroup_Text_Bubble_61", "key": "bubblegroup_bubblegroup_Text_Bubble_61",
"text": "希卡普，我的儿子，我为你骄傲！" "text": "希卡普，我的儿子，我为你骄傲！"
} }
},
{
"KeyId": 62,
"GroupID": 11001,
"Type": 2,
"TaskIDMin": 0,
"TaskIDMax": 0,
"weight": 10,
"Text_Bubble": {
"key": "bubblegroup_bubblegroup_Text_Bubble_62",
"text": "商店收购需求商品语录"
}
},
{
"KeyId": 63,
"GroupID": 11002,
"Type": 2,
"TaskIDMin": 0,
"TaskIDMax": 0,
"weight": 10,
"Text_Bubble": {
"key": "bubblegroup_bubblegroup_Text_Bubble_63",
"text": "商店收购普通商品语录"
}
},
{
"KeyId": 64,
"GroupID": 11003,
"Type": 2,
"TaskIDMin": 0,
"TaskIDMax": 0,
"weight": 10,
"Text_Bubble": {
"key": "bubblegroup_bubblegroup_Text_Bubble_64",
"text": "商店收购饱和商品语录"
}
},
{
"KeyId": 65,
"GroupID": 11004,
"Type": 2,
"TaskIDMin": 0,
"TaskIDMax": 0,
"weight": 10,
"Text_Bubble": {
"key": "bubblegroup_bubblegroup_Text_Bubble_65",
"text": "玩家购买成功语录"
}
} }
] ]

6748
bin/json/game_buriedcondi.json
View File

File diff suppressed because it is too large Load Diff

16
bin/json/game_buriedtype.json
View File

@ -498,7 +498,8 @@
"id": 79, "id": 79,
"insert": 1, "insert": 1,
"filter": [ "filter": [
"eq" "eq",
"gte"
] ]
}, },
{ {
@ -766,7 +767,9 @@
{ {
"id": 124, "id": 124,
"insert": 3, "insert": 3,
"filter": [] "filter": [
"gte"
]
}, },
{ {
"id": 125, "id": 125,
@ -797,7 +800,9 @@
{ {
"id": 129, "id": 129,
"insert": 1, "insert": 1,
"filter": [] "filter": [
"gte"
]
}, },
{ {
"id": 130, "id": 130,
@ -1117,6 +1122,11 @@
"insert": 2, "insert": 2,
"filter": [] "filter": []
}, },
{
"id": 189,
"insert": 2,
"filter": []
},
{ {
"id": 20001, "id": 20001,
"insert": 1, "insert": 1,

20
bin/json/game_caravancity.json
View File

@ -46,6 +46,10 @@
"exspecialnum": 1500, "exspecialnum": 1500,
"Orspecial": 1000, "Orspecial": 1000,
"checktime": 1800, "checktime": 1800,
"extalk": 11001,
"ortalk": 11002,
"sptalk": 11003,
"buytalk": 11004,
"cityeventpro": 50000, "cityeventpro": 50000,
"cityevent": [ "cityevent": [
1001 1001
@ -98,6 +102,10 @@
"exspecialnum": 1600, "exspecialnum": 1600,
"Orspecial": 1000, "Orspecial": 1000,
"checktime": 1800, "checktime": 1800,
"extalk": 11001,
"ortalk": 11002,
"sptalk": 11003,
"buytalk": 11004,
"cityeventpro": 100000, "cityeventpro": 100000,
"cityevent": [ "cityevent": [
1001 1001
@ -151,6 +159,10 @@
"exspecialnum": 1700, "exspecialnum": 1700,
"Orspecial": 1000, "Orspecial": 1000,
"checktime": 1800, "checktime": 1800,
"extalk": 11001,
"ortalk": 11002,
"sptalk": 11003,
"buytalk": 11004,
"cityeventpro": 50000, "cityeventpro": 50000,
"cityevent": [ "cityevent": [
1001 1001
@ -204,6 +216,10 @@
"exspecialnum": 1800, "exspecialnum": 1800,
"Orspecial": 1000, "Orspecial": 1000,
"checktime": 1800, "checktime": 1800,
"extalk": 11001,
"ortalk": 11002,
"sptalk": 11003,
"buytalk": 11004,
"cityeventpro": 100000, "cityeventpro": 100000,
"cityevent": [ "cityevent": [
1001 1001
@ -256,6 +272,10 @@
"exspecialnum": 1900, "exspecialnum": 1900,
"Orspecial": 1000, "Orspecial": 1000,
"checktime": 1800, "checktime": 1800,
"extalk": 11001,
"ortalk": 11002,
"sptalk": 11003,
"buytalk": 11004,
"cityeventpro": 50000, "cityeventpro": 50000,
"cityevent": [ "cityevent": [
1001 1001

6
bin/json/game_caravanevent.json
View File

@ -11,9 +11,9 @@
"key": "caravan_caravan_event_traintips_1", "key": "caravan_caravan_event_traintips_1",
"text": "列车上来了外人，这个人看上去有很急切的事情，我们必须先解决这个再离开这里。" "text": "列车上来了外人，这个人看上去有很急切的事情，我们必须先解决这个再离开这里。"
}, },
"trainstory": 888, "trainstory": 500,
"trainstorybad": 777, "trainstorybad": 500,
"trainstorygood": 888, "trainstorygood": 500,
"reword": [ "reword": [
{ {
"a": "item", "a": "item",

1944
bin/json/game_equip.json
View File

File diff suppressed because it is too large Load Diff

10
bin/json/game_gm.json
View File

@ -308,5 +308,15 @@
}, },
"data": "", "data": "",
"prefix": "bingo:cleannpc" "prefix": "bingo:cleannpc"
},
{
"id": 32,
"type": 1,
"text": {
"key": "GM_GM_text_32",
"text": "获取所有教习资源"
},
"data": "",
"prefix": "bingo:jx"
} }
] ]

2
bin/json/game_guildtask.json
View File

@ -107,7 +107,7 @@
"jump_interface": 103, "jump_interface": 103,
"task_display": { "task_display": {
"key": "guild_guild_task_task_display_4", "key": "guild_guild_task_task_display_4",
"text": "为任意影响提升1级" "text": "为任意英雄提升1级"
}, },
"reward": [ "reward": [
{ {

206
bin/json/game_item.json
View File

@ -12,7 +12,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -43,7 +43,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_2", "effects": "effect_ui_bagwindow_2",
"modelName": "", "modelName": "",
"box_id": 60001, "box_id": 60001,
"synthetize_num": 0, "synthetize_num": 0,
@ -74,7 +74,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_2", "effects": "effect_ui_bagwindow_2",
"modelName": "", "modelName": "",
"box_id": 60002, "box_id": 60002,
"synthetize_num": 0, "synthetize_num": 0,
@ -105,7 +105,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_2", "effects": "effect_ui_bagwindow_2",
"modelName": "", "modelName": "",
"box_id": 60003, "box_id": 60003,
"synthetize_num": 0, "synthetize_num": 0,
@ -1366,7 +1366,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "moyao_1", "modelName": "moyao_1",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -1397,7 +1397,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "moyao_2", "modelName": "moyao_2",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -1490,7 +1490,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -1527,7 +1527,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -1564,7 +1564,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -1601,7 +1601,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -1638,7 +1638,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -1675,7 +1675,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -1712,7 +1712,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -1749,7 +1749,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -1786,7 +1786,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -1823,7 +1823,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -1860,7 +1860,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -1897,7 +1897,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -1934,7 +1934,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -1971,7 +1971,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2008,7 +2008,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2045,7 +2045,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2082,7 +2082,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2119,7 +2119,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2156,7 +2156,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2193,7 +2193,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2230,7 +2230,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2267,7 +2267,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2304,7 +2304,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2341,7 +2341,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2378,7 +2378,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2415,7 +2415,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2452,7 +2452,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2489,7 +2489,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2526,7 +2526,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2563,7 +2563,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2600,7 +2600,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2637,7 +2637,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2674,7 +2674,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2711,7 +2711,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2748,7 +2748,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2785,7 +2785,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2822,7 +2822,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2859,7 +2859,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2896,7 +2896,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2933,7 +2933,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -2970,7 +2970,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3007,7 +3007,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3044,7 +3044,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3081,7 +3081,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3118,7 +3118,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3155,7 +3155,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3192,7 +3192,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3229,7 +3229,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3266,7 +3266,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3303,7 +3303,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3340,7 +3340,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3377,7 +3377,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3414,7 +3414,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3451,7 +3451,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3488,7 +3488,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3525,7 +3525,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3562,7 +3562,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3599,7 +3599,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3636,7 +3636,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3673,7 +3673,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3710,7 +3710,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3747,7 +3747,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3784,7 +3784,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3821,7 +3821,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3858,7 +3858,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3895,7 +3895,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3932,7 +3932,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -3969,7 +3969,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -4006,7 +4006,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -4043,7 +4043,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -4080,7 +4080,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -4117,7 +4117,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -4154,7 +4154,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_2", "effects": "effect_ui_bagwindow_2",
"modelName": "", "modelName": "",
"box_id": 1000001, "box_id": 1000001,
"synthetize_num": 0, "synthetize_num": 0,
@ -4228,7 +4228,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -4339,7 +4339,7 @@
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -4369,7 +4369,7 @@
"key": "item_item_name_144", "key": "item_item_name_144",
"text": "英雄初级升星道具" "text": "英雄初级升星道具"
}, },
"usetype": 2, "usetype": 6,
"color": 2, "color": 2,
"bagtype": 1, "bagtype": 1,
"index": 100, "index": 100,
@ -4406,7 +4406,7 @@
"key": "item_item_name_145", "key": "item_item_name_145",
"text": "英雄中级升星道具" "text": "英雄中级升星道具"
}, },
"usetype": 2, "usetype": 6,
"color": 3, "color": 3,
"bagtype": 1, "bagtype": 1,
"index": 101, "index": 101,
@ -4449,14 +4449,14 @@
"key": "item_item_name_146", "key": "item_item_name_146",
"text": "英雄高级升星道具" "text": "英雄高级升星道具"
}, },
"usetype": 2, "usetype": 6,
"color": 4, "color": 4,
"bagtype": 1, "bagtype": 1,
"index": 102, "index": 102,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -7385,7 +7385,7 @@
"special_type": 600, "special_type": 600,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -7422,7 +7422,7 @@
"special_type": 550, "special_type": 550,
"time": 0, "time": 0,
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_wuping_1", "effects": "effect_ui_bagwindow_3",
"modelName": "", "modelName": "",
"box_id": 0, "box_id": 0,
"synthetize_num": 0, "synthetize_num": 0,
@ -7752,7 +7752,7 @@
"effects": "", "effects": "",
"modelName": "", "modelName": "",
"box_id": 15000201, "box_id": 15000201,
"synthetize_num": 3, "synthetize_num": 5,
"access": [ "access": [
168 168
], ],
@ -7789,7 +7789,7 @@
"effects": "", "effects": "",
"modelName": "", "modelName": "",
"box_id": 15000202, "box_id": 15000202,
"synthetize_num": 3, "synthetize_num": 5,
"access": [ "access": [
168 168
], ],
@ -7826,7 +7826,7 @@
"effects": "", "effects": "",
"modelName": "", "modelName": "",
"box_id": 15000203, "box_id": 15000203,
"synthetize_num": 3, "synthetize_num": 5,
"access": [ "access": [
168 168
], ],
@ -7863,7 +7863,7 @@
"effects": "", "effects": "",
"modelName": "", "modelName": "",
"box_id": 15000204, "box_id": 15000204,
"synthetize_num": 3, "synthetize_num": 5,
"access": [ "access": [
168 168
], ],
@ -7900,7 +7900,7 @@
"effects": "", "effects": "",
"modelName": "", "modelName": "",
"box_id": 15000301, "box_id": 15000301,
"synthetize_num": 3, "synthetize_num": 5,
"access": [ "access": [
168 168
], ],
@ -7923,7 +7923,7 @@
{ {
"a": "item", "a": "item",
"t": "15000201", "t": "15000201",
"n": 4 "n": 3
} }
] ]
}, },
@ -7943,7 +7943,7 @@
"effects": "", "effects": "",
"modelName": "", "modelName": "",
"box_id": 15000302, "box_id": 15000302,
"synthetize_num": 3, "synthetize_num": 5,
"access": [ "access": [
168 168
], ],
@ -7966,7 +7966,7 @@
{ {
"a": "item", "a": "item",
"t": "15000202", "t": "15000202",
"n": 4 "n": 3
} }
] ]
}, },
@ -7986,7 +7986,7 @@
"effects": "", "effects": "",
"modelName": "", "modelName": "",
"box_id": 15000303, "box_id": 15000303,
"synthetize_num": 3, "synthetize_num": 5,
"access": [ "access": [
168 168
], ],
@ -8009,7 +8009,7 @@
{ {
"a": "item", "a": "item",
"t": "15000203", "t": "15000203",
"n": 4 "n": 3
} }
] ]
}, },
@ -8029,7 +8029,7 @@
"effects": "", "effects": "",
"modelName": "", "modelName": "",
"box_id": 15000304, "box_id": 15000304,
"synthetize_num": 3, "synthetize_num": 5,
"access": [ "access": [
168 168
], ],
@ -8052,7 +8052,7 @@
{ {
"a": "item", "a": "item",
"t": "15000204", "t": "15000204",
"n": 4 "n": 3
} }
] ]
}, },
@ -8095,7 +8095,7 @@
{ {
"a": "item", "a": "item",
"t": "15000301", "t": "15000301",
"n": 4 "n": 3
} }
] ]
}, },
@ -8138,7 +8138,7 @@
{ {
"a": "item", "a": "item",
"t": "15000302", "t": "15000302",
"n": 4 "n": 3
} }
] ]
}, },
@ -8181,7 +8181,7 @@
{ {
"a": "item", "a": "item",
"t": "15000303", "t": "15000303",
"n": 4 "n": 3
} }
] ]
}, },
@ -8224,7 +8224,7 @@
{ {
"a": "item", "a": "item",
"t": "15000304", "t": "15000304",
"n": 4 "n": 3
} }
] ]
}, },

81
bin/json/game_navigation.json
View File

@ -15,7 +15,7 @@
"功能入口-商人" "功能入口-商人"
], ],
"functionicon": "icon_sd", "functionicon": "icon_sd",
"mainscreen": "" "jumpId": 122
}, },
{ {
"Id": 2, "Id": 2,
@ -33,7 +33,7 @@
"功能入口-公告" "功能入口-公告"
], ],
"functionicon": "icon_gg", "functionicon": "icon_gg",
"mainscreen": "" "jumpId": 722
}, },
{ {
"Id": 3, "Id": 3,
@ -51,7 +51,7 @@
"功能入口-邮件" "功能入口-邮件"
], ],
"functionicon": "icon_yj", "functionicon": "icon_yj",
"mainscreen": "" "jumpId": 721
}, },
{ {
"Id": 4, "Id": 4,
@ -69,7 +69,7 @@
"功能入口-捕羊大赛" "功能入口-捕羊大赛"
], ],
"functionicon": "ty_qp_by", "functionicon": "ty_qp_by",
"mainscreen": "" "jumpId": 170
}, },
{ {
"Id": 5, "Id": 5,
@ -87,7 +87,7 @@
"功能入口-烹饪" "功能入口-烹饪"
], ],
"functionicon": "ty_qp_pr", "functionicon": "ty_qp_pr",
"mainscreen": "" "jumpId": 140
}, },
{ {
"Id": 6, "Id": 6,
@ -105,7 +105,7 @@
"传送点-指挥部" "传送点-指挥部"
], ],
"functionicon": "ty_qp_zhb", "functionicon": "ty_qp_zhb",
"mainscreen": "" "jumpId": 905
}, },
{ {
"Id": 7, "Id": 7,
@ -123,7 +123,7 @@
"功能入口-竞技场" "功能入口-竞技场"
], ],
"functionicon": "ty_qp_jjc", "functionicon": "ty_qp_jjc",
"mainscreen": "" "jumpId": 156
}, },
{ {
"Id": 8, "Id": 8,
@ -135,18 +135,35 @@
"sceneicon": "ty_qp_my01", "sceneicon": "ty_qp_my01",
"functionname": { "functionname": {
"key": "navigation_Sheet1_functionname_8", "key": "navigation_Sheet1_functionname_8",
"text": "工会" "text": "公会"
}, },
"npcName": [ "npcName": [
"功能入口-工会申请", "功能入口-工会申请"
"传送点-公会"
], ],
"functionicon": "ty_qp_gh", "functionicon": "ty_qp_gh",
"mainscreen": "" "jumpId": 157
}, },
{ {
"Id": 9, "Id": 9,
"scene": "GameMain", "scene": "GameMain",
"scenename": {
"key": "navigation_Sheet1_scenename_8",
"text": "中轴城"
},
"sceneicon": "ty_qp_my01",
"functionname": {
"key": "navigation_Sheet1_functionname_8",
"text": "公会"
},
"npcName": [
"传送点-公会"
],
"functionicon": "ty_qp_gh",
"jumpId": 11003
},
{
"Id": 10,
"scene": "GameMain",
"scenename": { "scenename": {
"key": "navigation_Sheet1_scenename_19", "key": "navigation_Sheet1_scenename_19",
"text": "中轴城" "text": "中轴城"
@ -160,10 +177,10 @@
"功能入口-维京远征" "功能入口-维京远征"
], ],
"functionicon": "ty_qp_yz", "functionicon": "ty_qp_yz",
"mainscreen": "" "jumpId": 167
}, },
{ {
"Id": 10, "Id": 11,
"scene": "SmithyScene", "scene": "SmithyScene",
"scenename": { "scenename": {
"key": "navigation_Sheet1_scenename_9", "key": "navigation_Sheet1_scenename_9",
@ -178,10 +195,10 @@
"打造" "打造"
], ],
"functionicon": "ty_qp_zm", "functionicon": "ty_qp_zm",
"mainscreen": "传送点-铁匠铺" "jumpId": 1001
}, },
{ {
"Id": 11, "Id": 12,
"scene": "SmithyScene", "scene": "SmithyScene",
"scenename": { "scenename": {
"key": "navigation_Sheet1_scenename_10", "key": "navigation_Sheet1_scenename_10",
@ -196,10 +213,10 @@
"锻造炉" "锻造炉"
], ],
"functionicon": "ty_qp_wdj", "functionicon": "ty_qp_wdj",
"mainscreen": "传送点-铁匠铺" "jumpId": 1002
}, },
{ {
"Id": 12, "Id": 13,
"scene": "SmithyScene", "scene": "SmithyScene",
"scenename": { "scenename": {
"key": "navigation_Sheet1_scenename_11", "key": "navigation_Sheet1_scenename_11",
@ -214,10 +231,10 @@
"手册台" "手册台"
], ],
"functionicon": "ty_qp_sj", "functionicon": "ty_qp_sj",
"mainscreen": "传送点-铁匠铺" "jumpId": 1003
}, },
{ {
"Id": 13, "Id": 14,
"scene": "WuGuanScene", "scene": "WuGuanScene",
"scenename": { "scenename": {
"key": "navigation_Sheet1_scenename_12", "key": "navigation_Sheet1_scenename_12",
@ -232,10 +249,10 @@
"总教习" "总教习"
], ],
"functionicon": "ty_qp_jx", "functionicon": "ty_qp_jx",
"mainscreen": "" "jumpId": 10004
}, },
{ {
"Id": 14, "Id": 15,
"scene": "WuGuanScene", "scene": "WuGuanScene",
"scenename": { "scenename": {
"key": "navigation_Sheet1_scenename_13", "key": "navigation_Sheet1_scenename_13",
@ -250,10 +267,10 @@
"阿宝" "阿宝"
], ],
"functionicon": "ty_qp_mryj", "functionicon": "ty_qp_mryj",
"mainscreen": "" "jumpId": 10002
}, },
{ {
"Id": 15, "Id": 16,
"scene": "WuGuanScene", "scene": "WuGuanScene",
"scenename": { "scenename": {
"key": "navigation_Sheet1_scenename_14", "key": "navigation_Sheet1_scenename_14",
@ -268,10 +285,10 @@
"告示板" "告示板"
], ],
"functionicon": "ty_qp_gsb", "functionicon": "ty_qp_gsb",
"mainscreen": "" "jumpId": 10006
}, },
{ {
"Id": 16, "Id": 17,
"scene": "WuGuanScene", "scene": "WuGuanScene",
"scenename": { "scenename": {
"key": "navigation_Sheet1_scenename_15", "key": "navigation_Sheet1_scenename_15",
@ -286,10 +303,10 @@
"木桩" "木桩"
], ],
"functionicon": "ty_qp_mz", "functionicon": "ty_qp_mz",
"mainscreen": "" "jumpId": 137
}, },
{ {
"Id": 17, "Id": 18,
"scene": "GameMain", "scene": "GameMain",
"scenename": { "scenename": {
"key": "navigation_Sheet1_scenename_16", "key": "navigation_Sheet1_scenename_16",
@ -304,10 +321,10 @@
"功能入口-藏书馆" "功能入口-藏书馆"
], ],
"functionicon": "ty_qp_hgd", "functionicon": "ty_qp_hgd",
"mainscreen": "" "jumpId": 146
}, },
{ {
"Id": 18, "Id": 19,
"scene": "CommandScene", "scene": "CommandScene",
"scenename": { "scenename": {
"key": "navigation_Sheet1_scenename_17", "key": "navigation_Sheet1_scenename_17",
@ -322,10 +339,10 @@
"功能入口_旧时光" "功能入口_旧时光"
], ],
"functionicon": "ty_qp_jsg", "functionicon": "ty_qp_jsg",
"mainscreen": "" "jumpId": 169
}, },
{ {
"Id": 19, "Id": 20,
"scene": "CommandScene", "scene": "CommandScene",
"scenename": { "scenename": {
"key": "navigation_Sheet1_scenename_18", "key": "navigation_Sheet1_scenename_18",
@ -340,6 +357,6 @@
"功能入口_主角星座图" "功能入口_主角星座图"
], ],
"functionicon": "ty_qp_tf", "functionicon": "ty_qp_tf",
"mainscreen": "" "jumpId": 171
} }
] ]

2
bin/json/game_opencond.json
View File

@ -417,7 +417,7 @@
"id": "hjeart demon tower", "id": "hjeart demon tower",
"name": { "name": {
"key": "opencond_opencond_name_19", "key": "opencond_opencond_name_19",
"text": "心魔塔" "text": "功夫大师挑战塔"
}, },
"main": [ "main": [
{ {

8
bin/json/game_ruledesc.json
View File

@ -223,22 +223,22 @@
"id": 10021, "id": 10021,
"title": { "title": {
"key": "ruledesc_ruledesc_title_21", "key": "ruledesc_ruledesc_title_21",
"text": "工会申请说明" "text": "公会申请说明"
}, },
"content": { "content": {
"key": "ruledesc_ruledesc_content_21", "key": "ruledesc_ruledesc_content_21",
"text": "这里可以加入其他人的工会" "text": "这里可以加入其他人的公会"
} }
}, },
{ {
"id": 10022, "id": 10022,
"title": { "title": {
"key": "ruledesc_ruledesc_title_22", "key": "ruledesc_ruledesc_title_22",
"text": "工会创建说明" "text": "公会创建说明"
}, },
"content": { "content": {
"key": "ruledesc_ruledesc_content_22", "key": "ruledesc_ruledesc_content_22",
"text": "这里可以创建属于自己的工会" "text": "这里可以创建属于自己的公会"
} }
}, },
{ {

439
bin/json/game_skillafteratk.json
View File

@ -10048,7 +10048,7 @@
"Argu": [ "Argu": [
414007211, 414007211,
-1, -1,
1 -1
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -10118,7 +10118,7 @@
390001403, 390001403,
1000, 1000,
1, 1,
0 -1
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -10159,7 +10159,7 @@
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 3,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
1, 1,
@ -10215,7 +10215,7 @@
"Type": 3, "Type": 3,
"Argu": [ "Argu": [
390001104, 390001104,
300, 600,
1, 1,
1 1
], ],
@ -12591,7 +12591,9 @@
4000 4000
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [
213003212
],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -12610,7 +12612,7 @@
"Type": 5, "Type": 5,
"Argu": [ "Argu": [
1, 1,
1, 2,
50 50
], ],
"FollowSK": [], "FollowSK": [],
@ -12633,7 +12635,7 @@
"Type": 2, "Type": 2,
"Argu": [ "Argu": [
413003211, 413003211,
1, -1,
-1 -1
], ],
"FollowSK": [], "FollowSK": [],
@ -12699,14 +12701,17 @@
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 1, "Type": 11,
"Argu": [ "Argu": [
1, 2,
1, 2,
180 180
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [
213003312,
213003313
],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -12832,7 +12837,7 @@
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [
235005213 235005212
], ],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
@ -12842,7 +12847,7 @@
"RevisiParams": [] "RevisiParams": []
}, },
{ {
"Id": 235005213, "Id": 235005212,
"EmitPR": 1000, "EmitPR": 1000,
"From": 2, "From": 2,
"Where": [], "Where": [],
@ -12962,30 +12967,6 @@
"RevisiCondition": "", "RevisiCondition": "",
"RevisiParams": [] "RevisiParams": []
}, },
{
"Id": 390001315,
"EmitPR": 1000,
"From": 1,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001325,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{ {
"Id": 215001011, "Id": 215001011,
"EmitPR": 1000, "EmitPR": 1000,
@ -13322,15 +13303,16 @@
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
"ExecuteCnt": 2, "ExecuteCnt": 1,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
1, 1,
4, 4,
1500 3000
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [
245001112,
245001113 245001113
], ],
"FailFollowSK": [], "FailFollowSK": [],
@ -13489,21 +13471,19 @@
{ {
"Id": 245001311, "Id": 245001311,
"EmitPR": 1000, "EmitPR": 1000,
"From": 2, "From": 3,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 2, "Type": 8,
"Argu": [ "Argu": [
445001311, 1,
-1, -1,
-1 1000
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [],
245001316
],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -13514,14 +13494,14 @@
{ {
"Id": 245001312, "Id": 245001312,
"EmitPR": 1000, "EmitPR": 1000,
"From": 3, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 8, "Type": 8,
"Argu": [ "Argu": [
1, 3,
-1, -1,
1000 1000
], ],
@ -13540,16 +13520,18 @@
"From": 2, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 8, "Type": 1,
"Argu": [ "Argu": [
3, 1,
-1, 4,
1000 6000
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [
245001314
],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -13565,61 +13547,12 @@
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
6000
],
"FollowSK": [],
"SucFollowSK": [
245001315
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 245001315,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001007,
500,
1,
2
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 245001316,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3, "Type": 3,
"Argu": [ "Argu": [
390001007, 390001007,
1000, 1000,
1, 1,
1 2
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -14535,10 +14468,7 @@
2 2
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [],
234008312,
234008313
],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -14553,15 +14483,17 @@
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
"ExecuteCnt": 2, "ExecuteCnt": 8,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
1, 1,
4, 4,
3600 800
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [
234008313
],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -15543,76 +15475,6 @@
"RevisiCondition": "", "RevisiCondition": "",
"RevisiParams": [] "RevisiParams": []
}, },
{
"Id": 235006313,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
435006311,
-1,
1
],
"FollowSK": [],
"SucFollowSK": [
235006314
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 235006314,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001105,
600,
1,
1
],
"FollowSK": [],
"SucFollowSK": [
235006315
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 235006315,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 28,
"Argu": [],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{ {
"Id": 234002011, "Id": 234002011,
"EmitPR": 1000, "EmitPR": 1000,
@ -15853,7 +15715,7 @@
{ {
"Id": 224005211, "Id": 224005211,
"EmitPR": 1000, "EmitPR": 1000,
"From": 1, "From": 4,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
@ -15864,10 +15726,10 @@
-1, -1,
1000 1000
], ],
"FollowSK": [ "FollowSK": [],
"SucFollowSK": [
224005212 224005212
], ],
"SucFollowSK": [],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -15878,7 +15740,7 @@
{ {
"Id": 224005212, "Id": 224005212,
"EmitPR": 1000, "EmitPR": 1000,
"From": 1, "From": 4,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
@ -15915,7 +15777,9 @@
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [
224005312 224005312,
224005313,
224005314
], ],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
@ -15958,7 +15822,7 @@
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 12, "Type": 12,
"Argu": [ "Argu": [
300 -300
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -16284,7 +16148,7 @@
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 21, "Type": 1,
"Argu": [ "Argu": [
1, 1,
4, 4,
@ -16768,10 +16632,10 @@
{ {
"Id": 243001311, "Id": 243001311,
"EmitPR": 1000, "EmitPR": 1000,
"From": 2, "From": 4,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 10, "Limit": 1,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
@ -16793,7 +16657,7 @@
{ {
"Id": 243001312, "Id": 243001312,
"EmitPR": 1000, "EmitPR": 1000,
"From": 10, "From": 11,
"Where": [], "Where": [],
"Order": "Type=Rand", "Order": "Type=Rand",
"Limit": 1, "Limit": 1,
@ -16915,10 +16779,10 @@
{ {
"Id": 234003211, "Id": 234003211,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
@ -16928,6 +16792,7 @@
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [
234003212,
234003213 234003213
], ],
"FailFollowSK": [], "FailFollowSK": [],
@ -16940,37 +16805,10 @@
{ {
"Id": 234003212, "Id": 234003212,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 10,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
2000
],
"FollowSK": [],
"SucFollowSK": [
234003213,
234003214,
234003215
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 234003213,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 3, "Type": 3,
"Argu": [ "Argu": [
@ -16989,35 +16827,14 @@
"RevisiParams": [] "RevisiParams": []
}, },
{ {
"Id": 234003214, "Id": 234003213,
"EmitPR": 1000, "EmitPR": 1000,
"From": 2, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 14, "Type": 36,
"Argu": [
250
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 234003215,
"EmitPR": 1000,
"From": 1,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 12,
"Argu": [ "Argu": [
250 250
], ],
@ -17426,12 +17243,10 @@
"Argu": [ "Argu": [
434007111, 434007111,
-1, -1,
1 -1
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [],
234007113
],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -17529,7 +17344,8 @@
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [
234007214 234007214,
234007215
], ],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
@ -17553,9 +17369,7 @@
600 600
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [],
234007215
],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -17648,33 +17462,7 @@
"Argu": [ "Argu": [
434007311, 434007311,
-1, -1,
1 -1
],
"FollowSK": [],
"SucFollowSK": [
234007314,
234007315
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 234007314,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
300
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -17686,7 +17474,7 @@
"RevisiParams": [] "RevisiParams": []
}, },
{ {
"Id": 234007315, "Id": 234007314,
"EmitPR": 1000, "EmitPR": 1000,
"From": 3, "From": 3,
"Where": [], "Where": [],
@ -17761,7 +17549,7 @@
{ {
"Id": 243006211, "Id": 243006211,
"EmitPR": 1000, "EmitPR": 1000,
"From": 1, "From": 4,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
@ -17788,7 +17576,7 @@
{ {
"Id": 243006212, "Id": 243006212,
"EmitPR": 1000, "EmitPR": 1000,
"From": 1, "From": 4,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
@ -17812,7 +17600,7 @@
{ {
"Id": 243006213, "Id": 243006213,
"EmitPR": 1000, "EmitPR": 1000,
"From": 1, "From": 4,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
@ -17836,7 +17624,7 @@
{ {
"Id": 243006214, "Id": 243006214,
"EmitPR": 1000, "EmitPR": 1000,
"From": 1, "From": 4,
"Where": [ "Where": [
"EnemyHpproless=500" "EnemyHpproless=500"
], ],
@ -17983,16 +17771,16 @@
{ {
"Id": 213001211, "Id": 213001211,
"EmitPR": 1000, "EmitPR": 1000,
"From": 1, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 2, "Type": 1,
"Argu": [ "Argu": [
413001211, 1,
-1, 4,
-1 2000
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -18006,10 +17794,10 @@
{ {
"Id": 213001311, "Id": 213001311,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
@ -18082,7 +17870,7 @@
"From": 4, "From": 4,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 2, "Limit": 1,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
@ -18107,7 +17895,7 @@
"From": 4, "From": 4,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 2, "Limit": 1,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 32, "Type": 32,
"Argu": [ "Argu": [
@ -18139,9 +17927,7 @@
2250 2250
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [],
214005212
],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -18175,7 +17961,7 @@
{ {
"Id": 214005213, "Id": 214005213,
"EmitPR": 1000, "EmitPR": 1000,
"From": 2, "From": 4,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
@ -18183,7 +17969,7 @@
"Type": 2, "Type": 2,
"Argu": [ "Argu": [
414005211, 414005211,
1, -1,
-1 -1
], ],
"FollowSK": [], "FollowSK": [],
@ -18198,7 +17984,7 @@
{ {
"Id": 214005214, "Id": 214005214,
"EmitPR": 1000, "EmitPR": 1000,
"From": 2, "From": 4,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
@ -19097,7 +18883,7 @@
"Type": 2, "Type": 2,
"Argu": [ "Argu": [
415002211, 415002211,
1, -1,
-1 -1
], ],
"FollowSK": [], "FollowSK": [],
@ -19116,7 +18902,7 @@
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
"ExecuteCnt": 2, "ExecuteCnt": 1,
"Type": 3, "Type": 3,
"Argu": [ "Argu": [
390001205, 390001205,
@ -19144,7 +18930,7 @@
"Type": 2, "Type": 2,
"Argu": [ "Argu": [
415002212, 415002212,
1, -1,
-1 -1
], ],
"FollowSK": [], "FollowSK": [],
@ -19252,7 +19038,7 @@
{ {
"Id": 215002314, "Id": 215002314,
"EmitPR": 1000, "EmitPR": 1000,
"From": 1, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
@ -20009,9 +19795,7 @@
4, 4,
1200 1200
], ],
"FollowSK": [ "FollowSK": [],
224001314
],
"SucFollowSK": [], "SucFollowSK": [],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
@ -20312,10 +20096,10 @@
{ {
"Id": 233002311, "Id": 233002311,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
@ -21259,10 +21043,8 @@
"Id": 255005312, "Id": 255005312,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 4,
"Where": [ "Where": [],
"EnemyHpproless=500" "Order": "PropertyUp=20",
],
"Order": "PropertyDown=3",
"Limit": 1, "Limit": 1,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 1, "Type": 1,
@ -21277,10 +21059,13 @@
"SucFollowSK": [], "SucFollowSK": [],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 106,
"DpsCondition": "", "DpsCondition": "",
"RevisiCondition": "", "RevisiCondition": "",
"RevisiParams": [] "RevisiParams": [
100,
50
]
}, },
{ {
"Id": 255005313, "Id": 255005313,
@ -24830,12 +24615,10 @@
"Type": 2, "Type": 2,
"Argu": [ "Argu": [
451010111, 451010111,
1, -1,
1 -1
],
"FollowSK": [
251010113
], ],
"FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
@ -25631,7 +25414,7 @@
{ {
"Id": 215003212, "Id": 215003212,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 3,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
@ -28367,12 +28150,10 @@
"Type": 2, "Type": 2,
"Argu": [ "Argu": [
453006211, 453006211,
1, -1,
1 -1
],
"FollowSK": [
253006213
], ],
"FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,

45
bin/json/game_skillatk.json
View File

@ -8721,7 +8721,6 @@
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
213003311, 213003311,
213003312,
213003313 213003313
] ]
}, },
@ -8811,8 +8810,7 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
235005211, 235005211
235005212
] ]
}, },
"Desc": { "Desc": {
@ -9092,8 +9090,7 @@
"Id": [ "Id": [
245001311, 245001311,
245001312, 245001312,
245001313, 245001313
245001314
] ]
}, },
"Desc": { "Desc": {
@ -9440,12 +9437,13 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
234008311 234008311,
234008312
] ]
}, },
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_134008311", "key": "skill_skill_atk_Desc_134008311",
"text": "悍夫那特先为自身施加2回合【速度提升】效果，之后对敌方1个目标造成2次自身攻击力360%的伤害，并吸收目标10行动值" "text": "悍夫那特先为自身施加2回合【速度提升】效果，之后对敌方1个目标造成4次自身攻击力200%的伤害，并吸收目标10行动值"
}, },
"buffid": [ "buffid": [
390001003 390001003
@ -9929,7 +9927,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_135006311", "key": "skill_skill_atk_Desc_135006311",
"text": "平先生恢复30%生命值并恢复30%行动值" "text": "平先生恢复友方30%生命值并恢复30%行动值"
}, },
"buffid": [], "buffid": [],
"map": "" "map": ""
@ -10136,7 +10134,7 @@
"Type": 1, "Type": 1,
"CD": 3, "CD": 3,
"Where": [], "Where": [],
"Target": 0, "Target": 1,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
224005211 224005211
@ -10170,9 +10168,7 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
224005311, 224005311
224005313,
224005314
] ]
}, },
"Desc": { "Desc": {
@ -10688,13 +10684,12 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
234003211, 234003211
234003212
] ]
}, },
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_134003211", "key": "skill_skill_atk_Desc_134003211",
"text": "圣诞老人对敌方1个目标发起2段攻击，每段造成攻击力200%的伤害，每段有75%概率附加1回合【眩晕】状态。第二段攻击会偷取目标25%行动值并平均分配给我发" "text": "圣诞老人对敌方群体发起攻击，造成攻击力200%的伤害，有75%概率附加1回合【眩晕】状态，并偷取目标25%行动值并平均分配给我方"
}, },
"buffid": [ "buffid": [
390001105 390001105
@ -11149,10 +11144,10 @@
"CorrectPos": 0, "CorrectPos": 0,
"IsMelee": 0, "IsMelee": 0,
"act": "Skill_2", "act": "Skill_2",
"Type": 2, "Type": 1,
"CD": 0, "CD": 0,
"Where": [], "Where": [],
"Target": 1, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
213001211 213001211
@ -11160,7 +11155,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_113001211", "key": "skill_skill_atk_Desc_113001211",
"text": "若敌方攻击当前生命值低于50%的我方队友则反击" "text": "闪闪对敌方所有人造成攻击力200%的伤害"
}, },
"buffid": [], "buffid": [],
"map": "" "map": ""
@ -11189,7 +11184,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_113001311", "key": "skill_skill_atk_Desc_113001311",
"text": "闪闪对敌方1个目标造成攻击力350%的伤害，并为我方附加2回合【防御提升】状态" "text": "闪闪对敌方所有目标造成攻击力350%的伤害，并为我方附加2回合【防御提升】状态"
}, },
"buffid": [ "buffid": [
390001002 390001002
@ -11244,8 +11239,7 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
214005111, 214005111
214005112
] ]
}, },
"Desc": { "Desc": {
@ -11275,6 +11269,7 @@
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
214005211, 214005211,
214005212,
214005213 214005213
] ]
}, },
@ -12303,13 +12298,12 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
233002312,
233002311 233002311
] ]
}, },
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_133002311", "key": "skill_skill_atk_Desc_133002311",
"text": "坦克对敌方1个目标造成攻击力750%的伤害；若目标身上存在减益状态，每一个减益状态，额外造成20%的伤害" "text": "坦克对敌方所有目标造成攻击力750%的伤害；若目标身上存在减益状态，每一个减益状态，额外造成20%的伤害"
}, },
"buffid": [], "buffid": [],
"map": "" "map": ""
@ -12836,8 +12830,7 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
255005311, 255005311
255005312
] ]
}, },
"Desc": { "Desc": {
@ -13019,7 +13012,7 @@
"Id": [ "Id": [
255007211, 255007211,
255007213, 255007213,
25507215 255007215
] ]
}, },
"Desc": { "Desc": {

2
bin/json/game_skillbuff.json
View File

@ -1200,7 +1200,7 @@
"BuffType": 21, "BuffType": 21,
"EffectArgu": [ "EffectArgu": [
1, 1,
1, 2,
350 350
], ],
"BufParNum": 1, "BufParNum": 1,

9
bin/json/game_skillpassive.json
View File

@ -634,7 +634,7 @@
"When": 18, "When": 18,
"FromCheck": "", "FromCheck": "",
"TargetCheck": "2", "TargetCheck": "2",
"MainSkillCheck": "", "MainSkillCheck": "MainSkillID=113003211",
"AfterSkillCheck": "", "AfterSkillCheck": "",
"BuffCheck": "Effect=3,Succ=1", "BuffCheck": "Effect=3,Succ=1",
"AddCon": [], "AddCon": [],
@ -1016,7 +1016,7 @@
"When": 10, "When": 10,
"FromCheck": "Target=3", "FromCheck": "Target=3",
"TargetCheck": "", "TargetCheck": "",
"MainSkillCheck": "", "MainSkillCheck": "MainSkillID=134007111",
"AfterSkillCheck": "", "AfterSkillCheck": "",
"BuffCheck": "", "BuffCheck": "",
"AddCon": [], "AddCon": [],
@ -1032,7 +1032,7 @@
"When": 10, "When": 10,
"FromCheck": "Target=3", "FromCheck": "Target=3",
"TargetCheck": "", "TargetCheck": "",
"MainSkillCheck": "", "MainSkillCheck": "MainSkillID=134007311",
"AfterSkillCheck": "", "AfterSkillCheck": "",
"BuffCheck": "", "BuffCheck": "",
"AddCon": [], "AddCon": [],
@ -1040,8 +1040,7 @@
"Type": "CallSkillPas", "Type": "CallSkillPas",
"MaxEmitTimes": 1, "MaxEmitTimes": 1,
"Callback": [ "Callback": [
234007314, 234007314
234007315
] ]
}, },
{ {

12
modules/equipment/api_equip.go
View File

@ -82,22 +82,22 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
} }
return return
} }
if minstr > confs[i].Star { if minstr > confs[i].Color {
minstr = confs[i].Star minstr = confs[i].Color
} }
// equipStr[confs[i].Star]++ // equipStr[confs[i].Star]++
if i < 4 { if i < 4 {
if confs[i].Star < suite1Str { if confs[i].Color < suite1Str {
suite1Str = confs[i].Star suite1Str = confs[i].Color
} }
if equipments[i].Lv < suite1Lv { if equipments[i].Lv < suite1Lv {
suite1Lv = equipments[i].Lv suite1Lv = equipments[i].Lv
} }
} else if i < 6 { } else if i < 6 {
if confs[i].Star < suite2Str { if confs[i].Color < suite2Str {
suite2Str = confs[i].Star suite2Str = confs[i].Color
} }
if equipments[i].Lv < suite2Lv { if equipments[i].Lv < suite2Lv {
suite2Lv = equipments[i].Lv suite2Lv = equipments[i].Lv

6
modules/equipment/api_upgrade.go
View File

@ -63,7 +63,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade
return return
} }
//找到下一个等级的相关配置 //找到下一个等级的相关配置
if intensify, err = this.module.configure.GetEquipmentIntensifyConfigureById(conf.EquipId, conf.Star, equipment.Lv); err != nil || intensify.Need == nil || len(intensify.Need) == 0 { if intensify, err = this.module.configure.GetEquipmentIntensifyConfigureById(conf.EquipId, conf.Color, equipment.Lv); err != nil || intensify.Need == nil || len(intensify.Need) == 0 {
this.module.Errorf("Equip_Check err:%v", err) this.module.Errorf("Equip_Check err:%v", err)
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_EquipmentLvlimitReached, Code: pb.ErrorCode_EquipmentLvlimitReached,
@ -217,13 +217,13 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype49, 1, hero.Suite1Star, hero.Suite1Lv)) tasks = append(tasks, comm.GetBuriedParam(comm.Rtype49, 1, hero.Suite1Star, hero.Suite1Lv))
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype93, 1, hero.SuiteId, suite1Lv)) tasks = append(tasks, comm.GetBuriedParam(comm.Rtype93, 1, hero.SuiteId, suite1Lv))
tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype43, equipment.Id, equipment.Lv)) tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype43, equipment.Id, equipment.Lv))
tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype45, equipment.Id, conf.Star, hero.SuiteExtId, hero.Suite2Lv)) tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype45, equipment.Id, conf.Color, hero.SuiteExtId, hero.Suite2Lv))
} }
if conf.Pos >= 4 && conf.Pos < 6 && hero.SuiteExtId != 0 { if conf.Pos >= 4 && conf.Pos < 6 && hero.SuiteExtId != 0 {
hero.Suite2Lv = suite2Lv hero.Suite2Lv = suite2Lv
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype48, 1, hero.Suite2Star, hero.Suite2Lv)) tasks = append(tasks, comm.GetBuriedParam(comm.Rtype48, 1, hero.Suite2Star, hero.Suite2Lv))
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype93, 1, hero.SuiteExtId, suite2Lv)) tasks = append(tasks, comm.GetBuriedParam(comm.Rtype93, 1, hero.SuiteExtId, suite2Lv))
tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype45, equipment.Id, conf.Star, hero.SuiteExtId, hero.Suite2Lv)) tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype45, equipment.Id, conf.Color, hero.SuiteExtId, hero.Suite2Lv))
} }
if errdata = this.module.ModuleHero.UpdateEquipment(session, hero, equipments); errdata != nil { if errdata = this.module.ModuleHero.UpdateEquipment(session, hero, equipments); errdata != nil {
return return

107
modules/equipment/modelEquipment.go
View File

@ -111,8 +111,8 @@ func (this *modelEquipmentComp) AddEquipments(session comm.IUserSession, cIds ma
return nil, err return nil, err
} else { } else {
//随机任务 //随机任务
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype50, 1, c.Star)) tasks = append(tasks, comm.GetBuriedParam(comm.Rtype50, 1, c.Color))
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype97, 1, c.Suittype, c.Star)) tasks = append(tasks, comm.GetBuriedParam(comm.Rtype97, 1, c.Suittype, c.Color))
unm := int32(1) unm := int32(1)
if equipment.AdverbEntry != nil { if equipment.AdverbEntry != nil {
unm += int32(len(equipment.AdverbEntry)) unm += int32(len(equipment.AdverbEntry))
@ -120,11 +120,11 @@ func (this *modelEquipmentComp) AddEquipments(session comm.IUserSession, cIds ma
if equipment.Adverbskill != nil { if equipment.Adverbskill != nil {
unm += int32(len(equipment.Adverbskill)) unm += int32(len(equipment.Adverbskill))
} }
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype99, 1, unm, c.Star)) tasks = append(tasks, comm.GetBuriedParam(comm.Rtype99, 1, unm, c.Color))
if c.Pos == 7 { if c.Pos == 7 {
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype103, 1, c.Star)) tasks = append(tasks, comm.GetBuriedParam(comm.Rtype103, 1, c.Color))
} else if c.Pos == 6 { } else if c.Pos == 6 {
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype101, 1, c.Star)) tasks = append(tasks, comm.GetBuriedParam(comm.Rtype101, 1, c.Color))
} }
add[equipment.Id] = equipment add[equipment.Id] = equipment
change = append(change, equipment) change = append(change, equipment)
@ -313,7 +313,7 @@ func (this *modelEquipmentComp) newEquipment(uid string, conf *cfg.GameEquipData
} }
if satterNum > 0 && satterNum <= 4 { if satterNum > 0 && satterNum <= 4 {
equipment.Quality = satterNum equipment.Star = satterNum
r := rand.New(rand.NewSource(configure.Now().Unix())) r := rand.New(rand.NewSource(configure.Now().Unix()))
if conf.EquipId == 1 { if conf.EquipId == 1 {
equipment.AdverbEntry = make([]*pb.EquipmentAttributeEntry, 0) equipment.AdverbEntry = make([]*pb.EquipmentAttributeEntry, 0)
@ -356,61 +356,62 @@ func (this *modelEquipmentComp) upgradeEquipment(equipment *pb.DB_Equipment, equ
return return
} }
equipment.MainEntry.Value = equipment.MainEntry.BaseValue + int32(float64(mainconfigure.AttrvarCorrect)*float64(intensify.Bonus)/1000.0) equipment.MainEntry.Value = equipment.MainEntry.BaseValue + int32(float64(mainconfigure.AttrvarCorrect)*float64(intensify.Bonus)/1000.0)
if !intensify.Activation { //不触发副词条变化 if intensify.Activation { //不触发副词条变化
return if len(equipment.AdverbEntry) < 4 { //去随机副词条
} var (
if len(equipment.AdverbEntry) < 4 { //去随机副词条 temp []*cfg.GameEquipAttrlibrarySData
var ( sattr []*cfg.GameEquipAttrlibrarySData
temp []*cfg.GameEquipAttrlibrarySData equipatt *cfg.GameEquipAttributeData
sattr []*cfg.GameEquipAttrlibrarySData )
equipatt *cfg.GameEquipAttributeData if temp, err = this.module.configure.GetEquipmentAttrlibraryConfigureById(equip.Addlibrary); err != nil {
) this.module.Errorf("升级服务错误 读取副词条配置错误!")
if temp, err = this.module.configure.GetEquipmentAttrlibraryConfigureById(equip.Addlibrary); err != nil { return
this.module.Errorf("升级服务错误 读取副词条配置错误!") }
return //检索出未使用的词条
} for _, v := range temp {
//检索出未使用的词条 iskeep := false
for _, v := range temp { for _, v1 := range equipment.AdverbEntry {
iskeep := false if v.Attrkey == v1.AttrName {
for _, v1 := range equipment.AdverbEntry { iskeep = true
if v.Attrkey == v1.AttrName { }
}
if v.Attrkey == equipment.MainEntry.AttrName {
iskeep = true iskeep = true
} }
if !iskeep {
sattr = append(sattr, v)
}
} }
if v.Attrkey == equipment.MainEntry.AttrName { if len(sattr) > 0 {
iskeep = true r := rand.New(rand.NewSource(configure.Now().Unix()))
} index := r.Perm(len(sattr))[0]
if !iskeep { if equip.EquipId == 1 {
sattr = append(sattr, v) equipment.AdverbEntry = append(equipment.AdverbEntry, &pb.EquipmentAttributeEntry{
} Id: sattr[index].Key,
} Libraryid: sattr[index].Libraryid,
if len(sattr) > 0 { Lv: 1,
r := rand.New(rand.NewSource(configure.Now().Unix())) AttrName: sattr[index].Attrkey,
index := r.Perm(len(sattr))[0] Value: sattr[index].Attrvar,
if equip.EquipId == 1 { })
equipment.AdverbEntry = append(equipment.AdverbEntry, &pb.EquipmentAttributeEntry{ return
Id: sattr[index].Key, } else {
Libraryid: sattr[index].Libraryid, if equipatt, err = this.module.configure.getEquipAttribute(sattr[index].Attrkey); err != nil {
Lv: 1, return
AttrName: sattr[index].Attrkey, }
Value: sattr[index].Attrvar, equipment.Adverbskill = append(equipment.Adverbskill, &pb.EquipmentSkillEntry{
}) Id: sattr[index].Key,
return Libraryid: sattr[index].Libraryid,
} else { AttrName: sattr[index].Attrkey,
if equipatt, err = this.module.configure.getEquipAttribute(sattr[index].Attrkey); err != nil { SkillId: equipatt.SkillId,
Lv: 1,
})
return return
} }
equipment.Adverbskill = append(equipment.Adverbskill, &pb.EquipmentSkillEntry{
Id: sattr[index].Key,
Libraryid: sattr[index].Libraryid,
AttrName: sattr[index].Attrkey,
SkillId: equipatt.SkillId,
Lv: 1,
})
return
} }
} }
return
} }
if equip.EquipId == 1 { if equip.EquipId == 1 {
var attrlibrary *cfg.GameEquipAttrlibrarySData var attrlibrary *cfg.GameEquipAttrlibrarySData
r := rand.New(rand.NewSource(configure.Now().Unix())) r := rand.New(rand.NewSource(configure.Now().Unix()))

14
modules/equipment/module.go
View File

@ -245,8 +245,8 @@ func (this *Equipment) AddEquipment(session comm.IUserSession, equip *pb.DB_Equi
} }
tasks := make([]*pb.BuriedParam, 0) tasks := make([]*pb.BuriedParam, 0)
//随机任务 //随机任务
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype50, 1, configure.Star)) tasks = append(tasks, comm.GetBuriedParam(comm.Rtype50, 1, configure.Color))
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype97, 1, configure.Suittype, configure.Star)) tasks = append(tasks, comm.GetBuriedParam(comm.Rtype97, 1, configure.Suittype, configure.Color))
unm := int32(1) unm := int32(1)
if equip.AdverbEntry != nil { if equip.AdverbEntry != nil {
unm += int32(len(equip.AdverbEntry)) unm += int32(len(equip.AdverbEntry))
@ -254,11 +254,11 @@ func (this *Equipment) AddEquipment(session comm.IUserSession, equip *pb.DB_Equi
if equip.Adverbskill != nil { if equip.Adverbskill != nil {
unm += int32(len(equip.Adverbskill)) unm += int32(len(equip.Adverbskill))
} }
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype99, 1, unm, configure.Star)) tasks = append(tasks, comm.GetBuriedParam(comm.Rtype99, 1, unm, configure.Color))
if configure.Pos == 7 { if configure.Pos == 7 {
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype103, 1, configure.Star)) tasks = append(tasks, comm.GetBuriedParam(comm.Rtype103, 1, configure.Color))
} else if configure.Pos == 6 { } else if configure.Pos == 6 {
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype101, 1, configure.Star)) tasks = append(tasks, comm.GetBuriedParam(comm.Rtype101, 1, configure.Color))
} }
go this.ModuleBuried.TriggerBuried(session.GetUserId(), tasks...) go this.ModuleBuried.TriggerBuried(session.GetUserId(), tasks...)
this.equipmentsChangePush(session, []*pb.DB_Equipment{equip}) this.equipmentsChangePush(session, []*pb.DB_Equipment{equip})
@ -472,7 +472,7 @@ func (this *Equipment) GetForgeEquip(session comm.IUserSession, suiteId int32, p
} }
if pos != -1 { if pos != -1 {
for _, v := range configures { for _, v := range configures {
if v.Pos == pos && v.Star == lv { if v.Pos == pos && v.Color == lv {
if eruip, err = this.modelEquipment.newEquipment(session.GetUserId(), v, dyweight); err == nil { if eruip, err = this.modelEquipment.newEquipment(session.GetUserId(), v, dyweight); err == nil {
this.equipmentsChangePush(session, []*pb.DB_Equipment{eruip}) this.equipmentsChangePush(session, []*pb.DB_Equipment{eruip})
return return
@ -495,7 +495,7 @@ func (this *Equipment) GetForgeEquip(session comm.IUserSession, suiteId int32, p
} else { } else {
lvs = make([]*cfg.GameEquipData, 0) lvs = make([]*cfg.GameEquipData, 0)
for _, v := range configures { for _, v := range configures {
if v.Star == lv { if v.Color == lv {
lvs = append(lvs, v) lvs = append(lvs, v)
} }
} }

2
modules/hunting/api_challengeover.go
View File

@ -128,7 +128,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
if v.A == "equp" { if v.A == "equp" {
for _, star := range req.Star { for _, star := range req.Star {
cfg := this.configure.GetEquipmentConfigureById(v.T) cfg := this.configure.GetEquipmentConfigureById(v.T)
if cfg != nil && star == cfg.Star { // 自动出售 转换成其他道具 if cfg != nil && star == cfg.Color { // 自动出售 转换成其他道具
if len(cfg.Sale) != 0 { if len(cfg.Sale) != 0 {
bFound = true bFound = true
del = append(del, cfg.Id) del = append(del, cfg.Id)

4
modules/smithy/api_forgeequip.go
View File

@ -306,7 +306,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
if equipConf := this.module.configure.GetEquipmentConfigureById(v.CId); equipConf != nil { // 获取装备等级 if equipConf := this.module.configure.GetEquipmentConfigureById(v.CId); equipConf != nil { // 获取装备等级
go func(cid string, star int32, AdverbEntry int32) { go func(cid string, star int32, AdverbEntry int32) {
this.module.modelAtlas.CheckActivateAtlas(session.GetUserId(), cid, star, AdverbEntry, stove.Forge[req.ReelId]) this.module.modelAtlas.CheckActivateAtlas(session.GetUserId(), cid, star, AdverbEntry, stove.Forge[req.ReelId])
}(v.CId, equipConf.Star, int32(len(v.AdverbEntry)+1)) // 品质按副词条数+1 来算 }(v.CId, equipConf.Color, int32(len(v.AdverbEntry)+1)) // 品质按副词条数+1 来算
} }
} }
var equip map[int32]int32 // key xingji value 数量 var equip map[int32]int32 // key xingji value 数量
@ -314,7 +314,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
tasks := make([]*pb.BuriedParam, 0) tasks := make([]*pb.BuriedParam, 0)
for _, v := range atno { for _, v := range atno {
if cfg := this.module.configure.GetEquipmentConfigureById(v.T); cfg != nil { if cfg := this.module.configure.GetEquipmentConfigureById(v.T); cfg != nil {
equip[cfg.Star]++ equip[cfg.Color]++
} }
} }
for k, v := range equip { for k, v := range equip {

2
modules/viking/api_challengeover.go
View File

@ -123,7 +123,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
if v.A == "equp" { if v.A == "equp" {
for _, star := range req.Star { for _, star := range req.Star {
cfg := this.configure.GetEquipmentConfigureById(v.T) cfg := this.configure.GetEquipmentConfigureById(v.T)
if cfg != nil && star == cfg.Star { // 自动出售 转换成其他道具 if cfg != nil && star == cfg.Color { // 自动出售 转换成其他道具
if len(cfg.Sale) != 0 { if len(cfg.Sale) != 0 {
bFound = true bFound = true
del = append(del, cfg.Id) del = append(del, cfg.Id)

52
pb/battle_struct.pb.go
View File

@ -23,13 +23,14 @@ const (
type EffectTipsType int32 type EffectTipsType int32
const ( const (
EffectTipsType_Eff_Success EffectTipsType = 0 EffectTipsType_Eff_Success EffectTipsType = 0
EffectTipsType_Not_Success EffectTipsType = 1 //没有成功 EffectTipsType_Not_Success EffectTipsType = 1 //没有成功
EffectTipsType_Immunity EffectTipsType = 2 //免疫 EffectTipsType_Immunity EffectTipsType = 2 //免疫
EffectTipsType_Resist EffectTipsType = 3 //抵抗 EffectTipsType_Resist EffectTipsType = 3 //抵抗
EffectTipsType_Not_Gain EffectTipsType = 4 //无法获得增益 EffectTipsType_Not_Gain EffectTipsType = 4 //无法获得增益
EffectTipsType_Not_Control EffectTipsType = 5 //免疫控制 EffectTipsType_Not_Control EffectTipsType = 5 //免疫控制
EffectTipsType_Not_Action EffectTipsType = 6 //无法行动 EffectTipsType_Not_Action EffectTipsType = 6 //无法行动
EffectTipsType_Purification EffectTipsType = 7 //净化
) )
// Enum value maps for EffectTipsType. // Enum value maps for EffectTipsType.
@ -42,15 +43,17 @@ var (
4: "Not_Gain", 4: "Not_Gain",
5: "Not_Control", 5: "Not_Control",
6: "Not_Action", 6: "Not_Action",
7: "Purification",
} }
EffectTipsType_value = map[string]int32{ EffectTipsType_value = map[string]int32{
"Eff_Success": 0, "Eff_Success": 0,
"Not_Success": 1, "Not_Success": 1,
"Immunity": 2, "Immunity": 2,
"Resist": 3, "Resist": 3,
"Not_Gain": 4, "Not_Gain": 4,
"Not_Control": 5, "Not_Control": 5,
"Not_Action": 6, "Not_Action": 6,
"Purification": 7,
} }
) )
@ -1818,16 +1821,17 @@ var file_battle_battle_struct_proto_rawDesc = []byte{
0x43, 0x6f, 0x6d, 0x53, 0x68, 0x69, 0x65, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x43, 0x6f, 0x6d, 0x53, 0x68, 0x69, 0x65, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a,
0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12,
0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x2a, 0x7b, 0x0a, 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2a, 0x8d, 0x01, 0x0a, 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74,
0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x45, 0x66, 0x66, 0x5f, 0x53, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x45, 0x66, 0x66, 0x5f,
0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74,
0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x6d, 0x6d, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x6d,
0x75, 0x6e, 0x69, 0x74, 0x79, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x52, 0x65, 0x73, 0x69, 0x73, 0x6d, 0x75, 0x6e, 0x69, 0x74, 0x79, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x52, 0x65, 0x73, 0x69,
0x74, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x4e, 0x6f, 0x74, 0x5f, 0x47, 0x61, 0x69, 0x6e, 0x10, 0x73, 0x74, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x4e, 0x6f, 0x74, 0x5f, 0x47, 0x61, 0x69, 0x6e,
0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x6f, 0x74, 0x5f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x6c, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x6f, 0x74, 0x5f, 0x41, 0x63, 0x74, 0x69, 0x6f,
0x10, 0x06, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6e, 0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x75, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
0x6f, 0x33, 0x69, 0x6f, 0x6e, 0x10, 0x07, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (

50
pb/equipment_db.pb.go
View File

@ -207,7 +207,7 @@ type DB_Equipment struct {
UId string `protobuf:"bytes,3,opt,name=uId,proto3" json:"uId" bson:"uid"` // 所属玩家Id UId string `protobuf:"bytes,3,opt,name=uId,proto3" json:"uId" bson:"uid"` // 所属玩家Id
HeroId string `protobuf:"bytes,4,opt,name=heroId,proto3" json:"heroId" bson:"heroId"` // 挂在的英雄卡片id 未装备 填 '' HeroId string `protobuf:"bytes,4,opt,name=heroId,proto3" json:"heroId" bson:"heroId"` // 挂在的英雄卡片id 未装备 填 ''
Lv int32 `protobuf:"varint,5,opt,name=lv,proto3" json:"lv" bson:"lv"` //装备强化等级 Lv int32 `protobuf:"varint,5,opt,name=lv,proto3" json:"lv" bson:"lv"` //装备强化等级
Quality int32 `protobuf:"varint,6,opt,name=quality,proto3" json:"quality" bson:"quality"` //装备品质 Star int32 `protobuf:"varint,6,opt,name=star,proto3" json:"star" bson:"star"` //装备品质
KeepFailNum int32 `protobuf:"varint,7,opt,name=keepFailNum,proto3" json:"keepFailNum" bson:"keepFailNum"` // 连续强化失败次数 KeepFailNum int32 `protobuf:"varint,7,opt,name=keepFailNum,proto3" json:"keepFailNum" bson:"keepFailNum"` // 连续强化失败次数
MainEntry *EquipmentAttributeEntry `protobuf:"bytes,8,opt,name=mainEntry,proto3" json:"mainEntry" bson:"mainEntry"` // 装备主词条 MainEntry *EquipmentAttributeEntry `protobuf:"bytes,8,opt,name=mainEntry,proto3" json:"mainEntry" bson:"mainEntry"` // 装备主词条
AdverbEntry []*EquipmentAttributeEntry `protobuf:"bytes,9,rep,name=adverbEntry,proto3" json:"adverbEntry" bson:"adverbEntry"` //装备副词条 AdverbEntry []*EquipmentAttributeEntry `protobuf:"bytes,9,rep,name=adverbEntry,proto3" json:"adverbEntry" bson:"adverbEntry"` //装备副词条
@ -284,9 +284,9 @@ func (x *DB_Equipment) GetLv() int32 {
return 0 return 0
} }
func (x *DB_Equipment) GetQuality() int32 { func (x *DB_Equipment) GetStar() int32 {
if x != nil { if x != nil {
return x.Quality return x.Star
} }
return 0 return 0
} }
@ -366,35 +366,35 @@ var file_equipment_equipment_db_proto_rawDesc = []byte{
0x41, 0x74, 0x74, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x6b, 0x69, 0x6c, 0x41, 0x74, 0x74, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x6b, 0x69, 0x6c,
0x6c, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x6c, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x53, 0x6b, 0x69, 0x6c, 0x6c,
0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x4c, 0x76, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x4c, 0x76, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
0x4c, 0x76, 0x22, 0xb2, 0x03, 0x0a, 0x0c, 0x44, 0x42, 0x5f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x4c, 0x76, 0x22, 0xac, 0x03, 0x0a, 0x0c, 0x44, 0x42, 0x5f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d,
0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
0x02, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x02, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
0x52, 0x03, 0x63, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x52, 0x03, 0x63, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01,
0x28, 0x09, 0x52, 0x03, 0x75, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x28, 0x09, 0x52, 0x03, 0x75, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49,
0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12,
0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12,
0x18, 0x0a, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73,
0x52, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x6b, 0x65, 0x65, 0x74, 0x61, 0x72, 0x12, 0x20, 0x0a, 0x0b, 0x6b, 0x65, 0x65, 0x70, 0x46, 0x61, 0x69, 0x6c, 0x4e,
0x70, 0x46, 0x61, 0x69, 0x6c, 0x4e, 0x75, 0x6d, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x75, 0x6d, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x6b, 0x65, 0x65, 0x70, 0x46, 0x61,
0x6b, 0x65, 0x65, 0x70, 0x46, 0x61, 0x69, 0x6c, 0x4e, 0x75, 0x6d, 0x12, 0x36, 0x0a, 0x09, 0x6d, 0x69, 0x6c, 0x4e, 0x75, 0x6d, 0x12, 0x36, 0x0a, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x45, 0x6e, 0x74,
0x61, 0x69, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x72, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70,
0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62,
0x75, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x45, 0x6e,
0x74, 0x72, 0x79, 0x12, 0x3a, 0x0a, 0x0b, 0x61, 0x64, 0x76, 0x65, 0x72, 0x62, 0x45, 0x6e, 0x74,
0x72, 0x79, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70,
0x6d, 0x65, 0x6e, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x45, 0x6e, 0x74,
0x72, 0x79, 0x52, 0x0b, 0x61, 0x64, 0x76, 0x65, 0x72, 0x62, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x72, 0x79, 0x52, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x3a, 0x0a,
0x1e, 0x0a, 0x0a, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x61, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x0a, 0x20, 0x0b, 0x61, 0x64, 0x76, 0x65, 0x72, 0x62, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x09, 0x20, 0x03,
0x01, 0x28, 0x0d, 0x52, 0x0a, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x61, 0x79, 0x4e, 0x75, 0x6d, 0x12, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x74,
0x26, 0x0a, 0x0e, 0x69, 0x73, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x61, 0x64,
0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x69, 0x73, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x76, 0x65, 0x72, 0x62, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x6f, 0x76, 0x65,
0x61, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x6c, 0x6f, 0x63, 0x72, 0x6c, 0x61, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x6f,
0x6b, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x76, 0x65, 0x72, 0x6c, 0x61, 0x79, 0x4e, 0x75, 0x6d, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x73, 0x49,
0x36, 0x0a, 0x0b, 0x61, 0x64, 0x76, 0x65, 0x72, 0x62, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x0d, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x08, 0x52, 0x0e, 0x69, 0x73, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x74,
0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x61, 0x64, 0x76, 0x65, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x0c, 0x20, 0x01, 0x28,
0x72, 0x62, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x08, 0x52, 0x06, 0x69, 0x73, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x36, 0x0a, 0x0b, 0x61, 0x64, 0x76,
0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x65, 0x72, 0x62, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14,
0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45,
0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x61, 0x64, 0x76, 0x65, 0x72, 0x62, 0x73, 0x6b, 0x69, 0x6c,
0x6c, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x33,
} }
var ( var (

15
sys/configure/structs/Game.BuriedCondiData.go
View File

@ -22,6 +22,7 @@ type GameBuriedCondiData struct {
NPC int32 NPC int32
Value int32 Value int32
Filter []int32 Filter []int32
Filter2 []string
} }
const TypeId_GameBuriedCondiData = 1792922092 const TypeId_GameBuriedCondiData = 1792922092
@ -68,6 +69,20 @@ func (_v *GameBuriedCondiData)Deserialize(_buf map[string]interface{}) (err erro
} }
} }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["filter2"].([]interface{}); !_ok_ { err = errors.New("filter2 error"); return }
_v.Filter2 = 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.Filter2 = append(_v.Filter2, _list_v_)
}
}
return return
} }

8
sys/configure/structs/Game.CaravanCityData.go
View File

@ -29,6 +29,10 @@ type GameCaravanCityData struct {
Exspecialnum int32 Exspecialnum int32
Orspecial int32 Orspecial int32
Checktime int32 Checktime int32
Extalk int32
Ortalk int32
Sptalk int32
Buytalk int32
Cityeventpro int32 Cityeventpro int32
Cityevent []int32 Cityevent []int32
} }
@ -123,6 +127,10 @@ func (_v *GameCaravanCityData)Deserialize(_buf map[string]interface{}) (err erro
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["exspecialnum"].(float64); !_ok_ { err = errors.New("exspecialnum error"); return }; _v.Exspecialnum = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["exspecialnum"].(float64); !_ok_ { err = errors.New("exspecialnum error"); return }; _v.Exspecialnum = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Orspecial"].(float64); !_ok_ { err = errors.New("Orspecial error"); return }; _v.Orspecial = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Orspecial"].(float64); !_ok_ { err = errors.New("Orspecial error"); return }; _v.Orspecial = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["checktime"].(float64); !_ok_ { err = errors.New("checktime error"); return }; _v.Checktime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["checktime"].(float64); !_ok_ { err = errors.New("checktime error"); return }; _v.Checktime = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["extalk"].(float64); !_ok_ { err = errors.New("extalk error"); return }; _v.Extalk = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ortalk"].(float64); !_ok_ { err = errors.New("ortalk error"); return }; _v.Ortalk = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sptalk"].(float64); !_ok_ { err = errors.New("sptalk error"); return }; _v.Sptalk = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buytalk"].(float64); !_ok_ { err = errors.New("buytalk error"); return }; _v.Buytalk = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cityeventpro"].(float64); !_ok_ { err = errors.New("cityeventpro error"); return }; _v.Cityeventpro = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cityeventpro"].(float64); !_ok_ { err = errors.New("cityeventpro error"); return }; _v.Cityeventpro = int32(_tempNum_) }
{ {
var _arr_ []interface{} var _arr_ []interface{}

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

@ -18,7 +18,7 @@ type GameNavigationData struct {
Functionname string Functionname string
NpcName []string NpcName []string
Functionicon string Functionicon string
Mainscreen string JumpId int32
} }
const TypeId_GameNavigationData = -800652966 const TypeId_GameNavigationData = -800652966
@ -48,7 +48,7 @@ func (_v *GameNavigationData)Deserialize(_buf map[string]interface{}) (err error
} }
{ var _ok_ bool; if _v.Functionicon, _ok_ = _buf["functionicon"].(string); !_ok_ { err = errors.New("functionicon error"); return } } { var _ok_ bool; if _v.Functionicon, _ok_ = _buf["functionicon"].(string); !_ok_ { err = errors.New("functionicon error"); return } }
{ var _ok_ bool; if _v.Mainscreen, _ok_ = _buf["mainscreen"].(string); !_ok_ { err = errors.New("mainscreen error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["jumpId"].(float64); !_ok_ { err = errors.New("jumpId error"); return }; _v.JumpId = int32(_tempNum_) }
return return
} }

14
sys/configure/structs/Tables.go
View File

@ -27,7 +27,6 @@ type Tables struct {
Equip *GameEquip Equip *GameEquip
EquipAttrlibraryS *GameEquipAttrlibraryS EquipAttrlibraryS *GameEquipAttrlibraryS
EquipSuit *GameEquipSuit EquipSuit *GameEquipSuit
EquipColor *GameEquipColor
EquipIntensify *GameEquipIntensify EquipIntensify *GameEquipIntensify
EquipSCompose *GameEquipSCompose EquipSCompose *GameEquipSCompose
EquipAttribute *GameEquipAttribute EquipAttribute *GameEquipAttribute
@ -79,7 +78,6 @@ type Tables struct {
HeroConvertdata *GameHeroConvertdata HeroConvertdata *GameHeroConvertdata
LinestoryTimeLine *GameLinestoryTimeLine LinestoryTimeLine *GameLinestoryTimeLine
LinestoryMainTask *GameLinestoryMainTask LinestoryMainTask *GameLinestoryMainTask
Herofusion *GameHerofusion
PlayerInfor *GamePlayerInfor PlayerInfor *GamePlayerInfor
PlayerInfor_overview *GamePlayerInfor_overview PlayerInfor_overview *GamePlayerInfor_overview
ArenaActiveReward *GameArenaActiveReward ArenaActiveReward *GameArenaActiveReward
@ -289,12 +287,6 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.EquipSuit, err = NewGameEquipSuit(buf) ; err != nil { if tables.EquipSuit, err = NewGameEquipSuit(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_equipcolor") ; err != nil {
return nil, err
}
if tables.EquipColor, err = NewGameEquipColor(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_equipintensify") ; err != nil { if buf, err = loader("game_equipintensify") ; err != nil {
return nil, err return nil, err
} }
@ -601,12 +593,6 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.LinestoryMainTask, err = NewGameLinestoryMainTask(buf) ; err != nil { if tables.LinestoryMainTask, err = NewGameLinestoryMainTask(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_herofusion") ; err != nil {
return nil, err
}
if tables.Herofusion, err = NewGameHerofusion(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_playerinfor") ; err != nil { if buf, err = loader("game_playerinfor") ; err != nil {
return nil, err return nil, err
} }

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

@ -18,7 +18,6 @@ type GameEquipData struct {
Suittype int32 Suittype int32
Suitintr string Suitintr string
Pos int32 Pos int32
Star int32
Color int32 Color int32
Effects string Effects string
Leadlibrary int32 Leadlibrary int32
@ -46,7 +45,6 @@ func (_v *GameEquipData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["suittype"].(float64); !_ok_ { err = errors.New("suittype error"); return }; _v.Suittype = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["suittype"].(float64); !_ok_ { err = errors.New("suittype error"); return }; _v.Suittype = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["suitintr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Suitintr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Suitintr, _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["suitintr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Suitintr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Suitintr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pos"].(float64); !_ok_ { err = errors.New("pos error"); return }; _v.Pos = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pos"].(float64); !_ok_ { err = errors.New("pos error"); return }; _v.Pos = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["color"].(float64); !_ok_ { err = errors.New("color error"); return }; _v.Color = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["color"].(float64); !_ok_ { err = errors.New("color error"); return }; _v.Color = int32(_tempNum_) }
{ var _ok_ bool; if _v.Effects, _ok_ = _buf["Effects"].(string); !_ok_ { err = errors.New("Effects error"); return } } { var _ok_ bool; if _v.Effects, _ok_ = _buf["Effects"].(string); !_ok_ { err = errors.New("Effects error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["leadlibrary"].(float64); !_ok_ { err = errors.New("leadlibrary error"); return }; _v.Leadlibrary = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["leadlibrary"].(float64); !_ok_ { err = errors.New("leadlibrary error"); return }; _v.Leadlibrary = int32(_tempNum_) }