Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
ca8d0feb99
@ -1,6 +1,7 @@
|
||||
[
|
||||
{
|
||||
"Id": 1,
|
||||
<<<<<<< HEAD
|
||||
"GroupId": 300001,
|
||||
"buffID": 770076113,
|
||||
"GroupNum": 3,
|
||||
@ -30,34 +31,87 @@
|
||||
"GroupNum": 1,
|
||||
"BuffWt": 50,
|
||||
"TypeWt": 50
|
||||
},
|
||||
{
|
||||
"Id": 5,
|
||||
=======
|
||||
"GroupId": 100001,
|
||||
"buffID": 125004311,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
"TypeWt": 75
|
||||
"TypeWt": 600
|
||||
},
|
||||
{
|
||||
"Id": 6,
|
||||
"Id": 2,
|
||||
"GroupId": 100001,
|
||||
"buffID": 125004312,
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
"TypeWt": 75
|
||||
"TypeWt": 600
|
||||
},
|
||||
{
|
||||
"Id": 7,
|
||||
"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,
|
||||
@ -97,98 +151,185 @@
|
||||
},
|
||||
{
|
||||
"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
|
||||
},
|
||||
{
|
||||
@ -2750,5 +2891,8 @@
|
||||
"GroupNum": 3,
|
||||
"BuffWt": 50,
|
||||
"TypeWt": 75
|
||||
=======
|
||||
"TypeWt": 600
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
]
|
@ -1,7 +1,10 @@
|
||||
[
|
||||
{
|
||||
"BattleStageId": 110101,
|
||||
<<<<<<< HEAD
|
||||
"EnemyShowIcon": 0,
|
||||
=======
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Atk": 0,
|
||||
"Hp": 0,
|
||||
"Def": 0,
|
||||
@ -10,12 +13,19 @@
|
||||
"BattleReadyID": 118,
|
||||
"FormatList": [
|
||||
101011
|
||||
<<<<<<< HEAD
|
||||
],
|
||||
"RewardLottery": 0
|
||||
},
|
||||
{
|
||||
"BattleStageId": 110102,
|
||||
"EnemyShowIcon": 0,
|
||||
=======
|
||||
]
|
||||
},
|
||||
{
|
||||
"BattleStageId": 110102,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Atk": 0,
|
||||
"Hp": 0,
|
||||
"Def": 0,
|
||||
@ -24,12 +34,19 @@
|
||||
"BattleReadyID": 118,
|
||||
"FormatList": [
|
||||
101012
|
||||
<<<<<<< HEAD
|
||||
],
|
||||
"RewardLottery": 0
|
||||
},
|
||||
{
|
||||
"BattleStageId": 110103,
|
||||
"EnemyShowIcon": 0,
|
||||
=======
|
||||
]
|
||||
},
|
||||
{
|
||||
"BattleStageId": 110103,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Atk": 0,
|
||||
"Hp": 0,
|
||||
"Def": 0,
|
||||
@ -38,12 +55,19 @@
|
||||
"BattleReadyID": 118,
|
||||
"FormatList": [
|
||||
101013
|
||||
<<<<<<< HEAD
|
||||
],
|
||||
"RewardLottery": 0
|
||||
},
|
||||
{
|
||||
"BattleStageId": 110104,
|
||||
"EnemyShowIcon": 0,
|
||||
=======
|
||||
]
|
||||
},
|
||||
{
|
||||
"BattleStageId": 110104,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Atk": 0,
|
||||
"Hp": 0,
|
||||
"Def": 0,
|
||||
@ -52,12 +76,19 @@
|
||||
"BattleReadyID": 118,
|
||||
"FormatList": [
|
||||
101021
|
||||
<<<<<<< HEAD
|
||||
],
|
||||
"RewardLottery": 0
|
||||
},
|
||||
{
|
||||
"BattleStageId": 110105,
|
||||
"EnemyShowIcon": 0,
|
||||
=======
|
||||
]
|
||||
},
|
||||
{
|
||||
"BattleStageId": 110105,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Atk": 0,
|
||||
"Hp": 0,
|
||||
"Def": 0,
|
||||
@ -66,6 +97,7 @@
|
||||
"BattleReadyID": 118,
|
||||
"FormatList": [
|
||||
101022
|
||||
<<<<<<< HEAD
|
||||
],
|
||||
"RewardLottery": 0
|
||||
},
|
||||
@ -82,5 +114,8 @@
|
||||
101022
|
||||
],
|
||||
"RewardLottery": 0
|
||||
=======
|
||||
]
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
]
|
@ -1,6 +1,10 @@
|
||||
[
|
||||
{
|
||||
"BuffId": 125004311,
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"BuffGroupId": 1001,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Type": 1,
|
||||
"SkillId": 125004311,
|
||||
"BuffLevel": 1,
|
||||
@ -8,6 +12,7 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_1",
|
||||
<<<<<<< HEAD
|
||||
"text": "愤怒笼罩了全身,谁都不能破坏坦克的窗户!"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -19,10 +24,27 @@
|
||||
"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,
|
||||
@ -30,6 +52,7 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_2",
|
||||
<<<<<<< HEAD
|
||||
"text": "愤怒笼罩了全身,谁都不能破坏坦克的窗户!"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -41,10 +64,27 @@
|
||||
"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,
|
||||
@ -52,6 +92,7 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_3",
|
||||
<<<<<<< HEAD
|
||||
"text": "食物即将被抢走,全身的血液都在沸腾!像猛兽一样冲出去!"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -63,10 +104,27 @@
|
||||
"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,
|
||||
@ -74,6 +132,7 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_4",
|
||||
<<<<<<< HEAD
|
||||
"text": "食物即将被抢走,全身的血液都在沸腾!像猛兽一样冲出去!"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -85,10 +144,27 @@
|
||||
"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,
|
||||
@ -96,6 +172,7 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_5",
|
||||
<<<<<<< HEAD
|
||||
"text": "珊迪紧咬牙关发动马力,所过之处寸草不生!"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -107,10 +184,27 @@
|
||||
"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,
|
||||
@ -118,6 +212,7 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_6",
|
||||
<<<<<<< HEAD
|
||||
"text": "珊迪紧咬牙关发动马力,所过之处寸草不生!"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -129,10 +224,27 @@
|
||||
"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,
|
||||
@ -140,6 +252,7 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_7",
|
||||
<<<<<<< HEAD
|
||||
"text": "盖对陆冲滑板进行了改良,在不平缓的坡地上依旧一往无前!"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -151,10 +264,27 @@
|
||||
"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,
|
||||
@ -162,6 +292,7 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_8",
|
||||
<<<<<<< HEAD
|
||||
"text": "盖对陆冲滑板进行了改良,在不平缓的坡地上依旧一往无前!"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -173,10 +304,27 @@
|
||||
"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,
|
||||
@ -184,6 +332,7 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_9",
|
||||
<<<<<<< HEAD
|
||||
"text": "懒惰就会成为野兽的腹中餐,一想到此,瓜哥又做了二百个俯卧撑。"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -195,10 +344,27 @@
|
||||
"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,
|
||||
@ -206,6 +372,7 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_10",
|
||||
<<<<<<< HEAD
|
||||
"text": "懒惰就会成为野兽的腹中餐,一想到此,瓜哥又做了二百个俯卧撑。"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -217,10 +384,27 @@
|
||||
"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,
|
||||
@ -228,6 +412,7 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_11",
|
||||
<<<<<<< HEAD
|
||||
"text": "家人是瓜哥心中最重要的东西,就算牺牲自己也在所不惜。"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -239,10 +424,27 @@
|
||||
"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,
|
||||
@ -250,6 +452,7 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_12",
|
||||
<<<<<<< HEAD
|
||||
"text": "家人是瓜哥心中最重要的东西,就算牺牲自己也在所不惜。"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -261,10 +464,27 @@
|
||||
"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,
|
||||
@ -272,6 +492,7 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_13",
|
||||
<<<<<<< HEAD
|
||||
"text": "绝望中暴发的强大力量!险境激发了瓜哥隐藏的潜能,让瓜哥完成了自我的突破。"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -283,10 +504,27 @@
|
||||
"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,
|
||||
@ -294,6 +532,7 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_14",
|
||||
<<<<<<< HEAD
|
||||
"text": "绝望中暴发的强大力量!险境激发了瓜哥隐藏的潜能,让瓜哥完成了自我的突破。"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -305,10 +544,27 @@
|
||||
"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,
|
||||
@ -316,6 +572,7 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_15",
|
||||
<<<<<<< HEAD
|
||||
"text": "绝处逢生,只要一家人都在,就决不放弃。"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -327,10 +584,27 @@
|
||||
"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,
|
||||
@ -338,6 +612,7 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_16",
|
||||
<<<<<<< HEAD
|
||||
"text": "绝处逢生,只要一家人都在,就决不放弃。"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -349,10 +624,27 @@
|
||||
"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,
|
||||
@ -360,6 +652,7 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_17",
|
||||
<<<<<<< HEAD
|
||||
"text": "珊迪跑动时只剩残影掠过,猎物还没看清就倒下了。"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -371,10 +664,27 @@
|
||||
"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,
|
||||
@ -382,6 +692,7 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_18",
|
||||
<<<<<<< HEAD
|
||||
"text": "珊迪跑动时只剩残影掠过,猎物还没看清就倒下了。"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -393,10 +704,27 @@
|
||||
"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,
|
||||
@ -404,6 +732,7 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_19",
|
||||
<<<<<<< HEAD
|
||||
"text": "鳄鲨已经饿了!发动偷袭时非常猛烈,猎手和猎物只在一瞬之间。"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -415,10 +744,27 @@
|
||||
"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,
|
||||
@ -426,6 +772,7 @@
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_20",
|
||||
<<<<<<< HEAD
|
||||
"text": "鳄鲨已经饿了!发动偷袭时非常猛烈,猎手和猎物只在一瞬之间。"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
@ -4045,6 +4392,19 @@
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 0
|
||||
=======
|
||||
"text": "描述描述描述20"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 29
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 29
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
}
|
||||
}
|
||||
]
|
@ -96,11 +96,16 @@
|
||||
"probability": 0
|
||||
},
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
"EventId": 25100001,
|
||||
=======
|
||||
"EventId": 25,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"EventTitle": {
|
||||
"key": "stonehenge_eventconfig_EventTitle_7",
|
||||
"text": "随机符文"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"EventType": 25,
|
||||
"EventResource": "",
|
||||
"Value1": 100001,
|
||||
@ -120,6 +125,11 @@
|
||||
"EventType": 28,
|
||||
"EventResource": "",
|
||||
"Value1": 110501,
|
||||
=======
|
||||
"EventType": 0,
|
||||
"EventResource": "",
|
||||
"Value1": 25,
|
||||
>>>>>>> 91f08811039ec515828a9916e93840070bffa1b6
|
||||
"Value2": 0,
|
||||
"Value3": 0,
|
||||
"Value4": 0,
|
||||
|
@ -1,42 +1,73 @@
|
||||
[
|
||||
{
|
||||
<<<<<<< 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,
|
||||
@ -57,10 +88,17 @@
|
||||
"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
|
||||
},
|
||||
{
|
||||
@ -72,10 +110,40 @@
|
||||
"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
|
||||
},
|
||||
@ -88,10 +156,25 @@
|
||||
"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
|
||||
},
|
||||
@ -110,11 +193,19 @@
|
||||
"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": "",
|
||||
|
@ -1,276 +0,0 @@
|
||||
[
|
||||
{
|
||||
"BuffId": 143006310,
|
||||
"BuffGroupId": 1001,
|
||||
"Type": 1,
|
||||
"SkillId": 143006311,
|
||||
"BuffLevel": 1,
|
||||
"Quality": 1,
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_1",
|
||||
"text": "描述描述描述1"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 10
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 10
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 125004310,
|
||||
"BuffGroupId": 1001,
|
||||
"Type": 1,
|
||||
"SkillId": 125004311,
|
||||
"BuffLevel": 2,
|
||||
"Quality": 1,
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_2",
|
||||
"text": "描述描述描述2"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 11
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 135006210,
|
||||
"BuffGroupId": 1002,
|
||||
"Type": 2,
|
||||
"SkillId": 135006211,
|
||||
"BuffLevel": 1,
|
||||
"Quality": 2,
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_3",
|
||||
"text": "描述描述描述3"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 12
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 12
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 135006310,
|
||||
"BuffGroupId": 1002,
|
||||
"Type": 2,
|
||||
"SkillId": 135006311,
|
||||
"BuffLevel": 2,
|
||||
"Quality": 2,
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_4",
|
||||
"text": "描述描述描述4"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 13
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 13
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 144004310,
|
||||
"BuffGroupId": 1003,
|
||||
"Type": 3,
|
||||
"SkillId": 144004311,
|
||||
"BuffLevel": 1,
|
||||
"Quality": 1,
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_5",
|
||||
"text": "描述描述描述5"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 14
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 14
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 124006310,
|
||||
"BuffGroupId": 1003,
|
||||
"Type": 3,
|
||||
"SkillId": 124006311,
|
||||
"BuffLevel": 2,
|
||||
"Quality": 1,
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_6",
|
||||
"text": "描述描述描述6"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 15
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 15
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 144002310,
|
||||
"BuffGroupId": 1004,
|
||||
"Type": 4,
|
||||
"SkillId": 144002311,
|
||||
"BuffLevel": 1,
|
||||
"Quality": 2,
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_7",
|
||||
"text": "描述描述描述7"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 16
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 16
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 151513210,
|
||||
"BuffGroupId": 1004,
|
||||
"Type": 4,
|
||||
"SkillId": 151513211,
|
||||
"BuffLevel": 2,
|
||||
"Quality": 2,
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_8",
|
||||
"text": "描述描述描述8"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 17
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 17
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 143002310,
|
||||
"BuffGroupId": 1005,
|
||||
"Type": 4,
|
||||
"SkillId": 143002311,
|
||||
"BuffLevel": 1,
|
||||
"Quality": 3,
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_9",
|
||||
"text": "描述描述描述9"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 18
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 18
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 115005310,
|
||||
"BuffGroupId": 1005,
|
||||
"Type": 4,
|
||||
"SkillId": 115005311,
|
||||
"BuffLevel": 2,
|
||||
"Quality": 3,
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_10",
|
||||
"text": "描述描述描述10"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 19
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "atn",
|
||||
"t": "10000002",
|
||||
"n": 19
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 143002311,
|
||||
"BuffGroupId": 1005,
|
||||
"Type": 1,
|
||||
"BuffLevel": 1,
|
||||
"Quality": 3,
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_9",
|
||||
"text": "描述描述描述9"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 8
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 9
|
||||
}
|
||||
},
|
||||
{
|
||||
"BuffId": 115005311,
|
||||
"BuffGroupId": 1005,
|
||||
"Type": 1,
|
||||
"BuffLevel": 2,
|
||||
"Quality": 3,
|
||||
"BuffIcon": "",
|
||||
"BuffStory": {
|
||||
"key": "stonehenge_buffconfig_BuffStory_10",
|
||||
"text": "描述描述描述10"
|
||||
},
|
||||
"BuffUpgradeCost": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 9
|
||||
},
|
||||
"BuffSell": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 10
|
||||
}
|
||||
}
|
||||
]
|
@ -1,114 +0,0 @@
|
||||
[
|
||||
{
|
||||
"EventId": 16010101,
|
||||
"EventTitle": {
|
||||
"key": "stonehenge_eventconfig_EventTitle_1",
|
||||
"text": "捡垃圾"
|
||||
},
|
||||
"EventType": 16,
|
||||
"EventResource": "Treasure",
|
||||
"Value1": 21160001,
|
||||
"Value2": 0,
|
||||
"Value3": 0,
|
||||
"Value4": 0,
|
||||
"CostItem": [],
|
||||
"PostEvent": 0,
|
||||
"probability": 0
|
||||
},
|
||||
{
|
||||
"EventId": 14110101,
|
||||
"EventTitle": {
|
||||
"key": "stonehenge_eventconfig_EventTitle_2",
|
||||
"text": "战斗"
|
||||
},
|
||||
"EventType": 14,
|
||||
"EventResource": "51004",
|
||||
"Value1": 110101,
|
||||
"Value2": 0,
|
||||
"Value3": 0,
|
||||
"Value4": 0,
|
||||
"CostItem": [],
|
||||
"PostEvent": 0,
|
||||
"probability": 0
|
||||
},
|
||||
{
|
||||
"EventId": 14110102,
|
||||
"EventTitle": {
|
||||
"key": "stonehenge_eventconfig_EventTitle_3",
|
||||
"text": "战斗"
|
||||
},
|
||||
"EventType": 14,
|
||||
"EventResource": "51002",
|
||||
"Value1": 110102,
|
||||
"Value2": 0,
|
||||
"Value3": 0,
|
||||
"Value4": 0,
|
||||
"CostItem": [],
|
||||
"PostEvent": 0,
|
||||
"probability": 0
|
||||
},
|
||||
{
|
||||
"EventId": 14110103,
|
||||
"EventTitle": {
|
||||
"key": "stonehenge_eventconfig_EventTitle_4",
|
||||
"text": "战斗"
|
||||
},
|
||||
"EventType": 14,
|
||||
"EventResource": "51003",
|
||||
"Value1": 110103,
|
||||
"Value2": 0,
|
||||
"Value3": 0,
|
||||
"Value4": 0,
|
||||
"CostItem": [],
|
||||
"PostEvent": 0,
|
||||
"probability": 0
|
||||
},
|
||||
{
|
||||
"EventId": 14110104,
|
||||
"EventTitle": {
|
||||
"key": "stonehenge_eventconfig_EventTitle_5",
|
||||
"text": "战斗"
|
||||
},
|
||||
"EventType": 14,
|
||||
"EventResource": "51005",
|
||||
"Value1": 110104,
|
||||
"Value2": 0,
|
||||
"Value3": 0,
|
||||
"Value4": 0,
|
||||
"CostItem": [],
|
||||
"PostEvent": 0,
|
||||
"probability": 0
|
||||
},
|
||||
{
|
||||
"EventId": 14110105,
|
||||
"EventTitle": {
|
||||
"key": "stonehenge_eventconfig_EventTitle_6",
|
||||
"text": "战斗"
|
||||
},
|
||||
"EventType": 14,
|
||||
"EventResource": "51001",
|
||||
"Value1": 110105,
|
||||
"Value2": 0,
|
||||
"Value3": 0,
|
||||
"Value4": 0,
|
||||
"CostItem": [],
|
||||
"PostEvent": 0,
|
||||
"probability": 0
|
||||
},
|
||||
{
|
||||
"EventId": 25,
|
||||
"EventTitle": {
|
||||
"key": "stonehenge_eventconfig_EventTitle_7",
|
||||
"text": "随机符文"
|
||||
},
|
||||
"EventType": 0,
|
||||
"EventResource": "",
|
||||
"Value1": 25,
|
||||
"Value2": 0,
|
||||
"Value3": 0,
|
||||
"Value4": 0,
|
||||
"CostItem": [],
|
||||
"PostEvent": 0,
|
||||
"probability": 0
|
||||
}
|
||||
]
|
@ -1,114 +0,0 @@
|
||||
[
|
||||
{
|
||||
"RoomId": 100001,
|
||||
"RoomName": {
|
||||
"key": "stonehenge_roomconfig_RoomName_1",
|
||||
"text": "战斗"
|
||||
},
|
||||
"SceneName": "scenesfight_secret_realm_01",
|
||||
"PortalName": "",
|
||||
"EventrewardGroup": 1001001,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 0,
|
||||
"EventTreasureGroup": 0,
|
||||
"EventStoreGroup": 0,
|
||||
"BossEvent": 0,
|
||||
"Condition": 0
|
||||
},
|
||||
{
|
||||
"RoomId": 100002,
|
||||
"RoomName": {
|
||||
"key": "stonehenge_roomconfig_RoomName_2",
|
||||
"text": "战斗"
|
||||
},
|
||||
"SceneName": "scenesfight_secret_realm_01",
|
||||
"PortalName": "",
|
||||
"EventrewardGroup": 1001001,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 0,
|
||||
"EventTreasureGroup": 0,
|
||||
"EventStoreGroup": 0,
|
||||
"BossEvent": 0,
|
||||
"Condition": 0
|
||||
},
|
||||
{
|
||||
"RoomId": 100003,
|
||||
"RoomName": {
|
||||
"key": "stonehenge_roomconfig_RoomName_3",
|
||||
"text": "战斗"
|
||||
},
|
||||
"SceneName": "scenesfight_secret_realm_01",
|
||||
"PortalName": "",
|
||||
"EventrewardGroup": 1001001,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 0,
|
||||
"EventTreasureGroup": 0,
|
||||
"EventStoreGroup": 0,
|
||||
"BossEvent": 0,
|
||||
"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,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 0,
|
||||
"EventTreasureGroup": 0,
|
||||
"EventStoreGroup": 0,
|
||||
"BossEvent": 0,
|
||||
"Condition": 0
|
||||
},
|
||||
{
|
||||
"RoomId": 100006,
|
||||
"RoomName": {
|
||||
"key": "stonehenge_roomconfig_RoomName_6",
|
||||
"text": "剧情"
|
||||
},
|
||||
"SceneName": "",
|
||||
"PortalName": "",
|
||||
"EventrewardGroup": 1001001,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 0,
|
||||
"EventTreasureGroup": 0,
|
||||
"EventStoreGroup": 0,
|
||||
"BossEvent": 0,
|
||||
"Condition": 0
|
||||
},
|
||||
{
|
||||
"RoomId": 99999,
|
||||
"RoomName": {
|
||||
"key": "stonehenge_roomconfig_RoomName_7",
|
||||
"text": "结算"
|
||||
},
|
||||
"SceneName": "",
|
||||
"PortalName": "",
|
||||
"EventrewardGroup": 0,
|
||||
"EventBattleGroup": 0,
|
||||
"EventStoryNpcGroup": 0,
|
||||
"EventTreasureGroup": 0,
|
||||
"EventStoreGroup": 0,
|
||||
"BossEvent": 0,
|
||||
"Condition": 0
|
||||
}
|
||||
]
|
@ -1,140 +0,0 @@
|
||||
[
|
||||
{
|
||||
"Id": 1,
|
||||
"StageId": 1001,
|
||||
"PreviouStage": 0,
|
||||
"StageName": {
|
||||
"key": "stonehenge_stageconfig_StageName_1",
|
||||
"text": "石阵1"
|
||||
},
|
||||
"RoomId": 1,
|
||||
"RoomGroup": 100001,
|
||||
"PortalGroup": 100002,
|
||||
"rewardpreview": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"TreasurePreview": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"FirstReward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
"TalentItem": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
},
|
||||
{
|
||||
"Id": 4,
|
||||
"StageId": 1001,
|
||||
"PreviouStage": 0,
|
||||
"StageName": {
|
||||
"key": "stonehenge_stageconfig_StageName_4",
|
||||
"text": "石阵4"
|
||||
},
|
||||
"RoomId": 4,
|
||||
"RoomGroup": 0,
|
||||
"PortalGroup": 100003,
|
||||
"rewardpreview": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 2
|
||||
}
|
||||
],
|
||||
"TreasurePreview": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 2
|
||||
}
|
||||
],
|
||||
"FirstReward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 2
|
||||
}
|
||||
],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 2
|
||||
},
|
||||
"TalentItem": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 2
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
},
|
||||
{
|
||||
"Id": 5,
|
||||
"StageId": 1001,
|
||||
"PreviouStage": 0,
|
||||
"StageName": {
|
||||
"key": "stonehenge_stageconfig_StageName_5",
|
||||
"text": "石阵5"
|
||||
},
|
||||
"RoomId": 5,
|
||||
"RoomGroup": 0,
|
||||
"PortalGroup": 99999,
|
||||
"rewardpreview": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 3
|
||||
}
|
||||
],
|
||||
"TreasurePreview": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 3
|
||||
}
|
||||
],
|
||||
"FirstReward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 3
|
||||
}
|
||||
],
|
||||
"WeeklyPointPreview": 0,
|
||||
"WeeklyPoint": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 3
|
||||
},
|
||||
"TalentItem": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 3
|
||||
},
|
||||
"ReferenceLevel": 0,
|
||||
"StageValue": 0
|
||||
}
|
||||
]
|
@ -25,9 +25,9 @@ func (this *apiComp) EnterLevel(session comm.IUserSession, req *pb.StonehengeEnt
|
||||
update map[string]interface{}
|
||||
heros []*pb.DBHero
|
||||
portal int32 // 生成传送门 构造房间数据
|
||||
confStage *cfg.GameStroneStageData
|
||||
confStage *cfg.GameStoneStageData
|
||||
roomlotteryConf *cfg.GameRoomlotteryData
|
||||
roomConf *cfg.GameStroneRoomData
|
||||
roomConf *cfg.GameStoneRoomData
|
||||
szBuff []int32
|
||||
err error
|
||||
)
|
||||
|
@ -22,10 +22,10 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
|
||||
var (
|
||||
stone *pb.DBStonehenge
|
||||
update map[string]interface{}
|
||||
roomConf *cfg.GameStroneRoomData
|
||||
roomConf *cfg.GameStoneRoomData
|
||||
err error
|
||||
newEvent int32 // 是否有新的事件
|
||||
eventConf *cfg.GameStroneEventData
|
||||
eventConf *cfg.GameStoneEventData
|
||||
)
|
||||
update = make(map[string]interface{})
|
||||
if errdata = this.EventCheck(session, req); errdata != nil {
|
||||
|
@ -15,10 +15,10 @@ const (
|
||||
game_bufflottery = "game_bufflottery.json"
|
||||
game_eventlottery = "game_eventlottery.json"
|
||||
game_roomlottery = "game_roomlottery.json"
|
||||
game_roomconf = "game_stroneroom.json"
|
||||
game_stageconf = "game_stronestage.json"
|
||||
game_buffconf = "game_stronebuff.json"
|
||||
game_eventconf = "game_stroneevent.json"
|
||||
game_roomconf = "game_stoneroom.json"
|
||||
game_stageconf = "game_stonestage.json"
|
||||
game_buffconf = "game_stonebuff.json"
|
||||
game_eventconf = "game_stoneevent.json"
|
||||
)
|
||||
|
||||
///背包配置管理组件
|
||||
@ -27,7 +27,7 @@ type configureComp struct {
|
||||
module *Stonehenge
|
||||
hlock sync.RWMutex
|
||||
// stronestage
|
||||
stage map[int64]*cfg.GameStroneStageData
|
||||
stage map[int64]*cfg.GameStoneStageData
|
||||
|
||||
// buff
|
||||
buff map[int32]map[int32]struct{} // key buff 类型 value buffid
|
||||
@ -60,18 +60,7 @@ type configureComp struct {
|
||||
SNumE map[int64]int32 // 小组产出数量
|
||||
|
||||
// buff 随机
|
||||
_group map[int64][]int32 // key 小组ID value cid
|
||||
// 类型为1 的数据 该大组中的小组为权重掉落,必定从N个小组中随机出1个小组
|
||||
_lotteryType1 map[int32][]int32 // key 大组ID value cid
|
||||
// 类型为2 的数据 有多个小组ID
|
||||
_lotteryType2 map[int32][]int32 // key 大组ID value 小组ID
|
||||
// 小组类型为1
|
||||
_groupType1 map[int64][]int32 //value cid
|
||||
// 小组类型为2
|
||||
_groupType2 map[int64][]int32 //value cid
|
||||
Btype map[int32]int32
|
||||
Stype map[int64]int32 // subtype
|
||||
SNum map[int64]int32 // 小组产出数量
|
||||
buffLottery map[int32]map[int32]*cfg.GameBufflotteryData
|
||||
}
|
||||
|
||||
//组件初始化接口
|
||||
@ -87,14 +76,23 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
|
||||
err = this.LoadConfigure(game_roomlottery, cfg.NewGameRoomlottery)
|
||||
configure.RegisterConfigure(game_roomlottery, cfg.NewGameRoomlottery, this.LoadRoomGroupData)
|
||||
|
||||
err = this.LoadConfigure(game_stageconf, cfg.NewGameStroneStage)
|
||||
err = this.LoadConfigure(game_buffconf, cfg.NewGameStroneBuff)
|
||||
err = this.LoadConfigure(game_eventconf, cfg.NewGameStroneEvent)
|
||||
err = this.LoadConfigure(game_roomconf, cfg.NewGameStroneRoom)
|
||||
err = this.LoadConfigure(game_stageconf, cfg.NewGameStoneStage)
|
||||
err = this.LoadConfigure(game_buffconf, cfg.NewGameStoneBuff)
|
||||
err = this.LoadConfigure(game_eventconf, cfg.NewGameStoneEvent)
|
||||
err = this.LoadConfigure(game_roomconf, cfg.NewGameStoneRoom)
|
||||
|
||||
configure.RegisterConfigure(game_stageconf, cfg.NewGameStroneStage, this.LoadGameStroneStage)
|
||||
configure.RegisterConfigure(game_buffconf, cfg.NewGameStroneBuff, this.LoadGameStroneBuff)
|
||||
configure.RegisterConfigure(game_stageconf, cfg.NewGameStoneStage, this.LoadGameStoneStage)
|
||||
configure.RegisterConfigure(game_buffconf, cfg.NewGameStoneBuff, this.LoadGameStoneBuff)
|
||||
|
||||
// sz := make(map[int32]struct{})
|
||||
// sz[125004312] = struct{}{}
|
||||
// sz[135006211] = struct{}{}
|
||||
// sz[135006212] = struct{}{}
|
||||
// sz[135006312] = struct{}{}
|
||||
// sz[144004311] = struct{}{}
|
||||
// sz[144004312] = struct{}{}
|
||||
// sz[124006311] = struct{}{}
|
||||
// this.GetBuffGroupDataByLottery(100001, 1, sz)
|
||||
return
|
||||
}
|
||||
|
||||
@ -458,52 +456,23 @@ func (this *configureComp) GetRoomGroupDataByLottery(lotteryId int32) (buff []in
|
||||
|
||||
func (this *configureComp) LoadBUffGroupData() {
|
||||
if v, err := this.GetConfigure(game_bufflottery); err == nil {
|
||||
this.hlock.Lock()
|
||||
defer this.hlock.Unlock()
|
||||
this.buffLottery = make(map[int32]map[int32]*cfg.GameBufflotteryData, 0)
|
||||
if configure, ok := v.(*cfg.GameBufflottery); ok {
|
||||
this.hlock.Lock()
|
||||
defer this.hlock.Unlock()
|
||||
this._group = make(map[int64][]int32, 0)
|
||||
this._lotteryType1 = make(map[int32][]int32, 0)
|
||||
this._lotteryType2 = make(map[int32][]int32, 0)
|
||||
this._groupType1 = make(map[int64][]int32, 0)
|
||||
this._groupType2 = make(map[int64][]int32, 0)
|
||||
this.Btype = make(map[int32]int32, 0)
|
||||
this.Stype = make(map[int64]int32, 0)
|
||||
this.SNum = make(map[int64]int32, 0)
|
||||
|
||||
for _, value := range configure.GetDataList() {
|
||||
|
||||
key := int64(value.GroupId)<<31 + int64(value.SubGroupId)
|
||||
this._group[key] = append(this._group[key], value.Id)
|
||||
|
||||
if _, ok := this.Btype[value.GroupId]; !ok {
|
||||
this.Btype[value.GroupId] = value.GroupType
|
||||
}
|
||||
|
||||
if _, ok := this.Stype[key]; !ok {
|
||||
this.Stype[key] = value.SubGroupType
|
||||
}
|
||||
if _, ok := this.SNum[key]; !ok {
|
||||
this.SNum[key] = value.SubGroupNum
|
||||
}
|
||||
if this.Btype[value.GroupId] == 1 {
|
||||
this._lotteryType1[value.GroupId] = append(this._lotteryType1[value.GroupId], value.Id)
|
||||
} else if this.Btype[value.GroupId] == 2 {
|
||||
this._lotteryType2[value.GroupId] = append(this._lotteryType2[value.GroupId], value.Id)
|
||||
}
|
||||
|
||||
if this.Stype[key] == 1 { // 小组ID为1
|
||||
this._groupType1[key] = append(this._groupType1[key], value.Id)
|
||||
} else if this.Stype[key] == 2 {
|
||||
this._groupType2[key] = append(this._groupType2[key], value.Id)
|
||||
for _, v := range configure.GetDataList() {
|
||||
if _, ok := this.buffLottery[v.GroupId]; !ok {
|
||||
this.buffLottery[v.GroupId] = make(map[int32]*cfg.GameBufflotteryData)
|
||||
}
|
||||
this.buffLottery[v.GroupId][v.BuffID] = v
|
||||
}
|
||||
return
|
||||
}
|
||||
} else {
|
||||
log.Errorf("get NewGameBufflottery conf err:%v", err)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func (this *configureComp) GetLotterConfById(id int32) (data *cfg.GameBufflotteryData) {
|
||||
if v, err := this.GetConfigure(game_bufflottery); err == nil {
|
||||
if configure, ok := v.(*cfg.GameBufflottery); ok {
|
||||
@ -514,151 +483,51 @@ func (this *configureComp) GetLotterConfById(id int32) (data *cfg.GameBufflotter
|
||||
}
|
||||
|
||||
// 实际掉落逻辑 (传入 掉落组ID vip等级 玩家等级 返回获得的道具)
|
||||
func (this *configureComp) GetBuffGroupDataByLottery(lotteryId int32, addType int32) (buff []int32) {
|
||||
func (this *configureComp) GetBuffGroupDataByLottery(lotteryId int32, addType int32, ownerbuff map[int32]struct{}) (buff []int32) {
|
||||
var (
|
||||
num int32
|
||||
szW []int32
|
||||
curWt int32 // 是否增加权重
|
||||
sz []*cfg.GameBufflotteryData
|
||||
)
|
||||
|
||||
if _, ok := this._lotteryType1[lotteryId]; !ok {
|
||||
if _, ok := this._lotteryType2[lotteryId]; !ok {
|
||||
fmt.Printf("not found config lotterId:%d", lotteryId)
|
||||
return
|
||||
}
|
||||
}
|
||||
// 优先校验大组ID 的类型
|
||||
if this.Btype[lotteryId] == 1 { // 该大组中的小组为权重掉落,必定从N个小组中随机出1个小组
|
||||
var (
|
||||
szW []int32 // 权重数组
|
||||
szID []int32 // 小组ID 数组
|
||||
groupID int32
|
||||
gourp map[int32]int32 // key 小组ID value 权重
|
||||
)
|
||||
|
||||
gourp = make(map[int32]int32, 0)
|
||||
// 随机小组id
|
||||
for _, v := range this._lotteryType1[lotteryId] {
|
||||
if _data := this.GetLotterConfById(v); _data != nil {
|
||||
if _, ok := gourp[_data.SubGroupId]; !ok {
|
||||
gourp[_data.SubGroupId] = _data.SubGroupWt // 小组ID 权重赋值
|
||||
szW = append(szW, _data.SubGroupWt)
|
||||
szID = append(szID, _data.SubGroupId)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
groupID = szID[comm.GetRandW(szW)] // 获得小组ID
|
||||
//fmt.Printf("大组类型为1的,获得小组ID :%d,dropID:%d", groupID, lotteryId)
|
||||
key := int64(lotteryId)<<31 + int64(groupID)
|
||||
// 小组ID 类型判断
|
||||
if this.Stype[key] == 1 { // 该小组的道具为权重掉落,必定从N个道具中随机出1个道具
|
||||
for i := 0; i < int(this.SNum[key]); i++ {
|
||||
szW = make([]int32, 0)
|
||||
szID = make([]int32, 0)
|
||||
gourp = make(map[int32]int32, 0)
|
||||
for _, v := range this._groupType1[key] {
|
||||
if _data := this.GetLotterConfById(v); _data != nil { // 权重赋值
|
||||
curWt := _data.BuffWt
|
||||
if _, ok := gourp[_data.SubGroupId]; !ok {
|
||||
if buf, ok := this.buff[addType]; ok {
|
||||
if _, ok := buf[_data.BuffID]; ok {
|
||||
curWt += _data.TypeWt
|
||||
}
|
||||
}
|
||||
szW = append(szW, curWt)
|
||||
szID = append(szID, _data.Id)
|
||||
if v, ok := this.buffLottery[lotteryId]; ok {
|
||||
for i := 1; ; i++ {
|
||||
for k, v1 := range v { // k buffID v1 cfg.GameBufflotteryData
|
||||
curWt = 0
|
||||
if _, ok := ownerbuff[k]; !ok {
|
||||
sz = append(sz, v1)
|
||||
if v2, ok := this.buff[addType]; ok {
|
||||
if _, ok := v2[k]; ok {
|
||||
curWt += v1.TypeWt
|
||||
}
|
||||
}
|
||||
curWt += v1.BuffWt
|
||||
szW = append(szW, curWt)
|
||||
}
|
||||
index := comm.GetRandW(szW)
|
||||
_data := this.GetLotterConfById(szID[index])
|
||||
buff = append(buff, _data.BuffID)
|
||||
}
|
||||
return
|
||||
} else if this.Stype[key] == 2 { // 该小组中的道具为概率掉落,每个道具都会随机一次是否会掉落(单位为千分比)
|
||||
var wt int32
|
||||
for _, v := range this._groupType2[key] {
|
||||
if _data := this.GetLotterConfById(v); _data != nil { // 权重赋值
|
||||
if _data.SubGroupWt != 0 {
|
||||
wt = _data.SubGroupWt
|
||||
}
|
||||
//fmt.Printf("大组类型1小组类型2获得道具 :%v, 该道具Cid:%d", _data.Itemid, v)
|
||||
if wt >= comm.GetRandNum(0, 1000) { // 命中
|
||||
buff = append(buff, _data.BuffID)
|
||||
}
|
||||
if num == 0 {
|
||||
num = v1.GroupNum
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
} else if this.Btype[lotteryId] == 2 { // 该大组中的小组为概率掉落,每个小组都会随机一次是否会掉落(单位为千分比)
|
||||
// 每个小组id 都随机取一次
|
||||
var szGroupID []int32 // 获得的权重数组
|
||||
gourp := make([]*cfg.GameBufflotteryData, 0) // key 小组ID value 权重
|
||||
for _, v := range this._lotteryType2[lotteryId] {
|
||||
if _data := this.GetLotterConfById(v); _data != nil {
|
||||
gourp = append(gourp, _data)
|
||||
}
|
||||
}
|
||||
var wt int32
|
||||
// 类型为2 可能会同时获得多个组id
|
||||
for _, v := range gourp {
|
||||
if v.SubGroupWt != 0 {
|
||||
wt = v.SubGroupWt
|
||||
}
|
||||
k := v.SubGroupId
|
||||
//fmt.Printf("大组类型为2的,获得小组ID :%d,dropID:%d", k, v.Id)
|
||||
if wt >= comm.GetRandNum(0, 1000) { // 命中
|
||||
szGroupID = append(szGroupID, k)
|
||||
key := int64(lotteryId)<<31 + int64(k)
|
||||
if this.Stype[key] == 1 { // 随机一组数据
|
||||
for i := 0; i < int(this.SNum[key]); i++ {
|
||||
szW := make([]int32, 0)
|
||||
szID := make([]int32, 0)
|
||||
gourp := make(map[int32]int32, 0)
|
||||
for _, v := range this._groupType1[key] {
|
||||
if _data := this.GetLotterConfById(v); _data != nil { // 权重赋值
|
||||
curWt := _data.BuffWt
|
||||
if _, ok := gourp[_data.SubGroupId]; !ok {
|
||||
if buf, ok := this.buff[addType]; ok {
|
||||
if _, ok := buf[_data.BuffID]; ok {
|
||||
curWt += _data.TypeWt
|
||||
}
|
||||
}
|
||||
szW = append(szW, curWt)
|
||||
szID = append(szID, _data.Id)
|
||||
}
|
||||
}
|
||||
}
|
||||
index := comm.GetRandW(szW)
|
||||
_data := this.GetLotterConfById(szID[index])
|
||||
buff = append(buff, _data.BuffID)
|
||||
}
|
||||
} else if this.Stype[key] == 2 {
|
||||
for _, v := range this._groupType2[key] {
|
||||
var wt int32
|
||||
if _data := this.GetLotterConfById(v); _data != nil { // 权重赋值
|
||||
if _data.BuffWt != 0 {
|
||||
if buf, ok := this.buff[addType]; ok {
|
||||
if _, ok := buf[_data.BuffID]; ok {
|
||||
wt += _data.TypeWt
|
||||
}
|
||||
}
|
||||
wt += _data.BuffWt
|
||||
}
|
||||
if wt >= comm.GetRandNum(0, 1000) { // 命中
|
||||
buff = append(buff, _data.BuffID)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
getbuffid := sz[comm.GetRandW(szW)].BuffID
|
||||
ownerbuff[getbuffid] = struct{}{}
|
||||
buff = append(buff, getbuffid)
|
||||
if i >= int(num) {
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func (this *configureComp) GetStoneRoomDataById(roomid int32) (conf *cfg.GameStroneRoomData, err error) {
|
||||
func (this *configureComp) GetStoneRoomDataById(roomid int32) (conf *cfg.GameStoneRoomData, err error) {
|
||||
var (
|
||||
v interface{}
|
||||
)
|
||||
if v, err = this.GetConfigure(game_roomconf); err == nil {
|
||||
if configure, ok := v.(*cfg.GameStroneRoom); ok {
|
||||
if configure, ok := v.(*cfg.GameStoneRoom); ok {
|
||||
if conf = configure.Get(roomid); conf != nil {
|
||||
return
|
||||
}
|
||||
@ -668,12 +537,12 @@ func (this *configureComp) GetStoneRoomDataById(roomid int32) (conf *cfg.GameStr
|
||||
return
|
||||
}
|
||||
|
||||
func (this *configureComp) GetStoneBuffDataById(buffid int32) (conf *cfg.GameStroneBuffData, err error) {
|
||||
func (this *configureComp) GetStoneBuffDataById(buffid int32) (conf *cfg.GameStoneBuffData, err error) {
|
||||
var (
|
||||
v interface{}
|
||||
)
|
||||
if v, err = this.GetConfigure(game_buffconf); err == nil {
|
||||
if configure, ok := v.(*cfg.GameStroneBuff); ok {
|
||||
if configure, ok := v.(*cfg.GameStoneBuff); ok {
|
||||
if conf = configure.Get(buffid); conf != nil {
|
||||
return
|
||||
}
|
||||
@ -683,12 +552,12 @@ func (this *configureComp) GetStoneBuffDataById(buffid int32) (conf *cfg.GameStr
|
||||
return
|
||||
}
|
||||
|
||||
func (this *configureComp) GetStoneEventDataById(eventid int32) (conf *cfg.GameStroneEventData, err error) {
|
||||
func (this *configureComp) GetStoneEventDataById(eventid int32) (conf *cfg.GameStoneEventData, err error) {
|
||||
var (
|
||||
v interface{}
|
||||
)
|
||||
if v, err = this.GetConfigure(game_eventconf); err == nil {
|
||||
if configure, ok := v.(*cfg.GameStroneEvent); ok {
|
||||
if configure, ok := v.(*cfg.GameStoneEvent); ok {
|
||||
if conf = configure.Get(eventid); conf != nil {
|
||||
return
|
||||
}
|
||||
@ -699,13 +568,13 @@ func (this *configureComp) GetStoneEventDataById(eventid int32) (conf *cfg.GameS
|
||||
}
|
||||
|
||||
//
|
||||
func (this *configureComp) LoadGameStroneStage() {
|
||||
func (this *configureComp) LoadGameStoneStage() {
|
||||
|
||||
if v, err := this.GetConfigure(game_stageconf); err == nil {
|
||||
if configure, ok := v.(*cfg.GameStroneStage); ok {
|
||||
if configure, ok := v.(*cfg.GameStoneStage); ok {
|
||||
this.hlock.Lock()
|
||||
defer this.hlock.Unlock()
|
||||
this.stage = make(map[int64]*cfg.GameStroneStageData, 0)
|
||||
this.stage = make(map[int64]*cfg.GameStoneStageData, 0)
|
||||
for _, v := range configure.GetDataList() {
|
||||
key := int64(v.StageId)<<16 + int64(v.RoomId)
|
||||
this.stage[key] = v
|
||||
@ -717,15 +586,15 @@ func (this *configureComp) LoadGameStroneStage() {
|
||||
}
|
||||
|
||||
// 参数1 关卡id 参数2 层数id
|
||||
func (this *configureComp) GetStageConfByStageid(stgeid int32, roomid int32) (conf *cfg.GameStroneStageData) {
|
||||
func (this *configureComp) GetStageConfByStageid(stgeid int32, roomid int32) (conf *cfg.GameStoneStageData) {
|
||||
key := int64(stgeid)<<16 + int64(roomid)
|
||||
return this.stage[key]
|
||||
}
|
||||
|
||||
func (this *configureComp) LoadGameStroneBuff() {
|
||||
func (this *configureComp) LoadGameStoneBuff() {
|
||||
|
||||
if v, err := this.GetConfigure(game_buffconf); err == nil {
|
||||
if configure, ok := v.(*cfg.GameStroneBuff); ok {
|
||||
if configure, ok := v.(*cfg.GameStoneBuff); ok {
|
||||
this.hlock.Lock()
|
||||
defer this.hlock.Unlock()
|
||||
this.buff = make(map[int32]map[int32]struct{}, 0)
|
||||
@ -741,6 +610,6 @@ func (this *configureComp) LoadGameStroneBuff() {
|
||||
return
|
||||
}
|
||||
|
||||
func (this *configureComp) GetGameStroneBuff(addType int32) (m map[int32]struct{}) {
|
||||
func (this *configureComp) GetGameStoneBuff(addType int32) (m map[int32]struct{}) {
|
||||
return this.buff[addType]
|
||||
}
|
||||
|
@ -11,56 +11,139 @@ package cfg
|
||||
import "errors"
|
||||
|
||||
type GameStoneBattleData struct {
|
||||
BattleStageId int32
|
||||
EnemyShowIcon int32
|
||||
Atk int32
|
||||
Hp int32
|
||||
Def int32
|
||||
SpeedValue int32
|
||||
EffreValue int32
|
||||
BattleReadyID int32
|
||||
FormatList []int32
|
||||
RewardLottery int32
|
||||
BattleStageId int32
|
||||
EnemyShowIcon int32
|
||||
Atk int32
|
||||
Hp int32
|
||||
Def int32
|
||||
SpeedValue int32
|
||||
EffreValue int32
|
||||
BattleReadyID int32
|
||||
FormatList []int32
|
||||
RewardLottery int32
|
||||
}
|
||||
|
||||
const TypeId_GameStoneBattleData = 469689547
|
||||
|
||||
func (*GameStoneBattleData) GetTypeId() int32 {
|
||||
return 469689547
|
||||
return 469689547
|
||||
}
|
||||
|
||||
func (_v *GameStoneBattleData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleStageId"].(float64); !_ok_ { err = errors.New("BattleStageId error"); return }; _v.BattleStageId = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EnemyShowIcon"].(float64); !_ok_ { err = errors.New("EnemyShowIcon error"); return }; _v.EnemyShowIcon = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Atk"].(float64); !_ok_ { err = errors.New("Atk error"); return }; _v.Atk = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Hp"].(float64); !_ok_ { err = errors.New("Hp error"); return }; _v.Hp = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Def"].(float64); !_ok_ { err = errors.New("Def error"); return }; _v.Def = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["SpeedValue"].(float64); !_ok_ { err = errors.New("SpeedValue error"); return }; _v.SpeedValue = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EffreValue"].(float64); !_ok_ { err = errors.New("EffreValue error"); return }; _v.EffreValue = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["FormatList"].([]interface{}); !_ok_ { err = errors.New("FormatList error"); return }
|
||||
func (_v *GameStoneBattleData) Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{
|
||||
var _ok_ bool
|
||||
var _tempNum_ float64
|
||||
if _tempNum_, _ok_ = _buf["BattleStageId"].(float64); !_ok_ {
|
||||
err = errors.New("BattleStageId error")
|
||||
return
|
||||
}
|
||||
_v.BattleStageId = int32(_tempNum_)
|
||||
}
|
||||
{
|
||||
var _ok_ bool
|
||||
var _tempNum_ float64
|
||||
if _tempNum_, _ok_ = _buf["EnemyShowIcon"].(float64); !_ok_ {
|
||||
err = errors.New("EnemyShowIcon error")
|
||||
return
|
||||
}
|
||||
_v.EnemyShowIcon = int32(_tempNum_)
|
||||
}
|
||||
{
|
||||
var _ok_ bool
|
||||
var _tempNum_ float64
|
||||
if _tempNum_, _ok_ = _buf["Atk"].(float64); !_ok_ {
|
||||
err = errors.New("Atk error")
|
||||
return
|
||||
}
|
||||
_v.Atk = int32(_tempNum_)
|
||||
}
|
||||
{
|
||||
var _ok_ bool
|
||||
var _tempNum_ float64
|
||||
if _tempNum_, _ok_ = _buf["Hp"].(float64); !_ok_ {
|
||||
err = errors.New("Hp error")
|
||||
return
|
||||
}
|
||||
_v.Hp = int32(_tempNum_)
|
||||
}
|
||||
{
|
||||
var _ok_ bool
|
||||
var _tempNum_ float64
|
||||
if _tempNum_, _ok_ = _buf["Def"].(float64); !_ok_ {
|
||||
err = errors.New("Def error")
|
||||
return
|
||||
}
|
||||
_v.Def = int32(_tempNum_)
|
||||
}
|
||||
{
|
||||
var _ok_ bool
|
||||
var _tempNum_ float64
|
||||
if _tempNum_, _ok_ = _buf["SpeedValue"].(float64); !_ok_ {
|
||||
err = errors.New("SpeedValue error")
|
||||
return
|
||||
}
|
||||
_v.SpeedValue = int32(_tempNum_)
|
||||
}
|
||||
{
|
||||
var _ok_ bool
|
||||
var _tempNum_ float64
|
||||
if _tempNum_, _ok_ = _buf["EffreValue"].(float64); !_ok_ {
|
||||
err = errors.New("EffreValue error")
|
||||
return
|
||||
}
|
||||
_v.EffreValue = int32(_tempNum_)
|
||||
}
|
||||
{
|
||||
var _ok_ bool
|
||||
var _tempNum_ float64
|
||||
if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ {
|
||||
err = errors.New("BattleReadyID error")
|
||||
return
|
||||
}
|
||||
_v.BattleReadyID = int32(_tempNum_)
|
||||
}
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["FormatList"].([]interface{}); !_ok_ {
|
||||
err = errors.New("FormatList error")
|
||||
return
|
||||
}
|
||||
|
||||
_v.FormatList = make([]int32, 0, len(_arr_))
|
||||
|
||||
for _, _e_ := range _arr_ {
|
||||
var _list_v_ int32
|
||||
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
|
||||
_v.FormatList = append(_v.FormatList, _list_v_)
|
||||
}
|
||||
}
|
||||
_v.FormatList = make([]int32, 0, len(_arr_))
|
||||
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["RewardLottery"].(float64); !_ok_ { err = errors.New("RewardLottery error"); return }; _v.RewardLottery = int32(_tempNum_) }
|
||||
return
|
||||
for _, _e_ := range _arr_ {
|
||||
var _list_v_ int32
|
||||
{
|
||||
var _ok_ bool
|
||||
var _x_ float64
|
||||
if _x_, _ok_ = _e_.(float64); !_ok_ {
|
||||
err = errors.New("_list_v_ error")
|
||||
return
|
||||
}
|
||||
_list_v_ = int32(_x_)
|
||||
}
|
||||
_v.FormatList = append(_v.FormatList, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
var _ok_ bool
|
||||
var _tempNum_ float64
|
||||
if _tempNum_, _ok_ = _buf["RewardLottery"].(float64); !_ok_ {
|
||||
err = errors.New("RewardLottery error")
|
||||
return
|
||||
}
|
||||
_v.RewardLottery = int32(_tempNum_)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func DeserializeGameStoneBattleData(_buf map[string]interface{}) (*GameStoneBattleData, error) {
|
||||
v := &GameStoneBattleData{}
|
||||
if err := v.Deserialize(_buf); err == nil {
|
||||
return v, nil
|
||||
} else {
|
||||
return nil, err
|
||||
}
|
||||
v := &GameStoneBattleData{}
|
||||
if err := v.Deserialize(_buf); err == nil {
|
||||
return v, nil
|
||||
} else {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
@ -11,41 +11,128 @@ package cfg
|
||||
import "errors"
|
||||
|
||||
type GameStoneBuffData struct {
|
||||
BuffId int32
|
||||
Type int32
|
||||
SkillId int32
|
||||
BuffLevel int32
|
||||
Quality int32
|
||||
BuffIcon string
|
||||
BuffStory string
|
||||
BuffUpgradeCost *Gameatn
|
||||
BuffSell *Gameatn
|
||||
BuffId int32
|
||||
Type int32
|
||||
SkillId int32
|
||||
BuffLevel int32
|
||||
Quality int32
|
||||
BuffIcon string
|
||||
BuffStory string
|
||||
BuffUpgradeCost *Gameatn
|
||||
BuffSell *Gameatn
|
||||
}
|
||||
|
||||
const TypeId_GameStoneBuffData = -1457644250
|
||||
|
||||
func (*GameStoneBuffData) GetTypeId() int32 {
|
||||
return -1457644250
|
||||
return -1457644250
|
||||
}
|
||||
|
||||
func (_v *GameStoneBuffData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BuffId"].(float64); !_ok_ { err = errors.New("BuffId error"); return }; _v.BuffId = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Type"].(float64); !_ok_ { err = errors.New("Type error"); return }; _v.Type = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["SkillId"].(float64); !_ok_ { err = errors.New("SkillId error"); return }; _v.SkillId = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BuffLevel"].(float64); !_ok_ { err = errors.New("BuffLevel error"); return }; _v.BuffLevel = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Quality"].(float64); !_ok_ { err = errors.New("Quality error"); return }; _v.Quality = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.BuffIcon, _ok_ = _buf["BuffIcon"].(string); !_ok_ { err = errors.New("BuffIcon error"); return } }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["BuffStory"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.BuffStory error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.BuffStory, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["BuffUpgradeCost"].(map[string]interface{}); !_ok_ { err = errors.New("BuffUpgradeCost error"); return }; if _v.BuffUpgradeCost, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["BuffSell"].(map[string]interface{}); !_ok_ { err = errors.New("BuffSell error"); return }; if _v.BuffSell, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
return
|
||||
func (_v *GameStoneBuffData) Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{
|
||||
var _ok_ bool
|
||||
var _tempNum_ float64
|
||||
if _tempNum_, _ok_ = _buf["BuffId"].(float64); !_ok_ {
|
||||
err = errors.New("BuffId error")
|
||||
return
|
||||
}
|
||||
_v.BuffId = int32(_tempNum_)
|
||||
}
|
||||
{
|
||||
var _ok_ bool
|
||||
var _tempNum_ float64
|
||||
if _tempNum_, _ok_ = _buf["Type"].(float64); !_ok_ {
|
||||
err = errors.New("Type error")
|
||||
return
|
||||
}
|
||||
_v.Type = int32(_tempNum_)
|
||||
}
|
||||
{
|
||||
var _ok_ bool
|
||||
var _tempNum_ float64
|
||||
if _tempNum_, _ok_ = _buf["SkillId"].(float64); !_ok_ {
|
||||
err = errors.New("SkillId error")
|
||||
return
|
||||
}
|
||||
_v.SkillId = int32(_tempNum_)
|
||||
}
|
||||
{
|
||||
var _ok_ bool
|
||||
var _tempNum_ float64
|
||||
if _tempNum_, _ok_ = _buf["BuffLevel"].(float64); !_ok_ {
|
||||
err = errors.New("BuffLevel error")
|
||||
return
|
||||
}
|
||||
_v.BuffLevel = int32(_tempNum_)
|
||||
}
|
||||
{
|
||||
var _ok_ bool
|
||||
var _tempNum_ float64
|
||||
if _tempNum_, _ok_ = _buf["Quality"].(float64); !_ok_ {
|
||||
err = errors.New("Quality error")
|
||||
return
|
||||
}
|
||||
_v.Quality = int32(_tempNum_)
|
||||
}
|
||||
{
|
||||
var _ok_ bool
|
||||
if _v.BuffIcon, _ok_ = _buf["BuffIcon"].(string); !_ok_ {
|
||||
err = errors.New("BuffIcon error")
|
||||
return
|
||||
}
|
||||
}
|
||||
{
|
||||
var _ok_ bool
|
||||
var __json_text__ map[string]interface{}
|
||||
if __json_text__, _ok_ = _buf["BuffStory"].(map[string]interface{}); !_ok_ {
|
||||
err = errors.New("_v.BuffStory error")
|
||||
return
|
||||
}
|
||||
{
|
||||
var _ok_ bool
|
||||
if _, _ok_ = __json_text__["key"].(string); !_ok_ {
|
||||
err = errors.New("key error")
|
||||
return
|
||||
}
|
||||
}
|
||||
{
|
||||
var _ok_ bool
|
||||
if _v.BuffStory, _ok_ = __json_text__["text"].(string); !_ok_ {
|
||||
err = errors.New("text error")
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
{
|
||||
var _ok_ bool
|
||||
var _x_ map[string]interface{}
|
||||
if _x_, _ok_ = _buf["BuffUpgradeCost"].(map[string]interface{}); !_ok_ {
|
||||
err = errors.New("BuffUpgradeCost error")
|
||||
return
|
||||
}
|
||||
if _v.BuffUpgradeCost, err = DeserializeGameatn(_x_); err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
{
|
||||
var _ok_ bool
|
||||
var _x_ map[string]interface{}
|
||||
if _x_, _ok_ = _buf["BuffSell"].(map[string]interface{}); !_ok_ {
|
||||
err = errors.New("BuffSell error")
|
||||
return
|
||||
}
|
||||
if _v.BuffSell, err = DeserializeGameatn(_x_); err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func DeserializeGameStoneBuffData(_buf map[string]interface{}) (*GameStoneBuffData, error) {
|
||||
v := &GameStoneBuffData{}
|
||||
if err := v.Deserialize(_buf); err == nil {
|
||||
return v, nil
|
||||
} else {
|
||||
return nil, err
|
||||
}
|
||||
v := &GameStoneBuffData{}
|
||||
if err := v.Deserialize(_buf); err == nil {
|
||||
return v, nil
|
||||
} else {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
@ -1,42 +0,0 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
package cfg
|
||||
|
||||
type GameStroneBuff struct {
|
||||
_dataMap map[int32]*GameStroneBuffData
|
||||
_dataList []*GameStroneBuffData
|
||||
}
|
||||
|
||||
func NewGameStroneBuff(_buf []map[string]interface{}) (*GameStroneBuff, error) {
|
||||
_dataList := make([]*GameStroneBuffData, 0, len(_buf))
|
||||
dataMap := make(map[int32]*GameStroneBuffData)
|
||||
for _, _ele_ := range _buf {
|
||||
if _v, err2 := DeserializeGameStroneBuffData(_ele_); err2 != nil {
|
||||
return nil, err2
|
||||
} else {
|
||||
_dataList = append(_dataList, _v)
|
||||
dataMap[_v.BuffId] = _v
|
||||
}
|
||||
}
|
||||
return &GameStroneBuff{_dataList:_dataList, _dataMap:dataMap}, nil
|
||||
}
|
||||
|
||||
func (table *GameStroneBuff) GetDataMap() map[int32]*GameStroneBuffData {
|
||||
return table._dataMap
|
||||
}
|
||||
|
||||
func (table *GameStroneBuff) GetDataList() []*GameStroneBuffData {
|
||||
return table._dataList
|
||||
}
|
||||
|
||||
func (table *GameStroneBuff) Get(key int32) *GameStroneBuffData {
|
||||
return table._dataMap[key]
|
||||
}
|
||||
|
||||
|
@ -1,51 +0,0 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
package cfg
|
||||
|
||||
import "errors"
|
||||
|
||||
type GameStroneBuffData struct {
|
||||
BuffId int32
|
||||
BuffGroupId int32
|
||||
Type int32
|
||||
BuffLevel int32
|
||||
Quality int32
|
||||
BuffIcon string
|
||||
BuffStory string
|
||||
BuffUpgradeCost *Gameatn
|
||||
BuffSell *Gameatn
|
||||
}
|
||||
|
||||
const TypeId_GameStroneBuffData = 1812104654
|
||||
|
||||
func (*GameStroneBuffData) GetTypeId() int32 {
|
||||
return 1812104654
|
||||
}
|
||||
|
||||
func (_v *GameStroneBuffData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BuffId"].(float64); !_ok_ { err = errors.New("BuffId error"); return }; _v.BuffId = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BuffGroupId"].(float64); !_ok_ { err = errors.New("BuffGroupId error"); return }; _v.BuffGroupId = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Type"].(float64); !_ok_ { err = errors.New("Type error"); return }; _v.Type = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BuffLevel"].(float64); !_ok_ { err = errors.New("BuffLevel error"); return }; _v.BuffLevel = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Quality"].(float64); !_ok_ { err = errors.New("Quality error"); return }; _v.Quality = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.BuffIcon, _ok_ = _buf["BuffIcon"].(string); !_ok_ { err = errors.New("BuffIcon error"); return } }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["BuffStory"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.BuffStory error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.BuffStory, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["BuffUpgradeCost"].(map[string]interface{}); !_ok_ { err = errors.New("BuffUpgradeCost error"); return }; if _v.BuffUpgradeCost, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["BuffSell"].(map[string]interface{}); !_ok_ { err = errors.New("BuffSell error"); return }; if _v.BuffSell, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
return
|
||||
}
|
||||
|
||||
func DeserializeGameStroneBuffData(_buf map[string]interface{}) (*GameStroneBuffData, error) {
|
||||
v := &GameStroneBuffData{}
|
||||
if err := v.Deserialize(_buf); err == nil {
|
||||
return v, nil
|
||||
} else {
|
||||
return nil, err
|
||||
}
|
||||
}
|
@ -1,42 +0,0 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
package cfg
|
||||
|
||||
type GameStroneEvent struct {
|
||||
_dataMap map[int32]*GameStroneEventData
|
||||
_dataList []*GameStroneEventData
|
||||
}
|
||||
|
||||
func NewGameStroneEvent(_buf []map[string]interface{}) (*GameStroneEvent, error) {
|
||||
_dataList := make([]*GameStroneEventData, 0, len(_buf))
|
||||
dataMap := make(map[int32]*GameStroneEventData)
|
||||
for _, _ele_ := range _buf {
|
||||
if _v, err2 := DeserializeGameStroneEventData(_ele_); err2 != nil {
|
||||
return nil, err2
|
||||
} else {
|
||||
_dataList = append(_dataList, _v)
|
||||
dataMap[_v.EventId] = _v
|
||||
}
|
||||
}
|
||||
return &GameStroneEvent{_dataList:_dataList, _dataMap:dataMap}, nil
|
||||
}
|
||||
|
||||
func (table *GameStroneEvent) GetDataMap() map[int32]*GameStroneEventData {
|
||||
return table._dataMap
|
||||
}
|
||||
|
||||
func (table *GameStroneEvent) GetDataList() []*GameStroneEventData {
|
||||
return table._dataList
|
||||
}
|
||||
|
||||
func (table *GameStroneEvent) Get(key int32) *GameStroneEventData {
|
||||
return table._dataMap[key]
|
||||
}
|
||||
|
||||
|
@ -1,68 +0,0 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
package cfg
|
||||
|
||||
import "errors"
|
||||
|
||||
type GameStroneEventData struct {
|
||||
EventId int32
|
||||
EventTitle string
|
||||
EventType int32
|
||||
EventResource string
|
||||
Value1 int32
|
||||
Value2 int32
|
||||
Value3 int32
|
||||
Value4 int32
|
||||
CostItem []*Gameatn
|
||||
PostEvent int32
|
||||
Probability int32
|
||||
}
|
||||
|
||||
const TypeId_GameStroneEventData = 341060691
|
||||
|
||||
func (*GameStroneEventData) GetTypeId() int32 {
|
||||
return 341060691
|
||||
}
|
||||
|
||||
func (_v *GameStroneEventData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EventId"].(float64); !_ok_ { err = errors.New("EventId error"); return }; _v.EventId = int32(_tempNum_) }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["EventTitle"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.EventTitle error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.EventTitle, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EventType"].(float64); !_ok_ { err = errors.New("EventType error"); return }; _v.EventType = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.EventResource, _ok_ = _buf["EventResource"].(string); !_ok_ { err = errors.New("EventResource error"); return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Value1"].(float64); !_ok_ { err = errors.New("Value1 error"); return }; _v.Value1 = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Value2"].(float64); !_ok_ { err = errors.New("Value2 error"); return }; _v.Value2 = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Value3"].(float64); !_ok_ { err = errors.New("Value3 error"); return }; _v.Value3 = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Value4"].(float64); !_ok_ { err = errors.New("Value4 error"); return }; _v.Value4 = int32(_tempNum_) }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["CostItem"].([]interface{}); !_ok_ { err = errors.New("CostItem error"); return }
|
||||
|
||||
_v.CostItem = make([]*Gameatn, 0, len(_arr_))
|
||||
|
||||
for _, _e_ := range _arr_ {
|
||||
var _list_v_ *Gameatn
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
_v.CostItem = append(_v.CostItem, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["PostEvent"].(float64); !_ok_ { err = errors.New("PostEvent error"); return }; _v.PostEvent = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["probability"].(float64); !_ok_ { err = errors.New("probability error"); return }; _v.Probability = int32(_tempNum_) }
|
||||
return
|
||||
}
|
||||
|
||||
func DeserializeGameStroneEventData(_buf map[string]interface{}) (*GameStroneEventData, error) {
|
||||
v := &GameStroneEventData{}
|
||||
if err := v.Deserialize(_buf); err == nil {
|
||||
return v, nil
|
||||
} else {
|
||||
return nil, err
|
||||
}
|
||||
}
|
@ -1,42 +0,0 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
package cfg
|
||||
|
||||
type GameStroneRoom struct {
|
||||
_dataMap map[int32]*GameStroneRoomData
|
||||
_dataList []*GameStroneRoomData
|
||||
}
|
||||
|
||||
func NewGameStroneRoom(_buf []map[string]interface{}) (*GameStroneRoom, error) {
|
||||
_dataList := make([]*GameStroneRoomData, 0, len(_buf))
|
||||
dataMap := make(map[int32]*GameStroneRoomData)
|
||||
for _, _ele_ := range _buf {
|
||||
if _v, err2 := DeserializeGameStroneRoomData(_ele_); err2 != nil {
|
||||
return nil, err2
|
||||
} else {
|
||||
_dataList = append(_dataList, _v)
|
||||
dataMap[_v.RoomId] = _v
|
||||
}
|
||||
}
|
||||
return &GameStroneRoom{_dataList:_dataList, _dataMap:dataMap}, nil
|
||||
}
|
||||
|
||||
func (table *GameStroneRoom) GetDataMap() map[int32]*GameStroneRoomData {
|
||||
return table._dataMap
|
||||
}
|
||||
|
||||
func (table *GameStroneRoom) GetDataList() []*GameStroneRoomData {
|
||||
return table._dataList
|
||||
}
|
||||
|
||||
func (table *GameStroneRoom) Get(key int32) *GameStroneRoomData {
|
||||
return table._dataMap[key]
|
||||
}
|
||||
|
||||
|
@ -1,55 +0,0 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
package cfg
|
||||
|
||||
import "errors"
|
||||
|
||||
type GameStroneRoomData struct {
|
||||
RoomId int32
|
||||
RoomName string
|
||||
SceneName string
|
||||
PortalName string
|
||||
EventrewardGroup int32
|
||||
EventBattleGroup int32
|
||||
EventStoryNpcGroup int32
|
||||
EventTreasureGroup int32
|
||||
EventStoreGroup int32
|
||||
BossEvent int32
|
||||
Condition int32
|
||||
}
|
||||
|
||||
const TypeId_GameStroneRoomData = -1133628842
|
||||
|
||||
func (*GameStroneRoomData) GetTypeId() int32 {
|
||||
return -1133628842
|
||||
}
|
||||
|
||||
func (_v *GameStroneRoomData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["RoomId"].(float64); !_ok_ { err = errors.New("RoomId error"); return }; _v.RoomId = int32(_tempNum_) }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["RoomName"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.RoomName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.RoomName, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{ var _ok_ bool; if _v.SceneName, _ok_ = _buf["SceneName"].(string); !_ok_ { err = errors.New("SceneName error"); return } }
|
||||
{ var _ok_ bool; if _v.PortalName, _ok_ = _buf["PortalName"].(string); !_ok_ { err = errors.New("PortalName error"); return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EventrewardGroup"].(float64); !_ok_ { err = errors.New("EventrewardGroup error"); return }; _v.EventrewardGroup = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EventBattleGroup"].(float64); !_ok_ { err = errors.New("EventBattleGroup error"); return }; _v.EventBattleGroup = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EventStoryNpcGroup"].(float64); !_ok_ { err = errors.New("EventStoryNpcGroup error"); return }; _v.EventStoryNpcGroup = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EventTreasureGroup"].(float64); !_ok_ { err = errors.New("EventTreasureGroup error"); return }; _v.EventTreasureGroup = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EventStoreGroup"].(float64); !_ok_ { err = errors.New("EventStoreGroup error"); return }; _v.EventStoreGroup = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BossEvent"].(float64); !_ok_ { err = errors.New("BossEvent error"); return }; _v.BossEvent = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Condition"].(float64); !_ok_ { err = errors.New("Condition error"); return }; _v.Condition = int32(_tempNum_) }
|
||||
return
|
||||
}
|
||||
|
||||
func DeserializeGameStroneRoomData(_buf map[string]interface{}) (*GameStroneRoomData, error) {
|
||||
v := &GameStroneRoomData{}
|
||||
if err := v.Deserialize(_buf); err == nil {
|
||||
return v, nil
|
||||
} else {
|
||||
return nil, err
|
||||
}
|
||||
}
|
@ -1,42 +0,0 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
package cfg
|
||||
|
||||
type GameStroneStage struct {
|
||||
_dataMap map[int32]*GameStroneStageData
|
||||
_dataList []*GameStroneStageData
|
||||
}
|
||||
|
||||
func NewGameStroneStage(_buf []map[string]interface{}) (*GameStroneStage, error) {
|
||||
_dataList := make([]*GameStroneStageData, 0, len(_buf))
|
||||
dataMap := make(map[int32]*GameStroneStageData)
|
||||
for _, _ele_ := range _buf {
|
||||
if _v, err2 := DeserializeGameStroneStageData(_ele_); err2 != nil {
|
||||
return nil, err2
|
||||
} else {
|
||||
_dataList = append(_dataList, _v)
|
||||
dataMap[_v.Id] = _v
|
||||
}
|
||||
}
|
||||
return &GameStroneStage{_dataList:_dataList, _dataMap:dataMap}, nil
|
||||
}
|
||||
|
||||
func (table *GameStroneStage) GetDataMap() map[int32]*GameStroneStageData {
|
||||
return table._dataMap
|
||||
}
|
||||
|
||||
func (table *GameStroneStage) GetDataList() []*GameStroneStageData {
|
||||
return table._dataList
|
||||
}
|
||||
|
||||
func (table *GameStroneStage) Get(key int32) *GameStroneStageData {
|
||||
return table._dataMap[key]
|
||||
}
|
||||
|
||||
|
@ -1,102 +0,0 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
package cfg
|
||||
|
||||
import "errors"
|
||||
|
||||
type GameStroneStageData struct {
|
||||
Id int32
|
||||
StageId int32
|
||||
PreviouStage int32
|
||||
StageName string
|
||||
RoomId int32
|
||||
RoomGroup int32
|
||||
PortalGroup int32
|
||||
Rewardpreview []*Gameatn
|
||||
TreasurePreview []*Gameatn
|
||||
FirstReward []*Gameatn
|
||||
WeeklyPointPreview int32
|
||||
WeeklyPoint *Gameatn
|
||||
TalentItem *Gameatn
|
||||
ReferenceLevel int32
|
||||
StageValue int32
|
||||
}
|
||||
|
||||
const TypeId_GameStroneStageData = 2146544311
|
||||
|
||||
func (*GameStroneStageData) GetTypeId() int32 {
|
||||
return 2146544311
|
||||
}
|
||||
|
||||
func (_v *GameStroneStageData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Id"].(float64); !_ok_ { err = errors.New("Id error"); return }; _v.Id = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["StageId"].(float64); !_ok_ { err = errors.New("StageId error"); return }; _v.StageId = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["PreviouStage"].(float64); !_ok_ { err = errors.New("PreviouStage error"); return }; _v.PreviouStage = int32(_tempNum_) }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["StageName"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.StageName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.StageName, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["RoomId"].(float64); !_ok_ { err = errors.New("RoomId error"); return }; _v.RoomId = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["RoomGroup"].(float64); !_ok_ { err = errors.New("RoomGroup error"); return }; _v.RoomGroup = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["PortalGroup"].(float64); !_ok_ { err = errors.New("PortalGroup error"); return }; _v.PortalGroup = int32(_tempNum_) }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["rewardpreview"].([]interface{}); !_ok_ { err = errors.New("rewardpreview error"); return }
|
||||
|
||||
_v.Rewardpreview = make([]*Gameatn, 0, len(_arr_))
|
||||
|
||||
for _, _e_ := range _arr_ {
|
||||
var _list_v_ *Gameatn
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
_v.Rewardpreview = append(_v.Rewardpreview, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["TreasurePreview"].([]interface{}); !_ok_ { err = errors.New("TreasurePreview error"); return }
|
||||
|
||||
_v.TreasurePreview = make([]*Gameatn, 0, len(_arr_))
|
||||
|
||||
for _, _e_ := range _arr_ {
|
||||
var _list_v_ *Gameatn
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
_v.TreasurePreview = append(_v.TreasurePreview, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["FirstReward"].([]interface{}); !_ok_ { err = errors.New("FirstReward error"); return }
|
||||
|
||||
_v.FirstReward = make([]*Gameatn, 0, len(_arr_))
|
||||
|
||||
for _, _e_ := range _arr_ {
|
||||
var _list_v_ *Gameatn
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
_v.FirstReward = append(_v.FirstReward, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["WeeklyPointPreview"].(float64); !_ok_ { err = errors.New("WeeklyPointPreview error"); return }; _v.WeeklyPointPreview = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["WeeklyPoint"].(map[string]interface{}); !_ok_ { err = errors.New("WeeklyPoint error"); return }; if _v.WeeklyPoint, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["TalentItem"].(map[string]interface{}); !_ok_ { err = errors.New("TalentItem error"); return }; if _v.TalentItem, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ReferenceLevel"].(float64); !_ok_ { err = errors.New("ReferenceLevel error"); return }; _v.ReferenceLevel = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["StageValue"].(float64); !_ok_ { err = errors.New("StageValue error"); return }; _v.StageValue = int32(_tempNum_) }
|
||||
return
|
||||
}
|
||||
|
||||
func DeserializeGameStroneStageData(_buf map[string]interface{}) (*GameStroneStageData, error) {
|
||||
v := &GameStroneStageData{}
|
||||
if err := v.Deserialize(_buf); err == nil {
|
||||
return v, nil
|
||||
} else {
|
||||
return nil, err
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user