This commit is contained in:
meixiongfeng 2023-03-29 21:10:37 +08:00
parent 40a0a1f651
commit ed4c5c6788
14 changed files with 431 additions and 143 deletions

View File

@ -8,7 +8,7 @@
},
"icon": "xmwg_rw_pt1",
"taskcd": 200,
"tasktime": 110,
"tasktime": 140,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@ -56,7 +56,7 @@
},
"icon": "xmwg_rw_pt2",
"taskcd": 200,
"tasktime": 110,
"tasktime": 169,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@ -104,7 +104,7 @@
},
"icon": "xmwg_rw_pt3",
"taskcd": 200,
"tasktime": 102,
"tasktime": 172,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@ -152,7 +152,7 @@
},
"icon": "xmwg_rw_pt4",
"taskcd": 200,
"tasktime": 180,
"tasktime": 118,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@ -200,7 +200,7 @@
},
"icon": "xmwg_rw_pt5",
"taskcd": 200,
"tasktime": 80,
"tasktime": 100,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@ -248,7 +248,7 @@
},
"icon": "xmwg_rw_pt6",
"taskcd": 200,
"tasktime": 174,
"tasktime": 131,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@ -296,7 +296,7 @@
},
"icon": "xmwg_rw_pt7",
"taskcd": 200,
"tasktime": 87,
"tasktime": 166,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@ -344,7 +344,7 @@
},
"icon": "xmwg_rw_pt1",
"taskcd": 200,
"tasktime": 133,
"tasktime": 119,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@ -392,7 +392,7 @@
},
"icon": "xmwg_rw_pt2",
"taskcd": 200,
"tasktime": 130,
"tasktime": 120,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@ -440,7 +440,7 @@
},
"icon": "xmwg_rw_pt3",
"taskcd": 200,
"tasktime": 169,
"tasktime": 157,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@ -488,7 +488,7 @@
},
"icon": "xmwg_rw_pt4",
"taskcd": 200,
"tasktime": 71,
"tasktime": 105,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@ -536,7 +536,7 @@
},
"icon": "xmwg_rw_pt5",
"taskcd": 200,
"tasktime": 105,
"tasktime": 79,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@ -584,7 +584,7 @@
},
"icon": "xmwg_rw_pt6",
"taskcd": 200,
"tasktime": 122,
"tasktime": 64,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@ -632,7 +632,7 @@
},
"icon": "xmwg_rw_pt7",
"taskcd": 200,
"tasktime": 148,
"tasktime": 177,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@ -680,7 +680,7 @@
},
"icon": "xmwg_rw_pt1",
"taskcd": 200,
"tasktime": 114,
"tasktime": 96,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@ -728,7 +728,7 @@
},
"icon": "xmwg_rw_pt2",
"taskcd": 200,
"tasktime": 84,
"tasktime": 98,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@ -776,7 +776,7 @@
},
"icon": "xmwg_rw_pt3",
"taskcd": 200,
"tasktime": 64,
"tasktime": 133,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@ -824,7 +824,7 @@
},
"icon": "xmwg_rw_pt4",
"taskcd": 200,
"tasktime": 75,
"tasktime": 66,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@ -872,7 +872,7 @@
},
"icon": "xmwg_rw_pt5",
"taskcd": 200,
"tasktime": 110,
"tasktime": 176,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@ -920,7 +920,7 @@
},
"icon": "xmwg_rw_pt6",
"taskcd": 200,
"tasktime": 100,
"tasktime": 85,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@ -968,7 +968,7 @@
},
"icon": "xmwg_rw_pt7",
"taskcd": 200,
"tasktime": 93,
"tasktime": 157,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@ -1016,7 +1016,7 @@
},
"icon": "xmwg_rw_pt1",
"taskcd": 200,
"tasktime": 114,
"tasktime": 142,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@ -1064,7 +1064,7 @@
},
"icon": "xmwg_rw_pt2",
"taskcd": 200,
"tasktime": 121,
"tasktime": 178,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@ -1112,7 +1112,7 @@
},
"icon": "xmwg_rw_pt3",
"taskcd": 200,
"tasktime": 116,
"tasktime": 113,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@ -1160,7 +1160,7 @@
},
"icon": "xmwg_rw_pt4",
"taskcd": 200,
"tasktime": 164,
"tasktime": 65,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@ -1208,7 +1208,7 @@
},
"icon": "xmwg_rw_pt5",
"taskcd": 200,
"tasktime": 147,
"tasktime": 163,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@ -1256,7 +1256,7 @@
},
"icon": "xmwg_rw_pt6",
"taskcd": 200,
"tasktime": 101,
"tasktime": 95,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@ -1304,7 +1304,7 @@
},
"icon": "xmwg_rw_pt7",
"taskcd": 200,
"tasktime": 108,
"tasktime": 170,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@ -1352,7 +1352,7 @@
},
"icon": "xmwg_rw_pt1",
"taskcd": 200,
"tasktime": 139,
"tasktime": 80,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@ -1400,7 +1400,7 @@
},
"icon": "xmwg_rw_pt2",
"taskcd": 200,
"tasktime": 89,
"tasktime": 71,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@ -1448,7 +1448,7 @@
},
"icon": "xmwg_rw_pt3",
"taskcd": 200,
"tasktime": 66,
"tasktime": 175,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@ -1496,7 +1496,7 @@
},
"icon": "xmwg_rw_pt4",
"taskcd": 200,
"tasktime": 62,
"tasktime": 142,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@ -1544,7 +1544,7 @@
},
"icon": "xmwg_rw_pt5",
"taskcd": 200,
"tasktime": 129,
"tasktime": 170,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@ -1592,7 +1592,7 @@
},
"icon": "xmwg_rw_pt6",
"taskcd": 200,
"tasktime": 164,
"tasktime": 64,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@ -1640,7 +1640,7 @@
},
"icon": "xmwg_rw_pt7",
"taskcd": 200,
"tasktime": 68,
"tasktime": 159,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@ -1688,7 +1688,7 @@
},
"icon": "xmwg_rw_pt1",
"taskcd": 200,
"tasktime": 81,
"tasktime": 98,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@ -1736,7 +1736,7 @@
},
"icon": "xmwg_rw_pt2",
"taskcd": 200,
"tasktime": 165,
"tasktime": 141,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@ -1784,7 +1784,7 @@
},
"icon": "xmwg_rw_pt3",
"taskcd": 200,
"tasktime": 164,
"tasktime": 130,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@ -1832,7 +1832,7 @@
},
"icon": "xmwg_rw_pt4",
"taskcd": 200,
"tasktime": 140,
"tasktime": 171,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@ -1880,7 +1880,7 @@
},
"icon": "xmwg_rw_pt5",
"taskcd": 200,
"tasktime": 165,
"tasktime": 113,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@ -1928,7 +1928,7 @@
},
"icon": "xmwg_rw_pt6",
"taskcd": 200,
"tasktime": 98,
"tasktime": 95,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@ -1976,7 +1976,7 @@
},
"icon": "xmwg_rw_pt7",
"taskcd": 200,
"tasktime": 160,
"tasktime": 100,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@ -2024,7 +2024,7 @@
},
"icon": "xmwg_rw_pt1",
"taskcd": 200,
"tasktime": 138,
"tasktime": 152,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@ -2072,7 +2072,7 @@
},
"icon": "xmwg_rw_pt2",
"taskcd": 200,
"tasktime": 132,
"tasktime": 174,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@ -2120,7 +2120,7 @@
},
"icon": "xmwg_rw_pt3",
"taskcd": 200,
"tasktime": 117,
"tasktime": 105,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@ -2168,7 +2168,7 @@
},
"icon": "xmwg_rw_pt4",
"taskcd": 200,
"tasktime": 159,
"tasktime": 141,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@ -2216,7 +2216,7 @@
},
"icon": "xmwg_rw_pt5",
"taskcd": 200,
"tasktime": 83,
"tasktime": 173,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@ -2264,7 +2264,7 @@
},
"icon": "xmwg_rw_pt6",
"taskcd": 200,
"tasktime": 119,
"tasktime": 167,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@ -2312,7 +2312,7 @@
},
"icon": "xmwg_rw_pt7",
"taskcd": 200,
"tasktime": 85,
"tasktime": 129,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@ -2360,7 +2360,7 @@
},
"icon": "xmwg_rw_pt1",
"taskcd": 200,
"tasktime": 156,
"tasktime": 62,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@ -2408,7 +2408,7 @@
},
"icon": "xmwg_rw_pt2",
"taskcd": 200,
"tasktime": 145,
"tasktime": 142,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@ -2456,7 +2456,7 @@
},
"icon": "xmwg_rw_pt3",
"taskcd": 200,
"tasktime": 176,
"tasktime": 82,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@ -2504,7 +2504,7 @@
},
"icon": "xmwg_rw_pt4",
"taskcd": 200,
"tasktime": 143,
"tasktime": 127,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@ -2552,7 +2552,7 @@
},
"icon": "xmwg_rw_pt5",
"taskcd": 200,
"tasktime": 82,
"tasktime": 73,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@ -2600,7 +2600,7 @@
},
"icon": "xmwg_rw_pt6",
"taskcd": 200,
"tasktime": 168,
"tasktime": 173,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@ -2648,7 +2648,7 @@
},
"icon": "xmwg_rw_pt7",
"taskcd": 200,
"tasktime": 68,
"tasktime": 67,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@ -2696,7 +2696,7 @@
},
"icon": "xmwg_rw_pt1",
"taskcd": 200,
"tasktime": 113,
"tasktime": 179,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@ -2744,7 +2744,7 @@
},
"icon": "xmwg_rw_pt2",
"taskcd": 200,
"tasktime": 92,
"tasktime": 114,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@ -2792,7 +2792,7 @@
},
"icon": "xmwg_rw_pt3",
"taskcd": 200,
"tasktime": 173,
"tasktime": 160,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@ -2840,7 +2840,7 @@
},
"icon": "xmwg_rw_pt4",
"taskcd": 200,
"tasktime": 99,
"tasktime": 123,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@ -2888,7 +2888,7 @@
},
"icon": "xmwg_rw_pt5",
"taskcd": 200,
"tasktime": 162,
"tasktime": 75,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@ -2936,7 +2936,7 @@
},
"icon": "xmwg_rw_pt6",
"taskcd": 200,
"tasktime": 63,
"tasktime": 162,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@ -2984,7 +2984,7 @@
},
"icon": "xmwg_rw_pt7",
"taskcd": 200,
"tasktime": 164,
"tasktime": 122,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@ -3032,7 +3032,7 @@
},
"icon": "xmwg_rw_pt1",
"taskcd": 200,
"tasktime": 94,
"tasktime": 68,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@ -3080,7 +3080,7 @@
},
"icon": "xmwg_rw_pt2",
"taskcd": 200,
"tasktime": 85,
"tasktime": 86,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@ -3128,7 +3128,7 @@
},
"icon": "xmwg_rw_pt3",
"taskcd": 200,
"tasktime": 105,
"tasktime": 180,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@ -3176,7 +3176,7 @@
},
"icon": "xmwg_rw_pt4",
"taskcd": 200,
"tasktime": 74,
"tasktime": 137,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@ -3224,7 +3224,7 @@
},
"icon": "xmwg_rw_pt5",
"taskcd": 200,
"tasktime": 70,
"tasktime": 92,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@ -3272,7 +3272,7 @@
},
"icon": "xmwg_rw_pt6",
"taskcd": 200,
"tasktime": 83,
"tasktime": 71,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@ -3320,7 +3320,7 @@
},
"icon": "xmwg_rw_pt7",
"taskcd": 200,
"tasktime": 96,
"tasktime": 152,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"
@ -3368,7 +3368,7 @@
},
"icon": "xmwg_rw_pt1",
"taskcd": 200,
"tasktime": 167,
"tasktime": 70,
"tasktxt": {
"key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托"
@ -3416,7 +3416,7 @@
},
"icon": "xmwg_rw_pt2",
"taskcd": 200,
"tasktime": 138,
"tasktime": 105,
"tasktxt": {
"key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托"
@ -3464,7 +3464,7 @@
},
"icon": "xmwg_rw_pt3",
"taskcd": 200,
"tasktime": 69,
"tasktime": 90,
"tasktxt": {
"key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托"
@ -3512,7 +3512,7 @@
},
"icon": "xmwg_rw_pt4",
"taskcd": 200,
"tasktime": 71,
"tasktime": 77,
"tasktxt": {
"key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托"

View File

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

View File

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

View File

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

View File

@ -4242,7 +4242,7 @@
"type": 20001,
"valid": 1,
"data1": 1,
"data2": 500,
"data2": 602,
"data3": 0,
"data4": 0,
"data5": 10011

View File

@ -60,7 +60,7 @@
],
"event": [
2,
500
601
],
"goto": 0
},
@ -73,7 +73,7 @@
],
"event": [
2,
500
602
],
"goto": 0
},
@ -86,7 +86,7 @@
],
"event": [
2,
500
603
],
"goto": 0
},
@ -99,7 +99,7 @@
],
"event": [
2,
500
604
],
"goto": 0
},
@ -112,7 +112,7 @@
],
"event": [
2,
432
605
],
"goto": 0
},
@ -125,7 +125,7 @@
],
"event": [
2,
500
606
],
"goto": 0
},
@ -138,7 +138,7 @@
],
"event": [
2,
500
607
],
"goto": 0
},
@ -151,7 +151,7 @@
],
"event": [
2,
412
608
],
"goto": 0
},
@ -164,7 +164,7 @@
],
"event": [
2,
500
609
],
"goto": 0
},
@ -177,7 +177,7 @@
],
"event": [
2,
500
611
],
"goto": 0
},
@ -190,7 +190,7 @@
],
"event": [
2,
500
612
],
"goto": 0
},
@ -203,7 +203,7 @@
],
"event": [
2,
500
613
],
"goto": 0
},
@ -216,7 +216,7 @@
],
"event": [
2,
500
614
],
"goto": 0
},
@ -227,10 +227,153 @@
"20010_熊猫_1",
"901"
],
"event": [
2,
615
],
"goto": 0
},
{
"id": 10070,
"datas": [
"SmithyScene",
"打造",
"139"
],
"event": [
2,
631
],
"goto": 0
},
{
"id": 10071,
"datas": [
"GameMain",
"功能入口-维京远征",
"901"
],
"event": [
2,
500
],
"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",
"食人鱼",
"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",
"梦魇",
"901"
],
"event": [
2,
500
],
"goto": 0
},
{
"id": 10102,
"datas": [
"GameMain",
"20020_邦尼兔_1",
"901"
],
"event": [
2,
641
],
"goto": 0
}
]

View File

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

View File

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

View File

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

View File

@ -178,7 +178,7 @@
"key": 20060,
"lock": 1,
"ontxe": 20050,
"id_after": 0,
"id_after": 20070,
"group": 2,
"des": 2,
"icon": "",
@ -208,5 +208,145 @@
}
],
"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": [
0
],
"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": [
0
],
"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": [
0
],
"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": [
0
],
"deliver_npc": 10102,
"auto_accept": 1,
"reword": [
{
"a": "item",
"t": "110001",
"n": 109
}
],
"module": []
}
]

View File

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

View File

@ -30,6 +30,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
rsp *pb.SmithyForgeEquipResp
needTemperatureCos int32 // 需要消耗的温度
maxT int32
atno []*pb.UserAtno
)
rsp = &pb.SmithyForgeEquipResp{}
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)
// 检查是否命中双倍打造
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 {
if eq, err1 := this.module.ModuleEquipment.QueryEquipment(session.GetUserId(), v.O); err1 == pb.ErrorCode_Success {
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 {
if eq, err1 := this.module.ModuleEquipment.QueryEquipment(session.GetUserId(), v.O); err1 == pb.ErrorCode_Success {
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 来算
}
}
this.module.SendRdTask(session, atno)
return
}

View File

@ -71,7 +71,7 @@ func (this *Smithy) CheckActivateAtlasCollect(uid string, id string) (code pb.Er
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 数量
equip = make(map[int32]int32, 0)
tasks := make([]*comm.TaskParam, 0)
@ -82,8 +82,9 @@ func (this *Smithy) SendRdTask(session comm.IUserSession, Items []*pb.UserAssets
}
for k, v := range equip {
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...)
}

View File

@ -197,6 +197,7 @@ type GameGlobalData struct {
MrylFlushed []*Gameatn
GameMakeTunkNum int32
PandamasTiguandiaoxiangCd int32
MaxBreakingbadRecipe int32
}
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["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
}