Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng
This commit is contained in:
commit
8804225486
@ -8,7 +8,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt1",
|
||||
"taskcd": 200,
|
||||
"tasktime": 138,
|
||||
"tasktime": 168,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -56,7 +56,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt2",
|
||||
"taskcd": 200,
|
||||
"tasktime": 163,
|
||||
"tasktime": 124,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -104,7 +104,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt3",
|
||||
"taskcd": 200,
|
||||
"tasktime": 164,
|
||||
"tasktime": 125,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -152,7 +152,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt4",
|
||||
"taskcd": 200,
|
||||
"tasktime": 105,
|
||||
"tasktime": 169,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -200,7 +200,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt5",
|
||||
"taskcd": 200,
|
||||
"tasktime": 101,
|
||||
"tasktime": 176,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -248,7 +248,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt6",
|
||||
"taskcd": 200,
|
||||
"tasktime": 157,
|
||||
"tasktime": 97,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -296,7 +296,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt7",
|
||||
"taskcd": 200,
|
||||
"tasktime": 138,
|
||||
"tasktime": 66,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -344,7 +344,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt1",
|
||||
"taskcd": 200,
|
||||
"tasktime": 133,
|
||||
"tasktime": 173,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -392,7 +392,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt2",
|
||||
"taskcd": 200,
|
||||
"tasktime": 144,
|
||||
"tasktime": 104,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -440,7 +440,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt3",
|
||||
"taskcd": 200,
|
||||
"tasktime": 155,
|
||||
"tasktime": 77,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -488,7 +488,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt4",
|
||||
"taskcd": 200,
|
||||
"tasktime": 127,
|
||||
"tasktime": 180,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -536,7 +536,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt5",
|
||||
"taskcd": 200,
|
||||
"tasktime": 115,
|
||||
"tasktime": 91,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -584,7 +584,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt6",
|
||||
"taskcd": 200,
|
||||
"tasktime": 176,
|
||||
"tasktime": 129,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -632,7 +632,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt7",
|
||||
"taskcd": 200,
|
||||
"tasktime": 61,
|
||||
"tasktime": 95,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -680,7 +680,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt1",
|
||||
"taskcd": 200,
|
||||
"tasktime": 80,
|
||||
"tasktime": 86,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -728,7 +728,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt2",
|
||||
"taskcd": 200,
|
||||
"tasktime": 127,
|
||||
"tasktime": 162,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -776,7 +776,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt3",
|
||||
"taskcd": 200,
|
||||
"tasktime": 96,
|
||||
"tasktime": 175,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -824,7 +824,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt4",
|
||||
"taskcd": 200,
|
||||
"tasktime": 89,
|
||||
"tasktime": 63,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -872,7 +872,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt5",
|
||||
"taskcd": 200,
|
||||
"tasktime": 145,
|
||||
"tasktime": 131,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -920,7 +920,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt6",
|
||||
"taskcd": 200,
|
||||
"tasktime": 107,
|
||||
"tasktime": 155,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -968,7 +968,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt7",
|
||||
"taskcd": 200,
|
||||
"tasktime": 82,
|
||||
"tasktime": 76,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -1016,7 +1016,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt1",
|
||||
"taskcd": 200,
|
||||
"tasktime": 129,
|
||||
"tasktime": 101,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -1064,7 +1064,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt2",
|
||||
"taskcd": 200,
|
||||
"tasktime": 176,
|
||||
"tasktime": 158,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -1112,7 +1112,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt3",
|
||||
"taskcd": 200,
|
||||
"tasktime": 102,
|
||||
"tasktime": 172,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -1160,7 +1160,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt4",
|
||||
"taskcd": 200,
|
||||
"tasktime": 155,
|
||||
"tasktime": 116,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -1208,7 +1208,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt5",
|
||||
"taskcd": 200,
|
||||
"tasktime": 93,
|
||||
"tasktime": 81,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -1256,7 +1256,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt6",
|
||||
"taskcd": 200,
|
||||
"tasktime": 167,
|
||||
"tasktime": 60,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -1304,7 +1304,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt7",
|
||||
"taskcd": 200,
|
||||
"tasktime": 86,
|
||||
"tasktime": 134,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -1352,7 +1352,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt1",
|
||||
"taskcd": 200,
|
||||
"tasktime": 153,
|
||||
"tasktime": 125,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -1400,7 +1400,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt2",
|
||||
"taskcd": 200,
|
||||
"tasktime": 146,
|
||||
"tasktime": 131,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -1448,7 +1448,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt3",
|
||||
"taskcd": 200,
|
||||
"tasktime": 115,
|
||||
"tasktime": 118,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -1496,7 +1496,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt4",
|
||||
"taskcd": 200,
|
||||
"tasktime": 115,
|
||||
"tasktime": 148,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -1544,7 +1544,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt5",
|
||||
"taskcd": 200,
|
||||
"tasktime": 139,
|
||||
"tasktime": 64,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -1592,7 +1592,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt6",
|
||||
"taskcd": 200,
|
||||
"tasktime": 177,
|
||||
"tasktime": 110,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -1640,7 +1640,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt7",
|
||||
"taskcd": 200,
|
||||
"tasktime": 137,
|
||||
"tasktime": 151,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -1688,7 +1688,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt1",
|
||||
"taskcd": 200,
|
||||
"tasktime": 121,
|
||||
"tasktime": 101,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -1736,7 +1736,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt2",
|
||||
"taskcd": 200,
|
||||
"tasktime": 97,
|
||||
"tasktime": 96,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -1784,7 +1784,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt3",
|
||||
"taskcd": 200,
|
||||
"tasktime": 174,
|
||||
"tasktime": 61,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -1832,7 +1832,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt4",
|
||||
"taskcd": 200,
|
||||
"tasktime": 63,
|
||||
"tasktime": 151,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -1880,7 +1880,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt5",
|
||||
"taskcd": 200,
|
||||
"tasktime": 116,
|
||||
"tasktime": 85,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -1928,7 +1928,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt6",
|
||||
"taskcd": 200,
|
||||
"tasktime": 171,
|
||||
"tasktime": 132,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -1976,7 +1976,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt7",
|
||||
"taskcd": 200,
|
||||
"tasktime": 92,
|
||||
"tasktime": 74,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -2024,7 +2024,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt1",
|
||||
"taskcd": 200,
|
||||
"tasktime": 75,
|
||||
"tasktime": 98,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -2072,7 +2072,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt2",
|
||||
"taskcd": 200,
|
||||
"tasktime": 102,
|
||||
"tasktime": 153,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -2120,7 +2120,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt3",
|
||||
"taskcd": 200,
|
||||
"tasktime": 86,
|
||||
"tasktime": 162,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -2168,7 +2168,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt4",
|
||||
"taskcd": 200,
|
||||
"tasktime": 60,
|
||||
"tasktime": 117,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -2216,7 +2216,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt5",
|
||||
"taskcd": 200,
|
||||
"tasktime": 117,
|
||||
"tasktime": 71,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -2264,7 +2264,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt6",
|
||||
"taskcd": 200,
|
||||
"tasktime": 118,
|
||||
"tasktime": 119,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -2312,7 +2312,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt7",
|
||||
"taskcd": 200,
|
||||
"tasktime": 170,
|
||||
"tasktime": 166,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -2360,7 +2360,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt1",
|
||||
"taskcd": 200,
|
||||
"tasktime": 107,
|
||||
"tasktime": 100,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -2408,7 +2408,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt2",
|
||||
"taskcd": 200,
|
||||
"tasktime": 73,
|
||||
"tasktime": 148,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -2456,7 +2456,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt3",
|
||||
"taskcd": 200,
|
||||
"tasktime": 114,
|
||||
"tasktime": 154,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -2504,7 +2504,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt4",
|
||||
"taskcd": 200,
|
||||
"tasktime": 99,
|
||||
"tasktime": 119,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -2552,7 +2552,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt5",
|
||||
"taskcd": 200,
|
||||
"tasktime": 106,
|
||||
"tasktime": 93,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -2600,7 +2600,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt6",
|
||||
"taskcd": 200,
|
||||
"tasktime": 136,
|
||||
"tasktime": 163,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -2648,7 +2648,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt7",
|
||||
"taskcd": 200,
|
||||
"tasktime": 96,
|
||||
"tasktime": 180,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -2696,7 +2696,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt1",
|
||||
"taskcd": 200,
|
||||
"tasktime": 114,
|
||||
"tasktime": 104,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -2744,7 +2744,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt2",
|
||||
"taskcd": 200,
|
||||
"tasktime": 109,
|
||||
"tasktime": 119,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -2792,7 +2792,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt3",
|
||||
"taskcd": 200,
|
||||
"tasktime": 80,
|
||||
"tasktime": 103,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -2840,7 +2840,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt4",
|
||||
"taskcd": 200,
|
||||
"tasktime": 172,
|
||||
"tasktime": 164,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -2888,7 +2888,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt5",
|
||||
"taskcd": 200,
|
||||
"tasktime": 103,
|
||||
"tasktime": 90,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -2936,7 +2936,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt6",
|
||||
"taskcd": 200,
|
||||
"tasktime": 157,
|
||||
"tasktime": 113,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -2984,7 +2984,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt7",
|
||||
"taskcd": 200,
|
||||
"tasktime": 154,
|
||||
"tasktime": 138,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -3032,7 +3032,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt1",
|
||||
"taskcd": 200,
|
||||
"tasktime": 82,
|
||||
"tasktime": 178,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -3080,7 +3080,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt2",
|
||||
"taskcd": 200,
|
||||
"tasktime": 135,
|
||||
"tasktime": 113,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -3128,7 +3128,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt3",
|
||||
"taskcd": 200,
|
||||
"tasktime": 63,
|
||||
"tasktime": 165,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -3176,7 +3176,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt4",
|
||||
"taskcd": 200,
|
||||
"tasktime": 137,
|
||||
"tasktime": 155,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -3224,7 +3224,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt5",
|
||||
"taskcd": 200,
|
||||
"tasktime": 121,
|
||||
"tasktime": 107,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -3272,7 +3272,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt6",
|
||||
"taskcd": 200,
|
||||
"tasktime": 119,
|
||||
"tasktime": 141,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -3320,7 +3320,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt7",
|
||||
"taskcd": 200,
|
||||
"tasktime": 89,
|
||||
"tasktime": 70,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
@ -3368,7 +3368,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt1",
|
||||
"taskcd": 200,
|
||||
"tasktime": 72,
|
||||
"tasktime": 115,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Tiger",
|
||||
"text": "这是属于悍娇虎的专属委托"
|
||||
@ -3416,7 +3416,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt2",
|
||||
"taskcd": 200,
|
||||
"tasktime": 134,
|
||||
"tasktime": 65,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Shifu",
|
||||
"text": "这是属于师父的专属委托"
|
||||
@ -3464,7 +3464,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt3",
|
||||
"taskcd": 200,
|
||||
"tasktime": 128,
|
||||
"tasktime": 160,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Po",
|
||||
"text": "这是属于阿宝的专属委托"
|
||||
@ -3512,7 +3512,7 @@
|
||||
},
|
||||
"icon": "xmwg_rw_pt4",
|
||||
"taskcd": 200,
|
||||
"tasktime": 98,
|
||||
"tasktime": 106,
|
||||
"tasktxt": {
|
||||
"key": "Entrustment details of Bobi",
|
||||
"text": "这是属于波比的专属委托"
|
||||
|
||||
@ -3490,12 +3490,12 @@
|
||||
},
|
||||
"boxPos": {
|
||||
"x": 0,
|
||||
"y": 0.5,
|
||||
"y": 16,
|
||||
"z": 0
|
||||
},
|
||||
"boxSize": {
|
||||
"x": 1,
|
||||
"y": 1,
|
||||
"x": 28,
|
||||
"y": 20,
|
||||
"z": 1
|
||||
}
|
||||
},
|
||||
@ -3525,12 +3525,12 @@
|
||||
},
|
||||
"boxPos": {
|
||||
"x": 0,
|
||||
"y": 0.5,
|
||||
"y": 16,
|
||||
"z": 0
|
||||
},
|
||||
"boxSize": {
|
||||
"x": 1,
|
||||
"y": 1,
|
||||
"x": 28,
|
||||
"y": 20,
|
||||
"z": 1
|
||||
}
|
||||
},
|
||||
@ -3560,12 +3560,12 @@
|
||||
},
|
||||
"boxPos": {
|
||||
"x": 0,
|
||||
"y": 0.5,
|
||||
"y": 16,
|
||||
"z": 0
|
||||
},
|
||||
"boxSize": {
|
||||
"x": 1,
|
||||
"y": 1,
|
||||
"x": 28,
|
||||
"y": 20,
|
||||
"z": 1
|
||||
}
|
||||
},
|
||||
@ -3595,12 +3595,12 @@
|
||||
},
|
||||
"boxPos": {
|
||||
"x": 0,
|
||||
"y": 0.5,
|
||||
"y": 16,
|
||||
"z": 0
|
||||
},
|
||||
"boxSize": {
|
||||
"x": 1,
|
||||
"y": 1,
|
||||
"x": 28,
|
||||
"y": 20,
|
||||
"z": 1
|
||||
}
|
||||
},
|
||||
@ -3630,12 +3630,12 @@
|
||||
},
|
||||
"boxPos": {
|
||||
"x": 0,
|
||||
"y": 0.5,
|
||||
"y": 16,
|
||||
"z": 0
|
||||
},
|
||||
"boxSize": {
|
||||
"x": 1,
|
||||
"y": 1,
|
||||
"x": 28,
|
||||
"y": 20,
|
||||
"z": 1
|
||||
}
|
||||
},
|
||||
@ -3665,12 +3665,12 @@
|
||||
},
|
||||
"boxPos": {
|
||||
"x": 0,
|
||||
"y": 0.5,
|
||||
"y": 16,
|
||||
"z": 0
|
||||
},
|
||||
"boxSize": {
|
||||
"x": 1,
|
||||
"y": 1,
|
||||
"x": 28,
|
||||
"y": 20,
|
||||
"z": 1
|
||||
}
|
||||
},
|
||||
@ -3700,12 +3700,12 @@
|
||||
},
|
||||
"boxPos": {
|
||||
"x": 0,
|
||||
"y": 0.5,
|
||||
"y": 16,
|
||||
"z": 0
|
||||
},
|
||||
"boxSize": {
|
||||
"x": 1,
|
||||
"y": 1,
|
||||
"x": 28,
|
||||
"y": 20,
|
||||
"z": 1
|
||||
}
|
||||
},
|
||||
|
||||
@ -1051,7 +1051,7 @@
|
||||
"key": "opencond_prompt_Mystery",
|
||||
"text": "功能暂未开启"
|
||||
},
|
||||
"uiid": 0,
|
||||
"uiid": 903,
|
||||
"activateType": 0,
|
||||
"notify": []
|
||||
},
|
||||
@ -1660,5 +1660,24 @@
|
||||
"uiid": 0,
|
||||
"activateType": 0,
|
||||
"notify": []
|
||||
},
|
||||
{
|
||||
"id": "vikingexpedition_experience",
|
||||
"name": {
|
||||
"key": "num_3008",
|
||||
"text": "经验副本"
|
||||
},
|
||||
"main": [],
|
||||
"optional": "",
|
||||
"wkqbx": 0,
|
||||
"kqbx": 0,
|
||||
"img": "",
|
||||
"prompt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"uiid": 10005,
|
||||
"activateType": 0,
|
||||
"notify": []
|
||||
}
|
||||
]
|
||||
@ -12,7 +12,7 @@
|
||||
},
|
||||
"ticks": 3,
|
||||
"ani": "fitness_action1",
|
||||
"p": 200,
|
||||
"p": 500,
|
||||
"before_training": 25003,
|
||||
"after_training": 25004,
|
||||
"buff_group": 1000001
|
||||
@ -30,187 +30,7 @@
|
||||
},
|
||||
"ticks": 3,
|
||||
"ani": "fitness_action2",
|
||||
"p": 200,
|
||||
"before_training": 25003,
|
||||
"after_training": 25004,
|
||||
"buff_group": 1000001
|
||||
},
|
||||
{
|
||||
"id": 103,
|
||||
"name": {
|
||||
"key": "wuguandongzuo_103",
|
||||
"text": "肩部拉伸"
|
||||
},
|
||||
"icon": "开合跳",
|
||||
"des": {
|
||||
"key": "wuguandongzuo_开合跳",
|
||||
"text": "一只手臂放于胸前,与地面平行，另一只手臂将它拉向胸部。\n坚持一会儿，再拉伸另一侧肩膀，重复练习。"
|
||||
},
|
||||
"ticks": 3,
|
||||
"ani": "",
|
||||
"p": 200,
|
||||
"before_training": 25003,
|
||||
"after_training": 25004,
|
||||
"buff_group": 1000001
|
||||
},
|
||||
{
|
||||
"id": 104,
|
||||
"name": {
|
||||
"key": "wuguandongzuo_104",
|
||||
"text": "波比"
|
||||
},
|
||||
"icon": "手臂环绕",
|
||||
"des": {
|
||||
"key": "wuguandongzuo_手臂环绕",
|
||||
"text": "双脚与肩同宽，然后下蹲并双手着地,同时双腿向后蹬直。\n快速做一个俯卧撑的动作，然后起身向上跳起。重复这套动作。"
|
||||
},
|
||||
"ticks": 3,
|
||||
"ani": "",
|
||||
"p": 200,
|
||||
"before_training": 25003,
|
||||
"after_training": 25004,
|
||||
"buff_group": 1000001
|
||||
},
|
||||
{
|
||||
"id": 105,
|
||||
"name": {
|
||||
"key": "wuguandongzuo_105",
|
||||
"text": "交错俯卧撑"
|
||||
},
|
||||
"icon": "开合跳",
|
||||
"des": {
|
||||
"key": "wuguandongzuo_开合跳",
|
||||
"text": "从标准的俯卧撑姿势开始，但两只手一前一后。\n双臂做一个俯卧撑的动作，然后换另一只手靠前。注意身体要保持成一条直线的状态。"
|
||||
},
|
||||
"ticks": 3,
|
||||
"ani": "",
|
||||
"p": 200,
|
||||
"before_training": 25003,
|
||||
"after_training": 25004,
|
||||
"buff_group": 1000001
|
||||
},
|
||||
{
|
||||
"id": 106,
|
||||
"name": {
|
||||
"key": "wuguandongzuo_106",
|
||||
"text": "钻石俯卧撑"
|
||||
},
|
||||
"icon": "手臂环绕",
|
||||
"des": {
|
||||
"key": "wuguandongzuo_手臂环绕",
|
||||
"text": "四肢着地,双手的食指和拇指分别相对,放于脸颊下方。\n身体保持呈一条直线，然后做俯卧撑动作。"
|
||||
},
|
||||
"ticks": 3,
|
||||
"ani": "",
|
||||
"p": 200,
|
||||
"before_training": 25003,
|
||||
"after_training": 25004,
|
||||
"buff_group": 1000001
|
||||
},
|
||||
{
|
||||
"id": 107,
|
||||
"name": {
|
||||
"key": "wuguandongzuo_107",
|
||||
"text": "掌上压后转身"
|
||||
},
|
||||
"icon": "开合跳",
|
||||
"des": {
|
||||
"key": "wuguandongzuo_开合跳",
|
||||
"text": "从标准的俯卧撑姿势开始。向下做一个俯卧撑动作,起身的同时，旋转上半身，并将右臂向上伸直。\n然后换另一条手臂重复这一动作。这个动作能够锻炼你的胸部、肩膀和手臂,同时也能锻炼腹部肌肉。"
|
||||
},
|
||||
"ticks": 3,
|
||||
"ani": "",
|
||||
"p": 200,
|
||||
"before_training": 25003,
|
||||
"after_training": 25004,
|
||||
"buff_group": 1000001
|
||||
},
|
||||
{
|
||||
"id": 108,
|
||||
"name": {
|
||||
"key": "wuguandongzuo_108",
|
||||
"text": "眼镜蛇式拉伸"
|
||||
},
|
||||
"icon": "手臂环绕",
|
||||
"des": {
|
||||
"key": "wuguandongzuo_手臂环绕",
|
||||
"text": "腹部向下俯卧，肘部弯曲，双手放置在肩膀下方。\n然后胸部离地,尽量伸展。保持这个姿势数秒。"
|
||||
},
|
||||
"ticks": 3,
|
||||
"ani": "",
|
||||
"p": 200,
|
||||
"before_training": 25003,
|
||||
"after_training": 25004,
|
||||
"buff_group": 1000001
|
||||
},
|
||||
{
|
||||
"id": 109,
|
||||
"name": {
|
||||
"key": "wuguandongzuo_109",
|
||||
"text": "胸部拉伸"
|
||||
},
|
||||
"icon": "开合跳",
|
||||
"des": {
|
||||
"key": "wuguandongzuo_开合跳",
|
||||
"text": "站在门前，腿部呈弓步姿势，两臂倚在门框上，两肘略低于肩膀,胸部慢慢向前移。\n坚持30至40秒。慢慢还原姿势,手臂自然放下，再做几圈摆臂练习。"
|
||||
},
|
||||
"ticks": 3,
|
||||
"ani": "",
|
||||
"p": 200,
|
||||
"before_training": 25003,
|
||||
"after_training": 25004,
|
||||
"buff_group": 1000001
|
||||
},
|
||||
{
|
||||
"id": 110,
|
||||
"name": {
|
||||
"key": "wuguandongzuo_110",
|
||||
"text": "原地跑"
|
||||
},
|
||||
"icon": "手臂环绕",
|
||||
"des": {
|
||||
"key": "wuguandongzuo_手臂环绕",
|
||||
"text": "原地跑"
|
||||
},
|
||||
"ticks": 3,
|
||||
"ani": "",
|
||||
"p": 200,
|
||||
"before_training": 25003,
|
||||
"after_training": 25004,
|
||||
"buff_group": 1000001
|
||||
},
|
||||
{
|
||||
"id": 111,
|
||||
"name": {
|
||||
"key": "wuguandongzuo_111",
|
||||
"text": "深蹲"
|
||||
},
|
||||
"icon": "开合跳",
|
||||
"des": {
|
||||
"key": "wuguandongzuo_开合跳",
|
||||
"text": "深蹲"
|
||||
},
|
||||
"ticks": 3,
|
||||
"ani": "",
|
||||
"p": 200,
|
||||
"before_training": 25003,
|
||||
"after_training": 25004,
|
||||
"buff_group": 1000001
|
||||
},
|
||||
{
|
||||
"id": 112,
|
||||
"name": {
|
||||
"key": "wuguandongzuo_112",
|
||||
"text": "仰卧起坐"
|
||||
},
|
||||
"icon": "手臂环绕",
|
||||
"des": {
|
||||
"key": "wuguandongzuo_手臂环绕",
|
||||
"text": "仰卧起坐"
|
||||
},
|
||||
"ticks": 3,
|
||||
"ani": "",
|
||||
"p": 200,
|
||||
"p": 500,
|
||||
"before_training": 25003,
|
||||
"after_training": 25004,
|
||||
"buff_group": 1000001
|
||||
|
||||
44
modules/parkour/api_getreward.go
Normal file
44
modules/parkour/api_getreward.go
Normal file
@ -0,0 +1,44 @@
|
||||
package parkour
|
||||
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
)
|
||||
|
||||
//参数校验
|
||||
func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.ParkourGetRewardReq) (code pb.ErrorCode) {
|
||||
return
|
||||
}
|
||||
|
||||
///积分领奖
|
||||
func (this *apiComp) GetReward(session comm.IUserSession, req *pb.ParkourGetRewardReq) (code pb.ErrorCode, data *pb.ErrorData) {
|
||||
var (
|
||||
info *pb.DBParkour
|
||||
err error
|
||||
)
|
||||
if code = this.GetRewardCheck(session, req); code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
if info, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil {
|
||||
code = pb.ErrorCode_DBError
|
||||
return
|
||||
}
|
||||
_conf := this.module.configure.getGameBuzkashiReward(req.Id)
|
||||
if _conf == nil {
|
||||
code = pb.ErrorCode_ConfigNoFound
|
||||
return
|
||||
}
|
||||
if _conf.Schedule <= info.Integral && (info.Reward+1 == req.Id) {
|
||||
info.Reward += 1
|
||||
if err = this.module.parkourComp.Change(session.GetUserId(), map[string]interface{}{
|
||||
"reward": info.Reward,
|
||||
}); err != nil {
|
||||
code = pb.ErrorCode_DBError
|
||||
return
|
||||
}
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), "getreward", &pb.ParkourGetRewardResp{
|
||||
Info: info,
|
||||
})
|
||||
return
|
||||
}
|
||||
42
modules/parkour/api_viewplayer.go
Normal file
42
modules/parkour/api_viewplayer.go
Normal file
@ -0,0 +1,42 @@
|
||||
package parkour
|
||||
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
)
|
||||
|
||||
//参数校验
|
||||
func (this *apiComp) ViewPlayerCheck(session comm.IUserSession, req *pb.ParkourViewPlayerReq) (code pb.ErrorCode) {
|
||||
return
|
||||
}
|
||||
|
||||
///游戏
|
||||
func (this *apiComp) ViewPlayer(session comm.IUserSession, req *pb.ParkourViewPlayerReq) (code pb.ErrorCode, data *pb.ErrorData) {
|
||||
var (
|
||||
resp *pb.ParkourViewPlayerResp
|
||||
)
|
||||
if code = this.ViewPlayerCheck(session, req); code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
|
||||
for _, uid := range req.Uid {
|
||||
if u := this.module.ModuleUser.GetUser(uid); u != nil {
|
||||
{
|
||||
bOnline := false
|
||||
if _, ok := this.module.GetUserSession(uid); ok {
|
||||
bOnline = true
|
||||
}
|
||||
resp.Player = append(resp.Player, &pb.ParkourData{
|
||||
Uid: uid,
|
||||
Name: u.Name,
|
||||
Avatar: u.Avatar,
|
||||
Lv: u.Lv,
|
||||
IsOnline: bOnline, // 检查是否在线
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
session.SendMsg(string(this.module.GetType()), "viewplayer", resp)
|
||||
return
|
||||
}
|
||||
@ -26,7 +26,7 @@ type configureComp struct {
|
||||
func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
|
||||
this.MCompConfigure.Init(service, module, comp, options)
|
||||
this.module = module.(*Parkour)
|
||||
this.LoadConfigure(game_buzkashiopen, cfg.NewGamebuzkashiOpen)
|
||||
this.LoadConfigure(game_buzkashiopen, cfg.NewGameBuzkashiOpen)
|
||||
this.LoadConfigure(game_buzkashigrade, cfg.NewGameBuzkashiGrade)
|
||||
this.LoadConfigure(game_buzkashilv, cfg.NewGameBuzkashiLv)
|
||||
this.LoadConfigure(game_buzkashimount, cfg.NewGameBuzkashiMount)
|
||||
@ -38,7 +38,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
|
||||
func (this *configureComp) isopen() (open bool) {
|
||||
var (
|
||||
v interface{}
|
||||
config *cfg.GamebuzkashiOpen
|
||||
config *cfg.GameBuzkashiOpen
|
||||
currtime string = configure.Now().Format("15:04")
|
||||
err error
|
||||
ok bool
|
||||
@ -47,7 +47,7 @@ func (this *configureComp) isopen() (open bool) {
|
||||
this.module.Errorln(err)
|
||||
return
|
||||
} else {
|
||||
if config, ok = v.(*cfg.GamebuzkashiOpen); !ok {
|
||||
if config, ok = v.(*cfg.GameBuzkashiOpen); !ok {
|
||||
err = fmt.Errorf("config type err:%T", v)
|
||||
return
|
||||
} else {
|
||||
@ -80,3 +80,15 @@ func (this *configureComp) getGameBuzkashiMount(id string) (configure *cfg.GameB
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func (this *configureComp) getGameBuzkashiReward(id int32) (configure *cfg.GameBuzkashiRewardData) {
|
||||
if v, err := this.GetConfigure(game_buzkashireward); err == nil {
|
||||
var ok bool
|
||||
if configure, ok = v.(*cfg.GameBuzkashiReward).GetDataMap()[id]; !ok {
|
||||
err = fmt.Errorf("not found:%d ", id)
|
||||
this.module.Errorln(err)
|
||||
return
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
@ -334,6 +334,7 @@ type DBParkour struct {
|
||||
Captainid string `protobuf:"bytes,8,opt,name=captainid,proto3" json:"captainid"` //队长id 当前所在队伍
|
||||
Invite []*DBRaceInvite `protobuf:"bytes,9,rep,name=invite,proto3" json:"invite"` //邀请列表
|
||||
Member []*DBRaceMember `protobuf:"bytes,10,rep,name=member,proto3" json:"member"` //成员列表
|
||||
Reward int32 `protobuf:"varint,11,opt,name=reward,proto3" json:"reward"` // 积分信息奖励
|
||||
}
|
||||
|
||||
func (x *DBParkour) Reset() {
|
||||
@ -438,6 +439,13 @@ func (x *DBParkour) GetMember() []*DBRaceMember {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *DBParkour) GetReward() int32 {
|
||||
if x != nil {
|
||||
return x.Reward
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
//比赛数据
|
||||
type DBRace struct {
|
||||
state protoimpl.MessageState
|
||||
@ -560,7 +568,7 @@ var file_parkour_parkour_db_proto_rawDesc = []byte{
|
||||
0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c,
|
||||
0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x65,
|
||||
0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x78,
|
||||
0x70, 0x69, 0x72, 0x65, 0x64, 0x22, 0x80, 0x03, 0x0a, 0x09, 0x44, 0x42, 0x50, 0x61, 0x72, 0x6b,
|
||||
0x70, 0x69, 0x72, 0x65, 0x64, 0x22, 0x98, 0x03, 0x0a, 0x09, 0x44, 0x42, 0x50, 0x61, 0x72, 0x6b,
|
||||
0x6f, 0x75, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
|
||||
0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x06, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18,
|
||||
@ -580,34 +588,35 @@ var file_parkour_parkour_db_proto_rawDesc = []byte{
|
||||
0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x52, 0x06,
|
||||
0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x12, 0x25, 0x0a, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72,
|
||||
0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d,
|
||||
0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x1a, 0x39, 0x0a,
|
||||
0x0b, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
|
||||
0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
|
||||
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76,
|
||||
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xef, 0x01, 0x0a, 0x06, 0x44, 0x42, 0x52,
|
||||
0x61, 0x63, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
|
||||
0x02, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61,
|
||||
0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
|
||||
0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x1f, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03,
|
||||
0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52,
|
||||
0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69,
|
||||
0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64,
|
||||
0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x6d, 0x6f, 0x73, 0x74, 0x18, 0x05, 0x20,
|
||||
0x01, 0x28, 0x05, 0x52, 0x09, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x6d, 0x6f, 0x73, 0x74, 0x12, 0x2b,
|
||||
0x0a, 0x09, 0x72, 0x65, 0x64, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x06, 0x20, 0x03, 0x28,
|
||||
0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72,
|
||||
0x52, 0x09, 0x72, 0x65, 0x64, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x2d, 0x0a, 0x0a, 0x62,
|
||||
0x75, 0x6c, 0x65, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32,
|
||||
0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x0a,
|
||||
0x62, 0x75, 0x6c, 0x65, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x2a, 0x22, 0x0a, 0x08, 0x52, 0x61,
|
||||
0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0c, 0x0a, 0x08, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61,
|
||||
0x72, 0x79, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x70, 0x72, 0x6f, 0x70, 0x10, 0x01, 0x2a, 0x44,
|
||||
0x0a, 0x0d, 0x52, 0x61, 0x63, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12,
|
||||
0x0b, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07,
|
||||
0x74, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x6d, 0x61, 0x74,
|
||||
0x63, 0x68, 0x69, 0x6e, 0x67, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x72, 0x61, 0x63, 0x65, 0x69,
|
||||
0x6e, 0x67, 0x10, 0x03, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
|
||||
0x6f, 0x74, 0x6f, 0x33,
|
||||
0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x16, 0x0a,
|
||||
0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x72,
|
||||
0x65, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x39, 0x0a, 0x0b, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x45,
|
||||
0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||
0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
|
||||
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
|
||||
0x22, 0xef, 0x01, 0x0a, 0x06, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69,
|
||||
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x73,
|
||||
0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x1f, 0x0a,
|
||||
0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x52,
|
||||
0x61, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18,
|
||||
0x0a, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x6e, 0x65,
|
||||
0x72, 0x6d, 0x6f, 0x73, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x69, 0x6e, 0x6e,
|
||||
0x65, 0x72, 0x6d, 0x6f, 0x73, 0x74, 0x12, 0x2b, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x6d, 0x65, 0x6d,
|
||||
0x62, 0x65, 0x72, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61,
|
||||
0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x09, 0x72, 0x65, 0x64, 0x6d, 0x65, 0x6d,
|
||||
0x62, 0x65, 0x72, 0x12, 0x2d, 0x0a, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x6d, 0x65, 0x6d, 0x62, 0x65,
|
||||
0x72, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65,
|
||||
0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x6d, 0x65, 0x6d, 0x62,
|
||||
0x65, 0x72, 0x2a, 0x22, 0x0a, 0x08, 0x52, 0x61, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0c,
|
||||
0x0a, 0x08, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04,
|
||||
0x70, 0x72, 0x6f, 0x70, 0x10, 0x01, 0x2a, 0x44, 0x0a, 0x0d, 0x52, 0x61, 0x63, 0x65, 0x54, 0x65,
|
||||
0x61, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x74, 0x69,
|
||||
0x6e, 0x67, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x10,
|
||||
0x01, 0x12, 0x0c, 0x0a, 0x08, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x10, 0x02, 0x12,
|
||||
0x0b, 0x0a, 0x07, 0x72, 0x61, 0x63, 0x65, 0x69, 0x6e, 0x67, 0x10, 0x03, 0x42, 0x06, 0x5a, 0x04,
|
||||
0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
|
||||
1141
pb/parkour_msg.pb.go
1141
pb/parkour_msg.pb.go
File diff suppressed because it is too large
Load Diff
@ -8,34 +8,34 @@
|
||||
|
||||
package cfg
|
||||
|
||||
type GamebuzkashiOpen struct {
|
||||
_dataMap map[int32]*GamebuzkashiOpenData
|
||||
_dataList []*GamebuzkashiOpenData
|
||||
type GameBuzkashiOpen struct {
|
||||
_dataMap map[int32]*GameBuzkashiOpenData
|
||||
_dataList []*GameBuzkashiOpenData
|
||||
}
|
||||
|
||||
func NewGamebuzkashiOpen(_buf []map[string]interface{}) (*GamebuzkashiOpen, error) {
|
||||
_dataList := make([]*GamebuzkashiOpenData, 0, len(_buf))
|
||||
dataMap := make(map[int32]*GamebuzkashiOpenData)
|
||||
func NewGameBuzkashiOpen(_buf []map[string]interface{}) (*GameBuzkashiOpen, error) {
|
||||
_dataList := make([]*GameBuzkashiOpenData, 0, len(_buf))
|
||||
dataMap := make(map[int32]*GameBuzkashiOpenData)
|
||||
for _, _ele_ := range _buf {
|
||||
if _v, err2 := DeserializeGamebuzkashiOpenData(_ele_); err2 != nil {
|
||||
if _v, err2 := DeserializeGameBuzkashiOpenData(_ele_); err2 != nil {
|
||||
return nil, err2
|
||||
} else {
|
||||
_dataList = append(_dataList, _v)
|
||||
dataMap[_v.Num] = _v
|
||||
}
|
||||
}
|
||||
return &GamebuzkashiOpen{_dataList:_dataList, _dataMap:dataMap}, nil
|
||||
return &GameBuzkashiOpen{_dataList:_dataList, _dataMap:dataMap}, nil
|
||||
}
|
||||
|
||||
func (table *GamebuzkashiOpen) GetDataMap() map[int32]*GamebuzkashiOpenData {
|
||||
func (table *GameBuzkashiOpen) GetDataMap() map[int32]*GameBuzkashiOpenData {
|
||||
return table._dataMap
|
||||
}
|
||||
|
||||
func (table *GamebuzkashiOpen) GetDataList() []*GamebuzkashiOpenData {
|
||||
func (table *GameBuzkashiOpen) GetDataList() []*GameBuzkashiOpenData {
|
||||
return table._dataList
|
||||
}
|
||||
|
||||
func (table *GamebuzkashiOpen) Get(key int32) *GamebuzkashiOpenData {
|
||||
func (table *GameBuzkashiOpen) Get(key int32) *GameBuzkashiOpenData {
|
||||
return table._dataMap[key]
|
||||
}
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@ package cfg
|
||||
|
||||
import "errors"
|
||||
|
||||
type GamebuzkashiOpenData struct {
|
||||
type GameBuzkashiOpenData struct {
|
||||
Num int32
|
||||
Shtime int32
|
||||
Smtime int32
|
||||
@ -18,13 +18,13 @@ type GamebuzkashiOpenData struct {
|
||||
Emtime int32
|
||||
}
|
||||
|
||||
const TypeId_GamebuzkashiOpenData = 1621393927
|
||||
const TypeId_GameBuzkashiOpenData = 778618407
|
||||
|
||||
func (*GamebuzkashiOpenData) GetTypeId() int32 {
|
||||
return 1621393927
|
||||
func (*GameBuzkashiOpenData) GetTypeId() int32 {
|
||||
return 778618407
|
||||
}
|
||||
|
||||
func (_v *GamebuzkashiOpenData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
func (_v *GameBuzkashiOpenData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["num"].(float64); !_ok_ { err = errors.New("num error"); return }; _v.Num = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["shtime"].(float64); !_ok_ { err = errors.New("shtime error"); return }; _v.Shtime = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["smtime"].(float64); !_ok_ { err = errors.New("smtime error"); return }; _v.Smtime = int32(_tempNum_) }
|
||||
@ -33,8 +33,8 @@ func (_v *GamebuzkashiOpenData)Deserialize(_buf map[string]interface{}) (err err
|
||||
return
|
||||
}
|
||||
|
||||
func DeserializeGamebuzkashiOpenData(_buf map[string]interface{}) (*GamebuzkashiOpenData, error) {
|
||||
v := &GamebuzkashiOpenData{}
|
||||
func DeserializeGameBuzkashiOpenData(_buf map[string]interface{}) (*GameBuzkashiOpenData, error) {
|
||||
v := &GameBuzkashiOpenData{}
|
||||
if err := v.Deserialize(_buf); err == nil {
|
||||
return v, nil
|
||||
} else {
|
||||
|
||||
@ -195,7 +195,7 @@ type Tables struct {
|
||||
BuzkashiGrade *GameBuzkashiGrade
|
||||
BuzkashiReward *GameBuzkashiReward
|
||||
BuzkashiFm *GameBuzkashiFm
|
||||
buzkashiOpen *GamebuzkashiOpen
|
||||
BuzkashiOpen *GameBuzkashiOpen
|
||||
}
|
||||
|
||||
func NewTables(loader JsonLoader) (*Tables, error) {
|
||||
@ -1310,7 +1310,7 @@ func NewTables(loader JsonLoader) (*Tables, error) {
|
||||
if buf, err = loader("game_buzkashiopen") ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if tables.buzkashiOpen, err = NewGamebuzkashiOpen(buf) ; err != nil {
|
||||
if tables.BuzkashiOpen, err = NewGameBuzkashiOpen(buf) ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return tables, nil
|
||||
|
||||
Loading…
Reference in New Issue
Block a user