diff --git a/modules/activity/model_hdlist.go b/modules/activity/model_hdlist.go index 75c0cacfb..51aae20a7 100644 --- a/modules/activity/model_hdlist.go +++ b/modules/activity/model_hdlist.go @@ -134,6 +134,7 @@ func (this *modelHdList) loadHdInfo() (err error) { if _, err = this.DB.InsertMany(core.SqlTable(this.TableName), data); err != nil { return } + this.module.ReloadActivity() return } return diff --git a/modules/activity/module.go b/modules/activity/module.go index bd8e9f137..7ea8cf399 100644 --- a/modules/activity/module.go +++ b/modules/activity/module.go @@ -97,35 +97,39 @@ func (this *Activity) Start() (err error) { } this.uigame = module.(comm.IUiGame) if !db.IsCross() { - this.modelhdList.LoadActivityData() - for k, v := range this.modelhdList.activity { - switch k { - case pb.HdType_HdTypeWarorder, pb.HdType_SupplyWarOrder, pb.HdType_MoondreamWarOrder: - this.warorder.ActivityOpenNotice(v) - break - case pb.HdType_HdTypePay, pb.HdType_ShopCenterPayPakcge: - this.pay.ActivityOpenNotice(v) - break - case pb.HdType_XSFundPhysical, pb.HdType_XSFundRecruit, pb.HdType_XSFundExp: - this.shopcenter.ActivityOpenNotice(v) - break - case pb.HdType_AddUpRecharge: - this.addrecharge.ActivityOpenNotice(v) - break - case pb.HdType_KFSevenTask: - this.kftask.ActivityOpenNotice(v) - break - case pb.HdType_HdPuzzle, pb.HdType_HdLattice, pb.HdType_HdMiner: - this.uigame.ActivityOpenNotice(v) - break - } - } + this.ReloadActivity() } this.service.RegisterFunctionName(string(comm.Rpc_ActivityOver), this.Rpc_ActivityOver) this.service.RegisterFunctionName(string(comm.Rpc_ActivityStart), this.Rpc_ActivityStart) return } + +func (this *Activity) ReloadActivity() { + this.modelhdList.LoadActivityData() + for k, v := range this.modelhdList.activity { + switch k { + case pb.HdType_HdTypeWarorder, pb.HdType_SupplyWarOrder, pb.HdType_MoondreamWarOrder: + this.warorder.ActivityOpenNotice(v) + break + case pb.HdType_HdTypePay, pb.HdType_ShopCenterPayPakcge: + this.pay.ActivityOpenNotice(v) + break + case pb.HdType_XSFundPhysical, pb.HdType_XSFundRecruit, pb.HdType_XSFundExp: + this.shopcenter.ActivityOpenNotice(v) + break + case pb.HdType_AddUpRecharge: + this.addrecharge.ActivityOpenNotice(v) + break + case pb.HdType_KFSevenTask: + this.kftask.ActivityOpenNotice(v) + break + case pb.HdType_HdPuzzle, pb.HdType_HdLattice, pb.HdType_HdMiner: + this.uigame.ActivityOpenNotice(v) + break + } + } +} func (this *Activity) OnInstallComp() { this.ModuleBase.OnInstallComp() this.api = this.RegisterComp(new(apiComp)).(*apiComp) @@ -134,50 +138,6 @@ func (this *Activity) OnInstallComp() { this.modelhdList = this.RegisterComp(new(modelHdList)).(*modelHdList) } -// 创建一条活动数据 -// func (this *Activity) CreateHdData() (err error) { -// var db *pb.DBHuodong -// db = &pb.DBHuodong{ -// Id: primitive.NewObjectID().Hex(), -// Hdid: 10001, -// Rtime: 1680105599, -// Itype: 0, -// Name: "累计充值活动", -// Img: "", -// Showtime: "03月15日00:00-03月20日23:59", -// PressImg: "huodong_btn4_1.png", -// Intr: "累计充值,限时福利", -// Etime: 1680105599, -// NormalImg: "huodong_btn4.png", -// Stime: 1679414400, -// Tab: 2, -// Ttype: 0, -// Icon: "ico_event_yxjl", -// Open: 1, -// Order: 102, -// Stype: 10009, -// Htype: 9, -// Data: &pb.ActivityInfo{}, -// } -// for i := 0; i < 6; i++ { -// var p []*pb.UserAssets -// p = append(p, &pb.UserAssets{ -// A: "item", -// T: "10000001", -// N: 1, -// }) -// db.Data.Prize = append(db.Data.Prize, &pb.Arr{ -// Prize: p, -// Val: int32(i) + 1, -// }) - -// } - -// this.modelhdList.addHdInfo(db) -// fmt.Printf("%v", db) -// return -// } - func (this *Activity) CreateHdData() (err error) { this.modelhdList.getHdInfo() return