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

#27556 【巨怪商队】-背包使用负重的概念，商品配置负重值

Browse Source
This commit is contained in:
meixiongfeng 2023-07-11 18:44:15 +08:00
parent 2c714293c8
commit eadf3027ca
15 changed files with 407 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
bin/json/game_battleready.json
View File

@ -8,6 +8,8 @@
"scenesfight_07" "scenesfight_07"
], ],
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -25,6 +27,8 @@
"scenesfight_07" "scenesfight_07"
], ],
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -42,6 +46,8 @@
"scenesfight_05_01" "scenesfight_05_01"
], ],
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -59,6 +65,8 @@
"scenesfight_06" "scenesfight_06"
], ],
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -76,6 +84,8 @@
"bossfight_spinymandrilla_02" "bossfight_spinymandrilla_02"
], ],
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -93,6 +103,8 @@
"scenesfight_07" "scenesfight_07"
], ],
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -110,6 +122,8 @@
"scenesfight_07" "scenesfight_07"
], ],
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -127,6 +141,8 @@
"bossfight_spinymandrilla_02" "bossfight_spinymandrilla_02"
], ],
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -144,6 +160,8 @@
"scenesfight_07" "scenesfight_07"
], ],
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -161,6 +179,8 @@
"scenesfight_07" "scenesfight_07"
], ],
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -178,6 +198,8 @@
"scenesfight_07" "scenesfight_07"
], ],
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -195,6 +217,8 @@
"scenesfight_07" "scenesfight_07"
], ],
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -212,6 +236,8 @@
"scenesfight_07" "scenesfight_07"
], ],
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -229,6 +255,8 @@
"scenesfight_07" "scenesfight_07"
], ],
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -246,6 +274,8 @@
"scenesfight_07" "scenesfight_07"
], ],
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -263,6 +293,8 @@
"scenesfight_06" "scenesfight_06"
], ],
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -280,6 +312,8 @@
"scenesfight_07" "scenesfight_07"
], ],
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -297,6 +331,8 @@
"scenesfight_06" "scenesfight_06"
], ],
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -314,6 +350,8 @@
"scenesfight_05_01" "scenesfight_05_01"
], ],
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -331,6 +369,8 @@
"scenesfight_03_02" "scenesfight_03_02"
], ],
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -348,6 +388,8 @@
"bossfight_spinymandrilla_02" "bossfight_spinymandrilla_02"
], ],
"disableAiCamera": 1, "disableAiCamera": 1,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -365,6 +407,8 @@
"bossfight_naturetitan_01" "bossfight_naturetitan_01"
], ],
"disableAiCamera": 1, "disableAiCamera": 1,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -382,6 +426,8 @@
"bossfight_spinymandrilla_02" "bossfight_spinymandrilla_02"
], ],
"disableAiCamera": 1, "disableAiCamera": 1,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -399,6 +445,8 @@
"bossfight_chef_01" "bossfight_chef_01"
], ],
"disableAiCamera": 1, "disableAiCamera": 1,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -416,6 +464,8 @@
"bossfight_spinymandrilla_03" "bossfight_spinymandrilla_03"
], ],
"disableAiCamera": 1, "disableAiCamera": 1,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -433,6 +483,8 @@
"bossfight_chef_02" "bossfight_chef_02"
], ],
"disableAiCamera": 1, "disableAiCamera": 1,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -450,6 +502,8 @@
"scenesfight_08" "scenesfight_08"
], ],
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -467,6 +521,8 @@
"scenesfight_08" "scenesfight_08"
], ],
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [ "ChoseHero": [
"44004" "44004"
@ -486,6 +542,8 @@
"bossfight_dragon_01" "bossfight_dragon_01"
], ],
"disableAiCamera": 1, "disableAiCamera": 1,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
@ -503,6 +561,8 @@
"scenesfight_06" "scenesfight_06"
], ],
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 0,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],

74
bin/json/game_buriedcondi.json
View File

@ -22,7 +22,7 @@
25001 25001
], ],
"filter2": [ "filter2": [
"英雄ID", "守护者ID",
"0", "0",
"0", "0",
"0" "0"
@ -51,7 +51,7 @@
24004 24004
], ],
"filter2": [ "filter2": [
"英雄ID", "守护者ID",
"0", "0",
"0", "0",
"0" "0"
@ -109,7 +109,7 @@
14007 14007
], ],
"filter2": [ "filter2": [
"英雄ID", "守护者ID",
"0", "0",
"0", "0",
"0" "0"
@ -138,7 +138,7 @@
25001 25001
], ],
"filter2": [ "filter2": [
"英雄ID", "守护者ID",
"0", "0",
"0", "0",
"0" "0"
@ -167,7 +167,7 @@
25004 25004
], ],
"filter2": [ "filter2": [
"英雄ID", "守护者ID",
"0", "0",
"0", "0",
"0" "0"
@ -605,7 +605,7 @@
25001 25001
], ],
"filter2": [ "filter2": [
"英雄ID", "守护者ID",
"0", "0",
"0", "0",
"0" "0"
@ -692,7 +692,7 @@
6 6
], ],
"filter2": [ "filter2": [
"英雄ID", "守护者ID",
"星级", "星级",
"0", "0",
"0" "0"
@ -723,7 +723,7 @@
], ],
"filter2": [ "filter2": [
"等级", "等级",
"英雄ID", "守护者ID",
"0", "0",
"0" "0"
] ]
@ -781,7 +781,7 @@
20 20
], ],
"filter2": [ "filter2": [
"满足条件的英雄品质", "满足条件的守护者品质",
"需要升到的等级", "需要升到的等级",
"0", "0",
"0" "0"
@ -839,7 +839,7 @@
25001 25001
], ],
"filter2": [ "filter2": [
"英雄ID", "守护者ID",
"0", "0",
"0", "0",
"0" "0"
@ -871,7 +871,7 @@
1 1
], ],
"filter2": [ "filter2": [
"英雄品质", "守护者品质",
"指定职业", "指定职业",
"指定阵营", "指定阵营",
"觉醒阶段" "觉醒阶段"
@ -900,7 +900,7 @@
3 3
], ],
"filter2": [ "filter2": [
"英雄品质", "守护者品质",
"0", "0",
"0", "0",
"0" "0"
@ -1275,7 +1275,7 @@
14007 14007
], ],
"filter2": [ "filter2": [
"指定英雄", "指定守护者",
"0", "0",
"0", "0",
"0" "0"
@ -1638,7 +1638,7 @@
44006 44006
], ],
"filter2": [ "filter2": [
"英雄ID", "守护者ID",
"0", "0",
"0", "0",
"0" "0"
@ -9338,7 +9338,7 @@
25001 25001
], ],
"filter2": [ "filter2": [
"英雄ID", "守护者ID",
"0", "0",
"0", "0",
"0" "0"
@ -11447,7 +11447,7 @@
25001 25001
], ],
"filter2": [ "filter2": [
"指定英雄", "指定守护者",
"0", "0",
"0", "0",
"0" "0"
@ -11476,7 +11476,7 @@
25001 25001
], ],
"filter2": [ "filter2": [
"指定英雄", "指定守护者",
"0", "0",
"0", "0",
"0" "0"
@ -11780,7 +11780,7 @@
25001 25001
], ],
"filter2": [ "filter2": [
"英雄id", "守护者id",
"0", "0",
"0", "0",
"0" "0"
@ -16265,7 +16265,7 @@
25001 25001
], ],
"filter2": [ "filter2": [
"英雄ID", "守护者ID",
"0", "0",
"0", "0",
"0" "0"
@ -16323,7 +16323,7 @@
14007 14007
], ],
"filter2": [ "filter2": [
"英雄ID", "守护者ID",
"0", "0",
"0", "0",
"0" "0"
@ -16352,7 +16352,7 @@
25001 25001
], ],
"filter2": [ "filter2": [
"英雄ID", "守护者ID",
"0", "0",
"0", "0",
"0" "0"
@ -16381,7 +16381,7 @@
25004 25004
], ],
"filter2": [ "filter2": [
"英雄ID", "守护者ID",
"0", "0",
"0", "0",
"0" "0"
@ -16823,7 +16823,7 @@
6 6
], ],
"filter2": [ "filter2": [
"英雄ID", "守护者ID",
"星级", "星级",
"0", "0",
"0" "0"
@ -16963,7 +16963,7 @@
20 20
], ],
"filter2": [ "filter2": [
"满足条件的英雄品质", "满足条件的守护者品质",
"需要升到的等级", "需要升到的等级",
"0", "0",
"0" "0"
@ -16993,7 +16993,7 @@
23 23
], ],
"filter2": [ "filter2": [
"满足条件的英雄品质", "满足条件的守护者品质",
"需要升到的等级", "需要升到的等级",
"0", "0",
"0" "0"
@ -17051,7 +17051,7 @@
25001 25001
], ],
"filter2": [ "filter2": [
"英雄ID", "守护者ID",
"0", "0",
"0", "0",
"0" "0"
@ -17083,7 +17083,7 @@
1 1
], ],
"filter2": [ "filter2": [
"英雄品质", "守护者品质",
"指定职业", "指定职业",
"指定阵营", "指定阵营",
"觉醒阶段" "觉醒阶段"
@ -17112,7 +17112,7 @@
3 3
], ],
"filter2": [ "filter2": [
"英雄品质", "守护者品质",
"0", "0",
"0", "0",
"0" "0"
@ -17426,7 +17426,7 @@
14007 14007
], ],
"filter2": [ "filter2": [
"指定英雄", "指定守护者",
"0", "0",
"0", "0",
"0" "0"
@ -18814,7 +18814,7 @@
24004 24004
], ],
"filter2": [ "filter2": [
"英雄id", "守护者id",
"0", "0",
"0", "0",
"0" "0"
@ -18901,7 +18901,7 @@
25001 25001
], ],
"filter2": [ "filter2": [
"英雄id", "守护者id",
"0", "0",
"0", "0",
"0" "0"
@ -18960,7 +18960,7 @@
25001 25001
], ],
"filter2": [ "filter2": [
"英雄id", "守护者id",
"0", "0",
"0", "0",
"0" "0"
@ -19133,7 +19133,7 @@
24004 24004
], ],
"filter2": [ "filter2": [
"英雄id", "守护者id",
"0", "0",
"0", "0",
"0" "0"
@ -19359,7 +19359,7 @@
25001 25001
], ],
"filter2": [ "filter2": [
"英雄id", "守护者id",
"0", "0",
"0", "0",
"0" "0"
@ -19498,7 +19498,7 @@
25004 25004
], ],
"filter2": [ "filter2": [
"英雄ID", "守护者ID",
"0", "0",
"0", "0",
"0" "0"
@ -20740,7 +20740,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_731", "key": "buried_buried_condi_tasktxt_731",
"text": "使用木桩上阵英雄" "text": "使用木桩上阵守护者"
}, },
"type": 149, "type": 149,
"valid": 0, "valid": 0,
@ -20840,7 +20840,7 @@
44004 44004
], ],
"filter2": [ "filter2": [
"英雄ID", "守护者ID",
"0", "0",
"0", "0",
"0" "0"

10
bin/json/game_chatsystem.json
View File

@ -176,7 +176,7 @@
"datatype": 3, "datatype": 3,
"text": { "text": {
"key": "chat_system_text_11", "key": "chat_system_text_11",
"text": "【传闻】{0}已经{1}培养至60级！" "text": "【传闻】{0}已经将{1}培养至60级！"
}, },
"data": 60, "data": 60,
"data2": 0, "data2": 0,
@ -191,7 +191,7 @@
"datatype": 3, "datatype": 3,
"text": { "text": {
"key": "chat_system_text_12", "key": "chat_system_text_12",
"text": "【传闻】{0}已经{1}培养至6星！" "text": "【传闻】{0}已经将{1}培养至6星！"
}, },
"data": 5, "data": 5,
"data2": 0, "data2": 0,
@ -206,7 +206,7 @@
"datatype": 3, "datatype": 3,
"text": { "text": {
"key": "chat_system_text_13", "key": "chat_system_text_13",
"text": "【传闻】{0}已经{1}技能培养至满级！" "text": "【传闻】{0}已经将{1}技能培养至满级！"
}, },
"data": 5, "data": 5,
"data2": 0, "data2": 0,
@ -221,7 +221,7 @@
"datatype": 3, "datatype": 3,
"text": { "text": {
"key": "chat_system_text_14", "key": "chat_system_text_14",
"text": "【传闻】{0}已经{1}回响至满级！" "text": "【传闻】{0}已经将{1}回响至满级！"
}, },
"data": 5, "data": 5,
"data2": 0, "data2": 0,
@ -236,7 +236,7 @@
"datatype": 3, "datatype": 3,
"text": { "text": {
"key": "chat_system_text_15", "key": "chat_system_text_15",
"text": "【传闻】{0}已经{1}觉醒至满级！" "text": "【传闻】{0}已经将{1}觉醒至满级！"
}, },
"data": 5, "data": 5,
"data2": 0, "data2": 0,

160
bin/json/game_circulate.json
View File

File diff suppressed because it is too large Load Diff

6
bin/json/game_heromethodcomment.json
View File

@ -3,7 +3,7 @@
"id": 101, "id": 101,
"comment": { "comment": {
"key": "hero_method_hero_method_comment_comment_1", "key": "hero_method_hero_method_comment_comment_1",
"text": "这英雄速度有什么要求吗？" "text": "这守护者速度有什么要求吗？"
} }
}, },
{ {
@ -17,7 +17,7 @@
"id": 103, "id": 103,
"comment": { "comment": {
"key": "hero_method_hero_method_comment_comment_3", "key": "hero_method_hero_method_comment_comment_3",
"text": "这英雄一波流打不了BOSS，竞技场好用~" "text": "这守护者一波流打不了BOSS，竞技场好用~"
} }
}, },
{ {
@ -38,7 +38,7 @@
"id": 106, "id": 106,
"comment": { "comment": {
"key": "hero_method_hero_method_comment_comment_6", "key": "hero_method_hero_method_comment_comment_6",
"text": "平民英雄，好养。" "text": "平民守护者，好养。"
} }
}, },
{ {

26
bin/json/game_item.json
View File

@ -276,7 +276,7 @@
"id": "10000008", "id": "10000008",
"name": { "name": {
"key": "item_item_name_8", "key": "item_item_name_8",
"text": "英雄初级护身符" "text": "守护者初级护身符"
}, },
"usetype": 2, "usetype": 2,
"color": 2, "color": 2,
@ -315,7 +315,7 @@
"id": "10000009", "id": "10000009",
"name": { "name": {
"key": "item_item_name_9", "key": "item_item_name_9",
"text": "英雄中级护身符" "text": "守护者中级护身符"
}, },
"usetype": 2, "usetype": 2,
"color": 3, "color": 3,
@ -354,7 +354,7 @@
"id": "10000010", "id": "10000010",
"name": { "name": {
"key": "item_item_name_10", "key": "item_item_name_10",
"text": "英雄高级护身符" "text": "守护者高级护身符"
}, },
"usetype": 2, "usetype": 2,
"color": 4, "color": 4,
@ -9868,7 +9868,7 @@
"decompose_get": [ "decompose_get": [
{ {
"a": "item", "a": "item",
"t": "15000101", "t": "15000201",
"n": 2 "n": 2
} }
], ],
@ -9931,7 +9931,7 @@
"decompose_get": [ "decompose_get": [
{ {
"a": "item", "a": "item",
"t": "15000102", "t": "15000202",
"n": 2 "n": 2
} }
], ],
@ -9994,7 +9994,7 @@
"decompose_get": [ "decompose_get": [
{ {
"a": "item", "a": "item",
"t": "15000103", "t": "15000203",
"n": 2 "n": 2
} }
], ],
@ -10057,7 +10057,7 @@
"decompose_get": [ "decompose_get": [
{ {
"a": "item", "a": "item",
"t": "15000104", "t": "15000204",
"n": 2 "n": 2
} }
], ],
@ -10108,7 +10108,7 @@
"decompose_get": [ "decompose_get": [
{ {
"a": "item", "a": "item",
"t": "15000201", "t": "15000301",
"n": 2 "n": 2
} }
], ],
@ -10159,7 +10159,7 @@
"decompose_get": [ "decompose_get": [
{ {
"a": "item", "a": "item",
"t": "15000202", "t": "15000302",
"n": 2 "n": 2
} }
], ],
@ -10210,7 +10210,7 @@
"decompose_get": [ "decompose_get": [
{ {
"a": "item", "a": "item",
"t": "15000203", "t": "15000303",
"n": 2 "n": 2
} }
], ],
@ -10261,7 +10261,7 @@
"decompose_get": [ "decompose_get": [
{ {
"a": "item", "a": "item",
"t": "15000204", "t": "15000304",
"n": 2 "n": 2
} }
], ],
@ -11964,7 +11964,7 @@
"id": "17050001", "id": "17050001",
"name": { "name": {
"key": "item_item_name_298", "key": "item_item_name_298",
"text": "5星全英雄自选宝箱" "text": "5星全守护者自选宝箱"
}, },
"usetype": 4, "usetype": 4,
"color": 5, "color": 5,
@ -11987,7 +11987,7 @@
"img": "item_17050001", "img": "item_17050001",
"intr": { "intr": {
"key": "item_item_intr_306", "key": "item_item_intr_306",
"text": "5星全英雄自选宝箱。" "text": "5星全守护者自选宝箱。"
}, },
"sale": [ "sale": [
{ {

4
bin/json/game_pandamasjx.json
View File

@ -322,7 +322,7 @@
"img": "sbkp_js_45004", "img": "sbkp_js_45004",
"intr": { "intr": {
"key": "item_pandamas_jx_intr_9", "key": "item_pandamas_jx_intr_9",
"text": "训练结束可以额外获得英雄中级护身符*1" "text": "训练结束可以额外获得守护者中级护身符*1"
}, },
"standard_text": 25001, "standard_text": 25001,
"special_text": 25002, "special_text": 25002,
@ -332,7 +332,7 @@
], ],
"description": { "description": {
"key": "item_pandamas_jx_description_9", "key": "item_pandamas_jx_description_9",
"text": "训练结束可以额外获得英雄中级护身符*1" "text": "训练结束可以额外获得守护者中级护身符*1"
}, },
"duration": 0, "duration": 0,
"exp": 0, "exp": 0,

4
bin/json/game_skillafteratk.json
View File

@ -27302,12 +27302,12 @@
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 3,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
1, 1,
4, 4,
3000 1000
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],

2
bin/json/game_worldtask.json
View File

@ -158,7 +158,7 @@
}, },
{ {
"key": 20030, "key": 20030,
"opencond": "", "opencond": "heroic_teaching",
"lock": 1, "lock": 1,
"lockend": 999, "lockend": 999,
"ontxe": 20020, "ontxe": 20020,

20
modules/caravan/api_buyorsell.go
View File

@ -23,8 +23,6 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe
addScore int32 // 收益 addScore int32 // 收益
cityInfo *pb.CityInfo cityInfo *pb.CityInfo
ok bool ok bool
upperLimit int32 // 单个物品堆叠上限
) )
update = make(map[string]interface{}) update = make(map[string]interface{})
if errdata = this.BuyOrSellCheck(session, req); errdata != nil { if errdata = this.BuyOrSellCheck(session, req); errdata != nil {
@ -40,9 +38,7 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe
return return
} }
c, err := this.module.configure.GetCaravanLv(caravan.Lv) c, err := this.module.configure.GetCaravanLv(caravan.Lv)
if err == nil { if err != nil {
upperLimit = c.Bagtagnum // 获取单个格子堆叠数
} else {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound, Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(), Title: pb.ErrorCode_ConfigNoFound.ToString(),
@ -50,7 +46,7 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe
} }
return return
} }
caravan.Baglimit = c.Bagtop
// special 城市卖给玩家的商品 // special 城市卖给玩家的商品
// exspecial 城市想要玩家卖给他的商品库 // exspecial 城市想要玩家卖给他的商品库
if !req.IsBuy { // 卖给npc if !req.IsBuy { // 卖给npc
@ -101,13 +97,7 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe
} }
addScore += price * v // 卖出收益 addScore += price * v // 卖出收益
} }
if this.module.ArrayBag(caravan, upperLimit) { // 背包满了 this.module.ArrayBag(caravan)
errdata = &pb.ErrorData{
Code: pb.ErrorCode_TrollMaxItemCount, // 道具数量不足
Title: pb.ErrorCode_TrollMaxItemCount.ToString(),
}
return
}
// 统计 收益 // 统计 收益
var lvReward []*cfg.Gameatn var lvReward []*cfg.Gameatn
caravan.Profit += int64(addScore) caravan.Profit += int64(addScore)
@ -145,7 +135,6 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe
return return
} }
} }
} else { // 买入 } else { // 买入
for k, v := range req.Items { for k, v := range req.Items {
if _, ok := caravan.Items[k]; !ok { if _, ok := caravan.Items[k]; !ok {
@ -198,7 +187,7 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe
return return
} }
} }
if this.module.ArrayBag(caravan, upperLimit) { // 背包满了 if this.module.CheckOverweight(caravan) { // 背包满了
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_TrollMaxItemCount, Code: pb.ErrorCode_TrollMaxItemCount,
Title: pb.ErrorCode_TrollMaxItemCount.ToString(), Title: pb.ErrorCode_TrollMaxItemCount.ToString(),
@ -215,7 +204,6 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe
} }
update["items"] = caravan.Items update["items"] = caravan.Items
update["baglimit"] = caravan.Baglimit update["baglimit"] = caravan.Baglimit
update["useCount"] = caravan.UseCount // 更新背包使用数量
this.module.modelCaravan.modifyCaravanDataByObjId(session.GetUserId(), update) this.module.modelCaravan.modifyCaravanDataByObjId(session.GetUserId(), update)
session.SendMsg(string(this.module.GetType()), "buyorsell", &pb.CaravanBuyOrSellResp{ session.SendMsg(string(this.module.GetType()), "buyorsell", &pb.CaravanBuyOrSellResp{
Data: caravan, Data: caravan,

1
modules/caravan/model_caravan.go
View File

@ -36,7 +36,6 @@ func (this *modelCaravan) getCaravanList(uid string) (result *pb.DBCaravan, err
result = &pb.DBCaravan{ result = &pb.DBCaravan{
Id: "", Id: "",
Uid: uid, Uid: uid,
UseCount: 0,
Items: map[string]*pb.BagInfo{}, Items: map[string]*pb.BagInfo{},
Goods: map[string]*pb.Goods{}, Goods: map[string]*pb.Goods{},
City: map[int32]*pb.CityInfo{}, City: map[int32]*pb.CityInfo{},

32
modules/caravan/module.go
View File

@ -341,28 +341,30 @@ func (this *Caravan) TaskComplete(session comm.IUserSession, taskid int32) {
} }
// 整理背包 (true 表示背包装不下) // 整理背包 (true 表示背包装不下)
func (this *Caravan) ArrayBag(data *pb.DBCaravan, limit int32) (bFull bool) { func (this *Caravan) ArrayBag(data *pb.DBCaravan) {
var count int32
for k, v := range data.Items { for k, v := range data.Items {
if v.Count == 0 { if v.Count == 0 {
delete(data.Items, k) delete(data.Items, k)
} else {
tmp := v.Count
for {
count++
if tmp > limit {
tmp -= limit
} else {
break
} }
} }
}
} return
if count > data.Baglimit { }
// 校验货物是否超重
func (this *Caravan) CheckOverweight(data *pb.DBCaravan) (b bool) {
var weight int32
for k, v := range data.Items {
if d, err := this.configure.GetCaravanGoods(k); err != nil {
weight += d.Weight * v.Count
if weight > data.Baglimit {
return true return true
} }
data.UseCount = count }
return false }
return true
} }
// 获得利润判断是否能提升商队等级 // 获得利润判断是否能提升商队等级

137
pb/caravan_db.pb.go
View File

@ -200,7 +200,7 @@ type DBCaravan struct {
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID
UseCount int32 `protobuf:"varint,3,opt,name=useCount,proto3" json:"useCount" bson:"useCount"` //当前背包使用的数量 //int32 useCount = 3; //@go_tags(`bson:"useCount"`) 当前背包使用的数量
Items map[string]*BagInfo `protobuf:"bytes,4,rep,name=items,proto3" json:"items" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 背包数据 Items map[string]*BagInfo `protobuf:"bytes,4,rep,name=items,proto3" json:"items" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 背包数据
Goods map[string]*Goods `protobuf:"bytes,5,rep,name=goods,proto3" json:"goods" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // key 货物ID Goods map[string]*Goods `protobuf:"bytes,5,rep,name=goods,proto3" json:"goods" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // key 货物ID
City map[int32]*CityInfo `protobuf:"bytes,6,rep,name=city,proto3" json:"city" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 城市信息 City map[int32]*CityInfo `protobuf:"bytes,6,rep,name=city,proto3" json:"city" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 城市信息
@ -263,13 +263,6 @@ func (x *DBCaravan) GetUid() string {
return "" return ""
} }
func (x *DBCaravan) GetUseCount() int32 {
if x != nil {
return x.UseCount
}
return 0
}
func (x *DBCaravan) GetItems() map[string]*BagInfo { func (x *DBCaravan) GetItems() map[string]*BagInfo {
if x != nil { if x != nil {
return x.Items return x.Items
@ -485,74 +478,72 @@ var file_caravan_caravan_db_proto_rawDesc = []byte{
0x42, 0x61, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x61, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74,
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a,
0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x70, 0x72, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x70, 0x72,
0x69, 0x63, 0x65, 0x22, 0xdd, 0x06, 0x0a, 0x09, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x69, 0x63, 0x65, 0x22, 0xc1, 0x06, 0x0a, 0x09, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61,
0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69,
0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x75, 0x69, 0x64, 0x12, 0x2b, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x03,
0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x75, 0x73, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x2e, 0x49,
0x2b, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73,
0x2e, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x2b, 0x0a, 0x05, 0x67, 0x6f, 0x6f, 0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x2b, 0x0a, 0x05, 0x15, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x2e, 0x47, 0x6f, 0x6f, 0x64,
0x67, 0x6f, 0x6f, 0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x67, 0x6f, 0x6f, 0x64, 0x73, 0x12, 0x28, 0x0a,
0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x2e, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x04, 0x63, 0x69, 0x74, 0x79, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42,
0x72, 0x79, 0x52, 0x05, 0x67, 0x6f, 0x6f, 0x64, 0x73, 0x12, 0x28, 0x0a, 0x04, 0x63, 0x69, 0x74, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x2e, 0x43, 0x69, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72,
0x79, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x79, 0x52, 0x04, 0x63, 0x69, 0x74, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x07, 0x20,
0x76, 0x61, 0x6e, 0x2e, 0x43, 0x69, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x63, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x72, 0x6f, 0x66, 0x69,
0x69, 0x74, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x74, 0x12,
0x02, 0x6c, 0x76, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x74, 0x18, 0x08, 0x20, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01,
0x01, 0x28, 0x03, 0x52, 0x06, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x28, 0x03, 0x52, 0x09, 0x72, 0x65, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a,
0x65, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x07, 0x63, 0x75, 0x72, 0x63, 0x69, 0x74, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
0x72, 0x65, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x63, 0x75, 0x72, 0x63, 0x69, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x69,
0x63, 0x69, 0x74, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x75, 0x72, 0x63, 0x64, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x69, 0x64, 0x12,
0x69, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x69, 0x64, 0x18, 0x0b, 0x20, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05,
0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73,
0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x74, 0x61, 0x73,
0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x74, 0x69, 0x6d, 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x67, 0x6c, 0x69, 0x6d, 0x69,
0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x74, 0x69, 0x6d, 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x61, 0x67, 0x6c, 0x69, 0x6d, 0x69,
0x65, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x67, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x0e, 0x20, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x69, 0x74, 0x79, 0x73, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0f,
0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x61, 0x67, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x1c, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x69, 0x74, 0x79, 0x73, 0x74, 0x69, 0x6d, 0x65, 0x12,
0x09, 0x63, 0x69, 0x74, 0x79, 0x73, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x03, 0x34, 0x0a, 0x08, 0x6f, 0x6c, 0x64, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x10, 0x20, 0x03, 0x28,
0x52, 0x09, 0x63, 0x69, 0x74, 0x79, 0x73, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x34, 0x0a, 0x08, 0x6f, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x2e, 0x4f, 0x6c,
0x6c, 0x64, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x10, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x64, 0x70, 0x72, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6f, 0x6c, 0x64,
0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x2e, 0x4f, 0x6c, 0x64, 0x70, 0x72, 0x69, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, 0x28, 0x0a, 0x04, 0x6e, 0x65, 0x78, 0x74, 0x18, 0x11, 0x20,
0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6f, 0x6c, 0x64, 0x70, 0x72, 0x69, 0x63, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x2e,
0x65, 0x12, 0x28, 0x0a, 0x04, 0x6e, 0x65, 0x78, 0x74, 0x18, 0x11, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x4e, 0x65, 0x78, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x6e, 0x65, 0x78, 0x74, 0x1a,
0x14, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x2e, 0x4e, 0x65, 0x78, 0x74, 0x42, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x6e, 0x65, 0x78, 0x74, 0x1a, 0x42, 0x0a, 0x0a, 0x49,
0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x05, 0x76,
0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x42, 0x61, 0x67,
0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
0x40, 0x0a, 0x0a, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
0x1c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x1e, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08,
0x2e, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x2e, 0x42, 0x61, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
0x01, 0x1a, 0x42, 0x0a, 0x09, 0x43, 0x69, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x02, 0x38, 0x01, 0x1a, 0x40, 0x0a, 0x0a, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72,
0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
0x09, 0x2e, 0x43, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d, 0x4f, 0x6c, 0x64, 0x70, 0x72, 0x69, 0x63, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42, 0x0a, 0x09, 0x43, 0x69, 0x74, 0x79, 0x45, 0x6e, 0x74,
0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x43, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05,
0x38, 0x01, 0x1a, 0x3f, 0x0a, 0x09, 0x4e, 0x65, 0x78, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d, 0x4f, 0x6c, 0x64,
0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x70, 0x72, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
0x79, 0x12, 0x1c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
0x32, 0x06, 0x2e, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c,
0x02, 0x38, 0x01, 0x22, 0xbf, 0x01, 0x0a, 0x0f, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x52, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3f, 0x0a, 0x09, 0x4e, 0x65, 0x78, 0x74, 0x45, 0x6e,
0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x52, 0x05, 0x76, 0x61,
0x06, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x75, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xbf, 0x01, 0x0a, 0x0f, 0x43, 0x61, 0x72, 0x61,
0x73, 0x65, 0x72, 0x6c, 0x76, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x76, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x75,
0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x12, 0x0a, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a,
0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,
0x6b, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28,
0x65, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, 0x05, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x76, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61,
0x6e, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x72, 0x61, 0x76, 0x74, 0x61, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61,
0x61, 0x6e, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x61, 0x72, 0x61, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52,
0x76, 0x61, 0x6e, 0x4c, 0x76, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, 0x6e,
0x72, 0x6f, 0x74, 0x6f, 0x33, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6d, 0x65,
0x72, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x63,
0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09,
0x63, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x4c, 0x76, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (

30
sys/configure/structs/Game.BattleReadyData.go
View File

@ -17,6 +17,8 @@ type GameBattleReadyData struct {
ReadyScene string ReadyScene string
BattleScenes []string BattleScenes []string
DisableAiCamera int32 DisableAiCamera int32
ChoseCamp []int32
DisableCamp []int32
DefaultHero int32 DefaultHero int32
ChoseHero []string ChoseHero []string
DisableHero []string DisableHero []string
@ -52,6 +54,34 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro
} }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["disableAiCamera"].(float64); !_ok_ { err = errors.New("disableAiCamera error"); return }; _v.DisableAiCamera = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["disableAiCamera"].(float64); !_ok_ { err = errors.New("disableAiCamera error"); return }; _v.DisableAiCamera = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["ChoseCamp"].([]interface{}); !_ok_ { err = errors.New("ChoseCamp error"); return }
_v.ChoseCamp = make([]int32, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ int32
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
_v.ChoseCamp = append(_v.ChoseCamp, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["DisableCamp"].([]interface{}); !_ok_ { err = errors.New("DisableCamp error"); return }
_v.DisableCamp = make([]int32, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ int32
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
_v.DisableCamp = append(_v.DisableCamp, _list_v_)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DefaultHero"].(float64); !_ok_ { err = errors.New("DefaultHero error"); return }; _v.DefaultHero = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DefaultHero"].(float64); !_ok_ { err = errors.New("DefaultHero error"); return }; _v.DefaultHero = int32(_tempNum_) }
{ {
var _arr_ []interface{} var _arr_ []interface{}

2
sys/configure/structs/Game.CirculateData.go
View File

@ -16,6 +16,7 @@ type GameCirculateData struct {
Restriction int32 Restriction int32
BattlereadyID int32 BattlereadyID int32
Openingtime []int32 Openingtime []int32
Time int32
Unlock int32 Unlock int32
Floors int32 Floors int32
Fightevents []int32 Fightevents []int32
@ -54,6 +55,7 @@ func (_v *GameCirculateData)Deserialize(_buf map[string]interface{}) (err error)
} }
} }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time"].(float64); !_ok_ { err = errors.New("time error"); return }; _v.Time = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["unlock"].(float64); !_ok_ { err = errors.New("unlock error"); return }; _v.Unlock = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["unlock"].(float64); !_ok_ { err = errors.New("unlock error"); return }; _v.Unlock = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["floors"].(float64); !_ok_ { err = errors.New("floors error"); return }; _v.Floors = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["floors"].(float64); !_ok_ { err = errors.New("floors error"); return }; _v.Floors = int32(_tempNum_) }
{ {