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

配置同步

Browse Source
This commit is contained in:
meixiongfeng 2023-04-14 18:19:17 +08:00
parent 260d936e20
commit e9a9f99b65
18 changed files with 1150 additions and 720 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bin/json/game_battleready.json
View File

@ -7,6 +7,7 @@
"battleScenes": [ "battleScenes": [
"scenesfight_03_02" "scenesfight_03_02"
], ],
"disableAiCamera": 0,
"DefaultHero": 0, "DefaultHero": 0,
"DisableHero": [], "DisableHero": [],
"LockSlots": [], "LockSlots": [],
@ -22,6 +23,7 @@
"battleScenes": [ "battleScenes": [
"scenesfight_03_02" "scenesfight_03_02"
], ],
"disableAiCamera": 0,
"DefaultHero": 0, "DefaultHero": 0,
"DisableHero": [], "DisableHero": [],
"LockSlots": [], "LockSlots": [],
@ -37,6 +39,7 @@
"battleScenes": [ "battleScenes": [
"scenesfight_03_02" "scenesfight_03_02"
], ],
"disableAiCamera": 0,
"DefaultHero": 0, "DefaultHero": 0,
"DisableHero": [], "DisableHero": [],
"LockSlots": [], "LockSlots": [],
@ -52,6 +55,7 @@
"battleScenes": [ "battleScenes": [
"scenesfight_03_02" "scenesfight_03_02"
], ],
"disableAiCamera": 0,
"DefaultHero": 0, "DefaultHero": 0,
"DisableHero": [], "DisableHero": [],
"LockSlots": [], "LockSlots": [],
@ -67,6 +71,7 @@
"battleScenes": [ "battleScenes": [
"scenesfight_03_02" "scenesfight_03_02"
], ],
"disableAiCamera": 0,
"DefaultHero": 0, "DefaultHero": 0,
"DisableHero": [], "DisableHero": [],
"LockSlots": [], "LockSlots": [],
@ -82,6 +87,7 @@
"battleScenes": [ "battleScenes": [
"scenesfight_03_02" "scenesfight_03_02"
], ],
"disableAiCamera": 0,
"DefaultHero": 0, "DefaultHero": 0,
"DisableHero": [], "DisableHero": [],
"LockSlots": [], "LockSlots": [],
@ -97,6 +103,7 @@
"battleScenes": [ "battleScenes": [
"scenesfight_03_02" "scenesfight_03_02"
], ],
"disableAiCamera": 0,
"DefaultHero": 0, "DefaultHero": 0,
"DisableHero": [], "DisableHero": [],
"LockSlots": [], "LockSlots": [],
@ -112,6 +119,7 @@
"battleScenes": [ "battleScenes": [
"scenesfight_03_02" "scenesfight_03_02"
], ],
"disableAiCamera": 0,
"DefaultHero": 0, "DefaultHero": 0,
"DisableHero": [], "DisableHero": [],
"LockSlots": [], "LockSlots": [],
@ -127,6 +135,7 @@
"battleScenes": [ "battleScenes": [
"scenesfight_03_02" "scenesfight_03_02"
], ],
"disableAiCamera": 0,
"DefaultHero": 0, "DefaultHero": 0,
"DisableHero": [], "DisableHero": [],
"LockSlots": [], "LockSlots": [],
@ -142,6 +151,7 @@
"battleScenes": [ "battleScenes": [
"scenesfight_03_02" "scenesfight_03_02"
], ],
"disableAiCamera": 0,
"DefaultHero": 0, "DefaultHero": 0,
"DisableHero": [], "DisableHero": [],
"LockSlots": [], "LockSlots": [],
@ -157,6 +167,7 @@
"battleScenes": [ "battleScenes": [
"scenesfight_03_02" "scenesfight_03_02"
], ],
"disableAiCamera": 0,
"DefaultHero": 0, "DefaultHero": 0,
"DisableHero": [], "DisableHero": [],
"LockSlots": [], "LockSlots": [],
@ -172,6 +183,7 @@
"battleScenes": [ "battleScenes": [
"scenesfight_07" "scenesfight_07"
], ],
"disableAiCamera": 0,
"DefaultHero": 0, "DefaultHero": 0,
"DisableHero": [], "DisableHero": [],
"LockSlots": [], "LockSlots": [],
@ -187,6 +199,7 @@
"battleScenes": [ "battleScenes": [
"scenesfight_03_02" "scenesfight_03_02"
], ],
"disableAiCamera": 0,
"DefaultHero": 0, "DefaultHero": 0,
"DisableHero": [], "DisableHero": [],
"LockSlots": [], "LockSlots": [],
@ -202,6 +215,7 @@
"battleScenes": [ "battleScenes": [
"scenesfight_03_02" "scenesfight_03_02"
], ],
"disableAiCamera": 0,
"DefaultHero": 0, "DefaultHero": 0,
"DisableHero": [], "DisableHero": [],
"LockSlots": [], "LockSlots": [],
@ -217,6 +231,7 @@
"battleScenes": [ "battleScenes": [
"scenesfight_03_02" "scenesfight_03_02"
], ],
"disableAiCamera": 0,
"DefaultHero": 0, "DefaultHero": 0,
"DisableHero": [], "DisableHero": [],
"LockSlots": [], "LockSlots": [],
@ -232,6 +247,7 @@
"battleScenes": [ "battleScenes": [
"scenesfight_06" "scenesfight_06"
], ],
"disableAiCamera": 0,
"DefaultHero": 0, "DefaultHero": 0,
"DisableHero": [], "DisableHero": [],
"LockSlots": [], "LockSlots": [],
@ -247,6 +263,7 @@
"battleScenes": [ "battleScenes": [
"scenesfight_07" "scenesfight_07"
], ],
"disableAiCamera": 0,
"DefaultHero": 0, "DefaultHero": 0,
"DisableHero": [], "DisableHero": [],
"LockSlots": [], "LockSlots": [],
@ -262,6 +279,7 @@
"battleScenes": [ "battleScenes": [
"scenesfight_06" "scenesfight_06"
], ],
"disableAiCamera": 0,
"DefaultHero": 0, "DefaultHero": 0,
"DisableHero": [], "DisableHero": [],
"LockSlots": [], "LockSlots": [],
@ -277,6 +295,7 @@
"battleScenes": [ "battleScenes": [
"scenesfight_05_01" "scenesfight_05_01"
], ],
"disableAiCamera": 0,
"DefaultHero": 0, "DefaultHero": 0,
"DisableHero": [], "DisableHero": [],
"LockSlots": [], "LockSlots": [],
@ -292,6 +311,7 @@
"battleScenes": [ "battleScenes": [
"scenesfight_03_02" "scenesfight_03_02"
], ],
"disableAiCamera": 0,
"DefaultHero": 0, "DefaultHero": 0,
"DisableHero": [], "DisableHero": [],
"LockSlots": [], "LockSlots": [],
@ -307,6 +327,7 @@
"battleScenes": [ "battleScenes": [
"bossfight_spinymandrilla_02" "bossfight_spinymandrilla_02"
], ],
"disableAiCamera": 1,
"DefaultHero": 0, "DefaultHero": 0,
"DisableHero": [], "DisableHero": [],
"LockSlots": [], "LockSlots": [],
@ -322,6 +343,7 @@
"battleScenes": [ "battleScenes": [
"bossfight_naturetitan_01" "bossfight_naturetitan_01"
], ],
"disableAiCamera": 1,
"DefaultHero": 0, "DefaultHero": 0,
"DisableHero": [], "DisableHero": [],
"LockSlots": [], "LockSlots": [],

2
bin/json/game_breakingbad.json
View File

@ -114,7 +114,7 @@
"n": 10 "n": 10
}, },
{ {
"a": "132008", "a": "131002",
"n": 5 "n": 5
} }
], ],

24
bin/json/game_dispatch_battle.json
View File

@ -28,18 +28,6 @@
"n": 1 "n": 1
} }
], ],
"story_award": [
{
"a": "attr",
"t": "gold",
"n": 2640
},
{
"a": "item",
"t": "30001",
"n": 1
}
],
"onlookers": [ "onlookers": [
"45003", "45003",
"25001" "25001"
@ -82,18 +70,6 @@
"n": 2 "n": 2
} }
], ],
"story_award": [
{
"a": "attr",
"t": "gold",
"n": 6480
},
{
"a": "item",
"t": "30001",
"n": 2
}
],
"onlookers": [ "onlookers": [
"45003", "45003",
"25001" "25001"

148
bin/json/game_dispatch_task.json
View File

@ -8,7 +8,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 63, "tasktime": 111,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -56,7 +56,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 131, "tasktime": 174,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -104,7 +104,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 64, "tasktime": 100,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -152,7 +152,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 170, "tasktime": 140,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -200,7 +200,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 169, "tasktime": 176,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -248,7 +248,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 112, "tasktime": 65,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -296,7 +296,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 89, "tasktime": 124,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -344,7 +344,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 115, "tasktime": 96,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -392,7 +392,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 91, "tasktime": 114,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -440,7 +440,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 119, "tasktime": 109,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -488,7 +488,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 71, "tasktime": 92,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -536,7 +536,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 156, "tasktime": 137,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -584,7 +584,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 96, "tasktime": 109,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -632,7 +632,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 160, "tasktime": 109,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -680,7 +680,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 175, "tasktime": 107,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -728,7 +728,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 163, "tasktime": 175,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -776,7 +776,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 63, "tasktime": 142,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -824,7 +824,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 135, "tasktime": 109,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -872,7 +872,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 60, "tasktime": 61,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -920,7 +920,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 148, "tasktime": 172,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -968,7 +968,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 101, "tasktime": 120,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -1016,7 +1016,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 61, "tasktime": 64,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -1064,7 +1064,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 129, "tasktime": 103,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -1112,7 +1112,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 154, "tasktime": 140,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -1160,7 +1160,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 87, "tasktime": 124,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -1208,7 +1208,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 157, "tasktime": 147,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -1256,7 +1256,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 147, "tasktime": 120,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -1304,7 +1304,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 62, "tasktime": 137,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -1352,7 +1352,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 163, "tasktime": 90,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -1400,7 +1400,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 114, "tasktime": 158,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -1448,7 +1448,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 148, "tasktime": 104,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -1496,7 +1496,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 83, "tasktime": 158,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -1544,7 +1544,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 88, "tasktime": 92,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -1592,7 +1592,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 85, "tasktime": 83,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -1640,7 +1640,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 153, "tasktime": 60,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -1688,7 +1688,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 169, "tasktime": 152,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -1736,7 +1736,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 119, "tasktime": 88,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -1784,7 +1784,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 171, "tasktime": 156,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -1832,7 +1832,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 166, "tasktime": 153,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -1880,7 +1880,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 128, "tasktime": 110,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -1928,7 +1928,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 162, "tasktime": 127,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -1976,7 +1976,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 117, "tasktime": 115,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -2024,7 +2024,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 106, "tasktime": 109,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -2072,7 +2072,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 162, "tasktime": 174,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -2120,7 +2120,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 81, "tasktime": 79,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -2168,7 +2168,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 64, "tasktime": 70,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -2216,7 +2216,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 113, "tasktime": 103,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -2264,7 +2264,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 71, "tasktime": 143,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -2312,7 +2312,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 75, "tasktime": 123,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -2360,7 +2360,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 157, "tasktime": 65,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -2408,7 +2408,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 97, "tasktime": 171,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -2456,7 +2456,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 148, "tasktime": 150,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -2504,7 +2504,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 129, "tasktime": 90,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -2552,7 +2552,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 144, "tasktime": 163,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -2600,7 +2600,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 169, "tasktime": 87,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -2648,7 +2648,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 112, "tasktime": 100,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -2696,7 +2696,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 173, "tasktime": 154,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -2744,7 +2744,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 133, "tasktime": 167,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -2792,7 +2792,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 127, "tasktime": 114,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -2840,7 +2840,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 98, "tasktime": 64,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -2888,7 +2888,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 169, "tasktime": 157,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -2936,7 +2936,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 82, "tasktime": 129,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -2984,7 +2984,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 79, "tasktime": 166,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -3032,7 +3032,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 164, "tasktime": 100,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -3080,7 +3080,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 95, "tasktime": 63,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -3128,7 +3128,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 84, "tasktime": 137,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -3176,7 +3176,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 176, "tasktime": 70,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -3224,7 +3224,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 129, "tasktime": 63,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -3272,7 +3272,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 141, "tasktime": 83,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -3320,7 +3320,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 169, "tasktime": 163,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -3368,7 +3368,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 163, "tasktime": 91,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -3416,7 +3416,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 141, "tasktime": 73,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -3464,7 +3464,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 156, "tasktime": 151,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -3512,7 +3512,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 75, "tasktime": 115,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"

785
bin/json/game_drawcard.json
View File

File diff suppressed because it is too large Load Diff

29
bin/json/game_global.json
View File

@ -575,7 +575,7 @@
"g": [ "g": [
{ {
"a": "item", "a": "item",
"t": "10006", "t": "120003",
"n": 1 "n": 1
}, },
{ {
@ -590,7 +590,7 @@
"g": [ "g": [
{ {
"a": "item", "a": "item",
"t": "10006", "t": "120003",
"n": 2 "n": 2
}, },
{ {
@ -605,7 +605,7 @@
"g": [ "g": [
{ {
"a": "item", "a": "item",
"t": "10006", "t": "120003",
"n": 4 "n": 4
} }
] ]
@ -661,6 +661,27 @@
"Daily_Tips": 3, "Daily_Tips": 3,
"Daily_Num": 2, "Daily_Num": 2,
"Week_Num": 2, "Week_Num": 2,
"fitnessModelId": "25001" "fitnessModelId": "25001",
"business_ticket": 40,
"business_money": {
"a": "item",
"t": "141001",
"n": 1
},
"business_moneynum": 10000,
"business_minint_reward": {
"a": "attr",
"t": "gold",
"n": 1000
},
"business_maxint_reward": {
"a": "attr",
"t": "gold",
"n": 99999
},
"business_maxint": 1000,
"business_bag": 20,
"business_rewardday": 1,
"business_renovatething": 180
} }
] ]

8
bin/json/game_hero.json
View File

@ -8070,10 +8070,10 @@
"z": 0 "z": 0
}, },
"capskillrule": 101, "capskillrule": 101,
"skill": 0, "skill": 111021011,
"skill1": 155006111, "skill1": 111021111,
"skill2": 155006211, "skill2": 111021211,
"skill3": 155006311, "skill3": 111021311,
"txt": { "txt": {
"key": "atlas_11021", "key": "atlas_11021",
"text": "" "text": ""

30
bin/json/game_item.json
View File

@ -8270,5 +8270,35 @@
], ],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [] "decompose_deplete": []
},
{
"id": "141001",
"name": {
"key": "item_name_141001",
"text": "流通货币"
},
"usetype": 14,
"color": 4,
"bagtype": 0,
"index": 99,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"box_id": 0,
"synthetize_num": 0,
"access": [
107
],
"use_skip": 166,
"upper_limit": -1,
"img": "icon_mcs",
"intr": {
"key": "sd_ing_141001",
"text": "缺少流通货币"
},
"sale": [],
"synthetize_deplete": [],
"decompose_deplete": []
} }
] ]

379
bin/json/game_skillafteratk.json
View File

@ -4176,10 +4176,10 @@
{ {
"Id": 225001311, "Id": 225001311,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 10,
"ExecuteCnt": 3, "ExecuteCnt": 3,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
@ -4250,10 +4250,10 @@
{ {
"Id": 225001321, "Id": 225001321,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 10,
"ExecuteCnt": 3, "ExecuteCnt": 3,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
@ -4276,10 +4276,10 @@
{ {
"Id": 225001331, "Id": 225001331,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 10,
"ExecuteCnt": 3, "ExecuteCnt": 3,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
@ -4302,10 +4302,10 @@
{ {
"Id": 225001341, "Id": 225001341,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 10,
"ExecuteCnt": 3, "ExecuteCnt": 3,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
@ -6472,59 +6472,34 @@
"RevisiCondition": "", "RevisiCondition": "",
"RevisiParams": [] "RevisiParams": []
}, },
{
"Id": 244006111,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
1000
],
"FollowSK": [
244006112
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{ {
"Id": 244006112, "Id": 244006112,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
500
],
"FollowSK": [
244006115
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 244006113,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
500
],
"FollowSK": [
244006114
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 244006114,
"EmitPR": 1000,
"From": 3, "From": 3,
"Where": [], "Where": [],
"Order": "", "Order": "",
@ -6548,22 +6523,22 @@
"RevisiParams": [] "RevisiParams": []
}, },
{ {
"Id": 244006115, "Id": 244006121,
"EmitPR": 1000, "EmitPR": 1000,
"From": 3, "From": 4,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 19, "Type": 1,
"Argu": [ "Argu": [
390001112,
1000,
1, 1,
2, 4,
500 1050
],
"FollowSK": [
244006122
], ],
"FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
@ -6575,31 +6550,6 @@
{ {
"Id": 244006122, "Id": 244006122,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
550
],
"FollowSK": [
244006125
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 244006125,
"EmitPR": 1000,
"From": 3, "From": 3,
"Where": [], "Where": [],
"Order": "", "Order": "",
@ -6622,34 +6572,34 @@
"RevisiCondition": "", "RevisiCondition": "",
"RevisiParams": [] "RevisiParams": []
}, },
{
"Id": 244006131,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
1100
],
"FollowSK": [
244006132
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{ {
"Id": 244006132, "Id": 244006132,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
600
],
"FollowSK": [
244006135
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 244006135,
"EmitPR": 1000,
"From": 3, "From": 3,
"Where": [], "Where": [],
"Order": "", "Order": "",
@ -6672,34 +6622,34 @@
"RevisiCondition": "", "RevisiCondition": "",
"RevisiParams": [] "RevisiParams": []
}, },
{
"Id": 244006141,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
1150
],
"FollowSK": [
244006142
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{ {
"Id": 244006142, "Id": 244006142,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
650
],
"FollowSK": [
244006145
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 244006145,
"EmitPR": 1000,
"From": 3, "From": 3,
"Where": [], "Where": [],
"Order": "", "Order": "",
@ -6722,34 +6672,34 @@
"RevisiCondition": "", "RevisiCondition": "",
"RevisiParams": [] "RevisiParams": []
}, },
{
"Id": 244006151,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
1200
],
"FollowSK": [
244006152
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{ {
"Id": 244006152, "Id": 244006152,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
700
],
"FollowSK": [
244006155
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 244006155,
"EmitPR": 1000,
"From": 3, "From": 3,
"Where": [], "Where": [],
"Order": "", "Order": "",
@ -6773,7 +6723,7 @@
"RevisiParams": [] "RevisiParams": []
}, },
{ {
"Id": 244006162, "Id": 244006161,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 4,
"Where": [], "Where": [],
@ -6784,10 +6734,10 @@
"Argu": [ "Argu": [
1, 1,
4, 4,
800 1250
], ],
"FollowSK": [ "FollowSK": [
244006165 244006162
], ],
"SucFollowSK": [], "SucFollowSK": [],
"FailFollowSK": [], "FailFollowSK": [],
@ -6798,7 +6748,7 @@
"RevisiParams": [] "RevisiParams": []
}, },
{ {
"Id": 244006165, "Id": 244006162,
"EmitPR": 1000, "EmitPR": 1000,
"From": 3, "From": 3,
"Where": [], "Where": [],
@ -9964,7 +9914,7 @@
"Type": 2, "Type": 2,
"Argu": [ "Argu": [
414007211, 414007211,
6, -1,
1 1
], ],
"FollowSK": [], "FollowSK": [],
@ -14365,7 +14315,7 @@
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
"ExecuteCnt": 2, "ExecuteCnt": 3,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
1, 1,
@ -28795,18 +28745,42 @@
"RevisiParams": [] "RevisiParams": []
}, },
{ {
"Id": 211021111, "Id": 211021011,
"EmitPR": 1000, "EmitPR": 1000,
"From": 2, "From": 3,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 1, "Type": 3,
"Argu": [ "Argu": [
390001116,
1000,
1, 1,
4, -1
1000 ],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 211021111,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
411021111,
-1,
1
], ],
"FollowSK": [ "FollowSK": [
211021112 211021112
@ -28822,6 +28796,55 @@
{ {
"Id": 211021112, "Id": 211021112,
"EmitPR": 1000, "EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001116,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 211021113,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
1000
],
"FollowSK": [
211021114
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 211021114,
"EmitPR": 1000,
"From": 2, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
@ -28881,7 +28904,7 @@
390001105, 390001105,
1000, 1000,
1, 1,
2 1
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],

53
bin/json/game_skillatk.json
View File

@ -2610,7 +2610,9 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
66 225001331,
225001312,
225001313
] ]
}, },
"Desc": { "Desc": {
@ -4518,8 +4520,7 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
244006112, 244006111
244006113
] ]
}, },
"Desc": { "Desc": {
@ -4547,8 +4548,7 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
244006122, 244006121
244006113
] ]
}, },
"Desc": { "Desc": {
@ -4576,8 +4576,7 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
244006132, 244006131
244006113
] ]
}, },
"Desc": { "Desc": {
@ -4605,8 +4604,7 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
244006142, 244006141
244006113
] ]
}, },
"Desc": { "Desc": {
@ -4634,8 +4632,7 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
244006152, 244006151
244006113
] ]
}, },
"Desc": { "Desc": {
@ -4663,8 +4660,7 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
244006162, 244006161
244006113
] ]
}, },
"Desc": { "Desc": {
@ -15201,6 +15197,34 @@
"buffid": [], "buffid": [],
"map": "" "map": ""
}, },
{
"id": 111021011,
"level": 1,
"MaxLV": 1,
"UnavailablePlayTypes": [],
"Name": {
"key": "skillname_111021011",
"text": "友方无法受到控制"
},
"ico": "jn_dzj_0021",
"CorrectPos": 0,
"IsMelee": 0,
"act": "",
"Type": 3,
"CD": 0,
"Target": 1,
"ChildSkill": {
"Id": [
211021011
]
},
"Desc": {
"key": "skill_1110210111",
"text": "友方无法受到控制"
},
"buffid": [],
"map": ""
},
{ {
"id": 111021111, "id": 111021111,
"level": 1, "level": 1,
@ -15219,7 +15243,8 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
211021111 211021111,
211021113
] ]
}, },
"Desc": { "Desc": {

10
bin/json/game_skillbuff.json
View File

@ -397,7 +397,7 @@
"key": "skill_buffdes_390001104", "key": "skill_buffdes_390001104",
"text": "生命最低降为1" "text": "生命最低降为1"
}, },
"BuffType": 13, "BuffType": 33,
"EffectArgu": [ "EffectArgu": [
1 1
], ],
@ -458,8 +458,8 @@
"OverlayTimes": 1, "OverlayTimes": 1,
"SameID": false, "SameID": false,
"buffIcon": "ty_zd_buff_j008", "buffIcon": "ty_zd_buff_j008",
"buffeffect": "", "buffeffect": "effect_jiaoxia_jiaobing\u00A0",
"buffpos": "infopos" "buffpos": "脚底"
}, },
{ {
"Id": 390001107, "Id": 390001107,
@ -606,7 +606,7 @@
"OverlayTimes": 1, "OverlayTimes": 1,
"SameID": false, "SameID": false,
"buffIcon": "ty_zd_buff_z010", "buffIcon": "ty_zd_buff_z010",
"buffeffect": "", "buffeffect": "effect_hudun_1",
"buffpos": "infopos" "buffpos": "infopos"
}, },
{ {
@ -691,7 +691,7 @@
"key": "skill_buffdes_390001116", "key": "skill_buffdes_390001116",
"text": "无法被附加任何控制效果" "text": "无法被附加任何控制效果"
}, },
"BuffType": 0, "BuffType": 37,
"EffectArgu": [], "EffectArgu": [],
"BufParNum": 1, "BufParNum": 1,
"RelyCheckArgu": [], "RelyCheckArgu": [],

16
bin/json/game_skillpassive.json
View File

@ -2340,5 +2340,21 @@
"Callback": [ "Callback": [
200001902 200001902
] ]
},
{
"Id": 411021111,
"When": 2,
"FromCheck": "Target=3",
"TargetCheck": "Target=3",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": [
211021112
]
} }
] ]

54
modules/practice/api_npcdialog.go
View File

@ -3,8 +3,6 @@ package practice
import ( import (
"go_dreamfactory/comm" "go_dreamfactory/comm"
"go_dreamfactory/pb" "go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs"
) )
//参数校验 //参数校验
@ -15,32 +13,32 @@ func (this *apiComp) NPCDialogCheck(session comm.IUserSession, req *pb.PracticeN
///npc 领取对白奖励 ///npc 领取对白奖励
func (this *apiComp) NPCDialog(session comm.IUserSession, req *pb.PracticeNPCDialogReq) (code pb.ErrorCode, data *pb.ErrorData) { func (this *apiComp) NPCDialog(session comm.IUserSession, req *pb.PracticeNPCDialogReq) (code pb.ErrorCode, data *pb.ErrorData) {
var ( // var (
err error // err error
room *pb.DBPracticeRoom // room *pb.DBPracticeRoom
conf *cfg.GameDispatch_BattleData // conf *cfg.GameDispatch_BattleData
) // )
if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { // if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError // code = pb.ErrorCode_DBError
return // return
} // }
if room.Npcstate != 2 { // if room.Npcstate != 2 {
code = pb.ErrorCode_ReqParameterError // code = pb.ErrorCode_ReqParameterError
return // return
} // }
if conf, err = this.module.configure.getDispatchBattleData(room.Currnpc); err != nil { // if conf, err = this.module.configure.getDispatchBattleData(room.Currnpc); err != nil {
code = pb.ErrorCode_ConfigNoFound // code = pb.ErrorCode_ConfigNoFound
return // return
} // }
if code = this.module.DispenseRes(session, conf.StoryAward, true); code != pb.ErrorCode_Success { // if code = this.module.DispenseRes(session, conf.StoryAward, true); code != pb.ErrorCode_Success {
return // return
} // }
room.Npcstate = 3 // room.Npcstate = 3
room.Refresh = configure.Now().Unix() // room.Refresh = configure.Now().Unix()
this.module.modelPandata.Change(session.GetUserId(), map[string]interface{}{ // this.module.modelPandata.Change(session.GetUserId(), map[string]interface{}{
"npcstate": room.Npcstate, // "npcstate": room.Npcstate,
"refresh": room.Refresh, // "refresh": room.Refresh,
}) // })
session.SendMsg(string(this.module.GetType()), "npcdialog", &pb.PracticeNPCDialogResp{Issucc: true}) session.SendMsg(string(this.module.GetType()), "npcdialog", &pb.PracticeNPCDialogResp{Issucc: true})
return return
} }

271
pb/troll_db.pb.go
View File

@ -300,6 +300,180 @@ func (x *DBTrollRecord) GetTime() int64 {
return 0 return 0
} }
type DBGoods struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
Period int32 `protobuf:"varint,2,opt,name=period,proto3" json:"period"` // 变动周期
CurPeriod int32 `protobuf:"varint,3,opt,name=curPeriod,proto3" json:"curPeriod"` // 当前变动周期
Weight int32 `protobuf:"varint,4,opt,name=weight,proto3" json:"weight"` // 周期权重
Price int32 `protobuf:"varint,5,opt,name=price,proto3" json:"price"` // 当前价格
Time int32 `protobuf:"varint,6,opt,name=time,proto3" json:"time"` // 刷新时间
}
func (x *DBGoods) Reset() {
*x = DBGoods{}
if protoimpl.UnsafeEnabled {
mi := &file_troll_troll_db_proto_msgTypes[2]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *DBGoods) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*DBGoods) ProtoMessage() {}
func (x *DBGoods) ProtoReflect() protoreflect.Message {
mi := &file_troll_troll_db_proto_msgTypes[2]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use DBGoods.ProtoReflect.Descriptor instead.
func (*DBGoods) Descriptor() ([]byte, []int) {
return file_troll_troll_db_proto_rawDescGZIP(), []int{2}
}
func (x *DBGoods) GetId() string {
if x != nil {
return x.Id
}
return ""
}
func (x *DBGoods) GetPeriod() int32 {
if x != nil {
return x.Period
}
return 0
}
func (x *DBGoods) GetCurPeriod() int32 {
if x != nil {
return x.CurPeriod
}
return 0
}
func (x *DBGoods) GetWeight() int32 {
if x != nil {
return x.Weight
}
return 0
}
func (x *DBGoods) GetPrice() int32 {
if x != nil {
return x.Price
}
return 0
}
func (x *DBGoods) GetTime() int32 {
if x != nil {
return x.Time
}
return 0
}
type DBTroll struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
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
UseCount int32 `protobuf:"varint,3,opt,name=useCount,proto3" json:"useCount"` // 当前背包使用的数量
Items map[int32]int32 `protobuf:"bytes,4,rep,name=items,proto3" json:"items" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 背包数据
Goods map[int32]*DBGoods `protobuf:"bytes,5,rep,name=goods,proto3" json:"goods" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 货物 key 货物ID
Lv int32 `protobuf:"varint,6,opt,name=lv,proto3" json:"lv"` // 商队等级
}
func (x *DBTroll) Reset() {
*x = DBTroll{}
if protoimpl.UnsafeEnabled {
mi := &file_troll_troll_db_proto_msgTypes[3]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *DBTroll) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*DBTroll) ProtoMessage() {}
func (x *DBTroll) ProtoReflect() protoreflect.Message {
mi := &file_troll_troll_db_proto_msgTypes[3]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use DBTroll.ProtoReflect.Descriptor instead.
func (*DBTroll) Descriptor() ([]byte, []int) {
return file_troll_troll_db_proto_rawDescGZIP(), []int{3}
}
func (x *DBTroll) GetId() string {
if x != nil {
return x.Id
}
return ""
}
func (x *DBTroll) GetUid() string {
if x != nil {
return x.Uid
}
return ""
}
func (x *DBTroll) GetUseCount() int32 {
if x != nil {
return x.UseCount
}
return 0
}
func (x *DBTroll) GetItems() map[int32]int32 {
if x != nil {
return x.Items
}
return nil
}
func (x *DBTroll) GetGoods() map[int32]*DBGoods {
if x != nil {
return x.Goods
}
return nil
}
func (x *DBTroll) GetLv() int32 {
if x != nil {
return x.Lv
}
return 0
}
var File_troll_troll_db_proto protoreflect.FileDescriptor var File_troll_troll_db_proto protoreflect.FileDescriptor
var file_troll_troll_db_proto_rawDesc = []byte{ var file_troll_troll_db_proto_rawDesc = []byte{
@ -370,8 +544,36 @@ var file_troll_troll_db_proto_rawDesc = []byte{
0x0a, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x67, 0x6f, 0x0a, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x67, 0x6f,
0x6c, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x6c, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
0x03, 0x70, 0x6f, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x03, 0x70, 0x6f, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01,
0x28, 0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x28, 0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x91, 0x01, 0x0a, 0x07, 0x44, 0x42, 0x47,
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x6f, 0x6f, 0x64, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x18, 0x02,
0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x12, 0x1c, 0x0a, 0x09,
0x63, 0x75, 0x72, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
0x09, 0x63, 0x75, 0x72, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x65,
0x69, 0x67, 0x68, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x77, 0x65, 0x69, 0x67,
0x68, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
0x05, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65,
0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x22, 0xab, 0x02, 0x0a,
0x07, 0x44, 0x42, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73,
0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x75, 0x73,
0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x29, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18,
0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x2e,
0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d,
0x73, 0x12, 0x29, 0x0a, 0x05, 0x67, 0x6f, 0x6f, 0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b,
0x32, 0x13, 0x2e, 0x44, 0x42, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x2e, 0x47, 0x6f, 0x6f, 0x64, 0x73,
0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x67, 0x6f, 0x6f, 0x64, 0x73, 0x12, 0x0e, 0x0a, 0x02,
0x6c, 0x76, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x1a, 0x38, 0x0a, 0x0a,
0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c,
0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42, 0x0a, 0x0a, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x45,
0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x52,
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -386,27 +588,34 @@ func file_troll_troll_db_proto_rawDescGZIP() []byte {
return file_troll_troll_db_proto_rawDescData return file_troll_troll_db_proto_rawDescData
} }
var file_troll_troll_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7) var file_troll_troll_db_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
var file_troll_troll_db_proto_goTypes = []interface{}{ var file_troll_troll_db_proto_goTypes = []interface{}{
(*DBTrollTrain)(nil), // 0: DBTrollTrain (*DBTrollTrain)(nil), // 0: DBTrollTrain
(*DBTrollRecord)(nil), // 1: DBTrollRecord (*DBTrollRecord)(nil), // 1: DBTrollRecord
nil, // 2: DBTrollTrain.ItemsEntry (*DBGoods)(nil), // 2: DBGoods
nil, // 3: DBTrollTrain.PriceEntry (*DBTroll)(nil), // 3: DBTroll
nil, // 4: DBTrollTrain.NpcRewardEntry nil, // 4: DBTrollTrain.ItemsEntry
nil, // 5: DBTrollTrain.ShopEntry nil, // 5: DBTrollTrain.PriceEntry
nil, // 6: DBTrollTrain.SurpriseIDEntry nil, // 6: DBTrollTrain.NpcRewardEntry
nil, // 7: DBTrollTrain.ShopEntry
nil, // 8: DBTrollTrain.SurpriseIDEntry
nil, // 9: DBTroll.ItemsEntry
nil, // 10: DBTroll.GoodsEntry
} }
var file_troll_troll_db_proto_depIdxs = []int32{ var file_troll_troll_db_proto_depIdxs = []int32{
2, // 0: DBTrollTrain.items:type_name -> DBTrollTrain.ItemsEntry 4, // 0: DBTrollTrain.items:type_name -> DBTrollTrain.ItemsEntry
3, // 1: DBTrollTrain.price:type_name -> DBTrollTrain.PriceEntry 5, // 1: DBTrollTrain.price:type_name -> DBTrollTrain.PriceEntry
4, // 2: DBTrollTrain.npcReward:type_name -> DBTrollTrain.NpcRewardEntry 6, // 2: DBTrollTrain.npcReward:type_name -> DBTrollTrain.NpcRewardEntry
5, // 3: DBTrollTrain.shop:type_name -> DBTrollTrain.ShopEntry 7, // 3: DBTrollTrain.shop:type_name -> DBTrollTrain.ShopEntry
6, // 4: DBTrollTrain.surpriseID:type_name -> DBTrollTrain.SurpriseIDEntry 8, // 4: DBTrollTrain.surpriseID:type_name -> DBTrollTrain.SurpriseIDEntry
5, // [5:5] is the sub-list for method output_type 9, // 5: DBTroll.items:type_name -> DBTroll.ItemsEntry
5, // [5:5] is the sub-list for method input_type 10, // 6: DBTroll.goods:type_name -> DBTroll.GoodsEntry
5, // [5:5] is the sub-list for extension type_name 2, // 7: DBTroll.GoodsEntry.value:type_name -> DBGoods
5, // [5:5] is the sub-list for extension extendee 8, // [8:8] is the sub-list for method output_type
0, // [0:5] is the sub-list for field type_name 8, // [8:8] is the sub-list for method input_type
8, // [8:8] is the sub-list for extension type_name
8, // [8:8] is the sub-list for extension extendee
0, // [0:8] is the sub-list for field type_name
} }
func init() { file_troll_troll_db_proto_init() } func init() { file_troll_troll_db_proto_init() }
@ -439,6 +648,30 @@ func file_troll_troll_db_proto_init() {
return nil return nil
} }
} }
file_troll_troll_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBGoods); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_troll_troll_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBTroll); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
} }
type x struct{} type x struct{}
out := protoimpl.TypeBuilder{ out := protoimpl.TypeBuilder{
@ -446,7 +679,7 @@ func file_troll_troll_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(), GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_troll_troll_db_proto_rawDesc, RawDescriptor: file_troll_troll_db_proto_rawDesc,
NumEnums: 0, NumEnums: 0,
NumMessages: 7, NumMessages: 11,
NumExtensions: 0, NumExtensions: 0,
NumServices: 0, NumServices: 0,
}, },

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

@ -16,6 +16,7 @@ type GameBattleReadyData struct {
HeroCount int32 HeroCount int32
ReadyScene string ReadyScene string
BattleScenes []string BattleScenes []string
DisableAiCamera int32
DefaultHero int32 DefaultHero int32
DisableHero []string DisableHero []string
LockSlots []int32 LockSlots []int32
@ -49,6 +50,7 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro
} }
} }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["disableAiCamera"].(float64); !_ok_ { err = errors.New("disableAiCamera error"); return }; _v.DisableAiCamera = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DefaultHero"].(float64); !_ok_ { err = errors.New("DefaultHero error"); return }; _v.DefaultHero = int32(_tempNum_) } { var _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{}

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

@ -22,7 +22,6 @@ type GameDispatch_BattleData struct {
BattleReadyID int32 BattleReadyID int32
EventList []int32 EventList []int32
Award []*Gameatn Award []*Gameatn
StoryAward []*Gameatn
Onlookers []string Onlookers []string
ChallengeOnlookers []string ChallengeOnlookers []string
Onlookersstory []int32 Onlookersstory []int32
@ -72,20 +71,6 @@ func (_v *GameDispatch_BattleData)Deserialize(_buf map[string]interface{}) (err
} }
} }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["story_award"].([]interface{}); !_ok_ { err = errors.New("story_award error"); return }
_v.StoryAward = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.StoryAward = append(_v.StoryAward, _list_v_)
}
}
{ {
var _arr_ []interface{} var _arr_ []interface{}
var _ok_ bool var _ok_ bool

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

@ -15,7 +15,7 @@ type GameDrawCardData struct {
RecruitmentType int32 RecruitmentType int32
CardPoolType string CardPoolType string
Star int32 Star int32
Race int32 Rece int32
Id string Id string
Weight int32 Weight int32
} }
@ -31,7 +31,7 @@ func (_v *GameDrawCardData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["recruitment_type"].(float64); !_ok_ { err = errors.New("recruitment_type error"); return }; _v.RecruitmentType = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["recruitment_type"].(float64); !_ok_ { err = errors.New("recruitment_type error"); return }; _v.RecruitmentType = int32(_tempNum_) }
{ var _ok_ bool; if _v.CardPoolType, _ok_ = _buf["card_pool_type"].(string); !_ok_ { err = errors.New("card_pool_type error"); return } } { var _ok_ bool; if _v.CardPoolType, _ok_ = _buf["card_pool_type"].(string); !_ok_ { err = errors.New("card_pool_type error"); return } }
{ 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["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["race"].(float64); !_ok_ { err = errors.New("race error"); return }; _v.Race = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rece"].(float64); !_ok_ { err = errors.New("rece error"); return }; _v.Rece = int32(_tempNum_) }
{ var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } } { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["weight"].(float64); !_ok_ { err = errors.New("weight error"); return }; _v.Weight = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["weight"].(float64); !_ok_ { err = errors.New("weight error"); return }; _v.Weight = int32(_tempNum_) }
return return

18
sys/configure/structs/game.globalData.go
View File

@ -203,6 +203,15 @@ type GameGlobalData struct {
DailyNum int32 DailyNum int32
WeekNum int32 WeekNum int32
FitnessModelId string FitnessModelId string
BusinessTicket int32
BusinessMoney *Gameatn
BusinessMoneynum int32
BusinessMinintReward *Gameatn
BusinessMaxintReward *Gameatn
BusinessMaxint int32
BusinessBag int32
BusinessRewardday int32
BusinessRenovatething int32
} }
const TypeId_GameGlobalData = 477542761 const TypeId_GameGlobalData = 477542761
@ -820,6 +829,15 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Daily_Num"].(float64); !_ok_ { err = errors.New("Daily_Num error"); return }; _v.DailyNum = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Daily_Num"].(float64); !_ok_ { err = errors.New("Daily_Num error"); return }; _v.DailyNum = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Week_Num"].(float64); !_ok_ { err = errors.New("Week_Num error"); return }; _v.WeekNum = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Week_Num"].(float64); !_ok_ { err = errors.New("Week_Num error"); return }; _v.WeekNum = int32(_tempNum_) }
{ var _ok_ bool; if _v.FitnessModelId, _ok_ = _buf["fitnessModelId"].(string); !_ok_ { err = errors.New("fitnessModelId error"); return } } { var _ok_ bool; if _v.FitnessModelId, _ok_ = _buf["fitnessModelId"].(string); !_ok_ { err = errors.New("fitnessModelId error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_ticket"].(float64); !_ok_ { err = errors.New("business_ticket error"); return }; _v.BusinessTicket = int32(_tempNum_) }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["business_money"].(map[string]interface{}); !_ok_ { err = errors.New("business_money error"); return }; if _v.BusinessMoney, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_moneynum"].(float64); !_ok_ { err = errors.New("business_moneynum error"); return }; _v.BusinessMoneynum = int32(_tempNum_) }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["business_minint_reward"].(map[string]interface{}); !_ok_ { err = errors.New("business_minint_reward error"); return }; if _v.BusinessMinintReward, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["business_maxint_reward"].(map[string]interface{}); !_ok_ { err = errors.New("business_maxint_reward error"); return }; if _v.BusinessMaxintReward, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_maxint"].(float64); !_ok_ { err = errors.New("business_maxint error"); return }; _v.BusinessMaxint = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_bag"].(float64); !_ok_ { err = errors.New("business_bag error"); return }; _v.BusinessBag = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_rewardday"].(float64); !_ok_ { err = errors.New("business_rewardday error"); return }; _v.BusinessRewardday = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_renovatething"].(float64); !_ok_ { err = errors.New("business_renovatething error"); return }; _v.BusinessRenovatething = int32(_tempNum_) }
return return
} }