上传配置中心
This commit is contained in:
parent
ca8d0feb99
commit
3bff8f6eef
@ -1,7 +1,6 @@
|
||||
[
|
||||
{
|
||||
"Id": 1,
|
||||
<<<<<<< HEAD
|
||||
"GroupId": 300001,
|
||||
"buffID": 770076113,
|
||||
"GroupNum": 3,
|
||||
@ -31,87 +30,34 @@
|
||||
"GroupNum": 1,
|
||||
"BuffWt": 50,
|
||||
"TypeWt": 50
|
||||
=======
|
||||
"GroupId": 100001,
|
||||
"buffID": 125004311,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
"TypeWt": 600
|
||||
},
|
||||
{
|
||||
"Id": 2,
|
||||
"GroupId": 100001,
|
||||
"buffID": 125004312,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
"TypeWt": 600
|
||||
},
|
||||
{
|
||||
"Id": 3,
|
||||
"GroupId": 100001,
|
||||
"buffID": 135006211,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
"TypeWt": 600
|
||||
},
|
||||
{
|
||||
"Id": 4,
|
||||
"GroupId": 100001,
|
||||
"buffID": 135006212,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
"TypeWt": 600
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
},
|
||||
{
|
||||
"Id": 5,
|
||||
"GroupId": 100001,
|
||||
<<<<<<< HEAD
|
||||
"buffID": 125004311,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
"TypeWt": 75
|
||||
=======
|
||||
"buffID": 135006311,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
"TypeWt": 600
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
},
|
||||
{
|
||||
"Id": 6,
|
||||
"GroupId": 100001,
|
||||
<<<<<<< HEAD
|
||||
"buffID": 125004312,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
"TypeWt": 75
|
||||
=======
|
||||
"buffID": 135006312,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
"TypeWt": 600
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
},
|
||||
{
|
||||
"Id": 7,
|
||||
"GroupId": 100001,
|
||||
<<<<<<< HEAD
|
||||
"buffID": 135006211,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
"TypeWt": 75
|
||||
=======
|
||||
"buffID": 144004311,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
"TypeWt": 600
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
},
|
||||
{
|
||||
"Id": 8,
|
||||
"GroupId": 100001,
|
||||
<<<<<<< HEAD
|
||||
"buffID": 135006212,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
@ -151,185 +97,98 @@
|
||||
},
|
||||
{
|
||||
"Id": 13,
|
||||
=======
|
||||
"buffID": 144004312,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
"TypeWt": 600
|
||||
},
|
||||
{
|
||||
"Id": 9,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"GroupId": 100001,
|
||||
"buffID": 124006311,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
<<<<<<< HEAD
|
||||
"TypeWt": 75
|
||||
},
|
||||
{
|
||||
"Id": 14,
|
||||
=======
|
||||
"TypeWt": 600
|
||||
},
|
||||
{
|
||||
"Id": 10,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"GroupId": 100001,
|
||||
"buffID": 124006312,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
<<<<<<< HEAD
|
||||
"TypeWt": 75
|
||||
},
|
||||
{
|
||||
"Id": 15,
|
||||
=======
|
||||
"TypeWt": 600
|
||||
},
|
||||
{
|
||||
"Id": 11,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"GroupId": 100001,
|
||||
"buffID": 144002311,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
<<<<<<< HEAD
|
||||
"TypeWt": 75
|
||||
},
|
||||
{
|
||||
"Id": 16,
|
||||
=======
|
||||
"TypeWt": 600
|
||||
},
|
||||
{
|
||||
"Id": 12,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"GroupId": 100001,
|
||||
"buffID": 144002312,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
<<<<<<< HEAD
|
||||
"TypeWt": 75
|
||||
},
|
||||
{
|
||||
"Id": 17,
|
||||
=======
|
||||
"TypeWt": 600
|
||||
},
|
||||
{
|
||||
"Id": 13,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"GroupId": 100001,
|
||||
"buffID": 151513211,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
<<<<<<< HEAD
|
||||
"TypeWt": 75
|
||||
},
|
||||
{
|
||||
"Id": 18,
|
||||
=======
|
||||
"TypeWt": 600
|
||||
},
|
||||
{
|
||||
"Id": 14,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"GroupId": 100001,
|
||||
"buffID": 151513212,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
<<<<<<< HEAD
|
||||
"TypeWt": 75
|
||||
},
|
||||
{
|
||||
"Id": 19,
|
||||
=======
|
||||
"TypeWt": 600
|
||||
},
|
||||
{
|
||||
"Id": 15,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"GroupId": 100001,
|
||||
"buffID": 143002311,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
<<<<<<< HEAD
|
||||
"TypeWt": 75
|
||||
},
|
||||
{
|
||||
"Id": 20,
|
||||
=======
|
||||
"TypeWt": 600
|
||||
},
|
||||
{
|
||||
"Id": 16,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"GroupId": 100001,
|
||||
"buffID": 143002312,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
<<<<<<< HEAD
|
||||
"TypeWt": 75
|
||||
},
|
||||
{
|
||||
"Id": 21,
|
||||
=======
|
||||
"TypeWt": 600
|
||||
},
|
||||
{
|
||||
"Id": 17,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"GroupId": 100001,
|
||||
"buffID": 115005311,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
<<<<<<< HEAD
|
||||
"TypeWt": 75
|
||||
},
|
||||
{
|
||||
"Id": 22,
|
||||
=======
|
||||
"TypeWt": 600
|
||||
},
|
||||
{
|
||||
"Id": 18,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"GroupId": 100001,
|
||||
"buffID": 115005312,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
<<<<<<< HEAD
|
||||
"TypeWt": 75
|
||||
},
|
||||
{
|
||||
"Id": 23,
|
||||
=======
|
||||
"TypeWt": 600
|
||||
},
|
||||
{
|
||||
"Id": 19,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"GroupId": 100001,
|
||||
"buffID": 143006311,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
<<<<<<< HEAD
|
||||
"TypeWt": 75
|
||||
},
|
||||
{
|
||||
"Id": 24,
|
||||
=======
|
||||
"TypeWt": 600
|
||||
},
|
||||
{
|
||||
"Id": 20,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"GroupId": 100001,
|
||||
"buffID": 143006312,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
<<<<<<< HEAD
|
||||
"TypeWt": 75
|
||||
},
|
||||
{
|
||||
@ -2891,8 +2750,5 @@
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
"TypeWt": 75
|
||||
=======
|
||||
"TypeWt": 600
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
]
|
||||
@ -1,10 +1,7 @@
|
||||
[
|
||||
{
|
||||
"BattleStageId": 110101,
|
||||
<<<<<<< HEAD
|
||||
"EnemyShowIcon": 0,
|
||||
=======
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Atk": 0,
|
||||
"Hp": 0,
|
||||
"Def": 0,
|
||||
@ -13,19 +10,12 @@
|
||||
"BattleReadyID": 118,
|
||||
"FormatList": [
|
||||
101011
|
||||
<<<<<<< HEAD
|
||||
],
|
||||
"RewardLottery": 0
|
||||
},
|
||||
{
|
||||
"BattleStageId": 110102,
|
||||
"EnemyShowIcon": 0,
|
||||
=======
|
||||
]
|
||||
},
|
||||
{
|
||||
"BattleStageId": 110102,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Atk": 0,
|
||||
"Hp": 0,
|
||||
"Def": 0,
|
||||
@ -34,19 +24,12 @@
|
||||
"BattleReadyID": 118,
|
||||
"FormatList": [
|
||||
101012
|
||||
<<<<<<< HEAD
|
||||
],
|
||||
"RewardLottery": 0
|
||||
},
|
||||
{
|
||||
"BattleStageId": 110103,
|
||||
"EnemyShowIcon": 0,
|
||||
=======
|
||||
]
|
||||
},
|
||||
{
|
||||
"BattleStageId": 110103,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Atk": 0,
|
||||
"Hp": 0,
|
||||
"Def": 0,
|
||||
@ -55,19 +38,12 @@
|
||||
"BattleReadyID": 118,
|
||||
"FormatList": [
|
||||
101013
|
||||
<<<<<<< HEAD
|
||||
],
|
||||
"RewardLottery": 0
|
||||
},
|
||||
{
|
||||
"BattleStageId": 110104,
|
||||
"EnemyShowIcon": 0,
|
||||
=======
|
||||
]
|
||||
},
|
||||
{
|
||||
"BattleStageId": 110104,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Atk": 0,
|
||||
"Hp": 0,
|
||||
"Def": 0,
|
||||
@ -76,19 +52,12 @@
|
||||
"BattleReadyID": 118,
|
||||
"FormatList": [
|
||||
101021
|
||||
<<<<<<< HEAD
|
||||
],
|
||||
"RewardLottery": 0
|
||||
},
|
||||
{
|
||||
"BattleStageId": 110105,
|
||||
"EnemyShowIcon": 0,
|
||||
=======
|
||||
]
|
||||
},
|
||||
{
|
||||
"BattleStageId": 110105,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Atk": 0,
|
||||
"Hp": 0,
|
||||
"Def": 0,
|
||||
@ -97,7 +66,6 @@
|
||||
"BattleReadyID": 118,
|
||||
"FormatList": [
|
||||
101022
|
||||
<<<<<<< HEAD
|
||||
],
|
||||
"RewardLottery": 0
|
||||
},
|
||||
@ -114,8 +82,5 @@
|
||||
101022
|
||||
],
|
||||
"RewardLottery": 0
|
||||
=======
|
||||
]
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
]
|
||||
@ -1,10 +1,6 @@
|
||||
[
|
||||
{
|
||||
"BuffId": 125004311,
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"BuffGroupId": 1001,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Type": 1,
|
||||
"SkillId": 125004311,
|
||||
"BuffLevel": 1,
|
||||
@ -12,7 +8,6 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_1",
|
||||
<<<<<<< HEAD
|
||||
"text": "愤怒笼罩了全身，谁都不能破坏坦克的窗户！"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -24,27 +19,10 @@
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 30
|
||||
=======
|
||||
"text": "描述描述描述1"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 10
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 10
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 125004312,
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"BuffGroupId": 1001,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Type": 1,
|
||||
"SkillId": 125004311,
|
||||
"BuffLevel": 2,
|
||||
@ -52,7 +30,6 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_2",
|
||||
<<<<<<< HEAD
|
||||
"text": "愤怒笼罩了全身，谁都不能破坏坦克的窗户！"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -64,27 +41,10 @@
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 0
|
||||
=======
|
||||
"text": "描述描述描述2"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 11
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 11
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 135006211,
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"BuffGroupId": 1002,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Type": 1,
|
||||
"SkillId": 135006211,
|
||||
"BuffLevel": 1,
|
||||
@ -92,7 +52,6 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_3",
|
||||
<<<<<<< HEAD
|
||||
"text": "食物即将被抢走，全身的血液都在沸腾！像猛兽一样冲出去！"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -104,27 +63,10 @@
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 50
|
||||
=======
|
||||
"text": "描述描述描述3"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 12
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 12
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 135006212,
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"BuffGroupId": 1002,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Type": 1,
|
||||
"SkillId": 135006211,
|
||||
"BuffLevel": 2,
|
||||
@ -132,7 +74,6 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_4",
|
||||
<<<<<<< HEAD
|
||||
"text": "食物即将被抢走，全身的血液都在沸腾！像猛兽一样冲出去！"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -144,27 +85,10 @@
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 0
|
||||
=======
|
||||
"text": "描述描述描述4"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 13
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 13
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 135006311,
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"BuffGroupId": 1003,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Type": 2,
|
||||
"SkillId": 135006311,
|
||||
"BuffLevel": 1,
|
||||
@ -172,7 +96,6 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_5",
|
||||
<<<<<<< HEAD
|
||||
"text": "珊迪紧咬牙关发动马力，所过之处寸草不生！"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -184,27 +107,10 @@
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 30
|
||||
=======
|
||||
"text": "描述描述描述5"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 14
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 14
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 135006312,
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"BuffGroupId": 1003,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Type": 2,
|
||||
"SkillId": 135006311,
|
||||
"BuffLevel": 2,
|
||||
@ -212,7 +118,6 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_6",
|
||||
<<<<<<< HEAD
|
||||
"text": "珊迪紧咬牙关发动马力，所过之处寸草不生！"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -224,27 +129,10 @@
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 0
|
||||
=======
|
||||
"text": "描述描述描述6"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 15
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 15
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 144004311,
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"BuffGroupId": 1004,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Type": 2,
|
||||
"SkillId": 144004311,
|
||||
"BuffLevel": 1,
|
||||
@ -252,7 +140,6 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_7",
|
||||
<<<<<<< HEAD
|
||||
"text": "盖对陆冲滑板进行了改良，在不平缓的坡地上依旧一往无前！"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -264,27 +151,10 @@
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 50
|
||||
=======
|
||||
"text": "描述描述描述7"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 16
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 16
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 144004312,
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"BuffGroupId": 1004,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Type": 2,
|
||||
"SkillId": 144004311,
|
||||
"BuffLevel": 2,
|
||||
@ -292,7 +162,6 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_8",
|
||||
<<<<<<< HEAD
|
||||
"text": "盖对陆冲滑板进行了改良，在不平缓的坡地上依旧一往无前！"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -304,27 +173,10 @@
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 0
|
||||
=======
|
||||
"text": "描述描述描述8"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 17
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 17
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 124006311,
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"BuffGroupId": 1005,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Type": 3,
|
||||
"SkillId": 124006311,
|
||||
"BuffLevel": 1,
|
||||
@ -332,7 +184,6 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_9",
|
||||
<<<<<<< HEAD
|
||||
"text": "懒惰就会成为野兽的腹中餐，一想到此，瓜哥又做了二百个俯卧撑。"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -344,27 +195,10 @@
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 80
|
||||
=======
|
||||
"text": "描述描述描述9"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 18
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 18
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 124006312,
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"BuffGroupId": 1005,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Type": 3,
|
||||
"SkillId": 124006311,
|
||||
"BuffLevel": 2,
|
||||
@ -372,7 +206,6 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_10",
|
||||
<<<<<<< HEAD
|
||||
"text": "懒惰就会成为野兽的腹中餐，一想到此，瓜哥又做了二百个俯卧撑。"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -384,27 +217,10 @@
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 0
|
||||
=======
|
||||
"text": "描述描述描述10"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 19
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 19
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 144002311,
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"BuffGroupId": 1006,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Type": 3,
|
||||
"SkillId": 144002311,
|
||||
"BuffLevel": 1,
|
||||
@ -412,7 +228,6 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_11",
|
||||
<<<<<<< HEAD
|
||||
"text": "家人是瓜哥心中最重要的东西，就算牺牲自己也在所不惜。"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -424,27 +239,10 @@
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 30
|
||||
=======
|
||||
"text": "描述描述描述11"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 20
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 20
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 144002312,
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"BuffGroupId": 1006,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Type": 3,
|
||||
"SkillId": 144002311,
|
||||
"BuffLevel": 2,
|
||||
@ -452,7 +250,6 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_12",
|
||||
<<<<<<< HEAD
|
||||
"text": "家人是瓜哥心中最重要的东西，就算牺牲自己也在所不惜。"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -464,27 +261,10 @@
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 0
|
||||
=======
|
||||
"text": "描述描述描述12"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 21
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 21
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 151513211,
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"BuffGroupId": 1007,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Type": 4,
|
||||
"SkillId": 151513211,
|
||||
"BuffLevel": 1,
|
||||
@ -492,7 +272,6 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_13",
|
||||
<<<<<<< HEAD
|
||||
"text": "绝望中暴发的强大力量！险境激发了瓜哥隐藏的潜能，让瓜哥完成了自我的突破。"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -504,27 +283,10 @@
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 50
|
||||
=======
|
||||
"text": "描述描述描述13"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 22
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 22
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 151513212,
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"BuffGroupId": 1007,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Type": 4,
|
||||
"SkillId": 151513211,
|
||||
"BuffLevel": 2,
|
||||
@ -532,7 +294,6 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_14",
|
||||
<<<<<<< HEAD
|
||||
"text": "绝望中暴发的强大力量！险境激发了瓜哥隐藏的潜能，让瓜哥完成了自我的突破。"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -544,27 +305,10 @@
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 0
|
||||
=======
|
||||
"text": "描述描述描述14"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 23
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 23
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 143002311,
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"BuffGroupId": 1008,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Type": 4,
|
||||
"SkillId": 143002311,
|
||||
"BuffLevel": 1,
|
||||
@ -572,7 +316,6 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_15",
|
||||
<<<<<<< HEAD
|
||||
"text": "绝处逢生，只要一家人都在，就决不放弃。"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -584,27 +327,10 @@
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 30
|
||||
=======
|
||||
"text": "描述描述描述15"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 24
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 24
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 143002312,
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"BuffGroupId": 1008,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Type": 4,
|
||||
"SkillId": 143002311,
|
||||
"BuffLevel": 2,
|
||||
@ -612,7 +338,6 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_16",
|
||||
<<<<<<< HEAD
|
||||
"text": "绝处逢生，只要一家人都在，就决不放弃。"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -624,27 +349,10 @@
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 0
|
||||
=======
|
||||
"text": "描述描述描述16"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 25
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 25
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 115005311,
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"BuffGroupId": 1009,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Type": 4,
|
||||
"SkillId": 115005311,
|
||||
"BuffLevel": 1,
|
||||
@ -652,7 +360,6 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_17",
|
||||
<<<<<<< HEAD
|
||||
"text": "珊迪跑动时只剩残影掠过，猎物还没看清就倒下了。"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -664,27 +371,10 @@
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 50
|
||||
=======
|
||||
"text": "描述描述描述17"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 26
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 26
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 115005312,
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"BuffGroupId": 1009,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Type": 4,
|
||||
"SkillId": 115005311,
|
||||
"BuffLevel": 2,
|
||||
@ -692,7 +382,6 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_18",
|
||||
<<<<<<< HEAD
|
||||
"text": "珊迪跑动时只剩残影掠过，猎物还没看清就倒下了。"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -704,27 +393,10 @@
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 0
|
||||
=======
|
||||
"text": "描述描述描述18"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 27
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 27
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 143006311,
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"BuffGroupId": 1010,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Type": 4,
|
||||
"SkillId": 143006311,
|
||||
"BuffLevel": 1,
|
||||
@ -732,7 +404,6 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_19",
|
||||
<<<<<<< HEAD
|
||||
"text": "鳄鲨已经饿了！发动偷袭时非常猛烈，猎手和猎物只在一瞬之间。"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -744,27 +415,10 @@
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 80
|
||||
=======
|
||||
"text": "描述描述描述19"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 28
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 28
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 143006312,
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"BuffGroupId": 1010,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Type": 4,
|
||||
"SkillId": 143006311,
|
||||
"BuffLevel": 2,
|
||||
@ -772,7 +426,6 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_20",
|
||||
<<<<<<< HEAD
|
||||
"text": "鳄鲨已经饿了！发动偷袭时非常猛烈，猎手和猎物只在一瞬之间。"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -4392,19 +4045,6 @@
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 0
|
||||
=======
|
||||
"text": "描述描述描述20"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 29
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 29
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
}
|
||||
]
|
||||
@ -96,16 +96,11 @@
|
||||
"probability": 0
|
||||
},
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
"EventId": 25100001,
|
||||
=======
|
||||
"EventId": 25,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"EventTitle": {
|
||||
"key": "stonehenge_eventconfig_EventTitle_7",
|
||||
"text": "随机符文"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"EventType": 25,
|
||||
"EventResource": "",
|
||||
"Value1": 100001,
|
||||
@ -125,11 +120,6 @@
|
||||
"EventType": 28,
|
||||
"EventResource": "",
|
||||
"Value1": 110501,
|
||||
=======
|
||||
"EventType": 0,
|
||||
"EventResource": "",
|
||||
"Value1": 25,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Value2": 0,
|
||||
"Value3": 0,
|
||||
"Value4": 0,
|
||||
|
||||
@ -1,73 +1,42 @@
|
||||
[
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
"RoomId": 10110101,
|
||||
=======
|
||||
"RoomId": 100001,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"RoomName": {
|
||||
"key": "stonehenge_roomconfig_RoomName_1",
|
||||
"text": "战斗"
|
||||
},
|
||||
"SceneName": "scenesfight_secret_realm_01",
|
||||
"PortalName": "",
|
||||
<<<<<<< HEAD
|
||||
"EventrewardGroup": 16010101,
|
||||
"EventBattleGroup": 14110100,
|
||||
=======
|
||||
"EventrewardGroup": 1001001,
|
||||
"EventBattleGroup": 0,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"EventStoryNpcGroup": 0,
|
||||
"EventTreasureGroup": 0,
|
||||
"EventStoreGroup": 0,
|
||||
"BossEvent": 0,
|
||||
<<<<<<< HEAD
|
||||
"Condition": 14110100
|
||||
},
|
||||
{
|
||||
"RoomId": 10110102,
|
||||
=======
|
||||
"Condition": 0
|
||||
},
|
||||
{
|
||||
"RoomId": 100002,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"RoomName": {
|
||||
"key": "stonehenge_roomconfig_RoomName_2",
|
||||
"text": "战斗"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"SceneName": "scenesfight_secret_realm_02",
|
||||
"PortalName": "",
|
||||
"EventrewardGroup": 16010101,
|
||||
"EventBattleGroup": 14110100,
|
||||
=======
|
||||
"SceneName": "scenesfight_secret_realm_01",
|
||||
"PortalName": "",
|
||||
"EventrewardGroup": 1001001,
|
||||
"EventBattleGroup": 0,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"EventStoryNpcGroup": 0,
|
||||
"EventTreasureGroup": 0,
|
||||
"EventStoreGroup": 0,
|
||||
"BossEvent": 0,
|
||||
<<<<<<< HEAD
|
||||
"Condition": 14110100
|
||||
},
|
||||
{
|
||||
"RoomId": 10110103,
|
||||
=======
|
||||
"Condition": 0
|
||||
},
|
||||
{
|
||||
"RoomId": 100003,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"RoomName": {
|
||||
"key": "stonehenge_roomconfig_RoomName_3",
|
||||
"text": "战斗"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"SceneName": "scenesfight_secret_realm_03",
|
||||
"PortalName": "",
|
||||
"EventrewardGroup": 16010101,
|
||||
@ -88,17 +57,10 @@
|
||||
"PortalName": "",
|
||||
"EventrewardGroup": 16010101,
|
||||
"EventBattleGroup": 14110100,
|
||||
=======
|
||||
"SceneName": "scenesfight_secret_realm_01",
|
||||
"PortalName": "",
|
||||
"EventrewardGroup": 1001001,
|
||||
"EventBattleGroup": 0,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"EventStoryNpcGroup": 0,
|
||||
"EventTreasureGroup": 0,
|
||||
"EventStoreGroup": 0,
|
||||
"BossEvent": 0,
|
||||
<<<<<<< HEAD
|
||||
"Condition": 14110100
|
||||
},
|
||||
{
|
||||
@ -110,40 +72,10 @@
|
||||
"SceneName": "scenesfight_secret_realm_04",
|
||||
"PortalName": "",
|
||||
"EventrewardGroup": 16010101,
|
||||
=======
|
||||
"Condition": 0
|
||||
},
|
||||
{
|
||||
"RoomId": 100004,
|
||||
"RoomName": {
|
||||
"key": "stonehenge_roomconfig_RoomName_4",
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "",
|
||||
"PortalName": "",
|
||||
"EventrewardGroup": 1001001,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 0,
|
||||
"EventTreasureGroup": 0,
|
||||
"EventStoreGroup": 0,
|
||||
"BossEvent": 0,
|
||||
"Condition": 0
|
||||
},
|
||||
{
|
||||
"RoomId": 100005,
|
||||
"RoomName": {
|
||||
"key": "stonehenge_roomconfig_RoomName_5",
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "",
|
||||
"PortalName": "",
|
||||
"EventrewardGroup": 1001001,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 0,
|
||||
"EventTreasureGroup": 0,
|
||||
"EventStoreGroup": 0,
|
||||
<<<<<<< HEAD
|
||||
"BossEvent": 28110500,
|
||||
"Condition": 28110500
|
||||
},
|
||||
@ -156,25 +88,10 @@
|
||||
"SceneName": "scenesfight_secret_realm_04",
|
||||
"PortalName": "",
|
||||
"EventrewardGroup": 16010101,
|
||||
=======
|
||||
"BossEvent": 0,
|
||||
"Condition": 0
|
||||
},
|
||||
{
|
||||
"RoomId": 100006,
|
||||
"RoomName": {
|
||||
"key": "stonehenge_roomconfig_RoomName_6",
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "",
|
||||
"PortalName": "",
|
||||
"EventrewardGroup": 1001001,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 0,
|
||||
"EventTreasureGroup": 0,
|
||||
"EventStoreGroup": 0,
|
||||
<<<<<<< HEAD
|
||||
"BossEvent": 28110500,
|
||||
"Condition": 28110500
|
||||
},
|
||||
@ -193,19 +110,11 @@
|
||||
"EventStoreGroup": 0,
|
||||
"BossEvent": 28110500,
|
||||
"Condition": 28110500
|
||||
=======
|
||||
"BossEvent": 0,
|
||||
"Condition": 0
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
},
|
||||
{
|
||||
"RoomId": 99999,
|
||||
"RoomName": {
|
||||
<<<<<<< HEAD
|
||||
"key": "stonehenge_roomconfig_RoomName_8",
|
||||
=======
|
||||
"key": "stonehenge_roomconfig_RoomName_7",
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"text": "结算"
|
||||
},
|
||||
"SceneName": "",
|
||||
|
||||
@ -91,13 +91,21 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.GuildGve
|
||||
v.Hp -= score.Hp
|
||||
|
||||
record := &pb.DBGveRecord{
|
||||
Uid: session.GetUserId(),
|
||||
Formation: make([]string, 0),
|
||||
User: &pb.DBSimpleUser{
|
||||
Uid: session.GetUserId(),
|
||||
},
|
||||
Formation: make([]*pb.DBSimpleHero, 0),
|
||||
}
|
||||
for i, v := range req.Report.Info.Redflist[0].Team {
|
||||
record.Formation[i] = ""
|
||||
if int32(i) == req.Report.Info.Redflist[0].Leadpos && v != nil {
|
||||
record.CaptainHeroId = v.HeroID
|
||||
}
|
||||
if v != nil {
|
||||
record.Formation[i] = v.HeroID
|
||||
record.Formation = append(record.Formation, &pb.DBSimpleHero{
|
||||
HeroId: v.HeroID,
|
||||
Star: v.Star,
|
||||
Level: v.Lv,
|
||||
})
|
||||
}
|
||||
}
|
||||
v.Record = append(v.Record)
|
||||
|
||||
@ -105,6 +105,12 @@ func (this *apiComp) ReceiveAward(session comm.IUserSession, req *pb.MainlineRec
|
||||
}
|
||||
return
|
||||
}
|
||||
ok = false
|
||||
for _, v := range awardConfs {
|
||||
if v.Starnum == req.Stage {
|
||||
ok = true
|
||||
}
|
||||
}
|
||||
|
||||
session.SendMsg(string(this.module.GetType()), "receiveaward", &pb.MainlineReceiveAwardResp{})
|
||||
return
|
||||
|
||||
@ -422,6 +422,8 @@ const (
|
||||
ErrorCode_StonehengeRepeatedSelectBUff ErrorCode = 4902 // 重复选择buff
|
||||
ErrorCode_StonehengePortalErr ErrorCode = 4903 // 传送门校验不对
|
||||
ErrorCode_StonehengeEnterRoomFailed ErrorCode = 4904 // 进入房间失败
|
||||
ErrorCode_StonehengeRepeatedReward ErrorCode = 4905 // 事件重复完成
|
||||
ErrorCode_StonehengeGotoRoomFailed ErrorCode = 4906 // 进入房间失败
|
||||
)
|
||||
|
||||
// Enum value maps for ErrorCode.
|
||||
@ -784,6 +786,8 @@ var (
|
||||
4902: "StonehengeRepeatedSelectBUff",
|
||||
4903: "StonehengePortalErr",
|
||||
4904: "StonehengeEnterRoomFailed",
|
||||
4905: "StonehengeRepeatedReward",
|
||||
4906: "StonehengeGotoRoomFailed",
|
||||
}
|
||||
ErrorCode_value = map[string]int32{
|
||||
"Success": 0,
|
||||
@ -1143,6 +1147,8 @@ var (
|
||||
"StonehengeRepeatedSelectBUff": 4902,
|
||||
"StonehengePortalErr": 4903,
|
||||
"StonehengeEnterRoomFailed": 4904,
|
||||
"StonehengeRepeatedReward": 4905,
|
||||
"StonehengeGotoRoomFailed": 4906,
|
||||
}
|
||||
)
|
||||
|
||||
@ -1177,7 +1183,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
|
||||
|
||||
var file_errorcode_proto_rawDesc = []byte{
|
||||
0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
|
||||
0x6f, 0x2a, 0xf6, 0x41, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
|
||||
0x6f, 0x2a, 0xb4, 0x42, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
|
||||
0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10,
|
||||
0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e,
|
||||
0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76,
|
||||
@ -1704,8 +1710,12 @@ var file_errorcode_proto_rawDesc = []byte{
|
||||
0x12, 0x18, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x50, 0x6f,
|
||||
0x72, 0x74, 0x61, 0x6c, 0x45, 0x72, 0x72, 0x10, 0xa7, 0x26, 0x12, 0x1e, 0x0a, 0x19, 0x53, 0x74,
|
||||
0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x52, 0x6f, 0x6f,
|
||||
0x6d, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xa8, 0x26, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
|
||||
0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x6d, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xa8, 0x26, 0x12, 0x1d, 0x0a, 0x18, 0x53, 0x74,
|
||||
0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64,
|
||||
0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xa9, 0x26, 0x12, 0x1d, 0x0a, 0x18, 0x53, 0x74, 0x6f,
|
||||
0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x47, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x6f, 0x6d, 0x46,
|
||||
0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xaa, 0x26, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
|
||||
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
|
||||
@ -402,10 +402,12 @@ type DBGveRecord struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` //uid
|
||||
Formation []string `protobuf:"bytes,2,rep,name=formation,proto3" json:"formation"` //阵型
|
||||
Rating int32 `protobuf:"varint,3,opt,name=rating,proto3" json:"rating"` //评级
|
||||
Harm int32 `protobuf:"varint,4,opt,name=harm,proto3" json:"harm"` //伤害血量
|
||||
User *DBSimpleUser `protobuf:"bytes,1,opt,name=user,proto3" json:"user"`
|
||||
Time int64 `protobuf:"varint,2,opt,name=time,proto3" json:"time"` //战斗发生时间
|
||||
CaptainHeroId string `protobuf:"bytes,3,opt,name=captainHeroId,proto3" json:"captainHeroId"` //阵型中的队长
|
||||
Formation []*DBSimpleHero `protobuf:"bytes,4,rep,name=formation,proto3" json:"formation"` //阵型
|
||||
Rating int32 `protobuf:"varint,5,opt,name=rating,proto3" json:"rating"` //评级配置ID
|
||||
Harm int32 `protobuf:"varint,6,opt,name=harm,proto3" json:"harm"` //伤害血量
|
||||
}
|
||||
|
||||
func (x *DBGveRecord) Reset() {
|
||||
@ -440,14 +442,28 @@ func (*DBGveRecord) Descriptor() ([]byte, []int) {
|
||||
return file_guildgve_guildgve_db_proto_rawDescGZIP(), []int{5}
|
||||
}
|
||||
|
||||
func (x *DBGveRecord) GetUid() string {
|
||||
func (x *DBGveRecord) GetUser() *DBSimpleUser {
|
||||
if x != nil {
|
||||
return x.Uid
|
||||
return x.User
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *DBGveRecord) GetTime() int64 {
|
||||
if x != nil {
|
||||
return x.Time
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBGveRecord) GetCaptainHeroId() string {
|
||||
if x != nil {
|
||||
return x.CaptainHeroId
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DBGveRecord) GetFormation() []string {
|
||||
func (x *DBGveRecord) GetFormation() []*DBSimpleHero {
|
||||
if x != nil {
|
||||
return x.Formation
|
||||
}
|
||||
@ -468,6 +484,148 @@ func (x *DBGveRecord) GetHarm() int32 {
|
||||
return 0
|
||||
}
|
||||
|
||||
type DBSimpleUser struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` //uid
|
||||
Nickname string `protobuf:"bytes,2,opt,name=nickname,proto3" json:"nickname"` //昵称
|
||||
Skin string `protobuf:"bytes,3,opt,name=skin,proto3" json:"skin"` //皮肤
|
||||
Sex int32 `protobuf:"varint,4,opt,name=sex,proto3" json:"sex"` //性别
|
||||
Lv int32 `protobuf:"varint,5,opt,name=lv,proto3" json:"lv"` //等级
|
||||
}
|
||||
|
||||
func (x *DBSimpleUser) Reset() {
|
||||
*x = DBSimpleUser{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_guildgve_guildgve_db_proto_msgTypes[6]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *DBSimpleUser) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*DBSimpleUser) ProtoMessage() {}
|
||||
|
||||
func (x *DBSimpleUser) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_guildgve_guildgve_db_proto_msgTypes[6]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
return ms
|
||||
}
|
||||
return mi.MessageOf(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use DBSimpleUser.ProtoReflect.Descriptor instead.
|
||||
func (*DBSimpleUser) Descriptor() ([]byte, []int) {
|
||||
return file_guildgve_guildgve_db_proto_rawDescGZIP(), []int{6}
|
||||
}
|
||||
|
||||
func (x *DBSimpleUser) GetUid() string {
|
||||
if x != nil {
|
||||
return x.Uid
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DBSimpleUser) GetNickname() string {
|
||||
if x != nil {
|
||||
return x.Nickname
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DBSimpleUser) GetSkin() string {
|
||||
if x != nil {
|
||||
return x.Skin
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DBSimpleUser) GetSex() int32 {
|
||||
if x != nil {
|
||||
return x.Sex
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBSimpleUser) GetLv() int32 {
|
||||
if x != nil {
|
||||
return x.Lv
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
type DBSimpleHero struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
HeroId string `protobuf:"bytes,1,opt,name=heroId,proto3" json:"heroId"` //英雄ID
|
||||
Level int32 `protobuf:"varint,2,opt,name=level,proto3" json:"level"` //等级
|
||||
Star int32 `protobuf:"varint,3,opt,name=star,proto3" json:"star"` //星级
|
||||
}
|
||||
|
||||
func (x *DBSimpleHero) Reset() {
|
||||
*x = DBSimpleHero{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_guildgve_guildgve_db_proto_msgTypes[7]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *DBSimpleHero) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*DBSimpleHero) ProtoMessage() {}
|
||||
|
||||
func (x *DBSimpleHero) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_guildgve_guildgve_db_proto_msgTypes[7]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
return ms
|
||||
}
|
||||
return mi.MessageOf(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use DBSimpleHero.ProtoReflect.Descriptor instead.
|
||||
func (*DBSimpleHero) Descriptor() ([]byte, []int) {
|
||||
return file_guildgve_guildgve_db_proto_rawDescGZIP(), []int{7}
|
||||
}
|
||||
|
||||
func (x *DBSimpleHero) GetHeroId() string {
|
||||
if x != nil {
|
||||
return x.HeroId
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DBSimpleHero) GetLevel() int32 {
|
||||
if x != nil {
|
||||
return x.Level
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBSimpleHero) GetStar() int32 {
|
||||
if x != nil {
|
||||
return x.Star
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
type DBGveRouletteRecord struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
@ -480,7 +638,7 @@ type DBGveRouletteRecord struct {
|
||||
func (x *DBGveRouletteRecord) Reset() {
|
||||
*x = DBGveRouletteRecord{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_guildgve_guildgve_db_proto_msgTypes[6]
|
||||
mi := &file_guildgve_guildgve_db_proto_msgTypes[8]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -493,7 +651,7 @@ func (x *DBGveRouletteRecord) String() string {
|
||||
func (*DBGveRouletteRecord) ProtoMessage() {}
|
||||
|
||||
func (x *DBGveRouletteRecord) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_guildgve_guildgve_db_proto_msgTypes[6]
|
||||
mi := &file_guildgve_guildgve_db_proto_msgTypes[8]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -506,7 +664,7 @@ func (x *DBGveRouletteRecord) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use DBGveRouletteRecord.ProtoReflect.Descriptor instead.
|
||||
func (*DBGveRouletteRecord) Descriptor() ([]byte, []int) {
|
||||
return file_guildgve_guildgve_db_proto_rawDescGZIP(), []int{6}
|
||||
return file_guildgve_guildgve_db_proto_rawDescGZIP(), []int{8}
|
||||
}
|
||||
|
||||
func (x *DBGveRouletteRecord) GetUid() string {
|
||||
@ -570,19 +728,37 @@ var file_guildgve_guildgve_db_proto_rawDesc = []byte{
|
||||
0x64, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68,
|
||||
0x70, 0x12, 0x24, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28,
|
||||
0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x47, 0x76, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52,
|
||||
0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x69, 0x0a, 0x0b, 0x44, 0x42, 0x47, 0x76, 0x65,
|
||||
0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x6f, 0x72, 0x6d,
|
||||
0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x6f, 0x72,
|
||||
0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x61, 0x74, 0x69, 0x6e, 0x67,
|
||||
0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x72, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x12,
|
||||
0x0a, 0x04, 0x68, 0x61, 0x72, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x68, 0x61,
|
||||
0x72, 0x6d, 0x22, 0x4a, 0x0a, 0x13, 0x44, 0x42, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65,
|
||||
0x74, 0x74, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61,
|
||||
0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65,
|
||||
0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06,
|
||||
0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0xc3, 0x01, 0x0a, 0x0b, 0x44, 0x42, 0x47, 0x76,
|
||||
0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x21, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65,
|
||||
0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69,
|
||||
0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x24,
|
||||
0x0a, 0x0d, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18,
|
||||
0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x48, 0x65,
|
||||
0x72, 0x6f, 0x49, 0x64, 0x12, 0x2b, 0x0a, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f,
|
||||
0x6e, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x53, 0x69, 0x6d, 0x70,
|
||||
0x6c, 0x65, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f,
|
||||
0x6e, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28,
|
||||
0x05, 0x52, 0x06, 0x72, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x72,
|
||||
0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x68, 0x61, 0x72, 0x6d, 0x22, 0x72, 0x0a,
|
||||
0x0c, 0x44, 0x42, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x55, 0x73, 0x65, 0x72, 0x12, 0x10, 0x0a,
|
||||
0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12,
|
||||
0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
|
||||
0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x73,
|
||||
0x6b, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x6b, 0x69, 0x6e, 0x12,
|
||||
0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x73, 0x65,
|
||||
0x78, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c,
|
||||
0x76, 0x22, 0x50, 0x0a, 0x0c, 0x44, 0x42, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x48, 0x65, 0x72,
|
||||
0x6f, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||
0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76,
|
||||
0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12,
|
||||
0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73,
|
||||
0x74, 0x61, 0x72, 0x22, 0x4a, 0x0a, 0x13, 0x44, 0x42, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c,
|
||||
0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
|
||||
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05,
|
||||
0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73,
|
||||
0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42,
|
||||
0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
@ -597,7 +773,7 @@ func file_guildgve_guildgve_db_proto_rawDescGZIP() []byte {
|
||||
return file_guildgve_guildgve_db_proto_rawDescData
|
||||
}
|
||||
|
||||
var file_guildgve_guildgve_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
|
||||
var file_guildgve_guildgve_db_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
|
||||
var file_guildgve_guildgve_db_proto_goTypes = []interface{}{
|
||||
(*DBGuildGveBossConf)(nil), // 0: DBGuildGveBossConf
|
||||
(*DBGuildGve)(nil), // 1: DBGuildGve
|
||||
@ -605,19 +781,23 @@ var file_guildgve_guildgve_db_proto_goTypes = []interface{}{
|
||||
(*DBGuildRouletteRecord)(nil), // 3: DBGuildRouletteRecord
|
||||
(*DBGuildGveBoss)(nil), // 4: DBGuildGveBoss
|
||||
(*DBGveRecord)(nil), // 5: DBGveRecord
|
||||
(*DBGveRouletteRecord)(nil), // 6: DBGveRouletteRecord
|
||||
(*UserAssets)(nil), // 7: UserAssets
|
||||
(*DBSimpleUser)(nil), // 6: DBSimpleUser
|
||||
(*DBSimpleHero)(nil), // 7: DBSimpleHero
|
||||
(*DBGveRouletteRecord)(nil), // 8: DBGveRouletteRecord
|
||||
(*UserAssets)(nil), // 9: UserAssets
|
||||
}
|
||||
var file_guildgve_guildgve_db_proto_depIdxs = []int32{
|
||||
4, // 0: DBGuildGve.boos:type_name -> DBGuildGveBoss
|
||||
6, // 1: DBGuildRouletteRecord.roulette:type_name -> DBGveRouletteRecord
|
||||
8, // 1: DBGuildRouletteRecord.roulette:type_name -> DBGveRouletteRecord
|
||||
5, // 2: DBGuildGveBoss.record:type_name -> DBGveRecord
|
||||
7, // 3: DBGveRouletteRecord.award:type_name -> UserAssets
|
||||
4, // [4:4] is the sub-list for method output_type
|
||||
4, // [4:4] is the sub-list for method input_type
|
||||
4, // [4:4] is the sub-list for extension type_name
|
||||
4, // [4:4] is the sub-list for extension extendee
|
||||
0, // [0:4] is the sub-list for field type_name
|
||||
6, // 3: DBGveRecord.user:type_name -> DBSimpleUser
|
||||
7, // 4: DBGveRecord.formation:type_name -> DBSimpleHero
|
||||
9, // 5: DBGveRouletteRecord.award:type_name -> UserAssets
|
||||
6, // [6:6] is the sub-list for method output_type
|
||||
6, // [6:6] is the sub-list for method input_type
|
||||
6, // [6:6] is the sub-list for extension type_name
|
||||
6, // [6:6] is the sub-list for extension extendee
|
||||
0, // [0:6] is the sub-list for field type_name
|
||||
}
|
||||
|
||||
func init() { file_guildgve_guildgve_db_proto_init() }
|
||||
@ -700,6 +880,30 @@ func file_guildgve_guildgve_db_proto_init() {
|
||||
}
|
||||
}
|
||||
file_guildgve_guildgve_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*DBSimpleUser); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_guildgve_guildgve_db_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*DBSimpleHero); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_guildgve_guildgve_db_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*DBGveRouletteRecord); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
@ -718,7 +922,7 @@ func file_guildgve_guildgve_db_proto_init() {
|
||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||
RawDescriptor: file_guildgve_guildgve_db_proto_rawDesc,
|
||||
NumEnums: 0,
|
||||
NumMessages: 7,
|
||||
NumMessages: 9,
|
||||
NumExtensions: 0,
|
||||
NumServices: 0,
|
||||
},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user