diff --git a/modules/comp_configure.go b/modules/comp_configure.go index 32b8bfd7b..27b580c06 100644 --- a/modules/comp_configure.go +++ b/modules/comp_configure.go @@ -14,7 +14,7 @@ import ( const ( //game_gamecolor = "game_gamecolor.json" //颜色表 game_playerlv = "game_playerlv.json" //玩家等级 - //game_facemod = "game_facemod.json" //形象配置表 + //game_facemod = "game_facemod.json" //形象配置表 game_drop = "game_drop.json" //掉落 new_hero = "game_hero.json" // 签到 diff --git a/modules/sociaty/api_cross_mine.go b/modules/sociaty/api_cross_mine.go index 1135589e5..d1432a0bc 100644 --- a/modules/sociaty/api_cross_mine.go +++ b/modules/sociaty/api_cross_mine.go @@ -74,10 +74,10 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.SociatyMineReq) (er } } } - + master := this.module.modelSociaty.getMasterInfo(sociaty) if sociaty.AccuseTime > 0 { // 获取会长 - master := this.module.modelSociaty.getMasterInfo(sociaty) + if master != nil { if master.Uid == session.GetUserId() { //自己是会长 sociaty.AccuseTime = 0 @@ -99,7 +99,11 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.SociatyMineReq) (er rsp.Master = master } } + } else { + rsp.Master = master } + } else { + rsp.Master = master } rsp.Sociaty = sociaty session.SendMsg(string(this.module.GetType()), SociatySubTypeMine, rsp)