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:
wh_zcy 2023-05-30 17:46:05 +08:00
commit 3371088e78
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/caravan/api_buyorsell.go
View File

@ -96,12 +96,15 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe
for i := caravan.Lv; i <= curLv-caravan.Lv; i++ { for i := caravan.Lv; i <= curLv-caravan.Lv; i++ {
if c, err := this.module.configure.GetCaravanLv(int32(i)); err == nil { if c, err := this.module.configure.GetCaravanLv(int32(i)); err == nil {
lvReward = append(lvReward, c.Reward...) lvReward = append(lvReward, c.Reward...)
update["lv"] = curLv
update["baglimit"] = c.Bagtop
} else { } else {
data.Message = err.Error() data.Message = err.Error()
code = pb.ErrorCode_ConfigNoFound code = pb.ErrorCode_ConfigNoFound
return return
} }
} }
caravan.Lv = curLv
} }
if len(lvReward) > 0 { if len(lvReward) > 0 {
if reward := this.module.DispenseRes(session, lvReward, true); reward != pb.ErrorCode_Success { if reward := this.module.DispenseRes(session, lvReward, true); reward != pb.ErrorCode_Success {

4
modules/caravan/model_caravan.go
View File

@ -54,13 +54,15 @@ func (this *modelCaravan) getCaravanList(uid string) (result *pb.DBCaravan, err
result.Citystime = configure.Now().Unix() result.Citystime = configure.Now().Unix()
result.Lv = 1 result.Lv = 1
result.Curcity = this.module.configure.GetCaravanInitCity() // 获取默认城市 result.Curcity = this.module.configure.GetCaravanInitCity() // 获取默认城市
if conf, err := this.module.configure.GetCaravanLv(result.Lv); err != nil { if conf, err := this.module.configure.GetCaravanLv(result.Lv); err == nil {
result.Baglimit = conf.Bagtop result.Baglimit = conf.Bagtop
} }
this.module.InitCaravanCityData(uid, result) // 初始1级 this.module.InitCaravanCityData(uid, result) // 初始1级
this.module.InitCaravanItemData(uid, result) this.module.InitCaravanItemData(uid, result)
this.Add(uid, result) this.Add(uid, result)
return return
} else {
this.module.Errorf("getCaravanList error: %v,uid:%s", err, uid)
} }
err = nil err = nil
return result, err return result, err

4
modules/hunting/api_challenge.go
View File

@ -38,7 +38,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen
if v1, ok := hunting.Ps[req.BossType]; ok && v1 == 0 { if v1, ok := hunting.Ps[req.BossType]; ok && v1 == 0 {
if code = this.module.ConsumeRes(session, cfgData.PsMg, true); code != pb.ErrorCode_Success { // 扣1点 if code = this.module.ConsumeRes(session, cfgData.PsMg, true); code != pb.ErrorCode_Success { // 扣1点
data.Message = err.Error()
return return
} }
} else { } else {
@ -58,7 +58,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen
N: ps, N: ps,
} }
if code = this.module.ConsumeRes(session, []*cfg.Gameatn{psAnt}, true); code != pb.ErrorCode_Success { if code = this.module.ConsumeRes(session, []*cfg.Gameatn{psAnt}, true); code != pb.ErrorCode_Success {
data.Message = err.Error()
return return
} }

4
modules/viking/api_challenge.go
View File

@ -39,7 +39,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng
if v1, ok := viking.Ps[req.BossId]; ok && v1 == 0 { if v1, ok := viking.Ps[req.BossId]; ok && v1 == 0 {
if code = this.module.ConsumeRes(session, cfgData.PsMg, true); code != pb.ErrorCode_Success { // 扣1点 if code = this.module.ConsumeRes(session, cfgData.PsMg, true); code != pb.ErrorCode_Success { // 扣1点
data.Message = err.Error()
return return
} }
} else { } else {
@ -59,7 +59,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng
N: ps, N: ps,
} }
if code = this.module.ConsumeRes(session, []*cfg.Gameatn{psAnt}, true); code != pb.ErrorCode_Success { if code = this.module.ConsumeRes(session, []*cfg.Gameatn{psAnt}, true); code != pb.ErrorCode_Success {
data.Message = err.Error()
return return
} }