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

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

Browse Source
This commit is contained in:
liwei1dao 2023-03-30 14:16:25 +08:00
commit 1d8fe7be12
25 changed files with 683 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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": 110, "tasktime": 140,
"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": 110, "tasktime": 169,
"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": 102, "tasktime": 172,
"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": 180, "tasktime": 118,
"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": 80, "tasktime": 100,
"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": 174, "tasktime": 131,
"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": 87, "tasktime": 166,
"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": 133, "tasktime": 119,
"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": 130, "tasktime": 120,
"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": 169, "tasktime": 157,
"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": 105,
"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": 105, "tasktime": 79,
"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": 122, "tasktime": 64,
"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": 148, "tasktime": 177,
"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": 114, "tasktime": 96,
"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": 84, "tasktime": 98,
"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": 64, "tasktime": 133,
"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": 75, "tasktime": 66,
"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": 110, "tasktime": 176,
"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": 100, "tasktime": 85,
"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": 93, "tasktime": 157,
"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": 114, "tasktime": 142,
"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": 121, "tasktime": 178,
"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": 116, "tasktime": 113,
"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": 164, "tasktime": 65,
"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": 147, "tasktime": 163,
"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": 101, "tasktime": 95,
"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": 108, "tasktime": 170,
"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": 139, "tasktime": 80,
"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": 89, "tasktime": 71,
"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": 66, "tasktime": 175,
"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": 62, "tasktime": 142,
"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": 129, "tasktime": 170,
"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": 164, "tasktime": 64,
"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": 68, "tasktime": 159,
"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": 81, "tasktime": 98,
"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": 165, "tasktime": 141,
"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": 164, "tasktime": 130,
"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": 140, "tasktime": 171,
"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": 165, "tasktime": 113,
"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": 98, "tasktime": 95,
"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": 160, "tasktime": 100,
"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": 138, "tasktime": 152,
"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": 132, "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": 117, "tasktime": 105,
"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": 159, "tasktime": 141,
"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": 83, "tasktime": 173,
"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": 119, "tasktime": 167,
"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": 85, "tasktime": 129,
"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": 156, "tasktime": 62,
"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": 145, "tasktime": 142,
"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": 176, "tasktime": 82,
"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": 143, "tasktime": 127,
"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": 82, "tasktime": 73,
"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": 168, "tasktime": 173,
"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": 68, "tasktime": 67,
"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": 113, "tasktime": 179,
"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": 92, "tasktime": 114,
"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": 173, "tasktime": 160,
"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": 99, "tasktime": 123,
"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": 162, "tasktime": 75,
"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": 63, "tasktime": 162,
"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": 164, "tasktime": 122,
"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": 94, "tasktime": 68,
"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": 85, "tasktime": 86,
"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": 105, "tasktime": 180,
"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": 74, "tasktime": 137,
"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": 70, "tasktime": 92,
"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": 83, "tasktime": 71,
"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": 96, "tasktime": 152,
"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": 167, "tasktime": 70,
"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": 138, "tasktime": 105,
"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": 69, "tasktime": 90,
"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": 71, "tasktime": 77,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"

3
bin/json/game_global.json
View File

@ -661,6 +661,7 @@
} }
], ],
"game_make_TunkNum": 5, "game_make_TunkNum": 5,
"pandamas_tiguandiaoxiang_cd": 10 "pandamas_tiguandiaoxiang_cd": 10,
"Max_breakingbad_recipe": 15
} }
] ]

2
bin/json/game_heroexp.json
View File

@ -11,7 +11,7 @@
}, },
{ {
"itemid": "600004", "itemid": "600004",
"exp": 3000, "exp": 30000,
"needgold": 30000 "needgold": 30000
} }
] ]

80
bin/json/game_item.json
View File

@ -10267,7 +10267,7 @@
}, },
"usetype": 13, "usetype": 13,
"color": 1, "color": 1,
"bagtype": 4, "bagtype": 1,
"index": 99, "index": 99,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -10284,9 +10284,9 @@
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10019", "img": "wp_icon_10019",
"ico": "wp_icon_10019", "ico": "pr_ing_sb",
"intr": { "intr": {
"key": "item_intr_132000", "key": "pr_ing_",
"text": "就是垃圾" "text": "就是垃圾"
}, },
"sale": [ "sale": [
@ -10311,7 +10311,7 @@
}, },
"usetype": 13, "usetype": 13,
"color": 3, "color": 3,
"bagtype": 4, "bagtype": 1,
"index": 99, "index": 99,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -10328,9 +10328,9 @@
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10020", "img": "wp_icon_10020",
"ico": "wp_icon_10020", "ico": "pr_ing_bz",
"intr": { "intr": {
"key": "item_intr_132001", "key": "pr_ing_",
"text": "需要面粉和肉" "text": "需要面粉和肉"
}, },
"sale": [ "sale": [
@ -10355,7 +10355,7 @@
}, },
"usetype": 13, "usetype": 13,
"color": 4, "color": 4,
"bagtype": 4, "bagtype": 1,
"index": 1, "index": 1,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -10372,9 +10372,9 @@
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10021", "img": "wp_icon_10021",
"ico": "wp_icon_10021", "ico": "pr_ing_tdnr",
"intr": { "intr": {
"key": "item_intr_132002", "key": "pr_ing_",
"text": "需要土豆和肉" "text": "需要土豆和肉"
}, },
"sale": [ "sale": [
@ -10399,7 +10399,7 @@
}, },
"usetype": 13, "usetype": 13,
"color": 4, "color": 4,
"bagtype": 4, "bagtype": 1,
"index": 2, "index": 2,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -10416,9 +10416,9 @@
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10031", "img": "wp_icon_10031",
"ico": "wp_icon_10031", "ico": "pr_ing_ljcr",
"intr": { "intr": {
"key": "item_intr_132003", "key": "pr_ing_",
"text": "需要青椒和肉" "text": "需要青椒和肉"
}, },
"sale": [ "sale": [
@ -10443,7 +10443,7 @@
}, },
"usetype": 13, "usetype": 13,
"color": 3, "color": 3,
"bagtype": 4, "bagtype": 1,
"index": 3, "index": 3,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -10460,9 +10460,9 @@
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10032", "img": "wp_icon_10032",
"ico": "wp_icon_10032", "ico": "pr_ing_hp",
"intr": { "intr": {
"key": "item_intr_132004", "key": "pr_ing_",
"text": "需要青椒和盐" "text": "需要青椒和盐"
}, },
"sale": [ "sale": [
@ -10487,7 +10487,7 @@
}, },
"usetype": 13, "usetype": 13,
"color": 3, "color": 3,
"bagtype": 4, "bagtype": 1,
"index": 4, "index": 4,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -10504,9 +10504,9 @@
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10033", "img": "wp_icon_10033",
"ico": "wp_icon_10033", "ico": "pr_ing_mt",
"intr": { "intr": {
"key": "item_intr_132005", "key": "pr_ing_",
"text": "需要面粉" "text": "需要面粉"
}, },
"sale": [ "sale": [
@ -10531,7 +10531,7 @@
}, },
"usetype": 13, "usetype": 13,
"color": 3, "color": 3,
"bagtype": 4, "bagtype": 1,
"index": 5, "index": 5,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -10548,9 +10548,9 @@
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10034", "img": "wp_icon_10034",
"ico": "wp_icon_10034", "ico": "pr_ing_gbr",
"intr": { "intr": {
"key": "item_intr_132006", "key": "pr_ing_",
"text": "需要面粉和肉" "text": "需要面粉和肉"
}, },
"sale": [ "sale": [
@ -10575,7 +10575,7 @@
}, },
"usetype": 13, "usetype": 13,
"color": 3, "color": 3,
"bagtype": 4, "bagtype": 1,
"index": 6, "index": 6,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -10592,9 +10592,9 @@
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10031", "img": "wp_icon_10031",
"ico": "wp_icon_10031", "ico": "pr_ing_kr",
"intr": { "intr": {
"key": "item_intr_132007", "key": "pr_ing_",
"text": "需要肉" "text": "需要肉"
}, },
"sale": [ "sale": [
@ -10619,7 +10619,7 @@
}, },
"usetype": 13, "usetype": 13,
"color": 3, "color": 3,
"bagtype": 4, "bagtype": 1,
"index": 7, "index": 7,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -10636,9 +10636,9 @@
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10032", "img": "wp_icon_10032",
"ico": "wp_icon_10032", "ico": "pr_ing_ykr",
"intr": { "intr": {
"key": "item_intr_132008", "key": "pr_ing_",
"text": "需要粗盐和肉" "text": "需要粗盐和肉"
}, },
"sale": [ "sale": [
@ -10663,7 +10663,7 @@
}, },
"usetype": 13, "usetype": 13,
"color": 3, "color": 3,
"bagtype": 4, "bagtype": 1,
"index": 8, "index": 8,
"special_type": 0, "special_type": 0,
"time": 0, "time": 0,
@ -10680,9 +10680,9 @@
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10033", "img": "wp_icon_10033",
"ico": "wp_icon_10033", "ico": "pr_ing_ktd",
"intr": { "intr": {
"key": "item_intr_132009", "key": "pr_ing_",
"text": "需要土豆" "text": "需要土豆"
}, },
"sale": [ "sale": [
@ -10724,9 +10724,9 @@
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10034", "img": "wp_icon_10034",
"ico": "wp_icon_10034", "ico": "pr_ing_td",
"intr": { "intr": {
"key": "item_intr_131001", "key": "pr_ing_",
"text": "就是土豆" "text": "就是土豆"
}, },
"sale": [ "sale": [
@ -10768,9 +10768,9 @@
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10031", "img": "wp_icon_10031",
"ico": "wp_icon_10031", "ico": "pr_ing_y",
"intr": { "intr": {
"key": "item_intr_131002", "key": "pr_ing_",
"text": "就是粗盐" "text": "就是粗盐"
}, },
"sale": [ "sale": [
@ -10812,9 +10812,9 @@
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10032", "img": "wp_icon_10032",
"ico": "wp_icon_10032", "ico": "pr_ing_qj",
"intr": { "intr": {
"key": "item_intr_131003", "key": "pr_ing_",
"text": "就是青椒" "text": "就是青椒"
}, },
"sale": [ "sale": [
@ -10856,9 +10856,9 @@
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10033", "img": "wp_icon_10033",
"ico": "wp_icon_10033", "ico": "pr_ing_mf",
"intr": { "intr": {
"key": "item_intr_131004", "key": "pr_ing_",
"text": "就是面粉" "text": "就是面粉"
}, },
"sale": [ "sale": [
@ -10900,9 +10900,9 @@
"star": 0, "star": 0,
"race": 0, "race": 0,
"img": "wp_icon_10034", "img": "wp_icon_10034",
"ico": "wp_icon_10034", "ico": "pr_ing_r",
"intr": { "intr": {
"key": "item_intr_131005", "key": "pr_ing_",
"text": "就是肉" "text": "就是肉"
}, },
"sale": [ "sale": [

50
bin/json/game_rdtaskcondi.json
View File

@ -1259,6 +1259,54 @@
"data4": 0, "data4": 0,
"data5": 0 "data5": 0
}, },
{
"id": 304,
"type_sp": 1,
"tasktxt": "通关维京远征难度1",
"type": 73,
"valid": 0,
"data1": 1,
"data2": 1001,
"data3": 1,
"data4": 0,
"data5": 10071
},
{
"id": 305,
"type_sp": 1,
"tasktxt": "通关主线1-6",
"type": 61,
"valid": 0,
"data1": 1100106,
"data2": 0,
"data3": 0,
"data4": 0,
"data5": 102
},
{
"id": 306,
"type_sp": 1,
"tasktxt": "进行一次10连",
"type": 14,
"valid": 0,
"data1": 10,
"data2": 0,
"data3": 0,
"data4": 0,
"data5": 101
},
{
"id": 307,
"type_sp": 1,
"tasktxt": "打败梦魇！",
"type": 70,
"valid": 0,
"data1": 1,
"data2": 102,
"data3": 0,
"data4": 0,
"data5": 10101
},
{ {
"id": 10001, "id": 10001,
"type_sp": 0, "type_sp": 0,
@ -4242,7 +4290,7 @@
"type": 20001, "type": 20001,
"valid": 1, "valid": 1,
"data1": 1, "data1": 1,
"data2": 500, "data2": 602,
"data3": 0, "data3": 0,
"data4": 0, "data4": 0,
"data5": 10011 "data5": 10011

169
bin/json/game_rdtasknpc.json
View File

@ -60,7 +60,7 @@
], ],
"event": [ "event": [
2, 2,
500 601
], ],
"goto": 0 "goto": 0
}, },
@ -73,7 +73,7 @@
], ],
"event": [ "event": [
2, 2,
500 602
], ],
"goto": 0 "goto": 0
}, },
@ -86,7 +86,7 @@
], ],
"event": [ "event": [
2, 2,
500 603
], ],
"goto": 0 "goto": 0
}, },
@ -99,7 +99,7 @@
], ],
"event": [ "event": [
2, 2,
500 604
], ],
"goto": 0 "goto": 0
}, },
@ -112,7 +112,7 @@
], ],
"event": [ "event": [
2, 2,
432 605
], ],
"goto": 0 "goto": 0
}, },
@ -125,7 +125,7 @@
], ],
"event": [ "event": [
2, 2,
500 606
], ],
"goto": 0 "goto": 0
}, },
@ -138,7 +138,7 @@
], ],
"event": [ "event": [
2, 2,
500 607
], ],
"goto": 0 "goto": 0
}, },
@ -151,7 +151,7 @@
], ],
"event": [ "event": [
2, 2,
412 608
], ],
"goto": 0 "goto": 0
}, },
@ -164,7 +164,7 @@
], ],
"event": [ "event": [
2, 2,
500 609
], ],
"goto": 0 "goto": 0
}, },
@ -177,7 +177,7 @@
], ],
"event": [ "event": [
2, 2,
500 611
], ],
"goto": 0 "goto": 0
}, },
@ -190,7 +190,7 @@
], ],
"event": [ "event": [
2, 2,
500 612
], ],
"goto": 0 "goto": 0
}, },
@ -203,7 +203,7 @@
], ],
"event": [ "event": [
2, 2,
500 613
], ],
"goto": 0 "goto": 0
}, },
@ -216,7 +216,7 @@
], ],
"event": [ "event": [
2, 2,
500 614
], ],
"goto": 0 "goto": 0
}, },
@ -227,10 +227,153 @@
"20010_熊猫_1", "20010_熊猫_1",
"901" "901"
], ],
"event": [
2,
615
],
"goto": 0
},
{
"id": 10070,
"datas": [
"SmithyScene",
"打造",
"139"
],
"event": [
2,
631
],
"goto": 0
},
{
"id": 10071,
"datas": [
"GameMain",
"功能入口-维京远征",
"901"
],
"event": [ "event": [
2, 2,
500 500
], ],
"goto": 0 "goto": 0
},
{
"id": 10072,
"datas": [
"SmithyScene",
"打造",
"139"
],
"event": [
2,
632
],
"goto": 0
},
{
"id": 10080,
"datas": [
"GameMain",
"20010_骇客蛛_1",
"901"
],
"event": [
2,
636
],
"goto": 0
},
{
"id": 10081,
"datas": [
"GameMain",
"功能入口-主线",
"901"
],
"event": [
10,
166
],
"goto": 0
},
{
"id": 10082,
"datas": [
"GameMain",
"20080_食人鱼_1",
"901"
],
"event": [
2,
637
],
"goto": 0
},
{
"id": 10090,
"datas": [
"GameMain",
"20020_熊猫_2",
"901"
],
"event": [
2,
638
],
"goto": 0
},
{
"id": 10091,
"datas": [
"GameMain",
"功能入口-招募",
"901"
],
"event": [
10,
107
],
"goto": 0
},
{
"id": 10100,
"datas": [
"GameMain",
"20020_熊猫_2",
"901"
],
"event": [
2,
640
],
"goto": 0
},
{
"id": 10101,
"datas": [
"GameMain",
"20100_梦魇_1",
"901"
],
"event": [
2,
500
],
"goto": 0
},
{
"id": 10102,
"datas": [
"GameMain",
"20020_邦尼兔_1",
"901"
],
"event": [
2,
641
],
"goto": 0
} }
] ]

4
bin/json/game_skillafteratk.json
View File

@ -15607,9 +15607,7 @@
1100 1100
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [],
234002112
],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,

3
bin/json/game_skillatk.json
View File

@ -9220,7 +9220,8 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
234002111 234002111,
234002112
] ]
}, },
"Desc": { "Desc": {

4
bin/json/game_skillbuff.json
View File

@ -978,8 +978,8 @@
"OverlayTimes": 1, "OverlayTimes": 1,
"SameID": false, "SameID": false,
"buffIcon": "ty_zd_buff_z004", "buffIcon": "ty_zd_buff_z004",
"buffeffect": "", "buffeffect": "effect_34002_skill_1_hit",
"buffpos": "infopos" "buffpos": "胸"
}, },
{ {
"Id": 390001128, "Id": 390001128,

142
bin/json/game_worldtask.json
View File

@ -178,7 +178,7 @@
"key": 20060, "key": 20060,
"lock": 1, "lock": 1,
"ontxe": 20050, "ontxe": 20050,
"id_after": 0, "id_after": 20070,
"group": 2, "group": 2,
"des": 2, "des": 2,
"icon": "", "icon": "",
@ -208,5 +208,145 @@
} }
], ],
"module": [] "module": []
},
{
"key": 20070,
"lock": 1,
"ontxe": 20060,
"id_after": 20080,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "story_80",
"text": "1"
},
"task_name": {
"key": "story_80",
"text": "1"
},
"task_display": {
"key": "story_80",
"text": "1"
},
"npc": 10070,
"completetask": [
304
],
"deliver_npc": 10072,
"auto_accept": 0,
"reword": [
{
"a": "item",
"t": "110001",
"n": 106
}
],
"module": []
},
{
"key": 20080,
"lock": 1,
"ontxe": 20070,
"id_after": 20090,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "story_80",
"text": "1"
},
"task_name": {
"key": "story_80",
"text": "1"
},
"task_display": {
"key": "story_80",
"text": "1"
},
"npc": 10080,
"completetask": [
305
],
"deliver_npc": 10082,
"auto_accept": 0,
"reword": [
{
"a": "item",
"t": "110001",
"n": 107
}
],
"module": []
},
{
"key": 20090,
"lock": 1,
"ontxe": 20080,
"id_after": 20100,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "story_80",
"text": "1"
},
"task_name": {
"key": "story_80",
"text": "1"
},
"task_display": {
"key": "story_80",
"text": "1"
},
"npc": 10090,
"completetask": [
306
],
"deliver_npc": 0,
"auto_accept": 0,
"reword": [
{
"a": "item",
"t": "110001",
"n": 108
}
],
"module": []
},
{
"key": 20100,
"lock": 1,
"ontxe": 20090,
"id_after": 0,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "story_80",
"text": "1"
},
"task_name": {
"key": "story_80",
"text": "1"
},
"task_display": {
"key": "story_80",
"text": "1"
},
"npc": 10100,
"completetask": [
307
],
"deliver_npc": 10102,
"auto_accept": 1,
"reword": [
{
"a": "item",
"t": "110001",
"n": 109
}
],
"module": []
} }
] ]

4
comm/imodule.go
View File

@ -431,11 +431,11 @@ type (
} }
ISmithy interface { ISmithy interface {
CheckActivateAtlasCollect(uid string, id string) (code pb.ErrorCode) CheckActivateAtlasCollect(uid string, id string)
} }
IPandaAtlas interface { IPandaAtlas interface {
CheckActivatePandaAtlasCollect(uid string, id string) (code pb.ErrorCode) CheckActivatePandaAtlasCollect(uid string, id string)
} }
//练功房 //练功房
IPractice interface { IPractice interface {

58
modules/atlas/module.go
View File

@ -11,6 +11,9 @@ import (
"go_dreamfactory/modules" "go_dreamfactory/modules"
"go_dreamfactory/pb" "go_dreamfactory/pb"
"go_dreamfactory/sys/configure" "go_dreamfactory/sys/configure"
"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/mongo"
) )
type PandaAtlas struct { type PandaAtlas struct {
@ -42,11 +45,55 @@ func (this *PandaAtlas) OnInstallComp() {
this.modelPandaAtlas = this.RegisterComp(new(modelPandaAtlas)).(*modelPandaAtlas) this.modelPandaAtlas = this.RegisterComp(new(modelPandaAtlas)).(*modelPandaAtlas)
} }
func (this *PandaAtlas) CheckActivatePandaAtlasCollect(uid string, id string) (code pb.ErrorCode) { func (this *PandaAtlas) CheckActivatePandaAtlasCollect(uid string, id string) {
list, _ := this.modelPandaAtlas.getPandaAtlasList(uid) conf := this.configure.GetPandoAtlasConf(id)
if _, ok := list.Collect[id]; !ok { if conf != nil {
conf := this.configure.GetPandoAtlasConf(id) return
if conf != nil { }
if this.IsCross() {
atlas := &pb.DBPandaAtlas{}
if model, err := this.GetDBModelByUid(uid, this.modelPandaAtlas.TableName, this.modelPandaAtlas.Expired); err == nil {
if err := model.Get(uid, atlas); err != nil { // 防止数据没有初始化情况
if mongo.ErrNoDocuments == err {
atlas.Id = primitive.NewObjectID().Hex()
atlas.Uid = uid
atlas.Collect = make(map[string]*pb.CollectInfo, 0)
atlas.Award = 1 // 初始1级
atlas.Collect[id] = &pb.CollectInfo{
Score: conf.AtlasScore,
Time: configure.Now().Unix(),
Activate: false,
}
update := make(map[string]interface{}, 0)
update["collect"] = atlas.Collect
if err := model.Add(uid, update); err != nil {
this.Errorf("err:%v", err)
}
return
} else {
this.Errorf("err:%v", err)
return
}
}
if _, ok := atlas.Collect[id]; !ok {
atlas.Collect[id] = &pb.CollectInfo{
Score: conf.AtlasScore,
Time: configure.Now().Unix(),
Activate: false,
}
update := make(map[string]interface{}, 0)
update["collect"] = atlas.Collect
if err := model.Change(uid, update); err != nil {
this.Errorf("err:%v", err)
return
}
}
}
} else { // 本服
list, _ := this.modelPandaAtlas.getPandaAtlasList(uid)
if _, ok := list.Collect[id]; !ok {
list.Collect[id] = &pb.CollectInfo{ list.Collect[id] = &pb.CollectInfo{
Score: conf.AtlasScore, Score: conf.AtlasScore,
Time: configure.Now().Unix(), Time: configure.Now().Unix(),
@ -58,7 +105,6 @@ func (this *PandaAtlas) CheckActivatePandaAtlasCollect(uid string, id string) (c
return return
} }
} }
code = pb.ErrorCode_SmithyNoFoundAtlas
return return
} }

113
modules/dispatch/model_dispatch.go
View File

@ -78,57 +78,36 @@ func (this *modelDispatch) getDBDispatch(uid string) (dis *pb.DBDispatch) {
return return
} }
// 获取任务权重数据 // 获取随机任务ID
func (this *modelDispatch) getTasksWeight(uid string, d *pb.DBDispatch) []int32 { func (this *modelDispatch) getTasksWeight(uid string, d *pb.DBDispatch) int32 {
if d == nil { if d == nil {
return []int32{} return 0
} }
if d.Nb == nil { if d.Nb == nil {
return []int32{} return 0
} }
conf, err := this.module.configure.getDispatchLvConf(d.Nb.Lv) conf, err := this.module.configure.getDispatchLvConf(d.Nb.Lv)
if err != nil || conf == nil { if err != nil || conf == nil {
this.module.Error("配置不存在", log.Field{Key: "error", Value: err}) this.module.Error("配置不存在", log.Field{Key: "error", Value: err})
return []int32{} return 0
} }
items := make([]*comm.WeightItem, 0) // 取权重数组下标
for i, v := range conf.Probability { i := comm.GetRandW(conf.Probability)
items = append(items, &comm.WeightItem{Id: (i + 1), Weight: int(v)}) // this.module.Debug("随机下标", log.Field{Key: "idx", Value: i})
} confList, err := this.module.configure.getDispatchTaskConfByType(int32(i + 1))
wr := comm.NewWeightedRandom(items)
//根据权重选出任务类型
var taskType int
if c := wr.Pick(); c != nil {
taskType = c.Id.(int)
}
confList, err := this.module.configure.getDispatchTaskConfByType(int32(taskType))
var tIds []int32 var tIds []int32
if len(d.Nb.Tasks) == 0 { for _, v := range confList {
for _, v := range confList { tIds = append(tIds, v.Id)
if int(v.Type) == taskType {
tIds = append(tIds, v.Id)
}
}
} else {
var existIds []int32
for _, v := range d.Nb.Tasks {
existIds = append(existIds, v.TaskId)
}
for _, v := range confList {
if int(v.Type) == taskType {
if _, ok := utils.Findx(existIds, v.Id); !ok {
tIds = append(tIds, v.Id)
}
}
}
} }
idex := utils.RandomNumbers(0, len(tIds), 1)
return tIds if len(idex) == 0 {
return 0
}
return tIds[idex[0]]
} }
// 随机任务 // 随机任务
@ -137,19 +116,33 @@ func (this *modelDispatch) taskRandom(uid string, dispatch *pb.DBDispatch) (task
dispatch.Nb.Lv = 1 dispatch.Nb.Lv = 1
} }
tIds := this.getTasksWeight(uid, dispatch)
if len(tIds) == 0 {
return
}
//判断随机数量 //判断随机数量
var n int var n int
n = len(dispatch.Nb.Tasks) n = len(dispatch.Nb.Tasks)
var existIds []int32
for _, v := range dispatch.Nb.Tasks {
existIds = append(existIds, v.TaskId)
}
if n == 0 { if n == 0 {
//随机6个任务 //随机6个任务
ids := utils.RandomNumbers(1, len(tIds), 6) total := 0
for _, id := range ids { for total < 6 {
tId := this.getTasksWeight(uid, dispatch)
if tId == 0 {
return
}
//去重
if _, ok := utils.Findx(existIds, int32(tId)); !ok {
existIds = append(existIds, int32(tId))
total++
}
}
for _, id := range existIds {
taskConf, err := this.module.configure.getDispatchTaskConf(int32(id)) taskConf, err := this.module.configure.getDispatchTaskConf(int32(id))
if err != nil { if err != nil {
continue continue
@ -162,13 +155,12 @@ func (this *modelDispatch) taskRandom(uid string, dispatch *pb.DBDispatch) (task
}) })
} }
} else { } else {
tasks = dispatch.Nb.Tasks
var randCount int var randCount int
for i := 0; i < len(tasks); i++ { for i := 0; i < len(dispatch.Nb.Tasks); i++ {
//只随机未接取的任务 //只随机未接取的任务
if tasks[i].Status == 0 { if dispatch.Nb.Tasks[i].Status == 0 {
//删除 //删除
tasks = append(tasks[:i], tasks[i+1:]...) dispatch.Nb.Tasks = append(dispatch.Nb.Tasks[:i], dispatch.Nb.Tasks[i+1:]...)
i-- i--
randCount++ randCount++
} }
@ -185,18 +177,27 @@ func (this *modelDispatch) addRandomTask(uid string, dispatch *pb.DBDispatch, n
tasks = dispatch.Nb.Tasks tasks = dispatch.Nb.Tasks
return return
} }
randomTaskIds := this.getTasksWeight(uid, dispatch)
if len(randomTaskIds) == 0 { var existIds []int32
return nil for _, v := range dispatch.Nb.Tasks {
existIds = append(existIds, v.TaskId)
} }
//追加n条随机任务 total := 0
ids := utils.RandomNumbers(1, len(randomTaskIds), n)
if len(ids) <= 0 { for total < n {
return nil rid := this.getTasksWeight(uid, dispatch)
if rid == 0 {
return nil
}
//去重
if _, ok := utils.Findx(existIds, int32(rid)); !ok {
existIds = append(existIds, int32(rid))
total++
}
} }
for _, id := range ids { for _, id := range existIds {
taskConf, err := this.module.configure.getDispatchTaskConf(int32(id)) taskConf, err := this.module.configure.getDispatchTaskConf(int32(id))
if err != nil { if err != nil {
return nil return nil

2
modules/gourmet/api_createfood.go
View File

@ -81,6 +81,6 @@ func (this *apiComp) CreateFood(session comm.IUserSession, req *pb.GourmetCreate
Cid: curFood, Cid: curFood,
FirstGet: bFirst, FirstGet: bFirst,
}) })
go this.module.ModuleRtask.TriggerTask(session.GetUserId(), comm.GettaskParam(comm.Rtype150, 1))
return return
} }

4
modules/gourmet/comp_configure.go
View File

@ -45,7 +45,9 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
log.Errorf("get game_pagoda conf err:%v", err) log.Errorf("get game_pagoda conf err:%v", err)
return return
}) })
this.SetGrormetCookBookConf()
configure.RegisterConfigure(game_food, cfg.NewGameBreakingbad, this.SetGrormetCookBookConf)
return return
} }

2
modules/hero/api_strengthenUpSkill.go
View File

@ -136,7 +136,7 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt
szTask = append(szTask, comm.GettaskParam(comm.Rtype57, 1)) szTask = append(szTask, comm.GettaskParam(comm.Rtype57, 1))
} }
if cfg := this.module.configure.GetHeroConfig(_hero.HeroID); cfg != nil { if cfg := this.module.configure.GetHeroConfig(_hero.HeroID); cfg != nil {
szTask = append(szTask, comm.GettaskParam(comm.Rtype55, cfg.Color, 1)) szTask = append(szTask, comm.GettaskParam(comm.Rtype55, 1, cfg.Color))
szTask = append(szTask, comm.GettaskParam(comm.Rtype56, 1, 1, cfg.Job)) szTask = append(szTask, comm.GettaskParam(comm.Rtype56, 1, 1, cfg.Job))
} }
go this.module.ModuleRtask.TriggerTask(session.GetUserId(), szTask...) go this.module.ModuleRtask.TriggerTask(session.GetUserId(), szTask...)

4
modules/hunting/api_challengeover.go
View File

@ -108,12 +108,12 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
} }
} }
session.SendMsg(string(this.module.GetType()), HuntingChallengeOverResp, &pb.HuntingChallengeOverResp{Data: hunting}) session.SendMsg(string(this.module.GetType()), HuntingChallengeOverResp, &pb.HuntingChallengeOverResp{Data: hunting})
tasks = append(tasks, comm.GettaskParam(comm.Rtype80, 1, req.Difficulty, req.BossType))
// 随机任务统计 // 随机任务统计
// this.module.ModuleRtask.SendToRtask(session, comm.Rtype81, req.Difficulty, req.BossType) // this.module.ModuleRtask.SendToRtask(session, comm.Rtype81, req.Difficulty, req.BossType)
// this.module.ModuleRtask.SendToRtask(session, comm.Rtype82, req.BossType) // this.module.ModuleRtask.SendToRtask(session, comm.Rtype82, req.BossType)
tasks = append(tasks, comm.GettaskParam(comm.Rtype81, req.Difficulty, req.BossType)) tasks = append(tasks, comm.GettaskParam(comm.Rtype81, req.Difficulty, req.BossType))
tasks = append(tasks, comm.GettaskParam(comm.Rtype82, req.BossType)) tasks = append(tasks, comm.GettaskParam(comm.Rtype82, 1, req.BossType))
// 狩猎副本掉落觉醒材料 // 狩猎副本掉落觉醒材料
for _, v := range reward { for _, v := range reward {
if _conf, err := this.module.configure.GetItemConfigureData(v.T); err == nil { if _conf, err := this.module.configure.GetItemConfigureData(v.T); err == nil {

2
modules/modulebase.go
View File

@ -450,7 +450,7 @@ func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Gameat
} }
if len(atlas) > 0 { if len(atlas) > 0 {
for k := range atlas { for k := range atlas {
code = this.ModuleSmithy.CheckActivateAtlasCollect(session.GetUserId(), k) this.ModuleSmithy.CheckActivateAtlasCollect(session.GetUserId(), k)
this.Debugf("发放图鉴资源: %v [%v]", k, code) this.Debugf("发放图鉴资源: %v [%v]", k, code)
} }
} }

13
modules/rtask/module.go
View File

@ -41,7 +41,7 @@ type ModuleRtask struct {
modelRtaskRecord *ModelRtaskRecord modelRtaskRecord *ModelRtaskRecord
api *apiComp api *apiComp
configure *configureComp configure *configureComp
handleMap sync.Map //map[int32]*rtaskCondi //任务校验处理器 handleMap sync.Map //map[int32]*rtaskCondi //任务校验处理器
} }
func NewModule() core.IModule { func NewModule() core.IModule {
@ -556,21 +556,22 @@ func (this *ModuleRtask) SendToRtask(session comm.IUserSession, rtaskType comm.T
} }
func (this *ModuleRtask) TriggerTask(uid string, taskParams ...*comm.TaskParam) { func (this *ModuleRtask) TriggerTask(uid string, taskParams ...*comm.TaskParam) {
this.Debug("任务处理",
log.Field{Key: "uid", Value: uid},
log.Field{Key: "params", Value: taskParams})
session, ok := this.GetUserSession(uid) session, ok := this.GetUserSession(uid)
if !ok { if !ok {
return return
} }
for _, tp := range taskParams { for _, tp := range taskParams {
if code := this.processOneTask(session, tp.TT, tp.Params...); code != pb.ErrorCode_Success { if code := this.processOneTask(session, tp.TT, tp.Params...); code != pb.ErrorCode_Success {
// this.Debug("任务处理",
// log.Field{Key: "uid", Value: uid},
// log.Field{Key: "taskType", Value: tp.TT},
// log.Field{Key: "params", Value: tp.Params},
// log.Field{Key: "code", Value: code})
} }
session.Push() session.Push()
comm.PuttaskParam(tp) comm.PuttaskParam(tp)
} }
this.PutUserSession(session) this.PutUserSession(session)
return return
} }

6
modules/smithy/api_forgeequip.go
View File

@ -30,6 +30,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
rsp *pb.SmithyForgeEquipResp rsp *pb.SmithyForgeEquipResp
needTemperatureCos int32 // 需要消耗的温度 needTemperatureCos int32 // 需要消耗的温度
maxT int32 maxT int32
atno []*pb.UserAtno
) )
rsp = &pb.SmithyForgeEquipResp{} rsp = &pb.SmithyForgeEquipResp{}
update = make(map[string]interface{}) update = make(map[string]interface{})
@ -189,7 +190,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
res := this.module.configure.GetDropReward(newdrop) res := this.module.configure.GetDropReward(newdrop)
// 检查是否命中双倍打造 // 检查是否命中双倍打造
if ok := this.module.modelStove.CheckForgetwoEquip(req.ReelId, stove.Data[req.ReelId].Lv, addProbability); ok { if ok := this.module.modelStove.CheckForgetwoEquip(req.ReelId, stove.Data[req.ReelId].Lv, addProbability); ok {
if err, atno := this.module.DispenseAtno(session, res, true); err == pb.ErrorCode_Success { if code, atno = this.module.DispenseAtno(session, res, true); code == pb.ErrorCode_Success {
for _, v := range atno { for _, v := range atno {
if eq, err1 := this.module.ModuleEquipment.QueryEquipment(session.GetUserId(), v.O); err1 == pb.ErrorCode_Success { if eq, err1 := this.module.ModuleEquipment.QueryEquipment(session.GetUserId(), v.O); err1 == pb.ErrorCode_Success {
rsp.Equip = append(rsp.Equip, eq) rsp.Equip = append(rsp.Equip, eq)
@ -197,7 +198,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
} }
} }
} }
if err, atno := this.module.DispenseAtno(session, res, true); err == pb.ErrorCode_Success { if code, atno = this.module.DispenseAtno(session, res, true); code == pb.ErrorCode_Success {
for _, v := range atno { for _, v := range atno {
if eq, err1 := this.module.ModuleEquipment.QueryEquipment(session.GetUserId(), v.O); err1 == pb.ErrorCode_Success { if eq, err1 := this.module.ModuleEquipment.QueryEquipment(session.GetUserId(), v.O); err1 == pb.ErrorCode_Success {
rsp.Equip = append(rsp.Equip, eq) rsp.Equip = append(rsp.Equip, eq)
@ -252,5 +253,6 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
}(v.CId, equipConf.Star, int32(len(v.AdverbEntry)+1)) // 品质按副词条数+1 来算 }(v.CId, equipConf.Star, int32(len(v.AdverbEntry)+1)) // 品质按副词条数+1 来算
} }
} }
this.module.SendRdTask(session, atno)
return return
} }

22
modules/smithy/model_atlas.go
View File

@ -121,25 +121,3 @@ func (this *modelAtlas) CheckActivateAtlas(uid string, id string, lv int32, qual
} }
return true return true
} }
// 检查是否激活收藏品
func (this *modelAtlas) CheckActivateAtlasCollect(uid string, id string) {
atlasConf := this.module.configure.GetSmithyAtlasConf(id)
if atlasConf != nil && atlasConf.TypeId == 2 {
if list, err := this.module.modelAtlas.getSmithyAtlasList(uid); err == nil {
if _, ok := list.Collect[id]; !ok {
list.Collect[id] = &pb.CollectData{
Id: id,
Score: atlasConf.AtlasScore,
Time: configure.Now().Unix(),
}
list.Score += atlasConf.AtlasScore
update := make(map[string]interface{}, 0)
update["collect"] = list.Collect
update["score"] = list.Score
this.module.modelAtlas.modifySmithyAtlasList(uid, update) // 更新分数信息
}
}
}
}

66
modules/smithy/module.go
View File

@ -11,6 +11,9 @@ import (
"go_dreamfactory/modules" "go_dreamfactory/modules"
"go_dreamfactory/pb" "go_dreamfactory/pb"
"go_dreamfactory/sys/configure" "go_dreamfactory/sys/configure"
"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/mongo"
) )
type Smithy struct { type Smithy struct {
@ -47,9 +50,58 @@ func (this *Smithy) OnInstallComp() {
this.modelTask = this.RegisterComp(new(modelTask)).(*modelTask) this.modelTask = this.RegisterComp(new(modelTask)).(*modelTask)
} }
func (this *Smithy) CheckActivateAtlasCollect(uid string, id string) (code pb.ErrorCode) { func (this *Smithy) CheckActivateAtlasCollect(uid string, id string) {
atlasConf := this.configure.GetSmithyAtlasConf(id) atlasConf := this.configure.GetSmithyAtlasConf(id)
if atlasConf != nil && atlasConf.TypeId == 2 { //类型为2表示特殊类型图鉴 if atlasConf == nil || atlasConf.TypeId != 2 {
return
}
if this.IsCross() {
atlas := &pb.DBAtlas{}
if model, err := this.GetDBModelByUid(uid, this.modelAtlas.TableName, this.modelAtlas.Expired); err == nil {
if err := model.Get(uid, atlas); err != nil { // 防止数据没有初始化情况
if mongo.ErrNoDocuments == err {
atlas.Id = primitive.NewObjectID().Hex()
atlas.Uid = uid
atlas.Atlas = make(map[string]*pb.ForgeList, 0)
atlas.Collect = make(map[string]*pb.CollectData, 0)
atlas.Award = 1 // 初始1级
atlas.Collect[id] = &pb.CollectData{
Id: id,
Score: atlasConf.AtlasScore,
Time: configure.Now().Unix(),
Activate: false,
}
update := make(map[string]interface{}, 0)
update["collect"] = atlas.Collect
if err := model.Add(uid, update); err != nil {
this.Errorf("err:%v", err)
}
return
} else {
this.Errorf("err:%v", err)
return
}
}
if _, ok := atlas.Collect[id]; !ok {
atlas.Collect[id] = &pb.CollectData{
Id: id,
Score: atlasConf.AtlasScore,
Time: configure.Now().Unix(),
Activate: false,
}
update := make(map[string]interface{}, 0)
update["collect"] = atlas.Collect
if err := model.Change(uid, update); err != nil {
this.Errorf("err:%v", err)
return
}
}
}
} else {
if list, err := this.modelAtlas.getSmithyAtlasList(uid); err == nil { if list, err := this.modelAtlas.getSmithyAtlasList(uid); err == nil {
if _, ok := list.Collect[id]; !ok { if _, ok := list.Collect[id]; !ok {
list.Collect[id] = &pb.CollectData{ list.Collect[id] = &pb.CollectData{
@ -58,20 +110,17 @@ func (this *Smithy) CheckActivateAtlasCollect(uid string, id string) (code pb.Er
Time: configure.Now().Unix(), Time: configure.Now().Unix(),
Activate: false, Activate: false,
} }
//list.Score += atlasConf.AtlasScore
update := make(map[string]interface{}, 0) update := make(map[string]interface{}, 0)
update["collect"] = list.Collect update["collect"] = list.Collect
//update["score"] = list.Score
this.modelAtlas.modifySmithyAtlasList(uid, update) // 更新信息 this.modelAtlas.modifySmithyAtlasList(uid, update) // 更新信息
return return
} }
} }
} }
code = pb.ErrorCode_SmithyNoFoundAtlas
return return
} }
func (this *Smithy) SendRdTask(session comm.IUserSession, Items []*pb.UserAssets) { func (this *Smithy) SendRdTask(session comm.IUserSession, Items []*pb.UserAtno) {
var equip map[int32]int32 // key xingji value 数量 var equip map[int32]int32 // key xingji value 数量
equip = make(map[int32]int32, 0) equip = make(map[int32]int32, 0)
tasks := make([]*comm.TaskParam, 0) tasks := make([]*comm.TaskParam, 0)
@ -82,8 +131,9 @@ func (this *Smithy) SendRdTask(session comm.IUserSession, Items []*pb.UserAssets
} }
for k, v := range equip { for k, v := range equip {
tasks = append(tasks, comm.GettaskParam(comm.Rtype51, v, k)) tasks = append(tasks, comm.GettaskParam(comm.Rtype51, v, k))
// this.ModuleRtask.SendToRtask(session, comm.Rtype51, v, k)
}
// this.ModuleRtask.SendToRtask(session, comm.Rtype148, v, k)
}
tasks = append(tasks, comm.GettaskParam(comm.Rtype148, int32(len(equip))))
go this.ModuleRtask.TriggerTask(session.GetUserId(), tasks...) go this.ModuleRtask.TriggerTask(session.GetUserId(), tasks...)
} }

2
modules/viking/api_challengeover.go
View File

@ -153,7 +153,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
} }
// 随机任务统计 // 随机任务统计
var szTask []*comm.TaskParam var szTask []*comm.TaskParam
szTask = append(szTask, comm.GettaskParam(comm.Rtype73, req.Difficulty, req.BossId, 1)) szTask = append(szTask, comm.GettaskParam(comm.Rtype73, 1, req.Difficulty, req.BossId))
szTask = append(szTask, comm.GettaskParam(comm.Rtype74, req.Difficulty, req.BossId)) szTask = append(szTask, comm.GettaskParam(comm.Rtype74, req.Difficulty, req.BossId))
szTask = append(szTask, comm.GettaskParam(comm.Rtype78, req.Difficulty, req.BossId, req.Report.Costtime)) szTask = append(szTask, comm.GettaskParam(comm.Rtype78, req.Difficulty, req.BossId, req.Report.Costtime))

43
pb/errorcode.pb.go
View File

@ -340,6 +340,7 @@ const (
ErrorCode_SmithyNoActivateAtlas ErrorCode = 4113 // 没有图鉴更新数据 ErrorCode_SmithyNoActivateAtlas ErrorCode = 4113 // 没有图鉴更新数据
ErrorCode_SmithyLvToolsFailed ErrorCode = 4114 // ErrorCode_SmithyLvToolsFailed ErrorCode = 4114 //
ErrorCode_SmithyLvToolsPre ErrorCode = 4115 // 前置条件不足 ErrorCode_SmithyLvToolsPre ErrorCode = 4115 // 前置条件不足
ErrorCode_SmithyAtlasTypeErr ErrorCode = 4116 //图鉴类型错误
// dispatch // dispatch
ErrorCode_DispatchHeroNoReached ErrorCode = 4201 //英雄条件未达标 ErrorCode_DispatchHeroNoReached ErrorCode = 4201 //英雄条件未达标
ErrorCode_DispatchNoFree ErrorCode = 4202 //免费次数用尽 ErrorCode_DispatchNoFree ErrorCode = 4202 //免费次数用尽
@ -643,6 +644,7 @@ var (
4113: "SmithyNoActivateAtlas", 4113: "SmithyNoActivateAtlas",
4114: "SmithyLvToolsFailed", 4114: "SmithyLvToolsFailed",
4115: "SmithyLvToolsPre", 4115: "SmithyLvToolsPre",
4116: "SmithyAtlasTypeErr",
4201: "DispatchHeroNoReached", 4201: "DispatchHeroNoReached",
4202: "DispatchNoFree", 4202: "DispatchNoFree",
4203: "DispatchTicketNoEnough", 4203: "DispatchTicketNoEnough",
@ -941,6 +943,7 @@ var (
"SmithyNoActivateAtlas": 4113, "SmithyNoActivateAtlas": 4113,
"SmithyLvToolsFailed": 4114, "SmithyLvToolsFailed": 4114,
"SmithyLvToolsPre": 4115, "SmithyLvToolsPre": 4115,
"SmithyAtlasTypeErr": 4116,
"DispatchHeroNoReached": 4201, "DispatchHeroNoReached": 4201,
"DispatchNoFree": 4202, "DispatchNoFree": 4202,
"DispatchTicketNoEnough": 4203, "DispatchTicketNoEnough": 4203,
@ -986,7 +989,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
var file_errorcode_proto_rawDesc = []byte{ var file_errorcode_proto_rawDesc = []byte{
0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x2a, 0xe5, 0x35, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x6f, 0x2a, 0xfe, 0x35, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10,
0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e,
0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76,
@ -1399,25 +1402,27 @@ var file_errorcode_proto_rawDesc = []byte{
0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x76, 0x54, 0x6f, 0x6f, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x76, 0x54, 0x6f, 0x6f,
0x6c, 0x73, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0x92, 0x20, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6c, 0x73, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0x92, 0x20, 0x12, 0x15, 0x0a, 0x10, 0x53,
0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x76, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x50, 0x72, 0x65, 0x10, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x76, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x50, 0x72, 0x65, 0x10,
0x93, 0x20, 0x12, 0x1a, 0x0a, 0x15, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65, 0x93, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61,
0x72, 0x6f, 0x4e, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xe9, 0x20, 0x12, 0x13, 0x73, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0x94, 0x20, 0x12, 0x1a, 0x0a, 0x15, 0x44,
0x0a, 0x0e, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x4e, 0x6f, 0x46, 0x72, 0x65, 0x65, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x52, 0x65, 0x61,
0x10, 0xea, 0x20, 0x12, 0x1b, 0x0a, 0x16, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54, 0x63, 0x68, 0x65, 0x64, 0x10, 0xe9, 0x20, 0x12, 0x13, 0x0a, 0x0e, 0x44, 0x69, 0x73, 0x70, 0x61,
0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xeb, 0x20, 0x74, 0x63, 0x68, 0x4e, 0x6f, 0x46, 0x72, 0x65, 0x65, 0x10, 0xea, 0x20, 0x12, 0x1b, 0x0a, 0x16,
0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f,
0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xeb, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x44, 0x69, 0x73,
0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65,
0x64, 0x10, 0xec, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68,
0x54, 0x61, 0x73, 0x6b, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x10, 0xed, 0x20, 0x12, 0x17,
0x0a, 0x12, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73,
0x68, 0x4d, 0x61, 0x78, 0x10, 0xee, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x44, 0x69, 0x73, 0x70, 0x61,
0x74, 0x63, 0x68, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xef, 0x20,
0x12, 0x19, 0x0a, 0x14, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x19, 0x0a, 0x14, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f,
0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x10, 0xec, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x44, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf0, 0x20, 0x12, 0x16, 0x0a, 0x11, 0x50,
0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x78, 0x70, 0x69, 0x72, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x69, 0x6e, 0x67,
0x65, 0x64, 0x10, 0xed, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x10, 0xcd, 0x21, 0x12, 0x11, 0x0a, 0x0c, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x53,
0x68, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4d, 0x61, 0x78, 0x10, 0xee, 0x20, 0x12, 0x17, 0x65, 0x6e, 0x74, 0x10, 0xce, 0x21, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69,
0x0a, 0x12, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x4f, 0x75, 0x74, 0x10,
0x73, 0x68, 0x65, 0x64, 0x10, 0xef, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x44, 0x69, 0x73, 0x70, 0x61, 0xcf, 0x21, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x6f, 0x33,
0xf0, 0x20, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69,
0x65, 0x63, 0x75, 0x6f, 0x69, 0x6e, 0x67, 0x10, 0xcd, 0x21, 0x12, 0x11, 0x0a, 0x0c, 0x50, 0x72,
0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x53, 0x65, 0x6e, 0x74, 0x10, 0xce, 0x21, 0x12, 0x1a, 0x0a,
0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x54,
0x69, 0x6d, 0x65, 0x4f, 0x75, 0x74, 0x10, 0xcf, 0x21, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (

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

@ -197,6 +197,7 @@ type GameGlobalData struct {
MrylFlushed []*Gameatn MrylFlushed []*Gameatn
GameMakeTunkNum int32 GameMakeTunkNum int32
PandamasTiguandiaoxiangCd int32 PandamasTiguandiaoxiangCd int32
MaxBreakingbadRecipe int32
} }
const TypeId_GameGlobalData = 477542761 const TypeId_GameGlobalData = 477542761
@ -821,6 +822,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["game_make_TunkNum"].(float64); !_ok_ { err = errors.New("game_make_TunkNum error"); return }; _v.GameMakeTunkNum = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["game_make_TunkNum"].(float64); !_ok_ { err = errors.New("game_make_TunkNum error"); return }; _v.GameMakeTunkNum = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pandamas_tiguandiaoxiang_cd"].(float64); !_ok_ { err = errors.New("pandamas_tiguandiaoxiang_cd error"); return }; _v.PandamasTiguandiaoxiangCd = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pandamas_tiguandiaoxiang_cd"].(float64); !_ok_ { err = errors.New("pandamas_tiguandiaoxiang_cd error"); return }; _v.PandamasTiguandiaoxiangCd = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Max_breakingbad_recipe"].(float64); !_ok_ { err = errors.New("Max_breakingbad_recipe error"); return }; _v.MaxBreakingbadRecipe = int32(_tempNum_) }
return return
} }