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

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
meixiongfeng 2023-12-05 18:10:18 +08:00
commit 7883892d60
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/comp_configure.go
View File

@ -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"
// 签到

8
modules/sociaty/api_cross_mine.go
View File

@ -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)