Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
fc3d8c552d
@ -18,7 +18,7 @@
|
||||
"n": 10
|
||||
},
|
||||
{
|
||||
"a": "132005",
|
||||
"a": "131004",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
@ -38,7 +38,7 @@
|
||||
"n": 10
|
||||
},
|
||||
{
|
||||
"a": "132005",
|
||||
"a": "131005",
|
||||
"n": 5
|
||||
}
|
||||
],
|
||||
@ -58,7 +58,7 @@
|
||||
"n": 10
|
||||
},
|
||||
{
|
||||
"a": "132005",
|
||||
"a": "131005",
|
||||
"n": 5
|
||||
}
|
||||
],
|
||||
@ -112,6 +112,10 @@
|
||||
{
|
||||
"a": "131004",
|
||||
"n": 10
|
||||
},
|
||||
{
|
||||
"a": "132008",
|
||||
"n": 5
|
||||
}
|
||||
],
|
||||
"Type": 2,
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
[
|
||||
{
|
||||
"id": 1,
|
||||
"model": "14005",
|
||||
"model": "51004",
|
||||
"weight": 1000,
|
||||
"startstory": 4001,
|
||||
"rejectstory": 4002,
|
||||
@ -55,7 +55,7 @@
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"model": "44006",
|
||||
"model": "51005",
|
||||
"weight": 1000,
|
||||
"startstory": 4001,
|
||||
"rejectstory": 4002,
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt1",
|
||||
"taskcd": 200,
|
||||
"tasktime": 140,
|
||||
"tasktime": 91,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -56,7 +56,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt2",
|
||||
"taskcd": 200,
|
||||
"tasktime": 169,
|
||||
"tasktime": 131,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -104,7 +104,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt3",
|
||||
"taskcd": 200,
|
||||
"tasktime": 172,
|
||||
"tasktime": 92,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -152,7 +152,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt4",
|
||||
"taskcd": 200,
|
||||
"tasktime": 118,
|
||||
"tasktime": 167,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -200,7 +200,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt5",
|
||||
"taskcd": 200,
|
||||
"tasktime": 100,
|
||||
"tasktime": 88,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -248,7 +248,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt6",
|
||||
"taskcd": 200,
|
||||
"tasktime": 131,
|
||||
"tasktime": 68,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -296,7 +296,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt7",
|
||||
"taskcd": 200,
|
||||
"tasktime": 166,
|
||||
"tasktime": 74,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -344,7 +344,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt1",
|
||||
"taskcd": 200,
|
||||
"tasktime": 119,
|
||||
"tasktime": 148,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -392,7 +392,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt2",
|
||||
"taskcd": 200,
|
||||
"tasktime": 120,
|
||||
"tasktime": 171,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -440,7 +440,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt3",
|
||||
"taskcd": 200,
|
||||
"tasktime": 157,
|
||||
"tasktime": 159,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -488,7 +488,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt4",
|
||||
"taskcd": 200,
|
||||
"tasktime": 105,
|
||||
"tasktime": 143,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -536,7 +536,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt5",
|
||||
"taskcd": 200,
|
||||
"tasktime": 79,
|
||||
"tasktime": 170,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -584,7 +584,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt6",
|
||||
"taskcd": 200,
|
||||
"tasktime": 64,
|
||||
"tasktime": 74,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -632,7 +632,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt7",
|
||||
"taskcd": 200,
|
||||
"tasktime": 177,
|
||||
"tasktime": 134,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -680,7 +680,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt1",
|
||||
"taskcd": 200,
|
||||
"tasktime": 96,
|
||||
"tasktime": 140,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -728,7 +728,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt2",
|
||||
"taskcd": 200,
|
||||
"tasktime": 98,
|
||||
"tasktime": 86,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -776,7 +776,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt3",
|
||||
"taskcd": 200,
|
||||
"tasktime": 133,
|
||||
"tasktime": 92,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -824,7 +824,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt4",
|
||||
"taskcd": 200,
|
||||
"tasktime": 66,
|
||||
"tasktime": 136,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -872,7 +872,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt5",
|
||||
"taskcd": 200,
|
||||
"tasktime": 176,
|
||||
"tasktime": 155,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -920,7 +920,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt6",
|
||||
"taskcd": 200,
|
||||
"tasktime": 85,
|
||||
"tasktime": 160,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -968,7 +968,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt7",
|
||||
"taskcd": 200,
|
||||
"tasktime": 157,
|
||||
"tasktime": 92,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -1016,7 +1016,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt1",
|
||||
"taskcd": 200,
|
||||
"tasktime": 142,
|
||||
"tasktime": 66,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -1064,7 +1064,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt2",
|
||||
"taskcd": 200,
|
||||
"tasktime": 178,
|
||||
"tasktime": 73,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -1112,7 +1112,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt3",
|
||||
"taskcd": 200,
|
||||
"tasktime": 113,
|
||||
"tasktime": 100,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -1160,7 +1160,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt4",
|
||||
"taskcd": 200,
|
||||
"tasktime": 65,
|
||||
"tasktime": 64,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -1208,7 +1208,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt5",
|
||||
"taskcd": 200,
|
||||
"tasktime": 163,
|
||||
"tasktime": 96,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -1256,7 +1256,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt6",
|
||||
"taskcd": 200,
|
||||
"tasktime": 95,
|
||||
"tasktime": 162,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -1304,7 +1304,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt7",
|
||||
"taskcd": 200,
|
||||
"tasktime": 170,
|
||||
"tasktime": 97,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -1352,7 +1352,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt1",
|
||||
"taskcd": 200,
|
||||
"tasktime": 80,
|
||||
"tasktime": 170,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -1400,7 +1400,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt2",
|
||||
"taskcd": 200,
|
||||
"tasktime": 71,
|
||||
"tasktime": 121,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -1448,7 +1448,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt3",
|
||||
"taskcd": 200,
|
||||
"tasktime": 175,
|
||||
"tasktime": 111,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -1496,7 +1496,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt4",
|
||||
"taskcd": 200,
|
||||
"tasktime": 142,
|
||||
"tasktime": 138,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -1544,7 +1544,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt5",
|
||||
"taskcd": 200,
|
||||
"tasktime": 170,
|
||||
"tasktime": 61,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -1592,7 +1592,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt6",
|
||||
"taskcd": 200,
|
||||
"tasktime": 64,
|
||||
"tasktime": 128,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -1640,7 +1640,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt7",
|
||||
"taskcd": 200,
|
||||
"tasktime": 159,
|
||||
"tasktime": 127,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -1688,7 +1688,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt1",
|
||||
"taskcd": 200,
|
||||
"tasktime": 98,
|
||||
"tasktime": 69,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -1736,7 +1736,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt2",
|
||||
"taskcd": 200,
|
||||
"tasktime": 141,
|
||||
"tasktime": 180,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -1784,7 +1784,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt3",
|
||||
"taskcd": 200,
|
||||
"tasktime": 130,
|
||||
"tasktime": 175,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -1832,7 +1832,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt4",
|
||||
"taskcd": 200,
|
||||
"tasktime": 171,
|
||||
"tasktime": 110,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -1880,7 +1880,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt5",
|
||||
"taskcd": 200,
|
||||
"tasktime": 113,
|
||||
"tasktime": 160,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -1928,7 +1928,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt6",
|
||||
"taskcd": 200,
|
||||
"tasktime": 95,
|
||||
"tasktime": 170,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -1976,7 +1976,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt7",
|
||||
"taskcd": 200,
|
||||
"tasktime": 100,
|
||||
"tasktime": 105,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -2024,7 +2024,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt1",
|
||||
"taskcd": 200,
|
||||
"tasktime": 152,
|
||||
"tasktime": 94,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -2072,7 +2072,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt2",
|
||||
"taskcd": 200,
|
||||
"tasktime": 174,
|
||||
"tasktime": 170,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -2120,7 +2120,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt3",
|
||||
"taskcd": 200,
|
||||
"tasktime": 105,
|
||||
"tasktime": 134,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -2168,7 +2168,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt4",
|
||||
"taskcd": 200,
|
||||
"tasktime": 141,
|
||||
"tasktime": 114,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -2216,7 +2216,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt5",
|
||||
"taskcd": 200,
|
||||
"tasktime": 173,
|
||||
"tasktime": 140,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -2264,7 +2264,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt6",
|
||||
"taskcd": 200,
|
||||
"tasktime": 167,
|
||||
"tasktime": 148,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -2312,7 +2312,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt7",
|
||||
"taskcd": 200,
|
||||
"tasktime": 129,
|
||||
"tasktime": 125,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -2360,7 +2360,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt1",
|
||||
"taskcd": 200,
|
||||
"tasktime": 62,
|
||||
"tasktime": 147,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -2408,7 +2408,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt2",
|
||||
"taskcd": 200,
|
||||
"tasktime": 142,
|
||||
"tasktime": 62,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -2456,7 +2456,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt3",
|
||||
"taskcd": 200,
|
||||
"tasktime": 82,
|
||||
"tasktime": 180,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -2504,7 +2504,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt4",
|
||||
"taskcd": 200,
|
||||
"tasktime": 127,
|
||||
"tasktime": 134,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -2552,7 +2552,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt5",
|
||||
"taskcd": 200,
|
||||
"tasktime": 73,
|
||||
"tasktime": 168,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -2600,7 +2600,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt6",
|
||||
"taskcd": 200,
|
||||
"tasktime": 173,
|
||||
"tasktime": 80,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -2648,7 +2648,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt7",
|
||||
"taskcd": 200,
|
||||
"tasktime": 67,
|
||||
"tasktime": 159,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -2696,7 +2696,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt1",
|
||||
"taskcd": 200,
|
||||
"tasktime": 179,
|
||||
"tasktime": 121,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -2744,7 +2744,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt2",
|
||||
"taskcd": 200,
|
||||
"tasktime": 114,
|
||||
"tasktime": 173,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -2792,7 +2792,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt3",
|
||||
"taskcd": 200,
|
||||
"tasktime": 160,
|
||||
"tasktime": 121,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -2840,7 +2840,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt4",
|
||||
"taskcd": 200,
|
||||
"tasktime": 123,
|
||||
"tasktime": 121,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -2888,7 +2888,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt5",
|
||||
"taskcd": 200,
|
||||
"tasktime": 75,
|
||||
"tasktime": 67,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -2936,7 +2936,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt6",
|
||||
"taskcd": 200,
|
||||
"tasktime": 162,
|
||||
"tasktime": 180,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -2984,7 +2984,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt7",
|
||||
"taskcd": 200,
|
||||
"tasktime": 122,
|
||||
"tasktime": 67,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -3032,7 +3032,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt1",
|
||||
"taskcd": 200,
|
||||
"tasktime": 68,
|
||||
"tasktime": 132,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -3080,7 +3080,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt2",
|
||||
"taskcd": 200,
|
||||
"tasktime": 86,
|
||||
"tasktime": 149,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -3128,7 +3128,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt3",
|
||||
"taskcd": 200,
|
||||
"tasktime": 180,
|
||||
"tasktime": 149,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -3176,7 +3176,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt4",
|
||||
"taskcd": 200,
|
||||
"tasktime": 137,
|
||||
"tasktime": 151,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -3224,7 +3224,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt5",
|
||||
"taskcd": 200,
|
||||
"tasktime": 92,
|
||||
"tasktime": 96,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -3272,7 +3272,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt6",
|
||||
"taskcd": 200,
|
||||
"tasktime": 71,
|
||||
"tasktime": 163,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -3320,7 +3320,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt7",
|
||||
"taskcd": 200,
|
||||
"tasktime": 152,
|
||||
"tasktime": 97,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -3368,7 +3368,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt1",
|
||||
"taskcd": 200,
|
||||
"tasktime": 70,
|
||||
"tasktime": 122,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -3416,7 +3416,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt2",
|
||||
"taskcd": 200,
|
||||
"tasktime": 105,
|
||||
"tasktime": 84,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -3464,7 +3464,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt3",
|
||||
"taskcd": 200,
|
||||
"tasktime": 90,
|
||||
"tasktime": 157,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
|
||||
@ -1,145 +1 @@
|
||||
[
|
||||
{
|
||||
"id": 10,
|
||||
"group": 10,
|
||||
"type": 3,
|
||||
"startPar": "",
|
||||
"parameter": "",
|
||||
"interface": "",
|
||||
"condition": "worldtask_200111",
|
||||
"followtj": "",
|
||||
"followguide": 20,
|
||||
"finger": [],
|
||||
"offset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"fingerTime": 0,
|
||||
"objSize": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"objOffset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"txt": "500",
|
||||
"speakerface": 0,
|
||||
"sound": "",
|
||||
"mask": 0,
|
||||
"lock": 0,
|
||||
"uishow": 0,
|
||||
"skiptime": 10000,
|
||||
"skip": 0,
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
},
|
||||
{
|
||||
"id": 20,
|
||||
"group": 20,
|
||||
"type": 5,
|
||||
"startPar": "",
|
||||
"parameter": "",
|
||||
"interface": "",
|
||||
"condition": "GuideFinish100",
|
||||
"followtj": "",
|
||||
"followguide": 0,
|
||||
"finger": [
|
||||
"gesture",
|
||||
"circle"
|
||||
],
|
||||
"offset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"fingerTime": 0.5,
|
||||
"objSize": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"objOffset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"txt": "",
|
||||
"speakerface": 0,
|
||||
"sound": "",
|
||||
"mask": 1,
|
||||
"lock": 1,
|
||||
"uishow": 0,
|
||||
"skiptime": 10000,
|
||||
"skip": 0,
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
},
|
||||
{
|
||||
"id": 40,
|
||||
"group": 40,
|
||||
"type": 3,
|
||||
"startPar": "",
|
||||
"parameter": "",
|
||||
"interface": "",
|
||||
"condition": "worldtask_20050",
|
||||
"followtj": "",
|
||||
"followguide": 0,
|
||||
"finger": [],
|
||||
"offset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"fingerTime": 0,
|
||||
"objSize": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"objOffset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"txt": "501",
|
||||
"speakerface": 0,
|
||||
"sound": "",
|
||||
"mask": 0,
|
||||
"lock": 0,
|
||||
"uishow": 0,
|
||||
"skiptime": 10000,
|
||||
"skip": 0,
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
},
|
||||
{
|
||||
"id": 50,
|
||||
"group": 50,
|
||||
"type": 3,
|
||||
"startPar": "",
|
||||
"parameter": "",
|
||||
"interface": "",
|
||||
"condition": "worldtask_20060",
|
||||
"followtj": "",
|
||||
"followguide": 0,
|
||||
"finger": [],
|
||||
"offset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"fingerTime": 0,
|
||||
"objSize": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"objOffset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"txt": "503",
|
||||
"speakerface": 0,
|
||||
"sound": "",
|
||||
"mask": 0,
|
||||
"lock": 0,
|
||||
"uishow": 0,
|
||||
"skiptime": 10000,
|
||||
"skip": 0,
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
}
|
||||
]
|
||||
[]
|
||||
@ -10283,10 +10283,10 @@
|
||||
"isani": 0,
|
||||
"star": 0,
|
||||
"race": 0,
|
||||
"img": "wp_icon_10019",
|
||||
"img": "pr_ing_sb",
|
||||
"ico": "pr_ing_sb",
|
||||
"intr": {
|
||||
"key": "pr_ing_",
|
||||
"key": "pr_ing_132000",
|
||||
"text": "就是垃圾"
|
||||
},
|
||||
"sale": [
|
||||
@ -10327,10 +10327,10 @@
|
||||
"isani": 0,
|
||||
"star": 0,
|
||||
"race": 0,
|
||||
"img": "wp_icon_10020",
|
||||
"img": "pr_ing_bz",
|
||||
"ico": "pr_ing_bz",
|
||||
"intr": {
|
||||
"key": "pr_ing_",
|
||||
"key": "pr_ing_132001",
|
||||
"text": "需要面粉和肉"
|
||||
},
|
||||
"sale": [
|
||||
@ -10371,10 +10371,10 @@
|
||||
"isani": 0,
|
||||
"star": 0,
|
||||
"race": 0,
|
||||
"img": "wp_icon_10021",
|
||||
"img": "pr_ing_tdnr",
|
||||
"ico": "pr_ing_tdnr",
|
||||
"intr": {
|
||||
"key": "pr_ing_",
|
||||
"key": "pr_ing_132002",
|
||||
"text": "需要土豆和肉"
|
||||
},
|
||||
"sale": [
|
||||
@ -10415,10 +10415,10 @@
|
||||
"isani": 0,
|
||||
"star": 0,
|
||||
"race": 0,
|
||||
"img": "wp_icon_10031",
|
||||
"img": "pr_ing_ljcr",
|
||||
"ico": "pr_ing_ljcr",
|
||||
"intr": {
|
||||
"key": "pr_ing_",
|
||||
"key": "pr_ing_132003",
|
||||
"text": "需要青椒和肉"
|
||||
},
|
||||
"sale": [
|
||||
@ -10459,10 +10459,10 @@
|
||||
"isani": 0,
|
||||
"star": 0,
|
||||
"race": 0,
|
||||
"img": "wp_icon_10032",
|
||||
"img": "pr_ing_hp",
|
||||
"ico": "pr_ing_hp",
|
||||
"intr": {
|
||||
"key": "pr_ing_",
|
||||
"key": "pr_ing_132004",
|
||||
"text": "需要青椒和盐"
|
||||
},
|
||||
"sale": [
|
||||
@ -10503,10 +10503,10 @@
|
||||
"isani": 0,
|
||||
"star": 0,
|
||||
"race": 0,
|
||||
"img": "wp_icon_10033",
|
||||
"img": "pr_ing_mt",
|
||||
"ico": "pr_ing_mt",
|
||||
"intr": {
|
||||
"key": "pr_ing_",
|
||||
"key": "pr_ing_132005",
|
||||
"text": "需要面粉"
|
||||
},
|
||||
"sale": [
|
||||
@ -10547,10 +10547,10 @@
|
||||
"isani": 0,
|
||||
"star": 0,
|
||||
"race": 0,
|
||||
"img": "wp_icon_10034",
|
||||
"img": "pr_ing_gbr",
|
||||
"ico": "pr_ing_gbr",
|
||||
"intr": {
|
||||
"key": "pr_ing_",
|
||||
"key": "pr_ing_132006",
|
||||
"text": "需要面粉和肉"
|
||||
},
|
||||
"sale": [
|
||||
@ -10591,10 +10591,10 @@
|
||||
"isani": 0,
|
||||
"star": 0,
|
||||
"race": 0,
|
||||
"img": "wp_icon_10031",
|
||||
"img": "pr_ing_kr",
|
||||
"ico": "pr_ing_kr",
|
||||
"intr": {
|
||||
"key": "pr_ing_",
|
||||
"key": "pr_ing_132007",
|
||||
"text": "需要肉"
|
||||
},
|
||||
"sale": [
|
||||
@ -10635,10 +10635,10 @@
|
||||
"isani": 0,
|
||||
"star": 0,
|
||||
"race": 0,
|
||||
"img": "wp_icon_10032",
|
||||
"img": "pr_ing_ykr",
|
||||
"ico": "pr_ing_ykr",
|
||||
"intr": {
|
||||
"key": "pr_ing_",
|
||||
"key": "pr_ing_132008",
|
||||
"text": "需要粗盐和肉"
|
||||
},
|
||||
"sale": [
|
||||
@ -10679,10 +10679,10 @@
|
||||
"isani": 0,
|
||||
"star": 0,
|
||||
"race": 0,
|
||||
"img": "wp_icon_10033",
|
||||
"img": "pr_ing_ktd",
|
||||
"ico": "pr_ing_ktd",
|
||||
"intr": {
|
||||
"key": "pr_ing_",
|
||||
"key": "pr_ing_132009",
|
||||
"text": "需要土豆"
|
||||
},
|
||||
"sale": [
|
||||
@ -10723,10 +10723,10 @@
|
||||
"isani": 0,
|
||||
"star": 0,
|
||||
"race": 0,
|
||||
"img": "wp_icon_10034",
|
||||
"img": "pr_ing_td",
|
||||
"ico": "pr_ing_td",
|
||||
"intr": {
|
||||
"key": "pr_ing_",
|
||||
"key": "pr_ing_131001",
|
||||
"text": "就是土豆"
|
||||
},
|
||||
"sale": [
|
||||
@ -10767,10 +10767,10 @@
|
||||
"isani": 0,
|
||||
"star": 0,
|
||||
"race": 0,
|
||||
"img": "wp_icon_10031",
|
||||
"img": "pr_ing_y",
|
||||
"ico": "pr_ing_y",
|
||||
"intr": {
|
||||
"key": "pr_ing_",
|
||||
"key": "pr_ing_131002",
|
||||
"text": "就是粗盐"
|
||||
},
|
||||
"sale": [
|
||||
@ -10811,10 +10811,10 @@
|
||||
"isani": 0,
|
||||
"star": 0,
|
||||
"race": 0,
|
||||
"img": "wp_icon_10032",
|
||||
"img": "pr_ing_qj",
|
||||
"ico": "pr_ing_qj",
|
||||
"intr": {
|
||||
"key": "pr_ing_",
|
||||
"key": "pr_ing_131003",
|
||||
"text": "就是青椒"
|
||||
},
|
||||
"sale": [
|
||||
@ -10855,10 +10855,10 @@
|
||||
"isani": 0,
|
||||
"star": 0,
|
||||
"race": 0,
|
||||
"img": "wp_icon_10033",
|
||||
"img": "pr_ing_mf",
|
||||
"ico": "pr_ing_mf",
|
||||
"intr": {
|
||||
"key": "pr_ing_",
|
||||
"key": "pr_ing_131004",
|
||||
"text": "就是面粉"
|
||||
},
|
||||
"sale": [
|
||||
@ -10899,10 +10899,10 @@
|
||||
"isani": 0,
|
||||
"star": 0,
|
||||
"race": 0,
|
||||
"img": "wp_icon_10034",
|
||||
"img": "pr_ing_r",
|
||||
"ico": "pr_ing_r",
|
||||
"intr": {
|
||||
"key": "pr_ing_",
|
||||
"key": "pr_ing_131005",
|
||||
"text": "就是肉"
|
||||
},
|
||||
"sale": [
|
||||
|
||||
@ -145,7 +145,7 @@
|
||||
],
|
||||
"BattleReadyID": 102,
|
||||
"FormatList": [
|
||||
101021
|
||||
101011
|
||||
],
|
||||
"captainId": 240025,
|
||||
"star": [
|
||||
@ -230,8 +230,7 @@
|
||||
],
|
||||
"BattleReadyID": 102,
|
||||
"FormatList": [
|
||||
101031,
|
||||
101032
|
||||
101011
|
||||
],
|
||||
"captainId": 530013,
|
||||
"star": [
|
||||
@ -316,8 +315,7 @@
|
||||
],
|
||||
"BattleReadyID": 102,
|
||||
"FormatList": [
|
||||
101041,
|
||||
101042
|
||||
101011
|
||||
],
|
||||
"captainId": 530013,
|
||||
"star": [
|
||||
@ -402,8 +400,7 @@
|
||||
],
|
||||
"BattleReadyID": 102,
|
||||
"FormatList": [
|
||||
101051,
|
||||
101052
|
||||
101011
|
||||
],
|
||||
"captainId": 440053,
|
||||
"star": [
|
||||
@ -488,8 +485,7 @@
|
||||
],
|
||||
"BattleReadyID": 102,
|
||||
"FormatList": [
|
||||
101061,
|
||||
101062
|
||||
101011
|
||||
],
|
||||
"captainId": 440063,
|
||||
"star": [
|
||||
|
||||
@ -13959,8 +13959,8 @@
|
||||
"Id": 301013,
|
||||
"pos": 4,
|
||||
"captainId": 0,
|
||||
"IsBoss": 1,
|
||||
"monster": 110215,
|
||||
"IsBoss": 0,
|
||||
"monster": -1,
|
||||
"lv": 35,
|
||||
"hppro": 0.6,
|
||||
"atkpro": 1,
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
500
|
||||
613
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
@ -203,7 +203,7 @@
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
613
|
||||
614
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
@ -216,7 +216,7 @@
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
614
|
||||
615
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
@ -229,7 +229,7 @@
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
615
|
||||
617
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
@ -254,8 +254,8 @@
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
500
|
||||
10,
|
||||
167
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
@ -359,7 +359,7 @@
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
500
|
||||
642
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
@ -375,5 +375,161 @@
|
||||
641
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 70010,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"70010_盖_1",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
9010
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 70020,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"支线40010_格里森_1",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
9020
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 70021,
|
||||
"datas": [
|
||||
"SmithyScene",
|
||||
"打造",
|
||||
"139"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
9024
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 70022,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"功能入口-维京远征",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
10,
|
||||
167
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 70023,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"支线40020_格里森_2",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
9025
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 70030,
|
||||
"datas": [
|
||||
"SmithyScene",
|
||||
"打造",
|
||||
"139"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
9030
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 70031,
|
||||
"datas": [
|
||||
"SmithyScene",
|
||||
"打造",
|
||||
"139"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
9034
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 70032,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"功能入口-维京远征",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
10,
|
||||
167
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 70033,
|
||||
"datas": [
|
||||
"SmithyScene",
|
||||
"打造",
|
||||
"139"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
9037
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 70040,
|
||||
"datas": [
|
||||
"WuGuanScene",
|
||||
"支线60010_瓦希尔指挥官_1",
|
||||
"137"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
9040
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 70050,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"支线70010_小伊_1",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
9050
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
{
|
||||
"id": 70060,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"支线80010_鼻涕粗_1",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
9060
|
||||
],
|
||||
"goto": 0
|
||||
}
|
||||
]
|
||||
22
bin/json/game_sellcoefficient.json
Normal file
22
bin/json/game_sellcoefficient.json
Normal file
@ -0,0 +1,22 @@
|
||||
[
|
||||
{
|
||||
"character": 1,
|
||||
"coefficient": 1000
|
||||
},
|
||||
{
|
||||
"character": 2,
|
||||
"coefficient": 1200
|
||||
},
|
||||
{
|
||||
"character": 3,
|
||||
"coefficient": 1500
|
||||
},
|
||||
{
|
||||
"character": 4,
|
||||
"coefficient": 2000
|
||||
},
|
||||
{
|
||||
"character": 5,
|
||||
"coefficient": 3000
|
||||
}
|
||||
]
|
||||
@ -21107,7 +21107,7 @@
|
||||
"Argu": [
|
||||
455005211,
|
||||
1,
|
||||
1
|
||||
0
|
||||
],
|
||||
"FollowSK": [
|
||||
255005212
|
||||
@ -21156,9 +21156,11 @@
|
||||
"Argu": [
|
||||
455005213,
|
||||
1,
|
||||
1
|
||||
0
|
||||
],
|
||||
"FollowSK": [
|
||||
255005214
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
@ -21221,7 +21223,7 @@
|
||||
"Argu": [
|
||||
455005211,
|
||||
1,
|
||||
1
|
||||
0
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
@ -21235,9 +21237,11 @@
|
||||
{
|
||||
"Id": 255005313,
|
||||
"EmitPR": 1000,
|
||||
"From": 2,
|
||||
"Where": [],
|
||||
"Order": "",
|
||||
"From": 4,
|
||||
"Where": [
|
||||
"EnemyHpproless=500"
|
||||
],
|
||||
"Order": "PropertyDown=3",
|
||||
"Limit": 1,
|
||||
"ExecuteCnt": 1,
|
||||
"Type": 1,
|
||||
@ -21260,7 +21264,7 @@
|
||||
{
|
||||
"Id": 255005314,
|
||||
"EmitPR": 1000,
|
||||
"From": 2,
|
||||
"From": 4,
|
||||
"Where": [],
|
||||
"Order": "",
|
||||
"Limit": 1,
|
||||
@ -21363,12 +21367,14 @@
|
||||
"ExecuteCnt": 1,
|
||||
"Type": 3,
|
||||
"Argu": [
|
||||
390001011,
|
||||
390001443,
|
||||
1000,
|
||||
1,
|
||||
1
|
||||
-1
|
||||
],
|
||||
"FollowSK": [
|
||||
255006212
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
@ -21392,7 +21398,7 @@
|
||||
2000
|
||||
],
|
||||
"FollowSK": [
|
||||
255006212
|
||||
255006214
|
||||
],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
@ -21414,7 +21420,7 @@
|
||||
"Argu": [
|
||||
455006214,
|
||||
1,
|
||||
1
|
||||
0
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
@ -21428,7 +21434,7 @@
|
||||
{
|
||||
"Id": 255006311,
|
||||
"EmitPR": 1000,
|
||||
"From": 2,
|
||||
"From": 3,
|
||||
"Where": [],
|
||||
"Order": "",
|
||||
"Limit": 1,
|
||||
@ -21437,9 +21443,12 @@
|
||||
"Argu": [
|
||||
455006311,
|
||||
1,
|
||||
1
|
||||
0
|
||||
],
|
||||
"FollowSK": [
|
||||
255006312,
|
||||
255006313
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
@ -21485,7 +21494,7 @@
|
||||
390001413,
|
||||
1000,
|
||||
1,
|
||||
1
|
||||
-1
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
@ -21508,30 +21517,7 @@
|
||||
"Argu": [
|
||||
455006314,
|
||||
1,
|
||||
1
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
"DpsRevisiType": 0,
|
||||
"DpsCondition": "",
|
||||
"RevisiCondition": "",
|
||||
"RevisiParams": []
|
||||
},
|
||||
{
|
||||
"Id": 255006315,
|
||||
"EmitPR": 1000,
|
||||
"From": 2,
|
||||
"Where": [],
|
||||
"Order": "",
|
||||
"Limit": 10,
|
||||
"ExecuteCnt": 1,
|
||||
"Type": 1,
|
||||
"Argu": [
|
||||
1,
|
||||
4,
|
||||
2000
|
||||
0
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
@ -21554,7 +21540,7 @@
|
||||
"Argu": [
|
||||
455007111,
|
||||
-1,
|
||||
1
|
||||
0
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
@ -21629,7 +21615,7 @@
|
||||
390001008,
|
||||
1000,
|
||||
1,
|
||||
1
|
||||
2
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
@ -21654,7 +21640,9 @@
|
||||
1,
|
||||
1
|
||||
],
|
||||
"FollowSK": [],
|
||||
"FollowSK": [
|
||||
255007116
|
||||
],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
@ -21701,7 +21689,10 @@
|
||||
1,
|
||||
1
|
||||
],
|
||||
"FollowSK": [],
|
||||
"FollowSK": [
|
||||
255007212,
|
||||
255007213
|
||||
],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
@ -21771,7 +21762,9 @@
|
||||
1,
|
||||
1
|
||||
],
|
||||
"FollowSK": [],
|
||||
"FollowSK": [
|
||||
255007215
|
||||
],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
@ -21818,7 +21811,9 @@
|
||||
1,
|
||||
1
|
||||
],
|
||||
"FollowSK": [],
|
||||
"FollowSK": [
|
||||
255007312
|
||||
],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
@ -21840,7 +21835,7 @@
|
||||
390001421,
|
||||
1000,
|
||||
1,
|
||||
1
|
||||
-1
|
||||
],
|
||||
"FollowSK": [],
|
||||
"SucFollowSK": [],
|
||||
@ -21885,7 +21880,7 @@
|
||||
"ExecuteCnt": 1,
|
||||
"Type": 2,
|
||||
"Argu": [
|
||||
455007314,
|
||||
455007312,
|
||||
1,
|
||||
1
|
||||
],
|
||||
@ -21927,16 +21922,17 @@
|
||||
{
|
||||
"Id": 255007316,
|
||||
"EmitPR": 1000,
|
||||
"From": 2,
|
||||
"From": 4,
|
||||
"Where": [],
|
||||
"Order": "",
|
||||
"Limit": 1,
|
||||
"ExecuteCnt": 1,
|
||||
"Type": 1,
|
||||
"Type": 3,
|
||||
"Argu": [
|
||||
390001444,
|
||||
1000,
|
||||
1,
|
||||
4,
|
||||
2000
|
||||
1
|
||||
],
|
||||
"FollowSK": [
|
||||
255007317
|
||||
@ -21952,7 +21948,7 @@
|
||||
{
|
||||
"Id": 255007317,
|
||||
"EmitPR": 1000,
|
||||
"From": 2,
|
||||
"From": 4,
|
||||
"Where": [],
|
||||
"Order": "",
|
||||
"Limit": 10,
|
||||
@ -21960,7 +21956,7 @@
|
||||
"Type": 3,
|
||||
"Argu": [
|
||||
390001105,
|
||||
1000,
|
||||
500,
|
||||
1,
|
||||
1
|
||||
],
|
||||
@ -21976,7 +21972,32 @@
|
||||
{
|
||||
"Id": 255007318,
|
||||
"EmitPR": 1000,
|
||||
"From": 2,
|
||||
"From": 3,
|
||||
"Where": [],
|
||||
"Order": "",
|
||||
"Limit": 1,
|
||||
"ExecuteCnt": 1,
|
||||
"Type": 2,
|
||||
"Argu": [
|
||||
455007313,
|
||||
1,
|
||||
1
|
||||
],
|
||||
"FollowSK": [
|
||||
255007319
|
||||
],
|
||||
"SucFollowSK": [],
|
||||
"FailFollowSK": [],
|
||||
"MustHit": false,
|
||||
"DpsRevisiType": 0,
|
||||
"DpsCondition": "",
|
||||
"RevisiCondition": "",
|
||||
"RevisiParams": []
|
||||
},
|
||||
{
|
||||
"Id": 255007319,
|
||||
"EmitPR": 1000,
|
||||
"From": 4,
|
||||
"Where": [],
|
||||
"Order": "",
|
||||
"Limit": 1,
|
||||
|
||||
@ -11905,8 +11905,7 @@
|
||||
"Id": [
|
||||
255005311,
|
||||
255005312,
|
||||
255005313,
|
||||
255005314
|
||||
255005313
|
||||
]
|
||||
},
|
||||
"Desc": {
|
||||
@ -11963,9 +11962,7 @@
|
||||
"ChildSkill": {
|
||||
"Id": [
|
||||
255006211,
|
||||
255006212,
|
||||
255006213,
|
||||
255006214
|
||||
255006213
|
||||
]
|
||||
},
|
||||
"Desc": {
|
||||
@ -12026,10 +12023,8 @@
|
||||
"ChildSkill": {
|
||||
"Id": [
|
||||
255007111,
|
||||
255007113,
|
||||
255007114,
|
||||
255007115,
|
||||
255007116
|
||||
255007112,
|
||||
255007115
|
||||
]
|
||||
},
|
||||
"Desc": {
|
||||
@ -12058,10 +12053,7 @@
|
||||
"ChildSkill": {
|
||||
"Id": [
|
||||
255007211,
|
||||
255007212,
|
||||
255007213,
|
||||
255007214,
|
||||
255007215
|
||||
255007214
|
||||
]
|
||||
},
|
||||
"Desc": {
|
||||
|
||||
@ -2485,8 +2485,10 @@
|
||||
"key": "skill_buffdes_390001412",
|
||||
"text": "敌方血量伤害越低，此次伤害越高"
|
||||
},
|
||||
"BuffType": 1,
|
||||
"EffectArgu": [],
|
||||
"BuffType": 92,
|
||||
"EffectArgu": [
|
||||
200
|
||||
],
|
||||
"BufParNum": 1,
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
@ -2557,17 +2559,19 @@
|
||||
},
|
||||
"Desc": {
|
||||
"key": "skill_buffdes_390001415",
|
||||
"text": ""
|
||||
"text": "受到伤害降低"
|
||||
},
|
||||
"BuffType": 0,
|
||||
"EffectArgu": [],
|
||||
"BufParNum": 0,
|
||||
"BuffType": 23,
|
||||
"EffectArgu": [
|
||||
350
|
||||
],
|
||||
"BufParNum": 1,
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": 0,
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
"OverlayTimes": 0,
|
||||
"RemoveType": true,
|
||||
"OverlayTimes": 99,
|
||||
"SameID": false,
|
||||
"buffIcon": "",
|
||||
"buffeffect": "",
|
||||
@ -3234,5 +3238,58 @@
|
||||
"buffIcon": "",
|
||||
"buffeffect": "",
|
||||
"buffpos": "infopos"
|
||||
},
|
||||
{
|
||||
"Id": 390001443,
|
||||
"Name": {
|
||||
"key": "skill_buff_390001443",
|
||||
"text": "根据目标身上减益效果数量提升伤害"
|
||||
},
|
||||
"Desc": {
|
||||
"key": "skill_buffdes_390001443",
|
||||
"text": "减益效果%+10%伤害"
|
||||
},
|
||||
"BuffType": 98,
|
||||
"EffectArgu": [
|
||||
1,
|
||||
100
|
||||
],
|
||||
"BufParNum": 0,
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": 0,
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
"OverlayTimes": 0,
|
||||
"SameID": false,
|
||||
"buffIcon": "",
|
||||
"buffeffect": "",
|
||||
"buffpos": ""
|
||||
},
|
||||
{
|
||||
"Id": 390001444,
|
||||
"Name": {
|
||||
"key": "skill_buff_390001444",
|
||||
"text": "灾祸冰原"
|
||||
},
|
||||
"Desc": {
|
||||
"key": "skill_buffdes_390001444",
|
||||
"text": "速度降低100%，无法进行任何行动，无法驱散"
|
||||
},
|
||||
"BuffType": 95,
|
||||
"EffectArgu": [
|
||||
1000
|
||||
],
|
||||
"BufParNum": 1,
|
||||
"RelyCheckArgu": [],
|
||||
"CoexistCheckArgu": [],
|
||||
"Effect": 2,
|
||||
"AddEffect": false,
|
||||
"RemoveType": false,
|
||||
"OverlayTimes": 1,
|
||||
"SameID": true,
|
||||
"buffIcon": "",
|
||||
"buffeffect": "",
|
||||
"buffpos": ""
|
||||
}
|
||||
]
|
||||
@ -1518,7 +1518,9 @@
|
||||
"PasPr": 1000,
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": []
|
||||
"Callback": [
|
||||
255006212
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 455006311,
|
||||
@ -1533,7 +1535,8 @@
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": [
|
||||
255006312
|
||||
255006312,
|
||||
255006313
|
||||
]
|
||||
},
|
||||
{
|
||||
@ -1549,7 +1552,23 @@
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": [
|
||||
255006315
|
||||
155006211
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 455007111,
|
||||
"When": 15,
|
||||
"FromCheck": "",
|
||||
"TargetCheck": "Target=2",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [],
|
||||
"PasPr": 1000,
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": [
|
||||
255007112
|
||||
]
|
||||
},
|
||||
{
|
||||
@ -1573,13 +1592,13 @@
|
||||
{
|
||||
"Id": 455007211,
|
||||
"When": 2,
|
||||
"FromCheck": "Target=2",
|
||||
"FromCheck": "Target=3",
|
||||
"TargetCheck": "Target=3",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [
|
||||
"EffType=390001415,Result=1"
|
||||
"Hasbuff=390001415"
|
||||
],
|
||||
"PasPr": 1000,
|
||||
"Type": "CallSkillPas",
|
||||
@ -1593,7 +1612,7 @@
|
||||
"When": 15,
|
||||
"FromCheck": "Target=3",
|
||||
"TargetCheck": "",
|
||||
"MainSkillCheck": "",
|
||||
"MainSkillCheck": "SkillID=255007213",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [],
|
||||
@ -1604,181 +1623,6 @@
|
||||
255007215
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 400003001,
|
||||
"When": 16,
|
||||
"FromCheck": "Target=2",
|
||||
"TargetCheck": "Target=3",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [],
|
||||
"PasPr": 1000,
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": [
|
||||
200003002
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 400006001,
|
||||
"When": 2,
|
||||
"FromCheck": "Target=3",
|
||||
"TargetCheck": "",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [],
|
||||
"PasPr": 1000,
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": [
|
||||
200006002
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 400007001,
|
||||
"When": 16,
|
||||
"FromCheck": "Target=3",
|
||||
"TargetCheck": "Target=2",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [],
|
||||
"PasPr": 1000,
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": [
|
||||
200007002
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 400001401,
|
||||
"When": 16,
|
||||
"FromCheck": "Target=2",
|
||||
"TargetCheck": "Target=3",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [],
|
||||
"PasPr": 250,
|
||||
"Type": "BeatBack",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": []
|
||||
},
|
||||
{
|
||||
"Id": 400001501,
|
||||
"When": 2,
|
||||
"FromCheck": "Target=3",
|
||||
"TargetCheck": "",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [],
|
||||
"PasPr": 1000,
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": [
|
||||
200001502
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 400001001,
|
||||
"When": 2,
|
||||
"FromCheck": "Target=3,HasBuff=2",
|
||||
"TargetCheck": "",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [],
|
||||
"PasPr": 1000,
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": [
|
||||
200001002
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 400009001,
|
||||
"When": 21,
|
||||
"FromCheck": "Target=3,HasBuff=2",
|
||||
"TargetCheck": "",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [],
|
||||
"PasPr": 1000,
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": [
|
||||
200009002
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 400001701,
|
||||
"When": 20,
|
||||
"FromCheck": "Target=3",
|
||||
"TargetCheck": "2",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [],
|
||||
"PasPr": 1000,
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": [
|
||||
200001702
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 400001901,
|
||||
"When": 2,
|
||||
"FromCheck": "Target=3",
|
||||
"TargetCheck": "",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [],
|
||||
"PasPr": 1000,
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": [
|
||||
200001902
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 455006214,
|
||||
"When": 12,
|
||||
"FromCheck": "Target=3",
|
||||
"TargetCheck": "Target=2",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "SkillID=255006213",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [],
|
||||
"PasPr": 1000,
|
||||
"Type": "DetonateBuff",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": [
|
||||
390001401,
|
||||
10
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 455007111,
|
||||
"When": 15,
|
||||
"FromCheck": "",
|
||||
"TargetCheck": "Target=2",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [],
|
||||
"PasPr": 1000,
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": [
|
||||
255007112
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 455007311,
|
||||
"When": 2,
|
||||
@ -1797,14 +1641,16 @@
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 455007314,
|
||||
"Id": 455007312,
|
||||
"When": 12,
|
||||
"FromCheck": "",
|
||||
"TargetCheck": "Target=3",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [],
|
||||
"AddCon": [
|
||||
"Hpproless=330"
|
||||
],
|
||||
"PasPr": 1000,
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimes": 1,
|
||||
@ -1812,6 +1658,41 @@
|
||||
255007315
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 455007313,
|
||||
"When": 5,
|
||||
"FromCheck": "Target=3",
|
||||
"TargetCheck": "",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [
|
||||
"Hasbuff=1"
|
||||
],
|
||||
"PasPr": 1000,
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": [
|
||||
255007319
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 455006214,
|
||||
"When": 12,
|
||||
"FromCheck": "Target=3",
|
||||
"TargetCheck": "Target=2",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "SkillID=255006213",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [],
|
||||
"PasPr": 1000,
|
||||
"Type": "DetonateBuff",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": [
|
||||
390001401,
|
||||
10
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 455002211,
|
||||
"When": 21,
|
||||
@ -2313,5 +2194,147 @@
|
||||
"Callback": [
|
||||
244002314
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 400003001,
|
||||
"When": 16,
|
||||
"FromCheck": "Target=2",
|
||||
"TargetCheck": "Target=3",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [],
|
||||
"PasPr": 1000,
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": [
|
||||
200003002
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 400006001,
|
||||
"When": 2,
|
||||
"FromCheck": "Target=3",
|
||||
"TargetCheck": "",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [],
|
||||
"PasPr": 1000,
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": [
|
||||
200006002
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 400007001,
|
||||
"When": 16,
|
||||
"FromCheck": "Target=3",
|
||||
"TargetCheck": "Target=2",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [],
|
||||
"PasPr": 1000,
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": [
|
||||
200007002
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 400001401,
|
||||
"When": 16,
|
||||
"FromCheck": "Target=2",
|
||||
"TargetCheck": "Target=3",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [],
|
||||
"PasPr": 250,
|
||||
"Type": "BeatBack",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": []
|
||||
},
|
||||
{
|
||||
"Id": 400001501,
|
||||
"When": 2,
|
||||
"FromCheck": "Target=3",
|
||||
"TargetCheck": "",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [],
|
||||
"PasPr": 1000,
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": [
|
||||
200001502
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 400001001,
|
||||
"When": 2,
|
||||
"FromCheck": "Target=3,HasBuff=2",
|
||||
"TargetCheck": "",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [],
|
||||
"PasPr": 1000,
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": [
|
||||
200001002
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 400009001,
|
||||
"When": 21,
|
||||
"FromCheck": "Target=3,HasBuff=2",
|
||||
"TargetCheck": "",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [],
|
||||
"PasPr": 1000,
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": [
|
||||
200009002
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 400001701,
|
||||
"When": 20,
|
||||
"FromCheck": "Target=3",
|
||||
"TargetCheck": "2",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [],
|
||||
"PasPr": 1000,
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": [
|
||||
200001702
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 400001901,
|
||||
"When": 2,
|
||||
"FromCheck": "Target=3",
|
||||
"TargetCheck": "",
|
||||
"MainSkillCheck": "",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"AddCon": [],
|
||||
"PasPr": 1000,
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimes": 1,
|
||||
"Callback": [
|
||||
200001902
|
||||
]
|
||||
}
|
||||
]
|
||||
@ -1,7 +1,7 @@
|
||||
[
|
||||
{
|
||||
"atlas_lv": 1,
|
||||
"atlas_score": 0,
|
||||
"atlas_score": 1,
|
||||
"item_id": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -12,7 +12,7 @@
|
||||
},
|
||||
{
|
||||
"atlas_lv": 2,
|
||||
"atlas_score": 1000,
|
||||
"atlas_score": 2,
|
||||
"item_id": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -23,7 +23,7 @@
|
||||
},
|
||||
{
|
||||
"atlas_lv": 3,
|
||||
"atlas_score": 2000,
|
||||
"atlas_score": 3,
|
||||
"item_id": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -34,7 +34,7 @@
|
||||
},
|
||||
{
|
||||
"atlas_lv": 4,
|
||||
"atlas_score": 3000,
|
||||
"atlas_score": 4,
|
||||
"item_id": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -45,7 +45,7 @@
|
||||
},
|
||||
{
|
||||
"atlas_lv": 5,
|
||||
"atlas_score": 4000,
|
||||
"atlas_score": 5,
|
||||
"item_id": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -56,7 +56,7 @@
|
||||
},
|
||||
{
|
||||
"atlas_lv": 6,
|
||||
"atlas_score": 5000,
|
||||
"atlas_score": 6,
|
||||
"item_id": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -67,7 +67,7 @@
|
||||
},
|
||||
{
|
||||
"atlas_lv": 7,
|
||||
"atlas_score": 6000,
|
||||
"atlas_score": 7,
|
||||
"item_id": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -78,7 +78,7 @@
|
||||
},
|
||||
{
|
||||
"atlas_lv": 8,
|
||||
"atlas_score": 7000,
|
||||
"atlas_score": 8,
|
||||
"item_id": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -89,7 +89,7 @@
|
||||
},
|
||||
{
|
||||
"atlas_lv": 9,
|
||||
"atlas_score": 8000,
|
||||
"atlas_score": 9,
|
||||
"item_id": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -100,7 +100,7 @@
|
||||
},
|
||||
{
|
||||
"atlas_lv": 10,
|
||||
"atlas_score": 9000,
|
||||
"atlas_score": 10,
|
||||
"item_id": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -111,7 +111,7 @@
|
||||
},
|
||||
{
|
||||
"atlas_lv": 11,
|
||||
"atlas_score": 10000,
|
||||
"atlas_score": 11,
|
||||
"item_id": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -122,7 +122,7 @@
|
||||
},
|
||||
{
|
||||
"atlas_lv": 12,
|
||||
"atlas_score": 11000,
|
||||
"atlas_score": 12,
|
||||
"item_id": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -133,7 +133,7 @@
|
||||
},
|
||||
{
|
||||
"atlas_lv": 13,
|
||||
"atlas_score": 12000,
|
||||
"atlas_score": 13,
|
||||
"item_id": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -144,7 +144,7 @@
|
||||
},
|
||||
{
|
||||
"atlas_lv": 14,
|
||||
"atlas_score": 13000,
|
||||
"atlas_score": 14,
|
||||
"item_id": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -155,7 +155,7 @@
|
||||
},
|
||||
{
|
||||
"atlas_lv": 15,
|
||||
"atlas_score": 14000,
|
||||
"atlas_score": 15,
|
||||
"item_id": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -166,7 +166,7 @@
|
||||
},
|
||||
{
|
||||
"atlas_lv": 16,
|
||||
"atlas_score": 15000,
|
||||
"atlas_score": 16,
|
||||
"item_id": [
|
||||
{
|
||||
"a": "attr",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -18,6 +18,8 @@ const (
|
||||
game_equipcompose = "game_equipcompose.json" //装备锻造
|
||||
game_equipattribute = "game_equipattribute.json" //装备技能列表
|
||||
game_equipenchanting = "game_equipenchanting.json" //装备附魔
|
||||
game_sellcoefficient = "game_sellcoefficient.json" //装备出售品质系数
|
||||
|
||||
)
|
||||
|
||||
///背包配置管理组件
|
||||
@ -39,6 +41,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
|
||||
this.LoadConfigure(game_equipcompose, cfg.NewGameEquipSCompose)
|
||||
this.LoadConfigure(game_equipattribute, cfg.NewGameEquipAttribute)
|
||||
this.LoadConfigure(game_equipenchanting, cfg.NewGameEquipEnchanting)
|
||||
this.LoadConfigure(game_sellcoefficient, cfg.NewGameSellCoefficient)
|
||||
configure.RegisterConfigure(game_equip, cfg.NewGameEquip, func() {
|
||||
this.equiplock.Lock()
|
||||
if v, err := this.GetConfigure(game_equip); err != nil {
|
||||
@ -282,8 +285,25 @@ func (this *configureComp) getEquipenchanting(id string) (result *cfg.GameEquipE
|
||||
} else {
|
||||
if result, ok = v.(*cfg.GameEquipEnchanting).GetDataMap()[id]; !ok {
|
||||
err = fmt.Errorf("on found getEquipenchanting id:%s", id)
|
||||
return
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
//读取装备出售系数配置
|
||||
func (this *configureComp) getSellcoefficient(id int32) (result *cfg.GameSellCoefficientData, err error) {
|
||||
var (
|
||||
v interface{}
|
||||
ok bool
|
||||
)
|
||||
if v, err = this.GetConfigure(game_sellcoefficient); err != nil {
|
||||
this.module.Errorf("err:%v", err)
|
||||
return
|
||||
} else {
|
||||
if result, ok = v.(*cfg.GameSellCoefficient).GetDataMap()[id]; !ok {
|
||||
err = fmt.Errorf("on found getSellcoefficient id:%d", id)
|
||||
return
|
||||
}
|
||||
}
|
||||
return
|
||||
|
||||
@ -235,6 +235,7 @@ func (this *Equipment) RecycleEquipments(session comm.IUserSession, equs []strin
|
||||
var (
|
||||
err error
|
||||
equipments []*pb.DB_Equipment
|
||||
sellconf *cfg.GameSellCoefficientData
|
||||
confs []*cfg.GameEquipData
|
||||
sale [][]*cfg.Gameatn
|
||||
)
|
||||
@ -252,19 +253,24 @@ func (this *Equipment) RecycleEquipments(session comm.IUserSession, equs []strin
|
||||
}
|
||||
if confs[i], err = this.configure.GetEquipmentConfigureById(v.CId); err != nil {
|
||||
this.Errorln(err)
|
||||
code = pb.ErrorCode_EquipmentOnFoundEquipment
|
||||
code = pb.ErrorCode_ConfigNoFound
|
||||
return
|
||||
}
|
||||
if confs[i].SmithySale == nil || len(confs[i].SmithySale) == 0 {
|
||||
code = pb.ErrorCode_EquipmentNoCanSell
|
||||
return
|
||||
}
|
||||
if sellconf, err = this.configure.getSellcoefficient(int32(len(v.AdverbEntry) + 1)); err != nil {
|
||||
this.Errorln(err)
|
||||
code = pb.ErrorCode_ConfigNoFound
|
||||
return
|
||||
}
|
||||
sale[i] = make([]*cfg.Gameatn, len(confs[i].Sale))
|
||||
for n, s := range confs[i].SmithySale {
|
||||
_s := &cfg.Gameatn{
|
||||
A: s.A,
|
||||
T: s.T,
|
||||
N: int32(math.Floor(float64(s.N) * float64(discount+1000) / float64(1000))),
|
||||
N: int32(math.Floor(float64(s.N) * (float64(discount+1000) / float64(1000)) * (float64(sellconf.Coefficient) / float64(1000)))),
|
||||
}
|
||||
sale[i][n] = _s
|
||||
}
|
||||
|
||||
@ -16,6 +16,7 @@ type GameRdtaskCondiData struct {
|
||||
Tasktxt string
|
||||
Type int32
|
||||
Valid int32
|
||||
NPC int32
|
||||
Data1 int32
|
||||
Data2 int32
|
||||
Data3 int32
|
||||
@ -35,6 +36,7 @@ func (_v *GameRdtaskCondiData)Deserialize(_buf map[string]interface{}) (err erro
|
||||
{ var _ok_ bool; if _v.Tasktxt, _ok_ = _buf["tasktxt"].(string); !_ok_ { err = errors.New("tasktxt error"); return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["valid"].(float64); !_ok_ { err = errors.New("valid error"); return }; _v.Valid = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["NPC"].(float64); !_ok_ { err = errors.New("NPC error"); return }; _v.NPC = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data1"].(float64); !_ok_ { err = errors.New("data1 error"); return }; _v.Data1 = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data2"].(float64); !_ok_ { err = errors.New("data2 error"); return }; _v.Data2 = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data3"].(float64); !_ok_ { err = errors.New("data3 error"); return }; _v.Data3 = int32(_tempNum_) }
|
||||
|
||||
42
sys/configure/structs/Game.SellCoefficient.go
Normal file
42
sys/configure/structs/Game.SellCoefficient.go
Normal file
@ -0,0 +1,42 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
package cfg
|
||||
|
||||
type GameSellCoefficient struct {
|
||||
_dataMap map[int32]*GameSellCoefficientData
|
||||
_dataList []*GameSellCoefficientData
|
||||
}
|
||||
|
||||
func NewGameSellCoefficient(_buf []map[string]interface{}) (*GameSellCoefficient, error) {
|
||||
_dataList := make([]*GameSellCoefficientData, 0, len(_buf))
|
||||
dataMap := make(map[int32]*GameSellCoefficientData)
|
||||
for _, _ele_ := range _buf {
|
||||
if _v, err2 := DeserializeGameSellCoefficientData(_ele_); err2 != nil {
|
||||
return nil, err2
|
||||
} else {
|
||||
_dataList = append(_dataList, _v)
|
||||
dataMap[_v.Character] = _v
|
||||
}
|
||||
}
|
||||
return &GameSellCoefficient{_dataList:_dataList, _dataMap:dataMap}, nil
|
||||
}
|
||||
|
||||
func (table *GameSellCoefficient) GetDataMap() map[int32]*GameSellCoefficientData {
|
||||
return table._dataMap
|
||||
}
|
||||
|
||||
func (table *GameSellCoefficient) GetDataList() []*GameSellCoefficientData {
|
||||
return table._dataList
|
||||
}
|
||||
|
||||
func (table *GameSellCoefficient) Get(key int32) *GameSellCoefficientData {
|
||||
return table._dataMap[key]
|
||||
}
|
||||
|
||||
|
||||
37
sys/configure/structs/Game.SellCoefficientData.go
Normal file
37
sys/configure/structs/Game.SellCoefficientData.go
Normal file
@ -0,0 +1,37 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
package cfg
|
||||
|
||||
import "errors"
|
||||
|
||||
type GameSellCoefficientData struct {
|
||||
Character int32
|
||||
Coefficient int32
|
||||
}
|
||||
|
||||
const TypeId_GameSellCoefficientData = 46519505
|
||||
|
||||
func (*GameSellCoefficientData) GetTypeId() int32 {
|
||||
return 46519505
|
||||
}
|
||||
|
||||
func (_v *GameSellCoefficientData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["character"].(float64); !_ok_ { err = errors.New("character error"); return }; _v.Character = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["coefficient"].(float64); !_ok_ { err = errors.New("coefficient error"); return }; _v.Coefficient = int32(_tempNum_) }
|
||||
return
|
||||
}
|
||||
|
||||
func DeserializeGameSellCoefficientData(_buf map[string]interface{}) (*GameSellCoefficientData, error) {
|
||||
v := &GameSellCoefficientData{}
|
||||
if err := v.Deserialize(_buf); err == nil {
|
||||
return v, nil
|
||||
} else {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user