liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

上传配置

Browse Source
This commit is contained in:
liwei 2023-07-03 14:14:02 +08:00
parent c5a605c3df
commit 1eabef7769
23 changed files with 591 additions and 556 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/json/game_global.json
View File

@ -328,10 +328,10 @@
"arena_RecordMax": 10,
"arena_RefreshCd": 10,
"show_male": [
100001
"16010101"
],
"show_female": [
200001
"16010101"
],
"horoscope_reset_cost": {
"a": "attr",

2
bin/json/game_opencond.json
View File

@ -606,7 +606,7 @@
"main": [
{
"key": 1,
"param": 9999
"param": 1
}
],
"wkqbx": 2,

18
bin/json/game_playerinfor_overview.json
View File

@ -8,6 +8,9 @@
107
],
"url": "100001",
"resources": "Person/10000/10000M.prefab",
"vague": "Person/10000/10000MT.prefab",
"pvpAnimator": "Person/10000/10000_MPvp.controller",
"playerhead": "tx_js_nz",
"name": {
"key": "playerinfor_playerinfor_overview_name_1",
@ -23,6 +26,9 @@
107
],
"url": "200001",
"resources": "Person/10000/10000W.prefab",
"vague": "Person/10000/10000WT.prefab",
"pvpAnimator": "Person/10000/10000_WPvp.controller",
"playerhead": "tx_js_nvz",
"name": {
"key": "playerinfor_playerinfor_overview_name_2",
@ -38,6 +44,9 @@
107
],
"url": "explore",
"resources": "",
"vague": "",
"pvpAnimator": "",
"playerhead": "tx_js_nz",
"name": {
"key": "playerinfor_playerinfor_overview_name_3",
@ -53,6 +62,9 @@
107
],
"url": "explore",
"resources": "",
"vague": "",
"pvpAnimator": "",
"playerhead": "tx_js_nvz",
"name": {
"key": "playerinfor_playerinfor_overview_name_4",
@ -68,6 +80,9 @@
107
],
"url": "character_cardshow",
"resources": "",
"vague": "",
"pvpAnimator": "",
"playerhead": "tx_js_nz",
"name": {
"key": "playerinfor_playerinfor_overview_name_5",
@ -83,6 +98,9 @@
107
],
"url": "character_cardshow",
"resources": "",
"vague": "",
"pvpAnimator": "",
"playerhead": "tx_js_nvz",
"name": {
"key": "playerinfor_playerinfor_overview_name_6",

26
bin/json/game_skillafteratk.json
View File

@ -2305,7 +2305,7 @@
390001107,
800,
1,
1
2
],
"FollowSK": [],
"SucFollowSK": [],
@ -2378,7 +2378,7 @@
390001008,
600,
1,
1
2
],
"FollowSK": [],
"SucFollowSK": [],
@ -2427,7 +2427,7 @@
390001008,
600,
1,
1
2
],
"FollowSK": [],
"SucFollowSK": [],
@ -2476,7 +2476,7 @@
390001008,
700,
1,
1
2
],
"FollowSK": [],
"SucFollowSK": [],
@ -2525,7 +2525,7 @@
390001008,
700,
1,
1
2
],
"FollowSK": [],
"SucFollowSK": [],
@ -2574,7 +2574,7 @@
390001008,
800,
1,
1
2
],
"FollowSK": [],
"SucFollowSK": [],
@ -2808,7 +2808,7 @@
390001008,
900,
1,
1
2
],
"FollowSK": [],
"SucFollowSK": [],
@ -2882,7 +2882,7 @@
390001008,
900,
1,
1
2
],
"FollowSK": [],
"SucFollowSK": [],
@ -2956,7 +2956,7 @@
390001008,
1000,
1,
1
2
],
"FollowSK": [],
"SucFollowSK": [],
@ -3030,7 +3030,7 @@
390001008,
1000,
1,
1
2
],
"FollowSK": [],
"SucFollowSK": [],
@ -13099,7 +13099,7 @@
"ExecuteCnt": 1,
"Type": 11,
"Argu": [
2,
1,
2,
180
],
@ -17326,12 +17326,12 @@
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 5,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
1000
5000
],
"FollowSK": [],
"SucFollowSK": [

188
bin/json/game_skillatk.json
View File

@ -52,7 +52,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125004111_1",
"text": "对敌方1个目标造成3次攻击力30%的伤害，有40%概率为自身附加2回合的[color=#37d8a9]免疫[/color]状态。"
"text": "对敌方1个目标造成次攻击力150%的伤害，有40%概率为自身附加2回合的[color=#37d8a9]免疫[/color]状态。"
},
"buffid": [
390001111
@ -522,7 +522,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135002111_1",
"text": "攻击一个敌方2次，伤害分别为自身攻击力30%和80%，每次向目标转嫁自身1个减益；转嫁成功时有50%的概率为目标附加1回合[color=#e5621b]眩晕[/color]。"
"text": "攻击一个敌方3次，伤害分别为自身攻击力50%和120%，每次向目标转嫁自身1个减益；转嫁成功时有50%的概率为目标附加1回合[color=#e5621b]眩晕[/color]。"
},
"buffid": [
390001105
@ -714,7 +714,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135002211_1",
"text": "自身[color=#37d8a9]不会失手[/color]。"
"text": "自身[color=#37d8a9]不会失手[/color]。敌方使其友方减益提前结束时，扣除其目前生命值30%，驱散其全部增益，为其附加1回合[color=#e5621b]【石化】[/color]。"
},
"buffid": [],
"map": ""
@ -743,7 +743,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135002311_1",
"text": "攻击敌方3次，每次伤害为自身攻击力35%。"
"text": "攻击敌方8次，每次伤害为自身攻击力35%，有80%概率驱散目标1个增益，并附加2回合[color=#e5621b]失手率提升[/color]。"
},
"buffid": [],
"map": ""
@ -1121,7 +1121,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124003111_1",
"text": "对敌方1个目标造成攻击力160%的伤害，并有70%的概率附加1回合[color=#37d8a9]睡眠[/color]状态。"
"text": "对敌方1个目标造成攻击力300%的伤害，并有70%的概率附加1回合[color=#37d8a9]睡眠[/color]状态。"
},
"buffid": [
390001118
@ -1347,7 +1347,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124003311_1",
"text": "对敌方造成攻击力80%的伤害，使敌方目标各减少30%行动值，并有100%概率附加1回合[color=#37d8a9]睡眠[/color][color=#e5621b]禁疗[/color]状态。"
"text": "对敌方造成4次攻击力125%的伤害，使敌方目标各减少30%行动值，并有100%概率附加1回合[color=#37d8a9]睡眠[/color]，2回合[color=#e5621b]禁疗[/color]状态。"
},
"buffid": [
390001118
@ -1642,7 +1642,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134006111_1",
"text": "对敌方1个目标造成2次攻击力50%伤害，60%概率为目标附加2回合[color=#e5621b]速度下降[/color]。"
"text": "对敌方1个目标造成2次攻击力200%伤害，60%概率为目标附加2回合[color=#e5621b]速度下降[/color]。"
},
"buffid": [
390001008
@ -1797,7 +1797,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134006211_1",
"text": "攻击敌方，伤害为自身攻击力210%，70%概率降低目标30%行动值。"
"text": "攻击敌方，伤害为自身攻击力360%，70%概率降低目标30%行动值。"
},
"buffid": [],
"map": ""
@ -1942,7 +1942,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134006311_1",
"text": "攻击敌方，伤害为自身攻击力300%，90%概率为目标附加2回合[color=#e5621b]速度下降[/color]和1回合[color=#e5621b]冰冻[/color]。"
"text": "攻击敌方，伤害为自身攻击力600%，90%概率为目标附加2回合[color=#e5621b]速度下降[/color]和1回合[color=#e5621b]冰冻[/color]。"
},
"buffid": [
390001008,
@ -2288,7 +2288,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125001111_1",
"text": "对敌方1个目标造成2次攻击力30%及防御力150%的伤害，有50%概率为目标附加2回合[color=#e5621b]攻击下降[/color]。"
"text": "对敌方全体目标造成3次攻击力100%及防御力250%的伤害，有50%概率为目标附加2回合[color=#e5621b]攻击下降[/color]。"
},
"buffid": [
390001006
@ -2444,7 +2444,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_125001211_1",
"text": "回合结束时，获得1回合[color=#37d8a9]玄御[/color]状态，效果期间的回合开始时会攻击敌方，伤害为自身防御力90%。"
"text": "回合结束时，获得1回合[color=#37d8a9]玄御[/color]状态，效果期间的回合开始时会攻击敌方，伤害为自身防御力200%。"
},
"buffid": [
390001210
@ -3107,7 +3107,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144005111_1",
"text": "小伊对敌方1个目标攻击2次，每次造成攻击力180%的伤害，并有50%概率吸收目标15%行动值。"
"text": "小伊对敌方1个目标攻击2次，每次造成攻击力200%的伤害，并有50%概率吸收目标15%行动值。"
},
"buffid": [],
"map": ""
@ -3409,7 +3409,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144005311_1",
"text": "攻击敌方，伤害为自身攻击力400%，75%概率驱散目标1个增益，每个驱散的增益提升友方5%行动值。"
"text": "攻击敌方，伤害为自身攻击力600%，75%概率驱散目标1个增益，每个驱散的增益提升友方5%行动值。"
},
"buffid": [],
"map": ""
@ -3753,7 +3753,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135001111_1",
"text": "攻击1个敌方，伤害为自身攻击力360%，攻击溅射随机2个敌方，伤害为自身攻击力180%。"
"text": "攻击1个敌方，伤害为自身攻击力100%，攻击溅射随机2个敌方，伤害为自身攻击力80%。"
},
"buffid": [
390001119,
@ -3968,7 +3968,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135001211_1",
"text": "攻击1个敌方，伤害为自身攻击力170%。"
"text": "攻击1个敌方，伤害为自身攻击力300%。"
},
"buffid": [],
"map": ""
@ -4120,7 +4120,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135001311_1",
"text": "攻击敌方2次，伤害为自身攻击360%。"
"text": "攻击敌方2次，伤害为自身攻击200%。"
},
"buffid": [
390001119,
@ -4462,7 +4462,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124004111_1",
"text": "攻击1个敌方，伤害为自身攻击力300%，60%概率为目标附加2回合[color=#e5621b]禁疗[/color]。"
"text": "攻击1个敌方，伤害为自身攻击力350%，60%概率为目标附加2回合[color=#e5621b]禁疗[/color]。"
},
"buffid": [
390001107
@ -4650,7 +4650,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124004311_1",
"text": "攻击敌方，伤害为自身攻击力600%，为目标附加2回合[color=#e5621b]速度下降[/color]和[color=#e5621b]中毒[/color]。"
"text": "攻击敌方，伤害为自身攻击力500%，为目标附加2回合[color=#e5621b]速度下降[/color]和[color=#e5621b]中毒[/color]。"
},
"buffid": [
390001008,
@ -4946,7 +4946,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144006111_1",
"text": "对敌方1个目标造成攻击力480%的伤害，自身每损失10%的生命，伤害提升5%。"
"text": "对敌方1个目标造成攻击力200%的伤害，为自身附加2回合[color=#37d8a9]护盾[/color] 。"
},
"buffid": [],
"map": ""
@ -5153,7 +5153,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144006311_1",
"text": "驱散敌方1个目标的全部增益效果，随后对其造成攻击力230%的伤害，同时自身受到此伤害30%的效果附加伤害，但是自身不会因为该伤害死亡。"
"text": "驱散敌方1个目标的全部增益效果，随后对其造成攻击力450%的伤害，同时自身受到此伤害30%的效果附加伤害，但是自身不会因为该伤害死亡。"
},
"buffid": [
390001001,
@ -5635,7 +5635,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115005111_1",
"text": "对敌方1个目标攻击2次，共造成攻击力90%的伤害，并未己方当前生命值最低的2个队友回复自身5%的最大生命值。"
"text": "对敌方1个目标攻击2次，造成攻击力150%的伤害，并为己方当前生命值最低的2个队友回复自身5%的最大生命值。"
},
"buffid": [],
"map": ""
@ -5816,7 +5816,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115005311_1",
"text": "提升友方20%行动值。"
"text": "提升全体友方20%行动值。治疗全体友方，治疗量为目标最大生命值25%。净化全体友方各1个减益，为无减益的目标附加1回合[color=#37d8a9]【免疫】[/color]。"
},
"buffid": [
390001111
@ -6012,7 +6012,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115004111_1",
"text": "攻击1个敌方3次，总伤害为自身攻击力160%，每次吸收目标10%行动值。"
"text": "攻击1个敌方3次，总伤害为自身攻击力300%，每次吸收目标10%行动值。"
},
"buffid": [],
"map": ""
@ -6128,7 +6128,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115004211_1",
"text": "攻击敌方，伤害为自身攻击力170%，85%概率为目标附加1回合[color=#e5621b]眩晕[/color]。"
"text": "攻击敌方，伤害为自身攻击力350%，85%概率为目标附加1回合[color=#e5621b]眩晕[/color]。"
},
"buffid": [
390001105
@ -6646,7 +6646,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124002111_1",
"text": "攻击随机2个敌方，伤害为自身攻击力200%，为目标附加[color=#e5621b]童真[/color] 。"
"text": "攻击随机2个敌方，伤害为自身攻击力140%，为目标附加[color=#e5621b]童真[/color] 。"
},
"buffid": [
390001211
@ -6866,7 +6866,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124002311_1",
"text": "攻击敌方3次，伤害是攻击力600%。并为目标附加童真状态。"
"text": "攻击敌方3次，伤害是攻击力450%。并为目标附加童真状态。"
},
"buffid": [
390001211,
@ -7092,7 +7092,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114007111_1",
"text": "攻击1个敌方，伤害为自身攻击力30%及防御力150%，50%概率为目标附加2回合[color=#e5621b]防御下降[/color]。"
"text": "攻击1个敌方，伤害为自身攻击力50%及防御力110%，50%概率为目标附加2回合[color=#e5621b]防御下降[/color]。"
},
"buffid": [
390001007
@ -7377,7 +7377,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114007311_1",
"text": "攻击敌方，伤害为自身防御力80%，30%概率为目标附加1回合[color=#e5621b]挑衅[/color]；目标防御比自身低时，概率翻倍。"
"text": "攻击敌方，伤害为自身防御力300%，30%概率为目标附加1回合[color=#e5621b]挑衅[/color]；目标防御比自身低时，概率翻倍。"
},
"buffid": [
390001110
@ -7607,7 +7607,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114003111_1",
"text": "攻击1个敌方，伤害为自身攻击力150%，50%概率降低目标30%行动值。"
"text": "攻击1个敌方，伤害为自身攻击力160%，50%概率降低目标30%行动值，每点速度提供攻击力0.33%额外伤害。"
},
"buffid": [],
"map": ""
@ -7917,7 +7917,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114003311_1",
"text": "攻击1个敌方3次，每次伤害为自身攻击力265%，每次有40%概率降低目标30%行动值。"
"text": "攻击1个敌方3次，每次伤害为自身攻击力200%，每次有40%概率降低目标30%行动值。"
},
"buffid": [],
"map": ""
@ -8091,7 +8091,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145003111_1",
"text": "对敌方1个目标造成攻击力90%和自身生命值5%伤害。"
"text": "对敌方1个目标造成攻击力150%和自身生命值5.5%伤害。"
},
"buffid": [],
"map": ""
@ -8910,7 +8910,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113003111_1",
"text": "啊啊对敌方1个目标造成攻击力250%的伤害，并有60%概率附加1回合[color=#e5621b]挑衅[/color]状态。"
"text": "啊啊对敌方1个目标造成攻击力300%的伤害，并有60%概率附加1回合[color=#e5621b]挑衅[/color]状态。"
},
"buffid": [
390001110
@ -9409,7 +9409,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135005111_1",
"text": "幸运·普雷斯科特对敌方1个目标造成攻击力140%的伤害，每点速度可额外造成攻击力0.4%的伤害。"
"text": "幸运·普雷斯科特对敌方1个目标造成攻击力400%和速度4.5%的伤害"
},
"buffid": [],
"map": ""
@ -9554,7 +9554,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135005211_1",
"text": "幸运·普雷斯科特对敌方目标造成200%伤害。"
"text": "幸运·普雷斯科特对敌方目标造成350%伤害。"
},
"buffid": [],
"map": ""
@ -9701,7 +9701,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135005311_1",
"text": "幸运·普雷斯科特为己方附加2回合[color=#37d8a9]免疫[/color]和[color=#37d8a9]防御提升[/color]状态，并对敌方目标造成攻击力500%的伤害，并附加2回合[color=#e5621b]攻击下降[/color]的状态。"
"text": "幸运·普雷斯科特为己方附加2回合[color=#37d8a9]免疫[/color]和[color=#37d8a9]防御提升[/color]状态，并对敌方目标造成攻击力4 00%的伤害，并附加2回合[color=#e5621b]攻击下降[/color]的状态。"
},
"buffid": [
390001111,
@ -10029,7 +10029,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145001111_1",
"text": "乌龟大师对敌方1个目标发起2段攻击，每段可造成攻击力150%的伤害，对目标附加2回合[color=#e5621b]烙印[/color]状态，并有70%概率夺取目标1个增益状态。"
"text": "乌龟大师对敌方1个目标发起攻击，每段可造成攻击力200%的伤害，对目标附加2回合[color=#e5621b]烙印[/color]状态，并有70%概率夺取目标1个增益状态。"
},
"buffid": [
390001101
@ -10346,7 +10346,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_145001311_1",
"text": "乌龟大师净化自身所有减益状态，同时驱散敌方所有增益状态，随后对敌方造成攻击力600%的伤害，共附加2回合[color=#e5621b]防御下降[/color][/color]状态。"
"text": "乌龟大师净化自身所有减益状态，同时驱散敌方所有增益状态，随后对敌方造成攻击力420%的伤害，共附加2回合[color=#e5621b]防御下降[/color][/color]状态。"
},
"buffid": [
390001007
@ -10509,7 +10509,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114001111_1",
"text": "史图依克对敌方1个目标造成攻击力80%以及防御力165%的伤害，并有60%概率附加2回合[color=#e5621b]防御下降[/color][/color]效果。"
"text": "史图依克对敌方1个目标造成攻击力80%以及防御力120%的伤害，并有60%概率附加2回合[color=#e5621b]防御下降[/color]效果。"
},
"buffid": [
390001007
@ -10699,7 +10699,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114001311_1",
"text": "史图依克对敌方1个目标造成攻击力80%以及防御力120%的伤害，并[color=#e5621b]挑衅[/color]1名敌人2回合。"
"text": "史图依克对敌方1个目标造成攻击力100%以及防御力220%的伤害，并[color=#e5621b]挑衅[/color]1名敌人2回合。"
},
"buffid": [
390001202,
@ -10901,7 +10901,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124008111_1",
"text": "暴芙那特对敌方1个目标造成2次自身攻击力180%的伤害，并有40%概率附加2回合[color=#e5621b]烙印[/color]效果。"
"text": "暴芙那特对敌方1个目标造成2次自身攻击力150%的伤害，并有40%概率附加2回合[color=#e5621b]烙印[/color]效果。"
},
"buffid": [
390001101
@ -11061,7 +11061,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124008211_1",
"text": "暴芙那特对敌方造成2次自身攻击力180%的伤害，并有40%概率附加2回合[color=#e5621b]速度下降[/color]效果。"
"text": "暴芙那特对敌方造成1次自身攻击力200%的伤害，并有40%概率附加2回合[color=#e5621b]速度下降[/color]效果。"
},
"buffid": [
390001008
@ -11222,7 +11222,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124008311_1",
"text": "暴芙那特先为自身施加2回合[color=#37d8a9]暴击提升[/color]效果，之后对敌方1个目标造成3次自身攻击力200%的伤害，并附加2回合[color=#e5621b]防御下降[/color][/color]效果。"
"text": "暴芙那特先为自身施加2回合[color=#37d8a9]暴击提升[/color]效果，之后对敌方1个目标造成3次自身攻击力140%的伤害，并附加2回合[color=#e5621b]防御下降[/color]效果。"
},
"buffid": [
390001004,
@ -11420,7 +11420,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134008111_1",
"text": "悍夫那特对敌方一个目标造成1次自身攻击力300%的伤害，并有40%概率击退目标10%行动值。"
"text": "悍夫那特对敌方一个目标造成1次自身攻击力400%的伤害，并有40%概率击退目标10%行动值。"
},
"buffid": [],
"map": ""
@ -11570,7 +11570,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134008211_1",
"text": "悍夫那特对敌方造成2次自身攻击力135%的伤害，并有40%概率附加1回合[color=#e5621b]眩晕[/color]效果。"
"text": "悍夫那特对敌方造成3次自身攻击力120%的伤害，并有40%概率附加1回合[color=#e5621b]眩晕[/color]效果。"
},
"buffid": [
390001105
@ -11730,7 +11730,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134008311_1",
"text": "悍夫那特先为自身施加2回合[color=#37d8a9]速度提升[/color]效果，之后对敌方1个目标造成4次自身攻击力200%的伤害，并吸收目标10行动值。"
"text": "悍夫那特先为自身施加2回合[color=#37d8a9]速度提升[/color]效果，之后对敌方1个目标造成4次自身攻击力125%的伤害，并吸收目标10行动值。"
},
"buffid": [
390001003
@ -11890,7 +11890,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113002111_1",
"text": "食人鱼先生对敌方1个目标造成攻击力400%的伤害；若发生暴击，生化武器冷却时间减少1回合。"
"text": "食人鱼先生对敌方1个目标造成攻击力200%的伤害；若发生暴击，生化武器冷却时间减少1回合。"
},
"buffid": [],
"map": ""
@ -12039,7 +12039,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113002211_1",
"text": "食人鱼先生对敌方1个目标造成攻击力450%的伤害，有85%概率附加2回合[color=#e5621b]防御下降[/color][/color]状态。"
"text": "食人鱼先生对敌方1个目标造成攻击力300%的伤害，有85%概率附加2回合[color=#e5621b]防御下降[/color]状态。"
},
"buffid": [
390001007
@ -12196,7 +12196,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113002311_1",
"text": "食人鱼先生对敌方目标造成攻击力500%的伤害；若目标死亡，则附加1次攻击，对随机1个目标造成攻击力300%的伤害，本次攻击无视防御。"
"text": "食人鱼先生对敌方目标造成攻击力400%的伤害；若目标死亡，则附加1次攻击，对随机1个目标造成攻击力250%的伤害，本次攻击无视防御。"
},
"buffid": [],
"map": ""
@ -12523,7 +12523,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143002111_1",
"text": "果酱教授对敌方1个目标造成攻击力360%的伤害，有75%概率对其施加2回合[color=#e5621b]速度下降[/color]状态，并有75%概率将自身1个减益状态转移给目标。"
"text": "果酱教授对敌方1个目标造成攻击力300%的伤害，有75%概率对其施加2回合[color=#e5621b]速度下降[/color]状态，并有75%概率将自身1个减益状态转移给目标。"
},
"buffid": [
390001008
@ -12703,7 +12703,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143002311_1",
"text": "果酱教授对敌方造成攻击力300%的伤害，有100%的概率减少各目标15%的行动值；若目标身上存在减益状态，将额外减少目标15%行动值。"
"text": "果酱教授对敌方造成攻击力500%的伤害，有100%的概率减少各目标15%的行动值；若目标身上存在减益状态，将额外减少目标15%行动值。"
},
"buffid": [],
"map": ""
@ -13000,7 +13000,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135006111_1",
"text": "平先生对敌方一个目标造成自身攻击力125%的伤害，并使自身和随机一名友方获得15%的行动值提升。"
"text": "平先生对敌方一个目标造成自身攻击力320%的伤害，并使自身和随机一名友方获得15%的行动值提升。"
},
"buffid": [],
"map": ""
@ -13419,7 +13419,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134002111_1",
"text": "蒂姆·邓普顿对敌方1个目标造成攻击力110%的伤害，并为生命比例最低的队友附加1回合[color=#37d8a9]复苏[/color]状态。"
"text": "蒂姆·邓普顿对敌方1个目标造成攻击力320%的伤害，并为生命比例最低的队友附加1回合[color=#37d8a9]复苏[/color]状态。"
},
"buffid": [
390001127
@ -13802,7 +13802,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124005111_1",
"text": "金猴对敌方1个目标造成攻击力200%的伤害，并有70%概率对自身附加2回合[color=#37d8a9]速度提升[/color]。"
"text": "金猴对敌方1个目标造成攻击力350%的伤害，并有70%概率对自身附加2回合[color=#37d8a9]速度提升[/color]。"
},
"buffid": [
390001003
@ -14050,7 +14050,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124005311_1",
"text": "金猴对敌方造成攻击力300%的伤害，并附加2回合[color=#e5621b]速度下降[/color]状态；同时能减少敌方30%行动值，并重置水中取月的冷却时间。"
"text": "金猴对敌方造成攻击力450%的伤害，并附加2回合[color=#e5621b]速度下降[/color]状态；同时能减少敌方30%行动值，并重置水中取月的冷却时间。"
},
"buffid": [
390001008
@ -14322,7 +14322,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113004111_1",
"text": "法夸德勋爵对敌方1个目标发起攻击，造成攻击力360%的伤害；若自身当前生命比例低于50%，则提升30%的暴击率。"
"text": "法夸德勋爵对敌方1个目标发起攻击，造成攻击力200%的伤害；若自身当前生命比例低于50%，则提升30%的暴击率。"
},
"buffid": [],
"map": ""
@ -14473,7 +14473,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113004211_1",
"text": "法夸德勋爵对敌方1个目标发起攻击，造成攻击力630%的伤害，并未自身附加2回合[color=#37d8a9]攻击提升[/color]状态和2回合[color=#37d8a9]对峙[/color]状态。"
"text": "法夸德勋爵对敌方1个目标发起攻击，造成攻击力300%的伤害，并未自身附加2回合[color=#37d8a9]攻击提升[/color]状态和2回合[color=#37d8a9]对峙[/color]状态。"
},
"buffid": [
390001001,
@ -14641,7 +14641,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113004311_1",
"text": "法夸德勋爵对敌方1个目标发起攻击，造成攻击力700%的伤害，同时会清除目标身上的2个增益状态，目标每损失10%生命，伤害会增加5%。"
"text": "法夸德勋爵对敌方1个目标发起攻击，造成攻击力400%的伤害，同时会清除目标身上的2个增益状态，目标每损失10%生命，伤害会增加5%。"
},
"buffid": [],
"map": ""
@ -14815,7 +14815,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133003111_1",
"text": "胡德先生对敌方1个目标造成攻击力330%的伤害，并有40%概率附加2回合[color=#e5621b]攻击下降[/color]状态。"
"text": "胡德先生对敌方1个目标造成攻击力300%的伤害，并有40%概率附加2回合[color=#e5621b]攻击下降[/color]状态。"
},
"buffid": [
390001006
@ -15002,7 +15002,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133003311_1",
"text": "胡德先生对敌方随机2个目标造成攻击力660%的伤害，并有80%概率附加2回合[color=#e5621b]防御下降[/color][/color][color=#e5621b]中毒[/color]。"
"text": "胡德先生对敌方随机2个目标造成攻击力200%的伤害，并有80%概率附加2回合[color=#e5621b]防御下降[/color][color=#e5621b]中毒[/color]。"
},
"buffid": [
390001401,
@ -15162,7 +15162,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143001111_1",
"text": "阿比盖尔·斯通对敌方1个目标造成攻击力220%的伤害，并有75%概率附加2回合[color=#e5621b]防御下降[/color][/color]状态。"
"text": "阿比盖尔·斯通对敌方1个目标造成攻击力300%的伤害，并有75%概率附加2回合[color=#e5621b]防御下降[/color][/color]状态。"
},
"buffid": [
390001007
@ -15255,7 +15255,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143001111_4",
"text": "伤害提升10%。"
"text": "1"
},
"buffid": [
390001007
@ -15317,7 +15317,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143001211_1",
"text": "阿比盖尔造成攻击力200%的伤害，有75%概率附加2回合[color=#e5621b]攻击下降[/color]状态。"
"text": "阿比盖尔造成攻击力270%的伤害，有75%概率附加2回合[color=#e5621b]攻击下降[/color]状态。"
},
"buffid": [
390001006
@ -15473,7 +15473,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143001311_1",
"text": "阿比盖尔·斯通选定敌方1个目标，随后另外随机挑选敌方1个目标，对2个目标同时发起攻击，分别造成攻击力360%的伤害，并附加3回合[color=#e5621b]链接[/color]状态。"
"text": "阿比盖尔·斯通选定敌方1个目标，随后另外随机挑选敌方1个目标，对2个目标同时发起攻击，分别造成攻击力400%的伤害，并附加3回合[color=#e5621b]链接[/color]状态。"
},
"buffid": [
390001213
@ -15661,7 +15661,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134003111_1",
"text": "圣诞老人对敌方1个目标造成攻击力310%的伤害，并有75%概率附加2回合[color=#e5621b]失手率提升[/color]状态。"
"text": "圣诞老人对敌方1个目标造成攻击力250%的伤害，并有75%概率附加2回合[color=#e5621b]失手率提升[/color]状态。"
},
"buffid": [
390001102
@ -15971,7 +15971,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134003311_1",
"text": "圣诞老人对目标体造成攻击力600%的伤害，同时夺取敌方目标各1个增益状态。"
"text": "圣诞老人对目标体造成攻击力400%的伤害，同时夺取敌方目标各1个增益状态。"
},
"buffid": [],
"map": ""
@ -16145,7 +16145,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144004111_1",
"text": "骇客蛛对敌方1个目标造成攻击力30%，附带自身5%血量伤害并有50%概率附加2回合[color=#e5621b]攻击下降[/color]状态。"
"text": "骇客蛛对敌方1个目标造成攻击力250%，附带自身5%血量伤害并有50%概率附加2回合[color=#e5621b]攻击下降[/color]状态。"
},
"buffid": [
390001006
@ -16301,7 +16301,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144004211_1",
"text": "骇客蛛对敌方1个目标造成1次攻击力100%，附带自身5%血量伤害有60%概率驱散目标1个增益状态，同时立刻触发目标身上的[color=#e5621b]黑客前瞻[/color]效果。"
"text": "骇客蛛对敌方1个目标造成1次攻击力300%，附带自身5%血量伤害有60%概率驱散目标1个增益状态，同时立刻触发目标身上的[color=#e5621b]黑客前瞻[/color]效果。"
},
"buffid": [
390001216
@ -16461,7 +16461,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_144004311_1",
"text": "骇客蛛为己方全体附加2回合[color=#37d8a9]速度提升[/color]状态，对所有敌方造成自身攻击力400%的伤害并附带2回合[color=#e5621b]黑客前瞻[/color]。"
"text": "骇客蛛为己方全体附加2回合[color=#37d8a9]速度提升[/color]状态，对所有敌方造成自身攻击力350%的伤害并附带2回合[color=#e5621b]黑客前瞻[/color]。"
},
"buffid": [
390001216,
@ -16589,7 +16589,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134007111_1",
"text": "菲奥娜对敌方1个目标造成2次攻击力160%的伤害，若发生暴击，则为自身附加1回合[color=#37d8a9]免疫[/color]状态。"
"text": "菲奥娜对敌方1个目标造成2次攻击力750%的伤害，若发生暴击，则为自身附加1回合[color=#37d8a9]免疫[/color]状态。"
},
"buffid": [
390001111
@ -16750,7 +16750,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134007211_1",
"text": "菲奥娜对敌方1个目标发起3连击，共造成攻击力300%的伤害，每次攻击有60%概率驱散目标1个增益状态；若驱散成功，则对目标附加2回合[color=#e5621b]攻击下降[/color]状态。"
"text": "菲奥娜对敌方1个目标发起3连击，共造成攻击力250%的伤害，每次攻击有60%概率驱散目标1个增益状态；若驱散成功，则对目标附加2回合[color=#e5621b]攻击下降[/color]状态。"
},
"buffid": [
390001006
@ -16914,7 +16914,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134007311_1",
"text": "菲奥娜对敌方1个目标造成攻击力580%的伤害，并为自身附加2回合生命值上限35%的[color=#37d8a9]护盾[/color]；若发生暴击，则次数伤害提升30%，并额外提升50%[color=#37d8a9]护盾[/color]。"
"text": "菲奥娜对敌方1个目标造成攻击力300%的伤害，并为自身附加2回合生命值上限35%的[color=#37d8a9]护盾[/color]；若发生暴击，则次数伤害提升30%，并额外提升50%[color=#37d8a9]护盾[/color]。"
},
"buffid": [
390001112
@ -17073,7 +17073,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143006111_1",
"text": "布里奇特对敌方1个目标造成攻击力130%的伤害，并有70%概率为目标附加2回合[color=#e5621b]攻击下降[/color]状态。"
"text": "布里奇特对敌方1个目标造成攻击力300%的伤害，并有70%概率为目标附加2回合[color=#e5621b]攻击下降[/color]状态。"
},
"buffid": [
390001006
@ -17519,7 +17519,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113001111_1",
"text": "闪闪对敌方1个目标造成攻击力250%的伤害，攻击时产生的光球能量有50%的概率对目标附加1回合[color=#e5621b]眩晕[/color]状态。"
"text": "闪闪对敌方1个目标造成攻击力400%的伤害，攻击时产生的光球能量有50%的概率对目标附加1回合[color=#e5621b]眩晕[/color]状态。"
},
"buffid": [
390001105
@ -17674,7 +17674,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113001211_1",
"text": "闪闪对敌方所有人造成攻击力200%的伤害。"
"text": "闪闪对敌方所有人造成攻击力350%的伤害。"
},
"buffid": [],
"map": ""
@ -17819,7 +17819,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113001311_1",
"text": "闪闪对敌方造成攻击力350%的伤害，并为己方附加2回合[color=#37d8a9]防御提升[/color]状态。"
"text": "闪闪对敌方造成攻击力500%的伤害，并为己方附加2回合[color=#37d8a9]防御提升[/color]状态。"
},
"buffid": [
390001002
@ -18003,7 +18003,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114005111_1",
"text": "鹤大师对敌方1个目标发起攻击，可造成攻击力210%伤害，并有50%概率夺取目标1个增益状态。"
"text": "鹤大师对敌方1个目标发起攻击，可造成攻击力200%伤害，并有50%概率夺取目标1个增益状态。"
},
"buffid": [],
"map": ""
@ -18150,7 +18150,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_114005211_1",
"text": "鹤大师对敌方目标发起3次攻击，每次攻击造成攻击力225%的伤害，并延长自身全部增益状态1回合。"
"text": "鹤大师对敌方目标发起3次攻击，每次攻击造成攻击力100%的伤害，并延长自身全部增益状态1回合。"
},
"buffid": [],
"map": ""
@ -18575,7 +18575,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143003111_1",
"text": "史蒂夫·帕丘克对敌方1个目标造成攻击力120%的伤害，并有40%概率附加2回合[color=#e5621b]速度下降[/color]状态。"
"text": "史蒂夫·帕丘克对敌方1个目标造成攻击力300%的伤害，并有40%概率附加2回合[color=#e5621b]速度下降[/color]状态。"
},
"buffid": [
390001008
@ -19148,7 +19148,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115002111_1",
"text": "船长对敌方1个目标造成390%伤害，夺取该目标1个增益状态，并有100%概率为自身附加2回合[color=#37d8a9]攻击提升[/color]状态。"
"text": "船长对敌方1个目标造成200%伤害，夺取该目标1个增益状态，并有100%概率为自身附加2回合[color=#37d8a9]攻击提升[/color]状态。"
},
"buffid": [],
"map": ""
@ -19326,7 +19326,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115002311_1",
"text": "船长随机扔出三张盟友牌，随机选中一张发动不同的效果。"
"text": "船长随机扔出三张盟友牌，随机选中一张发动不同的效果。选中牌1对敌方造成250%攻击力的伤害，选中牌2恢复友方30%体力。选中牌3减少敌方全体30%行动值"
},
"buffid": [],
"map": ""
@ -19513,7 +19513,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113005111_1",
"text": "攻击1个敌方，伤害为自身攻击力200%提升自身25%行动值。"
"text": "攻击1个敌方，伤害为自身攻击力350%提升自身25%行动值。"
},
"buffid": [],
"map": ""
@ -20339,7 +20339,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124001111_1",
"text": "警长对敌方1个目标进行射击，造成攻击力390%的伤害，若成功击杀目标，则获得额外回合。"
"text": "警长对敌方1个目标进行射击，造成攻击力200%的伤害，若成功击杀目标，则获得额外回合。"
},
"buffid": [],
"map": ""
@ -20488,7 +20488,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124001211_1",
"text": "警长对敌方所有目标造成攻击力210%的伤害，为自身回复本次总伤害30%的生命，并各吸收目标10%的行动值。"
"text": "警长对敌方所有目标造成攻击力150%的伤害，为自身回复本次总伤害30%的生命，并各吸收目标10%的行动值。"
},
"buffid": [],
"map": ""
@ -20634,7 +20634,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_124001311_1",
"text": "警长对敌方攻击4次，共造成攻击力420%的伤害；发生暴击时，本次伤害将额外提升30%。"
"text": "警长对敌方攻击4次，共造成攻击力250%的伤害；发生暴击时，本次伤害将额外提升30%。"
},
"buffid": [],
"map": ""
@ -20899,7 +20899,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133002111_1",
"text": "坦克对敌方1个目标发起2段攻击，每段造成攻击力180%的伤害，并有35%概率附加2回合[color=#e5621b]防御下降[/color][/color]状态。"
"text": "坦克对敌方1个目标发起2段攻击，每段造成攻击力100%的伤害，并有35%概率附加2回合[color=#e5621b]防御下降[/color][/color]状态。"
},
"buffid": [
390001007
@ -21055,7 +21055,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133002211_1",
"text": "坦克对敌方1个目标发起3段攻击，每段可造成攻击力180%的伤害，有30%概率将自身1个减益状态转移给目标。"
"text": "坦克对敌方1个目标发起3段攻击，每段可造成攻击力120%的伤害，有30%概率将自身1个减益状态转移给目标。"
},
"buffid": [
390001430
@ -21214,7 +21214,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_133002311_1",
"text": "坦克对敌方所有目标造成攻击力750%的伤害；若目标身上存在减益状态，每一个减益状态，额外造成20%的伤害。"
"text": "坦克对敌方所有目标造成攻击力400%的伤害；若目标身上存在减益状态，每一个减益状态，额外造成20%的伤害。"
},
"buffid": [],
"map": ""
@ -23164,7 +23164,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123004111_1",
"text": "攻击1个敌方3次，每次伤害为自身攻击力90%，每次有15%概率为目标附加1回合[color=#e5621b]眩晕[/color] 。"
"text": "攻击1个敌方3次，每次伤害为自身攻击力100%，每次有15%概率为目标附加1回合[color=#e5621b]眩晕[/color] 。"
},
"buffid": [
390001105
@ -23319,7 +23319,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_123004211_1",
"text": "攻击随机3个敌方，伤害为自身攻击力240%，75%概率为目标附加1回合[color=#e5621b]眩晕[/color] 。"
"text": "攻击随机3个敌方，伤害为自身攻击力80%，75%概率为目标附加1回合[color=#e5621b]眩晕[/color] 。"
},
"buffid": [
390001105
@ -24158,7 +24158,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115003111_1",
"text": "希沙窦斯对敌方1个目标造成攻击力300%的伤害，并吸收目标15%的行动值。"
"text": "希沙窦斯对敌方1个目标造成攻击力200%的伤害，并吸收目标15%的行动值。"
},
"buffid": [],
"map": ""
@ -24303,7 +24303,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115003211_1",
"text": "希沙窦斯对敌方1个目标发起5段攻击，每段造成自身攻击力150%的伤害，回复此次伤害50%的生命值，并追加目标最大生命值6%的效果附加伤害，此附加伤害不超过自身攻击力的80%。"
"text": "希沙窦斯对敌方1个目标发起5段攻击，每段造成自身攻击力70%的伤害，回复此次伤害50%的生命值，并追加目标最大生命值6%的效果附加伤害，此附加伤害不超过自身攻击力的80%。"
},
"buffid": [],
"map": ""
@ -24449,7 +24449,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_115003311_1",
"text": "希沙窦斯对敌方发起4段攻击，每段造成自身攻击力300%的伤害，并追加目标最大生命值6%的效果附加伤害，此附加伤害不超过自身攻击力的80%，最后一段攻击将吸收目标10%的行动值。"
"text": "希沙窦斯对敌方发起4段攻击，每段造成自身攻击力100%的伤害，并追加目标最大生命值6%的效果附加伤害，此附加伤害不超过自身攻击力的80%，最后一段攻击将吸收目标10%的行动值。"
},
"buffid": [],
"map": ""
@ -25386,7 +25386,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134005111_1",
"text": "沃尔特·史翠克勒对敌方1个目标造成攻击力360%的伤害，并有80%概率附加2回合[color=#e5621b]中毒[/color]状态。"
"text": "沃尔特·史翠克勒对敌方1个目标造成攻击力300%的伤害，并有80%概率附加2回合[color=#e5621b]中毒[/color]状态。"
},
"buffid": [
390001401
@ -25572,7 +25572,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134005311_1",
"text": "沃尔特·史翠克勒对敌方目标造成攻击力500%的伤害，并有80%概率为目标附加2回合[color=#e5621b]中毒[/color]状态。"
"text": "沃尔特·史翠克勒对敌方目标造成攻击力400%的伤害，并有80%概率为目标附加2回合[color=#e5621b]中毒[/color]状态。"
},
"buffid": [
390001401

2
bin/json/game_skillpassive.json
View File

@ -52,7 +52,7 @@
"Id": 435002211,
"When": 3,
"FromCheck": "Target=2",
"TargetCheck": "",
"TargetCheck": "Target=2",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",

1
comm/imodule.go
View File

@ -490,6 +490,7 @@ type (
GetGlobalConf() *cfg.GameGlobalData
GetPriceGroupCost(pricegroupId int32, purchase int32) (res []*cfg.Gameatn, err error)
GetHeroConfig(heroCfgId string) (conf *cfg.GameHeroData, err error)
GetPriceGroupLen(pricegroupId int32) (count int32, err error)
GetGrormetLlame(id string) (data int32, err error)
}

8
modules/practice/api_expulsion.go
View File

@ -10,13 +10,13 @@ import (
"time"
)
//参数校验
// 参数校验
func (this *apiComp) ExpulsionCheck(session comm.IUserSession, req *pb.PracticeExpulsionReq) (errdata *pb.ErrorData) {
return
}
///练功请求 驱逐
// /练功请求 驱逐
func (this *apiComp) Expulsion(session comm.IUserSession, req *pb.PracticeExpulsionReq) (errdata *pb.ErrorData) {
var (
err error
@ -225,8 +225,8 @@ func (this *apiComp) Expulsion(session comm.IUserSession, req *pb.PracticeExpuls
}, pillar.Uid)
// }
froom.Knapsack[pillar.Teacher] = 0
froom.Knapsack[pillar.Prop] = 0
froom.Knapsack[pillar.Teacher].State = 0
froom.Knapsack[pillar.Prop].State = 0
pillar.Hero = ""
pillar.Teacher = ""
pillar.Prop = ""

12
modules/practice/api_loot.go
View File

@ -8,13 +8,13 @@ import (
"time"
)
//参数校验
// 参数校验
func (this *apiComp) LootCheck(session comm.IUserSession, req *pb.PracticeLootReq) (errdata *pb.ErrorData) {
return
}
///练功请求 蹭馆
// /练功请求 蹭馆
func (this *apiComp) Loot(session comm.IUserSession, req *pb.PracticeLootReq) (errdata *pb.ErrorData) {
var (
err error
@ -59,14 +59,14 @@ func (this *apiComp) Loot(session comm.IUserSession, req *pb.PracticeLootReq) (e
return
}
if req.Teacher != "" {
if room.Knapsack[req.Teacher] == 1 { //已经被使用
if room.Knapsack[req.Teacher].State == 1 { //已经被使用
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
}
return
}
room.Knapsack[req.Teacher] = 1
room.Knapsack[req.Teacher].State = 1
if tconfigure, err = this.module.configure.getGamePandamasJx(req.Teacher); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
@ -79,14 +79,14 @@ func (this *apiComp) Loot(session comm.IUserSession, req *pb.PracticeLootReq) (e
froom.Pillarf.Teacher = req.Teacher
}
if req.Prop != "" {
if room.Knapsack[req.Prop] == 1 { //已经被使用
if room.Knapsack[req.Prop].State == 1 { //已经被使用
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
}
return
}
room.Knapsack[req.Prop] = 1
room.Knapsack[req.Prop].State = 1
if pconfigure, err = this.module.configure.getGamePandamasJx(req.Teacher); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,

50
modules/practice/api_practice.go
View File

@ -22,6 +22,7 @@ func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePractic
err error
room *pb.DBPracticeRoom
hero *pb.DBHero
heroconf *cfg.GameHeroData
pillar *pb.DBPracticePillar
pillarconfigure *cfg.GamePandamasMzData
tconfigure *cfg.GamePandamasJxData
@ -45,7 +46,7 @@ func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePractic
}
return
}
if tconfigure, err = this.module.configure.getGamePandamasJx(req.Teacher); err != nil {
if heroconf, err = this.module.ModuleTools.GetHeroConfig(hero.HeroID); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
@ -102,14 +103,16 @@ func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePractic
}
if req.Teacher != "" {
if room.Knapsack[req.Teacher] == 1 { //已经被使用
if room.Knapsack[req.Teacher].State == 1 { //已经被使用
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
Message: fmt.Sprintf("the teacher:%s is working", req.Teacher),
}
return
}
room.Knapsack[req.Teacher] = 1
room.Knapsack[req.Teacher].State = 1
if tconfigure, err = this.module.configure.getGamePandamasJx(req.Teacher); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
@ -118,6 +121,21 @@ func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePractic
}
return
}
if tconfigure.Race != heroconf.Race {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
Message: fmt.Sprintf("the teacher race:%d and the herorace:%d is race no can use", tconfigure.Race, heroconf.Race),
}
}
if tconfigure.Job != heroconf.Job {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
Message: fmt.Sprintf("the teacher job:%d and the hero job:%d is race no can use", tconfigure.Job, heroconf.Job),
}
}
if tconfigure.BanHero == hero.HeroID { //禁止使用
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
@ -126,18 +144,18 @@ func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePractic
}
return
}
extra += tconfigure.Duration
extra += int32(float64(pillarconfigure.PlacementDuration) * float64(tconfigure.Duration) / float64(1000))
pillar.Teacher = req.Teacher
}
if req.Prop != "" {
if room.Knapsack[req.Prop] == 1 { //已经被使用
if room.Knapsack[req.Prop].State == 1 { //已经被使用
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
}
return
}
room.Knapsack[req.Prop] = 1
room.Knapsack[req.Prop].State = 1
if pconfigure, err = this.module.configure.getGamePandamasJx(req.Prop); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
@ -146,7 +164,21 @@ func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePractic
}
return
}
extra += pconfigure.Duration
if pconfigure.Race != heroconf.Race {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
Message: fmt.Sprintf("the teacher race:%d and the herorace:%d is race no can use", tconfigure.Race, heroconf.Race),
}
}
if pconfigure.Job != heroconf.Job {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
Message: fmt.Sprintf("the teacher job:%d and the hero job:%d is race no can use", tconfigure.Job, heroconf.Job),
}
}
extra += int32(float64(pillarconfigure.PlacementDuration) * float64(pconfigure.Duration) / float64(1000))
pillar.Prop = req.Prop
}
pillar.Hero = req.Hero

8
modules/practice/api_receive.go
View File

@ -11,13 +11,13 @@ import (
"time"
)
//参数校验
// 参数校验
func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.PracticeReceiveReq) (errdata *pb.ErrorData) {
return
}
///练功请求 奖励
// /练功请求 奖励
func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveReq) (errdata *pb.ErrorData) {
var (
@ -241,8 +241,8 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveR
if errdata = this.module.DispenseRes(session, append(ants1, ants2...), true); errdata != nil {
return
}
room.Knapsack[pillar.Teacher] = 0
room.Knapsack[pillar.Prop] = 0
room.Knapsack[pillar.Teacher].State = 0
room.Knapsack[pillar.Prop].State = 0
pillar.Hero = ""
pillar.Teacher = ""
pillar.Prop = ""

4
modules/practice/modelPandata.go
View File

@ -44,7 +44,7 @@ func (this *modelPandata) queryUserMartialhall(uid string) (result *pb.DBPractic
Id: primitive.NewObjectID().Hex(),
Uid: uid,
Full: make(map[int32]int32),
Knapsack: make(map[string]int32),
Knapsack: make(map[string]*pb.DBPracticeRes),
Gymaction: 0,
Gymrefresh: 0,
Pillar1: &pb.DBPracticePillar{Index: 1, Isunlock: 0, Lv: 1},
@ -88,7 +88,7 @@ func (this *modelPandata) queryrooms(uids []string) (results []*pb.DBPracticeRoo
Id: primitive.NewObjectID().Hex(),
Uid: v,
Full: make(map[int32]int32),
Knapsack: make(map[string]int32),
Knapsack: make(map[string]*pb.DBPracticeRes),
Gymaction: 0,
Gymrefresh: 0,
Pillar1: &pb.DBPracticePillar{Index: 1, Isunlock: 2, Lv: 1},

23
modules/practice/module.go
View File

@ -116,7 +116,12 @@ func (this *Practice) AddItems(session comm.IUserSession, items map[string]int32
}
id = make([]string, 0)
for k, _ := range items {
room.Knapsack[k] = 0
room.Knapsack[k] = &pb.DBPracticeRes{
Pid: k,
State: 0,
Usenum: 0,
Lastusetime: 0,
}
id = append(id, k)
this.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), k)
}
@ -139,7 +144,7 @@ func (this *Practice) AddItems(session comm.IUserSession, items map[string]int32
Id: primitive.NewObjectID().Hex(),
Uid: session.GetUserId(),
Full: make(map[int32]int32),
Knapsack: make(map[string]int32),
Knapsack: make(map[string]*pb.DBPracticeRes),
Gymaction: 0,
Gymrefresh: 0,
Pillar1: &pb.DBPracticePillar{Index: 1, Isunlock: 0, Lv: 1},
@ -152,7 +157,12 @@ func (this *Practice) AddItems(session comm.IUserSession, items map[string]int32
}
id = make([]string, 0)
for k, _ := range items {
room.Knapsack[k] = 0
room.Knapsack[k] = &pb.DBPracticeRes{
Pid: k,
State: 0,
Usenum: 0,
Lastusetime: 0,
}
id = append(id, k)
this.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), k)
}
@ -168,7 +178,12 @@ func (this *Practice) AddItems(session comm.IUserSession, items map[string]int32
} else {
id = make([]string, 0)
for k, _ := range items {
room.Knapsack[k] = 0
room.Knapsack[k] = &pb.DBPracticeRes{
Pid: k,
State: 0,
Usenum: 0,
Lastusetime: 0,
}
id = append(id, k)
this.atlas.CheckActivatePandaAtlasCollect(session.GetUserId(), k)
}

20
modules/tools/comp_configure.go
View File

@ -33,7 +33,7 @@ const (
game_food = "game_breakingbad.json"
)
///配置管理基础组件
// /配置管理基础组件
type MCompConfigure struct {
cbase.ModuleCompBase
hlock sync.RWMutex
@ -56,7 +56,7 @@ type MCompConfigure struct {
_price map[int32][]*cfg.GamePricegroupData
}
//组件初始化接口
// 组件初始化接口
func (this *MCompConfigure) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
err = this.ModuleCompBase.Init(service, module, comp, options)
err = this.LoadConfigure(game_global, cfg.NewGameGlobal)
@ -293,7 +293,7 @@ func (this *MCompConfigure) LoadConfigure(name string, fn interface{}) (err erro
return configure.RegisterConfigure(name, fn, nil)
}
//加载一个配置文件
// 加载一个配置文件
func (this *MCompConfigure) LoadDropData() {
if v, err := this.GetConfigure(game_drop); err == nil {
if configure, ok := v.(*cfg.GameDrop); ok {
@ -320,7 +320,7 @@ func (this *MCompConfigure) LoadDropData() {
return
}
//加载多个配置文件
// 加载多个配置文件
func (this *MCompConfigure) LoadMultiConfigure(confs map[string]interface{}) (err error) {
for k, v := range confs {
err = configure.RegisterConfigure(k, v, nil)
@ -332,12 +332,12 @@ func (this *MCompConfigure) LoadMultiConfigure(confs map[string]interface{}) (er
return
}
//读取配置数据
// 读取配置数据
func (this *MCompConfigure) GetConfigure(name string) (v interface{}, err error) {
return configure.GetConfigure(name)
}
//全局配置
// 全局配置
func (this *MCompConfigure) GetGlobalConf() *cfg.GameGlobalData {
var (
configure *cfg.GameGlobal
@ -426,15 +426,15 @@ func (this *MCompConfigure) GetDropReward(dropId int32) (result []*cfg.Gameatn)
}
// 获取英雄原始星级
func (this *MCompConfigure) GetHeroConfig(heroCfgId string) *cfg.GameHeroData {
func (this *MCompConfigure) GetHeroConfig(heroCfgId string) (conf *cfg.GameHeroData, err error) {
if v, err := this.GetConfigure(new_hero); err == nil {
if configure, ok := v.(*cfg.GameHero); ok {
if v, ok := configure.GetDataMap()[heroCfgId]; ok {
return v
return v, nil
}
}
}
return nil
return nil, comm.NewNotFoundConfErr("英雄模块", new_hero, heroCfgId)
}
// 获取英雄原始星级
@ -492,7 +492,7 @@ func (this *MCompConfigure) GetHeroConfigData() (data []*cfg.GameHeroData) {
return nil
}
//读取物品配置
// 读取物品配置
func (this *MCompConfigure) GetItemConfigureData(id string) (item *cfg.GameItemData, err error) {
var (
v interface{}

13
modules/tools/module.go
View File

@ -17,29 +17,34 @@ type Tools struct {
configure *MCompConfigure
}
//模块名
// 模块名
func (this *Tools) GetType() core.M_Modules {
return comm.ModuleTools
}
//模块初始化接口 注册用户创建角色事件
// 模块初始化接口 注册用户创建角色事件
func (this *Tools) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
err = this.ModuleBase.Init(service, module, options)
return
}
//模块初始化接口 注册用户创建角色事件
// 模块初始化接口 注册用户创建角色事件
func (this *Tools) Start() (err error) {
err = this.ModuleBase.Start()
return
}
//装备组件
// 装备组件
func (this *Tools) OnInstallComp() {
this.ModuleBase.OnInstallComp()
this.configure = this.RegisterComp(new(MCompConfigure)).(*MCompConfigure)
}
// 读取英雄配置
func (this *Tools) GetHeroConfig(heroCfgId string) (conf *cfg.GameHeroData, err error) {
conf, err = this.configure.GetHeroConfig(heroCfgId)
return
}
func (this *Tools) GetGroupDataByLottery(lotteryId int32, vipLv int32, lv int32) (items []*cfg.Gameatn) {
items = this.configure.GetGroupDataByLottery(lotteryId, vipLv, lv)
return

8
pb/battle_struct.pb.go
View File

@ -32,6 +32,7 @@ const (
EffectTipsType_Not_Action EffectTipsType = 6 //无法行动
EffectTipsType_Purification EffectTipsType = 7 //净化
EffectTipsType_Disperse EffectTipsType = 8 //驱散
EffectTipsType_Gain_round EffectTipsType = 9 //获得回合
)
// Enum value maps for EffectTipsType.
@ -46,6 +47,7 @@ var (
6: "Not_Action",
7: "Purification",
8: "Disperse",
9: "Gain_round",
}
EffectTipsType_value = map[string]int32{
"Eff_Success": 0,
@ -57,6 +59,7 @@ var (
"Not_Action": 6,
"Purification": 7,
"Disperse": 8,
"Gain_round": 9,
}
)
@ -1824,7 +1827,7 @@ var file_battle_battle_struct_proto_rawDesc = []byte{
0x43, 0x6f, 0x6d, 0x53, 0x68, 0x69, 0x65, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a,
0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12,
0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x2a, 0x9b, 0x01, 0x0a, 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x2a, 0xab, 0x01, 0x0a, 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74,
0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x45, 0x66, 0x66, 0x5f,
0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74,
0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x6d,
@ -1834,7 +1837,8 @@ var file_battle_battle_struct_proto_rawDesc = []byte{
0x6c, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x6f, 0x74, 0x5f, 0x41, 0x63, 0x74, 0x69, 0x6f,
0x6e, 0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x75, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
0x69, 0x6f, 0x6e, 0x10, 0x07, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73, 0x70, 0x65, 0x72, 0x73,
0x65, 0x10, 0x08, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
0x65, 0x10, 0x08, 0x12, 0x0e, 0x0a, 0x0a, 0x47, 0x61, 0x69, 0x6e, 0x5f, 0x72, 0x6f, 0x75, 0x6e,
0x64, 0x10, 0x09, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x33,
}

326
pb/practice_db.pb.go
View File

@ -300,36 +300,108 @@ func (x *DBPracticeStatuer) GetEnd() int64 {
return 0
}
//武官资源数据
type DBPracticeRes struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Pid string `protobuf:"bytes,1,opt,name=pid,proto3" json:"pid"`
State int32 `protobuf:"varint,2,opt,name=state,proto3" json:"state"` //0 未使用 1 正在使用
Usenum int32 `protobuf:"varint,3,opt,name=usenum,proto3" json:"usenum"` //已使用次数
Lastusetime int64 `protobuf:"varint,4,opt,name=lastusetime,proto3" json:"lastusetime"` //最后使用时间
}
func (x *DBPracticeRes) Reset() {
*x = DBPracticeRes{}
if protoimpl.UnsafeEnabled {
mi := &file_practice_practice_db_proto_msgTypes[3]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *DBPracticeRes) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*DBPracticeRes) ProtoMessage() {}
func (x *DBPracticeRes) ProtoReflect() protoreflect.Message {
mi := &file_practice_practice_db_proto_msgTypes[3]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use DBPracticeRes.ProtoReflect.Descriptor instead.
func (*DBPracticeRes) Descriptor() ([]byte, []int) {
return file_practice_practice_db_proto_rawDescGZIP(), []int{3}
}
func (x *DBPracticeRes) GetPid() string {
if x != nil {
return x.Pid
}
return ""
}
func (x *DBPracticeRes) GetState() int32 {
if x != nil {
return x.State
}
return 0
}
func (x *DBPracticeRes) GetUsenum() int32 {
if x != nil {
return x.Usenum
}
return 0
}
func (x *DBPracticeRes) GetLastusetime() int64 {
if x != nil {
return x.Lastusetime
}
return 0
}
//练功房
type DBPracticeRoom struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //id
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //用户id
Gymaction int32 `protobuf:"varint,3,opt,name=gymaction,proto3" json:"gymaction"` //健身房动作
Gymrefresh int32 `protobuf:"varint,4,opt,name=gymrefresh,proto3" json:"gymrefresh"` //健身房刷新次数
Lastrefresh int64 `protobuf:"varint,5,opt,name=lastrefresh,proto3" json:"lastrefresh"` //最后刷新时间
Full map[int32]int32 `protobuf:"bytes,6,rep,name=full,proto3" json:"full" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //满级登记
Knapsack map[string]int32 `protobuf:"bytes,7,rep,name=knapsack,proto3" json:"knapsack" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //资源
Pillar1 *DBPracticePillar `protobuf:"bytes,8,opt,name=pillar1,proto3" json:"pillar1"` //柱子1
Pillar2 *DBPracticePillar `protobuf:"bytes,9,opt,name=pillar2,proto3" json:"pillar2"` //柱子2
Pillar3 *DBPracticePillar `protobuf:"bytes,10,opt,name=pillar3,proto3" json:"pillar3"` //柱子3
Pillarf *DBPracticePillar `protobuf:"bytes,11,opt,name=pillarf,proto3" json:"pillarf"` //好友柱子
Statuers []*DBPracticeStatuer `protobuf:"bytes,12,rep,name=statuers,proto3" json:"statuers"` //武馆雕像
Currnpc int32 `protobuf:"varint,13,opt,name=currnpc,proto3" json:"currnpc"` //当前npc
Npcstate int32 `protobuf:"varint,14,opt,name=npcstate,proto3" json:"npcstate"` //npc状态 -1未开启 0 未挑战 1 挑战失败 2挑战成功 3 CD中
Refresh int64 `protobuf:"varint,15,opt,name=refresh,proto3" json:"refresh"` //刷新时间
Battlenum int32 `protobuf:"varint,16,opt,name=battlenum,proto3" json:"battlenum"` //战斗次数
Captain int32 `protobuf:"varint,17,opt,name=captain,proto3" json:"captain"` //战斗征信队长位
Formation []*BattleRole `protobuf:"bytes,18,rep,name=formation,proto3" json:"formation"` //战斗阵型
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //id
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //用户id
Gymaction int32 `protobuf:"varint,3,opt,name=gymaction,proto3" json:"gymaction"` //健身房动作
Gymrefresh int32 `protobuf:"varint,4,opt,name=gymrefresh,proto3" json:"gymrefresh"` //健身房刷新次数
Lastrefresh int64 `protobuf:"varint,5,opt,name=lastrefresh,proto3" json:"lastrefresh"` //最后刷新时间
Full map[int32]int32 `protobuf:"bytes,6,rep,name=full,proto3" json:"full" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //满级登记
Knapsack map[string]*DBPracticeRes `protobuf:"bytes,7,rep,name=knapsack,proto3" json:"knapsack" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //资源
Pillar1 *DBPracticePillar `protobuf:"bytes,8,opt,name=pillar1,proto3" json:"pillar1"` //柱子1
Pillar2 *DBPracticePillar `protobuf:"bytes,9,opt,name=pillar2,proto3" json:"pillar2"` //柱子2
Pillar3 *DBPracticePillar `protobuf:"bytes,10,opt,name=pillar3,proto3" json:"pillar3"` //柱子3
Pillarf *DBPracticePillar `protobuf:"bytes,11,opt,name=pillarf,proto3" json:"pillarf"` //好友柱子
Statuers []*DBPracticeStatuer `protobuf:"bytes,12,rep,name=statuers,proto3" json:"statuers"` //武馆雕像
Currnpc int32 `protobuf:"varint,13,opt,name=currnpc,proto3" json:"currnpc"` //当前npc
Npcstate int32 `protobuf:"varint,14,opt,name=npcstate,proto3" json:"npcstate"` //npc状态 -1未开启 0 未挑战 1 挑战失败 2挑战成功 3 CD中
Refresh int64 `protobuf:"varint,15,opt,name=refresh,proto3" json:"refresh"` //刷新时间
Battlenum int32 `protobuf:"varint,16,opt,name=battlenum,proto3" json:"battlenum"` //战斗次数
Captain int32 `protobuf:"varint,17,opt,name=captain,proto3" json:"captain"` //战斗征信队长位
Formation []*BattleRole `protobuf:"bytes,18,rep,name=formation,proto3" json:"formation"` //战斗阵型
}
func (x *DBPracticeRoom) Reset() {
*x = DBPracticeRoom{}
if protoimpl.UnsafeEnabled {
mi := &file_practice_practice_db_proto_msgTypes[3]
mi := &file_practice_practice_db_proto_msgTypes[4]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -342,7 +414,7 @@ func (x *DBPracticeRoom) String() string {
func (*DBPracticeRoom) ProtoMessage() {}
func (x *DBPracticeRoom) ProtoReflect() protoreflect.Message {
mi := &file_practice_practice_db_proto_msgTypes[3]
mi := &file_practice_practice_db_proto_msgTypes[4]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -355,7 +427,7 @@ func (x *DBPracticeRoom) ProtoReflect() protoreflect.Message {
// Deprecated: Use DBPracticeRoom.ProtoReflect.Descriptor instead.
func (*DBPracticeRoom) Descriptor() ([]byte, []int) {
return file_practice_practice_db_proto_rawDescGZIP(), []int{3}
return file_practice_practice_db_proto_rawDescGZIP(), []int{4}
}
func (x *DBPracticeRoom) GetId() string {
@ -400,7 +472,7 @@ func (x *DBPracticeRoom) GetFull() map[int32]int32 {
return nil
}
func (x *DBPracticeRoom) GetKnapsack() map[string]int32 {
func (x *DBPracticeRoom) GetKnapsack() map[string]*DBPracticeRes {
if x != nil {
return x.Knapsack
}
@ -496,7 +568,7 @@ type DBPracticeQiecuoInvite struct {
func (x *DBPracticeQiecuoInvite) Reset() {
*x = DBPracticeQiecuoInvite{}
if protoimpl.UnsafeEnabled {
mi := &file_practice_practice_db_proto_msgTypes[4]
mi := &file_practice_practice_db_proto_msgTypes[5]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -509,7 +581,7 @@ func (x *DBPracticeQiecuoInvite) String() string {
func (*DBPracticeQiecuoInvite) ProtoMessage() {}
func (x *DBPracticeQiecuoInvite) ProtoReflect() protoreflect.Message {
mi := &file_practice_practice_db_proto_msgTypes[4]
mi := &file_practice_practice_db_proto_msgTypes[5]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -522,7 +594,7 @@ func (x *DBPracticeQiecuoInvite) ProtoReflect() protoreflect.Message {
// Deprecated: Use DBPracticeQiecuoInvite.ProtoReflect.Descriptor instead.
func (*DBPracticeQiecuoInvite) Descriptor() ([]byte, []int) {
return file_practice_practice_db_proto_rawDescGZIP(), []int{4}
return file_practice_practice_db_proto_rawDescGZIP(), []int{5}
}
func (x *DBPracticeQiecuoInvite) GetUid() string {
@ -556,7 +628,7 @@ type DBPracticeQiecuoRecord struct {
func (x *DBPracticeQiecuoRecord) Reset() {
*x = DBPracticeQiecuoRecord{}
if protoimpl.UnsafeEnabled {
mi := &file_practice_practice_db_proto_msgTypes[5]
mi := &file_practice_practice_db_proto_msgTypes[6]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -569,7 +641,7 @@ func (x *DBPracticeQiecuoRecord) String() string {
func (*DBPracticeQiecuoRecord) ProtoMessage() {}
func (x *DBPracticeQiecuoRecord) ProtoReflect() protoreflect.Message {
mi := &file_practice_practice_db_proto_msgTypes[5]
mi := &file_practice_practice_db_proto_msgTypes[6]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -582,7 +654,7 @@ func (x *DBPracticeQiecuoRecord) ProtoReflect() protoreflect.Message {
// Deprecated: Use DBPracticeQiecuoRecord.ProtoReflect.Descriptor instead.
func (*DBPracticeQiecuoRecord) Descriptor() ([]byte, []int) {
return file_practice_practice_db_proto_rawDescGZIP(), []int{5}
return file_practice_practice_db_proto_rawDescGZIP(), []int{6}
}
func (x *DBPracticeQiecuoRecord) GetId() string {
@ -664,73 +736,81 @@ var file_practice_practice_db_proto_rawDesc = []byte{
0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c,
0x0a, 0x09, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
0x09, 0x52, 0x09, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03,
0x65, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x22, 0x89,
0x06, 0x0a, 0x0e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f,
0x6d, 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, 0x1c, 0x0a, 0x09, 0x67, 0x79, 0x6d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x67, 0x79, 0x6d, 0x61, 0x63, 0x74, 0x69, 0x6f,
0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x67, 0x79, 0x6d, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18,
0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x67, 0x79, 0x6d, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73,
0x68, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68,
0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72,
0x65, 0x73, 0x68, 0x12, 0x2d, 0x0a, 0x04, 0x66, 0x75, 0x6c, 0x6c, 0x18, 0x06, 0x20, 0x03, 0x28,
0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f,
0x6f, 0x6d, 0x2e, 0x46, 0x75, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x66, 0x75,
0x6c, 0x6c, 0x12, 0x39, 0x0a, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x18, 0x07,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63,
0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x2e, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e,
0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x12, 0x2b, 0x0a,
0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x31, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11,
0x65, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x22, 0x71,
0x0a, 0x0d, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x12,
0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x70, 0x69,
0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x6e, 0x75,
0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x75, 0x73, 0x65, 0x6e, 0x75, 0x6d, 0x12,
0x20, 0x0a, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x75, 0x73, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04,
0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x75, 0x73, 0x65, 0x74, 0x69, 0x6d,
0x65, 0x22, 0x99, 0x06, 0x0a, 0x0e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65,
0x52, 0x6f, 0x6f, 0x6d, 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, 0x1c, 0x0a, 0x09, 0x67, 0x79, 0x6d, 0x61, 0x63, 0x74,
0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x67, 0x79, 0x6d, 0x61, 0x63,
0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x67, 0x79, 0x6d, 0x72, 0x65, 0x66, 0x72, 0x65,
0x73, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x67, 0x79, 0x6d, 0x72, 0x65, 0x66,
0x72, 0x65, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72,
0x65, 0x73, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72,
0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x2d, 0x0a, 0x04, 0x66, 0x75, 0x6c, 0x6c, 0x18, 0x06,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63,
0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x2e, 0x46, 0x75, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
0x04, 0x66, 0x75, 0x6c, 0x6c, 0x12, 0x39, 0x0a, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63,
0x6b, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63,
0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x2e, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63,
0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b,
0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x31, 0x18, 0x08, 0x20, 0x01, 0x28,
0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69,
0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x31, 0x12, 0x2b, 0x0a,
0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x32, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11,
0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61,
0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x31, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69,
0x6c, 0x6c, 0x61, 0x72, 0x32, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42,
0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x32, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69,
0x6c, 0x6c, 0x61, 0x72, 0x33, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42,
0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07,
0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x32, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61,
0x72, 0x33, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61,
0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x33, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61,
0x72, 0x66, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61,
0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c,
0x6c, 0x61, 0x72, 0x33, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x66, 0x18,
0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69,
0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72,
0x66, 0x12, 0x2e, 0x0a, 0x08, 0x73, 0x74, 0x61, 0x74, 0x75, 0x65, 0x72, 0x73, 0x18, 0x0c, 0x20,
0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65,
0x53, 0x74, 0x61, 0x74, 0x75, 0x65, 0x72, 0x52, 0x08, 0x73, 0x74, 0x61, 0x74, 0x75, 0x65, 0x72,
0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x72, 0x6e, 0x70, 0x63, 0x18, 0x0d, 0x20, 0x01,
0x28, 0x05, 0x52, 0x07, 0x63, 0x75, 0x72, 0x72, 0x6e, 0x70, 0x63, 0x12, 0x1a, 0x0a, 0x08, 0x6e,
0x70, 0x63, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e,
0x70, 0x63, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x66, 0x72, 0x65,
0x73, 0x68, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73,
0x68, 0x12, 0x1c, 0x0a, 0x09, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x10,
0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x6e, 0x75, 0x6d, 0x12,
0x18, 0x0a, 0x07, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05,
0x52, 0x07, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x12, 0x29, 0x0a, 0x09, 0x66, 0x6f, 0x72,
0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x12, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42,
0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x09, 0x66, 0x6f, 0x72, 0x6d, 0x61,
0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x37, 0x0a, 0x09, 0x46, 0x75, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72,
0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, 0x0a,
0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x48, 0x0a, 0x16, 0x44, 0x42,
0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x49, 0x6e,
0x76, 0x69, 0x74, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74,
0x61, 0x6d, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73,
0x74, 0x61, 0x6d, 0x70, 0x22, 0xb5, 0x01, 0x0a, 0x16, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74,
0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12,
0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12,
0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
0x64, 0x12, 0x31, 0x0a, 0x07, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03,
0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51,
0x69, 0x65, 0x63, 0x75, 0x6f, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x52, 0x07, 0x74, 0x61, 0x72,
0x67, 0x65, 0x74, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04,
0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x16, 0x0a, 0x06,
0x62, 0x61, 0x74, 0x74, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x62, 0x61,
0x74, 0x74, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x06,
0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x42, 0x06, 0x5a, 0x04,
0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x6c, 0x61, 0x72, 0x66, 0x12, 0x2e, 0x0a, 0x08, 0x73, 0x74, 0x61, 0x74, 0x75, 0x65, 0x72, 0x73,
0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74,
0x69, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x65, 0x72, 0x52, 0x08, 0x73, 0x74, 0x61, 0x74,
0x75, 0x65, 0x72, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x72, 0x6e, 0x70, 0x63, 0x18,
0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x75, 0x72, 0x72, 0x6e, 0x70, 0x63, 0x12, 0x1a,
0x0a, 0x08, 0x6e, 0x70, 0x63, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05,
0x52, 0x08, 0x6e, 0x70, 0x63, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65,
0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x72, 0x65, 0x66,
0x72, 0x65, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x6e, 0x75,
0x6d, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x6e,
0x75, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x18, 0x11, 0x20,
0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x12, 0x29, 0x0a, 0x09,
0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x12, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x09, 0x66, 0x6f,
0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x37, 0x0a, 0x09, 0x46, 0x75, 0x6c, 0x6c, 0x45,
0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
0x1a, 0x4b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72,
0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52,
0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x48, 0x0a,
0x16, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75,
0x6f, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01,
0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d,
0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69,
0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0xb5, 0x01, 0x0a, 0x16, 0x44, 0x42, 0x50, 0x72,
0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x52, 0x65, 0x63, 0x6f,
0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
0x03, 0x75, 0x69, 0x64, 0x12, 0x31, 0x0a, 0x07, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x73, 0x18,
0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69,
0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x52, 0x07,
0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75,
0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12,
0x16, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52,
0x06, 0x62, 0x61, 0x74, 0x74, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65,
0x72, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x42,
0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -745,33 +825,35 @@ func file_practice_practice_db_proto_rawDescGZIP() []byte {
return file_practice_practice_db_proto_rawDescData
}
var file_practice_practice_db_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
var file_practice_practice_db_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
var file_practice_practice_db_proto_goTypes = []interface{}{
(*DBPracticePillar)(nil), // 0: DBPracticePillar
(*DBPracticeTeacher)(nil), // 1: DBPracticeTeacher
(*DBPracticeStatuer)(nil), // 2: DBPracticeStatuer
(*DBPracticeRoom)(nil), // 3: DBPracticeRoom
(*DBPracticeQiecuoInvite)(nil), // 4: DBPracticeQiecuoInvite
(*DBPracticeQiecuoRecord)(nil), // 5: DBPracticeQiecuoRecord
nil, // 6: DBPracticeRoom.FullEntry
nil, // 7: DBPracticeRoom.KnapsackEntry
(*BattleRole)(nil), // 8: BattleRole
(*DBPracticeRes)(nil), // 3: DBPracticeRes
(*DBPracticeRoom)(nil), // 4: DBPracticeRoom
(*DBPracticeQiecuoInvite)(nil), // 5: DBPracticeQiecuoInvite
(*DBPracticeQiecuoRecord)(nil), // 6: DBPracticeQiecuoRecord
nil, // 7: DBPracticeRoom.FullEntry
nil, // 8: DBPracticeRoom.KnapsackEntry
(*BattleRole)(nil), // 9: BattleRole
}
var file_practice_practice_db_proto_depIdxs = []int32{
6, // 0: DBPracticeRoom.full:type_name -> DBPracticeRoom.FullEntry
7, // 1: DBPracticeRoom.knapsack:type_name -> DBPracticeRoom.KnapsackEntry
0, // 2: DBPracticeRoom.pillar1:type_name -> DBPracticePillar
0, // 3: DBPracticeRoom.pillar2:type_name -> DBPracticePillar
0, // 4: DBPracticeRoom.pillar3:type_name -> DBPracticePillar
0, // 5: DBPracticeRoom.pillarf:type_name -> DBPracticePillar
2, // 6: DBPracticeRoom.statuers:type_name -> DBPracticeStatuer
8, // 7: DBPracticeRoom.formation:type_name -> BattleRole
4, // 8: DBPracticeQiecuoRecord.targets:type_name -> DBPracticeQiecuoInvite
9, // [9:9] is the sub-list for method output_type
9, // [9:9] is the sub-list for method input_type
9, // [9:9] is the sub-list for extension type_name
9, // [9:9] is the sub-list for extension extendee
0, // [0:9] is the sub-list for field type_name
7, // 0: DBPracticeRoom.full:type_name -> DBPracticeRoom.FullEntry
8, // 1: DBPracticeRoom.knapsack:type_name -> DBPracticeRoom.KnapsackEntry
0, // 2: DBPracticeRoom.pillar1:type_name -> DBPracticePillar
0, // 3: DBPracticeRoom.pillar2:type_name -> DBPracticePillar
0, // 4: DBPracticeRoom.pillar3:type_name -> DBPracticePillar
0, // 5: DBPracticeRoom.pillarf:type_name -> DBPracticePillar
2, // 6: DBPracticeRoom.statuers:type_name -> DBPracticeStatuer
9, // 7: DBPracticeRoom.formation:type_name -> BattleRole
5, // 8: DBPracticeQiecuoRecord.targets:type_name -> DBPracticeQiecuoInvite
3, // 9: DBPracticeRoom.KnapsackEntry.value:type_name -> DBPracticeRes
10, // [10:10] is the sub-list for method output_type
10, // [10:10] is the sub-list for method input_type
10, // [10:10] is the sub-list for extension type_name
10, // [10:10] is the sub-list for extension extendee
0, // [0:10] is the sub-list for field type_name
}
func init() { file_practice_practice_db_proto_init() }
@ -818,7 +900,7 @@ func file_practice_practice_db_proto_init() {
}
}
file_practice_practice_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBPracticeRoom); i {
switch v := v.(*DBPracticeRes); i {
case 0:
return &v.state
case 1:
@ -830,7 +912,7 @@ func file_practice_practice_db_proto_init() {
}
}
file_practice_practice_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBPracticeQiecuoInvite); i {
switch v := v.(*DBPracticeRoom); i {
case 0:
return &v.state
case 1:
@ -842,6 +924,18 @@ func file_practice_practice_db_proto_init() {
}
}
file_practice_practice_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBPracticeQiecuoInvite); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_practice_practice_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBPracticeQiecuoRecord); i {
case 0:
return &v.state
@ -860,7 +954,7 @@ func file_practice_practice_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_practice_practice_db_proto_rawDesc,
NumEnums: 0,
NumMessages: 8,
NumMessages: 9,
NumExtensions: 0,
NumServices: 0,
},

57
pb/practice_msg.pb.go
View File

@ -739,8 +739,8 @@ type PracticeExpulsionResp struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Pillar *DBPracticePillar `protobuf:"bytes,1,opt,name=pillar,proto3" json:"pillar"`
Knapsack map[string]int32 `protobuf:"bytes,2,rep,name=knapsack,proto3" json:"knapsack" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //资源
Pillar *DBPracticePillar `protobuf:"bytes,1,opt,name=pillar,proto3" json:"pillar"`
Knapsack map[string]*DBPracticeRes `protobuf:"bytes,2,rep,name=knapsack,proto3" json:"knapsack" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //资源
}
func (x *PracticeExpulsionResp) Reset() {
@ -782,7 +782,7 @@ func (x *PracticeExpulsionResp) GetPillar() *DBPracticePillar {
return nil
}
func (x *PracticeExpulsionResp) GetKnapsack() map[string]int32 {
func (x *PracticeExpulsionResp) GetKnapsack() map[string]*DBPracticeRes {
if x != nil {
return x.Knapsack
}
@ -795,9 +795,9 @@ type PracticeBeExpulsionPush struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Fuid string `protobuf:"bytes,1,opt,name=fuid,proto3" json:"fuid"`
Pillar *DBPracticePillar `protobuf:"bytes,2,opt,name=pillar,proto3" json:"pillar"`
Knapsack map[string]int32 `protobuf:"bytes,3,rep,name=knapsack,proto3" json:"knapsack" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //资源
Fuid string `protobuf:"bytes,1,opt,name=fuid,proto3" json:"fuid"`
Pillar *DBPracticePillar `protobuf:"bytes,2,opt,name=pillar,proto3" json:"pillar"`
Knapsack map[string]*DBPracticeRes `protobuf:"bytes,3,rep,name=knapsack,proto3" json:"knapsack" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //资源
}
func (x *PracticeBeExpulsionPush) Reset() {
@ -846,7 +846,7 @@ func (x *PracticeBeExpulsionPush) GetPillar() *DBPracticePillar {
return nil
}
func (x *PracticeBeExpulsionPush) GetKnapsack() map[string]int32 {
func (x *PracticeBeExpulsionPush) GetKnapsack() map[string]*DBPracticeRes {
if x != nil {
return x.Knapsack
}
@ -914,8 +914,8 @@ type PracticeReceiveResp struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Pillar *DBPracticePillar `protobuf:"bytes,1,opt,name=pillar,proto3" json:"pillar"`
Knapsack map[string]int32 `protobuf:"bytes,2,rep,name=knapsack,proto3" json:"knapsack" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //资源
Pillar *DBPracticePillar `protobuf:"bytes,1,opt,name=pillar,proto3" json:"pillar"`
Knapsack map[string]*DBPracticeRes `protobuf:"bytes,2,rep,name=knapsack,proto3" json:"knapsack" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //资源
}
func (x *PracticeReceiveResp) Reset() {
@ -957,7 +957,7 @@ func (x *PracticeReceiveResp) GetPillar() *DBPracticePillar {
return nil
}
func (x *PracticeReceiveResp) GetKnapsack() map[string]int32 {
func (x *PracticeReceiveResp) GetKnapsack() map[string]*DBPracticeRes {
if x != nil {
return x.Knapsack
}
@ -2225,7 +2225,7 @@ var file_practice_practice_msg_proto_rawDesc = []byte{
0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63,
0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c,
0x61, 0x72, 0x22, 0x16, 0x0a, 0x14, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x78,
0x70, 0x75, 0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x22, 0xc1, 0x01, 0x0a, 0x15, 0x50,
0x70, 0x75, 0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x22, 0xd1, 0x01, 0x0a, 0x15, 0x50,
0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x78, 0x70, 0x75, 0x6c, 0x73, 0x69, 0x6f, 0x6e,
0x52, 0x65, 0x73, 0x70, 0x12, 0x29, 0x0a, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x18, 0x01,
0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63,
@ -2234,10 +2234,11 @@ var file_practice_practice_msg_proto_rawDesc = []byte{
0x0b, 0x32, 0x24, 0x2e, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x78, 0x70, 0x75,
0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61,
0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63,
0x6b, 0x1a, 0x3b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74,
0x6b, 0x1a, 0x4b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74,
0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xd9,
0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65,
0x52, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xe9,
0x01, 0x0a, 0x17, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x42, 0x65, 0x45, 0x78, 0x70,
0x75, 0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x50, 0x75, 0x73, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x75,
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x66, 0x75, 0x69, 0x64, 0x12, 0x29,
@ -2247,15 +2248,16 @@ var file_practice_practice_msg_proto_rawDesc = []byte{
0x70, 0x73, 0x61, 0x63, 0x6b, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x50, 0x72,
0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x42, 0x65, 0x45, 0x78, 0x70, 0x75, 0x6c, 0x73, 0x69, 0x6f,
0x6e, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e,
0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x1a, 0x3b, 0x0a,
0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x1a, 0x4b, 0x0a,
0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x0e, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x52,
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x42, 0x0a, 0x12, 0x50, 0x72,
0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71,
0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0xbd,
0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0xcd,
0x01, 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69,
0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x29, 0x0a, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72,
0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74,
@ -2264,10 +2266,11 @@ var file_practice_practice_msg_proto_rawDesc = []byte{
0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65,
0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61,
0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63,
0x6b, 0x1a, 0x3b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74,
0x6b, 0x1a, 0x4b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74,
0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3f,
0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65,
0x52, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3f,
0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x72, 0x6f, 0x6c, 0x6c,
0x65, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01,
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x68,
@ -2424,6 +2427,7 @@ var file_practice_practice_msg_proto_goTypes = []interface{}{
(ErrorCode)(0), // 50: ErrorCode
(*BattleInfo)(nil), // 51: BattleInfo
(*BattleReport)(nil), // 52: BattleReport
(*DBPracticeRes)(nil), // 53: DBPracticeRes
}
var file_practice_practice_msg_proto_depIdxs = []int32{
46, // 0: PracticeInfoResp.info:type_name -> DBPracticeRoom
@ -2444,11 +2448,14 @@ var file_practice_practice_msg_proto_depIdxs = []int32{
51, // 15: PracticeNPCBattkleResp.info:type_name -> BattleInfo
52, // 16: PracticeNPCBattkleFinishReq.report:type_name -> BattleReport
46, // 17: PracticeFriendRommResp.InfosEntry.value:type_name -> DBPracticeRoom
18, // [18:18] is the sub-list for method output_type
18, // [18:18] is the sub-list for method input_type
18, // [18:18] is the sub-list for extension type_name
18, // [18:18] is the sub-list for extension extendee
0, // [0:18] is the sub-list for field type_name
53, // 18: PracticeExpulsionResp.KnapsackEntry.value:type_name -> DBPracticeRes
53, // 19: PracticeBeExpulsionPush.KnapsackEntry.value:type_name -> DBPracticeRes
53, // 20: PracticeReceiveResp.KnapsackEntry.value:type_name -> DBPracticeRes
21, // [21:21] is the sub-list for method output_type
21, // [21:21] is the sub-list for method input_type
21, // [21:21] is the sub-list for extension type_name
21, // [21:21] is the sub-list for extension extendee
0, // [0:21] is the sub-list for field type_name
}
func init() { file_practice_practice_msg_proto_init() }

1
sys/configure/structs/Game.FightEventType.go
View File

@ -37,4 +37,5 @@ const (
GameFightEventType_OnFightEnd = 25
GameFightEventType_OnWaitInputSkill = 26
GameFightEventType_OnBuffOverlayNumChange = 27
GameFightEventType_OnCleanSkillExecute = 28
)

347
sys/configure/structs/Game.HuntingBossData.go
View File

@ -11,270 +11,129 @@ package cfg
import "errors"
type GameHuntingBossData struct {
Id int32
Type int32
Name string
Difficulty int32
BattleReadyID int32
Firstprize []*Gameatn
Dropshow []*Gameatn
Drop int32
Heroexp int32
Boss []int32
PsConsume []*Gameatn
PsMg []*Gameatn
Captionrecommend []int32
Id int32
Type int32
Name string
Difficulty int32
BattleReadyID int32
Firstprize []*Gameatn
Dropshow []*Gameatn
Drop int32
Heroexp int32
Bossmodel int32
Boss []int32
PsConsume []*Gameatn
PsMg []*Gameatn
Captionrecommend []int32
}
const TypeId_GameHuntingBossData = -450881718
func (*GameHuntingBossData) GetTypeId() int32 {
return -450881718
return -450881718
}
func (_v *GameHuntingBossData) 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["type"].(float64); !_ok_ {
err = errors.New("type error")
return
}
_v.Type = int32(_tempNum_)
}
{
var _ok_ bool
var __json_text__ map[string]interface{}
if __json_text__, _ok_ = _buf["name"].(map[string]interface{}); !_ok_ {
err = errors.New("_v.Name error")
return
}
{
var _ok_ bool
if _, _ok_ = __json_text__["key"].(string); !_ok_ {
err = errors.New("key error")
return
}
}
{
var _ok_ bool
if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ {
err = errors.New("text error")
return
}
}
}
{
var _ok_ bool
var _tempNum_ float64
if _tempNum_, _ok_ = _buf["difficulty"].(float64); !_ok_ {
err = errors.New("difficulty error")
return
}
_v.Difficulty = 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["firstprize"].([]interface{}); !_ok_ {
err = errors.New("firstprize error")
return
}
func (_v *GameHuntingBossData)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["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["difficulty"].(float64); !_ok_ { err = errors.New("difficulty error"); return }; _v.Difficulty = 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["firstprize"].([]interface{}); !_ok_ { err = errors.New("firstprize error"); return }
_v.Firstprize = make([]*Gameatn, 0, len(_arr_))
_v.Firstprize = 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.Firstprize = append(_v.Firstprize, _list_v_)
}
}
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.Firstprize = append(_v.Firstprize, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["dropshow"].([]interface{}); !_ok_ { err = errors.New("dropshow error"); return }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["dropshow"].([]interface{}); !_ok_ {
err = errors.New("dropshow error")
return
}
_v.Dropshow = 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.Dropshow = append(_v.Dropshow, _list_v_)
}
}
_v.Dropshow = make([]*Gameatn, 0, len(_arr_))
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["drop"].(float64); !_ok_ { err = errors.New("drop error"); return }; _v.Drop = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["heroexp"].(float64); !_ok_ { err = errors.New("heroexp error"); return }; _v.Heroexp = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bossmodel"].(float64); !_ok_ { err = errors.New("bossmodel error"); return }; _v.Bossmodel = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["boss"].([]interface{}); !_ok_ { err = errors.New("boss error"); return }
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.Dropshow = append(_v.Dropshow, _list_v_)
}
}
_v.Boss = 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.Boss = append(_v.Boss, _list_v_)
}
}
{
var _ok_ bool
var _tempNum_ float64
if _tempNum_, _ok_ = _buf["drop"].(float64); !_ok_ {
err = errors.New("drop error")
return
}
_v.Drop = int32(_tempNum_)
}
{
var _ok_ bool
var _tempNum_ float64
if _tempNum_, _ok_ = _buf["heroexp"].(float64); !_ok_ {
err = errors.New("heroexp error")
return
}
_v.Heroexp = int32(_tempNum_)
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["boss"].([]interface{}); !_ok_ {
err = errors.New("boss error")
return
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["ps_consume"].([]interface{}); !_ok_ { err = errors.New("ps_consume error"); return }
_v.Boss = make([]int32, 0, len(_arr_))
_v.PsConsume = 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.PsConsume = append(_v.PsConsume, _list_v_)
}
}
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.Boss = append(_v.Boss, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["ps_mg"].([]interface{}); !_ok_ { err = errors.New("ps_mg error"); return }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["ps_consume"].([]interface{}); !_ok_ {
err = errors.New("ps_consume error")
return
}
_v.PsMg = 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.PsMg = append(_v.PsMg, _list_v_)
}
}
_v.PsConsume = make([]*Gameatn, 0, len(_arr_))
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["captionrecommend"].([]interface{}); !_ok_ { err = errors.New("captionrecommend error"); return }
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.PsConsume = append(_v.PsConsume, _list_v_)
}
}
_v.Captionrecommend = 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.Captionrecommend = append(_v.Captionrecommend, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["ps_mg"].([]interface{}); !_ok_ {
err = errors.New("ps_mg error")
return
}
_v.PsMg = 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.PsMg = append(_v.PsMg, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["captionrecommend"].([]interface{}); !_ok_ {
err = errors.New("captionrecommend error")
return
}
_v.Captionrecommend = 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.Captionrecommend = append(_v.Captionrecommend, _list_v_)
}
}
return
return
}
func DeserializeGameHuntingBossData(_buf map[string]interface{}) (*GameHuntingBossData, error) {
v := &GameHuntingBossData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
v := &GameHuntingBossData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

6
sys/configure/structs/Game.PlayerInfor_overviewData.go
View File

@ -17,6 +17,9 @@ type GamePlayerInfor_overviewData struct {
Icon string
Tujing []int32
Url string
Resources string
Vague string
PvpAnimator string
Playerhead string
Name string
}
@ -47,6 +50,9 @@ func (_v *GamePlayerInfor_overviewData)Deserialize(_buf map[string]interface{})
}
{ var _ok_ bool; if _v.Url, _ok_ = _buf["url"].(string); !_ok_ { err = errors.New("url error"); return } }
{ var _ok_ bool; if _v.Resources, _ok_ = _buf["resources"].(string); !_ok_ { err = errors.New("resources error"); return } }
{ var _ok_ bool; if _v.Vague, _ok_ = _buf["vague"].(string); !_ok_ { err = errors.New("vague error"); return } }
{ var _ok_ bool; if _v.PvpAnimator, _ok_ = _buf["pvpAnimator"].(string); !_ok_ { err = errors.New("pvpAnimator error"); return } }
{ var _ok_ bool; if _v.Playerhead, _ok_ = _buf["playerhead"].(string); !_ok_ { err = errors.New("playerhead error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return

7
sys/configure/structs/Tables.go
View File

@ -82,7 +82,6 @@ type Tables struct {
ArenaRobot *GameArenaRobot
ArenaRankReward *GameArenaRankReward
ArenaChallengeNpc *GameArenaChallengeNpc
Show *GameShow
GuildLv *GameGuildLv
GuildPng *GameGuildPng
GuildActivity *GameGuildActivity
@ -617,12 +616,6 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.ArenaChallengeNpc, err = NewGameArenaChallengeNpc(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_show") ; err != nil {
return nil, err
}
if tables.Show, err = NewGameShow(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_guildlv") ; err != nil {
return nil, err
}

16
sys/configure/structs/game.globalData.go
View File

@ -125,8 +125,8 @@ type GameGlobalData struct {
ArenaInitiaIntegral int32
ArenaRecordMax int32
ArenaRefreshCd int32
ShowMale []int32
ShowFemale []int32
ShowMale []string
ShowFemale []string
HoroscopeResetCost *Gameatn
HoroscopeResetCd int32
HeroReset []*Gameatn
@ -537,11 +537,11 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
var _ok_ bool
if _arr_, _ok_ = _buf["show_male"].([]interface{}); !_ok_ { err = errors.New("show_male error"); return }
_v.ShowMale = make([]int32, 0, len(_arr_))
_v.ShowMale = make([]string, 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_) }
var _list_v_ string
{ if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
_v.ShowMale = append(_v.ShowMale, _list_v_)
}
}
@ -551,11 +551,11 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
var _ok_ bool
if _arr_, _ok_ = _buf["show_female"].([]interface{}); !_ok_ { err = errors.New("show_female error"); return }
_v.ShowFemale = make([]int32, 0, len(_arr_))
_v.ShowFemale = make([]string, 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_) }
var _list_v_ string
{ if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
_v.ShowFemale = append(_v.ShowFemale, _list_v_)
}
}