上传配置表

This commit is contained in:
liwei1dao 2024-01-09 14:11:03 +08:00
parent f797754263
commit e3873e4f6e
39 changed files with 2547 additions and 1406 deletions

View File

@ -1,13 +1,17 @@
[
{
"key": "51004",
"key": "33003",
"type": 1,
"herocolor": 1,
"hero": 51004,
"img": "tx_js_51004",
"herotitel": {
"key": "consume_consume_hero_herotitel_01",
"text": "酒吧新人"
},
"hero": 33003,
"img": "tx_js_33003",
"intr": {
"key": "consume_consume_hero_intr_01",
"text": "豺狼小怪的三消英雄卡。"
"text": "胡德的毒苹果酒吧桌游卡"
},
"skillname": {
"key": "consume_consume_hero_skillname_01",
@ -21,77 +25,104 @@
"skilltype": 1,
"skillload": 6,
"skilleffect": 1,
"skillvalue": 7
"skillvalue": 7,
"lost": [
1000,
800,
600,
500,
400,
300,
200
]
},
{
"key": "51012",
"type": 2,
"herocolor": 2,
"hero": 25001,
"img": "tx_js_51012",
"key": "43003",
"type": 1,
"herocolor": 1,
"herotitel": {
"key": "consume_consume_hero_herotitel_02",
"text": "酒吧新人"
},
"hero": 43003,
"img": "tx_js_43003",
"intr": {
"key": "consume_consume_hero_intr_02",
"text": "小猴子的三消英雄卡。"
"text": "匹诺曹的毒苹果酒吧桌游卡"
},
"skillname": {
"key": "consume_consume_hero_skillname_02",
"text": "香蕉连成串"
"text": "谎话连篇"
},
"skilltxt": {
"key": "consume_consume_hero_skilltxt_02",
"text": "消除中间的一列宝石"
},
"consume": [
{
"a": "attr",
"t": "gold",
"n": 10
}
],
"consume": [],
"skilltype": 1,
"skillload": 7,
"skilleffect": 2,
"skillvalue": 0
"skillvalue": 0,
"lost": [
1000,
800,
600,
500,
400,
300,
200
]
},
{
"key": "13002",
"type": 2,
"herocolor": 2,
"hero": 13002,
"img": "tx_js_51012",
"key": "43004",
"type": 1,
"herocolor": 1,
"herotitel": {
"key": "consume_consume_hero_herotitel_03",
"text": "酒吧新人"
},
"hero": 43004,
"img": "tx_js_43004",
"intr": {
"key": "consume_consume_hero_intr_03",
"text": "食人鱼的三消英雄卡"
"text": "姜饼人的毒苹果酒吧桌游卡"
},
"skillname": {
"key": "consume_consume_hero_skillname_03",
"text": "臭屁四溢"
"text": "东躲西藏"
},
"skilltxt": {
"key": "consume_consume_hero_skilltxt_03",
"text": "玩家标记(选中)一个方块然后有100%的概率周围位置标记完毕后有60%概率继续标记周围位置然后30%概率标记周围位置最多蔓延4次,标记结束后,消除所有被标记的方块。"
"text": "将随机6个宝石染成当前盘面上颜色最多的宝石"
},
"consume": [
{
"a": "attr",
"t": "gold",
"n": 20
}
],
"skilltype": 2,
"consume": [],
"skilltype": 1,
"skillload": 7,
"skilleffect": 3,
"skillvalue": 0
"skillvalue": 6,
"lost": [
1000,
800,
600,
500,
400,
300,
200
]
},
{
"key": "33003",
"key": "13004",
"type": 2,
"herocolor": 3,
"hero": 33003,
"img": "tx_js_51012",
"herocolor": 2,
"herotitel": {
"key": "consume_consume_hero_herotitel_04",
"text": "老手"
},
"hero": 13004,
"img": "tx_js_13004",
"intr": {
"key": "consume_consume_hero_intr_04",
"text": "胡德先生的三消英雄卡"
"text": "法夸德勋爵的毒苹果酒吧桌游卡"
},
"skillname": {
"key": "consume_consume_hero_skillname_04",
@ -105,23 +136,36 @@
{
"a": "attr",
"t": "gold",
"n": 10
"n": 20
}
],
"skilltype": 2,
"skillload": 7,
"skilleffect": 4,
"skillvalue": 0
"skillvalue": 0,
"lost": [
1000,
800,
600,
500,
400,
300,
200
]
},
{
"key": "13005",
"type": 2,
"herocolor": 3,
"herocolor": 2,
"herotitel": {
"key": "consume_consume_hero_herotitel_05",
"text": "老手"
},
"hero": 13005,
"img": "tx_js_51012",
"img": "tx_js_13005",
"intr": {
"key": "consume_consume_hero_intr_05",
"text": "大大的三消英雄卡"
"text": "大大的毒苹果酒吧桌游卡"
},
"skillname": {
"key": "consume_consume_hero_skillname_05",
@ -141,6 +185,531 @@
"skilltype": 1,
"skillload": 7,
"skilleffect": 5,
"skillvalue": 0
"skillvalue": 0,
"lost": [
1000,
800,
600,
500,
400,
300,
200
]
},
{
"key": "15002",
"type": 2,
"herocolor": 2,
"herotitel": {
"key": "consume_consume_hero_herotitel_06",
"text": "老手"
},
"hero": 15002,
"img": "tx_js_15002",
"intr": {
"key": "consume_consume_hero_intr_06",
"text": "船长的毒苹果酒吧桌游卡"
},
"skillname": {
"key": "consume_consume_hero_skillname_06",
"text": "运筹帷幄"
},
"skilltxt": {
"key": "consume_consume_hero_skilltxt_06",
"text": "指定盘面上2中颜色最多的方块将其中一种颜色全部集中到右方另一种全部集中到左方然后执行消除。"
},
"consume": [
{
"a": "attr",
"t": "gold",
"n": 20
}
],
"skilltype": 1,
"skillload": 7,
"skilleffect": 6,
"skillvalue": 0,
"lost": [
1000,
800,
600,
500,
400,
300,
200
]
},
{
"key": "24001",
"type": 2,
"herocolor": 2,
"herotitel": {
"key": "consume_consume_hero_herotitel_07",
"text": "老手"
},
"hero": 24001,
"img": "tx_js_24001",
"intr": {
"key": "consume_consume_hero_intr_07",
"text": "警长的毒苹果酒吧桌游卡"
},
"skillname": {
"key": "consume_consume_hero_skillname_07",
"text": "全速追击"
},
"skilltxt": {
"key": "consume_consume_hero_skilltxt_07",
"text": "使用技能后,玩家下一次行动不会消耗步骤,如果下一次行动消除了一组方块,那么会直接消除该组方块左右三行/三列区域内的所有方块。"
},
"consume": [
{
"a": "attr",
"t": "gold",
"n": 20
}
],
"skilltype": 1,
"skillload": 7,
"skilleffect": 7,
"skillvalue": 0,
"lost": [
1000,
800,
600,
500,
400,
300,
200
]
},
{
"key": "25001",
"type": 2,
"herocolor": 3,
"herotitel": {
"key": "consume_consume_hero_herotitel_08",
"text": "靠谱的家伙"
},
"hero": 25001,
"img": "tx_js_25001",
"intr": {
"key": "consume_consume_hero_intr_08",
"text": "阿宝的毒苹果酒吧桌游卡"
},
"skillname": {
"key": "consume_consume_hero_skillname_08",
"text": "盖世大胃王"
},
"skilltxt": {
"key": "consume_consume_hero_skilltxt_08",
"text": "随机选择2中颜色然后消除盘面上所有对应颜色的方块"
},
"consume": [
{
"a": "attr",
"t": "gold",
"n": 20
}
],
"skilltype": 1,
"skillload": 7,
"skilleffect": 8,
"skillvalue": 0,
"lost": [
1000,
800,
600,
500,
400,
300,
200
]
},
{
"key": "35001",
"type": 2,
"herocolor": 3,
"herotitel": {
"key": "consume_consume_hero_herotitel_09",
"text": "靠谱的家伙"
},
"hero": 35001,
"img": "tx_js_35001",
"intr": {
"key": "consume_consume_hero_intr_09",
"text": "师父的毒苹果酒吧桌游卡"
},
"skillname": {
"key": "consume_consume_hero_skillname_09",
"text": "功夫特训"
},
"skilltxt": {
"key": "consume_consume_hero_skilltxt_09",
"text": "选择一种颜色所有对应颜色的棋子随机变成象棋里的马并按照对应的象棋规则走3次被该方块踩中的方块消除然后对应方块也消除。"
},
"consume": [
{
"a": "attr",
"t": "gold",
"n": 20
}
],
"skilltype": 2,
"skillload": 7,
"skilleffect": 9,
"skillvalue": 0,
"lost": [
1000,
800,
600,
500,
400,
300,
200
]
},
{
"key": "44004",
"type": 2,
"herocolor": 3,
"herotitel": {
"key": "consume_consume_hero_herotitel_10",
"text": "靠谱的家伙"
},
"hero": 44004,
"img": "tx_js_44004",
"intr": {
"key": "consume_consume_hero_intr_10",
"text": "骇客蛛的毒苹果酒吧桌游卡"
},
"skillname": {
"key": "consume_consume_hero_skillname_10",
"text": "病毒复制体"
},
"skilltxt": {
"key": "consume_consume_hero_skilltxt_10",
"text": "选中不相连的3列一起向左/向右复制这3列的宝石(覆盖原方块)"
},
"consume": [
{
"a": "attr",
"t": "gold",
"n": 20
}
],
"skilltype": 1,
"skillload": 7,
"skilleffect": 10,
"skillvalue": 0,
"lost": [
1000,
800,
600,
500,
400,
300,
200
]
},
{
"key": "44006",
"type": 2,
"herocolor": 3,
"herotitel": {
"key": "consume_consume_hero_herotitel_11",
"text": "靠谱的家伙"
},
"hero": 44006,
"img": "tx_js_44006",
"intr": {
"key": "consume_consume_hero_intr_11",
"text": "悍娇虎的毒苹果酒吧桌游卡"
},
"skillname": {
"key": "consume_consume_hero_skillname_11",
"text": "彪悍虎爪"
},
"skilltxt": {
"key": "consume_consume_hero_skilltxt_11",
"text": "选中一个方块,然后消除盘面上所有相同颜色的方块。"
},
"consume": [
{
"a": "attr",
"t": "gold",
"n": 20
}
],
"skilltype": 2,
"skillload": 7,
"skilleffect": 11,
"skillvalue": 0,
"lost": [
1000,
800,
600,
500,
400,
300,
200
]
},
{
"key": "45003",
"type": 2,
"herocolor": 4,
"herotitel": {
"key": "consume_consume_hero_herotitel_12",
"text": "身怀绝技之人"
},
"hero": 45003,
"img": "tx_js_45003",
"intr": {
"key": "consume_consume_hero_intr_12",
"text": "盖的毒苹果酒吧桌游卡"
},
"skillname": {
"key": "consume_consume_hero_skillname_12",
"text": "漫天爆米花"
},
"skilltxt": {
"key": "consume_consume_hero_skilltxt_12",
"text": "随机将盘面内8个方块变为“烟火”并从消除通过该技能生成的4个烟火。"
},
"consume": [
{
"a": "attr",
"t": "gold",
"n": 20
}
],
"skilltype": 1,
"skillload": 7,
"skilleffect": 12,
"skillvalue": 0,
"lost": [
1000,
800,
600,
500,
400,
300,
200
]
},
{
"key": "34007",
"type": 2,
"herocolor": 4,
"herotitel": {
"key": "consume_consume_hero_herotitel_13",
"text": "身怀绝技之人"
},
"hero": 34007,
"img": "tx_js_34007",
"intr": {
"key": "consume_consume_hero_intr_13",
"text": "菲奥娜的毒苹果酒吧桌游卡"
},
"skillname": {
"key": "consume_consume_hero_skillname_13",
"text": "无敌吞金怪"
},
"skilltxt": {
"key": "consume_consume_hero_skilltxt_13",
"text": "随机标记三个处于最左边的方块,然后消除这三个方块所在的三行的所有方块。"
},
"consume": [
{
"a": "attr",
"t": "gold",
"n": 20
}
],
"skilltype": 1,
"skillload": 7,
"skilleffect": 13,
"skillvalue": 0,
"lost": [
1000,
800,
600,
500,
400,
300,
200
]
},
{
"key": "45004",
"type": 2,
"herocolor": 4,
"herotitel": {
"key": "consume_consume_hero_herotitel_14",
"text": "身怀绝技之人"
},
"hero": 45004,
"img": "tx_js_45004",
"intr": {
"key": "consume_consume_hero_intr_14",
"text": "穿靴子的猫的毒苹果酒吧桌游卡"
},
"skillname": {
"key": "consume_consume_hero_skillname_14",
"text": "侠猫飞剑"
},
"skilltxt": {
"key": "consume_consume_hero_skilltxt_14",
"text": "选中一个方块,然后消除改方块行列上的所有宝石。"
},
"consume": [
{
"a": "attr",
"t": "gold",
"n": 20
}
],
"skilltype": 2,
"skillload": 7,
"skilleffect": 14,
"skillvalue": 0,
"lost": [
1000,
800,
600,
500,
400,
300,
200
]
},
{
"key": "45001",
"type": 2,
"herocolor": 5,
"herotitel": {
"key": "consume_consume_hero_herotitel_15",
"text": "传奇牌手!"
},
"hero": 45001,
"img": "tx_js_45001",
"intr": {
"key": "consume_consume_hero_intr_15",
"text": "乌龟大师的毒苹果酒吧桌游卡"
},
"skillname": {
"key": "consume_consume_hero_skillname_15",
"text": "羽化登仙"
},
"skilltxt": {
"key": "consume_consume_hero_skilltxt_15",
"text": "选择一种宝石颜色,场内所有对应颜色左右上下的宝石均变成改颜色。"
},
"consume": [
{
"a": "attr",
"t": "gold",
"n": 20
}
],
"skilltype": 2,
"skillload": 7,
"skilleffect": 15,
"skillvalue": 0,
"lost": [
1000,
800,
600,
500,
400,
300,
200
]
},
{
"key": "34006",
"type": 2,
"herocolor": 5,
"herotitel": {
"key": "consume_consume_hero_herotitel_16",
"text": "传奇牌手!"
},
"hero": 34006,
"img": "tx_js_34006",
"intr": {
"key": "consume_consume_hero_intr_16",
"text": "冰霜杰克的毒苹果酒吧桌游卡"
},
"skillname": {
"key": "consume_consume_hero_skillname_16",
"text": "冰天雪地"
},
"skilltxt": {
"key": "consume_consume_hero_skilltxt_16",
"text": "随机选中一种颜色的宝石首尾相连,连线路上的宝石也变成该颜色,然后随机引爆一个泥巴方块。"
},
"consume": [
{
"a": "attr",
"t": "gold",
"n": 20
}
],
"skilltype": 1,
"skillload": 7,
"skilleffect": 16,
"skillvalue": 0,
"lost": [
1000,
800,
600,
500,
400,
300,
200
]
},
{
"key": "35003",
"type": 2,
"herocolor": 5,
"herotitel": {
"key": "consume_consume_hero_herotitel_17",
"text": "传奇牌手!"
},
"hero": 35003,
"img": "tx_js_35003",
"intr": {
"key": "consume_consume_hero_intr_17",
"text": "漆黑的毒苹果酒吧桌游卡"
},
"skillname": {
"key": "consume_consume_hero_skillname_17",
"text": "黑暗侵袭"
},
"skilltxt": {
"key": "consume_consume_hero_skilltxt_17",
"text": "随机选中棋盘内的一种颜色,将该颜色方块随机变成另一种颜色,然后执行一次消除,然后再执行一次该逻辑(变2次消除2次)。"
},
"consume": [
{
"a": "attr",
"t": "gold",
"n": 20
}
],
"skilltype": 1,
"skillload": 7,
"skilleffect": 17,
"skillvalue": 0,
"lost": [
1000,
800,
600,
500,
400,
300,
200
]
}
]

View File

@ -15,7 +15,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 2,
@ -41,7 +41,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 3,
@ -67,7 +67,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 4,
@ -89,7 +89,7 @@
],
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
"rewardtime": true
},
{
"key": 5,
@ -111,7 +111,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 6,
@ -145,7 +145,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 7,
@ -179,7 +179,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 8,
@ -197,7 +197,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 9,
@ -215,7 +215,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 10,
@ -233,7 +233,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 11,
@ -251,7 +251,7 @@
],
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
"rewardtime": true
},
{
"key": 12,
@ -269,7 +269,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 13,
@ -287,7 +287,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 14,
@ -305,7 +305,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 15,
@ -323,7 +323,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 16,
@ -345,7 +345,7 @@
],
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 17,
@ -367,7 +367,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 18,
@ -389,7 +389,7 @@
],
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
"rewardtime": true
},
{
"key": 19,
@ -419,7 +419,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 20,
@ -445,7 +445,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 21,
@ -471,7 +471,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 22,
@ -489,7 +489,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 23,
@ -511,7 +511,7 @@
],
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 24,
@ -533,7 +533,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 25,
@ -555,7 +555,7 @@
],
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
"rewardtime": true
},
{
"key": 26,
@ -585,7 +585,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 27,
@ -611,7 +611,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 28,
@ -637,7 +637,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 29,
@ -655,7 +655,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 30,
@ -677,7 +677,7 @@
],
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 31,
@ -699,7 +699,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 32,
@ -721,7 +721,7 @@
],
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
"rewardtime": true
},
{
"key": 33,
@ -751,7 +751,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 34,
@ -777,7 +777,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 35,
@ -803,7 +803,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 36,
@ -821,7 +821,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 37,
@ -843,7 +843,7 @@
],
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 38,
@ -865,7 +865,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 39,
@ -887,7 +887,7 @@
],
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
"rewardtime": true
},
{
"key": 40,
@ -917,7 +917,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 41,
@ -943,7 +943,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 42,
@ -969,7 +969,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 43,
@ -987,7 +987,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 44,
@ -1009,7 +1009,7 @@
],
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 45,
@ -1031,7 +1031,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 46,
@ -1053,7 +1053,7 @@
],
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
"rewardtime": true
},
{
"key": 47,
@ -1083,7 +1083,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 48,
@ -1109,7 +1109,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 49,
@ -1135,7 +1135,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 50,
@ -1153,7 +1153,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 51,
@ -1175,7 +1175,7 @@
],
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 52,
@ -1197,7 +1197,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 53,
@ -1219,7 +1219,7 @@
],
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
"rewardtime": true
},
{
"key": 54,
@ -1249,7 +1249,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 55,
@ -1275,7 +1275,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 56,
@ -1301,7 +1301,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 57,
@ -1319,7 +1319,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 58,
@ -1341,7 +1341,7 @@
],
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 59,
@ -1363,7 +1363,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 60,
@ -1385,7 +1385,7 @@
],
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
"rewardtime": true
},
{
"key": 61,
@ -1415,7 +1415,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 62,
@ -1441,7 +1441,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 63,
@ -1467,7 +1467,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 64,
@ -1485,7 +1485,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 65,
@ -1507,7 +1507,7 @@
],
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 66,
@ -1529,7 +1529,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 67,
@ -1551,7 +1551,7 @@
],
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
"rewardtime": true
},
{
"key": 68,
@ -1581,7 +1581,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 69,
@ -1607,7 +1607,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 70,
@ -1633,7 +1633,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 71,
@ -1651,7 +1651,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 72,
@ -1673,7 +1673,7 @@
],
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 73,
@ -1695,7 +1695,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 74,
@ -1717,7 +1717,7 @@
],
"roundinterval": 2,
"roundtime": 5000,
"rewardtime": 1
"rewardtime": true
},
{
"key": 75,
@ -1747,7 +1747,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 76,
@ -1773,7 +1773,7 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
},
{
"key": 77,
@ -1799,6 +1799,6 @@
],
"roundinterval": 2,
"roundtime": 2000,
"rewardtime": 0
"rewardtime": false
}
]

File diff suppressed because it is too large Load Diff

View File

@ -9,8 +9,8 @@
"refreshtime": 1,
"packagetype": "",
"buy_num": 1,
"issp": 0,
"isrecommend": 0,
"issp": false,
"isrecommend": false,
"packagename": {
"key": "paypackage_paypackage_packagename_20001",
"text": "每日好礼"
@ -40,8 +40,8 @@
"refreshtime": 1,
"packagetype": "",
"buy_num": 1,
"issp": 0,
"isrecommend": 0,
"issp": false,
"isrecommend": false,
"packagename": {
"key": "paypackage_paypackage_packagename_20002",
"text": "每日好礼"
@ -71,8 +71,8 @@
"refreshtime": 1,
"packagetype": "",
"buy_num": 1,
"issp": 0,
"isrecommend": 0,
"issp": false,
"isrecommend": false,
"packagename": {
"key": "paypackage_paypackage_packagename_20003",
"text": "每日好礼"
@ -102,8 +102,8 @@
"refreshtime": 1,
"packagetype": "",
"buy_num": 1,
"issp": 0,
"isrecommend": 0,
"issp": false,
"isrecommend": false,
"packagename": {
"key": "paypackage_paypackage_packagename_20004",
"text": "每日好礼"
@ -133,8 +133,8 @@
"refreshtime": 1,
"packagetype": "",
"buy_num": 1,
"issp": 0,
"isrecommend": 0,
"issp": false,
"isrecommend": false,
"packagename": {
"key": "paypackage_paypackage_packagename_20005",
"text": "每日好礼"
@ -164,8 +164,8 @@
"refreshtime": 30,
"packagetype": "",
"buy_num": 2,
"issp": 1,
"isrecommend": 1,
"issp": true,
"isrecommend": true,
"packagename": {
"key": "paypackage_paypackage_packagename_20006",
"text": "兑换礼包"
@ -195,8 +195,8 @@
"refreshtime": 30,
"packagetype": "drawcard_pack1",
"buy_num": 3,
"issp": 0,
"isrecommend": 0,
"issp": false,
"isrecommend": false,
"packagename": {
"key": "paypackage_paypackage_packagename_20007",
"text": "招募礼包1"
@ -220,8 +220,8 @@
"refreshtime": 30,
"packagetype": "drawcard_pack2",
"buy_num": 3,
"issp": 0,
"isrecommend": 0,
"issp": false,
"isrecommend": false,
"packagename": {
"key": "paypackage_paypackage_packagename_20008",
"text": "限时礼包1"
@ -245,8 +245,8 @@
"refreshtime": 30,
"packagetype": "drawcard_pack3",
"buy_num": 3,
"issp": 0,
"isrecommend": 0,
"issp": false,
"isrecommend": false,
"packagename": {
"key": "paypackage_paypackage_packagename_20009",
"text": "限时礼包2"
@ -270,8 +270,8 @@
"refreshtime": 30,
"packagetype": "drawcard_pack4",
"buy_num": 3,
"issp": 0,
"isrecommend": 0,
"issp": false,
"isrecommend": false,
"packagename": {
"key": "paypackage_paypackage_packagename_20010",
"text": "限时礼包3"

View File

@ -9,7 +9,7 @@
"text": "这好像不是熊猫?"
},
"time": 90,
"speed": 12264
"speed": 7214
},
{
"id": "2",
@ -20,8 +20,8 @@
"key": "playerinfor_barrage_2",
"text": "看起来像个画家。"
},
"time": 317,
"speed": 9011
"time": 203,
"speed": 8092
},
{
"id": "3",
@ -32,8 +32,8 @@
"key": "playerinfor_barrage_3",
"text": "为什么会觉得是熊猫啊?"
},
"time": 524,
"speed": 10110
"time": 311,
"speed": 11716
},
{
"id": "4",
@ -44,8 +44,8 @@
"key": "playerinfor_barrage_4",
"text": "从石头里蹦出来的人?怎么感觉有点熟悉……"
},
"time": 668,
"speed": 7968
"time": 451,
"speed": 10044
},
{
"id": "5",
@ -56,8 +56,8 @@
"key": "playerinfor_barrage_5",
"text": "你可能是听说过从石头里蹦出来的猴子。"
},
"time": 873,
"speed": 10282
"time": 633,
"speed": 11550
},
{
"id": "6",
@ -68,8 +68,8 @@
"key": "playerinfor_barrage_6",
"text": "你是从石头里蹦出来的?!"
},
"time": 996,
"speed": 10272
"time": 783,
"speed": 12018
},
{
"id": "7",
@ -80,8 +80,8 @@
"key": "playerinfor_barrage_7",
"text": "不!那不是我!"
},
"time": 1096,
"speed": 11342
"time": 987,
"speed": 10050
},
{
"id": "8",
@ -92,8 +92,8 @@
"key": "playerinfor_barrage_8",
"text": "哦,传承之人……"
},
"time": 1234,
"speed": 10410
"time": 1189,
"speed": 12814
},
{
"id": "9",
@ -104,8 +104,8 @@
"key": "playerinfor_barrage_9",
"text": "月光能量都汇集在他身上了!"
},
"time": 1464,
"speed": 12515
"time": 1408,
"speed": 11023
},
{
"id": "10",
@ -116,8 +116,8 @@
"key": "playerinfor_barrage_10",
"text": "那应该不会爆炸吧?"
},
"time": 1666,
"speed": 8088
"time": 1628,
"speed": 12614
},
{
"id": "11",
@ -128,8 +128,8 @@
"key": "playerinfor_barrage_11",
"text": "阿宝,你为什么站那么远?"
},
"time": 1843,
"speed": 12569
"time": 1815,
"speed": 10765
},
{
"id": "312",
@ -141,7 +141,7 @@
"text": "哦!那是什么?"
},
"time": 90,
"speed": 12411
"speed": 7260
},
{
"id": "313",
@ -152,8 +152,8 @@
"key": "playerinfor_barrage_313",
"text": "我有种被她注视的感觉……"
},
"time": 223,
"speed": 10607
"time": 295,
"speed": 7199
},
{
"id": "314",
@ -164,8 +164,8 @@
"key": "playerinfor_barrage_314",
"text": "好像是一种叫做“照相”的魔法……"
},
"time": 442,
"speed": 9473
"time": 455,
"speed": 8046
},
{
"id": "315",
@ -176,8 +176,8 @@
"key": "playerinfor_barrage_315",
"text": "我看这魔法不是很疼。"
},
"time": 636,
"speed": 12893
"time": 562,
"speed": 12812
},
{
"id": "316",
@ -188,8 +188,8 @@
"key": "playerinfor_barrage_316",
"text": "据说它的作用是封印灵魂?"
},
"time": 842,
"speed": 10418
"time": 726,
"speed": 12955
},
{
"id": "317",
@ -200,8 +200,8 @@
"key": "playerinfor_barrage_317",
"text": "月中人的传承居然这么可怕?!"
},
"time": 1049,
"speed": 8644
"time": 911,
"speed": 11454
},
{
"id": "318",
@ -212,8 +212,8 @@
"key": "playerinfor_barrage_318",
"text": "哦!你们真是够了!"
},
"time": 1286,
"speed": 8771
"time": 1088,
"speed": 12528
},
{
"id": "319",
@ -224,8 +224,8 @@
"key": "playerinfor_barrage_319",
"text": "照相不是魔法!也不能封印灵魂!"
},
"time": 1511,
"speed": 12398
"time": 1248,
"speed": 8490
},
{
"id": "320",
@ -236,8 +236,8 @@
"key": "playerinfor_barrage_320",
"text": "那她是在干什么?"
},
"time": 1751,
"speed": 10489
"time": 1357,
"speed": 10674
},
{
"id": "321",
@ -248,8 +248,8 @@
"key": "playerinfor_barrage_321",
"text": "……别问。"
},
"time": 1955,
"speed": 8701
"time": 1579,
"speed": 12352
},
{
"id": "322",
@ -260,8 +260,8 @@
"key": "playerinfor_barrage_322",
"text": "那可以教我吗?"
},
"time": 2058,
"speed": 7459
"time": 1698,
"speed": 9598
},
{
"id": "323",
@ -272,8 +272,8 @@
"key": "playerinfor_barrage_323",
"text": "我也想学。"
},
"time": 2213,
"speed": 10095
"time": 1905,
"speed": 7049
},
{
"id": "324",
@ -284,7 +284,7 @@
"key": "playerinfor_barrage_324",
"text": "要不你们问问这个传承者?"
},
"time": 2420,
"speed": 12297
"time": 2046,
"speed": 12761
}
]

View File

@ -24,7 +24,7 @@
"time": 240,
"rebate": 1500,
"isdayrepeat": 0,
"force": 0,
"force": false,
"recharge": "push_gift_1"
},
{
@ -52,7 +52,7 @@
"time": 240,
"rebate": 1000,
"isdayrepeat": 0,
"force": 0,
"force": false,
"recharge": "push_gift_2"
},
{
@ -80,7 +80,7 @@
"time": 240,
"rebate": 1000,
"isdayrepeat": 0,
"force": 0,
"force": false,
"recharge": "push_gift_3"
},
{
@ -108,7 +108,7 @@
"time": 240,
"rebate": 900,
"isdayrepeat": 0,
"force": 0,
"force": false,
"recharge": "push_gift_4"
},
{
@ -136,7 +136,7 @@
"time": 240,
"rebate": 900,
"isdayrepeat": 0,
"force": 0,
"force": false,
"recharge": "push_gift_5"
},
{
@ -164,7 +164,7 @@
"time": 240,
"rebate": 600,
"isdayrepeat": 0,
"force": 0,
"force": false,
"recharge": "push_gift_6"
},
{
@ -192,7 +192,7 @@
"time": 240,
"rebate": 600,
"isdayrepeat": 0,
"force": 0,
"force": false,
"recharge": "push_gift_7"
}
]

View File

@ -430,7 +430,20 @@
30001,
30002,
30003,
30004
30004,
30005,
30006,
30007,
30008,
30009,
30010,
30011,
30012,
30013,
30014,
30015,
30016,
30017
]
}
]

File diff suppressed because it is too large Load Diff

View File

@ -14823,7 +14823,7 @@
{
"Id": 224008114,
"EmitPR": 1000,
"From": 4,
"From": 9,
"Where": [],
"Order": "",
"Limit": 1,
@ -15440,7 +15440,7 @@
"Where": [],
"Order": "Type=Rand",
"Limit": 2,
"ExecuteCnt": 1,
"ExecuteCnt": 2,
"Type": 1,
"Argu": [
1,
@ -37102,7 +37102,7 @@
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "HasBuffDown=0",
"Order": "HasBuffDown=3",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 8,
@ -37127,7 +37127,7 @@
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "HasBuffDown=0",
"Order": "HasBuffDown=3",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 8,

View File

@ -11020,6 +11020,39 @@
],
"map": ""
},
{
"id": 124008121,
"level": 1,
"MaxLV": 1,
"UnavailablePlayTypes": [],
"SkillFlag": 1,
"EffectFlag": 5,
"Priority": 1,
"Name": {
"key": "skill_skill_atk_Name_124008111",
"text": "回马枪"
},
"ico": "jn_24008_1",
"CorrectPos": 0,
"IsMelee": 1,
"act": "Skill_1",
"Type": 1,
"CD": 0,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
224008114
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_124008111_1",
"text": "某悍夫那特在场则本次攻击额外附加目标最大生命值5%的伤害但最高无法超过自身攻击力的60%。"
},
"buffid": [],
"map": ""
},
{
"id": 124008211,
"level": 1,
@ -11205,6 +11238,39 @@
],
"map": ""
},
{
"id": 124008221,
"level": 1,
"MaxLV": 1,
"UnavailablePlayTypes": [],
"SkillFlag": 3,
"EffectFlag": 6,
"Priority": 2,
"Name": {
"key": "skill_skill_atk_Name_124008211",
"text": "迅猛突袭"
},
"ico": "jn_24008_2",
"CorrectPos": 0,
"IsMelee": 1,
"act": "Skill_2",
"Type": 1,
"CD": 4,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
224008214
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_124008211_1",
"text": "若悍夫那特在场,则本次攻击额外造成伤害。"
},
"buffid": [],
"map": ""
},
{
"id": 124008311,
"level": 1,
@ -11598,6 +11664,39 @@
"buffid": [],
"map": ""
},
{
"id": 134008121,
"level": 1,
"MaxLV": 1,
"UnavailablePlayTypes": [],
"SkillFlag": 1,
"EffectFlag": 5,
"Priority": 1,
"Name": {
"key": "skill_skill_atk_Name_134008111",
"text": "疾风飞矛"
},
"ico": "jn_34008_1",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_1",
"Type": 1,
"CD": 0,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
234008114
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_134008111_1",
"text": "若暴芙那特在场则本次攻击额外随机攻击2个目标。"
},
"buffid": [],
"map": ""
},
{
"id": 134008211,
"level": 1,
@ -11783,6 +11882,39 @@
],
"map": ""
},
{
"id": 134008221,
"level": 1,
"MaxLV": 1,
"UnavailablePlayTypes": [],
"SkillFlag": 3,
"EffectFlag": 6,
"Priority": 2,
"Name": {
"key": "skill_skill_atk_Name_134008211",
"text": "连续奇袭"
},
"ico": "jn_34008_2",
"CorrectPos": 0,
"IsMelee": 1,
"act": "Skill_2",
"Type": 1,
"CD": 4,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
224008214
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_134008211_1",
"text": "若暴芙那特在场,则本次攻击额外造成伤害。"
},
"buffid": [],
"map": ""
},
{
"id": 134008311,
"level": 1,

View File

@ -1438,8 +1438,8 @@
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_fs",
"buffeffect": "effect_34002_skill_1_hit_1",
"buffpos": "",
"buffeffect": "effect_common_fusu",
"buffpos": "根节点",
"TriggerEffect": "",
"TriggerPos": "",
"TriggerAnim": "",
@ -2110,7 +2110,7 @@
"buffpos": "",
"TriggerEffect": "",
"TriggerPos": "",
"TriggerAnim": "",
"TriggerAnim": "Buff",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@ -4114,7 +4114,7 @@
"buffpos": "根节点",
"TriggerEffect": "",
"TriggerPos": "",
"TriggerAnim": "",
"TriggerAnim": "Buff",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@ -12902,7 +12902,7 @@
"buffpos": "根节点",
"TriggerEffect": "",
"TriggerPos": "",
"TriggerAnim": "",
"TriggerAnim": "Buff",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
@ -13440,7 +13440,7 @@
"buffpos": "",
"TriggerEffect": "",
"TriggerPos": "",
"TriggerAnim": "",
"TriggerAnim": "Buff",
"forbidFloat": 0,
"ReplaceBuffID": 0
},

View File

@ -206,7 +206,7 @@
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"TriggerAnim": "",
"TriggerAnim": "Passive",
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
@ -648,7 +648,7 @@
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"TriggerAnim": "",
"TriggerAnim": "Passive",
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
@ -776,7 +776,7 @@
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"TriggerAnim": "",
"TriggerAnim": "Passive",
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
@ -1584,7 +1584,7 @@
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"TriggerAnim": "",
"TriggerAnim": "Passive",
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
@ -2711,7 +2711,7 @@
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"TriggerAnim": "",
"TriggerAnim": "Passive",
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
@ -2818,7 +2818,7 @@
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"TriggerAnim": "",
"TriggerAnim": "Passive",
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
@ -2923,7 +2923,7 @@
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"TriggerAnim": "",
"TriggerAnim": "Passive",
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
@ -3563,7 +3563,7 @@
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
224008114
124008121
]
},
{
@ -3586,7 +3586,7 @@
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
224008214
124008221
]
},
{
@ -3609,7 +3609,7 @@
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
234008114
134008121
]
},
{
@ -3632,7 +3632,7 @@
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 0,
"Callback": [
234008214
134008221
]
},
{

View File

@ -38,12 +38,10 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.BuriedInfoReq) (err
conditions = append(conditions, comm.GetBuriedConIProgress(items.Btype, v))
}
}
session.SendMsg(string(this.module.GetType()), "inquireprogress", &pb.BuriedInfoResp{Conitems: conditions})
session.SendMsg(string(this.module.GetType()), "info", &pb.BuriedInfoResp{Conitems: conditions})
//回收
for _, v := range conditions {
comm.PutburiedConIProgress(v)
}
return
}

View File

@ -677,7 +677,6 @@ func (this *Buried) trigger(session comm.IUserSession, burieds ...*pb.BuriedPara
notify[string(comm.ModuleWtask)] = append(notify[string(comm.ModuleWtask)], cp)
}
}
}
}
@ -686,6 +685,7 @@ func (this *Buried) trigger(session comm.IUserSession, burieds ...*pb.BuriedPara
this.Error("更新用户埋点数据错误!", log.Field{Key: "err", Value: err.Error()})
return
}
session.SendMsg(string(this.GetType()), "change", &pb.BuriedChangePush{Conitems: changes})
}
if len(notify) > 0 {

View File

@ -23,15 +23,21 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.ShopBuyReq) (er
// /获取用户商品列表
func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (errdata *pb.ErrorData) {
var (
err error
conf *cfg.GameShopitemData
shopData *pb.DBShop
good *pb.UserShopGood
record *pb.UserShopData
need []*cfg.Gameatn
give []*cfg.Gameatn
award []*pb.UserAtno
tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0)
err error
conf *cfg.GameShopitemData
condiIds []int32
condis []*pb.ConIProgress
condisMap map[int32]*pb.ConIProgress
addbuynum int32
condi *pb.ConIProgress
shopData *pb.DBShop
good *pb.UserShopGood
record *pb.UserShopData
need []*cfg.Gameatn
give []*cfg.Gameatn
award []*pb.UserAtno
tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0)
ok bool
)
if errdata = this.BuyCheck(session, req); errdata != nil {
return
@ -72,13 +78,43 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (errdata
if conf, err = this.module.configure.GetShopItemsConfigure(good.Gid); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Code: pb.ErrorCode_ConfigNoFound,
Message: err.Error(),
}
return
}
condiIds = append(condiIds, conf.Buymaxcond...)
condiIds = append(condiIds, conf.Unlock...)
if condis, err = this.module.ModuleBuried.CheckCondition(session, condiIds...); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Message: err.Error(),
}
return
}
condisMap = make(map[int32]*pb.ConIProgress)
for _, v := range condis {
condisMap[v.Conid] = v
}
ok = true
for _, v := range conf.Buymaxcond {
if condi, ok = condisMap[v]; !ok || condi.State == pb.BuriedItemFinishState_buried_unfinish {
ok = false
break
}
}
if ok {
addbuynum = conf.Addminnum
}
for _, v := range conf.Unlock {
if condi, ok = condisMap[v]; !ok || condi.State == pb.BuriedItemFinishState_buried_unfinish {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Message: fmt.Sprintf("%d is lock!", v),
}
return
}
}
need = make([]*cfg.Gameatn, len(conf.Need))
for i, v := range conf.Need {
need[i] = &cfg.Gameatn{
@ -97,7 +133,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (errdata
}
}
if conf.Buyminnum-good.Buy < req.BuyNum {
if conf.Buyminnum+addbuynum-good.Buy < req.BuyNum {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ShopGoodsIsSoldOut,
Title: pb.ErrorCode_ShopGoodsIsSoldOut.ToString(),

View File

@ -41,7 +41,7 @@ func (this *apiComp) FuncGetList(session comm.IUserSession, req *pb.SysFuncGetLi
id := this.module.modelSys.CheckValidCond(session.GetUserId(), v, list)
if id != "" {
if v.ActivateType == 1 { // 需要手动激活的
if v.ActivateType { // 需要手动激活的
list.Cond[id] = 1 //设置激活
} else {
list.Cond[id] = 2 //自动激活
@ -58,7 +58,7 @@ func (this *apiComp) FuncGetList(session comm.IUserSession, req *pb.SysFuncGetLi
if conf, ok := opencfg.GetDataMap()[key]; ok {
id := this.module.modelSys.CheckValidCond(session.GetUserId(), conf, list)
if id != "" {
if conf.ActivateType == 1 { // 需要手动激活的
if conf.ActivateType { // 需要手动激活的
list.Cond[id] = 1 //设置激活
} else {
list.Cond[id] = 2 //自动激活

View File

@ -171,7 +171,7 @@ func (this *ModuleSys) GMOpenAllCondition(uid string) {
return
}
for _, v := range opencfg.GetDataList() {
if v.ActivateType != 1 { // 跳过手动激活类型
if !v.ActivateType { // 跳过手动激活类型
list.Cond[v.Id] = 2
}

View File

@ -33,8 +33,6 @@ type ShopItem struct {
Sale int32 `protobuf:"varint,5,opt,name=Sale,proto3" json:"Sale"` //打折
LeftBuyNum int32 `protobuf:"varint,6,opt,name=LeftBuyNum,proto3" json:"LeftBuyNum"` //还可购买次数
Preview *DB_Equipment `protobuf:"bytes,7,opt,name=preview,proto3" json:"preview"` //装备预览数据
Isunlock bool `protobuf:"varint,8,opt,name=isunlock,proto3" json:"isunlock"` //是否可以购买
Addbuynum int32 `protobuf:"varint,9,opt,name=addbuynum,proto3" json:"addbuynum"` //额外购买次数
}
func (x *ShopItem) Reset() {
@ -118,20 +116,6 @@ func (x *ShopItem) GetPreview() *DB_Equipment {
return nil
}
func (x *ShopItem) GetIsunlock() bool {
if x != nil {
return x.Isunlock
}
return false
}
func (x *ShopItem) GetAddbuynum() int32 {
if x != nil {
return x.Addbuynum
}
return 0
}
//获取装备列表请求
type ShopGetListReq struct {
state protoimpl.MessageState
@ -395,7 +379,7 @@ var file_shop_shop_msg_proto_rawDesc = []byte{
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x1a, 0x1c, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x65, 0x71, 0x75,
0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
0x97, 0x02, 0x0a, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x10, 0x0a, 0x03,
0xdd, 0x01, 0x0a, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x10, 0x0a, 0x03,
0x67, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x67, 0x69, 0x64, 0x12, 0x18,
0x0a, 0x07, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
0x07, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x49, 0x74, 0x65, 0x6d,
@ -408,41 +392,38 @@ var file_shop_shop_msg_proto_rawDesc = []byte{
0x79, 0x4e, 0x75, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x4c, 0x65, 0x66, 0x74,
0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x12, 0x27, 0x0a, 0x07, 0x70, 0x72, 0x65, 0x76, 0x69, 0x65,
0x77, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x5f, 0x45, 0x71, 0x75,
0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x07, 0x70, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x12,
0x1a, 0x0a, 0x08, 0x69, 0x73, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x08, 0x20, 0x01, 0x28,
0x08, 0x52, 0x08, 0x69, 0x73, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x1c, 0x0a, 0x09, 0x61,
0x64, 0x64, 0x62, 0x75, 0x79, 0x6e, 0x75, 0x6d, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09,
0x61, 0x64, 0x64, 0x62, 0x75, 0x79, 0x6e, 0x75, 0x6d, 0x22, 0x50, 0x0a, 0x0e, 0x53, 0x68, 0x6f,
0x70, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x73,
0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x54, 0x79, 0x70,
0x65, 0x12, 0x28, 0x0a, 0x0f, 0x49, 0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66,
0x72, 0x65, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x49, 0x73, 0x4d, 0x61,
0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x22, 0xfa, 0x01, 0x0a, 0x0f,
0x53, 0x68, 0x6f, 0x70, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12,
0x14, 0x0a, 0x05, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x49, 0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61,
0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f,
0x49, 0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12,
0x1f, 0x0a, 0x05, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09,
0x2e, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x47, 0x6f, 0x6f, 0x64, 0x73,
0x12, 0x2c, 0x0a, 0x11, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65,
0x73, 0x68, 0x4e, 0x75, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x11, 0x53, 0x75, 0x72,
0x70, 0x6c, 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x12, 0x28,
0x0a, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x74, 0x69, 0x6d,
0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66,
0x72, 0x65, 0x73, 0x68, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x2e, 0x0a, 0x12, 0x6c, 0x65, 0x66, 0x74,
0x66, 0x72, 0x65, 0x65, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x18, 0x07,
0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x6c, 0x65, 0x66, 0x74, 0x66, 0x72, 0x65, 0x65, 0x72, 0x65,
0x66, 0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x22, 0x52, 0x0a, 0x0a, 0x53, 0x68, 0x6f, 0x70,
0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79,
0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79,
0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x67, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
0x03, 0x67, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x03,
0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x22, 0x2e, 0x0a, 0x0b,
0x53, 0x68, 0x6f, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x05, 0x61,
0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65,
0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04,
0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x07, 0x70, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x22,
0x50, 0x0a, 0x0e, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
0x71, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
0x52, 0x05, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x49, 0x73, 0x4d, 0x61, 0x6e,
0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
0x52, 0x0f, 0x49, 0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73,
0x68, 0x22, 0xfa, 0x01, 0x0a, 0x0f, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73,
0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01,
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x49,
0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x02,
0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x49, 0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65,
0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x1f, 0x0a, 0x05, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x18, 0x04,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x52,
0x05, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x12, 0x2c, 0x0a, 0x11, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75,
0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28,
0x05, 0x52, 0x11, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73,
0x68, 0x4e, 0x75, 0x6d, 0x12, 0x28, 0x0a, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72,
0x65, 0x73, 0x68, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x6c,
0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x2e,
0x0a, 0x12, 0x6c, 0x65, 0x66, 0x74, 0x66, 0x72, 0x65, 0x65, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73,
0x68, 0x6e, 0x75, 0x6d, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x6c, 0x65, 0x66, 0x74,
0x66, 0x72, 0x65, 0x65, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x22, 0x52,
0x0a, 0x0a, 0x53, 0x68, 0x6f, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08,
0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x67, 0x69, 0x64, 0x18,
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x67, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x42, 0x75,
0x79, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x42, 0x75, 0x79, 0x4e,
0x75, 0x6d, 0x22, 0x2e, 0x0a, 0x0b, 0x53, 0x68, 0x6f, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73,
0x70, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61,
0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x33,
}
var (

View File

@ -904,7 +904,7 @@ var file_user_user_db_proto_rawDesc = []byte{
0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x0e,
0x0a, 0x02, 0x69, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x12, 0x1c,
0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28,
0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0xbe, 0x0b, 0x0a,
0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0x9e, 0x0b, 0x0a,
0x06, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02,
0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69,

View File

@ -14,6 +14,7 @@ type GameConsumeHeroData struct {
Key string
Type int32
Herocolor int32
Herotitel string
Hero int32
Img string
Intr string
@ -24,6 +25,7 @@ type GameConsumeHeroData struct {
Skillload int32
Skilleffect int32
Skillvalue int32
Lost []int32
}
const TypeId_GameConsumeHeroData = 187972836
@ -36,6 +38,7 @@ func (_v *GameConsumeHeroData)Deserialize(_buf map[string]interface{}) (err erro
{ var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } }
{ 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["herocolor"].(float64); !_ok_ { err = errors.New("herocolor error"); return }; _v.Herocolor = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["herotitel"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Herotitel error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Herotitel, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hero"].(float64); !_ok_ { err = errors.New("hero error"); return }; _v.Hero = int32(_tempNum_) }
{ var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["intr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Intr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Intr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
@ -59,6 +62,20 @@ func (_v *GameConsumeHeroData)Deserialize(_buf map[string]interface{}) (err erro
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skillload"].(float64); !_ok_ { err = errors.New("skillload error"); return }; _v.Skillload = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skilleffect"].(float64); !_ok_ { err = errors.New("skilleffect error"); return }; _v.Skilleffect = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skillvalue"].(float64); !_ok_ { err = errors.New("skillvalue error"); return }; _v.Skillvalue = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["lost"].([]interface{}); !_ok_ { err = errors.New("lost error"); return }
_v.Lost = 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.Lost = append(_v.Lost, _list_v_)
}
}
return
}

View File

@ -17,7 +17,7 @@ type GameMonkeyStageData struct {
Rounddirection []*Gamekv
Roundinterval int32
Roundtime int32
Rewardtime int32
Rewardtime bool
}
const TypeId_GameMonkeyStageData = -61334727
@ -46,7 +46,7 @@ func (_v *GameMonkeyStageData)Deserialize(_buf map[string]interface{}) (err erro
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["roundinterval"].(float64); !_ok_ { err = errors.New("roundinterval error"); return }; _v.Roundinterval = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["roundtime"].(float64); !_ok_ { err = errors.New("roundtime error"); return }; _v.Roundtime = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rewardtime"].(float64); !_ok_ { err = errors.New("rewardtime error"); return }; _v.Rewardtime = int32(_tempNum_) }
{ var _ok_ bool; if _v.Rewardtime, _ok_ = _buf["rewardtime"].(bool); !_ok_ { err = errors.New("rewardtime error"); return } }
return
}

View File

@ -20,8 +20,8 @@ type GamePayGiftpackData struct {
Refreshtime int32
Packagetype string
BuyNum int32
Issp int32
Isrecommend int32
Issp bool
Isrecommend bool
Packagename string
Costitem []*Gameatn
Item []*Gameatn
@ -43,8 +43,8 @@ func (_v *GamePayGiftpackData)Deserialize(_buf map[string]interface{}) (err erro
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["refreshtime"].(float64); !_ok_ { err = errors.New("refreshtime error"); return }; _v.Refreshtime = int32(_tempNum_) }
{ var _ok_ bool; if _v.Packagetype, _ok_ = _buf["packagetype"].(string); !_ok_ { err = errors.New("packagetype error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buy_num"].(float64); !_ok_ { err = errors.New("buy_num error"); return }; _v.BuyNum = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["issp"].(float64); !_ok_ { err = errors.New("issp error"); return }; _v.Issp = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["isrecommend"].(float64); !_ok_ { err = errors.New("isrecommend error"); return }; _v.Isrecommend = int32(_tempNum_) }
{ var _ok_ bool; if _v.Issp, _ok_ = _buf["issp"].(bool); !_ok_ { err = errors.New("issp error"); return } }
{ var _ok_ bool; if _v.Isrecommend, _ok_ = _buf["isrecommend"].(bool); !_ok_ { err = errors.New("isrecommend error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["packagename"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Packagename error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Packagename, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{
var _arr_ []interface{}

View File

@ -21,7 +21,7 @@ type GamePushGiftData struct {
Time int32
Rebate int32
Isdayrepeat int32
Force int32
Force bool
Recharge string
}
@ -81,7 +81,7 @@ func (_v *GamePushGiftData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time"].(float64); !_ok_ { err = errors.New("time error"); return }; _v.Time = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rebate"].(float64); !_ok_ { err = errors.New("rebate error"); return }; _v.Rebate = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["isdayrepeat"].(float64); !_ok_ { err = errors.New("isdayrepeat error"); return }; _v.Isdayrepeat = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["force"].(float64); !_ok_ { err = errors.New("force error"); return }; _v.Force = int32(_tempNum_) }
{ var _ok_ bool; if _v.Force, _ok_ = _buf["force"].(bool); !_ok_ { err = errors.New("force error"); return } }
{ var _ok_ bool; if _v.Recharge, _ok_ = _buf["recharge"].(string); !_ok_ { err = errors.New("recharge error"); return } }
return
}

View File

@ -0,0 +1,15 @@
//------------------------------------------------------------------------------
// <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
const (
TEnumEDayRepeatType_NonRepeatable = 0
TEnumEDayRepeatType_Repeatable = 1
TEnumEDayRepeatType_RepeatOnce = 2
)

View File

@ -0,0 +1,16 @@
//------------------------------------------------------------------------------
// <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
const (
TEnumEDispatchType_Excellent = 1
TEnumEDispatchType_Rare = 2
TEnumEDispatchType_Elite = 3
TEnumEDispatchType_Epic = 4
)

View File

@ -0,0 +1,16 @@
//------------------------------------------------------------------------------
// <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
const (
TEnumEGiftPackChildType_RecruitDay = 101
TEnumEGiftPackChildType_RecruitExchange = 102
TEnumEGiftPackChildType_RecruitPay = 103
TEnumEGiftPackChildType_LimitedTime = 104
)

View File

@ -0,0 +1,14 @@
//------------------------------------------------------------------------------
// <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
const (
TEnumEGiftPackType_Recruit = 1
TEnumEGiftPackType_LimitedTime = 2
)

View File

@ -0,0 +1,16 @@
//------------------------------------------------------------------------------
// <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
const (
TEnumEIsLandEventType_Story = 1
TEnumEIsLandEventType_Box = 2
TEnumEIsLandEventType_Fight = 3
TEnumEIsLandEventType_Make = 4
)

View File

@ -0,0 +1,13 @@
//------------------------------------------------------------------------------
// <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
const (
TEnumELevelType_Normal = 1
)

View File

@ -0,0 +1,14 @@
//------------------------------------------------------------------------------
// <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
const (
TEnumEPagodaType_Ordinary = 1
TEnumEPagodaType_Season = 2
)

View File

@ -0,0 +1,15 @@
//------------------------------------------------------------------------------
// <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
const (
TEnumEPassCheckTaskType_DayRefresh = 1
TEnumEPassCheckTaskType_WeekRefresh = 2
TEnumEPassCheckTaskType_NotRefresh = 3
)

View File

@ -0,0 +1,18 @@
//------------------------------------------------------------------------------
// <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
const (
TEnumEPassCheckType_Season = 1
TEnumEPassCheckType_Recruit = 2
TEnumEPassCheckType_Supply = 3
TEnumEPassCheckType_MoonDream = 4
TEnumEPassCheckType_Island = 5
TEnumEPassCheckType_TripleElimination = 6
)

View File

@ -0,0 +1,16 @@
//------------------------------------------------------------------------------
// <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
const (
TEnumEPlayerInforType_Skin = 1
TEnumEPlayerInforType_Action = 2
TEnumEPlayerInforType_BackGround = 3
TEnumEPlayerInforType_AvatarFrame = 4
)

View File

@ -0,0 +1,16 @@
//------------------------------------------------------------------------------
// <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
const (
TEnumEPriceGroupType_Arena = 1001
TEnumEPriceGroupType_Action = 1002
TEnumEPriceGroupType_Ps = 1003
TEnumEPriceGroupType_IslandRecruit = 2001
)

View File

@ -0,0 +1,19 @@
//------------------------------------------------------------------------------
// <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
const (
TEnumEPrivilegeType_Purchase = 1
TEnumEPrivilegeType_SpeciesStoreRefresh = 2
TEnumEPrivilegeType_CopyChallengeCount = 3
TEnumEPrivilegeType_ArenaChallengeCount = 5
TEnumEPrivilegeType_CaravanBagCount = 7
TEnumEPrivilegeType_GourmetTime = 8
TEnumEPrivilegeType_SmithyTime = 10
)

View File

@ -9,6 +9,7 @@
package cfg
const (
TEnumESex_None = 0
TEnumESex_Male = 1
TEnumESex_Female = 2
)

View File

@ -0,0 +1,16 @@
//------------------------------------------------------------------------------
// <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
const (
TEnumEWkqbxType_Hide = 0
TEnumEWkqbxType_Display = 1
TEnumEWkqbxType_DoNotDisplay = 2
TEnumEWkqbxType_Ash = 3
)

View File

@ -18,9 +18,9 @@ type GameOpencondData struct {
Img string
Prompt string
Uiid int32
ActivateType int32
ActivateType bool
Notify []string
Kqbx int32
Kqbx bool
KqbxUi string
KqbxText string
}
@ -52,7 +52,7 @@ func (_v *GameOpencondData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["prompt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Prompt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Prompt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["uiid"].(float64); !_ok_ { err = errors.New("uiid error"); return }; _v.Uiid = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["activateType"].(float64); !_ok_ { err = errors.New("activateType error"); return }; _v.ActivateType = int32(_tempNum_) }
{ var _ok_ bool; if _v.ActivateType, _ok_ = _buf["activateType"].(bool); !_ok_ { err = errors.New("activateType error"); return } }
{
var _arr_ []interface{}
var _ok_ bool
@ -67,7 +67,7 @@ func (_v *GameOpencondData)Deserialize(_buf map[string]interface{}) (err error)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["kqbx"].(float64); !_ok_ { err = errors.New("kqbx error"); return }; _v.Kqbx = int32(_tempNum_) }
{ var _ok_ bool; if _v.Kqbx, _ok_ = _buf["kqbx"].(bool); !_ok_ { err = errors.New("kqbx error"); return } }
{ var _ok_ bool; if _v.KqbxUi, _ok_ = _buf["kqbx_ui"].(string); !_ok_ { err = errors.New("kqbx_ui error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["kqbx_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.KqbxText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.KqbxText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return

View File

@ -21,7 +21,7 @@ type GameShopitemData struct {
Salelist []int32
Buyminnum int32
Buymaxcond []int32
Buymaxnum int32
Addminnum int32
Vip int32
Lvmin int32
Lvmax int32
@ -99,7 +99,7 @@ func (_v *GameShopitemData)Deserialize(_buf map[string]interface{}) (err error)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buymaxnum"].(float64); !_ok_ { err = errors.New("buymaxnum error"); return }; _v.Buymaxnum = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["addminnum"].(float64); !_ok_ { err = errors.New("addminnum error"); return }; _v.Addminnum = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["vip"].(float64); !_ok_ { err = errors.New("vip error"); return }; _v.Vip = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lvmin"].(float64); !_ok_ { err = errors.New("lvmin error"); return }; _v.Lvmin = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lvmax"].(float64); !_ok_ { err = errors.New("lvmax error"); return }; _v.Lvmax = int32(_tempNum_) }