diff --git a/comm/const.go b/comm/const.go index 21d7fd26d..e7854f47f 100644 --- a/comm/const.go +++ b/comm/const.go @@ -449,6 +449,7 @@ const ( Reddot17102 ReddotType = 17102 // 铁匠铺手册台 Reddot17106 ReddotType = 17106 // 铁匠铺手册台收藏家奖励上 Reddot17107 ReddotType = 17107 // 铁匠铺手册台收藏家奖励按钮上 + Reddot17108 ReddotType = 17108 // 铁匠铺炉温回复时间 //竞技场 Reddot22100 ReddotType = 22100 //当玩家竞技场可挑战次数到达最大时 Reddot22102 ReddotType = 22102 //当竞技场npc可以挑战时 diff --git a/modules/pay/module.go b/modules/pay/module.go index 6fdde5889..b19a0b800 100644 --- a/modules/pay/module.go +++ b/modules/pay/module.go @@ -152,7 +152,7 @@ func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.PayDelivery return } } - go this.ModuleHero.RechargeMoney(args.Uid, conf.Amount) + go this.ModuleHero.RechargeMoney(args.Uid, args.Price) return } diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go index 27d40c12f..31bf50ba8 100644 --- a/modules/smithy/api_forgeequip.go +++ b/modules/smithy/api_forgeequip.go @@ -315,6 +315,20 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq this.module.modelStove.updateSmithyStove(session.GetUserId(), update) rsp.Data = stove session.SendMsg(string(this.module.GetType()), "forgeequip", rsp) + + // 炉温恢复时间红点推送 + i, err := this.module.service.GetModule(comm.ModuleReddot) + if err != nil { + this.module.Error(err.Error()) + return + } + if b, y := i.(comm.IReddot); y { + b.PushReddot(session, &pb.ReddotItem{ + Rid: int32(comm.Reddot17108), + Nextchanagetime: stove.RecoveTime, + }) + } + //session.SendMsg(string(this.GetType()), "change", &pb.ReddotChangePush{Rids: reddot}) // 校验图鉴信息 this.module.modelAtlas.CheckActivateEquipAtlas(session.GetUserId(), rsp.Equip, preHitCount) var equip map[int32]int32 // key xingji value 数量 diff --git a/modules/smithy/api_rise.go b/modules/smithy/api_rise.go index 7df1f7a4b..43521f3e3 100644 --- a/modules/smithy/api_rise.go +++ b/modules/smithy/api_rise.go @@ -72,6 +72,19 @@ func (this *apiComp) Rise(session comm.IUserSession, req *pb.SmithyRiseReq) (err update["temperature"] = stove.Temperature this.module.modelStove.updateSmithyStove(session.GetUserId(), update) session.SendMsg(string(this.module.GetType()), "rise", &pb.SmithyRiseResp{Data: stove}) + + // 炉温恢复时间红点推送 + i, err := this.module.service.GetModule(comm.ModuleReddot) + if err != nil { + this.module.Error(err.Error()) + return + } + if b, y := i.(comm.IReddot); y { + b.PushReddot(session, &pb.ReddotItem{ + Rid: int32(comm.Reddot17108), + Nextchanagetime: stove.RecoveTime, + }) + } tasks := make([]*pb.BuriedParam, 0) tasks = append(tasks, comm.GetBuriedParam(comm.Rtype175, stove.Temperature)) this.module.ModuleBuried.TriggerBuried(session.GetUserId(), tasks...) diff --git a/modules/smithy/model_stove.go b/modules/smithy/model_stove.go index d315c1509..6cd8d35ed 100644 --- a/modules/smithy/model_stove.go +++ b/modules/smithy/model_stove.go @@ -236,3 +236,10 @@ func (this *modelStove) CheckUnlockSuid(reelId, lv, dropid int32) int32 { return dropid } +func (this *modelStove) checkReddot17108(uid string) int64 { + list, _ := this.module.modelStove.getSmithyStoveList(uid) + if list.RecoveTime == 0 { + return configure.Now().Unix() + } + return list.RecoveTime +} diff --git a/modules/smithy/module.go b/modules/smithy/module.go index 030a2d547..3017d7887 100644 --- a/modules/smithy/module.go +++ b/modules/smithy/module.go @@ -138,7 +138,12 @@ func (this *Smithy) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (r Activated: this.modelTask.checkReddot17107(session.GetUserId()), } break - + case comm.Reddot17108: // 铁匠铺炉温恢复 + reddot[comm.Reddot17108] = &pb.ReddotItem{ + Rid: int32(comm.Reddot17108), + Nextchanagetime: this.modelStove.checkReddot17108(session.GetUserId()), + } + break } }