上传活动列表
This commit is contained in:
parent
45b4198b2d
commit
958191d92f
@ -578,9 +578,9 @@ type (
|
||||
}
|
||||
|
||||
IActivity interface {
|
||||
GetHdInfoByHdId(oid string) (result *pb.DBHuodong, err error) // 通过活动id 获取活动信息
|
||||
GetAllHdInfo() (hdList map[pb.HdType][]*pb.DBHuodong) // 获取所有活动信息
|
||||
GetHdInfoByItype(itype pb.HdType) (result []*pb.DBHuodong, err error) //
|
||||
GetHdInfoByHdId(oid string) (result *pb.DBHuodong, err error) // 通过活动id 获取活动信息
|
||||
GetAllHdInfo() (hdList map[pb.HdType]*pb.DBHuodong) // 获取所有活动信息
|
||||
GetHdInfoByItype(itype pb.HdType) (result *pb.DBHuodong, err error) //
|
||||
|
||||
// 庆典活动
|
||||
HDCelebration(session IUserSession, systemtype int32, bosstype int32) bool
|
||||
|
@ -45,7 +45,6 @@ func (this *ModuleBase) Start() (err error) {
|
||||
|
||||
//模块独立协程 模块可以更具需要自行重构
|
||||
func (this *ModuleBase) Run(closeSig chan bool) (err error) {
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
|
@ -20,12 +20,12 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.ActivityGetListR
|
||||
list := this.module.modelhdList.getHdInfo()
|
||||
|
||||
for _, szhd := range list {
|
||||
for _, v := range szhd {
|
||||
data = append(data, v)
|
||||
if c, err := this.module.modelhdData.getHddataByOid(session.GetUserId(), v.Id); err == nil {
|
||||
hdlist = append(hdlist, c)
|
||||
}
|
||||
// for _, v := range szhd {
|
||||
data = append(data, szhd)
|
||||
if c, err := this.module.modelhdData.getHddataByOid(session.GetUserId(), szhd.Id); err == nil {
|
||||
hdlist = append(hdlist, c)
|
||||
}
|
||||
// }
|
||||
}
|
||||
|
||||
session.SendMsg(string(this.module.GetType()), "getlist", &pb.ActivityGetListResp{
|
||||
|
@ -18,7 +18,7 @@ type modelHdList struct {
|
||||
module *Activity
|
||||
|
||||
hlock sync.RWMutex
|
||||
activity map[pb.HdType][]*pb.DBHuodong
|
||||
activity map[pb.HdType]*pb.DBHuodong
|
||||
}
|
||||
|
||||
func (this *modelHdList) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
|
||||
@ -34,7 +34,7 @@ func (this *modelHdList) Init(service core.IService, module core.IModule, comp c
|
||||
return
|
||||
}
|
||||
|
||||
func (this *modelHdList) getHdInfo() (activity map[pb.HdType][]*pb.DBHuodong) {
|
||||
func (this *modelHdList) getHdInfo() (activity map[pb.HdType]*pb.DBHuodong) {
|
||||
|
||||
return this.activity
|
||||
}
|
||||
@ -62,38 +62,24 @@ func (this *modelHdList) addHdInfo(hd *pb.DBHuodong) error {
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// 通过活动类型查找
|
||||
func (this *modelHdList) getHdInfoByHdType(iType int32) (result *pb.DBHuodong, err error) {
|
||||
|
||||
_data := this.DBModel.DB.FindOne(comm.TableHdInfo, bson.M{"itype": iType})
|
||||
|
||||
result = &pb.DBHuodong{}
|
||||
if err = _data.Decode(result); err != nil {
|
||||
this.module.Errorln("活动配置没找到:活动类型:%d,错误信息:%v", iType, err.Error())
|
||||
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func (this *modelHdList) LoadActivityData() {
|
||||
if c, err := this.DB.Find(core.SqlTable(this.TableName), bson.M{}); err != nil {
|
||||
return
|
||||
} else {
|
||||
this.hlock.Lock()
|
||||
defer this.hlock.Unlock()
|
||||
this.activity = make(map[pb.HdType][]*pb.DBHuodong)
|
||||
this.activity = make(map[pb.HdType]*pb.DBHuodong)
|
||||
for c.Next(context.Background()) {
|
||||
hd := &pb.DBHuodong{}
|
||||
if err = c.Decode(hd); err != nil {
|
||||
this.module.Errorf("err:%v", err)
|
||||
continue
|
||||
}
|
||||
this.activity[hd.Itype] = append(this.activity[hd.Itype], hd)
|
||||
this.activity[hd.Itype] = hd
|
||||
}
|
||||
}
|
||||
}
|
||||
func (this *modelHdList) getHdInfoByType(itype pb.HdType) (activity []*pb.DBHuodong) {
|
||||
func (this *modelHdList) getHdInfoByType(itype pb.HdType) (activity *pb.DBHuodong) {
|
||||
if v, ok := this.activity[itype]; ok {
|
||||
return v
|
||||
}
|
||||
|
@ -22,8 +22,10 @@ type Activity struct {
|
||||
modelhdList *modelHdList
|
||||
modelhdData *modelhdData
|
||||
|
||||
mail comm.Imail
|
||||
//warorder comm.IWarorder // 战令
|
||||
mail comm.Imail
|
||||
warorder comm.IWarorder // 战令
|
||||
pay comm.IPay // 支付
|
||||
shopcenter comm.IShopcenter // 活动中心
|
||||
}
|
||||
|
||||
func NewModule() core.IModule {
|
||||
@ -57,27 +59,35 @@ func (this *Activity) Start() (err error) {
|
||||
return
|
||||
}
|
||||
this.mail = module.(comm.Imail)
|
||||
if module, err = this.service.GetModule(comm.ModuleWarorder); err != nil {
|
||||
return
|
||||
}
|
||||
this.warorder = module.(comm.IWarorder)
|
||||
if module, err = this.service.GetModule(comm.ModulePay); err != nil {
|
||||
return
|
||||
}
|
||||
this.pay = module.(comm.IPay)
|
||||
if module, err = this.service.GetModule(comm.ModuleShopCenter); err != nil {
|
||||
return
|
||||
}
|
||||
this.shopcenter = module.(comm.IShopcenter)
|
||||
event.RegisterGO(comm.EventUserLogin, this.EventUserLogin)
|
||||
if !db.IsCross() {
|
||||
if rst, err := this.modelhdList.getHdInfoByHdType(comm.HdTypeWarorder); err == nil {
|
||||
// 服务启动 获取活动信息
|
||||
if module, err = this.service.GetModule(comm.ModuleWarorder); err == nil {
|
||||
if m, ok := module.(comm.IWarorder); ok {
|
||||
m.ActivityOpenNotice(rst)
|
||||
}
|
||||
}
|
||||
}
|
||||
if rst, err := this.modelhdList.getHdInfoByHdType(comm.HdTypePay); err == nil {
|
||||
// 服务启动 获取活动信息
|
||||
if module, err = this.service.GetModule(comm.ModulePay); err == nil {
|
||||
if m, ok := module.(comm.IPay); ok {
|
||||
m.ActivityOpenNotice(rst)
|
||||
}
|
||||
}
|
||||
}
|
||||
this.modelhdList.LoadActivityData()
|
||||
for k, v := range this.modelhdList.activity {
|
||||
switch k {
|
||||
case pb.HdType_HdTypeWarorder:
|
||||
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.pay.ActivityOpenNotice(v)
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
func (this *Activity) OnInstallComp() {
|
||||
@ -137,10 +147,10 @@ func (this *Activity) CreateHdData() (err error) {
|
||||
return
|
||||
}
|
||||
|
||||
func (this *Activity) GetAllHdInfo() (activity map[pb.HdType][]*pb.DBHuodong) {
|
||||
func (this *Activity) GetAllHdInfo() (activity map[pb.HdType]*pb.DBHuodong) {
|
||||
return this.modelhdList.getHdInfo()
|
||||
}
|
||||
func (this *Activity) GetHdInfoByItype(itype pb.HdType) (result []*pb.DBHuodong, err error) {
|
||||
func (this *Activity) GetHdInfoByItype(itype pb.HdType) (result *pb.DBHuodong, err error) {
|
||||
if c := this.modelhdList.getHdInfo(); c != nil {
|
||||
if _, ok := c[itype]; ok {
|
||||
result = c[itype]
|
||||
@ -209,56 +219,56 @@ func (this *Activity) Turntable(drawIndex int32, reward []int32) (item *cfg.Game
|
||||
func (this *Activity) HDCelebration(session comm.IUserSession, systemtype int32, bosstype int32) bool {
|
||||
bDouble := false // 是否开启双倍奖励
|
||||
if activity := this.modelhdList.getHdInfoByType(comm.HdCelebration); activity != nil {
|
||||
for _, v := range activity {
|
||||
if configure.Now().Unix() > v.Stime && configure.Now().Unix() < v.Etime { // 活动范围内
|
||||
update := make(map[string]interface{})
|
||||
bChange := false
|
||||
// 查询玩家活动记录
|
||||
//key := fmt.Sprintf("%s-%s", session.GetUserId(), v.Id)
|
||||
if data, err := this.modelhdData.getHddataByOid(session.GetUserId(), v.Id); err != nil {
|
||||
// 注意 Gotarr:map[int32]int32 key value 已经挑战的次数
|
||||
if !utils.IsToday(data.Lasttime) { // 不是今天重置
|
||||
data.Lasttime = configure.Now().Unix()
|
||||
data.Gotarr = make(map[int32]int32)
|
||||
// 计算进度
|
||||
data.Val = int32((configure.Now().Unix()-v.Stime)/24*3600) + 1
|
||||
update["lasttime"] = data.Lasttime
|
||||
update["val"] = data.Val
|
||||
update["gotarr"] = data.Gotarr
|
||||
bChange = true
|
||||
}
|
||||
// for _, v := range activity {
|
||||
if configure.Now().Unix() > activity.Stime && configure.Now().Unix() < activity.Etime { // 活动范围内
|
||||
update := make(map[string]interface{})
|
||||
bChange := false
|
||||
// 查询玩家活动记录
|
||||
//key := fmt.Sprintf("%s-%s", session.GetUserId(), v.Id)
|
||||
if data, err := this.modelhdData.getHddataByOid(session.GetUserId(), activity.Id); err != nil {
|
||||
// 注意 Gotarr:map[int32]int32 key value 已经挑战的次数
|
||||
if !utils.IsToday(data.Lasttime) { // 不是今天重置
|
||||
data.Lasttime = configure.Now().Unix()
|
||||
data.Gotarr = make(map[int32]int32)
|
||||
// 计算进度
|
||||
data.Val = int32((configure.Now().Unix()-activity.Stime)/24*3600) + 1
|
||||
update["lasttime"] = data.Lasttime
|
||||
update["val"] = data.Val
|
||||
update["gotarr"] = data.Gotarr
|
||||
bChange = true
|
||||
}
|
||||
|
||||
if conf, err := this.configure.GetHDCelebration(data.Val); err != nil {
|
||||
if conf, err := this.configure.GetHDCelebration(data.Val); err != nil {
|
||||
|
||||
if conf.Systemtype == systemtype {
|
||||
data.Gotarr[bosstype] += 1
|
||||
// 天数
|
||||
var idays int32
|
||||
for i, v1 := range conf.Bosstype {
|
||||
if v1 == systemtype || v1 == 0 { // bosstype 为0 表示所有的boss 类型都算
|
||||
idays = conf.Num[i]
|
||||
break
|
||||
}
|
||||
}
|
||||
// 更新信息
|
||||
update["gotarr"] = data.Gotarr
|
||||
bChange = true
|
||||
if data.Gotarr[bosstype] <= idays {
|
||||
bDouble = true
|
||||
if conf.Systemtype == systemtype {
|
||||
data.Gotarr[bosstype] += 1
|
||||
// 天数
|
||||
var idays int32
|
||||
for i, v1 := range conf.Bosstype {
|
||||
if v1 == systemtype || v1 == 0 { // bosstype 为0 表示所有的boss 类型都算
|
||||
idays = conf.Num[i]
|
||||
break
|
||||
}
|
||||
}
|
||||
// 更新信息
|
||||
update["gotarr"] = data.Gotarr
|
||||
bChange = true
|
||||
if data.Gotarr[bosstype] <= idays {
|
||||
bDouble = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if bChange {
|
||||
this.modelhdData.ModifyActivityList(session.GetUserId(), data.Id, update)
|
||||
// 推送活动数据进度变化
|
||||
session.SendMsg(string(this.GetType()), "change", &pb.ActivityDataChangePush{
|
||||
Data: []*pb.DBActivityData{data},
|
||||
})
|
||||
}
|
||||
if bChange {
|
||||
this.modelhdData.ModifyActivityList(session.GetUserId(), data.Id, update)
|
||||
// 推送活动数据进度变化
|
||||
session.SendMsg(string(this.GetType()), "change", &pb.ActivityDataChangePush{
|
||||
Data: []*pb.DBActivityData{data},
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
// }
|
||||
}
|
||||
return bDouble
|
||||
}
|
||||
@ -267,12 +277,11 @@ func (this *Activity) EventUserLogin(session comm.IUserSession) {
|
||||
// 转盘活动
|
||||
if a, err := this.GetHdInfoByItype(pb.HdType_HdTypeTurntable); err == nil { //
|
||||
bEnd := false
|
||||
for _, v := range a {
|
||||
if configure.Now().Unix() > v.Etime {
|
||||
bEnd = true
|
||||
break
|
||||
}
|
||||
// for _, v := range a {
|
||||
if configure.Now().Unix() > a.Etime {
|
||||
bEnd = true
|
||||
}
|
||||
// }
|
||||
if bEnd { // 活动结束 活动道具转换
|
||||
t := this.ModuleTools.GetGlobalConf().VenturegiftsDraw
|
||||
var reward []*pb.UserAssets
|
||||
|
@ -38,9 +38,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.DreamWarorderInfoRe
|
||||
for _, v := range info.Weektasks {
|
||||
condiIds = append(condiIds, v)
|
||||
}
|
||||
for _, v := range info.Cycletasks {
|
||||
condiIds = append(condiIds, v)
|
||||
}
|
||||
|
||||
if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), condiIds...); err != nil {
|
||||
return
|
||||
}
|
||||
|
33
modules/dreamwarorder/api_buylv.go
Normal file
33
modules/dreamwarorder/api_buylv.go
Normal file
@ -0,0 +1,33 @@
|
||||
package dreamwarorder
|
||||
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
)
|
||||
|
||||
// 参数校验
|
||||
func (this *apiComp) BuyLvCheck(session comm.IUserSession, req *pb.DreamWarorderBuyLvReq) (errdata *pb.ErrorData) {
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
// /获取自己的排行榜信息
|
||||
func (this *apiComp) BuyLv(session comm.IUserSession, req *pb.DreamWarorderBuyLvReq) (errdata *pb.ErrorData) {
|
||||
var (
|
||||
info *pb.DBDreamWarorder
|
||||
err error
|
||||
)
|
||||
if errdata = this.BuyLvCheck(session, req); errdata != nil {
|
||||
return
|
||||
}
|
||||
if info, err = this.module.model.getUserDreamwarorder(session.GetUserId()); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DBError,
|
||||
Title: pb.ErrorCode_DBError.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), "info", &pb.DreamWarorderBuyLvResp{Info: info})
|
||||
return
|
||||
}
|
@ -15,32 +15,23 @@ const (
|
||||
|
||||
type configureComp struct {
|
||||
modules.MCompConfigure
|
||||
module *DreamWarorder
|
||||
lock sync.RWMutex
|
||||
product map[string]int32 //商品id
|
||||
order map[int32][]*cfg.GamePassCheckData //战令
|
||||
module *DreamWarorder
|
||||
lock sync.RWMutex
|
||||
order []*cfg.GamePassCheckData //战令
|
||||
}
|
||||
|
||||
func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
|
||||
err = this.MCompConfigure.Init(service, module, comp, options)
|
||||
this.module = module.(*DreamWarorder)
|
||||
this.order = make([]*cfg.GamePassCheckData, 0)
|
||||
configure.RegisterConfigure(game_passcheck, cfg.NewGamePassCheck, this.updateconfigure)
|
||||
return
|
||||
}
|
||||
|
||||
func (this *configureComp) getproduct() map[string]int32 {
|
||||
func (this *configureComp) getorder() (results []*cfg.GamePassCheckData) {
|
||||
this.lock.RLock()
|
||||
defer this.lock.RUnlock()
|
||||
return this.product
|
||||
}
|
||||
func (this *configureComp) getorder(wtype int32) (results []*cfg.GamePassCheckData, err error) {
|
||||
this.lock.RLock()
|
||||
defer this.lock.RUnlock()
|
||||
var ok bool
|
||||
if results, ok = this.order[wtype]; !ok {
|
||||
err = fmt.Errorf("no found wtype:%d", wtype)
|
||||
}
|
||||
return
|
||||
return this.order
|
||||
}
|
||||
|
||||
// 读取任务配置表
|
||||
@ -67,20 +58,14 @@ func (this *configureComp) updateconfigure() {
|
||||
this.module.Error("世界任务配置表异常!")
|
||||
return
|
||||
}
|
||||
productConf := make(map[string]int32)
|
||||
orderConf := make(map[int32][]*cfg.GamePassCheckData)
|
||||
orderConf := make([]*cfg.GamePassCheckData, 0)
|
||||
for _, v := range gwt.GetDataList() {
|
||||
if _, ok := productConf[v.PayId]; !ok {
|
||||
productConf[v.PayId] = v.PasscheckType
|
||||
if v.PasscheckType == 4 {
|
||||
orderConf = append(orderConf, v)
|
||||
}
|
||||
if _, ok := orderConf[v.PasscheckType]; !ok {
|
||||
orderConf[v.PasscheckType] = make([]*cfg.GamePassCheckData, 0)
|
||||
}
|
||||
orderConf[v.PasscheckType] = append(orderConf[v.PasscheckType], v)
|
||||
}
|
||||
|
||||
this.lock.Lock()
|
||||
this.product = productConf
|
||||
this.order = orderConf
|
||||
this.lock.Unlock()
|
||||
}
|
||||
|
@ -40,7 +40,6 @@ func (this *ModelDreamWarorder) getUserDreamwarorder(uid string) (results *pb.DB
|
||||
Uid: uid,
|
||||
Daytasks: make([]int32, 0),
|
||||
Weektasks: make([]int32, 0),
|
||||
Cycletasks: make([]int32, 0),
|
||||
Completetasks: make([]int32, 0),
|
||||
}
|
||||
err = this.Add(uid, results)
|
||||
|
@ -46,7 +46,7 @@ func (this *KFTask) OnInstallComp() {
|
||||
// 活动开启
|
||||
func (this *KFTask) ActivityOpenNotice(hdlist *pb.DBHuodong) {
|
||||
switch hdlist.Itype {
|
||||
case comm.KFSevenTask:
|
||||
case pb.HdType_KFSevenTask:
|
||||
this.open = true
|
||||
break
|
||||
}
|
||||
@ -54,5 +54,9 @@ func (this *KFTask) ActivityOpenNotice(hdlist *pb.DBHuodong) {
|
||||
|
||||
// 活动关闭
|
||||
func (this *KFTask) ActivityCloseNotice(hdlist *pb.DBHuodong) {
|
||||
|
||||
switch hdlist.Itype {
|
||||
case pb.HdType_KFSevenTask:
|
||||
this.open = false
|
||||
break
|
||||
}
|
||||
}
|
||||
|
@ -296,9 +296,12 @@ func (this *Pay) ModulePayDelivery(session comm.IUserSession, Productid string,
|
||||
|
||||
func (this *Pay) ActivityOpenNotice(hdlist *pb.DBHuodong) {
|
||||
switch hdlist.Itype {
|
||||
case comm.HdTypePay:
|
||||
case pb.HdType_HdTypePay:
|
||||
this.modelActivity.setopentime(1, hdlist)
|
||||
break
|
||||
case pb.HdType_ShopCenterPayPakcge:
|
||||
this.modelActivity.setopentime(2, hdlist)
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -17,7 +17,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ShopCenterInfoReq)
|
||||
var (
|
||||
info *pb.DBShopCenter
|
||||
conf *cfg.GameShopCenterControlData
|
||||
activitys map[int32]*pb.DBHuodong
|
||||
activitys map[pb.HdType]*pb.DBHuodong
|
||||
ok bool
|
||||
err error
|
||||
)
|
||||
@ -47,15 +47,15 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ShopCenterInfoReq)
|
||||
v.Open = true
|
||||
continue
|
||||
}
|
||||
if _, ok = activitys[comm.XSFundPhysical]; ok && conf.Type == 3 {
|
||||
if _, ok = activitys[pb.HdType_XSFundPhysical]; ok && conf.Type == 3 {
|
||||
v.Open = true
|
||||
continue
|
||||
}
|
||||
if _, ok = activitys[comm.XSFundRecruit]; ok && conf.Type == 4 {
|
||||
if _, ok = activitys[pb.HdType_XSFundRecruit]; ok && conf.Type == 4 {
|
||||
v.Open = true
|
||||
continue
|
||||
}
|
||||
if _, ok = activitys[comm.XSFundExp]; ok && conf.Type == 5 {
|
||||
if _, ok = activitys[pb.HdType_XSFundRecruit]; ok && conf.Type == 5 {
|
||||
v.Open = true
|
||||
continue
|
||||
}
|
||||
|
@ -18,7 +18,7 @@ type ModelShop struct {
|
||||
modules.MCompModel
|
||||
module *ShopCenter
|
||||
lock sync.RWMutex
|
||||
activitys map[int32]*pb.DBHuodong
|
||||
activitys map[pb.HdType]*pb.DBHuodong
|
||||
}
|
||||
|
||||
func (this *ModelShop) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
|
||||
@ -28,21 +28,21 @@ func (this *ModelShop) Init(service core.IService, module core.IModule, comp cor
|
||||
this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
|
||||
Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}},
|
||||
})
|
||||
this.activitys = make(map[int32]*pb.DBHuodong)
|
||||
this.activitys = make(map[pb.HdType]*pb.DBHuodong)
|
||||
return
|
||||
}
|
||||
|
||||
func (this *ModelShop) addactivity(id int32, activity *pb.DBHuodong) {
|
||||
func (this *ModelShop) addactivity(id pb.HdType, activity *pb.DBHuodong) {
|
||||
this.lock.Lock()
|
||||
this.activitys[id] = activity
|
||||
this.lock.Unlock()
|
||||
}
|
||||
func (this *ModelShop) delactivity(id int32, activity *pb.DBHuodong) {
|
||||
func (this *ModelShop) delactivity(id pb.HdType, activity *pb.DBHuodong) {
|
||||
this.lock.Lock()
|
||||
delete(this.activitys, id)
|
||||
this.lock.Unlock()
|
||||
}
|
||||
func (this *ModelShop) getactivity() map[int32]*pb.DBHuodong {
|
||||
func (this *ModelShop) getactivity() map[pb.HdType]*pb.DBHuodong {
|
||||
this.lock.RLock()
|
||||
defer this.lock.RUnlock()
|
||||
return this.activitys
|
||||
|
@ -69,14 +69,17 @@ func (this *ShopCenter) ActivityOpenNotice(hdlist *pb.DBHuodong) {
|
||||
// 移除关闭
|
||||
func (this *ShopCenter) ActivityCloseNotice(hdlist *pb.DBHuodong) {
|
||||
switch hdlist.Itype {
|
||||
case comm.XSFundPhysical:
|
||||
this.modelshop.delactivity(comm.XSFundPhysical, hdlist)
|
||||
case pb.HdType_XSFundPhysical:
|
||||
this.modelshop.delactivity(pb.HdType_XSFundPhysical, hdlist)
|
||||
break
|
||||
case comm.XSFundRecruit:
|
||||
this.modelshop.delactivity(comm.XSFundRecruit, hdlist)
|
||||
case pb.HdType_XSFundRecruit:
|
||||
this.modelshop.delactivity(pb.HdType_XSFundRecruit, hdlist)
|
||||
break
|
||||
case comm.XSFundExp:
|
||||
this.modelshop.delactivity(comm.XSFundExp, hdlist)
|
||||
case pb.HdType_XSFundExp:
|
||||
this.modelshop.delactivity(pb.HdType_XSFundExp, hdlist)
|
||||
break
|
||||
case pb.HdType_ShopCenterPayPakcge:
|
||||
this.modelshop.delactivity(pb.HdType_ShopCenterPayPakcge, hdlist)
|
||||
break
|
||||
}
|
||||
}
|
||||
|
@ -23,16 +23,17 @@ const (
|
||||
type HdType int32
|
||||
|
||||
const (
|
||||
HdType_HdTypeNull HdType = 0 //无效类型
|
||||
HdType_HdTypeWarorder HdType = 1 //圣桃战令类型
|
||||
HdType_HdTypePay HdType = 2 //圣桃充值礼包
|
||||
HdType_KFSevenTask HdType = 3 //开服任务
|
||||
HdType_XSFundPhysical HdType = 4 //现时活动 体力基金
|
||||
HdType_XSFundRecruit HdType = 5 //现时活动 招募基金
|
||||
HdType_XSFundExp HdType = 6 //现时活动 经验基金
|
||||
HdType_HdLevel HdType = 7 //开服等级活动
|
||||
HdType_HdTypeSign HdType = 8 //七日签到
|
||||
HdType_AddUpRecharge HdType = 10 //累计充值
|
||||
HdType_HdTypeNull HdType = 0 //无效类型
|
||||
HdType_HdTypeWarorder HdType = 1 //圣桃战令类型
|
||||
HdType_HdTypePay HdType = 2 //圣桃充值礼包
|
||||
HdType_KFSevenTask HdType = 3 //开服任务
|
||||
HdType_XSFundPhysical HdType = 4 //现时活动 体力基金
|
||||
HdType_XSFundRecruit HdType = 5 //现时活动 招募基金
|
||||
HdType_XSFundExp HdType = 6 //现时活动 经验基金
|
||||
HdType_HdLevel HdType = 7 //开服等级活动
|
||||
HdType_HdTypeSign HdType = 8 //七日签到
|
||||
HdType_AddUpRecharge HdType = 10 //累计充值
|
||||
HdType_ShopCenterPayPakcge HdType = 11 //活动中心限时礼包
|
||||
// 特殊类型活动 只受活动开启限制 具体玩法 走excel 配置
|
||||
HdType_HdTypeTurntable HdType = 1001 //大转盘
|
||||
HdType_HdCelebration HdType = 1002 // 庆典活动
|
||||
@ -54,6 +55,7 @@ var (
|
||||
7: "HdLevel",
|
||||
8: "HdTypeSign",
|
||||
10: "AddUpRecharge",
|
||||
11: "ShopCenterPayPakcge",
|
||||
1001: "HdTypeTurntable",
|
||||
1002: "HdCelebration",
|
||||
1003: "HdPuzzle",
|
||||
@ -61,21 +63,22 @@ var (
|
||||
1005: "HdMiner",
|
||||
}
|
||||
HdType_value = map[string]int32{
|
||||
"HdTypeNull": 0,
|
||||
"HdTypeWarorder": 1,
|
||||
"HdTypePay": 2,
|
||||
"KFSevenTask": 3,
|
||||
"XSFundPhysical": 4,
|
||||
"XSFundRecruit": 5,
|
||||
"XSFundExp": 6,
|
||||
"HdLevel": 7,
|
||||
"HdTypeSign": 8,
|
||||
"AddUpRecharge": 10,
|
||||
"HdTypeTurntable": 1001,
|
||||
"HdCelebration": 1002,
|
||||
"HdPuzzle": 1003,
|
||||
"HdLattice": 1004,
|
||||
"HdMiner": 1005,
|
||||
"HdTypeNull": 0,
|
||||
"HdTypeWarorder": 1,
|
||||
"HdTypePay": 2,
|
||||
"KFSevenTask": 3,
|
||||
"XSFundPhysical": 4,
|
||||
"XSFundRecruit": 5,
|
||||
"XSFundExp": 6,
|
||||
"HdLevel": 7,
|
||||
"HdTypeSign": 8,
|
||||
"AddUpRecharge": 10,
|
||||
"ShopCenterPayPakcge": 11,
|
||||
"HdTypeTurntable": 1001,
|
||||
"HdCelebration": 1002,
|
||||
"HdPuzzle": 1003,
|
||||
"HdLattice": 1004,
|
||||
"HdMiner": 1005,
|
||||
}
|
||||
)
|
||||
|
||||
@ -551,7 +554,7 @@ var file_activity_activity_db_proto_rawDesc = []byte{
|
||||
0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
|
||||
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
|
||||
0x01, 0x2a, 0x89, 0x02, 0x0a, 0x06, 0x48, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x0a,
|
||||
0x01, 0x2a, 0xa2, 0x02, 0x0a, 0x06, 0x48, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x0a,
|
||||
0x48, 0x64, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x75, 0x6c, 0x6c, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e,
|
||||
0x48, 0x64, 0x54, 0x79, 0x70, 0x65, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x10, 0x01,
|
||||
0x12, 0x0d, 0x0a, 0x09, 0x48, 0x64, 0x54, 0x79, 0x70, 0x65, 0x50, 0x61, 0x79, 0x10, 0x02, 0x12,
|
||||
@ -562,13 +565,15 @@ var file_activity_activity_db_proto_rawDesc = []byte{
|
||||
0x64, 0x45, 0x78, 0x70, 0x10, 0x06, 0x12, 0x0b, 0x0a, 0x07, 0x48, 0x64, 0x4c, 0x65, 0x76, 0x65,
|
||||
0x6c, 0x10, 0x07, 0x12, 0x0e, 0x0a, 0x0a, 0x48, 0x64, 0x54, 0x79, 0x70, 0x65, 0x53, 0x69, 0x67,
|
||||
0x6e, 0x10, 0x08, 0x12, 0x11, 0x0a, 0x0d, 0x41, 0x64, 0x64, 0x55, 0x70, 0x52, 0x65, 0x63, 0x68,
|
||||
0x61, 0x72, 0x67, 0x65, 0x10, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x64, 0x54, 0x79, 0x70, 0x65,
|
||||
0x54, 0x75, 0x72, 0x6e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x10, 0xe9, 0x07, 0x12, 0x12, 0x0a, 0x0d,
|
||||
0x48, 0x64, 0x43, 0x65, 0x6c, 0x65, 0x62, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xea, 0x07,
|
||||
0x12, 0x0d, 0x0a, 0x08, 0x48, 0x64, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x10, 0xeb, 0x07, 0x12,
|
||||
0x0e, 0x0a, 0x09, 0x48, 0x64, 0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x10, 0xec, 0x07, 0x12,
|
||||
0x0c, 0x0a, 0x07, 0x48, 0x64, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x10, 0xed, 0x07, 0x42, 0x06, 0x5a,
|
||||
0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x61, 0x72, 0x67, 0x65, 0x10, 0x0a, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x68, 0x6f, 0x70, 0x43, 0x65,
|
||||
0x6e, 0x74, 0x65, 0x72, 0x50, 0x61, 0x79, 0x50, 0x61, 0x6b, 0x63, 0x67, 0x65, 0x10, 0x0b, 0x12,
|
||||
0x14, 0x0a, 0x0f, 0x48, 0x64, 0x54, 0x79, 0x70, 0x65, 0x54, 0x75, 0x72, 0x6e, 0x74, 0x61, 0x62,
|
||||
0x6c, 0x65, 0x10, 0xe9, 0x07, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x64, 0x43, 0x65, 0x6c, 0x65, 0x62,
|
||||
0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xea, 0x07, 0x12, 0x0d, 0x0a, 0x08, 0x48, 0x64, 0x50,
|
||||
0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x10, 0xeb, 0x07, 0x12, 0x0e, 0x0a, 0x09, 0x48, 0x64, 0x4c, 0x61,
|
||||
0x74, 0x74, 0x69, 0x63, 0x65, 0x10, 0xec, 0x07, 0x12, 0x0c, 0x0a, 0x07, 0x48, 0x64, 0x4d, 0x69,
|
||||
0x6e, 0x65, 0x72, 0x10, 0xed, 0x07, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
|
||||
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
|
@ -31,9 +31,9 @@ type DBDreamWarorder struct {
|
||||
Vip1 bool `protobuf:"varint,3,opt,name=vip1,proto3" json:"vip1"`
|
||||
Vip2 bool `protobuf:"varint,4,opt,name=vip2,proto3" json:"vip2"`
|
||||
Exp int32 `protobuf:"varint,5,opt,name=exp,proto3" json:"exp"`
|
||||
Daytasks []int32 `protobuf:"varint,6,rep,packed,name=daytasks,proto3" json:"daytasks"`
|
||||
Weektasks []int32 `protobuf:"varint,7,rep,packed,name=weektasks,proto3" json:"weektasks"`
|
||||
Cycletasks []int32 `protobuf:"varint,8,rep,packed,name=cycletasks,proto3" json:"cycletasks"`
|
||||
Lv int32 `protobuf:"varint,6,opt,name=lv,proto3" json:"lv"`
|
||||
Daytasks []int32 `protobuf:"varint,7,rep,packed,name=daytasks,proto3" json:"daytasks"`
|
||||
Weektasks []int32 `protobuf:"varint,8,rep,packed,name=weektasks,proto3" json:"weektasks"`
|
||||
Completetasks []int32 `protobuf:"varint,9,rep,packed,name=completetasks,proto3" json:"completetasks"`
|
||||
}
|
||||
|
||||
@ -104,6 +104,13 @@ func (x *DBDreamWarorder) GetExp() int32 {
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBDreamWarorder) GetLv() int32 {
|
||||
if x != nil {
|
||||
return x.Lv
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBDreamWarorder) GetDaytasks() []int32 {
|
||||
if x != nil {
|
||||
return x.Daytasks
|
||||
@ -118,13 +125,6 @@ func (x *DBDreamWarorder) GetWeektasks() []int32 {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *DBDreamWarorder) GetCycletasks() []int32 {
|
||||
if x != nil {
|
||||
return x.Cycletasks
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *DBDreamWarorder) GetCompletetasks() []int32 {
|
||||
if x != nil {
|
||||
return x.Completetasks
|
||||
@ -137,19 +137,18 @@ var File_dreamwarorder_dreamwarorder_db_proto protoreflect.FileDescriptor
|
||||
var file_dreamwarorder_dreamwarorder_db_proto_rawDesc = []byte{
|
||||
0x0a, 0x24, 0x64, 0x72, 0x65, 0x61, 0x6d, 0x77, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2f,
|
||||
0x64, 0x72, 0x65, 0x61, 0x6d, 0x77, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x64, 0x62,
|
||||
0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xed, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x44, 0x72, 0x65,
|
||||
0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xdd, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x44, 0x72, 0x65,
|
||||
0x61, 0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
|
||||
0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04,
|
||||
0x76, 0x69, 0x70, 0x31, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x76, 0x69, 0x70, 0x31,
|
||||
0x12, 0x12, 0x0a, 0x04, 0x76, 0x69, 0x70, 0x32, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04,
|
||||
0x76, 0x69, 0x70, 0x32, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28,
|
||||
0x05, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x61, 0x79, 0x74, 0x61, 0x73,
|
||||
0x6b, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x64, 0x61, 0x79, 0x74, 0x61, 0x73,
|
||||
0x05, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x06, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x61, 0x79, 0x74, 0x61, 0x73,
|
||||
0x6b, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x64, 0x61, 0x79, 0x74, 0x61, 0x73,
|
||||
0x6b, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x77, 0x65, 0x65, 0x6b, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18,
|
||||
0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x77, 0x65, 0x65, 0x6b, 0x74, 0x61, 0x73, 0x6b, 0x73,
|
||||
0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x08,
|
||||
0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x73,
|
||||
0x08, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x77, 0x65, 0x65, 0x6b, 0x74, 0x61, 0x73, 0x6b, 0x73,
|
||||
0x12, 0x24, 0x0a, 0x0d, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b,
|
||||
0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0d, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74,
|
||||
0x65, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
|
||||
|
@ -115,6 +115,102 @@ func (x *DreamWarorderInfoResp) GetInfo() *DBDreamWarorder {
|
||||
return nil
|
||||
}
|
||||
|
||||
//如梦战令 购买等级
|
||||
type DreamWarorderBuyLvReq struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Lv int32 `protobuf:"varint,1,opt,name=lv,proto3" json:"lv"`
|
||||
}
|
||||
|
||||
func (x *DreamWarorderBuyLvReq) Reset() {
|
||||
*x = DreamWarorderBuyLvReq{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[2]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *DreamWarorderBuyLvReq) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*DreamWarorderBuyLvReq) ProtoMessage() {}
|
||||
|
||||
func (x *DreamWarorderBuyLvReq) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[2]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
return ms
|
||||
}
|
||||
return mi.MessageOf(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use DreamWarorderBuyLvReq.ProtoReflect.Descriptor instead.
|
||||
func (*DreamWarorderBuyLvReq) Descriptor() ([]byte, []int) {
|
||||
return file_dreamwarorder_dreamwarorder_msg_proto_rawDescGZIP(), []int{2}
|
||||
}
|
||||
|
||||
func (x *DreamWarorderBuyLvReq) GetLv() int32 {
|
||||
if x != nil {
|
||||
return x.Lv
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
//如梦战令 购买等级 回应
|
||||
type DreamWarorderBuyLvResp struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Info *DBDreamWarorder `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
|
||||
}
|
||||
|
||||
func (x *DreamWarorderBuyLvResp) Reset() {
|
||||
*x = DreamWarorderBuyLvResp{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[3]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *DreamWarorderBuyLvResp) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*DreamWarorderBuyLvResp) ProtoMessage() {}
|
||||
|
||||
func (x *DreamWarorderBuyLvResp) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[3]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
return ms
|
||||
}
|
||||
return mi.MessageOf(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use DreamWarorderBuyLvResp.ProtoReflect.Descriptor instead.
|
||||
func (*DreamWarorderBuyLvResp) Descriptor() ([]byte, []int) {
|
||||
return file_dreamwarorder_dreamwarorder_msg_proto_rawDescGZIP(), []int{3}
|
||||
}
|
||||
|
||||
func (x *DreamWarorderBuyLvResp) GetInfo() *DBDreamWarorder {
|
||||
if x != nil {
|
||||
return x.Info
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
//如梦战令 请求
|
||||
type DreamWarorderReceiveReq struct {
|
||||
state protoimpl.MessageState
|
||||
@ -127,7 +223,7 @@ type DreamWarorderReceiveReq struct {
|
||||
func (x *DreamWarorderReceiveReq) Reset() {
|
||||
*x = DreamWarorderReceiveReq{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[2]
|
||||
mi := &file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[4]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -140,7 +236,7 @@ func (x *DreamWarorderReceiveReq) String() string {
|
||||
func (*DreamWarorderReceiveReq) ProtoMessage() {}
|
||||
|
||||
func (x *DreamWarorderReceiveReq) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[2]
|
||||
mi := &file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[4]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -153,7 +249,7 @@ func (x *DreamWarorderReceiveReq) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use DreamWarorderReceiveReq.ProtoReflect.Descriptor instead.
|
||||
func (*DreamWarorderReceiveReq) Descriptor() ([]byte, []int) {
|
||||
return file_dreamwarorder_dreamwarorder_msg_proto_rawDescGZIP(), []int{2}
|
||||
return file_dreamwarorder_dreamwarorder_msg_proto_rawDescGZIP(), []int{4}
|
||||
}
|
||||
|
||||
func (x *DreamWarorderReceiveReq) GetId() int32 {
|
||||
@ -176,7 +272,7 @@ type DreamWarorderReceiveResp struct {
|
||||
func (x *DreamWarorderReceiveResp) Reset() {
|
||||
*x = DreamWarorderReceiveResp{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[3]
|
||||
mi := &file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[5]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -189,7 +285,7 @@ func (x *DreamWarorderReceiveResp) String() string {
|
||||
func (*DreamWarorderReceiveResp) ProtoMessage() {}
|
||||
|
||||
func (x *DreamWarorderReceiveResp) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[3]
|
||||
mi := &file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[5]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -202,7 +298,7 @@ func (x *DreamWarorderReceiveResp) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use DreamWarorderReceiveResp.ProtoReflect.Descriptor instead.
|
||||
func (*DreamWarorderReceiveResp) Descriptor() ([]byte, []int) {
|
||||
return file_dreamwarorder_dreamwarorder_msg_proto_rawDescGZIP(), []int{3}
|
||||
return file_dreamwarorder_dreamwarorder_msg_proto_rawDescGZIP(), []int{5}
|
||||
}
|
||||
|
||||
func (x *DreamWarorderReceiveResp) GetId() int32 {
|
||||
@ -237,15 +333,22 @@ var file_dreamwarorder_dreamwarorder_msg_proto_rawDesc = []byte{
|
||||
0x73, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x12, 0x24, 0x0a, 0x04, 0x69, 0x6e, 0x66,
|
||||
0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x44, 0x72, 0x65, 0x61,
|
||||
0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22,
|
||||
0x29, 0x0a, 0x17, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72,
|
||||
0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4d, 0x0a, 0x18, 0x44, 0x72,
|
||||
0x65, 0x61, 0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69,
|
||||
0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18,
|
||||
0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65,
|
||||
0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
|
||||
0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x27, 0x0a, 0x15, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72,
|
||||
0x42, 0x75, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x3e, 0x0a, 0x16, 0x44, 0x72, 0x65, 0x61,
|
||||
0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x42, 0x75, 0x79, 0x4c, 0x76, 0x52, 0x65,
|
||||
0x73, 0x70, 0x12, 0x24, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
|
||||
0x32, 0x10, 0x2e, 0x44, 0x42, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64,
|
||||
0x65, 0x72, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x29, 0x0a, 0x17, 0x44, 0x72, 0x65, 0x61,
|
||||
0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65,
|
||||
0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x02, 0x69, 0x64, 0x22, 0x4d, 0x0a, 0x18, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x57, 0x61, 0x72, 0x6f,
|
||||
0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12,
|
||||
0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12,
|
||||
0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b,
|
||||
0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61,
|
||||
0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
|
||||
0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
@ -260,25 +363,28 @@ func file_dreamwarorder_dreamwarorder_msg_proto_rawDescGZIP() []byte {
|
||||
return file_dreamwarorder_dreamwarorder_msg_proto_rawDescData
|
||||
}
|
||||
|
||||
var file_dreamwarorder_dreamwarorder_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
|
||||
var file_dreamwarorder_dreamwarorder_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
|
||||
var file_dreamwarorder_dreamwarorder_msg_proto_goTypes = []interface{}{
|
||||
(*DreamWarorderInfoReq)(nil), // 0: DreamWarorderInfoReq
|
||||
(*DreamWarorderInfoResp)(nil), // 1: DreamWarorderInfoResp
|
||||
(*DreamWarorderReceiveReq)(nil), // 2: DreamWarorderReceiveReq
|
||||
(*DreamWarorderReceiveResp)(nil), // 3: DreamWarorderReceiveResp
|
||||
(*ConIProgress)(nil), // 4: ConIProgress
|
||||
(*DBDreamWarorder)(nil), // 5: DBDreamWarorder
|
||||
(*UserAssets)(nil), // 6: UserAssets
|
||||
(*DreamWarorderBuyLvReq)(nil), // 2: DreamWarorderBuyLvReq
|
||||
(*DreamWarorderBuyLvResp)(nil), // 3: DreamWarorderBuyLvResp
|
||||
(*DreamWarorderReceiveReq)(nil), // 4: DreamWarorderReceiveReq
|
||||
(*DreamWarorderReceiveResp)(nil), // 5: DreamWarorderReceiveResp
|
||||
(*ConIProgress)(nil), // 6: ConIProgress
|
||||
(*DBDreamWarorder)(nil), // 7: DBDreamWarorder
|
||||
(*UserAssets)(nil), // 8: UserAssets
|
||||
}
|
||||
var file_dreamwarorder_dreamwarorder_msg_proto_depIdxs = []int32{
|
||||
4, // 0: DreamWarorderInfoResp.conlds:type_name -> ConIProgress
|
||||
5, // 1: DreamWarorderInfoResp.info:type_name -> DBDreamWarorder
|
||||
6, // 2: DreamWarorderReceiveResp.award:type_name -> UserAssets
|
||||
3, // [3:3] is the sub-list for method output_type
|
||||
3, // [3:3] is the sub-list for method input_type
|
||||
3, // [3:3] is the sub-list for extension type_name
|
||||
3, // [3:3] is the sub-list for extension extendee
|
||||
0, // [0:3] is the sub-list for field type_name
|
||||
6, // 0: DreamWarorderInfoResp.conlds:type_name -> ConIProgress
|
||||
7, // 1: DreamWarorderInfoResp.info:type_name -> DBDreamWarorder
|
||||
7, // 2: DreamWarorderBuyLvResp.info:type_name -> DBDreamWarorder
|
||||
8, // 3: DreamWarorderReceiveResp.award:type_name -> UserAssets
|
||||
4, // [4:4] is the sub-list for method output_type
|
||||
4, // [4:4] is the sub-list for method input_type
|
||||
4, // [4:4] is the sub-list for extension type_name
|
||||
4, // [4:4] is the sub-list for extension extendee
|
||||
0, // [0:4] is the sub-list for field type_name
|
||||
}
|
||||
|
||||
func init() { file_dreamwarorder_dreamwarorder_msg_proto_init() }
|
||||
@ -315,7 +421,7 @@ func file_dreamwarorder_dreamwarorder_msg_proto_init() {
|
||||
}
|
||||
}
|
||||
file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*DreamWarorderReceiveReq); i {
|
||||
switch v := v.(*DreamWarorderBuyLvReq); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
@ -327,6 +433,30 @@ func file_dreamwarorder_dreamwarorder_msg_proto_init() {
|
||||
}
|
||||
}
|
||||
file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*DreamWarorderBuyLvResp); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*DreamWarorderReceiveReq); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*DreamWarorderReceiveResp); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
@ -345,7 +475,7 @@ func file_dreamwarorder_dreamwarorder_msg_proto_init() {
|
||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||
RawDescriptor: file_dreamwarorder_dreamwarorder_msg_proto_rawDesc,
|
||||
NumEnums: 0,
|
||||
NumMessages: 4,
|
||||
NumMessages: 6,
|
||||
NumExtensions: 0,
|
||||
NumServices: 0,
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user