diff --git a/comm/const.go b/comm/const.go index fa30474e2..2a3a5d470 100644 --- a/comm/const.go +++ b/comm/const.go @@ -409,6 +409,11 @@ const ( Diamond int32 = 2 //钻石 ) +// 排行算虚拟币最低值 +const ( + CaravanMerchantmoney int32 = 10000 +) + // 定时通知类型 type NotifyType int32 @@ -839,15 +844,16 @@ const ( ) const ( - PrivilegeType1 = iota + 1 //每日获得 - PrivilegeType2 //金币商店每日免费刷新次数 - PrivilegeType3 //维京远征每日可购买挑战次数 - PrivilegeType4 //狩猎每日可购买挑战次数 - PrivilegeType5 //竞技场每日可购买挑战次数 - PrivilegeType6 //梦境每日可购买挑战次数 - PrivilegeType7 //巨怪商队背包容量 - PrivilegeType8 //美食馆每日最大制作时间 - PrivilegeType9 //武馆每日最大练功时间 + PrivilegeType1 = iota + 1 //每日获得 + PrivilegeType2 //金币商店每日免费刷新次数 + PrivilegeType3 //维京远征每日可购买挑战次数 + PrivilegeType4 //狩猎每日可购买挑战次数 + PrivilegeType5 //竞技场每日可购买挑战次数 + PrivilegeType6 //梦境每日可购买挑战次数 + PrivilegeType7 //巨怪商队背包容量 + PrivilegeType8 //美食馆每日最大制作时间 + PrivilegeType9 //武馆每日最大练功时间 + PrivilegeType10 //竞技场门票存储上限 ) const ( diff --git a/modules/arena/modelarena.go b/modules/arena/modelarena.go index 88e5a228c..337ac2d36 100644 --- a/modules/arena/modelarena.go +++ b/modules/arena/modelarena.go @@ -421,8 +421,11 @@ func (this *modelArena) recoverTicket(session comm.IUserSession, info *pb.DBAren } global := this.module.ModuleTools.GetGlobalConf() + maxTick := global.ArenaTicketMax + // 竞技场最大上限 + maxTick += this.module.privilege.GetCountByPrivilegeId(session.GetUserId(), comm.PrivilegeType10) // 特权 ticket = int32(this.module.ModuleItems.QueryItemAmount(info.Uid, ticketitem.T)) - if ticket < global.ArenaTicketMax && info.Lastrtickettime > 0 { + if ticket < maxTick && info.Lastrtickettime > 0 { duration = configure.Now().Sub(time.Unix(info.Lastrtickettime, 0)) ticketNum = int32(math.Floor(duration.Minutes() / float64(global.ArenaTicketRecoveryTime))) if ticketNum > 0 { diff --git a/modules/battle/module.go b/modules/battle/module.go index d94f3a3cc..82e81d394 100644 --- a/modules/battle/module.go +++ b/modules/battle/module.go @@ -35,7 +35,7 @@ type Battle struct { clientmgr *battleClientMgrComp //c#战斗客户端端管理 } -//模块名 +// 模块名 func (this *Battle) GetType() core.M_Modules { return comm.ModuleBattle } @@ -44,7 +44,7 @@ func (this *Battle) NewOptions() (options core.IModuleOptions) { return new(Options) } -//模块初始化接口 注册用户创建角色事件 +// 模块初始化接口 注册用户创建角色事件 func (this *Battle) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { err = this.ModuleBase.Init(service, module, options) this.service = service.(base.IRPCXService) @@ -71,7 +71,7 @@ func (this *Battle) Start() (err error) { return } -//装备组件 +// 装备组件 func (this *Battle) OnInstallComp() { this.ModuleBase.OnInstallComp() this.api_comp = this.RegisterComp(new(apiComp)).(*apiComp) @@ -80,7 +80,7 @@ func (this *Battle) OnInstallComp() { this.clientmgr = this.RegisterComp(new(battleClientMgrComp)).(*battleClientMgrComp) } -//查询战斗记录 +// 查询战斗记录 func (this *Battle) QueryBattleRecord(oid string) (errdata *pb.ErrorData, record *pb.DBBattleRecord) { var err error if record, err = this.modelBattle.queryrecord(oid); err != nil { @@ -93,7 +93,7 @@ func (this *Battle) QueryBattleRecord(oid string) (errdata *pb.ErrorData, record return } -//创建pve战斗 +// 创建pve战斗 func (this *Battle) CreateEveBattle(session comm.IUserSession, req *pb.BattleEVEReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) { var ( conn *db.DBConn @@ -120,7 +120,7 @@ func (this *Battle) CreateEveBattle(session comm.IUserSession, req *pb.BattleEVE return } -//创建pve战斗 +// 创建pve战斗 func (this *Battle) CreatePveBattle(session comm.IUserSession, req *pb.BattlePVEReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) { var ( conn *db.DBConn @@ -153,8 +153,10 @@ func (this *Battle) CreatePveBattle(session comm.IUserSession, req *pb.BattlePVE Title: pb.ErrorCode_ReqParameterError.ToString(), } } + var flag bool for _, v := range req.Format.Friendformat { if v != "" { + flag = true // this.ModuleBuried.SendToRtask(session, comm.Rtype108, 1) go this.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype108, 1)) break @@ -164,13 +166,13 @@ func (this *Battle) CreatePveBattle(session comm.IUserSession, req *pb.BattlePVE if record, errdata = this.modelBattle.createpve(session, conn, pb.BattleType_pve, req); errdata != nil { return } - if req.Format.Friendformat != nil { + if flag { go this.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype12, 1)) } return } -//创建pve战斗 +// 创建pve战斗 func (this *Battle) CreatePvbBattle(session comm.IUserSession, req *pb.BattlePVBReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) { var ( conn *db.DBConn @@ -203,7 +205,7 @@ func (this *Battle) CreatePvbBattle(session comm.IUserSession, req *pb.BattlePVB return } -//创建pve战斗 +// 创建pve战斗 func (this *Battle) CreatePvpBattle(session comm.IUserSession, req *pb.BattlePVPReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) { var ( conn *db.DBConn @@ -229,7 +231,7 @@ func (this *Battle) CreatePvpBattle(session comm.IUserSession, req *pb.BattlePVP return } -//只有跨服环境下才可使用 +// 只有跨服环境下才可使用 func (this *Battle) CreateRtPvpBattle(req *pb.BattleRTPVPReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) { var ( redmodel *db.DBModel @@ -265,7 +267,7 @@ func (this *Battle) CreateRtPvpBattle(req *pb.BattleRTPVPReq) (errdata *pb.Error return } -//创建连续战斗 +// 创建连续战斗 func (this *Battle) CreateLPVEBattle(session comm.IUserSession, req *pb.BattleLPVEReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) { var ( conn *db.DBConn @@ -298,8 +300,10 @@ func (this *Battle) CreateLPVEBattle(session comm.IUserSession, req *pb.BattleLP Title: pb.ErrorCode_ReqParameterError.ToString(), } } + var flag bool for _, v := range req.Format.Friendformat { if v != "" { + flag = true // this.ModuleBuried.SendToRtask(session, comm.Rtype108, 1) go this.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype108, 1)) break @@ -309,19 +313,19 @@ func (this *Battle) CreateLPVEBattle(session comm.IUserSession, req *pb.BattleLP if record, errdata = this.modelBattle.createlpve(session, conn, pb.BattleType_lpev, req); errdata != nil { return } - if req.Format.Friendformat != nil { + if flag { go this.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype12, 1)) } return } -///创建角色列表 更具Format表格 +// /创建角色列表 更具Format表格 func (this *Battle) CreateRolesByFormat(fid int32) (captain int32, roles []*pb.BattleRole, errdata *pb.ErrorData) { captain, roles, errdata = this.modelBattle.createMasterRoles(2, 0, fid) return } -///创建角色列表 更具英雄列表 +// /创建角色列表 更具英雄列表 func (this *Battle) CreateRolesByHeros(heros []*pb.DBHero) (roles []*pb.BattleRole, errdata *pb.ErrorData) { roles = make([]*pb.BattleRole, len(heros)) for i, v := range heros { @@ -334,7 +338,7 @@ func (this *Battle) CreateRolesByHeros(heros []*pb.DBHero) (roles []*pb.BattleRo return } -///获取战斗详情 +// /获取战斗详情 func (this *Battle) GetBattleInfo(req *pb.BattleGetInfoReq) (errdata *pb.ErrorData, resp *pb.BattleGetInfoResp) { this.Debug("GetBattleInfo", log.Field{Key: "req", Value: req}) var ( @@ -352,7 +356,7 @@ func (this *Battle) GetBattleInfo(req *pb.BattleGetInfoReq) (errdata *pb.ErrorDa return } -//创建战斗服务 +// 创建战斗服务 func (this *Battle) CreateBattleServer(req *pb.BattleInfo) (errdata *pb.ErrorData) { this.Debug("CreateBattleServer", log.Field{Key: "req", Value: req}) var ( @@ -400,7 +404,7 @@ func (this *Battle) InCmdBattle(req *pb.BattleInCmdReq) (errdata *pb.ErrorData) return } -//pvp认输 +// pvp认输 func (this *Battle) ConcedeBattle(req *pb.BattleConcedeReq) (errdata *pb.ErrorData) { var ( resp *pb.BattleConcedeResp @@ -422,7 +426,7 @@ func (this *Battle) ConcedeBattle(req *pb.BattleConcedeReq) (errdata *pb.ErrorDa return } -//校验战报是否成功 +// 校验战报是否成功 func (this *Battle) CheckBattleReport(session comm.IUserSession, report *pb.BattleReport) (errdata *pb.ErrorData, iswin bool) { var ( reply *pb.BattleCheckResults diff --git a/modules/caravan/module.go b/modules/caravan/module.go index 66b5bed16..b7ddf0880 100644 --- a/modules/caravan/module.go +++ b/modules/caravan/module.go @@ -378,7 +378,7 @@ func (this *Caravan) Rpc_ModuleCaravanSettlement(ctx context.Context, args *pb.E } } // 发送虚拟币奖励 - if _data, err := this.modelCaravan.DB.Find(comm.TableUser, bson.M{"merchantmoney": bson.M{"$gt": 0}}); err == nil { + if _data, err := this.modelCaravan.DB.Find(comm.TableUser, bson.M{"merchantmoney": bson.M{"$gt": comm.CaravanMerchantmoney}}); err == nil { for _data.Next(context.TODO()) { temp := &pb.DBUser{} diff --git a/modules/user/api_login.go b/modules/user/api_login.go index cd9bf0d6e..52761f14b 100644 --- a/modules/user/api_login.go +++ b/modules/user/api_login.go @@ -10,7 +10,7 @@ import ( "go.mongodb.org/mongo-driver/mongo" ) -//参数校验 +// 参数校验 func (this *apiComp) LoginCheck(session comm.IUserSession, req *pb.UserLoginReq) (errdata *pb.ErrorData) { if req.Account == "" { errdata = &pb.ErrorData{ @@ -21,7 +21,7 @@ func (this *apiComp) LoginCheck(session comm.IUserSession, req *pb.UserLoginReq) return } -//登录 +// 登录 func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (errdata *pb.ErrorData) { if errdata = this.LoginCheck(session, req); errdata != nil { return @@ -129,6 +129,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err if this.module.modelUser.isLoginFirst(lastLoginTime) { this.module.ModuleHero.NoLoginDay(user.Uid, int32(utils.DiffDays(lastLoginTime, configure.Now().Unix()))) go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype8, 1)) + go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype9, 1)) this.module.modelExpand.updateLoginDay(user.Uid, lastLoginTime) // 清理点赞 this.module.ModuleFriend.ResetFriend(user.Uid) @@ -150,7 +151,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err } else { rsp.Ex = expand } - } else { //新号 + } else { //新号 rsp.Ex = &pb.DBUserExpand{} this.module.modelSign.UserSign(session) go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype8, 1)) diff --git a/modules/user/module.go b/modules/user/module.go index 59582ebe1..4c22a7451 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -536,10 +536,12 @@ func (this *User) change(session comm.IUserSession, attr string, add int32) (cha } return } - } else { change.Ps += add - if change.Ps > ggd.PsUl { + } else { + if change.Ps+add > ggd.PsUl { change.Ps = ggd.PsUl + } else { + change.Ps += add } }