Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
0f8384554b
@ -9616,7 +9616,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_420",
|
"key": "buried_buried_condi_tasktxt_420",
|
||||||
"text": "解锁星象{0}次"
|
"text": "解锁回响{0}次"
|
||||||
},
|
},
|
||||||
"type": 173,
|
"type": 173,
|
||||||
"valid": 0,
|
"valid": 0,
|
||||||
@ -16579,7 +16579,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_709",
|
"key": "buried_buried_condi_tasktxt_709",
|
||||||
"text": "解锁星象{0}次"
|
"text": "解锁回响{0}次"
|
||||||
},
|
},
|
||||||
"type": 173,
|
"type": 173,
|
||||||
"valid": 0,
|
"valid": 0,
|
||||||
@ -17829,7 +17829,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_762",
|
"key": "buried_buried_condi_tasktxt_762",
|
||||||
"text": "守护者星象解锁次数1次"
|
"text": "守护者回响解锁次数1次"
|
||||||
},
|
},
|
||||||
"type": 173,
|
"type": 173,
|
||||||
"valid": 0,
|
"valid": 0,
|
||||||
@ -18069,7 +18069,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_772",
|
"key": "buried_buried_condi_tasktxt_772",
|
||||||
"text": "装备副本boss2难度2刷1次、装备穿戴、升级"
|
"text": "装备副本boss2难度2刷1次"
|
||||||
},
|
},
|
||||||
"type": 73,
|
"type": 73,
|
||||||
"valid": 0,
|
"valid": 0,
|
||||||
@ -18287,12 +18287,12 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_781",
|
"key": "buried_buried_condi_tasktxt_781",
|
||||||
"text": "守护者星象解锁次数3次"
|
"text": "主角星座觉醒3次"
|
||||||
},
|
},
|
||||||
"type": 173,
|
"type": 173,
|
||||||
"valid": 0,
|
"valid": 0,
|
||||||
"NPC": 10584,
|
"NPC": 10584,
|
||||||
"value": 1,
|
"value": 3,
|
||||||
"filter": [],
|
"filter": [],
|
||||||
"filter2": [
|
"filter2": [
|
||||||
"0",
|
"0",
|
||||||
@ -18693,7 +18693,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_798",
|
"key": "buried_buried_condi_tasktxt_798",
|
||||||
"text": "守护者星象解锁次数10次"
|
"text": "守护者回响解锁次数10次"
|
||||||
},
|
},
|
||||||
"type": 173,
|
"type": 173,
|
||||||
"valid": 0,
|
"valid": 0,
|
||||||
@ -18715,7 +18715,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_799",
|
"key": "buried_buried_condi_tasktxt_799",
|
||||||
"text": "守护者星象解锁次数15次"
|
"text": "守护者回响解锁次数15次"
|
||||||
},
|
},
|
||||||
"type": 173,
|
"type": 173,
|
||||||
"valid": 0,
|
"valid": 0,
|
||||||
@ -18832,7 +18832,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_804",
|
"key": "buried_buried_condi_tasktxt_804",
|
||||||
"text": "守护者星象解锁解锁30次"
|
"text": "守护者回响解锁解锁30次"
|
||||||
},
|
},
|
||||||
"type": 173,
|
"type": 173,
|
||||||
"valid": 0,
|
"valid": 0,
|
||||||
@ -19023,7 +19023,7 @@
|
|||||||
"type_sp": 1,
|
"type_sp": 1,
|
||||||
"tasktxt": {
|
"tasktxt": {
|
||||||
"key": "buried_buried_condi_tasktxt_812",
|
"key": "buried_buried_condi_tasktxt_812",
|
||||||
"text": "守护者星象解锁50次"
|
"text": "守护者回响解锁50次"
|
||||||
},
|
},
|
||||||
"type": 173,
|
"type": 173,
|
||||||
"valid": 0,
|
"valid": 0,
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
"item": "40001",
|
"item": "19001001",
|
||||||
"suittype": 1,
|
"suittype": 1,
|
||||||
"attrkey": "atk",
|
"attrkey": "atk",
|
||||||
"attr_mini": 300,
|
"attr_mini": 300,
|
||||||
@ -14,7 +14,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"item": "40002",
|
"item": "19002001",
|
||||||
"suittype": 1,
|
"suittype": 1,
|
||||||
"attrkey": "hppro",
|
"attrkey": "hppro",
|
||||||
"attr_mini": 300,
|
"attr_mini": 300,
|
||||||
@ -28,7 +28,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"item": "40003",
|
"item": "19003001",
|
||||||
"suittype": 1,
|
"suittype": 1,
|
||||||
"attrkey": "def",
|
"attrkey": "def",
|
||||||
"attr_mini": 50,
|
"attr_mini": 50,
|
||||||
@ -42,7 +42,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"item": "40004",
|
"item": "19004001",
|
||||||
"suittype": 1,
|
"suittype": 1,
|
||||||
"attrkey": "hp",
|
"attrkey": "hp",
|
||||||
"attr_mini": 1000,
|
"attr_mini": 1000,
|
||||||
@ -56,7 +56,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"item": "40005",
|
"item": "19005001",
|
||||||
"suittype": 1,
|
"suittype": 1,
|
||||||
"attrkey": "atkpro",
|
"attrkey": "atkpro",
|
||||||
"attr_mini": 300,
|
"attr_mini": 300,
|
||||||
@ -70,7 +70,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"item": "40006",
|
"item": "19001002",
|
||||||
"suittype": 1,
|
"suittype": 1,
|
||||||
"attrkey": "defpro",
|
"attrkey": "defpro",
|
||||||
"attr_mini": 300,
|
"attr_mini": 300,
|
||||||
@ -84,7 +84,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"item": "40007",
|
"item": "19002002",
|
||||||
"suittype": 1,
|
"suittype": 1,
|
||||||
"attrkey": "speed",
|
"attrkey": "speed",
|
||||||
"attr_mini": 10,
|
"attr_mini": 10,
|
||||||
@ -98,7 +98,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"item": "40008",
|
"item": "19003002",
|
||||||
"suittype": 1,
|
"suittype": 1,
|
||||||
"attrkey": "cri",
|
"attrkey": "cri",
|
||||||
"attr_mini": 300,
|
"attr_mini": 300,
|
||||||
@ -112,7 +112,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"item": "40009",
|
"item": "19004002",
|
||||||
"suittype": 1,
|
"suittype": 1,
|
||||||
"attrkey": "cridam",
|
"attrkey": "cridam",
|
||||||
"attr_mini": 300,
|
"attr_mini": 300,
|
||||||
@ -126,7 +126,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"item": "40010",
|
"item": "19005002",
|
||||||
"suittype": 1,
|
"suittype": 1,
|
||||||
"attrkey": "effhit",
|
"attrkey": "effhit",
|
||||||
"attr_mini": 300,
|
"attr_mini": 300,
|
||||||
@ -140,7 +140,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"item": "40011",
|
"item": "19001003",
|
||||||
"suittype": 1,
|
"suittype": 1,
|
||||||
"attrkey": "effre",
|
"attrkey": "effre",
|
||||||
"attr_mini": 300,
|
"attr_mini": 300,
|
||||||
@ -154,7 +154,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"item": "40012",
|
"item": "19002003",
|
||||||
"suittype": 1,
|
"suittype": 1,
|
||||||
"attrkey": "atk",
|
"attrkey": "atk",
|
||||||
"attr_mini": 300,
|
"attr_mini": 300,
|
||||||
@ -168,7 +168,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"item": "40013",
|
"item": "19003003",
|
||||||
"suittype": 1,
|
"suittype": 1,
|
||||||
"attrkey": "hppro",
|
"attrkey": "hppro",
|
||||||
"attr_mini": 300,
|
"attr_mini": 300,
|
||||||
@ -182,7 +182,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"item": "40014",
|
"item": "19004003",
|
||||||
"suittype": 1,
|
"suittype": 1,
|
||||||
"attrkey": "def",
|
"attrkey": "def",
|
||||||
"attr_mini": 300,
|
"attr_mini": 300,
|
||||||
@ -196,7 +196,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"item": "40015",
|
"item": "19005003",
|
||||||
"suittype": 1,
|
"suittype": 1,
|
||||||
"attrkey": "hp",
|
"attrkey": "hp",
|
||||||
"attr_mini": 50,
|
"attr_mini": 50,
|
||||||
@ -210,7 +210,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"item": "40016",
|
"item": "19001004",
|
||||||
"suittype": 1,
|
"suittype": 1,
|
||||||
"attrkey": "atkpro",
|
"attrkey": "atkpro",
|
||||||
"attr_mini": 1000,
|
"attr_mini": 1000,
|
||||||
@ -224,7 +224,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"item": "40017",
|
"item": "19002004",
|
||||||
"suittype": 1,
|
"suittype": 1,
|
||||||
"attrkey": "defpro",
|
"attrkey": "defpro",
|
||||||
"attr_mini": 300,
|
"attr_mini": 300,
|
||||||
@ -238,7 +238,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"item": "40018",
|
"item": "19003004",
|
||||||
"suittype": 1,
|
"suittype": 1,
|
||||||
"attrkey": "speed",
|
"attrkey": "speed",
|
||||||
"attr_mini": 300,
|
"attr_mini": 300,
|
||||||
@ -252,7 +252,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"item": "40019",
|
"item": "19004004",
|
||||||
"suittype": 1,
|
"suittype": 1,
|
||||||
"attrkey": "cri",
|
"attrkey": "cri",
|
||||||
"attr_mini": 10,
|
"attr_mini": 10,
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -16,9 +16,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1000,
|
"hpgrow": 721,
|
||||||
"atkgrow": 1300,
|
"atkgrow": 767,
|
||||||
"defgrow": 1250,
|
"defgrow": 1178,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -38,9 +38,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1100,
|
"hpgrow": 676,
|
||||||
"atkgrow": 1300,
|
"atkgrow": 1059,
|
||||||
"defgrow": 1150,
|
"defgrow": 882,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -60,9 +60,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1150,
|
"hpgrow": 970,
|
||||||
"atkgrow": 1100,
|
"atkgrow": 697,
|
||||||
"defgrow": 1300,
|
"defgrow": 936,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -82,9 +82,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1250,
|
"hpgrow": 694,
|
||||||
"atkgrow": 1000,
|
"atkgrow": 1113,
|
||||||
"defgrow": 1250,
|
"defgrow": 786,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -104,9 +104,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1000,
|
"hpgrow": 959,
|
||||||
"atkgrow": 1300,
|
"atkgrow": 697,
|
||||||
"defgrow": 1250,
|
"defgrow": 952,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -126,9 +126,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1250,
|
"hpgrow": 784,
|
||||||
"atkgrow": 1000,
|
"atkgrow": 735,
|
||||||
"defgrow": 1250,
|
"defgrow": 1277,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -170,9 +170,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1100,
|
"hpgrow": 689,
|
||||||
"atkgrow": 1300,
|
"atkgrow": 1016,
|
||||||
"defgrow": 1150,
|
"defgrow": 1037,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -214,9 +214,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1250,
|
"hpgrow": 751,
|
||||||
"atkgrow": 1000,
|
"atkgrow": 1161,
|
||||||
"defgrow": 1250,
|
"defgrow": 798,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -258,9 +258,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1000,
|
"hpgrow": 767,
|
||||||
"atkgrow": 1300,
|
"atkgrow": 769,
|
||||||
"defgrow": 1250,
|
"defgrow": 1245,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -302,9 +302,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1150,
|
"hpgrow": 766,
|
||||||
"atkgrow": 1100,
|
"atkgrow": 1233,
|
||||||
"defgrow": 1300,
|
"defgrow": 866,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -324,9 +324,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1250,
|
"hpgrow": 809,
|
||||||
"atkgrow": 1000,
|
"atkgrow": 1114,
|
||||||
"defgrow": 1250,
|
"defgrow": 937,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -346,9 +346,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1000,
|
"hpgrow": 954,
|
||||||
"atkgrow": 1300,
|
"atkgrow": 937,
|
||||||
"defgrow": 1250,
|
"defgrow": 937,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -368,9 +368,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1250,
|
"hpgrow": 1031,
|
||||||
"atkgrow": 1000,
|
"atkgrow": 786,
|
||||||
"defgrow": 1250,
|
"defgrow": 1080,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -456,9 +456,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1250,
|
"hpgrow": 952,
|
||||||
"atkgrow": 1000,
|
"atkgrow": 736,
|
||||||
"defgrow": 1250,
|
"defgrow": 925,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -478,9 +478,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1000,
|
"hpgrow": 632,
|
||||||
"atkgrow": 1300,
|
"atkgrow": 1162,
|
||||||
"defgrow": 1250,
|
"defgrow": 936,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -500,9 +500,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1000,
|
"hpgrow": 751,
|
||||||
"atkgrow": 1300,
|
"atkgrow": 1058,
|
||||||
"defgrow": 1250,
|
"defgrow": 935,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -522,9 +522,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1100,
|
"hpgrow": 935,
|
||||||
"atkgrow": 1300,
|
"atkgrow": 809,
|
||||||
"defgrow": 1150,
|
"defgrow": 992,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -544,9 +544,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1150,
|
"hpgrow": 945,
|
||||||
"atkgrow": 1100,
|
"atkgrow": 856,
|
||||||
"defgrow": 1300,
|
"defgrow": 925,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -566,9 +566,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1250,
|
"hpgrow": 799,
|
||||||
"atkgrow": 1000,
|
"atkgrow": 927,
|
||||||
"defgrow": 1250,
|
"defgrow": 1008,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -632,9 +632,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1000,
|
"hpgrow": 668,
|
||||||
"atkgrow": 1300,
|
"atkgrow": 1087,
|
||||||
"defgrow": 1250,
|
"defgrow": 992,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -654,9 +654,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1100,
|
"hpgrow": 745,
|
||||||
"atkgrow": 1300,
|
"atkgrow": 1085,
|
||||||
"defgrow": 1150,
|
"defgrow": 905,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -676,9 +676,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1150,
|
"hpgrow": 709,
|
||||||
"atkgrow": 1100,
|
"atkgrow": 881,
|
||||||
"defgrow": 1300,
|
"defgrow": 1354,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -742,9 +742,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1000,
|
"hpgrow": 1065,
|
||||||
"atkgrow": 1300,
|
"atkgrow": 767,
|
||||||
"defgrow": 1250,
|
"defgrow": 1049,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -786,9 +786,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1150,
|
"hpgrow": 704,
|
||||||
"atkgrow": 1100,
|
"atkgrow": 1039,
|
||||||
"defgrow": 1300,
|
"defgrow": 867,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -808,9 +808,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1250,
|
"hpgrow": 703,
|
||||||
"atkgrow": 1000,
|
"atkgrow": 1001,
|
||||||
"defgrow": 1250,
|
"defgrow": 924,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -918,9 +918,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1150,
|
"hpgrow": 968,
|
||||||
"atkgrow": 1100,
|
"atkgrow": 723,
|
||||||
"defgrow": 1300,
|
"defgrow": 1047,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -940,9 +940,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1250,
|
"hpgrow": 761,
|
||||||
"atkgrow": 1000,
|
"atkgrow": 1039,
|
||||||
"defgrow": 1250,
|
"defgrow": 936,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -984,9 +984,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1000,
|
"hpgrow": 819,
|
||||||
"atkgrow": 1300,
|
"atkgrow": 918,
|
||||||
"defgrow": 1250,
|
"defgrow": 1007,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -1006,9 +1006,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1100,
|
"hpgrow": 773,
|
||||||
"atkgrow": 1300,
|
"atkgrow": 1002,
|
||||||
"defgrow": 1150,
|
"defgrow": 952,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -1028,9 +1028,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1150,
|
"hpgrow": 744,
|
||||||
"atkgrow": 1100,
|
"atkgrow": 1015,
|
||||||
"defgrow": 1300,
|
"defgrow": 965,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -1050,9 +1050,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1250,
|
"hpgrow": 849,
|
||||||
"atkgrow": 1000,
|
"atkgrow": 786,
|
||||||
"defgrow": 1250,
|
"defgrow": 1124,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -1072,9 +1072,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1000,
|
"hpgrow": 786,
|
||||||
"atkgrow": 1300,
|
"atkgrow": 1133,
|
||||||
"defgrow": 1250,
|
"defgrow": 964,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -1160,9 +1160,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1150,
|
"hpgrow": 915,
|
||||||
"atkgrow": 1100,
|
"atkgrow": 890,
|
||||||
"defgrow": 1300,
|
"defgrow": 1091,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -1182,9 +1182,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1250,
|
"hpgrow": 891,
|
||||||
"atkgrow": 1000,
|
"atkgrow": 918,
|
||||||
"defgrow": 1250,
|
"defgrow": 1091,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -1204,9 +1204,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1000,
|
"hpgrow": 704,
|
||||||
"atkgrow": 1300,
|
"atkgrow": 1039,
|
||||||
"defgrow": 1250,
|
"defgrow": 867,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -1226,9 +1226,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1000,
|
"hpgrow": 789,
|
||||||
"atkgrow": 1300,
|
"atkgrow": 820,
|
||||||
"defgrow": 1250,
|
"defgrow": 993,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -1248,9 +1248,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1100,
|
"hpgrow": 901,
|
||||||
"atkgrow": 1300,
|
"atkgrow": 722,
|
||||||
"defgrow": 1150,
|
"defgrow": 1007,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -1314,9 +1314,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1000,
|
"hpgrow": 733,
|
||||||
"atkgrow": 1300,
|
"atkgrow": 795,
|
||||||
"defgrow": 1250,
|
"defgrow": 1123,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -1424,9 +1424,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1250,
|
"hpgrow": 988,
|
||||||
"atkgrow": 1000,
|
"atkgrow": 787,
|
||||||
"defgrow": 1250,
|
"defgrow": 952,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -1446,9 +1446,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1000,
|
"hpgrow": 896,
|
||||||
"atkgrow": 1300,
|
"atkgrow": 842,
|
||||||
"defgrow": 1250,
|
"defgrow": 993,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -1468,9 +1468,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1000,
|
"hpgrow": 744,
|
||||||
"atkgrow": 1300,
|
"atkgrow": 1150,
|
||||||
"defgrow": 1250,
|
"defgrow": 821,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -1490,9 +1490,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1100,
|
"hpgrow": 786,
|
||||||
"atkgrow": 1300,
|
"atkgrow": 1150,
|
||||||
"defgrow": 1150,
|
"defgrow": 936,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -1534,9 +1534,9 @@
|
|||||||
"treadd": 0,
|
"treadd": 0,
|
||||||
"betreadd": 0,
|
"betreadd": 0,
|
||||||
"suckblood": 0,
|
"suckblood": 0,
|
||||||
"hpgrow": 1250,
|
"hpgrow": 1079,
|
||||||
"atkgrow": 1000,
|
"atkgrow": 786,
|
||||||
"defgrow": 1250,
|
"defgrow": 1008,
|
||||||
"speedgrow": 0
|
"speedgrow": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -12,7 +12,7 @@
|
|||||||
},
|
},
|
||||||
"EditorStage": 0,
|
"EditorStage": 0,
|
||||||
"detailwindow": "effect_chezhan",
|
"detailwindow": "effect_chezhan",
|
||||||
"frontstoryid": 618,
|
"frontstoryid": 0,
|
||||||
"afterstoryid": 0,
|
"afterstoryid": 0,
|
||||||
"mainlineName": {
|
"mainlineName": {
|
||||||
"key": "mainchapter_main_stage_mainlineName_1",
|
"key": "mainchapter_main_stage_mainlineName_1",
|
||||||
@ -95,7 +95,7 @@
|
|||||||
},
|
},
|
||||||
"EditorStage": 0,
|
"EditorStage": 0,
|
||||||
"detailwindow": "effect_chezhan",
|
"detailwindow": "effect_chezhan",
|
||||||
"frontstoryid": 619,
|
"frontstoryid": 0,
|
||||||
"afterstoryid": 0,
|
"afterstoryid": 0,
|
||||||
"mainlineName": {
|
"mainlineName": {
|
||||||
"key": "mainchapter_main_stage_mainlineName_2",
|
"key": "mainchapter_main_stage_mainlineName_2",
|
||||||
@ -183,7 +183,7 @@
|
|||||||
},
|
},
|
||||||
"EditorStage": 0,
|
"EditorStage": 0,
|
||||||
"detailwindow": "effect_chezhan",
|
"detailwindow": "effect_chezhan",
|
||||||
"frontstoryid": 621,
|
"frontstoryid": 0,
|
||||||
"afterstoryid": 0,
|
"afterstoryid": 0,
|
||||||
"mainlineName": {
|
"mainlineName": {
|
||||||
"key": "mainchapter_main_stage_mainlineName_3",
|
"key": "mainchapter_main_stage_mainlineName_3",
|
||||||
@ -271,7 +271,7 @@
|
|||||||
},
|
},
|
||||||
"EditorStage": 0,
|
"EditorStage": 0,
|
||||||
"detailwindow": "effect_chezhan",
|
"detailwindow": "effect_chezhan",
|
||||||
"frontstoryid": 623,
|
"frontstoryid": 0,
|
||||||
"afterstoryid": 0,
|
"afterstoryid": 0,
|
||||||
"mainlineName": {
|
"mainlineName": {
|
||||||
"key": "mainchapter_main_stage_mainlineName_4",
|
"key": "mainchapter_main_stage_mainlineName_4",
|
||||||
@ -359,8 +359,8 @@
|
|||||||
},
|
},
|
||||||
"EditorStage": 0,
|
"EditorStage": 0,
|
||||||
"detailwindow": "effect_chezhan",
|
"detailwindow": "effect_chezhan",
|
||||||
"frontstoryid": 626,
|
"frontstoryid": 0,
|
||||||
"afterstoryid": 628,
|
"afterstoryid": 0,
|
||||||
"mainlineName": {
|
"mainlineName": {
|
||||||
"key": "mainchapter_main_stage_mainlineName_5",
|
"key": "mainchapter_main_stage_mainlineName_5",
|
||||||
"text": "1-5"
|
"text": "1-5"
|
||||||
@ -447,8 +447,8 @@
|
|||||||
},
|
},
|
||||||
"EditorStage": 0,
|
"EditorStage": 0,
|
||||||
"detailwindow": "effect_chezhan",
|
"detailwindow": "effect_chezhan",
|
||||||
"frontstoryid": 636,
|
"frontstoryid": 0,
|
||||||
"afterstoryid": 637,
|
"afterstoryid": 0,
|
||||||
"mainlineName": {
|
"mainlineName": {
|
||||||
"key": "mainchapter_main_stage_mainlineName_6",
|
"key": "mainchapter_main_stage_mainlineName_6",
|
||||||
"text": "1-6"
|
"text": "1-6"
|
||||||
|
|||||||
@ -23843,19 +23843,20 @@
|
|||||||
{
|
{
|
||||||
"Id": 223004311,
|
"Id": 223004311,
|
||||||
"EmitPR": 1000,
|
"EmitPR": 1000,
|
||||||
"From": 4,
|
"From": 2,
|
||||||
"Where": [],
|
"Where": [],
|
||||||
"Order": "",
|
"Order": "",
|
||||||
"Limit": 1,
|
"Limit": 10,
|
||||||
"ExecuteCnt": 1,
|
"ExecuteCnt": 1,
|
||||||
"Type": 1,
|
"Type": 1,
|
||||||
"Argu": [
|
"Argu": [
|
||||||
1,
|
1,
|
||||||
4,
|
4,
|
||||||
1000
|
4000
|
||||||
],
|
],
|
||||||
"FollowSK": [
|
"FollowSK": [
|
||||||
223004312
|
223004312,
|
||||||
|
223004313
|
||||||
],
|
],
|
||||||
"SucFollowSK": [],
|
"SucFollowSK": [],
|
||||||
"FailFollowSK": [],
|
"FailFollowSK": [],
|
||||||
@ -23868,15 +23869,15 @@
|
|||||||
{
|
{
|
||||||
"Id": 223004312,
|
"Id": 223004312,
|
||||||
"EmitPR": 1000,
|
"EmitPR": 1000,
|
||||||
"From": 4,
|
"From": 2,
|
||||||
"Where": [],
|
"Where": [],
|
||||||
"Order": "",
|
"Order": "",
|
||||||
"Limit": 1,
|
"Limit": 1,
|
||||||
"ExecuteCnt": 1,
|
"ExecuteCnt": 1,
|
||||||
"Type": 8,
|
"Type": 8,
|
||||||
"Argu": [
|
"Argu": [
|
||||||
|
3,
|
||||||
-1,
|
-1,
|
||||||
1000,
|
|
||||||
1000
|
1000
|
||||||
],
|
],
|
||||||
"FollowSK": [],
|
"FollowSK": [],
|
||||||
@ -23891,32 +23892,7 @@
|
|||||||
{
|
{
|
||||||
"Id": 223004313,
|
"Id": 223004313,
|
||||||
"EmitPR": 1000,
|
"EmitPR": 1000,
|
||||||
"From": 4,
|
"From": 2,
|
||||||
"Where": [],
|
|
||||||
"Order": "",
|
|
||||||
"Limit": 1,
|
|
||||||
"ExecuteCnt": 1,
|
|
||||||
"Type": 1,
|
|
||||||
"Argu": [
|
|
||||||
1,
|
|
||||||
1,
|
|
||||||
100
|
|
||||||
],
|
|
||||||
"FollowSK": [
|
|
||||||
223004314
|
|
||||||
],
|
|
||||||
"SucFollowSK": [],
|
|
||||||
"FailFollowSK": [],
|
|
||||||
"MustHit": false,
|
|
||||||
"DpsRevisiType": 0,
|
|
||||||
"DpsCondition": "",
|
|
||||||
"RevisiCondition": "",
|
|
||||||
"RevisiParams": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 223004314,
|
|
||||||
"EmitPR": 1000,
|
|
||||||
"From": 4,
|
|
||||||
"Where": [],
|
"Where": [],
|
||||||
"Order": "",
|
"Order": "",
|
||||||
"Limit": 1,
|
"Limit": 1,
|
||||||
@ -25088,12 +25064,12 @@
|
|||||||
"Where": [],
|
"Where": [],
|
||||||
"Order": "",
|
"Order": "",
|
||||||
"Limit": 10,
|
"Limit": 10,
|
||||||
"ExecuteCnt": 2,
|
"ExecuteCnt": 4,
|
||||||
"Type": 1,
|
"Type": 1,
|
||||||
"Argu": [
|
"Argu": [
|
||||||
1,
|
1,
|
||||||
4,
|
4,
|
||||||
3000
|
1000
|
||||||
],
|
],
|
||||||
"FollowSK": [
|
"FollowSK": [
|
||||||
215003312
|
215003312
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -1167,7 +1167,7 @@
|
|||||||
},
|
},
|
||||||
"Desc": {
|
"Desc": {
|
||||||
"key": "skill_skill_buff_Desc_390001128",
|
"key": "skill_skill_buff_Desc_390001128",
|
||||||
"text": ""
|
"text": "无法被选中"
|
||||||
},
|
},
|
||||||
"BuffType": 0,
|
"BuffType": 0,
|
||||||
"EffectArgu": [],
|
"EffectArgu": [],
|
||||||
@ -1469,7 +1469,7 @@
|
|||||||
},
|
},
|
||||||
"Desc": {
|
"Desc": {
|
||||||
"key": "skill_skill_buff_Desc_390001209",
|
"key": "skill_skill_buff_Desc_390001209",
|
||||||
"text": ""
|
"text": "每次受到攻击提升20%的防御，最多叠加5层"
|
||||||
},
|
},
|
||||||
"BuffType": 39,
|
"BuffType": 39,
|
||||||
"EffectArgu": [],
|
"EffectArgu": [],
|
||||||
|
|||||||
@ -1380,15 +1380,15 @@
|
|||||||
"icon": "",
|
"icon": "",
|
||||||
"task_name": {
|
"task_name": {
|
||||||
"key": "worldtask_world_task_task_name_39",
|
"key": "worldtask_world_task_task_name_39",
|
||||||
"text": "回响1次"
|
"text": "星座图1次"
|
||||||
},
|
},
|
||||||
"task_details": {
|
"task_details": {
|
||||||
"key": "worldtask_world_task_task_details_39",
|
"key": "worldtask_world_task_task_details_39",
|
||||||
"text": "回响1次"
|
"text": "星座图1次"
|
||||||
},
|
},
|
||||||
"npctxt": {
|
"npctxt": {
|
||||||
"key": "worldtask_world_task_npctxt_39",
|
"key": "worldtask_world_task_npctxt_39",
|
||||||
"text": "回响1次"
|
"text": "星座图1次"
|
||||||
},
|
},
|
||||||
"npc": 10390,
|
"npc": 10390,
|
||||||
"completetask": [
|
"completetask": [
|
||||||
@ -1424,7 +1424,7 @@
|
|||||||
},
|
},
|
||||||
"npctxt": {
|
"npctxt": {
|
||||||
"key": "worldtask_world_task_npctxt_40",
|
"key": "worldtask_world_task_npctxt_40",
|
||||||
"text": "维京远征boss1难度2"
|
"text": "维京远征boss2难度6"
|
||||||
},
|
},
|
||||||
"npc": 10400,
|
"npc": 10400,
|
||||||
"completetask": [
|
"completetask": [
|
||||||
@ -1560,15 +1560,15 @@
|
|||||||
"icon": "",
|
"icon": "",
|
||||||
"task_name": {
|
"task_name": {
|
||||||
"key": "worldtask_world_task_task_name_44",
|
"key": "worldtask_world_task_task_name_44",
|
||||||
"text": "战斗17"
|
"text": "战斗16"
|
||||||
},
|
},
|
||||||
"task_details": {
|
"task_details": {
|
||||||
"key": "worldtask_world_task_task_details_44",
|
"key": "worldtask_world_task_task_details_44",
|
||||||
"text": "战斗17"
|
"text": "战斗16"
|
||||||
},
|
},
|
||||||
"npctxt": {
|
"npctxt": {
|
||||||
"key": "worldtask_world_task_npctxt_44",
|
"key": "worldtask_world_task_npctxt_44",
|
||||||
"text": "战斗17"
|
"text": "战斗16"
|
||||||
},
|
},
|
||||||
"npc": 10440,
|
"npc": 10440,
|
||||||
"completetask": [
|
"completetask": [
|
||||||
@ -1668,15 +1668,15 @@
|
|||||||
"icon": "",
|
"icon": "",
|
||||||
"task_name": {
|
"task_name": {
|
||||||
"key": "worldtask_world_task_task_name_47",
|
"key": "worldtask_world_task_task_name_47",
|
||||||
"text": "强化装备套装"
|
"text": "强化装备"
|
||||||
},
|
},
|
||||||
"task_details": {
|
"task_details": {
|
||||||
"key": "worldtask_world_task_task_details_47",
|
"key": "worldtask_world_task_task_details_47",
|
||||||
"text": "强化装备套装"
|
"text": "强化装备"
|
||||||
},
|
},
|
||||||
"npctxt": {
|
"npctxt": {
|
||||||
"key": "worldtask_world_task_npctxt_47",
|
"key": "worldtask_world_task_npctxt_47",
|
||||||
"text": "强化装备套装"
|
"text": "强化装备"
|
||||||
},
|
},
|
||||||
"npc": 10470,
|
"npc": 10470,
|
||||||
"completetask": [
|
"completetask": [
|
||||||
@ -1740,15 +1740,15 @@
|
|||||||
"icon": "",
|
"icon": "",
|
||||||
"task_name": {
|
"task_name": {
|
||||||
"key": "worldtask_world_task_task_name_49",
|
"key": "worldtask_world_task_task_name_49",
|
||||||
"text": "装备副本boss1难度2刷1次、装备穿戴、升级"
|
"text": "装备副本boss2难度2刷1次"
|
||||||
},
|
},
|
||||||
"task_details": {
|
"task_details": {
|
||||||
"key": "worldtask_world_task_task_details_49",
|
"key": "worldtask_world_task_task_details_49",
|
||||||
"text": "装备副本boss1难度2刷1次、装备穿戴、升级"
|
"text": "装备副本boss2难度2刷1次"
|
||||||
},
|
},
|
||||||
"npctxt": {
|
"npctxt": {
|
||||||
"key": "worldtask_world_task_npctxt_49",
|
"key": "worldtask_world_task_npctxt_49",
|
||||||
"text": "装备副本boss1难度2刷1次、装备穿戴、升级"
|
"text": "装备副本boss2难度2刷1次"
|
||||||
},
|
},
|
||||||
"npc": 10490,
|
"npc": 10490,
|
||||||
"completetask": [
|
"completetask": [
|
||||||
@ -1920,15 +1920,15 @@
|
|||||||
"icon": "",
|
"icon": "",
|
||||||
"task_name": {
|
"task_name": {
|
||||||
"key": "worldtask_world_task_task_name_54",
|
"key": "worldtask_world_task_task_name_54",
|
||||||
"text": "战斗18"
|
"text": "战斗17"
|
||||||
},
|
},
|
||||||
"task_details": {
|
"task_details": {
|
||||||
"key": "worldtask_world_task_task_details_54",
|
"key": "worldtask_world_task_task_details_54",
|
||||||
"text": "战斗18"
|
"text": "战斗17"
|
||||||
},
|
},
|
||||||
"npctxt": {
|
"npctxt": {
|
||||||
"key": "worldtask_world_task_npctxt_54",
|
"key": "worldtask_world_task_npctxt_54",
|
||||||
"text": "战斗18"
|
"text": "战斗17"
|
||||||
},
|
},
|
||||||
"npc": 10540,
|
"npc": 10540,
|
||||||
"completetask": [
|
"completetask": [
|
||||||
@ -1956,15 +1956,15 @@
|
|||||||
"icon": "",
|
"icon": "",
|
||||||
"task_name": {
|
"task_name": {
|
||||||
"key": "worldtask_world_task_task_name_55",
|
"key": "worldtask_world_task_task_name_55",
|
||||||
"text": "战斗19"
|
"text": "战斗18"
|
||||||
},
|
},
|
||||||
"task_details": {
|
"task_details": {
|
||||||
"key": "worldtask_world_task_task_details_55",
|
"key": "worldtask_world_task_task_details_55",
|
||||||
"text": "战斗19"
|
"text": "战斗18"
|
||||||
},
|
},
|
||||||
"npctxt": {
|
"npctxt": {
|
||||||
"key": "worldtask_world_task_npctxt_55",
|
"key": "worldtask_world_task_npctxt_55",
|
||||||
"text": "战斗19"
|
"text": "战斗18"
|
||||||
},
|
},
|
||||||
"npc": 10550,
|
"npc": 10550,
|
||||||
"completetask": [
|
"completetask": [
|
||||||
@ -1992,15 +1992,15 @@
|
|||||||
"icon": "",
|
"icon": "",
|
||||||
"task_name": {
|
"task_name": {
|
||||||
"key": "worldtask_world_task_task_name_56",
|
"key": "worldtask_world_task_task_name_56",
|
||||||
"text": "战斗20"
|
"text": "战斗19"
|
||||||
},
|
},
|
||||||
"task_details": {
|
"task_details": {
|
||||||
"key": "worldtask_world_task_task_details_56",
|
"key": "worldtask_world_task_task_details_56",
|
||||||
"text": "战斗20"
|
"text": "战斗19"
|
||||||
},
|
},
|
||||||
"npctxt": {
|
"npctxt": {
|
||||||
"key": "worldtask_world_task_npctxt_56",
|
"key": "worldtask_world_task_npctxt_56",
|
||||||
"text": "战斗20"
|
"text": "战斗19"
|
||||||
},
|
},
|
||||||
"npc": 10560,
|
"npc": 10560,
|
||||||
"completetask": [
|
"completetask": [
|
||||||
@ -2028,15 +2028,15 @@
|
|||||||
"icon": "",
|
"icon": "",
|
||||||
"task_name": {
|
"task_name": {
|
||||||
"key": "worldtask_world_task_task_name_57",
|
"key": "worldtask_world_task_task_name_57",
|
||||||
"text": "通关觉醒副本boss1难度2"
|
"text": "装备副本boss3难度1(开支线，打狩猎)"
|
||||||
},
|
},
|
||||||
"task_details": {
|
"task_details": {
|
||||||
"key": "worldtask_world_task_task_details_57",
|
"key": "worldtask_world_task_task_details_57",
|
||||||
"text": "通关觉醒副本boss1难度2"
|
"text": "装备副本boss3难度1(开支线，打狩猎)"
|
||||||
},
|
},
|
||||||
"npctxt": {
|
"npctxt": {
|
||||||
"key": "worldtask_world_task_npctxt_57",
|
"key": "worldtask_world_task_npctxt_57",
|
||||||
"text": "通关觉醒副本boss1难度2"
|
"text": "装备副本boss3难度1(开支线，打狩猎)"
|
||||||
},
|
},
|
||||||
"npc": 10570,
|
"npc": 10570,
|
||||||
"completetask": [
|
"completetask": [
|
||||||
@ -2064,15 +2064,15 @@
|
|||||||
"icon": "",
|
"icon": "",
|
||||||
"task_name": {
|
"task_name": {
|
||||||
"key": "worldtask_world_task_task_name_58",
|
"key": "worldtask_world_task_task_name_58",
|
||||||
"text": "守护者觉醒1次"
|
"text": "主角星座觉醒3次"
|
||||||
},
|
},
|
||||||
"task_details": {
|
"task_details": {
|
||||||
"key": "worldtask_world_task_task_details_58",
|
"key": "worldtask_world_task_task_details_58",
|
||||||
"text": "守护者觉醒1次"
|
"text": "主角星座觉醒3次"
|
||||||
},
|
},
|
||||||
"npctxt": {
|
"npctxt": {
|
||||||
"key": "worldtask_world_task_npctxt_58",
|
"key": "worldtask_world_task_npctxt_58",
|
||||||
"text": "守护者觉醒1次"
|
"text": "主角星座觉醒3次"
|
||||||
},
|
},
|
||||||
"npc": 10580,
|
"npc": 10580,
|
||||||
"completetask": [
|
"completetask": [
|
||||||
@ -2136,15 +2136,15 @@
|
|||||||
"icon": "",
|
"icon": "",
|
||||||
"task_name": {
|
"task_name": {
|
||||||
"key": "worldtask_world_task_task_name_60",
|
"key": "worldtask_world_task_task_name_60",
|
||||||
"text": "战斗21"
|
"text": "战斗20"
|
||||||
},
|
},
|
||||||
"task_details": {
|
"task_details": {
|
||||||
"key": "worldtask_world_task_task_details_60",
|
"key": "worldtask_world_task_task_details_60",
|
||||||
"text": "战斗21"
|
"text": "战斗20"
|
||||||
},
|
},
|
||||||
"npctxt": {
|
"npctxt": {
|
||||||
"key": "worldtask_world_task_npctxt_60",
|
"key": "worldtask_world_task_npctxt_60",
|
||||||
"text": "战斗21"
|
"text": "战斗20"
|
||||||
},
|
},
|
||||||
"npc": 10600,
|
"npc": 10600,
|
||||||
"completetask": [
|
"completetask": [
|
||||||
@ -2172,15 +2172,15 @@
|
|||||||
"icon": "",
|
"icon": "",
|
||||||
"task_name": {
|
"task_name": {
|
||||||
"key": "worldtask_world_task_task_name_61",
|
"key": "worldtask_world_task_task_name_61",
|
||||||
"text": "战斗22"
|
"text": "战斗21"
|
||||||
},
|
},
|
||||||
"task_details": {
|
"task_details": {
|
||||||
"key": "worldtask_world_task_task_details_61",
|
"key": "worldtask_world_task_task_details_61",
|
||||||
"text": "战斗22"
|
"text": "战斗21"
|
||||||
},
|
},
|
||||||
"npctxt": {
|
"npctxt": {
|
||||||
"key": "worldtask_world_task_npctxt_61",
|
"key": "worldtask_world_task_npctxt_61",
|
||||||
"text": "战斗22"
|
"text": "战斗21"
|
||||||
},
|
},
|
||||||
"npc": 10610,
|
"npc": 10610,
|
||||||
"completetask": [
|
"completetask": [
|
||||||
@ -2280,15 +2280,15 @@
|
|||||||
"icon": "",
|
"icon": "",
|
||||||
"task_name": {
|
"task_name": {
|
||||||
"key": "worldtask_world_task_task_name_64",
|
"key": "worldtask_world_task_task_name_64",
|
||||||
"text": "装备副本boss2难度2刷1次"
|
"text": "装备副本boss3难度1刷1次"
|
||||||
},
|
},
|
||||||
"task_details": {
|
"task_details": {
|
||||||
"key": "worldtask_world_task_task_details_64",
|
"key": "worldtask_world_task_task_details_64",
|
||||||
"text": "装备副本boss2难度2刷1次"
|
"text": "装备副本boss3难度1刷1次"
|
||||||
},
|
},
|
||||||
"npctxt": {
|
"npctxt": {
|
||||||
"key": "worldtask_world_task_npctxt_64",
|
"key": "worldtask_world_task_npctxt_64",
|
||||||
"text": "装备副本boss2难度2刷1次"
|
"text": "装备副本boss3难度1刷1次"
|
||||||
},
|
},
|
||||||
"npc": 10640,
|
"npc": 10640,
|
||||||
"completetask": [
|
"completetask": [
|
||||||
@ -2460,15 +2460,15 @@
|
|||||||
"icon": "",
|
"icon": "",
|
||||||
"task_name": {
|
"task_name": {
|
||||||
"key": "worldtask_world_task_task_name_69",
|
"key": "worldtask_world_task_task_name_69",
|
||||||
"text": "战斗23"
|
"text": "战斗22"
|
||||||
},
|
},
|
||||||
"task_details": {
|
"task_details": {
|
||||||
"key": "worldtask_world_task_task_details_69",
|
"key": "worldtask_world_task_task_details_69",
|
||||||
"text": "战斗23"
|
"text": "战斗22"
|
||||||
},
|
},
|
||||||
"npctxt": {
|
"npctxt": {
|
||||||
"key": "worldtask_world_task_npctxt_69",
|
"key": "worldtask_world_task_npctxt_69",
|
||||||
"text": "战斗23"
|
"text": "战斗22"
|
||||||
},
|
},
|
||||||
"npc": 10690,
|
"npc": 10690,
|
||||||
"completetask": [
|
"completetask": [
|
||||||
@ -2496,15 +2496,15 @@
|
|||||||
"icon": "",
|
"icon": "",
|
||||||
"task_name": {
|
"task_name": {
|
||||||
"key": "worldtask_world_task_task_name_70",
|
"key": "worldtask_world_task_task_name_70",
|
||||||
"text": "战斗24"
|
"text": "战斗23"
|
||||||
},
|
},
|
||||||
"task_details": {
|
"task_details": {
|
||||||
"key": "worldtask_world_task_task_details_70",
|
"key": "worldtask_world_task_task_details_70",
|
||||||
"text": "战斗24"
|
"text": "战斗23"
|
||||||
},
|
},
|
||||||
"npctxt": {
|
"npctxt": {
|
||||||
"key": "worldtask_world_task_npctxt_70",
|
"key": "worldtask_world_task_npctxt_70",
|
||||||
"text": "战斗24"
|
"text": "战斗23"
|
||||||
},
|
},
|
||||||
"npc": 10700,
|
"npc": 10700,
|
||||||
"completetask": [
|
"completetask": [
|
||||||
@ -2640,15 +2640,15 @@
|
|||||||
"icon": "",
|
"icon": "",
|
||||||
"task_name": {
|
"task_name": {
|
||||||
"key": "worldtask_world_task_task_name_74",
|
"key": "worldtask_world_task_task_name_74",
|
||||||
"text": "通关觉醒boss2通关难度2"
|
"text": "装备副本boss3难度5刷2次"
|
||||||
},
|
},
|
||||||
"task_details": {
|
"task_details": {
|
||||||
"key": "worldtask_world_task_task_details_74",
|
"key": "worldtask_world_task_task_details_74",
|
||||||
"text": "通关觉醒boss2通关难度2"
|
"text": "装备副本boss3难度5刷2次"
|
||||||
},
|
},
|
||||||
"npctxt": {
|
"npctxt": {
|
||||||
"key": "worldtask_world_task_npctxt_74",
|
"key": "worldtask_world_task_npctxt_74",
|
||||||
"text": "通关觉醒boss2通关难度2"
|
"text": "装备副本boss3难度5刷2次"
|
||||||
},
|
},
|
||||||
"npc": 10740,
|
"npc": 10740,
|
||||||
"completetask": [
|
"completetask": [
|
||||||
@ -2676,15 +2676,15 @@
|
|||||||
"icon": "",
|
"icon": "",
|
||||||
"task_name": {
|
"task_name": {
|
||||||
"key": "worldtask_world_task_task_name_75",
|
"key": "worldtask_world_task_task_name_75",
|
||||||
"text": "收集25个觉醒材料"
|
"text": "守护者星座图解锁次数10次"
|
||||||
},
|
},
|
||||||
"task_details": {
|
"task_details": {
|
||||||
"key": "worldtask_world_task_task_details_75",
|
"key": "worldtask_world_task_task_details_75",
|
||||||
"text": "收集25个觉醒材料"
|
"text": "守护者星座图解锁次数10次"
|
||||||
},
|
},
|
||||||
"npctxt": {
|
"npctxt": {
|
||||||
"key": "worldtask_world_task_npctxt_75",
|
"key": "worldtask_world_task_npctxt_75",
|
||||||
"text": "收集25个觉醒材料"
|
"text": "守护者星座图解锁次数10次"
|
||||||
},
|
},
|
||||||
"npc": 10750,
|
"npc": 10750,
|
||||||
"completetask": [
|
"completetask": [
|
||||||
@ -2712,15 +2712,15 @@
|
|||||||
"icon": "",
|
"icon": "",
|
||||||
"task_name": {
|
"task_name": {
|
||||||
"key": "worldtask_world_task_task_name_76",
|
"key": "worldtask_world_task_task_name_76",
|
||||||
"text": "1个守护者觉醒到3阶段"
|
"text": "守护者星座图解锁次数15次"
|
||||||
},
|
},
|
||||||
"task_details": {
|
"task_details": {
|
||||||
"key": "worldtask_world_task_task_details_76",
|
"key": "worldtask_world_task_task_details_76",
|
||||||
"text": "1个守护者觉醒到3阶段"
|
"text": "守护者星座图解锁次数15次"
|
||||||
},
|
},
|
||||||
"npctxt": {
|
"npctxt": {
|
||||||
"key": "worldtask_world_task_npctxt_76",
|
"key": "worldtask_world_task_npctxt_76",
|
||||||
"text": "1个守护者觉醒到3阶段"
|
"text": "守护者星座图解锁次数15次"
|
||||||
},
|
},
|
||||||
"npc": 10760,
|
"npc": 10760,
|
||||||
"completetask": [
|
"completetask": [
|
||||||
@ -2856,15 +2856,15 @@
|
|||||||
"icon": "",
|
"icon": "",
|
||||||
"task_name": {
|
"task_name": {
|
||||||
"key": "worldtask_world_task_task_name_80",
|
"key": "worldtask_world_task_task_name_80",
|
||||||
"text": "通关觉醒boss3通关难度2"
|
"text": "装备副本boss4难度2刷1次"
|
||||||
},
|
},
|
||||||
"task_details": {
|
"task_details": {
|
||||||
"key": "worldtask_world_task_task_details_80",
|
"key": "worldtask_world_task_task_details_80",
|
||||||
"text": "通关觉醒boss3通关难度2"
|
"text": "装备副本boss4难度2刷1次"
|
||||||
},
|
},
|
||||||
"npctxt": {
|
"npctxt": {
|
||||||
"key": "worldtask_world_task_npctxt_80",
|
"key": "worldtask_world_task_npctxt_80",
|
||||||
"text": "通关觉醒boss3通关难度2"
|
"text": "装备副本boss4难度2刷1次"
|
||||||
},
|
},
|
||||||
"npc": 10800,
|
"npc": 10800,
|
||||||
"completetask": [
|
"completetask": [
|
||||||
@ -2892,15 +2892,15 @@
|
|||||||
"icon": "",
|
"icon": "",
|
||||||
"task_name": {
|
"task_name": {
|
||||||
"key": "worldtask_world_task_task_name_81",
|
"key": "worldtask_world_task_task_name_81",
|
||||||
"text": "3个守护者觉醒3阶"
|
"text": "守护者星座图解锁解锁30次"
|
||||||
},
|
},
|
||||||
"task_details": {
|
"task_details": {
|
||||||
"key": "worldtask_world_task_task_details_81",
|
"key": "worldtask_world_task_task_details_81",
|
||||||
"text": "3个守护者觉醒3阶"
|
"text": "守护者星座图解锁解锁30次"
|
||||||
},
|
},
|
||||||
"npctxt": {
|
"npctxt": {
|
||||||
"key": "worldtask_world_task_npctxt_81",
|
"key": "worldtask_world_task_npctxt_81",
|
||||||
"text": "3个守护者觉醒3阶"
|
"text": "守护者星座图解锁解锁30次"
|
||||||
},
|
},
|
||||||
"npc": 10810,
|
"npc": 10810,
|
||||||
"completetask": [
|
"completetask": [
|
||||||
@ -3072,15 +3072,15 @@
|
|||||||
"icon": "",
|
"icon": "",
|
||||||
"task_name": {
|
"task_name": {
|
||||||
"key": "worldtask_world_task_task_name_86",
|
"key": "worldtask_world_task_task_name_86",
|
||||||
"text": "装备副本boss3难度2刷1次"
|
"text": "装备副本boss4难度4刷1次"
|
||||||
},
|
},
|
||||||
"task_details": {
|
"task_details": {
|
||||||
"key": "worldtask_world_task_task_details_86",
|
"key": "worldtask_world_task_task_details_86",
|
||||||
"text": "装备副本boss3难度2刷1次"
|
"text": "装备副本boss4难度4刷1次"
|
||||||
},
|
},
|
||||||
"npctxt": {
|
"npctxt": {
|
||||||
"key": "worldtask_world_task_npctxt_86",
|
"key": "worldtask_world_task_npctxt_86",
|
||||||
"text": "装备副本boss3难度2刷1次"
|
"text": "装备副本boss4难度4刷1次"
|
||||||
},
|
},
|
||||||
"npc": 10860,
|
"npc": 10860,
|
||||||
"completetask": [
|
"completetask": [
|
||||||
@ -3180,15 +3180,15 @@
|
|||||||
"icon": "",
|
"icon": "",
|
||||||
"task_name": {
|
"task_name": {
|
||||||
"key": "worldtask_world_task_task_name_89",
|
"key": "worldtask_world_task_task_name_89",
|
||||||
"text": "4个守护者觉醒3阶段"
|
"text": "守护者星座图解锁50次"
|
||||||
},
|
},
|
||||||
"task_details": {
|
"task_details": {
|
||||||
"key": "worldtask_world_task_task_details_89",
|
"key": "worldtask_world_task_task_details_89",
|
||||||
"text": "4个守护者觉醒3阶段"
|
"text": "守护者星座图解锁50次"
|
||||||
},
|
},
|
||||||
"npctxt": {
|
"npctxt": {
|
||||||
"key": "worldtask_world_task_npctxt_89",
|
"key": "worldtask_world_task_npctxt_89",
|
||||||
"text": "4个守护者觉醒3阶段"
|
"text": "守护者星座图解锁50次"
|
||||||
},
|
},
|
||||||
"npc": 10890,
|
"npc": 10890,
|
||||||
"completetask": [
|
"completetask": [
|
||||||
@ -3252,15 +3252,15 @@
|
|||||||
"icon": "",
|
"icon": "",
|
||||||
"task_name": {
|
"task_name": {
|
||||||
"key": "worldtask_world_task_task_name_91",
|
"key": "worldtask_world_task_task_name_91",
|
||||||
"text": "装备副本boss4难度2刷1次"
|
"text": "装备副本boss4难度6刷1次"
|
||||||
},
|
},
|
||||||
"task_details": {
|
"task_details": {
|
||||||
"key": "worldtask_world_task_task_details_91",
|
"key": "worldtask_world_task_task_details_91",
|
||||||
"text": "装备副本boss4难度2刷1次"
|
"text": "装备副本boss4难度6刷1次"
|
||||||
},
|
},
|
||||||
"npctxt": {
|
"npctxt": {
|
||||||
"key": "worldtask_world_task_npctxt_91",
|
"key": "worldtask_world_task_npctxt_91",
|
||||||
"text": "装备副本boss4难度2刷1次"
|
"text": "装备副本boss4难度6刷1次"
|
||||||
},
|
},
|
||||||
"npc": 10910,
|
"npc": 10910,
|
||||||
"completetask": [
|
"completetask": [
|
||||||
|
|||||||
@ -155,19 +155,17 @@ func (this *Buried) CheckCondition(uid string, condiIds ...int32) (condis []*pb.
|
|||||||
if v1.Conid == v {
|
if v1.Conid == v {
|
||||||
ok = true
|
ok = true
|
||||||
//状态等于休眠
|
//状态等于休眠
|
||||||
if v1.State == pb.BuriedItemState_Sleep {
|
if conf.Ctype == ctype_daily { //日常
|
||||||
if conf.Ctype == ctype_daily { //日常
|
if !utils.IsToday(v1.Timestamp) { //不是同一天 可以重置数据
|
||||||
if !utils.IsToday(v1.Timestamp) { //不是同一天 可以重置数据
|
v1.State = pb.BuriedItemState_Activated
|
||||||
v1.State = pb.BuriedItemState_Activated
|
v1.Value = 0
|
||||||
v1.Value = 0
|
v1.Finish = pb.BuriedItemFinishState_buried_unfinish
|
||||||
v1.Finish = pb.BuriedItemFinishState_buried_unfinish
|
}
|
||||||
}
|
} else if conf.Ctype == ctype_weekly { //周常
|
||||||
} else if conf.Ctype == ctype_weekly { //周常
|
if !utils.IsSameWeek(v1.Timestamp) { //不是同一周
|
||||||
if !utils.IsSameWeek(v1.Timestamp) { //不是同一周
|
v1.State = pb.BuriedItemState_Activated
|
||||||
v1.State = pb.BuriedItemState_Activated
|
v1.Value = 0
|
||||||
v1.Value = 0
|
v1.Finish = pb.BuriedItemFinishState_buried_unfinish
|
||||||
v1.Finish = pb.BuriedItemFinishState_buried_unfinish
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
condis = append(condis, &pb.ConIProgress{
|
condis = append(condis, &pb.ConIProgress{
|
||||||
@ -282,19 +280,17 @@ func (this *Buried) FinishConditionAndCheck(uid string, finishcondiIds []int32,
|
|||||||
if v1.Conid == v {
|
if v1.Conid == v {
|
||||||
ok = true
|
ok = true
|
||||||
//状态等于休眠
|
//状态等于休眠
|
||||||
if v1.State == pb.BuriedItemState_Sleep {
|
if conf.Ctype == ctype_daily { //日常
|
||||||
if conf.Ctype == ctype_daily { //日常
|
if !utils.IsToday(v1.Timestamp) { //不是同一天 可以重置数据
|
||||||
if !utils.IsToday(v1.Timestamp) { //不是同一天 可以重置数据
|
v1.State = pb.BuriedItemState_Activated
|
||||||
v1.State = pb.BuriedItemState_Activated
|
v1.Value = 0
|
||||||
v1.Value = 0
|
v1.Finish = pb.BuriedItemFinishState_buried_unfinish
|
||||||
v1.Finish = pb.BuriedItemFinishState_buried_unfinish
|
}
|
||||||
}
|
} else if conf.Ctype == ctype_weekly { //周常
|
||||||
} else if conf.Ctype == ctype_weekly { //周常
|
if !utils.IsSameWeek(v1.Timestamp) { //不是同一周
|
||||||
if !utils.IsSameWeek(v1.Timestamp) { //不是同一周
|
v1.State = pb.BuriedItemState_Activated
|
||||||
v1.State = pb.BuriedItemState_Activated
|
v1.Value = 0
|
||||||
v1.Value = 0
|
v1.Finish = pb.BuriedItemFinishState_buried_unfinish
|
||||||
v1.Finish = pb.BuriedItemFinishState_buried_unfinish
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
condis = append(condis, &pb.ConIProgress{
|
condis = append(condis, &pb.ConIProgress{
|
||||||
@ -523,24 +519,23 @@ func (this *Buried) updateAndCheckBuried(bconf *cfg.GameBuriedTypeData, bdata *p
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
//状态等于休眠
|
if bitem.State == pb.BuriedItemState_Sleep && cond.Ctype == ctype_repeat { //完成后自动锁定
|
||||||
if bitem.State == pb.BuriedItemState_Sleep {
|
bitem.State = pb.BuriedItemState_Activated
|
||||||
if cond.Ctype == ctype_repeat { //完成后自动锁定
|
bitem.Value = 0
|
||||||
|
bitem.Finish = pb.BuriedItemFinishState_buried_unfinish
|
||||||
|
}
|
||||||
|
|
||||||
|
if cond.Ctype == ctype_daily { //日常
|
||||||
|
if !utils.IsToday(bitem.Timestamp) { //不是同一天 可以重置数据
|
||||||
|
bitem.State = pb.BuriedItemState_Activated
|
||||||
|
bitem.Value = 0
|
||||||
|
bitem.Finish = pb.BuriedItemFinishState_buried_unfinish
|
||||||
|
}
|
||||||
|
} else if cond.Ctype == ctype_weekly { //周常
|
||||||
|
if !utils.IsSameWeek(bitem.Timestamp) { //不是同一周
|
||||||
bitem.State = pb.BuriedItemState_Activated
|
bitem.State = pb.BuriedItemState_Activated
|
||||||
bitem.Value = 0
|
bitem.Value = 0
|
||||||
bitem.Finish = pb.BuriedItemFinishState_buried_unfinish
|
bitem.Finish = pb.BuriedItemFinishState_buried_unfinish
|
||||||
} else if cond.Ctype == ctype_daily { //日常
|
|
||||||
if !utils.IsToday(bitem.Timestamp) { //不是同一天 可以重置数据
|
|
||||||
bitem.State = pb.BuriedItemState_Activated
|
|
||||||
bitem.Value = 0
|
|
||||||
bitem.Finish = pb.BuriedItemFinishState_buried_unfinish
|
|
||||||
}
|
|
||||||
} else if cond.Ctype == ctype_weekly { //周常
|
|
||||||
if !utils.IsSameWeek(bitem.Timestamp) { //不是同一周
|
|
||||||
bitem.State = pb.BuriedItemState_Activated
|
|
||||||
bitem.Value = 0
|
|
||||||
bitem.Finish = pb.BuriedItemFinishState_buried_unfinish
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -575,8 +570,8 @@ func (this *Buried) updateAndCheckBuried(bconf *cfg.GameBuriedTypeData, bdata *p
|
|||||||
this.Error("未知的埋点数据处理类型!", log.Field{Key: "Insert", Value: bconf.Insert})
|
this.Error("未知的埋点数据处理类型!", log.Field{Key: "Insert", Value: bconf.Insert})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
bitem.Timestamp = configure.Now().Unix() //记录最后一次操作时间
|
||||||
if bitem.Value >= cond.Value { //完成进度
|
if bitem.Value >= cond.Value { //完成进度
|
||||||
bitem.Finish = pb.BuriedItemFinishState_buried_finish
|
bitem.Finish = pb.BuriedItemFinishState_buried_finish
|
||||||
if cond.Ctype == ctype_once { //完成后自动锁定
|
if cond.Ctype == ctype_once { //完成后自动锁定
|
||||||
bitem.State = pb.BuriedItemState_Freeze
|
bitem.State = pb.BuriedItemState_Freeze
|
||||||
@ -587,7 +582,6 @@ func (this *Buried) updateAndCheckBuried(bconf *cfg.GameBuriedTypeData, bdata *p
|
|||||||
} else if cond.Ctype == ctype_weekly {
|
} else if cond.Ctype == ctype_weekly {
|
||||||
bitem.State = pb.BuriedItemState_Sleep
|
bitem.State = pb.BuriedItemState_Sleep
|
||||||
}
|
}
|
||||||
bitem.Timestamp = configure.Now().Unix() //记录最后一次操作时间
|
|
||||||
} else {
|
} else {
|
||||||
this.Debug("完成条件未达成!", log.Field{Key: "埋点Id", Value: bdata.Btype}, log.Field{Key: "条件Id", Value: bitem.Conid}, log.Field{Key: "当前进度", Value: bitem.Value}, log.Field{Key: "目标进度", Value: cond.Value})
|
this.Debug("完成条件未达成!", log.Field{Key: "埋点Id", Value: bdata.Btype}, log.Field{Key: "条件Id", Value: bitem.Conid}, log.Field{Key: "当前进度", Value: bitem.Value}, log.Field{Key: "目标进度", Value: cond.Value})
|
||||||
}
|
}
|
||||||
|
|||||||
@ -65,11 +65,13 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade
|
|||||||
}
|
}
|
||||||
//找到下一个等级的相关配置
|
//找到下一个等级的相关配置
|
||||||
if intensify, err = this.module.configure.GetEquipmentIntensifyConfigureById(conf.EquipId, conf.InitLv, equipment.Lv); err != nil || intensify.Need == nil || len(intensify.Need) == 0 {
|
if intensify, err = this.module.configure.GetEquipmentIntensifyConfigureById(conf.EquipId, conf.InitLv, equipment.Lv); err != nil || intensify.Need == nil || len(intensify.Need) == 0 {
|
||||||
this.module.Errorf("Equip_Check err:%v", err)
|
|
||||||
errdata = &pb.ErrorData{
|
errdata = &pb.ErrorData{
|
||||||
Code: pb.ErrorCode_EquipmentLvlimitReached,
|
Code: pb.ErrorCode_EquipmentLvlimitReached,
|
||||||
Title: pb.ErrorCode_EquipmentLvlimitReached.ToString(),
|
Title: pb.ErrorCode_EquipmentLvlimitReached.ToString(),
|
||||||
Message: err.Error(),
|
Message: fmt.Sprintf("Lv:%d", equipment.Lv),
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
this.module.Errorf("Equip_Check err:%v", err)
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@ -419,27 +419,27 @@ func (this *modelEquipmentComp) upgradeEquipment(equipment *pb.DB_Equipment, equ
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return
|
||||||
}
|
}
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if equip.EquipId == 1 {
|
if equip.EquipId == 1 {
|
||||||
if len(equipment.AdverbEntry) <= 0 {
|
if len(equipment.AdverbEntry) <= 0 {
|
||||||
return
|
return
|
||||||
|
}
|
||||||
|
var attrlibrary *cfg.GameEquipAttrlibrarySData
|
||||||
|
index := comm.RandShuffle(len(equipment.AdverbEntry))[0]
|
||||||
|
if attrlibrary, err = this.module.configure.GetEquipmentAttrlibraryConfigureByKey(equipment.AdverbEntry[index].Id); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
value := equipment.AdverbEntry[index].BaseValue + int32(float64(attrlibrary.Addition[equipment.AdverbEntry[index].Lv-1])/1000.0*float64(equipment.AdverbEntry[index].BaseValue))
|
||||||
|
if equipment.AdverbEntry[index].Value < value {
|
||||||
|
equipment.AdverbEntry[index].Value = value
|
||||||
|
}
|
||||||
|
equipment.AdverbEntry[index].Lv++
|
||||||
|
} else {
|
||||||
|
index := comm.RandShuffle(len(equipment.Adverbskill))[0]
|
||||||
|
equipment.Adverbskill[index].Lv++
|
||||||
}
|
}
|
||||||
var attrlibrary *cfg.GameEquipAttrlibrarySData
|
|
||||||
index := comm.RandShuffle(len(equipment.AdverbEntry))[0]
|
|
||||||
if attrlibrary, err = this.module.configure.GetEquipmentAttrlibraryConfigureByKey(equipment.AdverbEntry[index].Id); err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
value := equipment.AdverbEntry[index].BaseValue + int32(float64(attrlibrary.Addition[equipment.AdverbEntry[index].Lv-1])/1000.0*float64(equipment.AdverbEntry[index].BaseValue))
|
|
||||||
if equipment.AdverbEntry[index].Value < value {
|
|
||||||
equipment.AdverbEntry[index].Value = value
|
|
||||||
}
|
|
||||||
equipment.AdverbEntry[index].Lv++
|
|
||||||
} else {
|
|
||||||
index := comm.RandShuffle(len(equipment.Adverbskill))[0]
|
|
||||||
equipment.Adverbskill[index].Lv++
|
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@ -53,7 +53,7 @@ func (this *apiComp) Fusion(session comm.IUserSession, req *pb.HeroFusionReq) (e
|
|||||||
for k, v := range req.Heros {
|
for k, v := range req.Heros {
|
||||||
// 校验英雄是否存在
|
// 校验英雄是否存在
|
||||||
_obj, c := this.module.GetHeroByObjID(session.GetUserId(), k)
|
_obj, c := this.module.GetHeroByObjID(session.GetUserId(), k)
|
||||||
if c != nil || _obj.SameCount < v {
|
if c != nil {
|
||||||
errdata = c
|
errdata = c
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -80,9 +80,9 @@ func (this *apiComp) Fusion(session comm.IUserSession, req *pb.HeroFusionReq) (e
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for k, v := range req.Heros {
|
for k, _ := range req.Heros {
|
||||||
//mapHero[_costMaphero[k].HeroID]
|
//mapHero[_costMaphero[k].HeroID]
|
||||||
if errdata = this.module.DelCard(session.GetUserId(), _costMaphero[k], v); errdata != nil {
|
if errdata = this.module.DelCard(session.GetUserId(), _costMaphero[k]); errdata != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
ChangeList = append(ChangeList, _costMaphero[k])
|
ChangeList = append(ChangeList, _costMaphero[k])
|
||||||
|
|||||||
@ -55,7 +55,6 @@ func (this *ModelHero) InitHero(uid string, heroCfgId string) *pb.DBHero {
|
|||||||
CardType: heroCfg.Type, //卡片类型
|
CardType: heroCfg.Type, //卡片类型
|
||||||
Skins: []int32{},
|
Skins: []int32{},
|
||||||
EquipID: make([]string, 8), //初始装备
|
EquipID: make([]string, 8), //初始装备
|
||||||
SameCount: 1, //默认叠加数量
|
|
||||||
AddProperty: make(map[string]int32),
|
AddProperty: make(map[string]int32),
|
||||||
Property: make(map[string]int32),
|
Property: make(map[string]int32),
|
||||||
JuexProperty: make(map[string]int32),
|
JuexProperty: make(map[string]int32),
|
||||||
@ -140,7 +139,7 @@ func (this *ModelHero) initHeroOverlying(uid string, heroCfgId string, count int
|
|||||||
)
|
)
|
||||||
hero = this.InitHero(uid, heroCfgId)
|
hero = this.InitHero(uid, heroCfgId)
|
||||||
if hero != nil {
|
if hero != nil {
|
||||||
hero.SameCount = 1 // 新需求 不需要判断叠加
|
|
||||||
if this.module.IsCross() {
|
if this.module.IsCross() {
|
||||||
if model, err = this.module.GetDBModelByUid(uid, this.TableName); err != nil {
|
if model, err = this.module.GetDBModelByUid(uid, this.TableName); err != nil {
|
||||||
this.module.Errorln(err)
|
this.module.Errorln(err)
|
||||||
@ -170,32 +169,17 @@ func (this *ModelHero) getOneHero(uid, heroId string) *pb.DBHero {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//消耗英雄卡
|
//消耗英雄卡
|
||||||
func (this *ModelHero) consumeHeroCard(uid string, hero *pb.DBHero, count int32) (err error) {
|
func (this *ModelHero) consumeHeroCard(uid string, hero *pb.DBHero) (err error) {
|
||||||
if count == 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if hero == nil {
|
if hero == nil {
|
||||||
err = errors.New("hero no exist")
|
err = errors.New("hero no exist")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if hero.SameCount < count {
|
if err := this.DelListlds(uid, []string{hero.Id}); err != nil {
|
||||||
err = errors.New("hero card no enough")
|
this.module.Errorf("%v", err)
|
||||||
return
|
|
||||||
}
|
}
|
||||||
hero.SameCount -= count // 数量-1
|
this.module.Debugf("删除卡牌uid:%s,卡牌ID:%s", uid, hero.Id)
|
||||||
if hero.SameCount == 0 {
|
|
||||||
if err := this.DelListlds(uid, []string{hero.Id}); err != nil {
|
|
||||||
this.module.Errorf("%v", err)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
update := map[string]interface{}{
|
|
||||||
"sameCount": hero.SameCount,
|
|
||||||
}
|
|
||||||
err = this.ChangeList(uid, hero.Id, update)
|
|
||||||
}
|
|
||||||
this.module.Debugf("删除%d张卡牌uid:%s,卡牌ID:%s", count, uid, hero.Id)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -661,7 +645,6 @@ func (this *ModelHero) InitMonsterHero(heroCfgId string, star, lv int32) *pb.DBH
|
|||||||
CardType: heroCfg.Type, //卡片类型
|
CardType: heroCfg.Type, //卡片类型
|
||||||
Skins: []int32{},
|
Skins: []int32{},
|
||||||
EquipID: make([]string, 8), //初始装备
|
EquipID: make([]string, 8), //初始装备
|
||||||
SameCount: 1, //默认叠加数量
|
|
||||||
AddProperty: make(map[string]int32),
|
AddProperty: make(map[string]int32),
|
||||||
Property: make(map[string]int32),
|
Property: make(map[string]int32),
|
||||||
JuexProperty: make(map[string]int32),
|
JuexProperty: make(map[string]int32),
|
||||||
|
|||||||
@ -172,8 +172,8 @@ func (this *Hero) QueryHeroByConfId(uId string, heroCfgId string) (hero *pb.DBHe
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 删除指定卡牌
|
// 删除指定卡牌
|
||||||
func (this *Hero) DelCard(udi string, hero *pb.DBHero, amount int32) (errdata *pb.ErrorData) {
|
func (this *Hero) DelCard(udi string, hero *pb.DBHero) (errdata *pb.ErrorData) {
|
||||||
err := this.modelHero.consumeHeroCard(udi, hero, amount)
|
err := this.modelHero.consumeHeroCard(udi, hero)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
errdata = &pb.ErrorData{
|
errdata = &pb.ErrorData{
|
||||||
Code: pb.ErrorCode_DBError,
|
Code: pb.ErrorCode_DBError,
|
||||||
@ -239,7 +239,6 @@ func (this *Hero) GetSpecifiedHero(session comm.IUserSession, heroConfId string,
|
|||||||
}
|
}
|
||||||
hero.Lv = lv
|
hero.Lv = lv
|
||||||
hero.Star = star
|
hero.Star = star
|
||||||
hero.SameCount = 1
|
|
||||||
_heroMap := map[string]interface{}{
|
_heroMap := map[string]interface{}{
|
||||||
"lv": hero.Lv,
|
"lv": hero.Lv,
|
||||||
"star": hero.Star,
|
"star": hero.Star,
|
||||||
@ -700,7 +699,6 @@ func (this *Hero) GetAllMaxHero(session comm.IUserSession) (errdata *pb.ErrorDat
|
|||||||
hero.Lv = maxLv
|
hero.Lv = maxLv
|
||||||
hero.Star = maxStar
|
hero.Star = maxStar
|
||||||
hero.JuexingLv = int32(maxJux)
|
hero.JuexingLv = int32(maxJux)
|
||||||
hero.SameCount = 1
|
|
||||||
this.modelHero.PropertyCompute(hero) // 重新计算属性
|
this.modelHero.PropertyCompute(hero) // 重新计算属性
|
||||||
_heroMap := map[string]interface{}{
|
_heroMap := map[string]interface{}{
|
||||||
"lv": hero.Lv,
|
"lv": hero.Lv,
|
||||||
|
|||||||
@ -31,6 +31,7 @@ const (
|
|||||||
EffectTipsType_Not_Control EffectTipsType = 5 //免疫控制
|
EffectTipsType_Not_Control EffectTipsType = 5 //免疫控制
|
||||||
EffectTipsType_Not_Action EffectTipsType = 6 //无法行动
|
EffectTipsType_Not_Action EffectTipsType = 6 //无法行动
|
||||||
EffectTipsType_Purification EffectTipsType = 7 //净化
|
EffectTipsType_Purification EffectTipsType = 7 //净化
|
||||||
|
EffectTipsType_Disperse EffectTipsType = 8 //驱散
|
||||||
)
|
)
|
||||||
|
|
||||||
// Enum value maps for EffectTipsType.
|
// Enum value maps for EffectTipsType.
|
||||||
@ -44,6 +45,7 @@ var (
|
|||||||
5: "Not_Control",
|
5: "Not_Control",
|
||||||
6: "Not_Action",
|
6: "Not_Action",
|
||||||
7: "Purification",
|
7: "Purification",
|
||||||
|
8: "Disperse",
|
||||||
}
|
}
|
||||||
EffectTipsType_value = map[string]int32{
|
EffectTipsType_value = map[string]int32{
|
||||||
"Eff_Success": 0,
|
"Eff_Success": 0,
|
||||||
@ -54,6 +56,7 @@ var (
|
|||||||
"Not_Control": 5,
|
"Not_Control": 5,
|
||||||
"Not_Action": 6,
|
"Not_Action": 6,
|
||||||
"Purification": 7,
|
"Purification": 7,
|
||||||
|
"Disperse": 8,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -1821,7 +1824,7 @@ var file_battle_battle_struct_proto_rawDesc = []byte{
|
|||||||
0x43, 0x6f, 0x6d, 0x53, 0x68, 0x69, 0x65, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a,
|
0x43, 0x6f, 0x6d, 0x53, 0x68, 0x69, 0x65, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a,
|
||||||
0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12,
|
0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12,
|
||||||
0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
|
0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
|
||||||
0x76, 0x61, 0x6c, 0x75, 0x65, 0x2a, 0x8d, 0x01, 0x0a, 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74,
|
0x76, 0x61, 0x6c, 0x75, 0x65, 0x2a, 0x9b, 0x01, 0x0a, 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74,
|
||||||
0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x45, 0x66, 0x66, 0x5f,
|
0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x45, 0x66, 0x66, 0x5f,
|
||||||
0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74,
|
0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74,
|
||||||
0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x6d,
|
0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x6d,
|
||||||
@ -1830,8 +1833,9 @@ var file_battle_battle_struct_proto_rawDesc = []byte{
|
|||||||
0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
|
0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
|
||||||
0x6c, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x6f, 0x74, 0x5f, 0x41, 0x63, 0x74, 0x69, 0x6f,
|
0x6c, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x6f, 0x74, 0x5f, 0x41, 0x63, 0x74, 0x69, 0x6f,
|
||||||
0x6e, 0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x75, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
|
0x6e, 0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x75, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
|
||||||
0x69, 0x6f, 0x6e, 0x10, 0x07, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
|
0x69, 0x6f, 0x6e, 0x10, 0x07, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73, 0x70, 0x65, 0x72, 0x73,
|
||||||
0x72, 0x6f, 0x74, 0x6f, 0x33,
|
0x65, 0x10, 0x08, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
|
||||||
|
0x74, 0x6f, 0x33,
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
|||||||
167
pb/hero_db.pb.go
167
pb/hero_db.pb.go
@ -96,7 +96,6 @@ type DBHero struct {
|
|||||||
Fulllvenr int32 `protobuf:"varint,23,opt,name=fulllvenr,proto3" json:"fulllvenr" bson:"fulllvenr"` ////满级登记分组 武馆使用
|
Fulllvenr int32 `protobuf:"varint,23,opt,name=fulllvenr,proto3" json:"fulllvenr" bson:"fulllvenr"` ////满级登记分组 武馆使用
|
||||||
KongfuUid string `protobuf:"bytes,24,opt,name=kongfuUid,proto3" json:"kongfuUid"` //@go_tags(`bson:"kongfuUid"`)// 英雄在谁家练功
|
KongfuUid string `protobuf:"bytes,24,opt,name=kongfuUid,proto3" json:"kongfuUid"` //@go_tags(`bson:"kongfuUid"`)// 英雄在谁家练功
|
||||||
Fetters map[string]int32 `protobuf:"bytes,25,rep,name=fetters,proto3" json:"fetters" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"fetters"` ////羁绊属性加成
|
Fetters map[string]int32 `protobuf:"bytes,25,rep,name=fetters,proto3" json:"fetters" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"fetters"` ////羁绊属性加成
|
||||||
SameCount int32 `protobuf:"varint,26,opt,name=sameCount,proto3" json:"sameCount" bson:"sameCount"` ////叠加数
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *DBHero) Reset() {
|
func (x *DBHero) Reset() {
|
||||||
@ -306,13 +305,6 @@ func (x *DBHero) GetFetters() map[string]int32 {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *DBHero) GetSameCount() int32 {
|
|
||||||
if x != nil {
|
|
||||||
return x.SameCount
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
//英雄扩展数据
|
//英雄扩展数据
|
||||||
type DBHeroRecord struct {
|
type DBHeroRecord struct {
|
||||||
state protoimpl.MessageState
|
state protoimpl.MessageState
|
||||||
@ -551,7 +543,7 @@ var file_hero_hero_db_proto_rawDesc = []byte{
|
|||||||
0x0a, 0x12, 0x68, 0x65, 0x72, 0x6f, 0x2f, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x64, 0x62, 0x2e, 0x70,
|
0x0a, 0x12, 0x68, 0x65, 0x72, 0x6f, 0x2f, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x64, 0x62, 0x2e, 0x70,
|
||||||
0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
|
0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
|
||||||
0x1a, 0x1c, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x65, 0x71, 0x75, 0x69,
|
0x1a, 0x1c, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x65, 0x71, 0x75, 0x69,
|
||||||
0x70, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xaa,
|
0x70, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8c,
|
||||||
0x0a, 0x0a, 0x06, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
|
0x0a, 0x0a, 0x06, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
|
||||||
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
|
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,
|
0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68,
|
||||||
@ -608,90 +600,89 @@ var file_hero_hero_db_proto_rawDesc = []byte{
|
|||||||
0x09, 0x6b, 0x6f, 0x6e, 0x67, 0x66, 0x75, 0x55, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x07, 0x66, 0x65,
|
0x09, 0x6b, 0x6f, 0x6e, 0x67, 0x66, 0x75, 0x55, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x07, 0x66, 0x65,
|
||||||
0x74, 0x74, 0x65, 0x72, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42,
|
0x74, 0x74, 0x65, 0x72, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42,
|
||||||
0x48, 0x65, 0x72, 0x6f, 0x2e, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72,
|
0x48, 0x65, 0x72, 0x6f, 0x2e, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72,
|
||||||
0x79, 0x52, 0x07, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x61,
|
0x79, 0x52, 0x07, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72,
|
||||||
0x6d, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x73,
|
0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
|
||||||
0x61, 0x6d, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70,
|
0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
|
||||||
0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
|
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61,
|
||||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
|
0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72,
|
||||||
0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
|
0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
|
||||||
0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70,
|
0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
|
||||||
0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
|
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61,
|
||||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
|
0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3f, 0x0a, 0x11, 0x4a, 0x75, 0x65, 0x78, 0x50,
|
||||||
0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
|
0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
|
||||||
0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3f, 0x0a, 0x11, 0x4a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f,
|
0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
|
||||||
0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
|
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76,
|
||||||
0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
|
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x41, 0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65,
|
||||||
0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c,
|
0x6e, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
|
||||||
0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x41, 0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74,
|
|
||||||
0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
|
|
||||||
0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
|
|
||||||
0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
|
|
||||||
0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x44, 0x0a, 0x16, 0x48, 0x6f, 0x72,
|
|
||||||
0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e,
|
|
||||||
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
|
||||||
0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
|
|
||||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
|
|
||||||
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, 0x98, 0x05, 0x0a, 0x0c,
|
0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x44, 0x0a, 0x16, 0x48,
|
||||||
0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02,
|
0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79,
|
||||||
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03,
|
0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
|
||||||
0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14,
|
0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
|
||||||
0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73,
|
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
|
||||||
0x74, 0x61, 0x72, 0x34, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x18, 0x04, 0x20,
|
0x01, 0x1a, 0x3a, 0x0a, 0x0c, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72,
|
||||||
0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74,
|
0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
|
||||||
0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65,
|
0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
|
||||||
0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20,
|
0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x98, 0x05,
|
||||||
0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x3a,
|
0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e,
|
||||||
0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x03, 0x28,
|
0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10,
|
||||||
0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64,
|
0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
|
||||||
0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
|
0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||||
0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x09, 0x73, 0x74,
|
0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x18,
|
||||||
0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e,
|
0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x12, 0x14, 0x0a, 0x05,
|
||||||
0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x53, 0x74, 0x61,
|
0x6d, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69,
|
||||||
0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x73, 0x74, 0x61,
|
0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18,
|
||||||
0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x63,
|
0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74,
|
||||||
0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61,
|
0x12, 0x3a, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20,
|
||||||
0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x61, 0x79, 0x63, 0x6f, 0x75,
|
0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f,
|
||||||
0x6e, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x61, 0x79, 0x63, 0x6f, 0x75,
|
0x72, 0x64, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72,
|
||||||
0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x0b, 0x20, 0x01,
|
0x79, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x09,
|
||||||
0x28, 0x05, 0x52, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65,
|
0x73, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32,
|
||||||
0x6e, 0x62, 0x75, 0x79, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62,
|
0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x53,
|
||||||
0x75, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65,
|
0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x73,
|
||||||
0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62,
|
0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x6f, 0x74, 0x61,
|
||||||
0x6c, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65,
|
0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x6f,
|
||||||
0x31, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61,
|
0x74, 0x61, 0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x61, 0x79, 0x63,
|
||||||
0x62, 0x6c, 0x65, 0x31, 0x12, 0x2b, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x0f, 0x20, 0x03,
|
0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x61, 0x79, 0x63,
|
||||||
0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72,
|
0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x0b,
|
||||||
0x64, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x72, 0x61, 0x63,
|
0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06,
|
||||||
0x65, 0x1a, 0x3c, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e,
|
0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65,
|
||||||
|
0x6e, 0x62, 0x75, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62,
|
||||||
|
0x6c, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74,
|
||||||
|
0x61, 0x62, 0x6c, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62,
|
||||||
|
0x6c, 0x65, 0x31, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x69, 0x6e, 0x65, 0x76, 0x69,
|
||||||
|
0x74, 0x61, 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, 0x64, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x72,
|
||||||
|
0x61, 0x63, 0x65, 0x1a, 0x3c, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e,
|
||||||
|
0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
|
||||||
|
0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
|
||||||
|
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
|
||||||
|
0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e,
|
||||||
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||||
0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
|
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, 0x1a,
|
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
|
||||||
0x3c, 0x0a, 0x0e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72,
|
0x37, 0x0a, 0x09, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
|
||||||
0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
|
0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
|
||||||
0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
|
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76,
|
||||||
0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a,
|
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb6, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x48,
|
||||||
0x09, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
|
0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
|
||||||
0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
|
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
|
||||||
0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c,
|
0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68,
|
||||||
0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb6, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72,
|
0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72,
|
||||||
0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
|
0x6f, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20,
|
||||||
0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02,
|
0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65,
|
||||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72,
|
0x6e, 0x74, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06,
|
||||||
0x6f, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49,
|
0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74,
|
||||||
0x64, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28,
|
0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
|
||||||
0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74,
|
0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
|
||||||
0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61,
|
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
|
||||||
0x6c, 0x65, 0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e,
|
0x01, 0x2a, 0x2f, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a,
|
||||||
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
|
0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x12,
|
||||||
0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
|
0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75,
|
||||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a,
|
0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
|
||||||
0x2f, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x48,
|
0x6f, 0x33,
|
||||||
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 (
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user