上传代码

This commit is contained in:
liwei 2023-06-19 21:18:46 +08:00
parent a402f4150b
commit b6e2ef26bf
21 changed files with 21394 additions and 22124 deletions

View File

@ -17756,7 +17756,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_759",
"text": "装备副本boss2难度4"
"text": "装备副本boss2难度2"
},
"type": 73,
"valid": 0,
@ -17764,7 +17764,7 @@
"value": 1,
"filter": [
2,
4
2
],
"filter2": [
"boss类型",
@ -17923,15 +17923,15 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_766",
"text": "维京远征boss2难度6"
"text": "维京远征boss3难度1"
},
"type": 73,
"valid": 0,
"NPC": 10404,
"value": 1,
"filter": [
2,
6
3,
1
],
"filter2": [
"boss类型",
@ -18501,7 +18501,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_790",
"text": "装备副本boss3难度1刷1次"
"text": "装备副本boss3难度4刷1次"
},
"type": 73,
"valid": 0,
@ -18668,7 +18668,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_797",
"text": "穿指定套装2套(从解锁的装备boss套装里选)"
"text": "穿一套+6的无极神功套装"
},
"type": 93,
"valid": 0,

View File

@ -8,7 +8,7 @@
},
"icon": "xmwg_rw_pt1",
"taskcd": 200,
"tasktime": 102,
"tasktime": 177,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_1",
"text": "这是属于阿宝的专属委托"
@ -56,7 +56,7 @@
},
"icon": "xmwg_rw_pt2",
"taskcd": 200,
"tasktime": 154,
"tasktime": 166,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_2",
"text": "这是属于波比的专属委托"
@ -104,7 +104,7 @@
},
"icon": "xmwg_rw_pt3",
"taskcd": 200,
"tasktime": 140,
"tasktime": 81,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_3",
"text": "这是属于悍娇虎的专属委托"
@ -152,7 +152,7 @@
},
"icon": "xmwg_rw_pt4",
"taskcd": 200,
"tasktime": 136,
"tasktime": 78,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_4",
"text": "这是属于师父的专属委托"
@ -200,7 +200,7 @@
},
"icon": "xmwg_rw_pt5",
"taskcd": 200,
"tasktime": 107,
"tasktime": 179,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_5",
"text": "这是属于阿宝的专属委托"
@ -248,7 +248,7 @@
},
"icon": "xmwg_rw_pt6",
"taskcd": 200,
"tasktime": 156,
"tasktime": 179,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_6",
"text": "这是属于波比的专属委托"
@ -296,7 +296,7 @@
},
"icon": "xmwg_rw_pt7",
"taskcd": 200,
"tasktime": 133,
"tasktime": 115,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_7",
"text": "这是属于悍娇虎的专属委托"
@ -344,7 +344,7 @@
},
"icon": "xmwg_rw_pt1",
"taskcd": 200,
"tasktime": 70,
"tasktime": 98,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_8",
"text": "这是属于师父的专属委托"
@ -392,7 +392,7 @@
},
"icon": "xmwg_rw_pt2",
"taskcd": 200,
"tasktime": 99,
"tasktime": 139,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_9",
"text": "这是属于阿宝的专属委托"
@ -440,7 +440,7 @@
},
"icon": "xmwg_rw_pt3",
"taskcd": 200,
"tasktime": 71,
"tasktime": 139,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_10",
"text": "这是属于波比的专属委托"
@ -488,7 +488,7 @@
},
"icon": "xmwg_rw_pt4",
"taskcd": 200,
"tasktime": 94,
"tasktime": 107,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_11",
"text": "这是属于悍娇虎的专属委托"
@ -536,7 +536,7 @@
},
"icon": "xmwg_rw_pt5",
"taskcd": 200,
"tasktime": 178,
"tasktime": 176,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_12",
"text": "这是属于师父的专属委托"
@ -584,7 +584,7 @@
},
"icon": "xmwg_rw_pt6",
"taskcd": 200,
"tasktime": 154,
"tasktime": 134,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_13",
"text": "这是属于阿宝的专属委托"
@ -632,7 +632,7 @@
},
"icon": "xmwg_rw_pt7",
"taskcd": 200,
"tasktime": 93,
"tasktime": 74,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_14",
"text": "这是属于波比的专属委托"
@ -680,7 +680,7 @@
},
"icon": "xmwg_rw_pt1",
"taskcd": 200,
"tasktime": 111,
"tasktime": 112,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_15",
"text": "这是属于悍娇虎的专属委托"
@ -728,7 +728,7 @@
},
"icon": "xmwg_rw_pt2",
"taskcd": 200,
"tasktime": 96,
"tasktime": 74,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_16",
"text": "这是属于师父的专属委托"
@ -776,7 +776,7 @@
},
"icon": "xmwg_rw_pt3",
"taskcd": 200,
"tasktime": 102,
"tasktime": 152,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_17",
"text": "这是属于阿宝的专属委托"
@ -824,7 +824,7 @@
},
"icon": "xmwg_rw_pt4",
"taskcd": 200,
"tasktime": 166,
"tasktime": 163,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_18",
"text": "这是属于波比的专属委托"
@ -872,7 +872,7 @@
},
"icon": "xmwg_rw_pt5",
"taskcd": 200,
"tasktime": 177,
"tasktime": 134,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_19",
"text": "这是属于悍娇虎的专属委托"
@ -920,7 +920,7 @@
},
"icon": "xmwg_rw_pt6",
"taskcd": 200,
"tasktime": 144,
"tasktime": 93,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_20",
"text": "这是属于师父的专属委托"
@ -968,7 +968,7 @@
},
"icon": "xmwg_rw_pt7",
"taskcd": 200,
"tasktime": 80,
"tasktime": 115,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_21",
"text": "这是属于阿宝的专属委托"
@ -1016,7 +1016,7 @@
},
"icon": "xmwg_rw_pt1",
"taskcd": 200,
"tasktime": 115,
"tasktime": 176,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_22",
"text": "这是属于波比的专属委托"
@ -1064,7 +1064,7 @@
},
"icon": "xmwg_rw_pt2",
"taskcd": 200,
"tasktime": 162,
"tasktime": 125,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_23",
"text": "这是属于悍娇虎的专属委托"
@ -1112,7 +1112,7 @@
},
"icon": "xmwg_rw_pt3",
"taskcd": 200,
"tasktime": 137,
"tasktime": 158,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_24",
"text": "这是属于师父的专属委托"
@ -1160,7 +1160,7 @@
},
"icon": "xmwg_rw_pt4",
"taskcd": 200,
"tasktime": 91,
"tasktime": 176,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_25",
"text": "这是属于阿宝的专属委托"
@ -1208,7 +1208,7 @@
},
"icon": "xmwg_rw_pt5",
"taskcd": 200,
"tasktime": 80,
"tasktime": 91,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_26",
"text": "这是属于波比的专属委托"
@ -1256,7 +1256,7 @@
},
"icon": "xmwg_rw_pt6",
"taskcd": 200,
"tasktime": 142,
"tasktime": 165,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_27",
"text": "这是属于悍娇虎的专属委托"
@ -1304,7 +1304,7 @@
},
"icon": "xmwg_rw_pt7",
"taskcd": 200,
"tasktime": 92,
"tasktime": 163,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_28",
"text": "这是属于师父的专属委托"
@ -1352,7 +1352,7 @@
},
"icon": "xmwg_rw_pt1",
"taskcd": 200,
"tasktime": 109,
"tasktime": 166,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_29",
"text": "这是属于阿宝的专属委托"
@ -1400,7 +1400,7 @@
},
"icon": "xmwg_rw_pt2",
"taskcd": 200,
"tasktime": 143,
"tasktime": 124,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_30",
"text": "这是属于波比的专属委托"
@ -1448,7 +1448,7 @@
},
"icon": "xmwg_rw_pt3",
"taskcd": 200,
"tasktime": 139,
"tasktime": 136,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_31",
"text": "这是属于悍娇虎的专属委托"
@ -1496,7 +1496,7 @@
},
"icon": "xmwg_rw_pt4",
"taskcd": 200,
"tasktime": 85,
"tasktime": 107,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_32",
"text": "这是属于师父的专属委托"
@ -1544,7 +1544,7 @@
},
"icon": "xmwg_rw_pt5",
"taskcd": 200,
"tasktime": 77,
"tasktime": 133,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_33",
"text": "这是属于阿宝的专属委托"
@ -1592,7 +1592,7 @@
},
"icon": "xmwg_rw_pt6",
"taskcd": 200,
"tasktime": 106,
"tasktime": 128,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_34",
"text": "这是属于波比的专属委托"
@ -1640,7 +1640,7 @@
},
"icon": "xmwg_rw_pt7",
"taskcd": 200,
"tasktime": 89,
"tasktime": 153,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_35",
"text": "这是属于悍娇虎的专属委托"
@ -1688,7 +1688,7 @@
},
"icon": "xmwg_rw_pt1",
"taskcd": 200,
"tasktime": 102,
"tasktime": 179,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_36",
"text": "这是属于师父的专属委托"
@ -1736,7 +1736,7 @@
},
"icon": "xmwg_rw_pt2",
"taskcd": 200,
"tasktime": 98,
"tasktime": 86,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_37",
"text": "这是属于阿宝的专属委托"
@ -1784,7 +1784,7 @@
},
"icon": "xmwg_rw_pt3",
"taskcd": 200,
"tasktime": 64,
"tasktime": 173,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_38",
"text": "这是属于波比的专属委托"
@ -1832,7 +1832,7 @@
},
"icon": "xmwg_rw_pt4",
"taskcd": 200,
"tasktime": 78,
"tasktime": 63,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_39",
"text": "这是属于悍娇虎的专属委托"
@ -1880,7 +1880,7 @@
},
"icon": "xmwg_rw_pt5",
"taskcd": 200,
"tasktime": 98,
"tasktime": 124,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_40",
"text": "这是属于师父的专属委托"
@ -1928,7 +1928,7 @@
},
"icon": "xmwg_rw_pt6",
"taskcd": 200,
"tasktime": 80,
"tasktime": 148,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_41",
"text": "这是属于阿宝的专属委托"
@ -1976,7 +1976,7 @@
},
"icon": "xmwg_rw_pt7",
"taskcd": 200,
"tasktime": 64,
"tasktime": 153,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_42",
"text": "这是属于波比的专属委托"
@ -2024,7 +2024,7 @@
},
"icon": "xmwg_rw_pt1",
"taskcd": 200,
"tasktime": 139,
"tasktime": 180,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_43",
"text": "这是属于悍娇虎的专属委托"
@ -2072,7 +2072,7 @@
},
"icon": "xmwg_rw_pt2",
"taskcd": 200,
"tasktime": 75,
"tasktime": 152,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_44",
"text": "这是属于师父的专属委托"
@ -2120,7 +2120,7 @@
},
"icon": "xmwg_rw_pt3",
"taskcd": 200,
"tasktime": 124,
"tasktime": 64,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_45",
"text": "这是属于阿宝的专属委托"
@ -2168,7 +2168,7 @@
},
"icon": "xmwg_rw_pt4",
"taskcd": 200,
"tasktime": 150,
"tasktime": 125,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_46",
"text": "这是属于波比的专属委托"
@ -2216,7 +2216,7 @@
},
"icon": "xmwg_rw_pt5",
"taskcd": 200,
"tasktime": 67,
"tasktime": 172,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_47",
"text": "这是属于悍娇虎的专属委托"
@ -2264,7 +2264,7 @@
},
"icon": "xmwg_rw_pt6",
"taskcd": 200,
"tasktime": 177,
"tasktime": 174,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_48",
"text": "这是属于师父的专属委托"
@ -2312,7 +2312,7 @@
},
"icon": "xmwg_rw_pt7",
"taskcd": 200,
"tasktime": 120,
"tasktime": 117,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_49",
"text": "这是属于阿宝的专属委托"
@ -2360,7 +2360,7 @@
},
"icon": "xmwg_rw_pt1",
"taskcd": 200,
"tasktime": 163,
"tasktime": 98,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_50",
"text": "这是属于波比的专属委托"
@ -2408,7 +2408,7 @@
},
"icon": "xmwg_rw_pt2",
"taskcd": 200,
"tasktime": 117,
"tasktime": 143,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_51",
"text": "这是属于悍娇虎的专属委托"
@ -2456,7 +2456,7 @@
},
"icon": "xmwg_rw_pt3",
"taskcd": 200,
"tasktime": 70,
"tasktime": 79,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_52",
"text": "这是属于师父的专属委托"
@ -2504,7 +2504,7 @@
},
"icon": "xmwg_rw_pt4",
"taskcd": 200,
"tasktime": 137,
"tasktime": 122,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_53",
"text": "这是属于阿宝的专属委托"
@ -2552,7 +2552,7 @@
},
"icon": "xmwg_rw_pt5",
"taskcd": 200,
"tasktime": 123,
"tasktime": 70,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_54",
"text": "这是属于波比的专属委托"
@ -2600,7 +2600,7 @@
},
"icon": "xmwg_rw_pt6",
"taskcd": 200,
"tasktime": 76,
"tasktime": 154,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_55",
"text": "这是属于悍娇虎的专属委托"
@ -2648,7 +2648,7 @@
},
"icon": "xmwg_rw_pt7",
"taskcd": 200,
"tasktime": 100,
"tasktime": 132,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_56",
"text": "这是属于师父的专属委托"
@ -2696,7 +2696,7 @@
},
"icon": "xmwg_rw_pt1",
"taskcd": 200,
"tasktime": 63,
"tasktime": 106,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_57",
"text": "这是属于阿宝的专属委托"
@ -2744,7 +2744,7 @@
},
"icon": "xmwg_rw_pt2",
"taskcd": 200,
"tasktime": 86,
"tasktime": 82,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_58",
"text": "这是属于波比的专属委托"
@ -2792,7 +2792,7 @@
},
"icon": "xmwg_rw_pt3",
"taskcd": 200,
"tasktime": 98,
"tasktime": 92,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_59",
"text": "这是属于悍娇虎的专属委托"
@ -2840,7 +2840,7 @@
},
"icon": "xmwg_rw_pt4",
"taskcd": 200,
"tasktime": 121,
"tasktime": 75,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_60",
"text": "这是属于师父的专属委托"
@ -2888,7 +2888,7 @@
},
"icon": "xmwg_rw_pt5",
"taskcd": 200,
"tasktime": 175,
"tasktime": 165,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_61",
"text": "这是属于阿宝的专属委托"
@ -2936,7 +2936,7 @@
},
"icon": "xmwg_rw_pt6",
"taskcd": 200,
"tasktime": 97,
"tasktime": 132,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_62",
"text": "这是属于波比的专属委托"
@ -2984,7 +2984,7 @@
},
"icon": "xmwg_rw_pt7",
"taskcd": 200,
"tasktime": 70,
"tasktime": 80,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_63",
"text": "这是属于悍娇虎的专属委托"
@ -3080,7 +3080,7 @@
},
"icon": "xmwg_rw_pt2",
"taskcd": 200,
"tasktime": 75,
"tasktime": 123,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_65",
"text": "这是属于阿宝的专属委托"
@ -3128,7 +3128,7 @@
},
"icon": "xmwg_rw_pt3",
"taskcd": 200,
"tasktime": 96,
"tasktime": 162,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_66",
"text": "这是属于波比的专属委托"
@ -3176,7 +3176,7 @@
},
"icon": "xmwg_rw_pt4",
"taskcd": 200,
"tasktime": 167,
"tasktime": 61,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_67",
"text": "这是属于悍娇虎的专属委托"
@ -3224,7 +3224,7 @@
},
"icon": "xmwg_rw_pt5",
"taskcd": 200,
"tasktime": 152,
"tasktime": 154,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_68",
"text": "这是属于师父的专属委托"
@ -3272,7 +3272,7 @@
},
"icon": "xmwg_rw_pt6",
"taskcd": 200,
"tasktime": 162,
"tasktime": 146,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_69",
"text": "这是属于阿宝的专属委托"
@ -3320,7 +3320,7 @@
},
"icon": "xmwg_rw_pt7",
"taskcd": 200,
"tasktime": 168,
"tasktime": 156,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_70",
"text": "这是属于波比的专属委托"
@ -3368,7 +3368,7 @@
},
"icon": "xmwg_rw_pt1",
"taskcd": 200,
"tasktime": 95,
"tasktime": 118,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_71",
"text": "这是属于悍娇虎的专属委托"
@ -3416,7 +3416,7 @@
},
"icon": "xmwg_rw_pt2",
"taskcd": 200,
"tasktime": 171,
"tasktime": 88,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_72",
"text": "这是属于师父的专属委托"
@ -3464,7 +3464,7 @@
},
"icon": "xmwg_rw_pt3",
"taskcd": 200,
"tasktime": 112,
"tasktime": 109,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_73",
"text": "这是属于阿宝的专属委托"
@ -3512,7 +3512,7 @@
},
"icon": "xmwg_rw_pt4",
"taskcd": 200,
"tasktime": 126,
"tasktime": 109,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_74",
"text": "这是属于波比的专属委托"

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -30,8 +30,6 @@
"drop": 10001000,
"bossmodel": 53001,
"boss": [
401001,
401002,
401003
],
"ps_consume": [
@ -87,8 +85,6 @@
"drop": 10002000,
"bossmodel": 53001,
"boss": [
401004,
401005,
401006
],
"ps_consume": [
@ -149,8 +145,6 @@
"drop": 10003000,
"bossmodel": 53001,
"boss": [
401007,
401008,
401009
],
"ps_consume": [
@ -211,8 +205,6 @@
"drop": 10004000,
"bossmodel": 53001,
"boss": [
401010,
401011,
401012
],
"ps_consume": [
@ -273,8 +265,6 @@
"drop": 10005000,
"bossmodel": 53001,
"boss": [
401013,
401014,
401015
],
"ps_consume": [
@ -335,8 +325,6 @@
"drop": 10006000,
"bossmodel": 53001,
"boss": [
401016,
401017,
401018
],
"ps_consume": [
@ -402,8 +390,6 @@
"drop": 10007000,
"bossmodel": 53001,
"boss": [
401019,
401020,
401021
],
"ps_consume": [
@ -469,8 +455,6 @@
"drop": 10008000,
"bossmodel": 53001,
"boss": [
401022,
401023,
401024
],
"ps_consume": [
@ -536,8 +520,6 @@
"drop": 10009000,
"bossmodel": 53001,
"boss": [
401025,
401026,
401027
],
"ps_consume": [
@ -603,8 +585,6 @@
"drop": 10010000,
"bossmodel": 53001,
"boss": [
401028,
401029,
401030
],
"ps_consume": [
@ -670,8 +650,6 @@
"drop": 10011000,
"bossmodel": 53001,
"boss": [
401025,
401026,
401027
],
"ps_consume": [
@ -737,8 +715,6 @@
"drop": 10012000,
"bossmodel": 53001,
"boss": [
401028,
401029,
401030
],
"ps_consume": [
@ -794,8 +770,6 @@
"drop": 20001000,
"bossmodel": 51004,
"boss": [
402001,
402002,
402003
],
"ps_consume": [
@ -851,8 +825,6 @@
"drop": 20002000,
"bossmodel": 51004,
"boss": [
402004,
402005,
402006
],
"ps_consume": [
@ -913,8 +885,6 @@
"drop": 20003000,
"bossmodel": 51004,
"boss": [
402007,
402008,
402009
],
"ps_consume": [
@ -975,8 +945,6 @@
"drop": 20004000,
"bossmodel": 51004,
"boss": [
402010,
402011,
402012
],
"ps_consume": [
@ -1037,8 +1005,6 @@
"drop": 20005000,
"bossmodel": 51004,
"boss": [
402013,
402014,
402015
],
"ps_consume": [
@ -1099,8 +1065,6 @@
"drop": 20006000,
"bossmodel": 51004,
"boss": [
402016,
402017,
402018
],
"ps_consume": [
@ -1166,8 +1130,6 @@
"drop": 20007000,
"bossmodel": 51004,
"boss": [
402019,
402020,
402021
],
"ps_consume": [
@ -1233,8 +1195,6 @@
"drop": 20008000,
"bossmodel": 51004,
"boss": [
402022,
402023,
402024
],
"ps_consume": [
@ -1300,8 +1260,6 @@
"drop": 20009000,
"bossmodel": 51004,
"boss": [
402025,
402026,
402027
],
"ps_consume": [
@ -1367,8 +1325,6 @@
"drop": 20010000,
"bossmodel": 51004,
"boss": [
402028,
402029,
402030
],
"ps_consume": [
@ -1434,8 +1390,6 @@
"drop": 20011000,
"bossmodel": 51004,
"boss": [
402025,
402026,
402027
],
"ps_consume": [
@ -1501,8 +1455,6 @@
"drop": 20012000,
"bossmodel": 51004,
"boss": [
402028,
402029,
402030
],
"ps_consume": [
@ -1558,8 +1510,6 @@
"drop": 30001000,
"bossmodel": 51005,
"boss": [
403001,
403002,
403003
],
"ps_consume": [
@ -1615,8 +1565,6 @@
"drop": 30002000,
"bossmodel": 51005,
"boss": [
403004,
403005,
403006
],
"ps_consume": [
@ -1677,8 +1625,6 @@
"drop": 30003000,
"bossmodel": 51005,
"boss": [
403007,
403008,
403009
],
"ps_consume": [
@ -1739,8 +1685,6 @@
"drop": 30004000,
"bossmodel": 51005,
"boss": [
403010,
403011,
403012
],
"ps_consume": [
@ -1801,8 +1745,6 @@
"drop": 30005000,
"bossmodel": 51005,
"boss": [
403013,
403014,
403015
],
"ps_consume": [
@ -1863,8 +1805,6 @@
"drop": 30006000,
"bossmodel": 51005,
"boss": [
403016,
403017,
403018
],
"ps_consume": [
@ -1930,8 +1870,6 @@
"drop": 30007000,
"bossmodel": 51005,
"boss": [
403019,
403020,
403021
],
"ps_consume": [
@ -1997,8 +1935,6 @@
"drop": 30008000,
"bossmodel": 51005,
"boss": [
403022,
403023,
403024
],
"ps_consume": [
@ -2064,8 +2000,6 @@
"drop": 30009000,
"bossmodel": 51005,
"boss": [
403025,
403026,
403027
],
"ps_consume": [
@ -2131,8 +2065,6 @@
"drop": 30010000,
"bossmodel": 51005,
"boss": [
403028,
403029,
403030
],
"ps_consume": [
@ -2198,8 +2130,6 @@
"drop": 30011000,
"bossmodel": 51005,
"boss": [
403025,
403026,
403027
],
"ps_consume": [
@ -2265,8 +2195,6 @@
"drop": 30012000,
"bossmodel": 51005,
"boss": [
403028,
403029,
403030
],
"ps_consume": [
@ -2322,8 +2250,6 @@
"drop": 40001000,
"bossmodel": 51002,
"boss": [
404001,
404002,
404003
],
"ps_consume": [
@ -2379,8 +2305,6 @@
"drop": 40002000,
"bossmodel": 51002,
"boss": [
404004,
404005,
404006
],
"ps_consume": [
@ -2441,8 +2365,6 @@
"drop": 40003000,
"bossmodel": 51002,
"boss": [
404007,
404008,
404009
],
"ps_consume": [
@ -2503,8 +2425,6 @@
"drop": 40004000,
"bossmodel": 51002,
"boss": [
404010,
404011,
404012
],
"ps_consume": [
@ -2565,8 +2485,6 @@
"drop": 40005000,
"bossmodel": 51002,
"boss": [
404013,
404014,
404015
],
"ps_consume": [
@ -2627,8 +2545,6 @@
"drop": 40006000,
"bossmodel": 51002,
"boss": [
404016,
404017,
404018
],
"ps_consume": [
@ -2694,8 +2610,6 @@
"drop": 40007000,
"bossmodel": 51002,
"boss": [
404019,
404020,
404021
],
"ps_consume": [
@ -2761,8 +2675,6 @@
"drop": 40008000,
"bossmodel": 51002,
"boss": [
404022,
404023,
404024
],
"ps_consume": [
@ -2828,8 +2740,6 @@
"drop": 40009000,
"bossmodel": 51002,
"boss": [
404025,
404026,
404027
],
"ps_consume": [
@ -2895,8 +2805,6 @@
"drop": 40010000,
"bossmodel": 51002,
"boss": [
404028,
404029,
404030
],
"ps_consume": [
@ -2962,8 +2870,6 @@
"drop": 40011000,
"bossmodel": 51002,
"boss": [
404025,
404026,
404027
],
"ps_consume": [
@ -3029,8 +2935,6 @@
"drop": 40012000,
"bossmodel": 51002,
"boss": [
404028,
404029,
404030
],
"ps_consume": [

View File

@ -767,8 +767,7 @@
],
"BattleReadyID": 119,
"FormatList": [
102031,
102032
102031
],
"captainId": 240025,
"star": [
@ -856,8 +855,7 @@
],
"BattleReadyID": 119,
"FormatList": [
102041,
102042
102041
],
"captainId": 510043,
"star": [
@ -945,8 +943,7 @@
],
"BattleReadyID": 119,
"FormatList": [
102051,
102052
102051
],
"captainId": 440063,
"star": [
@ -1034,8 +1031,7 @@
],
"BattleReadyID": 119,
"FormatList": [
102061,
102062
102061
],
"captainId": 350013,
"star": [
@ -1299,8 +1295,7 @@
],
"BattleReadyID": 119,
"FormatList": [
103031,
103032
103031
],
"captainId": 510053,
"star": [
@ -1388,8 +1383,7 @@
],
"BattleReadyID": 119,
"FormatList": [
103041,
103042
103041
],
"captainId": 530013,
"star": [
@ -1477,8 +1471,7 @@
],
"BattleReadyID": 116,
"FormatList": [
103051,
103052
103051
],
"captainId": 440052,
"star": [
@ -1566,8 +1559,7 @@
],
"BattleReadyID": 116,
"FormatList": [
103061,
103062
103061
],
"captainId": 550025,
"star": [
@ -1831,8 +1823,7 @@
],
"BattleReadyID": 116,
"FormatList": [
104031,
104032
104031
],
"captainId": 240025,
"star": [
@ -1920,8 +1911,7 @@
],
"BattleReadyID": 116,
"FormatList": [
104041,
104042
104041
],
"captainId": 510033,
"star": [
@ -2009,8 +1999,7 @@
],
"BattleReadyID": 116,
"FormatList": [
104051,
104052
104051
],
"captainId": 440063,
"star": [
@ -2098,8 +2087,7 @@
],
"BattleReadyID": 116,
"FormatList": [
104051,
104052
104051
],
"captainId": 350013,
"star": [
@ -2187,8 +2175,7 @@
],
"BattleReadyID": 116,
"FormatList": [
104051,
104052
104051
],
"captainId": 350013,
"star": [
@ -2276,8 +2263,7 @@
],
"BattleReadyID": 116,
"FormatList": [
104051,
104052
104051
],
"captainId": 350013,
"star": [
@ -2365,8 +2351,7 @@
],
"BattleReadyID": 116,
"FormatList": [
104051,
104052
104051
],
"captainId": 350013,
"star": [
@ -2454,8 +2439,7 @@
],
"BattleReadyID": 116,
"FormatList": [
104051,
104052
104051
],
"captainId": 350013,
"star": [
@ -2543,8 +2527,7 @@
],
"BattleReadyID": 116,
"FormatList": [
104051,
104052
104051
],
"captainId": 350013,
"star": [
@ -2632,8 +2615,7 @@
],
"BattleReadyID": 116,
"FormatList": [
104051,
104052
104051
],
"captainId": 350013,
"star": [
@ -2721,8 +2703,7 @@
],
"BattleReadyID": 116,
"FormatList": [
104051,
104052
104051
],
"captainId": 350013,
"star": [
@ -2810,8 +2791,7 @@
],
"BattleReadyID": 118,
"FormatList": [
104051,
104052
104051
],
"captainId": 350013,
"star": [

View File

@ -3606,9 +3606,9 @@
},
{
"id": "55005",
"preson": "55004",
"presonshow": "55004_exhibition",
"presonstory": "55004",
"preson": "55006",
"presonshow": "55006_exhibition",
"presonstory": "55006",
"presondraw": "",
"height": 1,
"weight": 1,
@ -3676,9 +3676,9 @@
},
{
"id": "55007",
"preson": "55007",
"presonshow": "55007_exhibition",
"presonstory": "55007",
"preson": "55006",
"presonshow": "55006_exhibition",
"presonstory": "55006",
"presondraw": "",
"height": 1,
"weight": 1,

File diff suppressed because it is too large Load Diff

View File

@ -19,10 +19,10 @@
{
"a": "item",
"t": "13001001",
"n": 5
"n": 3
}
],
"temperature_cos": 50,
"temperature_cos": 30,
"refine_cos": {
"a": "item",
"t": "13000001",
@ -43,8 +43,8 @@
2
],
"customized_lv_distribution": [
70,
30,
80,
20,
0
],
"light_velocity": 3000
@ -69,10 +69,10 @@
{
"a": "item",
"t": "13001001",
"n": 8
"n": 4
}
],
"temperature_cos": 50,
"temperature_cos": 30,
"refine_cos": {
"a": "item",
"t": "13000001",
@ -94,9 +94,9 @@
3
],
"customized_lv_distribution": [
50,
40,
10
40,
20
],
"light_velocity": 3000
},
@ -120,10 +120,10 @@
{
"a": "item",
"t": "13001001",
"n": 10
"n": 5
}
],
"temperature_cos": 50,
"temperature_cos": 30,
"refine_cos": {
"a": "item",
"t": "13000001",
@ -170,10 +170,10 @@
{
"a": "item",
"t": "13001002",
"n": 5
"n": 4
}
],
"temperature_cos": 50,
"temperature_cos": 40,
"refine_cos": {
"a": "item",
"t": "13000001",
@ -221,10 +221,10 @@
{
"a": "item",
"t": "13001002",
"n": 10
"n": 6
}
],
"temperature_cos": 50,
"temperature_cos": 40,
"refine_cos": {
"a": "item",
"t": "13000001",
@ -245,8 +245,8 @@
4
],
"customized_lv_distribution": [
70,
30,
60,
40,
0
],
"light_velocity": 3000
@ -322,7 +322,7 @@
{
"a": "item",
"t": "13001003",
"n": 10
"n": 7
}
],
"temperature_cos": 50,
@ -371,11 +371,11 @@
"basic_cos": [
{
"a": "item",
"t": "13001003",
"n": 5
"t": "13001004",
"n": 8
}
],
"temperature_cos": 50,
"temperature_cos": 60,
"refine_cos": {
"a": "item",
"t": "13000001",
@ -397,9 +397,9 @@
6
],
"customized_lv_distribution": [
50,
40,
10
25,
45,
30
],
"light_velocity": 3000
},
@ -422,11 +422,11 @@
"basic_cos": [
{
"a": "item",
"t": "13001003",
"t": "13001004",
"n": 10
}
],
"temperature_cos": 50,
"temperature_cos": 60,
"refine_cos": {
"a": "item",
"t": "13000001",
@ -447,8 +447,8 @@
6
],
"customized_lv_distribution": [
70,
30,
40,
60,
0
],
"light_velocity": 3000
@ -473,10 +473,10 @@
{
"a": "item",
"t": "13002001",
"n": 5
"n": 3
}
],
"temperature_cos": 50,
"temperature_cos": 30,
"refine_cos": {
"a": "item",
"t": "13000001",
@ -497,8 +497,8 @@
2
],
"customized_lv_distribution": [
70,
30,
80,
20,
0
],
"light_velocity": 3000
@ -523,10 +523,10 @@
{
"a": "item",
"t": "13002001",
"n": 8
"n": 4
}
],
"temperature_cos": 50,
"temperature_cos": 30,
"refine_cos": {
"a": "item",
"t": "13000001",
@ -548,9 +548,9 @@
3
],
"customized_lv_distribution": [
50,
40,
10
40,
20
],
"light_velocity": 3000
},
@ -574,10 +574,10 @@
{
"a": "item",
"t": "13002001",
"n": 10
"n": 5
}
],
"temperature_cos": 50,
"temperature_cos": 30,
"refine_cos": {
"a": "item",
"t": "13000001",
@ -624,10 +624,10 @@
{
"a": "item",
"t": "13002002",
"n": 5
"n": 4
}
],
"temperature_cos": 50,
"temperature_cos": 40,
"refine_cos": {
"a": "item",
"t": "13000001",
@ -675,10 +675,10 @@
{
"a": "item",
"t": "13002002",
"n": 10
"n": 6
}
],
"temperature_cos": 50,
"temperature_cos": 40,
"refine_cos": {
"a": "item",
"t": "13000001",
@ -699,8 +699,8 @@
4
],
"customized_lv_distribution": [
70,
30,
60,
40,
0
],
"light_velocity": 3000
@ -776,7 +776,7 @@
{
"a": "item",
"t": "13002003",
"n": 10
"n": 7
}
],
"temperature_cos": 50,
@ -825,11 +825,11 @@
"basic_cos": [
{
"a": "item",
"t": "13002003",
"n": 5
"t": "13002004",
"n": 8
}
],
"temperature_cos": 50,
"temperature_cos": 60,
"refine_cos": {
"a": "item",
"t": "13000001",
@ -851,9 +851,9 @@
6
],
"customized_lv_distribution": [
50,
40,
10
25,
45,
30
],
"light_velocity": 3000
},
@ -876,11 +876,11 @@
"basic_cos": [
{
"a": "item",
"t": "13002003",
"t": "13002004",
"n": 10
}
],
"temperature_cos": 50,
"temperature_cos": 60,
"refine_cos": {
"a": "item",
"t": "13000001",
@ -901,8 +901,8 @@
6
],
"customized_lv_distribution": [
70,
30,
40,
60,
0
],
"light_velocity": 3000
@ -927,10 +927,10 @@
{
"a": "item",
"t": "13003001",
"n": 5
"n": 3
}
],
"temperature_cos": 50,
"temperature_cos": 30,
"refine_cos": {
"a": "item",
"t": "13000001",
@ -951,8 +951,8 @@
2
],
"customized_lv_distribution": [
70,
30,
80,
20,
0
],
"light_velocity": 3000
@ -977,10 +977,10 @@
{
"a": "item",
"t": "13003001",
"n": 8
"n": 4
}
],
"temperature_cos": 50,
"temperature_cos": 30,
"refine_cos": {
"a": "item",
"t": "13000001",
@ -1002,9 +1002,9 @@
3
],
"customized_lv_distribution": [
50,
40,
10
40,
20
],
"light_velocity": 3000
},
@ -1028,10 +1028,10 @@
{
"a": "item",
"t": "13003001",
"n": 10
"n": 5
}
],
"temperature_cos": 50,
"temperature_cos": 30,
"refine_cos": {
"a": "item",
"t": "13000001",
@ -1078,10 +1078,10 @@
{
"a": "item",
"t": "13003002",
"n": 5
"n": 4
}
],
"temperature_cos": 50,
"temperature_cos": 40,
"refine_cos": {
"a": "item",
"t": "13000001",
@ -1129,10 +1129,10 @@
{
"a": "item",
"t": "13003002",
"n": 10
"n": 6
}
],
"temperature_cos": 50,
"temperature_cos": 40,
"refine_cos": {
"a": "item",
"t": "13000001",
@ -1153,8 +1153,8 @@
4
],
"customized_lv_distribution": [
70,
30,
60,
40,
0
],
"light_velocity": 3000
@ -1230,7 +1230,7 @@
{
"a": "item",
"t": "13003003",
"n": 10
"n": 7
}
],
"temperature_cos": 50,
@ -1279,11 +1279,11 @@
"basic_cos": [
{
"a": "item",
"t": "13003003",
"n": 5
"t": "13003004",
"n": 8
}
],
"temperature_cos": 50,
"temperature_cos": 60,
"refine_cos": {
"a": "item",
"t": "13000001",
@ -1305,9 +1305,9 @@
6
],
"customized_lv_distribution": [
50,
40,
10
25,
45,
30
],
"light_velocity": 3000
},
@ -1330,11 +1330,11 @@
"basic_cos": [
{
"a": "item",
"t": "13003003",
"t": "13003004",
"n": 10
}
],
"temperature_cos": 50,
"temperature_cos": 60,
"refine_cos": {
"a": "item",
"t": "13000001",
@ -1355,8 +1355,8 @@
6
],
"customized_lv_distribution": [
70,
30,
40,
60,
0
],
"light_velocity": 3000

View File

@ -1,364 +1,284 @@
[
{
"atlas_lv": 1,
"atlas_score": 10,
"atlas_score": 360,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
"a": "hero",
"t": "14005",
"n": 1
},
{
"a": "item",
"t": "13000009",
"n": 1
}
]
},
{
"atlas_lv": 2,
"atlas_score": 20,
"atlas_score": 720,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
"a": "hero",
"t": "34003",
"n": 1
},
{
"a": "item",
"t": "13000009",
"n": 1
}
]
},
{
"atlas_lv": 3,
"atlas_score": 30,
"atlas_score": 1080,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
"a": "hero",
"t": "24008",
"n": 1
},
{
"a": "item",
"t": "13000009",
"n": 1
}
]
},
{
"atlas_lv": 4,
"atlas_score": 50,
"atlas_score": 1440,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
"a": "hero",
"t": "24004",
"n": 1
},
{
"a": "item",
"t": "13000009",
"n": 1
}
]
},
{
"atlas_lv": 5,
"atlas_score": 80,
"atlas_score": 1800,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
"a": "hero",
"t": "24002",
"n": 1
},
{
"a": "item",
"t": "13000009",
"n": 1
}
]
},
{
"atlas_lv": 6,
"atlas_score": 150,
"atlas_score": 2160,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
"a": "hero",
"t": "34005",
"n": 1
},
{
"a": "item",
"t": "13000009",
"n": 1
}
]
},
{
"atlas_lv": 7,
"atlas_score": 300,
"atlas_score": 2520,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
"a": "hero",
"t": "14005",
"n": 1
},
{
"a": "item",
"t": "13000009",
"n": 1
}
]
},
{
"atlas_lv": 8,
"atlas_score": 450,
"atlas_score": 2880,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
"a": "hero",
"t": "34003",
"n": 1
},
{
"a": "item",
"t": "13000009",
"n": 1
}
]
},
{
"atlas_lv": 9,
"atlas_score": 600,
"atlas_score": 3240,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
"a": "hero",
"t": "24008",
"n": 1
},
{
"a": "item",
"t": "13000009",
"n": 1
}
]
},
{
"atlas_lv": 10,
"atlas_score": 750,
"atlas_score": 3600,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
"a": "hero",
"t": "24004",
"n": 1
},
{
"a": "item",
"t": "13000009",
"n": 1
}
]
},
{
"atlas_lv": 11,
"atlas_score": 900,
"atlas_score": 3960,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
"a": "hero",
"t": "24002",
"n": 1
},
{
"a": "item",
"t": "13000009",
"n": 1
}
]
},
{
"atlas_lv": 12,
"atlas_score": 1050,
"atlas_score": 4320,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
"a": "hero",
"t": "34005",
"n": 1
},
{
"a": "item",
"t": "13000009",
"n": 1
}
]
},
{
"atlas_lv": 13,
"atlas_score": 1200,
"atlas_score": 4680,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
"a": "hero",
"t": "14005",
"n": 1
},
{
"a": "item",
"t": "13000009",
"n": 1
}
]
},
{
"atlas_lv": 14,
"atlas_score": 1350,
"atlas_score": 5040,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
"a": "hero",
"t": "34003",
"n": 1
},
{
"a": "item",
"t": "13000009",
"n": 1
}
]
},
{
"atlas_lv": 15,
"atlas_score": 1500,
"atlas_score": 5400,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
"a": "hero",
"t": "24008",
"n": 1
},
{
"a": "item",
"t": "13000009",
"n": 1
}
]
},
{
"atlas_lv": 16,
"atlas_score": 1650,
"atlas_score": 5760,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
"a": "hero",
"t": "24004",
"n": 1
},
{
"a": "item",
"t": "13000009",
"n": 1
}
]
},
{
"atlas_lv": 17,
"atlas_score": 1800,
"atlas_score": 6120,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
"a": "hero",
"t": "24002",
"n": 1
},
{
"a": "item",
"t": "13000009",
"n": 1
}
]
},
{
"atlas_lv": 18,
"atlas_score": 1950,
"atlas_score": 6480,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
}
]
},
{
"atlas_lv": 19,
"atlas_score": 2100,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
}
]
},
{
"atlas_lv": 20,
"atlas_score": 2400,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
}
]
},
{
"atlas_lv": 21,
"atlas_score": 2700,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
}
]
},
{
"atlas_lv": 22,
"atlas_score": 3000,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
}
]
},
{
"atlas_lv": 23,
"atlas_score": 3300,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
}
]
},
{
"atlas_lv": 24,
"atlas_score": 3600,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
}
]
},
{
"atlas_lv": 25,
"atlas_score": 3900,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
}
]
},
{
"atlas_lv": 26,
"atlas_score": 4200,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
}
]
},
{
"atlas_lv": 27,
"atlas_score": 4500,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
}
]
},
{
"atlas_lv": 28,
"atlas_score": 4800,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
}
]
},
{
"atlas_lv": 29,
"atlas_score": 5100,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
}
]
},
{
"atlas_lv": 30,
"atlas_score": 5400,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
}
]
},
{
"atlas_lv": 31,
"atlas_score": 5700,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
}
]
},
{
"atlas_lv": 32,
"atlas_score": 6000,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
}
]
},
{
"atlas_lv": 33,
"atlas_score": 6300,
"item_id": [
{
"a": "attr",
"t": "diamond",
"n": 100
"a": "hero",
"t": "34005",
"n": 1
}
]
}

View File

@ -3,169 +3,169 @@
"id": 1,
"initLv": 1,
"entry_num": 0,
"score": 2
"score": 1
},
{
"id": 2,
"initLv": 1,
"entry_num": 1,
"score": 3
"score": 2
},
{
"id": 3,
"initLv": 1,
"entry_num": 2,
"score": 4
"score": 3
},
{
"id": 4,
"initLv": 1,
"entry_num": 3,
"score": 5
"score": 4
},
{
"id": 5,
"initLv": 1,
"entry_num": 4,
"score": 6
"score": 5
},
{
"id": 6,
"initLv": 2,
"entry_num": 0,
"score": 8
"score": 6
},
{
"id": 7,
"initLv": 2,
"entry_num": 1,
"score": 10
"score": 7
},
{
"id": 8,
"initLv": 2,
"entry_num": 2,
"score": 12
"score": 8
},
{
"id": 9,
"initLv": 2,
"entry_num": 3,
"score": 14
"score": 9
},
{
"id": 10,
"initLv": 2,
"entry_num": 4,
"score": 16
"score": 10
},
{
"id": 11,
"initLv": 3,
"entry_num": 0,
"score": 20
"score": 11
},
{
"id": 12,
"initLv": 3,
"entry_num": 1,
"score": 22
"score": 12
},
{
"id": 13,
"initLv": 3,
"entry_num": 2,
"score": 24
"score": 13
},
{
"id": 14,
"initLv": 3,
"entry_num": 3,
"score": 26
"score": 14
},
{
"id": 15,
"initLv": 3,
"entry_num": 4,
"score": 28
"score": 15
},
{
"id": 16,
"initLv": 4,
"entry_num": 0,
"score": 30
"score": 16
},
{
"id": 17,
"initLv": 4,
"entry_num": 1,
"score": 32
"score": 17
},
{
"id": 18,
"initLv": 4,
"entry_num": 2,
"score": 34
"score": 18
},
{
"id": 19,
"initLv": 4,
"entry_num": 3,
"score": 36
"score": 19
},
{
"id": 20,
"initLv": 4,
"entry_num": 4,
"score": 38
"score": 20
},
{
"id": 21,
"initLv": 5,
"entry_num": 0,
"score": 40
"score": 24
},
{
"id": 22,
"initLv": 5,
"entry_num": 1,
"score": 42
"score": 28
},
{
"id": 23,
"initLv": 5,
"entry_num": 2,
"score": 44
"score": 32
},
{
"id": 24,
"initLv": 5,
"entry_num": 3,
"score": 46
"score": 36
},
{
"id": 25,
"initLv": 5,
"entry_num": 4,
"score": 48
"score": 40
},
{
"id": 26,
"initLv": 6,
"entry_num": 0,
"score": 50
"score": 44
},
{
"id": 27,
"initLv": 6,
"entry_num": 1,
"score": 52
"score": 48
},
{
"id": 28,
"initLv": 6,
"entry_num": 2,
"score": 54
"score": 52
},
{
"id": 29,
@ -177,6 +177,6 @@
"id": 30,
"initLv": 6,
"entry_num": 4,
"score": 58
"score": 60
}
]

View File

@ -14,7 +14,7 @@
"n": 0
}
],
"weight": 4500
"weight": 2000
},
{
"customer_id": 2,
@ -26,12 +26,12 @@
"goods": [],
"reword": [
{
"a": "item",
"t": "10000001",
"n": 10
"a": "attr",
"t": "gold",
"n": 0
}
],
"weight": 4500
"weight": 2000
},
{
"customer_id": 3,
@ -53,18 +53,18 @@
},
"goods": [
{
"a": "item",
"t": "10000001",
"n": 10
"a": "attr",
"t": "diamond",
"n": 150
}
],
"reword": [
{
"a": "attr",
"t": "diamond",
"n": 10
"a": "item",
"t": "10000001",
"n": 1
}
],
"weight": 500
"weight": 6000
}
]

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,13 +1,13 @@
[
{
"star": 1,
"max_temperature": 2000,
"temperature_recovery": 60,
"max_temperature": 1000,
"temperature_recovery": 30,
"up_material": [
{
"a": "attr",
"t": "diamond",
"n": 100
"a": "item",
"t": "13000009",
"n": 1
}
],
"title_text": {
@ -17,13 +17,13 @@
},
{
"star": 2,
"max_temperature": 2100,
"temperature_recovery": 63,
"max_temperature": 1100,
"temperature_recovery": 33,
"up_material": [
{
"a": "attr",
"t": "diamond",
"n": 200
"a": "item",
"t": "13000009",
"n": 1
}
],
"title_text": {
@ -33,13 +33,13 @@
},
{
"star": 3,
"max_temperature": 2200,
"temperature_recovery": 66,
"max_temperature": 1200,
"temperature_recovery": 36,
"up_material": [
{
"a": "attr",
"t": "diamond",
"n": 300
"a": "item",
"t": "13000009",
"n": 1
}
],
"title_text": {
@ -49,13 +49,13 @@
},
{
"star": 4,
"max_temperature": 2300,
"temperature_recovery": 69,
"max_temperature": 1300,
"temperature_recovery": 39,
"up_material": [
{
"a": "attr",
"t": "diamond",
"n": 400
"a": "item",
"t": "13000009",
"n": 1
}
],
"title_text": {
@ -65,13 +65,13 @@
},
{
"star": 5,
"max_temperature": 2400,
"temperature_recovery": 72,
"max_temperature": 1400,
"temperature_recovery": 42,
"up_material": [
{
"a": "attr",
"t": "diamond",
"n": 500
"a": "item",
"t": "13000009",
"n": 1
}
],
"title_text": {
@ -81,13 +81,13 @@
},
{
"star": 6,
"max_temperature": 2500,
"temperature_recovery": 75,
"max_temperature": 1500,
"temperature_recovery": 45,
"up_material": [
{
"a": "attr",
"t": "diamond",
"n": 600
"a": "item",
"t": "13000009",
"n": 1
}
],
"title_text": {
@ -97,13 +97,13 @@
},
{
"star": 7,
"max_temperature": 2600,
"temperature_recovery": 78,
"max_temperature": 1600,
"temperature_recovery": 48,
"up_material": [
{
"a": "attr",
"t": "diamond",
"n": 700
"a": "item",
"t": "13000009",
"n": 1
}
],
"title_text": {
@ -113,13 +113,13 @@
},
{
"star": 8,
"max_temperature": 2700,
"temperature_recovery": 81,
"max_temperature": 1700,
"temperature_recovery": 51,
"up_material": [
{
"a": "attr",
"t": "diamond",
"n": 800
"a": "item",
"t": "13000009",
"n": 1
}
],
"title_text": {
@ -129,13 +129,13 @@
},
{
"star": 9,
"max_temperature": 2800,
"temperature_recovery": 84,
"max_temperature": 1800,
"temperature_recovery": 54,
"up_material": [
{
"a": "attr",
"t": "diamond",
"n": 900
"a": "item",
"t": "13000009",
"n": 1
}
],
"title_text": {
@ -145,18 +145,92 @@
},
{
"star": 10,
"max_temperature": 3000,
"temperature_recovery": 90,
"max_temperature": 1900,
"temperature_recovery": 57,
"up_material": [
{
"a": "attr",
"t": "diamond",
"n": 1000
"a": "item",
"t": "13000009",
"n": 1
}
],
"title_text": {
"key": "newsmithy_stove_title_text_10",
"text": "冶炼炉等级.10"
}
},
{
"star": 11,
"max_temperature": 2000,
"temperature_recovery": 60,
"up_material": [
{
"a": "item",
"t": "13000009",
"n": 1
}
],
"title_text": {
"key": "newsmithy_stove_title_text_11",
"text": "冶炼炉等级.11"
}
},
{
"star": 12,
"max_temperature": 2250,
"temperature_recovery": 65,
"up_material": [
{
"a": "item",
"t": "13000009",
"n": 3
}
],
"title_text": {
"key": "newsmithy_stove_title_text_12",
"text": "冶炼炉等级.12"
}
},
{
"star": 13,
"max_temperature": 2500,
"temperature_recovery": 70,
"up_material": [
{
"a": "item",
"t": "13000009",
"n": 3
}
],
"title_text": {
"key": "newsmithy_stove_title_text_13",
"text": "冶炼炉等级.13"
}
},
{
"star": 14,
"max_temperature": 2750,
"temperature_recovery": 75,
"up_material": [
{
"a": "item",
"t": "13000009",
"n": 3
}
],
"title_text": {
"key": "newsmithy_stove_title_text_14",
"text": "冶炼炉等级.14"
}
},
{
"star": 15,
"max_temperature": 3000,
"temperature_recovery": 80,
"up_material": [],
"title_text": {
"key": "newsmithy_stove_title_text_15",
"text": "冶炼炉等级.15"
}
}
]

File diff suppressed because it is too large Load Diff

View File

@ -2586,7 +2586,7 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301013
302013
],
"ps_consume": [
{
@ -2670,7 +2670,7 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301016
302016
],
"ps_consume": [
{
@ -2754,7 +2754,7 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301019
302019
],
"ps_consume": [
{
@ -2838,7 +2838,7 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301022
302022
],
"ps_consume": [
{
@ -2922,7 +2922,7 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301025
302025
],
"ps_consume": [
{
@ -3006,7 +3006,7 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301028
302028
],
"ps_consume": [
{
@ -3090,7 +3090,7 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301031
302031
],
"ps_consume": [
{
@ -3174,7 +3174,7 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301034
302034
],
"ps_consume": [
{
@ -3258,7 +3258,7 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301037
302037
],
"ps_consume": [
{
@ -3342,7 +3342,7 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301040
302040
],
"ps_consume": [
{
@ -3426,7 +3426,7 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301013
302043
],
"ps_consume": [
{
@ -3510,7 +3510,7 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301016
302046
],
"ps_consume": [
{
@ -3594,7 +3594,7 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301019
302049
],
"ps_consume": [
{
@ -3678,7 +3678,7 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301022
302052
],
"ps_consume": [
{
@ -3762,7 +3762,7 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301025
302055
],
"ps_consume": [
{
@ -3846,7 +3846,7 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301028
302058
],
"ps_consume": [
{
@ -3930,7 +3930,7 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301031
302061
],
"ps_consume": [
{
@ -4014,7 +4014,7 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301034
302064
],
"ps_consume": [
{
@ -4098,7 +4098,7 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301037
302067
],
"ps_consume": [
{
@ -4182,7 +4182,7 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301040
302070
],
"ps_consume": [
{
@ -4251,7 +4251,7 @@
"bossmodel": 11009,
"boss_skill": 25001,
"boss": [
710001
302073
],
"ps_consume": [
{
@ -4320,7 +4320,7 @@
"bossmodel": 11009,
"boss_skill": 25001,
"boss": [
710001
302076
],
"ps_consume": [
{
@ -4389,7 +4389,7 @@
"bossmodel": 11009,
"boss_skill": 25001,
"boss": [
710001
302079
],
"ps_consume": [
{
@ -4458,7 +4458,7 @@
"bossmodel": 11009,
"boss_skill": 25001,
"boss": [
710001
302082
],
"ps_consume": [
{
@ -4527,7 +4527,7 @@
"bossmodel": 11009,
"boss_skill": 25001,
"boss": [
710001
302085
],
"ps_consume": [
{
@ -4596,7 +4596,7 @@
"bossmodel": 11009,
"boss_skill": 25001,
"boss": [
710001
302088
],
"ps_consume": [
{
@ -4665,7 +4665,7 @@
"bossmodel": 11009,
"boss_skill": 25001,
"boss": [
710001
302091
],
"ps_consume": [
{
@ -4734,7 +4734,7 @@
"bossmodel": 11009,
"boss_skill": 25001,
"boss": [
710001
302094
],
"ps_consume": [
{
@ -4808,7 +4808,7 @@
"bossmodel": 11009,
"boss_skill": 25001,
"boss": [
710001
302097
],
"ps_consume": [
{
@ -4882,7 +4882,7 @@
"bossmodel": 11009,
"boss_skill": 25001,
"boss": [
710001
302100
],
"ps_consume": [
{
@ -4956,7 +4956,7 @@
"bossmodel": 11009,
"boss_skill": 25001,
"boss": [
710001
302103
],
"ps_consume": [
{
@ -5030,7 +5030,7 @@
"bossmodel": 11009,
"boss_skill": 25001,
"boss": [
710001
302106
],
"ps_consume": [
{

View File

@ -408,7 +408,7 @@
"icon": "",
"task_name": {
"key": "worldtask_world_story_task_name_12",
"text": "前往疯狂原始人世界"
"text": "返回指挥部"
},
"task_details": {
"key": "worldtask_world_story_task_details_12",

View File

@ -31,7 +31,7 @@ func (this *modelBuried) Init(service core.IService, module core.IModule, comp c
return
}
//获取用户全部的埋点数据
// 获取用户全部的埋点数据
func (this *modelBuried) getUserBurieds(uid string) (results *pb.DBBuried, err error) {
results = &pb.DBBuried{}
if err = this.Get(uid, results); err != nil && err != mgo.MongodbNil {
@ -50,7 +50,7 @@ func (this *modelBuried) getUserBurieds(uid string) (results *pb.DBBuried, err e
return
}
//更新用户数据
// 更新用户数据
func (this *modelBuried) updateUserBurieds(uid string, data *pb.DBBuried) (err error) {
err = this.Change(uid, map[string]interface{}{
"items": data.Items,
@ -62,7 +62,7 @@ func (this *modelBuried) userlock(uid string) (result *redis.RedisMutex, err err
return this.DBModel.Redis.NewRedisMutex(fmt.Sprintf("ulockburied:%s", uid))
}
//更新埋点数据到db中
// 更新埋点数据到db中
func (this *modelBuried) getburiedModel(uid string) (model *buriedModel, err error) {
var m *db.DBModel
if db.IsCross() {
@ -76,13 +76,13 @@ func (this *modelBuried) getburiedModel(uid string) (model *buriedModel, err err
return
}
//埋点专属模型 会封装特殊的数据转换接口
// 埋点专属模型 会封装特殊的数据转换接口
type buriedModel struct {
module *Buried
model *db.DBModel
}
//获取用户全部的埋点数据
// 获取用户全部的埋点数据
func (this *buriedModel) getUserBurieds(uid string) (results *pb.DBBuried, err error) {
results = &pb.DBBuried{}
if err = this.model.Get(uid, results); err != nil && err != mgo.MongodbNil {
@ -101,7 +101,7 @@ func (this *buriedModel) getUserBurieds(uid string) (results *pb.DBBuried, err e
return
}
//更新用户数据
// 更新用户数据
func (this *buriedModel) updateUserBurieds(uid string, data *pb.DBBuried) (err error) {
err = this.model.Change(uid, map[string]interface{}{
"items": data.Items,

View File

@ -80,7 +80,14 @@ func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (err error) {
if model, err = this.modelBuried.getburiedModel(uid); err != nil {
return
}
this.Debug("激活埋点!", log.Field{Key: "condiIds", Value: condiIds})
lock, _ := this.modelBuried.userlock(uid)
err = lock.Lock()
if err != nil {
this.Error("埋点分布式锁失效 err!", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()})
return
}
defer lock.Unlock()
for _, v := range condiIds {
if v == 0 {
continue