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

配置表更新

Browse Source
This commit is contained in:
meixiongfeng 2022-08-03 10:29:27 +08:00
parent f327295b52
commit 49a42793c6
13 changed files with 9500 additions and 431 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
bin/json/LocalizeConfig_CN.json
View File

@ -3354,5 +3354,77 @@
{ {
"key": "opencond_prompt_10003", "key": "opencond_prompt_10003",
"text_cn": "开服第2天开启且通关2-14后开启" "text_cn": "开服第2天开启且通关2-14后开启"
},
{
"key": "num_1001",
"text_cn": "主线入口"
},
{
"key": "num_1002",
"text_cn": "招募"
},
{
"key": "num_1003",
"text_cn": "剧情副本"
},
{
"key": "num_1004",
"text_cn": "武馆入口"
},
{
"key": "num_1005",
"text_cn": "主题活动入口"
},
{
"key": "num_1006",
"text_cn": "迷雾岛屿"
},
{
"key": "num_1007",
"text_cn": "维京远征"
},
{
"key": "num_1008",
"text_cn": "心魔塔"
},
{
"key": "num_1009",
"text_cn": "捕羊大赛"
},
{
"key": "num_1010",
"text_cn": "黑暗料理大赛"
},
{
"key": "num_1011",
"text_cn": "地下角斗场"
},
{
"key": "num_1012",
"text_cn": "疯狂竞技赛"
},
{
"key": "num_1013",
"text_cn": "五侠擂台"
},
{
"key": "num_1014",
"text_cn": "藏书馆"
},
{
"key": "num_1015",
"text_cn": "篝火舞会"
},
{
"key": "num_1016",
"text_cn": "商队"
},
{
"key": "num_1017",
"text_cn": "美食馆"
},
{
"key": "num_1018",
"text_cn": "戈伯铁匠铺"
} }
] ]

72
bin/json/LocalizeConfig_EN.json
View File

@ -3354,5 +3354,77 @@
{ {
"key": "opencond_prompt_10003", "key": "opencond_prompt_10003",
"text_en": "" "text_en": ""
},
{
"key": "num_1001",
"text_en": "TRIALS"
},
{
"key": "num_1002",
"text_en": "MOON"
},
{
"key": "num_1003",
"text_en": "STORY"
},
{
"key": "num_1004",
"text_en": "KONG FU"
},
{
"key": "num_1005",
"text_en": "EVENT"
},
{
"key": "num_1006",
"text_en": "Misty Island"
},
{
"key": "num_1007",
"text_en": "Viking expedition"
},
{
"key": "num_1008",
"text_en": "Heart demon tower"
},
{
"key": "num_1009",
"text_en": "Catch sheep"
},
{
"key": "num_1010",
"text_en": "Dark cuisine"
},
{
"key": "num_1011",
"text_en": "Underground Arena"
},
{
"key": "num_1012",
"text_en": "Crazy competition"
},
{
"key": "num_1013",
"text_en": "Five heroes challenge"
},
{
"key": "num_1014",
"text_en": "Library"
},
{
"key": "num_1015",
"text_en": "Bonfire Dance"
},
{
"key": "num_1016",
"text_en": "Caravan"
},
{
"key": "num_1017",
"text_en": "Gourmet restaurant"
},
{
"key": "num_1018",
"text_en": "Gober blacksmith shop"
} }
] ]

72
bin/json/LocalizeConfig_TW.json
View File

@ -3354,5 +3354,77 @@
{ {
"key": "opencond_prompt_10003", "key": "opencond_prompt_10003",
"text_tw": "" "text_tw": ""
},
{
"key": "num_1001",
"text_tw": ""
},
{
"key": "num_1002",
"text_tw": ""
},
{
"key": "num_1003",
"text_tw": ""
},
{
"key": "num_1004",
"text_tw": ""
},
{
"key": "num_1005",
"text_tw": ""
},
{
"key": "num_1006",
"text_tw": ""
},
{
"key": "num_1007",
"text_tw": ""
},
{
"key": "num_1008",
"text_tw": ""
},
{
"key": "num_1009",
"text_tw": ""
},
{
"key": "num_1010",
"text_tw": ""
},
{
"key": "num_1011",
"text_tw": ""
},
{
"key": "num_1012",
"text_tw": ""
},
{
"key": "num_1013",
"text_tw": ""
},
{
"key": "num_1014",
"text_tw": ""
},
{
"key": "num_1015",
"text_tw": ""
},
{
"key": "num_1016",
"text_tw": ""
},
{
"key": "num_1017",
"text_tw": ""
},
{
"key": "num_1018",
"text_tw": ""
} }
] ]

8
bin/json/game_extservers.json
View File

@ -22,5 +22,13 @@
}, },
"ips": "10.0.0.138:7891", "ips": "10.0.0.138:7891",
"debug": true "debug": true
},
{
"name": {
"key": "debug_server_02",
"text": "mxf"
},
"ips": "10.0.0.85:7891",
"debug": true
} }
] ]

108
bin/json/game_language.json
View File

@ -322,5 +322,113 @@
"key": "tips_1002", "key": "tips_1002",
"text": "tips_1002" "text": "tips_1002"
} }
},
{
"keycode": {
"key": "num_1001",
"text": "num_1001"
}
},
{
"keycode": {
"key": "num_1002",
"text": "num_1002"
}
},
{
"keycode": {
"key": "num_1003",
"text": "num_1003"
}
},
{
"keycode": {
"key": "num_1004",
"text": "num_1004"
}
},
{
"keycode": {
"key": "num_1005",
"text": "num_1005"
}
},
{
"keycode": {
"key": "num_1006",
"text": "num_1006"
}
},
{
"keycode": {
"key": "num_1007",
"text": "num_1007"
}
},
{
"keycode": {
"key": "num_1008",
"text": "num_1008"
}
},
{
"keycode": {
"key": "num_1009",
"text": "num_1009"
}
},
{
"keycode": {
"key": "num_1010",
"text": "num_1010"
}
},
{
"keycode": {
"key": "num_1011",
"text": "num_1011"
}
},
{
"keycode": {
"key": "num_1012",
"text": "num_1012"
}
},
{
"keycode": {
"key": "num_1013",
"text": "num_1013"
}
},
{
"keycode": {
"key": "num_1014",
"text": "num_1014"
}
},
{
"keycode": {
"key": "num_1015",
"text": "num_1015"
}
},
{
"keycode": {
"key": "num_1016",
"text": "num_1016"
}
},
{
"keycode": {
"key": "num_1017",
"text": "num_1017"
}
},
{
"keycode": {
"key": "num_1018",
"text": "num_1018"
}
} }
] ]

8586
bin/json/game_skill.json Normal file
View File

File diff suppressed because it is too large Load Diff

24
bin/json/game_ui.json
View File

@ -682,5 +682,29 @@
"packagename": "roledetails", "packagename": "roledetails",
"comname": "equistrengthen", "comname": "equistrengthen",
"des": "装备强化" "des": "装备强化"
},
{
"id": "strengthenup",
"file": "StrengthenUpWindow",
"unloadpkg": 5,
"loadtype": 1,
"full": 0,
"blur": 1,
"package": "roledetails/roledetails",
"packagename": "roledetails",
"comname": "strengthen",
"des": "英雄升级升星详情"
},
{
"id": "croppingwindow",
"file": "CroppingWindow",
"unloadpkg": 0,
"loadtype": 1,
"full": 2,
"blur": 0,
"package": "zhandou/zhandou",
"packagename": "zhandou",
"comname": "cropping",
"des": "遮幅"
} }
] ]

19
modules/hero/api_strengthenUpStar.go
View File

@ -39,8 +39,6 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
_hero *pb.DBHero // 目标英雄 _hero *pb.DBHero // 目标英雄
tagHero *pb.DBHero // 消耗指定英雄 tagHero *pb.DBHero // 消耗指定英雄
mapCostHero map[string]int32 // 所有消耗英雄分类 mapCostHero map[string]int32 // 所有消耗英雄分类
bCheckNeedhero bool // 指定英雄校验
bCheckRacehero bool // 种族英雄校验
chanegCard []*pb.DBHero // 变化的英雄数据 chanegCard []*pb.DBHero // 变化的英雄数据
CostHeroObj map[string]*pb.DBHero // 所有消耗英雄分类 CostHeroObj map[string]*pb.DBHero // 所有消耗英雄分类
) )
@ -95,6 +93,8 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
code = pb.ErrorCode_ReqParameterError code = pb.ErrorCode_ReqParameterError
return return
} }
costNeedHeroCount = 0
costRaceHeroCount = 0
// 遍历所有消耗英雄 // 遍历所有消耗英雄
for k, v := range mapCostHero { for k, v := range mapCostHero {
if tagHero, code = this.module.GetHeroByObjID(session.GetUserId(), k); code != pb.ErrorCode_Success { // 没有这个英雄 if tagHero, code = this.module.GetHeroByObjID(session.GetUserId(), k); code != pb.ErrorCode_Success { // 没有这个英雄
@ -110,7 +110,7 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
} }
if tagHero.HeroID == target.Needhero && tagHero.Star == target.Needherostar && tagHero.SameCount >= target.Needheronum { if tagHero.HeroID == target.Needhero && tagHero.Star == target.Needherostar && tagHero.SameCount >= target.Needheronum {
bCheckNeedhero = true costNeedHeroCount += v
} }
for _, value := range target.Needrace { // 阵营校验 for _, value := range target.Needrace { // 阵营校验
@ -118,19 +118,22 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
cfg := this.module.configure.GetHero(tagHero.HeroID) cfg := this.module.configure.GetHero(tagHero.HeroID)
if cfg != nil { if cfg != nil {
if cfg.Race == value { if cfg.Race == value {
bCheckRacehero = true costRaceHeroCount += v
break
} }
} }
} }
this.module.Debugf("指定英雄校验结果:%b,种族英雄校验结果:%b", bCheckNeedhero, bCheckRacehero)
} }
CostHeroObj[k] = tagHero CostHeroObj[k] = tagHero
} }
if !bCheckRacehero || !bCheckNeedhero {
if target.Needheronum <= costNeedHeroCount || target.Needracenum <= costRaceHeroCount {
code = pb.ErrorCode_ReqParameterError code = pb.ErrorCode_ReqParameterError
return // 校验失败 return
} }
// if !bCheckRacehero || !bCheckNeedhero {
// code = pb.ErrorCode_ReqParameterError
// return // 校验失败
// }
// 金币消耗判断 // 金币消耗判断
curGold := this.module.ModuleUser.QueryAttributeValue(session.GetUserId(), "gold") curGold := this.module.ModuleUser.QueryAttributeValue(session.GetUserId(), "gold")

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

@ -1,3 +1,4 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
@ -11,425 +12,425 @@ package cfg
type JsonLoader func(string) ([]map[string]interface{}, error) type JsonLoader func(string) ([]map[string]interface{}, error)
type Tables struct { type Tables struct {
LocalizeConfig_CNCategory *Localize_LocalizeConfig_CNCategory LocalizeConfig_CNCategory *Localize_LocalizeConfig_CNCategory
LocalizeConfig_ENCategory *Localize_LocalizeConfig_ENCategory LocalizeConfig_ENCategory *Localize_LocalizeConfig_ENCategory
LocalizeConfig_TWCategory *Localize_LocalizeConfig_TWCategory LocalizeConfig_TWCategory *Localize_LocalizeConfig_TWCategory
global *Game_global global *Game_global
ui *Game_ui ui *Game_ui
plot *Game_plot plot *Game_plot
extservers *Game_extservers extservers *Game_extservers
skillAtk *Game_skillAtk skillAtk *Game_skillAtk
skillAfteratk *Game_skillAfteratk skillAfteratk *Game_skillAfteratk
skillBuff *Game_skillBuff skillBuff *Game_skillBuff
skillPassive *Game_skillPassive skillPassive *Game_skillPassive
newHero *Game_hero hero *Game_hero
heroStargrow *Game_heroStargrow heroStargrow *Game_heroStargrow
heroLevelgrow *Game_heroLevelgrow heroLevelgrow *Game_heroLevelgrow
heroStarup *Game_heroStarup heroStarup *Game_heroStarup
heroExp *Game_heroExp heroExp *Game_heroExp
heroLevelup *Game_heroLevelup heroLevelup *Game_heroLevelup
equip *Game_equip equip *Game_equip
equipAttrlibrary *Game_equipAttrlibrary equipAttrlibrary *Game_equipAttrlibrary
equipSuit *Game_equipSuit equipSuit *Game_equipSuit
equipColor *Game_equipColor equipColor *Game_equipColor
equipIntensify *Game_equipIntensify equipIntensify *Game_equipIntensify
item *Game_item item *Game_item
heroSkillLevel *Game_heroSkillLevel heroSkillLevel *Game_heroSkillLevel
heroResonance *Game_heroResonance heroResonance *Game_heroResonance
comAtn *Game_comAtn comAtn *Game_comAtn
heroAwaken *Game_heroAwaken heroAwaken *Game_heroAwaken
heroMethod *Game_heroMethod heroMethod *Game_heroMethod
shop *Game_shop shop *Game_shop
shopitem *Game_shopitem shopitem *Game_shopitem
activeReward *Game_activeReward activeReward *Game_activeReward
serverList *Game_serverList serverList *Game_serverList
com *Game_com com *Game_com
newSkill *Game_newSkill skill *Game_skill
model *Game_model model *Game_model
mainlineChapter *Game_mainlineChapter mainlineChapter *Game_mainlineChapter
mainlineEasy *Game_mainlineEasy mainlineEasy *Game_mainlineEasy
mainlineHard *Game_mainlineHard mainlineHard *Game_mainlineHard
mainlinePurgatory *Game_mainlinePurgatory mainlinePurgatory *Game_mainlinePurgatory
drawCard *Game_drawCard drawCard *Game_drawCard
drawUpdraw *Game_drawUpdraw drawUpdraw *Game_drawUpdraw
drawCom *Game_drawCom drawCom *Game_drawCom
drawCost *Game_drawCost drawCost *Game_drawCost
chatChannel *Game_chatChannel chatChannel *Game_chatChannel
chatSystem *Game_chatSystem chatSystem *Game_chatSystem
chatServerGroup *Game_chatServerGroup chatServerGroup *Game_chatServerGroup
chatChannelCom *Game_chatChannelCom chatChannelCom *Game_chatChannelCom
taskRound *Game_taskRound taskRound *Game_taskRound
taskActiveReward *Game_taskActiveReward taskActiveReward *Game_taskActiveReward
coin *Game_coin coin *Game_coin
initial *Game_initial initial *Game_initial
monster *Game_monster monster *Game_monster
equipPos *Game_equipPos equipPos *Game_equipPos
playerlv *Game_playerlv playerlv *Game_playerlv
propsgroup *Game_propsgroup propsgroup *Game_propsgroup
facemod *Game_facemod facemod *Game_facemod
msgdistrib *Game_msgdistrib msgdistrib *Game_msgdistrib
language *Game_language language *Game_language
propsgrouplist *Game_propsgrouplist propsgrouplist *Game_propsgrouplist
} }
func NewTables(loader JsonLoader) (*Tables, error) { func NewTables(loader JsonLoader) (*Tables, error) {
var err error var err error
var buf []map[string]interface{} var buf []map[string]interface{}
tables := &Tables{} tables := &Tables{}
if buf, err = loader("LocalizeConfig_CN"); err != nil { if buf, err = loader("LocalizeConfig_CN") ; err != nil {
return nil, err return nil, err
} }
if tables.LocalizeConfig_CNCategory, err = NewLocalize_LocalizeConfig_CNCategory(buf); err != nil { if tables.LocalizeConfig_CNCategory, err = NewLocalize_LocalizeConfig_CNCategory(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("LocalizeConfig_EN"); err != nil { if buf, err = loader("LocalizeConfig_EN") ; err != nil {
return nil, err return nil, err
} }
if tables.LocalizeConfig_ENCategory, err = NewLocalize_LocalizeConfig_ENCategory(buf); err != nil { if tables.LocalizeConfig_ENCategory, err = NewLocalize_LocalizeConfig_ENCategory(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("LocalizeConfig_TW"); err != nil { if buf, err = loader("LocalizeConfig_TW") ; err != nil {
return nil, err return nil, err
} }
if tables.LocalizeConfig_TWCategory, err = NewLocalize_LocalizeConfig_TWCategory(buf); err != nil { if tables.LocalizeConfig_TWCategory, err = NewLocalize_LocalizeConfig_TWCategory(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_global"); err != nil { if buf, err = loader("game_global") ; err != nil {
return nil, err return nil, err
} }
if tables.global, err = NewGame_global(buf); err != nil { if tables.global, err = NewGame_global(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_ui"); err != nil { if buf, err = loader("game_ui") ; err != nil {
return nil, err return nil, err
} }
if tables.ui, err = NewGame_ui(buf); err != nil { if tables.ui, err = NewGame_ui(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_plot"); err != nil { if buf, err = loader("game_plot") ; err != nil {
return nil, err return nil, err
} }
if tables.plot, err = NewGame_plot(buf); err != nil { if tables.plot, err = NewGame_plot(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_extservers"); err != nil { if buf, err = loader("game_extservers") ; err != nil {
return nil, err return nil, err
} }
if tables.extservers, err = NewGame_extservers(buf); err != nil { if tables.extservers, err = NewGame_extservers(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_skillatk"); err != nil { if buf, err = loader("game_skillatk") ; err != nil {
return nil, err return nil, err
} }
if tables.skillAtk, err = NewGame_skillAtk(buf); err != nil { if tables.skillAtk, err = NewGame_skillAtk(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_skillafteratk"); err != nil { if buf, err = loader("game_skillafteratk") ; err != nil {
return nil, err return nil, err
} }
if tables.skillAfteratk, err = NewGame_skillAfteratk(buf); err != nil { if tables.skillAfteratk, err = NewGame_skillAfteratk(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_skillbuff"); err != nil { if buf, err = loader("game_skillbuff") ; err != nil {
return nil, err return nil, err
} }
if tables.skillBuff, err = NewGame_skillBuff(buf); err != nil { if tables.skillBuff, err = NewGame_skillBuff(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_skillpassive"); err != nil { if buf, err = loader("game_skillpassive") ; err != nil {
return nil, err return nil, err
} }
if tables.skillPassive, err = NewGame_skillPassive(buf); err != nil { if tables.skillPassive, err = NewGame_skillPassive(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_hero"); err != nil { if buf, err = loader("game_hero") ; err != nil {
return nil, err return nil, err
} }
if tables.newHero, err = NewGame_hero(buf); err != nil { if tables.hero, err = NewGame_hero(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_herostargrow"); err != nil { if buf, err = loader("game_herostargrow") ; err != nil {
return nil, err return nil, err
} }
if tables.heroStargrow, err = NewGame_heroStargrow(buf); err != nil { if tables.heroStargrow, err = NewGame_heroStargrow(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_herolevelgrow"); err != nil { if buf, err = loader("game_herolevelgrow") ; err != nil {
return nil, err return nil, err
} }
if tables.heroLevelgrow, err = NewGame_heroLevelgrow(buf); err != nil { if tables.heroLevelgrow, err = NewGame_heroLevelgrow(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_herostarup"); err != nil { if buf, err = loader("game_herostarup") ; err != nil {
return nil, err return nil, err
} }
if tables.heroStarup, err = NewGame_heroStarup(buf); err != nil { if tables.heroStarup, err = NewGame_heroStarup(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_heroexp"); err != nil { if buf, err = loader("game_heroexp") ; err != nil {
return nil, err return nil, err
} }
if tables.heroExp, err = NewGame_heroExp(buf); err != nil { if tables.heroExp, err = NewGame_heroExp(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_herolevelup"); err != nil { if buf, err = loader("game_herolevelup") ; err != nil {
return nil, err return nil, err
} }
if tables.heroLevelup, err = NewGame_heroLevelup(buf); err != nil { if tables.heroLevelup, err = NewGame_heroLevelup(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_equip"); err != nil { if buf, err = loader("game_equip") ; err != nil {
return nil, err return nil, err
} }
if tables.equip, err = NewGame_equip(buf); err != nil { if tables.equip, err = NewGame_equip(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_equipattrlibrary"); err != nil { if buf, err = loader("game_equipattrlibrary") ; err != nil {
return nil, err return nil, err
} }
if tables.equipAttrlibrary, err = NewGame_equipAttrlibrary(buf); err != nil { if tables.equipAttrlibrary, err = NewGame_equipAttrlibrary(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_equipsuit"); err != nil { if buf, err = loader("game_equipsuit") ; err != nil {
return nil, err return nil, err
} }
if tables.equipSuit, err = NewGame_equipSuit(buf); err != nil { if tables.equipSuit, err = NewGame_equipSuit(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_equipcolor"); err != nil { if buf, err = loader("game_equipcolor") ; err != nil {
return nil, err return nil, err
} }
if tables.equipColor, err = NewGame_equipColor(buf); err != nil { if tables.equipColor, err = NewGame_equipColor(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_equipintensify"); err != nil { if buf, err = loader("game_equipintensify") ; err != nil {
return nil, err return nil, err
} }
if tables.equipIntensify, err = NewGame_equipIntensify(buf); err != nil { if tables.equipIntensify, err = NewGame_equipIntensify(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_item"); err != nil { if buf, err = loader("game_item") ; err != nil {
return nil, err return nil, err
} }
if tables.item, err = NewGame_item(buf); err != nil { if tables.item, err = NewGame_item(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_heroskilllevel"); err != nil { if buf, err = loader("game_heroskilllevel") ; err != nil {
return nil, err return nil, err
} }
if tables.heroSkillLevel, err = NewGame_heroSkillLevel(buf); err != nil { if tables.heroSkillLevel, err = NewGame_heroSkillLevel(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_heroresonance"); err != nil { if buf, err = loader("game_heroresonance") ; err != nil {
return nil, err return nil, err
} }
if tables.heroResonance, err = NewGame_heroResonance(buf); err != nil { if tables.heroResonance, err = NewGame_heroResonance(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_comatn"); err != nil { if buf, err = loader("game_comatn") ; err != nil {
return nil, err return nil, err
} }
if tables.comAtn, err = NewGame_comAtn(buf); err != nil { if tables.comAtn, err = NewGame_comAtn(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_heroawaken"); err != nil { if buf, err = loader("game_heroawaken") ; err != nil {
return nil, err return nil, err
} }
if tables.heroAwaken, err = NewGame_heroAwaken(buf); err != nil { if tables.heroAwaken, err = NewGame_heroAwaken(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_heromethod"); err != nil { if buf, err = loader("game_heromethod") ; err != nil {
return nil, err return nil, err
} }
if tables.heroMethod, err = NewGame_heroMethod(buf); err != nil { if tables.heroMethod, err = NewGame_heroMethod(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_shop"); err != nil { if buf, err = loader("game_shop") ; err != nil {
return nil, err return nil, err
} }
if tables.shop, err = NewGame_shop(buf); err != nil { if tables.shop, err = NewGame_shop(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_shopitem"); err != nil { if buf, err = loader("game_shopitem") ; err != nil {
return nil, err return nil, err
} }
if tables.shopitem, err = NewGame_shopitem(buf); err != nil { if tables.shopitem, err = NewGame_shopitem(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_activereward"); err != nil { if buf, err = loader("game_activereward") ; err != nil {
return nil, err return nil, err
} }
if tables.activeReward, err = NewGame_activeReward(buf); err != nil { if tables.activeReward, err = NewGame_activeReward(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_serverlist"); err != nil { if buf, err = loader("game_serverlist") ; err != nil {
return nil, err return nil, err
} }
if tables.serverList, err = NewGame_serverList(buf); err != nil { if tables.serverList, err = NewGame_serverList(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_com"); err != nil { if buf, err = loader("game_com") ; err != nil {
return nil, err return nil, err
} }
if tables.com, err = NewGame_com(buf); err != nil { if tables.com, err = NewGame_com(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_newskill"); err != nil { if buf, err = loader("game_skill") ; err != nil {
return nil, err return nil, err
} }
if tables.newSkill, err = NewGame_newSkill(buf); err != nil { if tables.skill, err = NewGame_skill(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_model"); err != nil { if buf, err = loader("game_model") ; err != nil {
return nil, err return nil, err
} }
if tables.model, err = NewGame_model(buf); err != nil { if tables.model, err = NewGame_model(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_mainlinechapter"); err != nil { if buf, err = loader("game_mainlinechapter") ; err != nil {
return nil, err return nil, err
} }
if tables.mainlineChapter, err = NewGame_mainlineChapter(buf); err != nil { if tables.mainlineChapter, err = NewGame_mainlineChapter(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_mainlineeasy"); err != nil { if buf, err = loader("game_mainlineeasy") ; err != nil {
return nil, err return nil, err
} }
if tables.mainlineEasy, err = NewGame_mainlineEasy(buf); err != nil { if tables.mainlineEasy, err = NewGame_mainlineEasy(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_mainlinehard"); err != nil { if buf, err = loader("game_mainlinehard") ; err != nil {
return nil, err return nil, err
} }
if tables.mainlineHard, err = NewGame_mainlineHard(buf); err != nil { if tables.mainlineHard, err = NewGame_mainlineHard(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_mainlinepurgatory"); err != nil { if buf, err = loader("game_mainlinepurgatory") ; err != nil {
return nil, err return nil, err
} }
if tables.mainlinePurgatory, err = NewGame_mainlinePurgatory(buf); err != nil { if tables.mainlinePurgatory, err = NewGame_mainlinePurgatory(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_drawcard"); err != nil { if buf, err = loader("game_drawcard") ; err != nil {
return nil, err return nil, err
} }
if tables.drawCard, err = NewGame_drawCard(buf); err != nil { if tables.drawCard, err = NewGame_drawCard(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_drawupdraw"); err != nil { if buf, err = loader("game_drawupdraw") ; err != nil {
return nil, err return nil, err
} }
if tables.drawUpdraw, err = NewGame_drawUpdraw(buf); err != nil { if tables.drawUpdraw, err = NewGame_drawUpdraw(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_drawcom"); err != nil { if buf, err = loader("game_drawcom") ; err != nil {
return nil, err return nil, err
} }
if tables.drawCom, err = NewGame_drawCom(buf); err != nil { if tables.drawCom, err = NewGame_drawCom(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_drawcost"); err != nil { if buf, err = loader("game_drawcost") ; err != nil {
return nil, err return nil, err
} }
if tables.drawCost, err = NewGame_drawCost(buf); err != nil { if tables.drawCost, err = NewGame_drawCost(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_chatchannel"); err != nil { if buf, err = loader("game_chatchannel") ; err != nil {
return nil, err return nil, err
} }
if tables.chatChannel, err = NewGame_chatChannel(buf); err != nil { if tables.chatChannel, err = NewGame_chatChannel(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_chatsystem"); err != nil { if buf, err = loader("game_chatsystem") ; err != nil {
return nil, err return nil, err
} }
if tables.chatSystem, err = NewGame_chatSystem(buf); err != nil { if tables.chatSystem, err = NewGame_chatSystem(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_chatservergroup"); err != nil { if buf, err = loader("game_chatservergroup") ; err != nil {
return nil, err return nil, err
} }
if tables.chatServerGroup, err = NewGame_chatServerGroup(buf); err != nil { if tables.chatServerGroup, err = NewGame_chatServerGroup(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_chatchannelcom"); err != nil { if buf, err = loader("game_chatchannelcom") ; err != nil {
return nil, err return nil, err
} }
if tables.chatChannelCom, err = NewGame_chatChannelCom(buf); err != nil { if tables.chatChannelCom, err = NewGame_chatChannelCom(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_taskround"); err != nil { if buf, err = loader("game_taskround") ; err != nil {
return nil, err return nil, err
} }
if tables.taskRound, err = NewGame_taskRound(buf); err != nil { if tables.taskRound, err = NewGame_taskRound(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_taskactivereward"); err != nil { if buf, err = loader("game_taskactivereward") ; err != nil {
return nil, err return nil, err
} }
if tables.taskActiveReward, err = NewGame_taskActiveReward(buf); err != nil { if tables.taskActiveReward, err = NewGame_taskActiveReward(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_coin"); err != nil { if buf, err = loader("game_coin") ; err != nil {
return nil, err return nil, err
} }
if tables.coin, err = NewGame_coin(buf); err != nil { if tables.coin, err = NewGame_coin(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_initial"); err != nil { if buf, err = loader("game_initial") ; err != nil {
return nil, err return nil, err
} }
if tables.initial, err = NewGame_initial(buf); err != nil { if tables.initial, err = NewGame_initial(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_monster"); err != nil { if buf, err = loader("game_monster") ; err != nil {
return nil, err return nil, err
} }
if tables.monster, err = NewGame_monster(buf); err != nil { if tables.monster, err = NewGame_monster(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_equippos"); err != nil { if buf, err = loader("game_equippos") ; err != nil {
return nil, err return nil, err
} }
if tables.equipPos, err = NewGame_equipPos(buf); err != nil { if tables.equipPos, err = NewGame_equipPos(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_playerlv"); err != nil { if buf, err = loader("game_playerlv") ; err != nil {
return nil, err return nil, err
} }
if tables.playerlv, err = NewGame_playerlv(buf); err != nil { if tables.playerlv, err = NewGame_playerlv(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_propsgroup"); err != nil { if buf, err = loader("game_propsgroup") ; err != nil {
return nil, err return nil, err
} }
if tables.propsgroup, err = NewGame_propsgroup(buf); err != nil { if tables.propsgroup, err = NewGame_propsgroup(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_facemod"); err != nil { if buf, err = loader("game_facemod") ; err != nil {
return nil, err return nil, err
} }
if tables.facemod, err = NewGame_facemod(buf); err != nil { if tables.facemod, err = NewGame_facemod(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_msgdistrib"); err != nil { if buf, err = loader("game_msgdistrib") ; err != nil {
return nil, err return nil, err
} }
if tables.msgdistrib, err = NewGame_msgdistrib(buf); err != nil { if tables.msgdistrib, err = NewGame_msgdistrib(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_language"); err != nil { if buf, err = loader("game_language") ; err != nil {
return nil, err return nil, err
} }
if tables.language, err = NewGame_language(buf); err != nil { if tables.language, err = NewGame_language(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_propsgrouplist"); err != nil { if buf, err = loader("game_propsgrouplist") ; err != nil {
return nil, err return nil, err
} }
if tables.propsgrouplist, err = NewGame_propsgrouplist(buf); err != nil { if tables.propsgrouplist, err = NewGame_propsgrouplist(buf) ; err != nil {
return nil, err return nil, err
} }
return tables, nil return tables, nil
} }

15
sys/configure/structs/game.equipIntensify.go
View File

@ -1,3 +1,4 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
@ -8,8 +9,8 @@
package cfg package cfg
type Game_equipIntensify struct { type Game_equipIntensify struct {
_dataMap map[int32]*Game_equipIntensifyData _dataMap map[int32]*Game_equipIntensifyData
_dataList []*Game_equipIntensifyData _dataList []*Game_equipIntensifyData
} }
func NewGame_equipIntensify(_buf []map[string]interface{}) (*Game_equipIntensify, error) { func NewGame_equipIntensify(_buf []map[string]interface{}) (*Game_equipIntensify, error) {
@ -23,17 +24,19 @@ func NewGame_equipIntensify(_buf []map[string]interface{}) (*Game_equipIntensify
dataMap[_v.Key] = _v dataMap[_v.Key] = _v
} }
} }
return &Game_equipIntensify{_dataList: _dataList, _dataMap: dataMap}, nil return &Game_equipIntensify{_dataList:_dataList, _dataMap:dataMap}, nil
} }
func (table *Game_equipIntensify) GetDataMap() map[int32]*Game_equipIntensifyData { func (table *Game_equipIntensify) GetDataMap() map[int32]*Game_equipIntensifyData {
return table._dataMap return table._dataMap
} }
func (table *Game_equipIntensify) GetDataList() []*Game_equipIntensifyData { func (table *Game_equipIntensify) GetDataList() []*Game_equipIntensifyData {
return table._dataList return table._dataList
} }
func (table *Game_equipIntensify) Get(key int32) *Game_equipIntensifyData { func (table *Game_equipIntensify) Get(key int32) *Game_equipIntensifyData {
return table._dataMap[key] return table._dataMap[key]
} }

42
sys/configure/structs/game.skill.go Normal file
View File

@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type Game_skill struct {
_dataMap map[int32]*Game_skillData
_dataList []*Game_skillData
}
func NewGame_skill(_buf []map[string]interface{}) (*Game_skill, error) {
_dataList := make([]*Game_skillData, 0, len(_buf))
dataMap := make(map[int32]*Game_skillData)
for _, _ele_ := range _buf {
if _v, err2 := NewGame_skillData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
return &Game_skill{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *Game_skill) GetDataMap() map[int32]*Game_skillData {
return table._dataMap
}
func (table *Game_skill) GetDataList() []*Game_skillData {
return table._dataList
}
func (table *Game_skill) Get(key int32) *Game_skillData {
return table._dataMap[key]
}

77
sys/configure/structs/game.skillData.go Normal file
View File

@ -0,0 +1,77 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type Game_skillData struct {
Id int32
Name string
Ico string
Act string
Type int32
MaxLV int32
CD []int32
Target int32
ChildSkill []*Game_ChildSkills
Desc1 string
Desc2 string
Desc3 string
Desc4 string
Desc5 string
}
func (Game_skillData) GetTypeId() int {
return -1600555361
}
func NewGame_skillData(_buf map[string]interface{}) (_v *Game_skillData, err error) {
_v = &Game_skillData{}
{ 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 __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; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } }
{ var _ok_ bool; if _v.Act, _ok_ = _buf["act"].(string); !_ok_ { err = errors.New("act error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Type"].(float64); !_ok_ { err = errors.New("Type error"); return }; _v.Type = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MaxLV"].(float64); !_ok_ { err = errors.New("MaxLV error"); return }; _v.MaxLV = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["CD"].([]interface{}); !_ok_ { err = errors.New("CD error"); return }
_v.CD = 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.CD = append(_v.CD, _list_v_)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Target"].(float64); !_ok_ { err = errors.New("Target error"); return }; _v.Target = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["ChildSkill"].([]interface{}); !_ok_ { err = errors.New("ChildSkill error"); return }
_v.ChildSkill = make([]*Game_ChildSkills, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Game_ChildSkills
{ 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 = NewGame_ChildSkills(_x_); err != nil { return } }
_v.ChildSkill = append(_v.ChildSkill, _list_v_)
}
}
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Desc1"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc1 error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc1, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Desc2"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc2 error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc2, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Desc3"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc3 error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc3, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Desc4"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc4 error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc4, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Desc5"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc5 error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc5, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return
}

1
sys/db/init_test.go
View File

@ -26,6 +26,7 @@ func TestMain(m *testing.M) {
defer os.Exit(m.Run()) defer os.Exit(m.Run())
} }
func TestMail(t *testing.T) { func TestMail(t *testing.T) {
mail := &pb.DBMailData{} mail := &pb.DBMailData{}
err := db.mgo.FindOneAndUpdate( err := db.mgo.FindOneAndUpdate(
"mail", "mail",