diff --git a/comm/const.go b/comm/const.go index ca4324d70..b2c45d4c8 100644 --- a/comm/const.go +++ b/comm/const.go @@ -955,3 +955,7 @@ const ( SmithyToolsSkill4 = 4 // 每日顾客数量提升至{0}人 SmithyToolsSkill5 = 5 // 顾客购买装备数量上限提高至{0}件 ) + +const ( + HuodongWarorder = 100002 // 战令活动 +) diff --git a/comm/imodule.go b/comm/imodule.go index 4c15724a1..0422ebf7a 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -22,6 +22,10 @@ type ( IOpenCmdNotice interface { OpenCmdNotice(uid string, keys ...string) } + // 活动通知 + IActivityNotice interface { + ActivityNotice(hdlist *pb.DBHuodong) + } ) /* @@ -585,6 +589,7 @@ type ( IWarorder interface { Delivery(session IUserSession, pid string) (errdata *pb.ErrorData, items []*pb.UserAssets) OpenWarorder(wtype int32, opentime int64) + IActivityNotice } IActivity interface { diff --git a/modules/activity/module.go b/modules/activity/module.go index c94be56ba..97c4fc9ae 100644 --- a/modules/activity/module.go +++ b/modules/activity/module.go @@ -48,12 +48,13 @@ func (this *Activity) Start() (err error) { err = this.ModuleBase.Start() if !db.IsCross() { - if rst, err := this.modelhdList.getHdInfoByHdId(10002); err == nil { + if rst, err := this.modelhdList.getHdInfoByHdId(comm.HuodongWarorder); err == nil { // 服务启动 获取活动信息 var module core.IModule if module, err = this.service.GetModule(comm.ModuleWarorder); err == nil { if m, ok := module.(comm.IWarorder); ok { m.OpenWarorder(2, rst.Stime) + m.ActivityNotice(rst) } } if module, err = this.service.GetModule(comm.ModulePay); err == nil { diff --git a/modules/battle/modelBattle.go b/modules/battle/modelBattle.go index 953f12d64..a7ceec56f 100644 --- a/modules/battle/modelBattle.go +++ b/modules/battle/modelBattle.go @@ -953,8 +953,8 @@ func (this *modelBattleComp) creatStoneBattle(session comm.IUserSession, stoneBa record = &pb.DBBattleRecord{ Id: primitive.NewObjectID().Hex(), Title: "", - Btype: pb.BattleType_pve, - Ptype: pb.PlayType_stone, + Btype: stoneBattle.Btype, + Ptype: stoneBattle.Ptype, State: pb.BBattleState_in, RedCompId: session.GetUserId(), Redflist: make([]*pb.DBBattleFormt, 1), diff --git a/modules/stonehenge/api_challenge.go b/modules/stonehenge/api_challenge.go index a6db66a63..b25c4067f 100644 --- a/modules/stonehenge/api_challenge.go +++ b/modules/stonehenge/api_challenge.go @@ -125,13 +125,24 @@ func (this *apiComp) Battle(session comm.IUserSession, req *pb.StonehengeBattleR if errdata != nil { return } + update := make(map[string]interface{}, 0) stone.Rooms.Hero = fightHero update["rooms"] = stone.Rooms this.module.modelStonehenge.ChangeStonehengeData(session.GetUserId(), update) session.SendMsg(string(this.module.GetType()), "battle", &pb.StonehengeBattleResp{ Eventid: req.Eventid, - Info: &pb.BattleInfo{Id: record.Id, Title: record.Title, Rulesid: battleConf.BattleReadyID, Btype: record.Btype, Ptype: record.Ptype, RedCompId: record.RedCompId, Redflist: record.Redflist, BlueCompId: record.BlueCompId, Buleflist: record.Buleflist}, + Info: &pb.BattleInfo{ + Id: record.Id, + Title: record.Title, + Rulesid: battleConf.BattleReadyID, + Btype: record.Btype, + Ptype: record.Ptype, + RedCompId: record.RedCompId, + Redflist: record.Redflist, + BlueCompId: record.BlueCompId, + Buleflist: record.Buleflist, + }, }) return } diff --git a/modules/warorder/module.go b/modules/warorder/module.go index 3d805f7bb..a9735ab4d 100644 --- a/modules/warorder/module.go +++ b/modules/warorder/module.go @@ -90,3 +90,6 @@ func (this *Warorder) Delivery(session comm.IUserSession, pid string) (errdata * func (this *Warorder) OpenWarorder(wtype int32, opentime int64) { this.modelWarorder.setopentime(wtype, opentime) } +func (this *Warorder) ActivityNotice(hdlist *pb.DBHuodong) { + +}