Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
f092dbbc95
@ -9,6 +9,11 @@
|
|||||||
"t": "diamond",
|
"t": "diamond",
|
||||||
"n": 150
|
"n": 150
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"a": "item",
|
||||||
|
"t": "14020000",
|
||||||
|
"n": 50
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "gold",
|
"t": "gold",
|
||||||
@ -28,6 +33,11 @@
|
|||||||
"t": "diamond",
|
"t": "diamond",
|
||||||
"n": 150
|
"n": 150
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"a": "item",
|
||||||
|
"t": "14020000",
|
||||||
|
"n": 100
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "gold",
|
"t": "gold",
|
||||||
@ -47,6 +57,11 @@
|
|||||||
"t": "diamond",
|
"t": "diamond",
|
||||||
"n": 150
|
"n": 150
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"a": "item",
|
||||||
|
"t": "14020000",
|
||||||
|
"n": 100
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "gold",
|
"t": "gold",
|
||||||
@ -66,6 +81,11 @@
|
|||||||
"t": "diamond",
|
"t": "diamond",
|
||||||
"n": 150
|
"n": 150
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"a": "item",
|
||||||
|
"t": "14020000",
|
||||||
|
"n": 100
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "gold",
|
"t": "gold",
|
||||||
|
|||||||
@ -18097,7 +18097,7 @@
|
|||||||
},
|
},
|
||||||
"type": 43,
|
"type": 43,
|
||||||
"valid": 0,
|
"valid": 0,
|
||||||
"NPC": 10474,
|
"NPC": -102,
|
||||||
"value": 6,
|
"value": 6,
|
||||||
"filter": [
|
"filter": [
|
||||||
6
|
6
|
||||||
@ -18385,7 +18385,7 @@
|
|||||||
},
|
},
|
||||||
"type": 43,
|
"type": 43,
|
||||||
"valid": 0,
|
"valid": 0,
|
||||||
"NPC": 10594,
|
"NPC": -102,
|
||||||
"value": 9,
|
"value": 9,
|
||||||
"filter": [
|
"filter": [
|
||||||
6
|
6
|
||||||
@ -18530,7 +18530,7 @@
|
|||||||
},
|
},
|
||||||
"type": 43,
|
"type": 43,
|
||||||
"valid": 0,
|
"valid": 0,
|
||||||
"NPC": 10654,
|
"NPC": -102,
|
||||||
"value": 12,
|
"value": 12,
|
||||||
"filter": [
|
"filter": [
|
||||||
6
|
6
|
||||||
@ -18672,7 +18672,7 @@
|
|||||||
},
|
},
|
||||||
"type": 93,
|
"type": 93,
|
||||||
"valid": 0,
|
"valid": 0,
|
||||||
"NPC": 10714,
|
"NPC": -102,
|
||||||
"value": 1,
|
"value": 1,
|
||||||
"filter": [
|
"filter": [
|
||||||
1,
|
1,
|
||||||
@ -18837,7 +18837,7 @@
|
|||||||
},
|
},
|
||||||
"type": 43,
|
"type": 43,
|
||||||
"valid": 0,
|
"valid": 0,
|
||||||
"NPC": 10784,
|
"NPC": -102,
|
||||||
"value": 12,
|
"value": 12,
|
||||||
"filter": [
|
"filter": [
|
||||||
9
|
9
|
||||||
@ -19051,7 +19051,7 @@
|
|||||||
},
|
},
|
||||||
"type": 43,
|
"type": 43,
|
||||||
"valid": 0,
|
"valid": 0,
|
||||||
"NPC": 10874,
|
"NPC": -102,
|
||||||
"value": 18,
|
"value": 18,
|
||||||
"filter": [
|
"filter": [
|
||||||
9
|
9
|
||||||
@ -19170,7 +19170,7 @@
|
|||||||
},
|
},
|
||||||
"type": 43,
|
"type": 43,
|
||||||
"valid": 0,
|
"valid": 0,
|
||||||
"NPC": 10924,
|
"NPC": -102,
|
||||||
"value": 8,
|
"value": 8,
|
||||||
"filter": [
|
"filter": [
|
||||||
12
|
12
|
||||||
@ -19836,7 +19836,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_846",
|
"key": "buried_buried_condi_tasktxt_846",
|
||||||
"text": "本周竞技场挑战{0}次"
|
"text": "本周竞技场挑战10次"
|
||||||
},
|
},
|
||||||
"type": 130,
|
"type": 130,
|
||||||
"valid": 10,
|
"valid": 10,
|
||||||
@ -19853,7 +19853,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_847",
|
"key": "buried_buried_condi_tasktxt_847",
|
||||||
"text": "本周竞技场挑战{0}次"
|
"text": "本周竞技场挑战30次"
|
||||||
},
|
},
|
||||||
"type": 130,
|
"type": 130,
|
||||||
"valid": 30,
|
"valid": 30,
|
||||||
@ -19870,7 +19870,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_848",
|
"key": "buried_buried_condi_tasktxt_848",
|
||||||
"text": "本周竞技场挑战{0}次"
|
"text": "本周竞技场挑战50次"
|
||||||
},
|
},
|
||||||
"type": 130,
|
"type": 130,
|
||||||
"valid": 50,
|
"valid": 50,
|
||||||
@ -19887,7 +19887,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_849",
|
"key": "buried_buried_condi_tasktxt_849",
|
||||||
"text": "本周竞技场胜利{0}次"
|
"text": "本周竞技场胜利10次"
|
||||||
},
|
},
|
||||||
"type": 130,
|
"type": 130,
|
||||||
"valid": 10,
|
"valid": 10,
|
||||||
@ -19904,7 +19904,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_850",
|
"key": "buried_buried_condi_tasktxt_850",
|
||||||
"text": "本周竞技场胜利{0}次"
|
"text": "本周竞技场胜利20次"
|
||||||
},
|
},
|
||||||
"type": 130,
|
"type": 130,
|
||||||
"valid": 20,
|
"valid": 20,
|
||||||
@ -19921,7 +19921,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_851",
|
"key": "buried_buried_condi_tasktxt_851",
|
||||||
"text": "本周竞技场胜利{0}次"
|
"text": "本周竞技场胜利30次"
|
||||||
},
|
},
|
||||||
"type": 130,
|
"type": 130,
|
||||||
"valid": 30,
|
"valid": 30,
|
||||||
@ -19938,7 +19938,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_852",
|
"key": "buried_buried_condi_tasktxt_852",
|
||||||
"text": "本周累计经验副本消耗{0}体力"
|
"text": "本周累计经验副本消耗300体力"
|
||||||
},
|
},
|
||||||
"type": 130,
|
"type": 130,
|
||||||
"valid": 300,
|
"valid": 300,
|
||||||
@ -19955,7 +19955,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_853",
|
"key": "buried_buried_condi_tasktxt_853",
|
||||||
"text": "本周累计经验副本消耗{0}体力"
|
"text": "本周累计经验副本消耗600体力"
|
||||||
},
|
},
|
||||||
"type": 130,
|
"type": 130,
|
||||||
"valid": 600,
|
"valid": 600,
|
||||||
@ -19972,7 +19972,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_854",
|
"key": "buried_buried_condi_tasktxt_854",
|
||||||
"text": "本周累计经验副本消耗{0}体力"
|
"text": "本周累计经验副本消耗1000体力"
|
||||||
},
|
},
|
||||||
"type": 130,
|
"type": 130,
|
||||||
"valid": 1000,
|
"valid": 1000,
|
||||||
@ -19989,7 +19989,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_855",
|
"key": "buried_buried_condi_tasktxt_855",
|
||||||
"text": "本周累计消耗{0}点金币"
|
"text": "本周累计消耗3000000点金币"
|
||||||
},
|
},
|
||||||
"type": 130,
|
"type": 130,
|
||||||
"valid": 3000000,
|
"valid": 3000000,
|
||||||
@ -20006,7 +20006,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_856",
|
"key": "buried_buried_condi_tasktxt_856",
|
||||||
"text": "本周累计消耗{0}点金币"
|
"text": "本周累计消耗6000000点金币"
|
||||||
},
|
},
|
||||||
"type": 130,
|
"type": 130,
|
||||||
"valid": 6000000,
|
"valid": 6000000,
|
||||||
@ -20023,7 +20023,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_857",
|
"key": "buried_buried_condi_tasktxt_857",
|
||||||
"text": "本周累计消耗{0}点金币"
|
"text": "本周累计消耗10000000点金币"
|
||||||
},
|
},
|
||||||
"type": 130,
|
"type": 130,
|
||||||
"valid": 10000000,
|
"valid": 10000000,
|
||||||
@ -20040,7 +20040,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_858",
|
"key": "buried_buried_condi_tasktxt_858",
|
||||||
"text": "本周累计装备副本消耗{0}体力"
|
"text": "本周累计装备副本消耗300体力"
|
||||||
},
|
},
|
||||||
"type": 130,
|
"type": 130,
|
||||||
"valid": 300,
|
"valid": 300,
|
||||||
@ -20057,7 +20057,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_859",
|
"key": "buried_buried_condi_tasktxt_859",
|
||||||
"text": "本周累计装备副本消耗{0}体力"
|
"text": "本周累计装备副本消耗600体力"
|
||||||
},
|
},
|
||||||
"type": 130,
|
"type": 130,
|
||||||
"valid": 600,
|
"valid": 600,
|
||||||
@ -20074,7 +20074,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_860",
|
"key": "buried_buried_condi_tasktxt_860",
|
||||||
"text": "本周累计装备副本消耗{0}体力"
|
"text": "本周累计装备副本消耗1000体力"
|
||||||
},
|
},
|
||||||
"type": 130,
|
"type": 130,
|
||||||
"valid": 1000,
|
"valid": 1000,
|
||||||
@ -20091,7 +20091,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_861",
|
"key": "buried_buried_condi_tasktxt_861",
|
||||||
"text": "本周累计回响副本消耗{0}体力"
|
"text": "本周累计回响副本消耗300体力"
|
||||||
},
|
},
|
||||||
"type": 130,
|
"type": 130,
|
||||||
"valid": 300,
|
"valid": 300,
|
||||||
@ -20108,7 +20108,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_862",
|
"key": "buried_buried_condi_tasktxt_862",
|
||||||
"text": "本周累计回响副本消耗{0}体力"
|
"text": "本周累计回响副本消耗600体力"
|
||||||
},
|
},
|
||||||
"type": 130,
|
"type": 130,
|
||||||
"valid": 600,
|
"valid": 600,
|
||||||
@ -20125,7 +20125,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_863",
|
"key": "buried_buried_condi_tasktxt_863",
|
||||||
"text": "本周累计回响副本消耗{0}体力"
|
"text": "本周累计回响副本消耗1000体力"
|
||||||
},
|
},
|
||||||
"type": 130,
|
"type": 130,
|
||||||
"valid": 1000,
|
"valid": 1000,
|
||||||
|
|||||||
@ -34,7 +34,7 @@
|
|||||||
"z": 0
|
"z": 0
|
||||||
},
|
},
|
||||||
"capskillrule": 101,
|
"capskillrule": 101,
|
||||||
"skill": 11300011,
|
"skill": 113001011,
|
||||||
"skill1": 113001111,
|
"skill1": 113001111,
|
||||||
"skill2": 113001211,
|
"skill2": 113001211,
|
||||||
"skill3": 113001311,
|
"skill3": 113001311,
|
||||||
|
|||||||
@ -15,7 +15,7 @@
|
|||||||
"starup_hp": 15,
|
"starup_hp": 15,
|
||||||
"starup_atk": 15,
|
"starup_atk": 15,
|
||||||
"starup_def": 15,
|
"starup_def": 15,
|
||||||
"starup_speed": 15
|
"starup_speed": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"star": 3,
|
"star": 3,
|
||||||
@ -24,33 +24,33 @@
|
|||||||
"starup_hp": 25,
|
"starup_hp": 25,
|
||||||
"starup_atk": 25,
|
"starup_atk": 25,
|
||||||
"starup_def": 25,
|
"starup_def": 25,
|
||||||
"starup_speed": 25
|
"starup_speed": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"star": 4,
|
"star": 4,
|
||||||
"level": 30,
|
"level": 30,
|
||||||
"maxlevel": 40,
|
"maxlevel": 40,
|
||||||
"starup_hp": 55,
|
"starup_hp": 90,
|
||||||
"starup_atk": 55,
|
"starup_atk": 90,
|
||||||
"starup_def": 55,
|
"starup_def": 90,
|
||||||
"starup_speed": 55
|
"starup_speed": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"star": 5,
|
"star": 5,
|
||||||
"level": 40,
|
"level": 40,
|
||||||
"maxlevel": 50,
|
"maxlevel": 50,
|
||||||
"starup_hp": 95,
|
"starup_hp": 210,
|
||||||
"starup_atk": 95,
|
"starup_atk": 210,
|
||||||
"starup_def": 95,
|
"starup_def": 210,
|
||||||
"starup_speed": 95
|
"starup_speed": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"star": 6,
|
"star": 6,
|
||||||
"level": 50,
|
"level": 50,
|
||||||
"maxlevel": 60,
|
"maxlevel": 60,
|
||||||
"starup_hp": 145,
|
"starup_hp": 320,
|
||||||
"starup_atk": 145,
|
"starup_atk": 320,
|
||||||
"starup_def": 145,
|
"starup_def": 320,
|
||||||
"starup_speed": 145
|
"starup_speed": 0
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -650,7 +650,7 @@
|
|||||||
"drop": 10011000,
|
"drop": 10011000,
|
||||||
"bossmodel": 53001,
|
"bossmodel": 53001,
|
||||||
"boss": [
|
"boss": [
|
||||||
401027
|
401033
|
||||||
],
|
],
|
||||||
"ps_consume": [
|
"ps_consume": [
|
||||||
{
|
{
|
||||||
@ -715,7 +715,7 @@
|
|||||||
"drop": 10012000,
|
"drop": 10012000,
|
||||||
"bossmodel": 53001,
|
"bossmodel": 53001,
|
||||||
"boss": [
|
"boss": [
|
||||||
401030
|
401036
|
||||||
],
|
],
|
||||||
"ps_consume": [
|
"ps_consume": [
|
||||||
{
|
{
|
||||||
@ -1390,7 +1390,7 @@
|
|||||||
"drop": 20011000,
|
"drop": 20011000,
|
||||||
"bossmodel": 51004,
|
"bossmodel": 51004,
|
||||||
"boss": [
|
"boss": [
|
||||||
402027
|
402033
|
||||||
],
|
],
|
||||||
"ps_consume": [
|
"ps_consume": [
|
||||||
{
|
{
|
||||||
@ -1455,7 +1455,7 @@
|
|||||||
"drop": 20012000,
|
"drop": 20012000,
|
||||||
"bossmodel": 51004,
|
"bossmodel": 51004,
|
||||||
"boss": [
|
"boss": [
|
||||||
402030
|
402036
|
||||||
],
|
],
|
||||||
"ps_consume": [
|
"ps_consume": [
|
||||||
{
|
{
|
||||||
@ -2130,7 +2130,7 @@
|
|||||||
"drop": 30011000,
|
"drop": 30011000,
|
||||||
"bossmodel": 51005,
|
"bossmodel": 51005,
|
||||||
"boss": [
|
"boss": [
|
||||||
403027
|
403033
|
||||||
],
|
],
|
||||||
"ps_consume": [
|
"ps_consume": [
|
||||||
{
|
{
|
||||||
@ -2195,7 +2195,7 @@
|
|||||||
"drop": 30012000,
|
"drop": 30012000,
|
||||||
"bossmodel": 51005,
|
"bossmodel": 51005,
|
||||||
"boss": [
|
"boss": [
|
||||||
403030
|
403036
|
||||||
],
|
],
|
||||||
"ps_consume": [
|
"ps_consume": [
|
||||||
{
|
{
|
||||||
@ -2870,7 +2870,7 @@
|
|||||||
"drop": 40011000,
|
"drop": 40011000,
|
||||||
"bossmodel": 51002,
|
"bossmodel": 51002,
|
||||||
"boss": [
|
"boss": [
|
||||||
404027
|
404033
|
||||||
],
|
],
|
||||||
"ps_consume": [
|
"ps_consume": [
|
||||||
{
|
{
|
||||||
@ -2935,7 +2935,7 @@
|
|||||||
"drop": 40012000,
|
"drop": 40012000,
|
||||||
"bossmodel": 51002,
|
"bossmodel": 51002,
|
||||||
"boss": [
|
"boss": [
|
||||||
404030
|
404036
|
||||||
],
|
],
|
||||||
"ps_consume": [
|
"ps_consume": [
|
||||||
{
|
{
|
||||||
|
|||||||
@ -2,8 +2,13 @@
|
|||||||
{
|
{
|
||||||
"type": 1,
|
"type": 1,
|
||||||
"opentime": [
|
"opentime": [
|
||||||
|
0,
|
||||||
1,
|
1,
|
||||||
2
|
2,
|
||||||
|
3,
|
||||||
|
4,
|
||||||
|
5,
|
||||||
|
6
|
||||||
],
|
],
|
||||||
"name": {
|
"name": {
|
||||||
"key": "hunting_opentime_name_1",
|
"key": "hunting_opentime_name_1",
|
||||||
@ -24,8 +29,13 @@
|
|||||||
{
|
{
|
||||||
"type": 2,
|
"type": 2,
|
||||||
"opentime": [
|
"opentime": [
|
||||||
|
0,
|
||||||
|
1,
|
||||||
|
2,
|
||||||
3,
|
3,
|
||||||
4
|
4,
|
||||||
|
5,
|
||||||
|
6
|
||||||
],
|
],
|
||||||
"name": {
|
"name": {
|
||||||
"key": "hunting_opentime_name_2",
|
"key": "hunting_opentime_name_2",
|
||||||
@ -46,6 +56,11 @@
|
|||||||
{
|
{
|
||||||
"type": 3,
|
"type": 3,
|
||||||
"opentime": [
|
"opentime": [
|
||||||
|
0,
|
||||||
|
1,
|
||||||
|
2,
|
||||||
|
3,
|
||||||
|
4,
|
||||||
5,
|
5,
|
||||||
6
|
6
|
||||||
],
|
],
|
||||||
@ -68,8 +83,13 @@
|
|||||||
{
|
{
|
||||||
"type": 4,
|
"type": 4,
|
||||||
"opentime": [
|
"opentime": [
|
||||||
|
0,
|
||||||
1,
|
1,
|
||||||
0
|
2,
|
||||||
|
3,
|
||||||
|
4,
|
||||||
|
5,
|
||||||
|
6
|
||||||
],
|
],
|
||||||
"name": {
|
"name": {
|
||||||
"key": "hunting_opentime_name_4",
|
"key": "hunting_opentime_name_4",
|
||||||
|
|||||||
@ -1618,5 +1618,165 @@
|
|||||||
"n": 500
|
"n": 500
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"index": "357",
|
||||||
|
"var": [
|
||||||
|
{
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010001",
|
||||||
|
"n": 50
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"index": "358",
|
||||||
|
"var": [
|
||||||
|
{
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010002",
|
||||||
|
"n": 50
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"index": "359",
|
||||||
|
"var": [
|
||||||
|
{
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010003",
|
||||||
|
"n": 50
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"index": "360",
|
||||||
|
"var": [
|
||||||
|
{
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010004",
|
||||||
|
"n": 50
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"index": "361",
|
||||||
|
"var": [
|
||||||
|
{
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010005",
|
||||||
|
"n": 50
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"index": "362",
|
||||||
|
"var": [
|
||||||
|
{
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010006",
|
||||||
|
"n": 50
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"index": "363",
|
||||||
|
"var": [
|
||||||
|
{
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010007",
|
||||||
|
"n": 50
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"index": "364",
|
||||||
|
"var": [
|
||||||
|
{
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010008",
|
||||||
|
"n": 50
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"index": "365",
|
||||||
|
"var": [
|
||||||
|
{
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010009",
|
||||||
|
"n": 50
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"index": "366",
|
||||||
|
"var": [
|
||||||
|
{
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010010",
|
||||||
|
"n": 50
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"index": "367",
|
||||||
|
"var": [
|
||||||
|
{
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010011",
|
||||||
|
"n": 50
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"index": "368",
|
||||||
|
"var": [
|
||||||
|
{
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010012",
|
||||||
|
"n": 50
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"index": "369",
|
||||||
|
"var": [
|
||||||
|
{
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010013",
|
||||||
|
"n": 50
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"index": "370",
|
||||||
|
"var": [
|
||||||
|
{
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010014",
|
||||||
|
"n": 50
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"index": "371",
|
||||||
|
"var": [
|
||||||
|
{
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010015",
|
||||||
|
"n": 50
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"index": "372",
|
||||||
|
"var": [
|
||||||
|
{
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010016",
|
||||||
|
"n": 50
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -145,7 +145,7 @@
|
|||||||
"img": "item_10000004",
|
"img": "item_10000004",
|
||||||
"intr": {
|
"intr": {
|
||||||
"key": "item_item_intr_4",
|
"key": "item_item_intr_4",
|
||||||
"text": "用于提升守护者等级的道具"
|
"text": "用于提升稀有守护者技能等级的道具"
|
||||||
},
|
},
|
||||||
"sale": [
|
"sale": [
|
||||||
{
|
{
|
||||||
@ -184,7 +184,7 @@
|
|||||||
"img": "item_10000005",
|
"img": "item_10000005",
|
||||||
"intr": {
|
"intr": {
|
||||||
"key": "item_item_intr_5",
|
"key": "item_item_intr_5",
|
||||||
"text": "用于提升守护者等级的道具"
|
"text": "用于提升完美守护者技能等级的道具"
|
||||||
},
|
},
|
||||||
"sale": []
|
"sale": []
|
||||||
},
|
},
|
||||||
@ -217,7 +217,7 @@
|
|||||||
"img": "item_10000006",
|
"img": "item_10000006",
|
||||||
"intr": {
|
"intr": {
|
||||||
"key": "item_item_intr_6",
|
"key": "item_item_intr_6",
|
||||||
"text": "用于提升守护者等级的道具"
|
"text": "用于提升史诗守护者技能等级的道具"
|
||||||
},
|
},
|
||||||
"sale": [
|
"sale": [
|
||||||
{
|
{
|
||||||
@ -289,7 +289,7 @@
|
|||||||
"img": "item_10000008",
|
"img": "item_10000008",
|
||||||
"intr": {
|
"intr": {
|
||||||
"key": "item_item_intr_8",
|
"key": "item_item_intr_8",
|
||||||
"text": "用于提升稀有守护者技能等级的道具"
|
"text": "用于提升守护者等级的道具"
|
||||||
},
|
},
|
||||||
"sale": [
|
"sale": [
|
||||||
{
|
{
|
||||||
@ -328,7 +328,7 @@
|
|||||||
"img": "item_10000009",
|
"img": "item_10000009",
|
||||||
"intr": {
|
"intr": {
|
||||||
"key": "item_item_intr_9",
|
"key": "item_item_intr_9",
|
||||||
"text": "用于提升完美守护者技能等级的道具"
|
"text": "用于提升守护者等级的道具"
|
||||||
},
|
},
|
||||||
"sale": [
|
"sale": [
|
||||||
{
|
{
|
||||||
@ -367,7 +367,7 @@
|
|||||||
"img": "item_10000010",
|
"img": "item_10000010",
|
||||||
"intr": {
|
"intr": {
|
||||||
"key": "item_item_intr_10",
|
"key": "item_item_intr_10",
|
||||||
"text": "用于提升史诗守护者技能等级的道具"
|
"text": "用于提升守护者等级的道具"
|
||||||
},
|
},
|
||||||
"sale": [
|
"sale": [
|
||||||
{
|
{
|
||||||
@ -12597,5 +12597,38 @@
|
|||||||
"text": "熊猫武馆升级木桩所需道具"
|
"text": "熊猫武馆升级木桩所需道具"
|
||||||
},
|
},
|
||||||
"sale": []
|
"sale": []
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "14010000",
|
||||||
|
"name": {
|
||||||
|
"key": "item_item_name_346",
|
||||||
|
"text": "食材大礼包"
|
||||||
|
},
|
||||||
|
"usetype": 5,
|
||||||
|
"color": 3,
|
||||||
|
"bagtype": 1,
|
||||||
|
"index": 1,
|
||||||
|
"special_type": 0,
|
||||||
|
"time": 0,
|
||||||
|
"reddottype": 0,
|
||||||
|
"effects": "",
|
||||||
|
"modelName": "",
|
||||||
|
"box_id": 14010000,
|
||||||
|
"synthetize_num": 0,
|
||||||
|
"synthetize_deplete": [],
|
||||||
|
"synthetize_get": [],
|
||||||
|
"decompose_deplete": [],
|
||||||
|
"decompose_get": [],
|
||||||
|
"access": [
|
||||||
|
904
|
||||||
|
],
|
||||||
|
"use_skip": 140,
|
||||||
|
"upper_limit": 999,
|
||||||
|
"img": "icon_mcs",
|
||||||
|
"intr": {
|
||||||
|
"key": "item_item_intr_354",
|
||||||
|
"text": "打开后可以随机获得烹饪的食材，可以去找平先生用食材来制作各种美食"
|
||||||
|
},
|
||||||
|
"sale": []
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -22881,7 +22881,7 @@
|
|||||||
"subtype": 1,
|
"subtype": 1,
|
||||||
"groupnum": 1,
|
"groupnum": 1,
|
||||||
"itemid": {
|
"itemid": {
|
||||||
"a": "attr",
|
"a": "item",
|
||||||
"t": "gold",
|
"t": "gold",
|
||||||
"n": 1
|
"n": 1
|
||||||
},
|
},
|
||||||
@ -22894,5 +22894,389 @@
|
|||||||
"playerlvmin": 0,
|
"playerlvmin": 0,
|
||||||
"playerlvmax": 0,
|
"playerlvmax": 0,
|
||||||
"notice": 0
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 955,
|
||||||
|
"lotteryid": 14010000,
|
||||||
|
"description": "食材大礼包随机食材",
|
||||||
|
"type": 1,
|
||||||
|
"groupwt": 1000,
|
||||||
|
"groupid": 10001,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010001",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "小麦",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 956,
|
||||||
|
"lotteryid": 14010000,
|
||||||
|
"description": "食材大礼包随机食材",
|
||||||
|
"type": 1,
|
||||||
|
"groupwt": 1000,
|
||||||
|
"groupid": 10001,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010002",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "苹果",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 957,
|
||||||
|
"lotteryid": 14010000,
|
||||||
|
"description": "食材大礼包随机食材",
|
||||||
|
"type": 1,
|
||||||
|
"groupwt": 1000,
|
||||||
|
"groupid": 10001,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010003",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "香蕉",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 958,
|
||||||
|
"lotteryid": 14010000,
|
||||||
|
"description": "食材大礼包随机食材",
|
||||||
|
"type": 1,
|
||||||
|
"groupwt": 1000,
|
||||||
|
"groupid": 10001,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010004",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "玉米",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 959,
|
||||||
|
"lotteryid": 14010000,
|
||||||
|
"description": "食材大礼包随机食材",
|
||||||
|
"type": 1,
|
||||||
|
"groupwt": 1000,
|
||||||
|
"groupid": 10001,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010005",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "土豆",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 960,
|
||||||
|
"lotteryid": 14010000,
|
||||||
|
"description": "食材大礼包随机食材",
|
||||||
|
"type": 1,
|
||||||
|
"groupwt": 1000,
|
||||||
|
"groupid": 10001,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010006",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "萝卜",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 961,
|
||||||
|
"lotteryid": 14010000,
|
||||||
|
"description": "食材大礼包随机食材",
|
||||||
|
"type": 1,
|
||||||
|
"groupwt": 1000,
|
||||||
|
"groupid": 10001,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010007",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "蘑菇",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 962,
|
||||||
|
"lotteryid": 14010000,
|
||||||
|
"description": "食材大礼包随机食材",
|
||||||
|
"type": 1,
|
||||||
|
"groupwt": 1000,
|
||||||
|
"groupid": 10001,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010008",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "牛奶",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 963,
|
||||||
|
"lotteryid": 14010000,
|
||||||
|
"description": "食材大礼包随机食材",
|
||||||
|
"type": 1,
|
||||||
|
"groupwt": 1000,
|
||||||
|
"groupid": 10001,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010009",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "南瓜",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 964,
|
||||||
|
"lotteryid": 14010000,
|
||||||
|
"description": "食材大礼包随机食材",
|
||||||
|
"type": 1,
|
||||||
|
"groupwt": 1000,
|
||||||
|
"groupid": 10001,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010010",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "番茄",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 965,
|
||||||
|
"lotteryid": 14010000,
|
||||||
|
"description": "食材大礼包随机食材",
|
||||||
|
"type": 1,
|
||||||
|
"groupwt": 1000,
|
||||||
|
"groupid": 10001,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010011",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "蜂蜜",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 966,
|
||||||
|
"lotteryid": 14010000,
|
||||||
|
"description": "食材大礼包随机食材",
|
||||||
|
"type": 1,
|
||||||
|
"groupwt": 1000,
|
||||||
|
"groupid": 10001,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010012",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "杏仁",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 967,
|
||||||
|
"lotteryid": 14010000,
|
||||||
|
"description": "食材大礼包随机食材",
|
||||||
|
"type": 1,
|
||||||
|
"groupwt": 1000,
|
||||||
|
"groupid": 10001,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010013",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "鸡蛋",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 968,
|
||||||
|
"lotteryid": 14010000,
|
||||||
|
"description": "食材大礼包随机食材",
|
||||||
|
"type": 1,
|
||||||
|
"groupwt": 1000,
|
||||||
|
"groupid": 10001,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010014",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "鸡肉",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 969,
|
||||||
|
"lotteryid": 14010000,
|
||||||
|
"description": "食材大礼包随机食材",
|
||||||
|
"type": 1,
|
||||||
|
"groupwt": 1000,
|
||||||
|
"groupid": 10001,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010015",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "猪肉",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 970,
|
||||||
|
"lotteryid": 14010000,
|
||||||
|
"description": "食材大礼包随机食材",
|
||||||
|
"type": 1,
|
||||||
|
"groupwt": 1000,
|
||||||
|
"groupid": 10001,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "item",
|
||||||
|
"t": "14010016",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "鱼肉",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
File diff suppressed because it is too large
Load Diff
@ -231,7 +231,7 @@
|
|||||||
"木桩"
|
"木桩"
|
||||||
],
|
],
|
||||||
"functionicon": "ty_qp_mz",
|
"functionicon": "ty_qp_mz",
|
||||||
"jumpId": 137
|
"jumpId": 10001
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Id": 14,
|
"Id": 14,
|
||||||
|
|||||||
@ -14,6 +14,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -27,6 +32,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -40,6 +50,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -53,6 +68,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -66,6 +86,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -79,6 +104,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -92,6 +122,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -105,6 +140,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -118,6 +158,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -131,6 +176,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -144,6 +194,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -157,6 +212,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -170,6 +230,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -183,6 +248,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -196,6 +266,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -209,6 +284,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -222,6 +302,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -235,6 +320,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -248,6 +338,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -261,6 +356,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -274,6 +374,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -287,6 +392,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -300,6 +410,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -313,6 +428,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -326,6 +446,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -339,6 +464,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -352,6 +482,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -365,6 +500,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -378,6 +518,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -391,6 +536,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -404,6 +554,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -417,6 +572,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -430,6 +590,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -443,6 +608,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -456,6 +626,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -469,6 +644,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -482,6 +662,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -495,6 +680,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -508,6 +698,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -521,6 +716,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -534,6 +734,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -547,6 +752,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -560,6 +770,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -573,6 +788,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -586,6 +806,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -599,6 +824,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -612,6 +842,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -625,6 +860,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -638,6 +878,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -651,6 +896,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -664,6 +914,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -677,6 +932,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -690,6 +950,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -703,6 +968,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -716,6 +986,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -729,6 +1004,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -742,6 +1022,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -755,6 +1040,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
@ -768,6 +1058,11 @@
|
|||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "ps",
|
"t": "ps",
|
||||||
"n": 30
|
"n": 30
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"a": "attr",
|
||||||
|
"t": "starcoin",
|
||||||
|
"n": 40
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ps_ceiling": 180,
|
"ps_ceiling": 180,
|
||||||
|
|||||||
@ -3020,11 +3020,13 @@
|
|||||||
"id": 10664,
|
"id": 10664,
|
||||||
"heroid": 25001,
|
"heroid": 25001,
|
||||||
"datas": [
|
"datas": [
|
||||||
"GameMain",
|
"WuGuanScene",
|
||||||
"901"
|
"木桩3",
|
||||||
|
"137"
|
||||||
],
|
],
|
||||||
"event": [
|
"event": [
|
||||||
0
|
2,
|
||||||
|
10200
|
||||||
],
|
],
|
||||||
"goto": 0
|
"goto": 0
|
||||||
},
|
},
|
||||||
@ -3713,10 +3715,12 @@
|
|||||||
"heroid": 25001,
|
"heroid": 25001,
|
||||||
"datas": [
|
"datas": [
|
||||||
"SmithyScene",
|
"SmithyScene",
|
||||||
|
"功能入口-商人",
|
||||||
"139"
|
"139"
|
||||||
],
|
],
|
||||||
"event": [
|
"event": [
|
||||||
0
|
10,
|
||||||
|
122
|
||||||
],
|
],
|
||||||
"goto": 0
|
"goto": 0
|
||||||
},
|
},
|
||||||
|
|||||||
@ -62,7 +62,7 @@
|
|||||||
},
|
},
|
||||||
"content": {
|
"content": {
|
||||||
"key": "ruledesc_ruledesc_content_6",
|
"key": "ruledesc_ruledesc_content_6",
|
||||||
"text": "这里可以选择守护者去完成陪练任务，每个陪练任务有不同的等级与阵容要求，完成任务可以获得高额奖励。"
|
"text": "这里可以选择守护者去完成陪练任务，每个陪练任务有不同的等级与阵容要求，满足格外需求还可以获得格外的道具奖励，完成任务可以获得高额奖励。"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -84,7 +84,7 @@
|
|||||||
},
|
},
|
||||||
"content": {
|
"content": {
|
||||||
"key": "ruledesc_ruledesc_content_8",
|
"key": "ruledesc_ruledesc_content_8",
|
||||||
"text": "这里可以与其他玩家的阵容进行对决，也可以挑战npc获取奖励。挑战玩家获得积分，在每周结算时根据积分排名来获得奖励。"
|
"text": "这里可以与其他玩家的阵容进行对决，也可以挑战电脑阵容来获取奖励。<br>挑战电脑阵容难度随等级解锁，挑战需要消耗竞技场挑战卷。<br>挑战玩家也需消耗竞技场挑战卷，战胜玩家获得积分，在每周结算时根据积分排名来获得奖励。"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -157,11 +157,11 @@
|
|||||||
"id": 10015,
|
"id": 10015,
|
||||||
"title": {
|
"title": {
|
||||||
"key": "ruledesc_ruledesc_title_15",
|
"key": "ruledesc_ruledesc_title_15",
|
||||||
"text": "守护者图鉴说明"
|
"text": "守护者说明"
|
||||||
},
|
},
|
||||||
"content": {
|
"content": {
|
||||||
"key": "ruledesc_ruledesc_content_15",
|
"key": "ruledesc_ruledesc_content_15",
|
||||||
"text": "这里可以查看你获得的所有守护者们，选择守护者可以查看详细界面并且强化他们。"
|
"text": "这里可以查看你获得的所有守护者们，选择守护者点击右侧按钮可以查看详细界面并且强化他们。<br>在强化界面，可以有各种方式强化守护者。<br>守护者等级强化：<br>点击守护者经验条下方的加号按钮可以进入守护者升级界面，使用护身符可以快速提升守护者等级。<br>守护者升星：<br>当守护者等级达到当前星级最大值（三星最大等级为30级，四星为40级，5星为50级），可以使用荣耀徽章提升守护者星级，并解锁最高等级上限。守护者最高为6星<br>守护者技能等级强化：<br>点击技能图标上方的按钮，可以进入守护者技能升级界面，使用不同等级的功夫卷轴可以强化不同稀有度的守护者的技能等级。<br>守护者觉醒：<br>使用觉醒强化你的守护者。觉醒道具守护之心主要为招募重复守护者解锁。<br>守护者共鸣：<br>使用共鸣强化你的守护者。共鸣强化道具可以再狩猎与宝箱中获得。"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -194,7 +194,7 @@
|
|||||||
},
|
},
|
||||||
"content": {
|
"content": {
|
||||||
"key": "ruledesc_ruledesc_content_18",
|
"key": "ruledesc_ruledesc_content_18",
|
||||||
"text": "这里可以使用圣桃枝招募新的守护者们<br>（圣桃枝可以用200钻石购买一个）<br>招募概率公示：<br>史诗守护者获得概率：1.2%<br>完美守护者获得概率：10.8%<br>稀有守护者获得概率：88%"
|
"text": "这里可以使用圣桃枝招募新的守护者们。<br>（圣桃枝可以用200钻石购买一个）<br>招募概率公示：<br>史诗守护者获得概率：1.2%<br>完美守护者获得概率：10.8%<br>稀有守护者获得概率：88%"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -271,7 +271,7 @@
|
|||||||
},
|
},
|
||||||
"content": {
|
"content": {
|
||||||
"key": "ruledesc_ruledesc_content_25",
|
"key": "ruledesc_ruledesc_content_25",
|
||||||
"text": "这里可以使用共鸣强化你的守护者（每个守护者共鸣独立）。"
|
"text": "这里可以使用共鸣强化你的守护者。<br>共鸣强化道具可在狩猎与宝箱中获得。"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -293,7 +293,7 @@
|
|||||||
},
|
},
|
||||||
"content": {
|
"content": {
|
||||||
"key": "ruledesc_ruledesc_content_27",
|
"key": "ruledesc_ruledesc_content_27",
|
||||||
"text": "这里可以使用抽取过重复的守护者们加强该守护者。"
|
"text": "这里可以使用觉醒强化你的守护者。<br>觉醒道具守护之心主要为招募重复守护者获得。"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
"id": 1,
|
"id": 1,
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "sign_sign_extra_txt_1",
|
"key": "sign_sign_extra_txt_1",
|
||||||
"text": "累计签到{0}天领取"
|
"text": "累计完成拼图{0}次领取"
|
||||||
},
|
},
|
||||||
"day": 7,
|
"day": 7,
|
||||||
"groups": 1,
|
"groups": 1,
|
||||||
@ -19,7 +19,7 @@
|
|||||||
"id": 2,
|
"id": 2,
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "sign_sign_extra_txt_2",
|
"key": "sign_sign_extra_txt_2",
|
||||||
"text": "累计签到{0}天领取"
|
"text": "累计完成拼图{0}次领取"
|
||||||
},
|
},
|
||||||
"day": 14,
|
"day": 14,
|
||||||
"groups": 1,
|
"groups": 1,
|
||||||
@ -35,7 +35,7 @@
|
|||||||
"id": 3,
|
"id": 3,
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "sign_sign_extra_txt_3",
|
"key": "sign_sign_extra_txt_3",
|
||||||
"text": "累计签到{0}天领取"
|
"text": "累计完成拼图{0}次领取"
|
||||||
},
|
},
|
||||||
"day": 21,
|
"day": 21,
|
||||||
"groups": 1,
|
"groups": 1,
|
||||||
@ -51,7 +51,7 @@
|
|||||||
"id": 4,
|
"id": 4,
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "sign_sign_extra_txt_4",
|
"key": "sign_sign_extra_txt_4",
|
||||||
"text": "累计签到{0}天领取"
|
"text": "累计完成拼图{0}次领取"
|
||||||
},
|
},
|
||||||
"day": 7,
|
"day": 7,
|
||||||
"groups": 2,
|
"groups": 2,
|
||||||
@ -67,7 +67,7 @@
|
|||||||
"id": 5,
|
"id": 5,
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "sign_sign_extra_txt_5",
|
"key": "sign_sign_extra_txt_5",
|
||||||
"text": "累计签到{0}天领取"
|
"text": "累计完成拼图{0}次领取"
|
||||||
},
|
},
|
||||||
"day": 14,
|
"day": 14,
|
||||||
"groups": 2,
|
"groups": 2,
|
||||||
@ -83,7 +83,7 @@
|
|||||||
"id": 6,
|
"id": 6,
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "sign_sign_extra_txt_6",
|
"key": "sign_sign_extra_txt_6",
|
||||||
"text": "累计签到{0}天领取"
|
"text": "累计完成拼图{0}次领取"
|
||||||
},
|
},
|
||||||
"day": 21,
|
"day": 21,
|
||||||
"groups": 2,
|
"groups": 2,
|
||||||
@ -99,7 +99,7 @@
|
|||||||
"id": 7,
|
"id": 7,
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "sign_sign_extra_txt_7",
|
"key": "sign_sign_extra_txt_7",
|
||||||
"text": "累计签到{0}天领取"
|
"text": "累计完成拼图{0}次领取"
|
||||||
},
|
},
|
||||||
"day": 7,
|
"day": 7,
|
||||||
"groups": 3,
|
"groups": 3,
|
||||||
@ -115,7 +115,7 @@
|
|||||||
"id": 8,
|
"id": 8,
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "sign_sign_extra_txt_8",
|
"key": "sign_sign_extra_txt_8",
|
||||||
"text": "累计签到{0}天领取"
|
"text": "累计完成拼图{0}次领取"
|
||||||
},
|
},
|
||||||
"day": 14,
|
"day": 14,
|
||||||
"groups": 3,
|
"groups": 3,
|
||||||
@ -131,7 +131,7 @@
|
|||||||
"id": 9,
|
"id": 9,
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "sign_sign_extra_txt_9",
|
"key": "sign_sign_extra_txt_9",
|
||||||
"text": "累计签到{0}天领取"
|
"text": "累计完成拼图{0}次领取"
|
||||||
},
|
},
|
||||||
"day": 21,
|
"day": 21,
|
||||||
"groups": 3,
|
"groups": 3,
|
||||||
|
|||||||
@ -26773,7 +26773,7 @@
|
|||||||
"Argu": [
|
"Argu": [
|
||||||
1,
|
1,
|
||||||
4,
|
4,
|
||||||
3900
|
3500
|
||||||
],
|
],
|
||||||
"FollowSK": [],
|
"FollowSK": [],
|
||||||
"SucFollowSK": [],
|
"SucFollowSK": [],
|
||||||
@ -26838,7 +26838,7 @@
|
|||||||
"Argu": [
|
"Argu": [
|
||||||
1,
|
1,
|
||||||
4,
|
4,
|
||||||
4000
|
3600
|
||||||
],
|
],
|
||||||
"FollowSK": [],
|
"FollowSK": [],
|
||||||
"SucFollowSK": [],
|
"SucFollowSK": [],
|
||||||
@ -26861,7 +26861,7 @@
|
|||||||
"Argu": [
|
"Argu": [
|
||||||
1,
|
1,
|
||||||
4,
|
4,
|
||||||
4100
|
3700
|
||||||
],
|
],
|
||||||
"FollowSK": [],
|
"FollowSK": [],
|
||||||
"SucFollowSK": [],
|
"SucFollowSK": [],
|
||||||
@ -26884,7 +26884,7 @@
|
|||||||
"Argu": [
|
"Argu": [
|
||||||
1,
|
1,
|
||||||
4,
|
4,
|
||||||
4200
|
3800
|
||||||
],
|
],
|
||||||
"FollowSK": [],
|
"FollowSK": [],
|
||||||
"SucFollowSK": [],
|
"SucFollowSK": [],
|
||||||
@ -26907,7 +26907,7 @@
|
|||||||
"Argu": [
|
"Argu": [
|
||||||
1,
|
1,
|
||||||
4,
|
4,
|
||||||
4300
|
3900
|
||||||
],
|
],
|
||||||
"FollowSK": [],
|
"FollowSK": [],
|
||||||
"SucFollowSK": [],
|
"SucFollowSK": [],
|
||||||
@ -28413,7 +28413,7 @@
|
|||||||
"Argu": [
|
"Argu": [
|
||||||
1,
|
1,
|
||||||
4,
|
4,
|
||||||
4000
|
2000
|
||||||
],
|
],
|
||||||
"FollowSK": [
|
"FollowSK": [
|
||||||
255003312
|
255003312
|
||||||
@ -29129,7 +29129,7 @@
|
|||||||
"Argu": [
|
"Argu": [
|
||||||
1,
|
1,
|
||||||
4,
|
4,
|
||||||
4000
|
2000
|
||||||
],
|
],
|
||||||
"FollowSK": [],
|
"FollowSK": [],
|
||||||
"SucFollowSK": [
|
"SucFollowSK": [
|
||||||
@ -29231,7 +29231,7 @@
|
|||||||
"Argu": [
|
"Argu": [
|
||||||
1,
|
1,
|
||||||
4,
|
4,
|
||||||
1000
|
500
|
||||||
],
|
],
|
||||||
"FollowSK": [],
|
"FollowSK": [],
|
||||||
"SucFollowSK": [],
|
"SucFollowSK": [],
|
||||||
@ -33154,7 +33154,7 @@
|
|||||||
"Where": [],
|
"Where": [],
|
||||||
"Order": "",
|
"Order": "",
|
||||||
"Limit": 1,
|
"Limit": 1,
|
||||||
"ExecuteCnt": 5,
|
"ExecuteCnt": 4,
|
||||||
"Type": 1,
|
"Type": 1,
|
||||||
"Argu": [
|
"Argu": [
|
||||||
1,
|
1,
|
||||||
@ -33227,7 +33227,7 @@
|
|||||||
"Where": [],
|
"Where": [],
|
||||||
"Order": "",
|
"Order": "",
|
||||||
"Limit": 1,
|
"Limit": 1,
|
||||||
"ExecuteCnt": 5,
|
"ExecuteCnt": 4,
|
||||||
"Type": 1,
|
"Type": 1,
|
||||||
"Argu": [
|
"Argu": [
|
||||||
1,
|
1,
|
||||||
@ -33253,7 +33253,7 @@
|
|||||||
"Where": [],
|
"Where": [],
|
||||||
"Order": "",
|
"Order": "",
|
||||||
"Limit": 1,
|
"Limit": 1,
|
||||||
"ExecuteCnt": 5,
|
"ExecuteCnt": 4,
|
||||||
"Type": 1,
|
"Type": 1,
|
||||||
"Argu": [
|
"Argu": [
|
||||||
1,
|
1,
|
||||||
@ -33279,7 +33279,7 @@
|
|||||||
"Where": [],
|
"Where": [],
|
||||||
"Order": "",
|
"Order": "",
|
||||||
"Limit": 1,
|
"Limit": 1,
|
||||||
"ExecuteCnt": 5,
|
"ExecuteCnt": 4,
|
||||||
"Type": 1,
|
"Type": 1,
|
||||||
"Argu": [
|
"Argu": [
|
||||||
1,
|
1,
|
||||||
@ -33305,7 +33305,7 @@
|
|||||||
"Where": [],
|
"Where": [],
|
||||||
"Order": "",
|
"Order": "",
|
||||||
"Limit": 1,
|
"Limit": 1,
|
||||||
"ExecuteCnt": 5,
|
"ExecuteCnt": 4,
|
||||||
"Type": 1,
|
"Type": 1,
|
||||||
"Argu": [
|
"Argu": [
|
||||||
1,
|
1,
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -9,6 +9,11 @@
|
|||||||
"t": "diamond",
|
"t": "diamond",
|
||||||
"n": 150
|
"n": 150
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"a": "item",
|
||||||
|
"t": "14020000",
|
||||||
|
"n": 50
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "gold",
|
"t": "gold",
|
||||||
@ -28,6 +33,11 @@
|
|||||||
"t": "diamond",
|
"t": "diamond",
|
||||||
"n": 150
|
"n": 150
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"a": "item",
|
||||||
|
"t": "14020000",
|
||||||
|
"n": 100
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "gold",
|
"t": "gold",
|
||||||
@ -47,6 +57,11 @@
|
|||||||
"t": "diamond",
|
"t": "diamond",
|
||||||
"n": 150
|
"n": 150
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"a": "item",
|
||||||
|
"t": "14020000",
|
||||||
|
"n": 100
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "gold",
|
"t": "gold",
|
||||||
@ -66,6 +81,11 @@
|
|||||||
"t": "diamond",
|
"t": "diamond",
|
||||||
"n": 150
|
"n": 150
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"a": "item",
|
||||||
|
"t": "14020000",
|
||||||
|
"n": 100
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "gold",
|
"t": "gold",
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
"id_tag": 2,
|
"id_tag": 2,
|
||||||
"task_display": {
|
"task_display": {
|
||||||
"key": "task_task_round_task_display_1",
|
"key": "task_task_round_task_display_1",
|
||||||
"text": "本周竞技场挑战{1}次"
|
"text": "本周竞技场挑战10次"
|
||||||
},
|
},
|
||||||
"type_id": 13000001,
|
"type_id": 13000001,
|
||||||
"active": 10,
|
"active": 10,
|
||||||
@ -31,7 +31,7 @@
|
|||||||
"id_tag": 2,
|
"id_tag": 2,
|
||||||
"task_display": {
|
"task_display": {
|
||||||
"key": "task_task_round_task_display_2",
|
"key": "task_task_round_task_display_2",
|
||||||
"text": "本周竞技场挑战{1}次"
|
"text": "本周竞技场挑战30次"
|
||||||
},
|
},
|
||||||
"type_id": 13000002,
|
"type_id": 13000002,
|
||||||
"active": 10,
|
"active": 10,
|
||||||
@ -57,7 +57,7 @@
|
|||||||
"id_tag": 2,
|
"id_tag": 2,
|
||||||
"task_display": {
|
"task_display": {
|
||||||
"key": "task_task_round_task_display_3",
|
"key": "task_task_round_task_display_3",
|
||||||
"text": "本周竞技场挑战{1}次"
|
"text": "本周竞技场挑战50次"
|
||||||
},
|
},
|
||||||
"type_id": 13000003,
|
"type_id": 13000003,
|
||||||
"active": 10,
|
"active": 10,
|
||||||
@ -83,7 +83,7 @@
|
|||||||
"id_tag": 2,
|
"id_tag": 2,
|
||||||
"task_display": {
|
"task_display": {
|
||||||
"key": "task_task_round_task_display_4",
|
"key": "task_task_round_task_display_4",
|
||||||
"text": "本周竞技场胜利{1}次"
|
"text": "本周竞技场胜利10次"
|
||||||
},
|
},
|
||||||
"type_id": 13000004,
|
"type_id": 13000004,
|
||||||
"active": 10,
|
"active": 10,
|
||||||
@ -109,7 +109,7 @@
|
|||||||
"id_tag": 2,
|
"id_tag": 2,
|
||||||
"task_display": {
|
"task_display": {
|
||||||
"key": "task_task_round_task_display_5",
|
"key": "task_task_round_task_display_5",
|
||||||
"text": "本周竞技场胜利{1}次"
|
"text": "本周竞技场胜利20次"
|
||||||
},
|
},
|
||||||
"type_id": 13000005,
|
"type_id": 13000005,
|
||||||
"active": 10,
|
"active": 10,
|
||||||
@ -135,7 +135,7 @@
|
|||||||
"id_tag": 2,
|
"id_tag": 2,
|
||||||
"task_display": {
|
"task_display": {
|
||||||
"key": "task_task_round_task_display_6",
|
"key": "task_task_round_task_display_6",
|
||||||
"text": "本周竞技场胜利{1}次"
|
"text": "本周竞技场胜利30次"
|
||||||
},
|
},
|
||||||
"type_id": 13000006,
|
"type_id": 13000006,
|
||||||
"active": 10,
|
"active": 10,
|
||||||
@ -161,9 +161,9 @@
|
|||||||
"id_tag": 2,
|
"id_tag": 2,
|
||||||
"task_display": {
|
"task_display": {
|
||||||
"key": "task_task_round_task_display_7",
|
"key": "task_task_round_task_display_7",
|
||||||
"text": "本周累计经验副本消耗{1}体力"
|
"text": "本周累计经验副本消耗300体力"
|
||||||
},
|
},
|
||||||
"type_id": 13000006,
|
"type_id": 13000007,
|
||||||
"active": 10,
|
"active": 10,
|
||||||
"id_after": 0,
|
"id_after": 0,
|
||||||
"jump_interface": 11012,
|
"jump_interface": 11012,
|
||||||
@ -187,9 +187,9 @@
|
|||||||
"id_tag": 2,
|
"id_tag": 2,
|
||||||
"task_display": {
|
"task_display": {
|
||||||
"key": "task_task_round_task_display_8",
|
"key": "task_task_round_task_display_8",
|
||||||
"text": "本周累计经验副本消耗{1}体力"
|
"text": "本周累计经验副本消耗600体力"
|
||||||
},
|
},
|
||||||
"type_id": 13000006,
|
"type_id": 13000008,
|
||||||
"active": 10,
|
"active": 10,
|
||||||
"id_after": 0,
|
"id_after": 0,
|
||||||
"jump_interface": 11012,
|
"jump_interface": 11012,
|
||||||
@ -213,9 +213,9 @@
|
|||||||
"id_tag": 2,
|
"id_tag": 2,
|
||||||
"task_display": {
|
"task_display": {
|
||||||
"key": "task_task_round_task_display_9",
|
"key": "task_task_round_task_display_9",
|
||||||
"text": "本周累计经验副本消耗{1}体力"
|
"text": "本周累计经验副本消耗1000体力"
|
||||||
},
|
},
|
||||||
"type_id": 13000006,
|
"type_id": 13000009,
|
||||||
"active": 10,
|
"active": 10,
|
||||||
"id_after": 0,
|
"id_after": 0,
|
||||||
"jump_interface": 11012,
|
"jump_interface": 11012,
|
||||||
@ -239,9 +239,9 @@
|
|||||||
"id_tag": 2,
|
"id_tag": 2,
|
||||||
"task_display": {
|
"task_display": {
|
||||||
"key": "task_task_round_task_display_10",
|
"key": "task_task_round_task_display_10",
|
||||||
"text": "本周累计消耗{1}点金币"
|
"text": "本周累计消耗3000000点金币"
|
||||||
},
|
},
|
||||||
"type_id": 13000006,
|
"type_id": 13000010,
|
||||||
"active": 10,
|
"active": 10,
|
||||||
"id_after": 0,
|
"id_after": 0,
|
||||||
"jump_interface": 122,
|
"jump_interface": 122,
|
||||||
@ -265,9 +265,9 @@
|
|||||||
"id_tag": 2,
|
"id_tag": 2,
|
||||||
"task_display": {
|
"task_display": {
|
||||||
"key": "task_task_round_task_display_11",
|
"key": "task_task_round_task_display_11",
|
||||||
"text": "本周累计消耗{1}点金币"
|
"text": "本周累计消耗6000000点金币"
|
||||||
},
|
},
|
||||||
"type_id": 13000006,
|
"type_id": 13000011,
|
||||||
"active": 10,
|
"active": 10,
|
||||||
"id_after": 0,
|
"id_after": 0,
|
||||||
"jump_interface": 122,
|
"jump_interface": 122,
|
||||||
@ -291,9 +291,9 @@
|
|||||||
"id_tag": 2,
|
"id_tag": 2,
|
||||||
"task_display": {
|
"task_display": {
|
||||||
"key": "task_task_round_task_display_12",
|
"key": "task_task_round_task_display_12",
|
||||||
"text": "本周累计消耗{1}点金币"
|
"text": "本周累计消耗10000000点金币"
|
||||||
},
|
},
|
||||||
"type_id": 13000006,
|
"type_id": 13000012,
|
||||||
"active": 10,
|
"active": 10,
|
||||||
"id_after": 0,
|
"id_after": 0,
|
||||||
"jump_interface": 122,
|
"jump_interface": 122,
|
||||||
@ -317,9 +317,9 @@
|
|||||||
"id_tag": 2,
|
"id_tag": 2,
|
||||||
"task_display": {
|
"task_display": {
|
||||||
"key": "task_task_round_task_display_13",
|
"key": "task_task_round_task_display_13",
|
||||||
"text": "本周累计装备副本消耗{1}体力"
|
"text": "本周累计装备副本消耗300体力"
|
||||||
},
|
},
|
||||||
"type_id": 13000006,
|
"type_id": 13000013,
|
||||||
"active": 10,
|
"active": 10,
|
||||||
"id_after": 0,
|
"id_after": 0,
|
||||||
"jump_interface": 11012,
|
"jump_interface": 11012,
|
||||||
@ -343,9 +343,9 @@
|
|||||||
"id_tag": 2,
|
"id_tag": 2,
|
||||||
"task_display": {
|
"task_display": {
|
||||||
"key": "task_task_round_task_display_14",
|
"key": "task_task_round_task_display_14",
|
||||||
"text": "本周累计装备副本消耗{1}体力"
|
"text": "本周累计装备副本消耗600体力"
|
||||||
},
|
},
|
||||||
"type_id": 13000006,
|
"type_id": 13000014,
|
||||||
"active": 10,
|
"active": 10,
|
||||||
"id_after": 0,
|
"id_after": 0,
|
||||||
"jump_interface": 11012,
|
"jump_interface": 11012,
|
||||||
@ -369,9 +369,9 @@
|
|||||||
"id_tag": 2,
|
"id_tag": 2,
|
||||||
"task_display": {
|
"task_display": {
|
||||||
"key": "task_task_round_task_display_15",
|
"key": "task_task_round_task_display_15",
|
||||||
"text": "本周累计装备副本消耗{1}体力"
|
"text": "本周累计装备副本消耗1000体力"
|
||||||
},
|
},
|
||||||
"type_id": 13000006,
|
"type_id": 13000015,
|
||||||
"active": 10,
|
"active": 10,
|
||||||
"id_after": 0,
|
"id_after": 0,
|
||||||
"jump_interface": 11012,
|
"jump_interface": 11012,
|
||||||
@ -395,9 +395,9 @@
|
|||||||
"id_tag": 2,
|
"id_tag": 2,
|
||||||
"task_display": {
|
"task_display": {
|
||||||
"key": "task_task_round_task_display_16",
|
"key": "task_task_round_task_display_16",
|
||||||
"text": "本周累计回响副本消耗{1}体力"
|
"text": "本周累计回响副本消耗300体力"
|
||||||
},
|
},
|
||||||
"type_id": 13000006,
|
"type_id": 13000016,
|
||||||
"active": 10,
|
"active": 10,
|
||||||
"id_after": 0,
|
"id_after": 0,
|
||||||
"jump_interface": 168,
|
"jump_interface": 168,
|
||||||
@ -421,9 +421,9 @@
|
|||||||
"id_tag": 2,
|
"id_tag": 2,
|
||||||
"task_display": {
|
"task_display": {
|
||||||
"key": "task_task_round_task_display_17",
|
"key": "task_task_round_task_display_17",
|
||||||
"text": "本周累计回响副本消耗{1}体力"
|
"text": "本周累计回响副本消耗600体力"
|
||||||
},
|
},
|
||||||
"type_id": 13000006,
|
"type_id": 13000017,
|
||||||
"active": 10,
|
"active": 10,
|
||||||
"id_after": 0,
|
"id_after": 0,
|
||||||
"jump_interface": 168,
|
"jump_interface": 168,
|
||||||
@ -447,9 +447,9 @@
|
|||||||
"id_tag": 2,
|
"id_tag": 2,
|
||||||
"task_display": {
|
"task_display": {
|
||||||
"key": "task_task_round_task_display_18",
|
"key": "task_task_round_task_display_18",
|
||||||
"text": "本周累计回响副本消耗{1}体力"
|
"text": "本周累计回响副本消耗1000体力"
|
||||||
},
|
},
|
||||||
"type_id": 13000006,
|
"type_id": 13000018,
|
||||||
"active": 10,
|
"active": 10,
|
||||||
"id_after": 0,
|
"id_after": 0,
|
||||||
"jump_interface": 168,
|
"jump_interface": 168,
|
||||||
|
|||||||
@ -131,7 +131,7 @@
|
|||||||
},
|
},
|
||||||
"npctxt": {
|
"npctxt": {
|
||||||
"key": "worldtask_world_task_npctxt_4",
|
"key": "worldtask_world_task_npctxt_4",
|
||||||
"text": "击退豺狼小怪小怪"
|
"text": "击退豺狼小怪"
|
||||||
},
|
},
|
||||||
"npc": 10020,
|
"npc": 10020,
|
||||||
"completetask": [
|
"completetask": [
|
||||||
|
|||||||
@ -55,7 +55,7 @@ type (
|
|||||||
///添加单个物品到背包 (可以加物品和减物品)
|
///添加单个物品到背包 (可以加物品和减物品)
|
||||||
AddItem(session IUserSession, itemid string, addnum int32, bPush bool) (errdata *pb.ErrorData)
|
AddItem(session IUserSession, itemid string, addnum int32, bPush bool) (errdata *pb.ErrorData)
|
||||||
///添加多个物品到背包 (可以加物品和减物品)
|
///添加多个物品到背包 (可以加物品和减物品)
|
||||||
AddItems(session IUserSession, items map[string]int32, bPush bool) (change []*pb.DB_UserItemData, errdata *pb.ErrorData)
|
AddItems(session IUserSession, items map[string]int32, bPush bool) (change []*pb.UserAtno, errdata *pb.ErrorData)
|
||||||
///清理道具
|
///清理道具
|
||||||
CleanItems(session IUserSession) (errdata *pb.ErrorData)
|
CleanItems(session IUserSession) (errdata *pb.ErrorData)
|
||||||
///购买统一入场券
|
///购买统一入场券
|
||||||
|
|||||||
@ -5,13 +5,29 @@ import (
|
|||||||
"go_dreamfactory/pb"
|
"go_dreamfactory/pb"
|
||||||
)
|
)
|
||||||
|
|
||||||
//参数校验
|
// 参数校验
|
||||||
func (this *apiComp) SetDefFormtCheck(session comm.IUserSession, req *pb.ArenaSetDefFormtReq) (errdata *pb.ErrorData) {
|
func (this *apiComp) SetDefFormtCheck(session comm.IUserSession, req *pb.ArenaSetDefFormtReq) (errdata *pb.ErrorData) {
|
||||||
|
if len(req.Formt) == 0 {
|
||||||
|
errdata = &pb.ErrorData{
|
||||||
|
Code: pb.ErrorCode_ReqParameterError,
|
||||||
|
Title: pb.ErrorCode_DBError.ToString(),
|
||||||
|
Message: "阵容 不能为空!",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, v := range req.Formt {
|
||||||
|
if v != "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
errdata = &pb.ErrorData{
|
||||||
|
Code: pb.ErrorCode_ReqParameterError,
|
||||||
|
Title: pb.ErrorCode_DBError.ToString(),
|
||||||
|
Message: "阵容 不能为空!",
|
||||||
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
///设置防守阵型
|
// /设置防守阵型
|
||||||
func (this *apiComp) SetDefFormt(session comm.IUserSession, req *pb.ArenaSetDefFormtReq) (errdata *pb.ErrorData) {
|
func (this *apiComp) SetDefFormt(session comm.IUserSession, req *pb.ArenaSetDefFormtReq) (errdata *pb.ErrorData) {
|
||||||
var (
|
var (
|
||||||
info *pb.DBArenaUser
|
info *pb.DBArenaUser
|
||||||
@ -51,7 +67,6 @@ func (this *apiComp) SetDefFormt(session comm.IUserSession, req *pb.ArenaSetDefF
|
|||||||
Title: pb.ErrorCode_DBError.ToString(),
|
Title: pb.ErrorCode_DBError.ToString(),
|
||||||
Message: err.Error(),
|
Message: err.Error(),
|
||||||
}
|
}
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
session.SendMsg(string(this.module.GetType()), "setdefformt", &pb.ArenaSetDefFormtResp{Issucc: true})
|
session.SendMsg(string(this.module.GetType()), "setdefformt", &pb.ArenaSetDefFormtResp{Issucc: true})
|
||||||
|
|||||||
@ -64,14 +64,18 @@ func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) (
|
|||||||
}
|
}
|
||||||
|
|
||||||
adverbEntry = make([]*pb.EquipmentAttributeEntry, len(equip.AdverbEntry))
|
adverbEntry = make([]*pb.EquipmentAttributeEntry, len(equip.AdverbEntry))
|
||||||
for i, v := range comm.RandShuffle(len(equip.AdverbEntry)) {
|
for i, v := range comm.RandShuffle(len(attrlibrarys)) {
|
||||||
adverbEntry[i] = &pb.EquipmentAttributeEntry{
|
if i < len(equip.AdverbEntry) {
|
||||||
Id: attrlibrarys[v].Key,
|
adverbEntry[i] = &pb.EquipmentAttributeEntry{
|
||||||
Libraryid: attrlibrarys[v].Libraryid,
|
Id: attrlibrarys[v].Key,
|
||||||
Lv: equip.AdverbEntry[i].Lv,
|
Libraryid: attrlibrarys[v].Libraryid,
|
||||||
AttrName: attrlibrarys[v].Attrkey,
|
Lv: equip.AdverbEntry[i].Lv,
|
||||||
BaseValue: attrlibrarys[v].Attrvar,
|
AttrName: attrlibrarys[v].Attrkey,
|
||||||
Value: attrlibrarys[v].Attrvar + int32(float64(attrlibrarys[v].Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrarys[v].AttrvarCorrect)),
|
BaseValue: attrlibrarys[v].Attrvar,
|
||||||
|
Value: attrlibrarys[v].Attrvar + int32(float64(attrlibrarys[v].Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrarys[v].Attrvar)),
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// this.module.ModuleRtask.SendToRtask(session, comm.Rtype95, 1)
|
// this.module.ModuleRtask.SendToRtask(session, comm.Rtype95, 1)
|
||||||
|
|||||||
@ -390,10 +390,12 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte
|
|||||||
num = int64(v.Amount) + int64(leftnum)
|
num = int64(v.Amount) + int64(leftnum)
|
||||||
if num < 0 {
|
if num < 0 {
|
||||||
leftnum += int64(v.Amount)
|
leftnum += int64(v.Amount)
|
||||||
|
v.Change = -1 * int32(v.Amount)
|
||||||
v.Amount = 0
|
v.Amount = 0
|
||||||
del = append(del, v)
|
del = append(del, v)
|
||||||
} else if num > 0 && num < int64(v.Amount) {
|
} else if num > 0 && num < int64(v.Amount) {
|
||||||
leftnum = 0
|
leftnum = 0
|
||||||
|
v.Change = int32(num) - int32(v.Amount)
|
||||||
v.Amount = uint32(num)
|
v.Amount = uint32(num)
|
||||||
update = append(update, v)
|
update = append(update, v)
|
||||||
break
|
break
|
||||||
@ -401,6 +403,7 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte
|
|||||||
if conf.UpperLimit > 0 {
|
if conf.UpperLimit > 0 {
|
||||||
if num <= int64(conf.UpperLimit) {
|
if num <= int64(conf.UpperLimit) {
|
||||||
leftnum = 0
|
leftnum = 0
|
||||||
|
v.Change = int32(num) - int32(v.Amount)
|
||||||
v.Amount = uint32(num)
|
v.Amount = uint32(num)
|
||||||
update = append(update, v)
|
update = append(update, v)
|
||||||
break
|
break
|
||||||
@ -413,6 +416,7 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
leftnum = 0
|
leftnum = 0
|
||||||
|
v.Change = int32(num) - int32(v.Amount)
|
||||||
v.Amount = uint32(num)
|
v.Amount = uint32(num)
|
||||||
update = append(update, v)
|
update = append(update, v)
|
||||||
}
|
}
|
||||||
@ -434,6 +438,7 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte
|
|||||||
GridId: primitive.NewObjectID().Hex(),
|
GridId: primitive.NewObjectID().Hex(),
|
||||||
UId: uid,
|
UId: uid,
|
||||||
ItemId: itemId,
|
ItemId: itemId,
|
||||||
|
Change: int32(leftnum),
|
||||||
Amount: uint32(leftnum),
|
Amount: uint32(leftnum),
|
||||||
CTime: configure.Now().Unix(),
|
CTime: configure.Now().Unix(),
|
||||||
IsNewItem: isNew,
|
IsNewItem: isNew,
|
||||||
@ -451,6 +456,7 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte
|
|||||||
GridId: primitive.NewObjectID().Hex(),
|
GridId: primitive.NewObjectID().Hex(),
|
||||||
UId: uid,
|
UId: uid,
|
||||||
ItemId: itemId,
|
ItemId: itemId,
|
||||||
|
Change: int32(conf.UpperLimit),
|
||||||
Amount: uint32(conf.UpperLimit),
|
Amount: uint32(conf.UpperLimit),
|
||||||
CTime: configure.Now().Unix(),
|
CTime: configure.Now().Unix(),
|
||||||
IsNewItem: isNew,
|
IsNewItem: isNew,
|
||||||
|
|||||||
@ -34,19 +34,19 @@ type Items struct {
|
|||||||
configure *ConfigureComp
|
configure *ConfigureComp
|
||||||
}
|
}
|
||||||
|
|
||||||
//模块名称
|
// 模块名称
|
||||||
func (this *Items) GetType() core.M_Modules {
|
func (this *Items) GetType() core.M_Modules {
|
||||||
return comm.ModuleItems
|
return comm.ModuleItems
|
||||||
}
|
}
|
||||||
|
|
||||||
//模块初始化接口 注册用户创建角色事件
|
// 模块初始化接口 注册用户创建角色事件
|
||||||
func (this *Items) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
|
func (this *Items) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
|
||||||
err = this.ModuleBase.Init(service, module, options)
|
err = this.ModuleBase.Init(service, module, options)
|
||||||
this.service = service.(base.IRPCXService)
|
this.service = service.(base.IRPCXService)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
//模块启动
|
// 模块启动
|
||||||
func (this *Items) Start() (err error) {
|
func (this *Items) Start() (err error) {
|
||||||
err = this.ModuleBase.Start()
|
err = this.ModuleBase.Start()
|
||||||
var module core.IModule
|
var module core.IModule
|
||||||
@ -58,7 +58,7 @@ func (this *Items) Start() (err error) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
//装备组件
|
// 装备组件
|
||||||
func (this *Items) OnInstallComp() {
|
func (this *Items) OnInstallComp() {
|
||||||
this.ModuleBase.OnInstallComp()
|
this.ModuleBase.OnInstallComp()
|
||||||
this.api = this.RegisterComp(new(apiComp)).(*apiComp)
|
this.api = this.RegisterComp(new(apiComp)).(*apiComp)
|
||||||
@ -66,13 +66,13 @@ func (this *Items) OnInstallComp() {
|
|||||||
this.configure = this.RegisterComp(new(ConfigureComp)).(*ConfigureComp)
|
this.configure = this.RegisterComp(new(ConfigureComp)).(*ConfigureComp)
|
||||||
}
|
}
|
||||||
|
|
||||||
//Event------------------------------------------------------------------------------------------------------------
|
// Event------------------------------------------------------------------------------------------------------------
|
||||||
func (this *Items) EventUserOffline(uid, sessionid string) {
|
func (this *Items) EventUserOffline(uid, sessionid string) {
|
||||||
this.modelItems.BatchDelLists(uid)
|
this.modelItems.BatchDelLists(uid)
|
||||||
}
|
}
|
||||||
|
|
||||||
//IItems-------------------------------------------------------------------------------------------------------------------------------
|
// IItems-------------------------------------------------------------------------------------------------------------------------------
|
||||||
///查询用户背包物品数量
|
// /查询用户背包物品数量
|
||||||
func (this *Items) QueryItemAmount(uId string, itemid string) (amount uint32) {
|
func (this *Items) QueryItemAmount(uId string, itemid string) (amount uint32) {
|
||||||
defer this.Debugf("获取物品 uId:%s itemid:%s addnum:%d ", uId, itemid, amount)
|
defer this.Debugf("获取物品 uId:%s itemid:%s addnum:%d ", uId, itemid, amount)
|
||||||
amount = 0
|
amount = 0
|
||||||
@ -82,7 +82,7 @@ func (this *Items) QueryItemAmount(uId string, itemid string) (amount uint32) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
///查询用户背包多个物品数量
|
// /查询用户背包多个物品数量
|
||||||
func (this *Items) QueryItemsAmount(uId string, itemid ...string) (result map[string]uint32) {
|
func (this *Items) QueryItemsAmount(uId string, itemid ...string) (result map[string]uint32) {
|
||||||
result = this.modelItems.QueryUserPackItemsAmount(uId, itemid...)
|
result = this.modelItems.QueryUserPackItemsAmount(uId, itemid...)
|
||||||
return
|
return
|
||||||
@ -124,7 +124,7 @@ func (this *Items) AddItemforGrid(session comm.IUserSession, gridid string, addn
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
///添加单个物品到背包 (可以加物品和减物品)
|
// /添加单个物品到背包 (可以加物品和减物品)
|
||||||
func (this *Items) AddItem(session comm.IUserSession, itemid string, addnum int32, bPush bool) (errdata *pb.ErrorData) {
|
func (this *Items) AddItem(session comm.IUserSession, itemid string, addnum int32, bPush bool) (errdata *pb.ErrorData) {
|
||||||
var (
|
var (
|
||||||
err error
|
err error
|
||||||
@ -161,15 +161,17 @@ func (this *Items) AddItem(session comm.IUserSession, itemid string, addnum int3
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
///添加多个物品到背包 (可以加物品和减物品)
|
// /添加多个物品到背包 (可以加物品和减物品)
|
||||||
func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, bPush bool) (change []*pb.DB_UserItemData, errdata *pb.ErrorData) {
|
func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, bPush bool) (change []*pb.UserAtno, errdata *pb.ErrorData) {
|
||||||
var (
|
var (
|
||||||
tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0)
|
tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0)
|
||||||
err error
|
_change []*pb.DB_UserItemData
|
||||||
|
err error
|
||||||
)
|
)
|
||||||
|
|
||||||
defer this.Debugf("给用户添加物品 uId:%s items:%v items:%v", session.GetUserId(), items, err == nil)
|
defer this.Debugf("给用户添加物品 uId:%s items:%v items:%v", session.GetUserId(), items, err == nil)
|
||||||
if change, err = this.modelItems.AddItemsToUserPack(session.GetUserId(), items); err != nil {
|
change = make([]*pb.UserAtno, 0)
|
||||||
|
if _change, err = this.modelItems.AddItemsToUserPack(session.GetUserId(), items); err != nil {
|
||||||
this.Errorf("给用户添加物品 uId:%s items:%v err:%v", session.GetUserId(), items, err)
|
this.Errorf("给用户添加物品 uId:%s items:%v err:%v", session.GetUserId(), items, err)
|
||||||
if err == ItemNotEnoughError {
|
if err == ItemNotEnoughError {
|
||||||
errdata = &pb.ErrorData{
|
errdata = &pb.ErrorData{
|
||||||
@ -198,8 +200,16 @@ func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, b
|
|||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if len(change) > 0 && bPush {
|
for _, v := range _change {
|
||||||
this.itemsChangePush(session, change) //推送道具背包变化
|
change = append(change, &pb.UserAtno{
|
||||||
|
A: comm.ItemType,
|
||||||
|
T: v.ItemId,
|
||||||
|
N: v.Change,
|
||||||
|
O: v.GridId,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
if len(_change) > 0 && bPush {
|
||||||
|
this.itemsChangePush(session, _change) //推送道具背包变化
|
||||||
}
|
}
|
||||||
for k, v := range items {
|
for k, v := range items {
|
||||||
if v > 0 {
|
if v > 0 {
|
||||||
@ -213,12 +223,12 @@ func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, b
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
//使用物品
|
// 使用物品
|
||||||
func (this *Items) UseItem(session comm.IUserSession, gid string, amount int32, slt int32) (errdata *pb.ErrorData) {
|
func (this *Items) UseItem(session comm.IUserSession, gid string, amount int32, slt int32) (errdata *pb.ErrorData) {
|
||||||
return this.modelItems.useitem(session, gid, amount, slt)
|
return this.modelItems.useitem(session, gid, amount, slt)
|
||||||
}
|
}
|
||||||
|
|
||||||
//清理背包
|
// 清理背包
|
||||||
func (this *Items) CleanItems(session comm.IUserSession) (errdata *pb.ErrorData) {
|
func (this *Items) CleanItems(session comm.IUserSession) (errdata *pb.ErrorData) {
|
||||||
var (
|
var (
|
||||||
err error
|
err error
|
||||||
@ -236,19 +246,19 @@ func (this *Items) CleanItems(session comm.IUserSession) (errdata *pb.ErrorData)
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
//购买门票道具
|
// 购买门票道具
|
||||||
func (this *Items) BuyUnifiedTicket(session comm.IUserSession, buynum int32) (errdata *pb.ErrorData) {
|
func (this *Items) BuyUnifiedTicket(session comm.IUserSession, buynum int32) (errdata *pb.ErrorData) {
|
||||||
_, errdata = this.modelItems.buyTicket(session, buynum)
|
_, errdata = this.modelItems.buyTicket(session, buynum)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
//回复道具
|
// 回复道具
|
||||||
func (this *Items) RecoverTicket(session comm.IUserSession) (errdata *pb.ErrorData) {
|
func (this *Items) RecoverTicket(session comm.IUserSession) (errdata *pb.ErrorData) {
|
||||||
errdata = this.modelItems.recoverTicket(session)
|
errdata = this.modelItems.recoverTicket(session)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
//出售道具
|
// 出售道具
|
||||||
func (this *Items) SellItem(session comm.IUserSession, items map[string]int32, bPush bool) (errdata *pb.ErrorData, atno []*pb.UserAtno) {
|
func (this *Items) SellItem(session comm.IUserSession, items map[string]int32, bPush bool) (errdata *pb.ErrorData, atno []*pb.UserAtno) {
|
||||||
var (
|
var (
|
||||||
grids []string = make([]string, 0, len(items))
|
grids []string = make([]string, 0, len(items))
|
||||||
@ -334,8 +344,8 @@ func (this *Items) SellItem(session comm.IUserSession, items map[string]int32, b
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
//Evens--------------------------------------------------------------------------------------------------------------------------------
|
// Evens--------------------------------------------------------------------------------------------------------------------------------
|
||||||
//推送道具变化消息
|
// 推送道具变化消息
|
||||||
func (this *Items) itemsChangePush(session comm.IUserSession, items []*pb.DB_UserItemData) (err error) {
|
func (this *Items) itemsChangePush(session comm.IUserSession, items []*pb.DB_UserItemData) (err error) {
|
||||||
session.SendMsg(string(this.GetType()), "change", &pb.ItemsChangePush{Grids: items})
|
session.SendMsg(string(this.GetType()), "change", &pb.ItemsChangePush{Grids: items})
|
||||||
return
|
return
|
||||||
|
|||||||
@ -684,16 +684,10 @@ func (this *ModuleBase) DispenseAtno(session comm.IUserSession, res []*cfg.Gamea
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if len(items) > 0 { //道具资源
|
if len(items) > 0 { //道具资源
|
||||||
addItems, code := this.ModuleItems.AddItems(session, items, bPush)
|
_atno, code := this.ModuleItems.AddItems(session, items, bPush)
|
||||||
this.Debugf("发放道具资源: %v [%v]", items, code)
|
errdata = code
|
||||||
for _, v := range addItems {
|
atno = append(atno, _atno...)
|
||||||
atno = append(atno, &pb.UserAtno{
|
this.Debugf("发放道具资源: %v [%v]", _atno, code)
|
||||||
A: "item",
|
|
||||||
T: v.ItemId,
|
|
||||||
N: int32(len(items)),
|
|
||||||
O: v.GridId,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if len(heros) > 0 { //卡片资源
|
if len(heros) > 0 { //卡片资源
|
||||||
hero, atn, code := this.ModuleHero.CreateRepeatHeros(session, heros, bPush)
|
hero, atn, code := this.ModuleHero.CreateRepeatHeros(session, heros, bPush)
|
||||||
|
|||||||
@ -167,7 +167,6 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
|
|||||||
items = append(items, randomGoods(_items))
|
items = append(items, randomGoods(_items))
|
||||||
}
|
}
|
||||||
sdata.Buy = make(map[int32]int32)
|
sdata.Buy = make(map[int32]int32)
|
||||||
goods = transGoods(items, sdata)
|
|
||||||
sdata.LastRefreshTime = configure.Now().Unix()
|
sdata.LastRefreshTime = configure.Now().Unix()
|
||||||
sdata.ManualRefreshNum++
|
sdata.ManualRefreshNum++
|
||||||
sdata.Items = make([]int32, len(items))
|
sdata.Items = make([]int32, len(items))
|
||||||
@ -180,6 +179,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
goods = transGoods(items, sdata)
|
||||||
// this.module.ModuleRtask.SendToRtask(session, comm.Rtype105, 1)
|
// this.module.ModuleRtask.SendToRtask(session, comm.Rtype105, 1)
|
||||||
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype105, 1))
|
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype105, 1))
|
||||||
this.module.modelShop.Change(session.GetUserId(), map[string]interface{}{"refreshnumgoldShop": shopData.RefreshnumgoldShop, "refreshtimegoldShop": shopData.RefreshtimegoldShop, filed: sdata})
|
this.module.modelShop.Change(session.GetUserId(), map[string]interface{}{"refreshnumgoldShop": shopData.RefreshnumgoldShop, "refreshtimegoldShop": shopData.RefreshtimegoldShop, filed: sdata})
|
||||||
@ -247,6 +247,6 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
|
|||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
session.SendMsg(string(this.module.GetType()), "getlist", &pb.ShopGetListResp{SType: req.SType, IsManualRefresh: req.IsManualRefresh, Goods: goods, SurplusRefreshNum: leftrefnum})
|
session.SendMsg(string(this.module.GetType()), "getlist", &pb.ShopGetListResp{SType: req.SType, IsManualRefresh: req.IsManualRefresh, Goods: goods, SurplusRefreshNum: leftrefnum, Lastrefreshtime: sdata.LastRefreshTime})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@ -126,10 +126,14 @@ func (this *modelTask) TCondFinishNotify(uid string, conds []*pb.ConIProgress) {
|
|||||||
task.Received = 1
|
task.Received = 1
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
newTask = append(newTask, &pb.TujianTask{
|
nt := &pb.TujianTask{
|
||||||
TaskId: k,
|
TaskId: k,
|
||||||
Cond: v,
|
Cond: v,
|
||||||
})
|
}
|
||||||
|
if v.State == pb.BuriedItemFinishState_buried_finish {
|
||||||
|
nt.Received = 1
|
||||||
|
}
|
||||||
|
newTask = append(newTask, nt)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
dt.Tasks = append(dt.Tasks, newTask...)
|
dt.Tasks = append(dt.Tasks, newTask...)
|
||||||
|
|||||||
@ -128,7 +128,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err
|
|||||||
|
|
||||||
if this.module.modelUser.isLoginFirst(lastLoginTime) {
|
if this.module.modelUser.isLoginFirst(lastLoginTime) {
|
||||||
this.module.ModuleHero.NoLoginDay(user.Uid, int32(utils.DiffDays(lastLoginTime, configure.Now().Unix())))
|
this.module.ModuleHero.NoLoginDay(user.Uid, int32(utils.DiffDays(lastLoginTime, configure.Now().Unix())))
|
||||||
|
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype8, 1))
|
||||||
this.module.modelExpand.updateLoginDay(user.Uid, lastLoginTime)
|
this.module.modelExpand.updateLoginDay(user.Uid, lastLoginTime)
|
||||||
// 清理点赞
|
// 清理点赞
|
||||||
this.module.ModuleFriend.ResetFriend(user.Uid)
|
this.module.ModuleFriend.ResetFriend(user.Uid)
|
||||||
@ -150,14 +150,15 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err
|
|||||||
} else {
|
} else {
|
||||||
rsp.Ex = expand
|
rsp.Ex = expand
|
||||||
}
|
}
|
||||||
} else {
|
} else { //新号
|
||||||
rsp.Ex = &pb.DBUserExpand{}
|
rsp.Ex = &pb.DBUserExpand{}
|
||||||
this.module.modelSign.UserSign(session)
|
this.module.modelSign.UserSign(session)
|
||||||
|
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype8, 1))
|
||||||
}
|
}
|
||||||
|
|
||||||
this.module.RecoverUserPsStart(user.Uid)
|
this.module.RecoverUserPsStart(user.Uid)
|
||||||
// 日常登录任务
|
// 日常登录任务
|
||||||
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype8, 1))
|
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype7, 1))
|
||||||
this.module.ModulePrivilege.CheckDailyPrivilegeMail(session)
|
this.module.ModulePrivilege.CheckDailyPrivilegeMail(session)
|
||||||
|
|
||||||
rsp.Data = user
|
rsp.Data = user
|
||||||
|
|||||||
139
pb/hero_db.pb.go
139
pb/hero_db.pb.go
@ -321,8 +321,8 @@ type DBHeroRecord struct {
|
|||||||
|
|
||||||
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID 主键id
|
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID 主键id
|
||||||
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID
|
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID
|
||||||
Star4 int32 `protobuf:"varint,3,opt,name=star4,proto3" json:"star4"` // 4星保底 -- 新版抽卡废弃字段
|
Star4 int32 `protobuf:"varint,3,opt,name=star4,proto3" json:"star4"` // 4星保底
|
||||||
Star5 int32 `protobuf:"varint,4,opt,name=star5,proto3" json:"star5"` // 5星保底 -- 新版抽卡废弃字段
|
Star5 int32 `protobuf:"varint,4,opt,name=star5,proto3" json:"star5"` // 5星保底
|
||||||
Mtime int64 `protobuf:"varint,5,opt,name=mtime,proto3" json:"mtime"` // 修改时间
|
Mtime int64 `protobuf:"varint,5,opt,name=mtime,proto3" json:"mtime"` // 修改时间
|
||||||
Drawcount int32 `protobuf:"varint,6,opt,name=drawcount,proto3" json:"drawcount"` // 普通卡牌累计抽取次数
|
Drawcount int32 `protobuf:"varint,6,opt,name=drawcount,proto3" json:"drawcount"` // 普通卡牌累计抽取次数
|
||||||
Condition map[string]int32 `protobuf:"bytes,7,rep,name=condition,proto3" json:"condition" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key recharge、login 等 value 累计抽卡次数
|
Condition map[string]int32 `protobuf:"bytes,7,rep,name=condition,proto3" json:"condition" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key recharge、login 等 value 累计抽卡次数
|
||||||
@ -334,9 +334,6 @@ type DBHeroRecord struct {
|
|||||||
Inevitable int32 `protobuf:"varint,13,opt,name=inevitable,proto3" json:"inevitable"` //第2-30次抽奖必出一个5星英雄
|
Inevitable int32 `protobuf:"varint,13,opt,name=inevitable,proto3" json:"inevitable"` //第2-30次抽奖必出一个5星英雄
|
||||||
Inevitable1 int32 `protobuf:"varint,14,opt,name=inevitable1,proto3" json:"inevitable1"` //第30-50次抽奖必出一个5星英雄
|
Inevitable1 int32 `protobuf:"varint,14,opt,name=inevitable1,proto3" json:"inevitable1"` //第30-50次抽奖必出一个5星英雄
|
||||||
Race map[int32]int32 `protobuf:"bytes,15,rep,name=race,proto3" json:"race" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 阵营类型 value count
|
Race map[int32]int32 `protobuf:"bytes,15,rep,name=race,proto3" json:"race" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 阵营类型 value count
|
||||||
Baodi4 map[int32]int32 `protobuf:"bytes,16,rep,name=baodi4,proto3" json:"baodi4" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 4星保底次数 key 阵营类型 value count
|
|
||||||
Baodi5 map[int32]int32 `protobuf:"bytes,17,rep,name=baodi5,proto3" json:"baodi5" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 5星保底次数 key 阵营类型 value count
|
|
||||||
Count map[int32]int32 `protobuf:"bytes,18,rep,name=count,proto3" json:"count" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 抽卡次数 key 阵营类型 value count
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *DBHeroRecord) Reset() {
|
func (x *DBHeroRecord) Reset() {
|
||||||
@ -476,27 +473,6 @@ func (x *DBHeroRecord) GetRace() map[int32]int32 {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *DBHeroRecord) GetBaodi4() map[int32]int32 {
|
|
||||||
if x != nil {
|
|
||||||
return x.Baodi4
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *DBHeroRecord) GetBaodi5() map[int32]int32 {
|
|
||||||
if x != nil {
|
|
||||||
return x.Baodi5
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *DBHeroRecord) GetCount() map[int32]int32 {
|
|
||||||
if x != nil {
|
|
||||||
return x.Count
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// 英雄天赋系统
|
// 英雄天赋系统
|
||||||
type DBHeroTalent struct {
|
type DBHeroTalent struct {
|
||||||
state protoimpl.MessageState
|
state protoimpl.MessageState
|
||||||
@ -658,7 +634,7 @@ var file_hero_hero_db_proto_rawDesc = []byte{
|
|||||||
0x3a, 0x0a, 0x0c, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
|
0x3a, 0x0a, 0x0c, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
|
||||||
0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
|
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,
|
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, 0xde, 0x07, 0x0a, 0x0c,
|
0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x98, 0x05, 0x0a, 0x0c,
|
||||||
0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02,
|
0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02,
|
||||||
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03,
|
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, 0x14,
|
0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14,
|
||||||
@ -689,54 +665,33 @@ var file_hero_hero_db_proto_rawDesc = []byte{
|
|||||||
0x62, 0x6c, 0x65, 0x31, 0x12, 0x2b, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x0f, 0x20, 0x03,
|
0x62, 0x6c, 0x65, 0x31, 0x12, 0x2b, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x0f, 0x20, 0x03,
|
||||||
0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72,
|
0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72,
|
||||||
0x64, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x72, 0x61, 0x63,
|
0x64, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x72, 0x61, 0x63,
|
||||||
0x65, 0x12, 0x31, 0x0a, 0x06, 0x62, 0x61, 0x6f, 0x64, 0x69, 0x34, 0x18, 0x10, 0x20, 0x03, 0x28,
|
0x65, 0x1a, 0x3c, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e,
|
||||||
0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64,
|
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||||
0x2e, 0x42, 0x61, 0x6f, 0x64, 0x69, 0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x62, 0x61,
|
0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
|
||||||
0x6f, 0x64, 0x69, 0x34, 0x12, 0x31, 0x0a, 0x06, 0x62, 0x61, 0x6f, 0x64, 0x69, 0x35, 0x18, 0x11,
|
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
|
||||||
0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63,
|
0x3c, 0x0a, 0x0e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72,
|
||||||
0x6f, 0x72, 0x64, 0x2e, 0x42, 0x61, 0x6f, 0x64, 0x69, 0x35, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
|
0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
|
||||||
0x06, 0x62, 0x61, 0x6f, 0x64, 0x69, 0x35, 0x12, 0x2e, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74,
|
0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
|
||||||
0x18, 0x12, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52,
|
0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a,
|
||||||
0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79,
|
0x09, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
|
||||||
0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x1a, 0x3c, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69,
|
0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
|
||||||
0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
|
0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c,
|
||||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
|
0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb6, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72,
|
||||||
0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
|
0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
|
||||||
0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65,
|
0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02,
|
||||||
0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
|
0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72,
|
||||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
|
0x6f, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49,
|
||||||
0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
|
0x64, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28,
|
||||||
0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79,
|
0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74,
|
||||||
0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b,
|
0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61,
|
||||||
0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
|
0x6c, 0x65, 0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e,
|
||||||
0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b,
|
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
|
||||||
0x42, 0x61, 0x6f, 0x64, 0x69, 0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
|
0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
|
||||||
0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
|
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a,
|
||||||
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61,
|
0x2f, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x48,
|
||||||
0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x42, 0x61, 0x6f, 0x64, 0x69,
|
0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e,
|
||||||
0x35, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
|
0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x10, 0x01,
|
||||||
0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
|
0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||||
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
|
|
||||||
0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79,
|
|
||||||
0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 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, 0xb6, 0x01, 0x0a,
|
|
||||||
0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 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,
|
|
||||||
0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
|
|
||||||
0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e,
|
|
||||||
0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f,
|
|
||||||
0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74,
|
|
||||||
0x72, 0x79, 0x52, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61,
|
|
||||||
0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
|
|
||||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 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, 0x2a, 0x2f, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70,
|
|
||||||
0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c,
|
|
||||||
0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4b, 0x6f,
|
|
||||||
0x6e, 0x67, 0x46, 0x75, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
|
|
||||||
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -752,7 +707,7 @@ func file_hero_hero_db_proto_rawDescGZIP() []byte {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var file_hero_hero_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
|
var file_hero_hero_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
|
||||||
var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
|
var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
|
||||||
var file_hero_hero_db_proto_goTypes = []interface{}{
|
var file_hero_hero_db_proto_goTypes = []interface{}{
|
||||||
(HeroType)(0), // 0: HeroType
|
(HeroType)(0), // 0: HeroType
|
||||||
(*DBHero)(nil), // 1: DBHero
|
(*DBHero)(nil), // 1: DBHero
|
||||||
@ -767,36 +722,30 @@ var file_hero_hero_db_proto_goTypes = []interface{}{
|
|||||||
nil, // 10: DBHeroRecord.ConditionEntry
|
nil, // 10: DBHeroRecord.ConditionEntry
|
||||||
nil, // 11: DBHeroRecord.Star5HeroEntry
|
nil, // 11: DBHeroRecord.Star5HeroEntry
|
||||||
nil, // 12: DBHeroRecord.RaceEntry
|
nil, // 12: DBHeroRecord.RaceEntry
|
||||||
nil, // 13: DBHeroRecord.Baodi4Entry
|
nil, // 13: DBHeroTalent.TalentEntry
|
||||||
nil, // 14: DBHeroRecord.Baodi5Entry
|
(*SkillData)(nil), // 14: SkillData
|
||||||
nil, // 15: DBHeroRecord.CountEntry
|
(*DB_EquipmentSuit)(nil), // 15: DB_EquipmentSuit
|
||||||
nil, // 16: DBHeroTalent.TalentEntry
|
|
||||||
(*SkillData)(nil), // 17: SkillData
|
|
||||||
(*DB_EquipmentSuit)(nil), // 18: DB_EquipmentSuit
|
|
||||||
}
|
}
|
||||||
var file_hero_hero_db_proto_depIdxs = []int32{
|
var file_hero_hero_db_proto_depIdxs = []int32{
|
||||||
17, // 0: DBHero.normalSkill:type_name -> SkillData
|
14, // 0: DBHero.normalSkill:type_name -> SkillData
|
||||||
4, // 1: DBHero.property:type_name -> DBHero.PropertyEntry
|
4, // 1: DBHero.property:type_name -> DBHero.PropertyEntry
|
||||||
5, // 2: DBHero.addProperty:type_name -> DBHero.AddPropertyEntry
|
5, // 2: DBHero.addProperty:type_name -> DBHero.AddPropertyEntry
|
||||||
6, // 3: DBHero.juexProperty:type_name -> DBHero.JuexPropertyEntry
|
6, // 3: DBHero.juexProperty:type_name -> DBHero.JuexPropertyEntry
|
||||||
0, // 4: DBHero.status:type_name -> HeroType
|
0, // 4: DBHero.status:type_name -> HeroType
|
||||||
18, // 5: DBHero.suits:type_name -> DB_EquipmentSuit
|
15, // 5: DBHero.suits:type_name -> DB_EquipmentSuit
|
||||||
7, // 6: DBHero.talentProperty:type_name -> DBHero.TalentPropertyEntry
|
7, // 6: DBHero.talentProperty:type_name -> DBHero.TalentPropertyEntry
|
||||||
17, // 7: DBHero.equipSkill:type_name -> SkillData
|
14, // 7: DBHero.equipSkill:type_name -> SkillData
|
||||||
8, // 8: DBHero.horoscopeProperty:type_name -> DBHero.HoroscopePropertyEntry
|
8, // 8: DBHero.horoscopeProperty:type_name -> DBHero.HoroscopePropertyEntry
|
||||||
9, // 9: DBHero.fetters:type_name -> DBHero.FettersEntry
|
9, // 9: DBHero.fetters:type_name -> DBHero.FettersEntry
|
||||||
10, // 10: DBHeroRecord.condition:type_name -> DBHeroRecord.ConditionEntry
|
10, // 10: DBHeroRecord.condition:type_name -> DBHeroRecord.ConditionEntry
|
||||||
11, // 11: DBHeroRecord.star5Hero:type_name -> DBHeroRecord.Star5HeroEntry
|
11, // 11: DBHeroRecord.star5Hero:type_name -> DBHeroRecord.Star5HeroEntry
|
||||||
12, // 12: DBHeroRecord.race:type_name -> DBHeroRecord.RaceEntry
|
12, // 12: DBHeroRecord.race:type_name -> DBHeroRecord.RaceEntry
|
||||||
13, // 13: DBHeroRecord.baodi4:type_name -> DBHeroRecord.Baodi4Entry
|
13, // 13: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry
|
||||||
14, // 14: DBHeroRecord.baodi5:type_name -> DBHeroRecord.Baodi5Entry
|
14, // [14:14] is the sub-list for method output_type
|
||||||
15, // 15: DBHeroRecord.count:type_name -> DBHeroRecord.CountEntry
|
14, // [14:14] is the sub-list for method input_type
|
||||||
16, // 16: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry
|
14, // [14:14] is the sub-list for extension type_name
|
||||||
17, // [17:17] is the sub-list for method output_type
|
14, // [14:14] is the sub-list for extension extendee
|
||||||
17, // [17:17] is the sub-list for method input_type
|
0, // [0:14] is the sub-list for field type_name
|
||||||
17, // [17:17] is the sub-list for extension type_name
|
|
||||||
17, // [17:17] is the sub-list for extension extendee
|
|
||||||
0, // [0:17] is the sub-list for field type_name
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() { file_hero_hero_db_proto_init() }
|
func init() { file_hero_hero_db_proto_init() }
|
||||||
@ -850,7 +799,7 @@ func file_hero_hero_db_proto_init() {
|
|||||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||||
RawDescriptor: file_hero_hero_db_proto_rawDesc,
|
RawDescriptor: file_hero_hero_db_proto_rawDesc,
|
||||||
NumEnums: 1,
|
NumEnums: 1,
|
||||||
NumMessages: 16,
|
NumMessages: 13,
|
||||||
NumExtensions: 0,
|
NumExtensions: 0,
|
||||||
NumServices: 0,
|
NumServices: 0,
|
||||||
},
|
},
|
||||||
|
|||||||
@ -28,12 +28,13 @@ type DB_UserItemData struct {
|
|||||||
|
|
||||||
GridId string `protobuf:"bytes,1,opt,name=gridId,proto3" json:"gridId" bson:"_id"` // 背包格子Id
|
GridId string `protobuf:"bytes,1,opt,name=gridId,proto3" json:"gridId" bson:"_id"` // 背包格子Id
|
||||||
UId string `protobuf:"bytes,2,opt,name=uId,proto3" json:"uId" bson:"uid"` // 用户id
|
UId string `protobuf:"bytes,2,opt,name=uId,proto3" json:"uId" bson:"uid"` // 用户id
|
||||||
ItemId string `protobuf:"bytes,3,opt,name=itemId,proto3" json:"itemId" bson:"itemId"` // 存放物品的Id
|
ItemId string `protobuf:"bytes,3,opt,name=itemId,proto3" json:"itemId" bson:"itemId"` // 存放物品的Id
|
||||||
Amount uint32 `protobuf:"varint,4,opt,name=amount,proto3" json:"amount" bson:"amount"` // 存放物品的数量
|
Amount uint32 `protobuf:"varint,4,opt,name=amount,proto3" json:"amount" bson:"amount"` // 存放物品的数量
|
||||||
CTime int64 `protobuf:"varint,5,opt,name=cTime,proto3" json:"cTime" bson:"cTime"` // 物品获取时间
|
Change int32 `protobuf:"varint,5,opt,name=change,proto3" json:"change" bson:"change"` // 最后一次变化量
|
||||||
ETime int64 `protobuf:"varint,6,opt,name=eTime,proto3" json:"eTime" bson:"eTime"` // 物品过期时间
|
CTime int64 `protobuf:"varint,6,opt,name=cTime,proto3" json:"cTime" bson:"cTime"` // 物品获取时间
|
||||||
IsNewItem bool `protobuf:"varint,7,opt,name=isNewItem,proto3" json:"isNewItem" bson:"isNewItem"` // 是否是新的
|
ETime int64 `protobuf:"varint,7,opt,name=eTime,proto3" json:"eTime" bson:"eTime"` // 物品过期时间
|
||||||
Lastopt int64 `protobuf:"varint,8,opt,name=lastopt,proto3" json:"lastopt" bson:"lastopt"` // 最后操作时间
|
IsNewItem bool `protobuf:"varint,8,opt,name=isNewItem,proto3" json:"isNewItem" bson:"isNewItem"` // 是否是新的
|
||||||
|
Lastopt int64 `protobuf:"varint,9,opt,name=lastopt,proto3" json:"lastopt" bson:"lastopt"` // 最后操作时间
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *DB_UserItemData) Reset() {
|
func (x *DB_UserItemData) Reset() {
|
||||||
@ -96,6 +97,13 @@ func (x *DB_UserItemData) GetAmount() uint32 {
|
|||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (x *DB_UserItemData) GetChange() int32 {
|
||||||
|
if x != nil {
|
||||||
|
return x.Change
|
||||||
|
}
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
func (x *DB_UserItemData) GetCTime() int64 {
|
func (x *DB_UserItemData) GetCTime() int64 {
|
||||||
if x != nil {
|
if x != nil {
|
||||||
return x.CTime
|
return x.CTime
|
||||||
@ -128,21 +136,22 @@ var File_items_items_db_proto protoreflect.FileDescriptor
|
|||||||
|
|
||||||
var file_items_items_db_proto_rawDesc = []byte{
|
var file_items_items_db_proto_rawDesc = []byte{
|
||||||
0x0a, 0x14, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x5f, 0x64, 0x62,
|
0x0a, 0x14, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x5f, 0x64, 0x62,
|
||||||
0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xcf, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x5f, 0x55, 0x73,
|
0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe7, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x5f, 0x55, 0x73,
|
||||||
0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x72,
|
0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x72,
|
||||||
0x69, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x67, 0x72, 0x69, 0x64,
|
0x69, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x67, 0x72, 0x69, 0x64,
|
||||||
0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
|
0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
|
||||||
0x03, 0x75, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x03,
|
0x03, 0x75, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x03,
|
||||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06,
|
0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06,
|
||||||
0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x61, 0x6d,
|
0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x61, 0x6d,
|
||||||
0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20,
|
0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x05,
|
||||||
0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54,
|
0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05,
|
||||||
0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65,
|
0x63, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x54, 0x69,
|
||||||
0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x4e, 0x65, 0x77, 0x49, 0x74, 0x65, 0x6d, 0x18, 0x07, 0x20,
|
0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28,
|
||||||
0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x4e, 0x65, 0x77, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x18,
|
0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x4e, 0x65,
|
||||||
0x0a, 0x07, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52,
|
0x77, 0x49, 0x74, 0x65, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x4e,
|
||||||
0x07, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
|
0x65, 0x77, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70,
|
||||||
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x74,
|
||||||
|
0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
|||||||
@ -174,6 +174,7 @@ type ShopGetListResp struct {
|
|||||||
IsManualRefresh bool `protobuf:"varint,2,opt,name=IsManualRefresh,proto3" json:"IsManualRefresh"` //是否手动刷新
|
IsManualRefresh bool `protobuf:"varint,2,opt,name=IsManualRefresh,proto3" json:"IsManualRefresh"` //是否手动刷新
|
||||||
Goods []*ShopItem `protobuf:"bytes,4,rep,name=Goods,proto3" json:"Goods"` //商品列表
|
Goods []*ShopItem `protobuf:"bytes,4,rep,name=Goods,proto3" json:"Goods"` //商品列表
|
||||||
SurplusRefreshNum int32 `protobuf:"varint,5,opt,name=SurplusRefreshNum,proto3" json:"SurplusRefreshNum"` //剩余手动刷新次数
|
SurplusRefreshNum int32 `protobuf:"varint,5,opt,name=SurplusRefreshNum,proto3" json:"SurplusRefreshNum"` //剩余手动刷新次数
|
||||||
|
Lastrefreshtime int64 `protobuf:"varint,6,opt,name=lastrefreshtime,proto3" json:"lastrefreshtime"` //上一次刷新时间
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *ShopGetListResp) Reset() {
|
func (x *ShopGetListResp) Reset() {
|
||||||
@ -236,6 +237,13 @@ func (x *ShopGetListResp) GetSurplusRefreshNum() int32 {
|
|||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (x *ShopGetListResp) GetLastrefreshtime() int64 {
|
||||||
|
if x != nil {
|
||||||
|
return x.Lastrefreshtime
|
||||||
|
}
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
//购买商品 请求
|
//购买商品 请求
|
||||||
type ShopBuyReq struct {
|
type ShopBuyReq struct {
|
||||||
state protoimpl.MessageState
|
state protoimpl.MessageState
|
||||||
@ -374,7 +382,7 @@ var file_shop_shop_msg_proto_rawDesc = []byte{
|
|||||||
0x28, 0x0e, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x73,
|
0x28, 0x0e, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x73,
|
||||||
0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x49, 0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c,
|
0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x49, 0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c,
|
||||||
0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x49,
|
0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x49,
|
||||||
0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x22, 0xab,
|
0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x22, 0xd5,
|
||||||
0x01, 0x0a, 0x0f, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
|
0x01, 0x0a, 0x0f, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
|
||||||
0x73, 0x70, 0x12, 0x1f, 0x0a, 0x05, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
|
0x73, 0x70, 0x12, 0x1f, 0x0a, 0x05, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||||
0x0e, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x73, 0x54,
|
0x0e, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x73, 0x54,
|
||||||
@ -385,17 +393,20 @@ var file_shop_shop_msg_proto_rawDesc = []byte{
|
|||||||
0x68, 0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x12, 0x2c,
|
0x68, 0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x12, 0x2c,
|
||||||
0x0a, 0x11, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68,
|
0x0a, 0x11, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68,
|
||||||
0x4e, 0x75, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x11, 0x53, 0x75, 0x72, 0x70, 0x6c,
|
0x4e, 0x75, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x11, 0x53, 0x75, 0x72, 0x70, 0x6c,
|
||||||
0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x22, 0x65, 0x0a, 0x0a,
|
0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x12, 0x28, 0x0a, 0x0f,
|
||||||
0x53, 0x68, 0x6f, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x25, 0x0a, 0x08, 0x53, 0x68,
|
0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x74, 0x69, 0x6d, 0x65, 0x18,
|
||||||
0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x53,
|
0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65,
|
||||||
0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x52, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70,
|
0x73, 0x68, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x65, 0x0a, 0x0a, 0x53, 0x68, 0x6f, 0x70, 0x42, 0x75,
|
||||||
0x65, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
|
0x79, 0x52, 0x65, 0x71, 0x12, 0x25, 0x0a, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65,
|
||||||
0x28, 0x05, 0x52, 0x07, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x42,
|
0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70,
|
||||||
0x75, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x42, 0x75, 0x79,
|
0x65, 0x52, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x47,
|
||||||
0x4e, 0x75, 0x6d, 0x22, 0x25, 0x0a, 0x0b, 0x53, 0x68, 0x6f, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65,
|
0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x47, 0x6f,
|
||||||
0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01,
|
0x6f, 0x64, 0x73, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x18,
|
||||||
0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
|
0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x22, 0x25, 0x0a,
|
||||||
0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
0x0b, 0x53, 0x68, 0x6f, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06,
|
||||||
|
0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73,
|
||||||
|
0x53, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
|
||||||
|
0x6f, 0x74, 0x6f, 0x33,
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user