liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng

Browse Source
This commit is contained in:
meixiongfeng 2022-07-27 20:41:06 +08:00
commit 24e81a02a4
11 changed files with 137 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/robot/task.go
View File

@ -17,9 +17,9 @@ var (
subType: task.TaskSubTypeList, subType: task.TaskSubTypeList,
req: &pb.TaskListReq{ req: &pb.TaskListReq{
//设置任务类型 //设置任务类型
TaskTag: int32(comm.TASK_DAILY), //每天任务 // TaskTag: int32(comm.TASK_DAILY), //每天任务
// TaskTag: int32(comm.TASK_WEEKLY), //周任务 // TaskTag: int32(comm.TASK_WEEKLY), //周任务
// TaskTag: int32(comm.TASK_ACHIEVE), TaskTag: int32(comm.TASK_ACHIEVE),
// TaskTag: int32(comm.TASK_STRATEGY), // TaskTag: int32(comm.TASK_STRATEGY),
}, },
rsp: &pb.TaskListResp{}, rsp: &pb.TaskListResp{},
@ -39,8 +39,8 @@ var (
mainType: string(comm.ModuleTask), mainType: string(comm.ModuleTask),
subType: task.TaskSubTypeReceive, subType: task.TaskSubTypeReceive,
req: &pb.TaskReceiveReq{ req: &pb.TaskReceiveReq{
TaskTag: int32(comm.TASK_DAILY), TaskTag: int32(comm.TASK_ACHIEVE),
Id: "62dfee653be162da508224a4", Id: "62e0d79d7eefc9f4ef5803e3",
}, },
rsp: &pb.TaskReceiveResp{}, rsp: &pb.TaskReceiveResp{},
// enabled: true, // enabled: true,
@ -65,7 +65,7 @@ var (
} }
fmt.Printf("玩家活跃度 :%v \n", out.Active) fmt.Printf("玩家活跃度 :%v \n", out.Active)
}, },
enabled: true, // enabled: true,
}, { }, {
desc: "活跃度领取", desc: "活跃度领取",
mainType: string(comm.ModuleTask), mainType: string(comm.ModuleTask),

2
modules/gm/module.go
View File

@ -9,7 +9,7 @@ import (
/* /*
模块名:GM工具模块 模块名:GM工具模块
描述:处理客户端发过来的gm命令 描述:处理客户端发过来的gm命令
开发:李伟 开发:梅雄风
*/ */
func NewModule() core.IModule { func NewModule() core.IModule {
m := new(GM) m := new(GM)

11
modules/hero/api_specified.go
View File

@ -10,7 +10,7 @@ import (
//参数校验 //参数校验
func (this *apiComp) GetSpecifiedCheck(session comm.IUserSession, req *pb.HeroGetSpecifiedReq) (code pb.ErrorCode) { func (this *apiComp) GetSpecifiedCheck(session comm.IUserSession, req *pb.HeroGetSpecifiedReq) (code pb.ErrorCode) {
if req.HeroCoinfigID == "" { if req.HeroCoinfigID == "" && req.Star <= 6 && req.Lv <= 6*comm.HeroStarLvRatio {
code = pb.ErrorCode_ReqParameterError code = pb.ErrorCode_ReqParameterError
return return
} }
@ -18,7 +18,7 @@ func (this *apiComp) GetSpecifiedCheck(session comm.IUserSession, req *pb.HeroGe
return return
} }
/// 英雄锁定 /// 获取指定星级或等级的英雄 GM 协议
func (this *apiComp) GetSpecified(session comm.IUserSession, req *pb.HeroGetSpecifiedReq) (code pb.ErrorCode, data proto.Message) { func (this *apiComp) GetSpecified(session comm.IUserSession, req *pb.HeroGetSpecifiedReq) (code pb.ErrorCode, data proto.Message) {
code = this.GetSpecifiedCheck(session, req) // check code = this.GetSpecifiedCheck(session, req) // check
@ -26,10 +26,11 @@ func (this *apiComp) GetSpecified(session comm.IUserSession, req *pb.HeroGetSpec
return return
} }
hero, err := this.module.modelHero.createOneHero(session.GetUserId(), req.HeroCoinfigID) hero, err := this.module.modelHero.createOneHero(session.GetUserId(), req.HeroCoinfigID)
if err != nil { if err == nil {
hero.Lv = req.Lv code = pb.ErrorCode_HeroNoExist
hero.Star = req.Star
} }
hero.Lv = req.Lv
hero.Star = req.Star
_heroMap := map[string]interface{}{ _heroMap := map[string]interface{}{
"lv": hero.Lv, "lv": hero.Lv,
"star": hero.Star, "star": hero.Star,

84
modules/hero/model_hero.go
View File

@ -98,6 +98,7 @@ func (this *ModelHero) createOneHero(uid string, heroCfgId string) (hero *pb.DBH
return return
} }
// 克隆一个英雄
func (this *ModelHero) CloneNewHero(hero *pb.DBHero) (newHero *pb.DBHero) { func (this *ModelHero) CloneNewHero(hero *pb.DBHero) (newHero *pb.DBHero) {
temp := *hero temp := *hero
newHero = &temp newHero = &temp
@ -133,7 +134,7 @@ func (this *ModelHero) initHeroOverlying(uid string, heroCfgId string, count int
return return
} }
//叠加英雄 count叠加数量 // 该方法适用创建初始英雄 叠加英雄 count叠加数量
func (this *ModelHero) createHeroOverlying(uid string, heroCfgId string, count int32) (hero *pb.DBHero, err error) { func (this *ModelHero) createHeroOverlying(uid string, heroCfgId string, count int32) (hero *pb.DBHero, err error) {
heroes := this.moduleHero.modelHero.getHeroList(uid) heroes := this.moduleHero.modelHero.getHeroList(uid)
if len(heroes) == 0 { if len(heroes) == 0 {
@ -208,7 +209,7 @@ func (this *ModelHero) createMultiHero(uid string, heroCfgIds ...string) error {
return nil return nil
} }
//获取一个英雄 //获取一个英雄(参数唯一objID)
func (this *ModelHero) getOneHero(uid, heroId string) *pb.DBHero { func (this *ModelHero) getOneHero(uid, heroId string) *pb.DBHero {
hero := &pb.DBHero{} hero := &pb.DBHero{}
err := this.moduleHero.modelHero.GetListObj(uid, heroId, hero) err := this.moduleHero.modelHero.GetListObj(uid, heroId, hero)
@ -248,14 +249,6 @@ func (this *ModelHero) consumeHeroCard(uid string, hero *pb.DBHero, count int32)
return return
} }
//更新英雄数据
// func (this *ModelHero) modifyHeroData(uid, heroId string, data map[string]interface{}) error {
// if len(data) == 0 {
// return fmt.Errorf("params len is 0")
// }
// return this.moduleHero.modelHero.ChangeList(uid, heroId, data)
// }
//获取玩家的英雄列表 //获取玩家的英雄列表
func (this *ModelHero) getHeroList(uid string) []*pb.DBHero { func (this *ModelHero) getHeroList(uid string) []*pb.DBHero {
heroes := make([]*pb.DBHero, 0) heroes := make([]*pb.DBHero, 0)
@ -309,42 +302,26 @@ func (this *ModelHero) setEquipment(hero *pb.DBHero) (newHero *pb.DBHero, err er
if len(hero.EquipID) == 0 { if len(hero.EquipID) == 0 {
return return
} }
var (
curSameCount int32
)
update := make(map[string]interface{}) update := make(map[string]interface{})
if hero.IsOverlying && hero.SameCount > 1 { if hero.IsOverlying && hero.SameCount > 1 {
curSameCount = hero.SameCount - 1 // 克隆一个新的
hero.SameCount -= 1
newHero = this.CloneNewHero(hero)
hero.SameCount = 1 hero.SameCount = 1
hero.IsOverlying = false hero.IsOverlying = false
update["suiteId"] = hero.SuiteId
update["suiteExtId"] = hero.SuiteExtId
update["equipID"] = hero.EquipID
update["isoverlying"] = false update["isoverlying"] = false
update["sameCount"] = 1 update["sameCount"] = 1
if err = this.ChangeList(hero.Uid, hero.Id, update); err != nil { }
this.moduleHero.Errorf("%v", err) // 修改装备属性 并更新
return update["suiteId"] = hero.SuiteId
} update["suiteExtId"] = hero.SuiteExtId
//创建新卡 update["equipID"] = hero.EquipID
newHero = this.CloneNewHero(hero) if err = this.ChangeList(hero.Uid, hero.Id, update); err != nil {
newHero.EquipID = make([]string, 6) this.moduleHero.Errorf("%v", err)
newHero.IsOverlying = true return
newHero.SameCount = curSameCount
update1 := make(map[string]interface{})
update["equipID"] = newHero.EquipID
update1["sameCount"] = curSameCount
update1["isoverlying"] = true
this.ChangeList(newHero.Uid, newHero.Id, update1)
} else {
update["equipID"] = hero.EquipID
update["isoverlying"] = false
update["suiteId"] = hero.SuiteId
update["suiteExtId"] = hero.SuiteExtId
this.ChangeList(hero.Uid, hero.Id, update)
} }
// 打印 // 打印
for _, v := range hero.EquipID { for _, v := range hero.EquipID {
@ -353,12 +330,16 @@ func (this *ModelHero) setEquipment(hero *pb.DBHero) (newHero *pb.DBHero, err er
return return
} }
//合并属性即属性值累加 //合并属性即属性值累加 (data 额外加的属性)
func (this *ModelHero) mergeMainProperty(uid string, hero *pb.DBHero, data map[string]int32) (err error) { func (this *ModelHero) mergeMainProperty(uid string, hero *pb.DBHero, data map[string]int32) (err error) {
for k, v := range hero.Property {
if v1, ok := data[k]; ok {
v += v1
}
}
hero.Property = data
if err = this.ChangeList(uid, hero.Id, map[string]interface{}{ if err = this.ChangeList(uid, hero.Id, map[string]interface{}{
"property": data, "property": hero.Property,
}); err != nil { }); err != nil {
this.moduleHero.Errorf("mergeMainProperty err %v", err) this.moduleHero.Errorf("mergeMainProperty err %v", err)
} }
@ -457,7 +438,6 @@ func (this *ModelHero) PropertyCompute(hero *pb.DBHero) {
comm.Atk: int32(math.Floor(atk)), comm.Atk: int32(math.Floor(atk)),
comm.Def: int32(math.Floor(def)), comm.Def: int32(math.Floor(def)),
} }
} }
//重新计算英雄属性 //重新计算英雄属性
@ -525,18 +505,9 @@ func (this *ModelHero) AddCardExp(uid string, hero *pb.DBHero, exp int32) (newhe
} }
} }
} }
if hero.SameCount > 1 { //有堆叠的情况
curCount := hero.SameCount - 1 hero.SameCount -= 1
if curCount != 0 { // 有叠加的情况 newhero = this.CloneNewHero(hero) // 克隆一个新的
// 克隆一个英雄
newhero = this.CloneNewHero(hero)
update := map[string]interface{}{
"sameCount": curCount,
}
newhero.SameCount = curCount
if err := this.ChangeList(uid, newhero.Id, update); err != nil {
code = pb.ErrorCode_DBError
}
} }
update["lv"] = curLv update["lv"] = curLv
@ -552,9 +523,6 @@ func (this *ModelHero) AddCardExp(uid string, hero *pb.DBHero, exp int32) (newhe
if err := this.ChangeList(uid, hero.Id, update); err != nil { if err := this.ChangeList(uid, hero.Id, update); err != nil {
code = pb.ErrorCode_DBError code = pb.ErrorCode_DBError
} }
} else {
code = pb.ErrorCode_HeroNoExist
return
} }
return return
} }

9
modules/hero/module.go
View File

@ -91,9 +91,7 @@ func (this *Hero) UpdateEquipment(session comm.IUserSession, hero *pb.DBHero, eq
//英雄列表 //英雄列表
func (this *Hero) GetHeroList(uid string) []*pb.DBHero { func (this *Hero) GetHeroList(uid string) []*pb.DBHero {
heroes := this.modelHero.getHeroList(uid) return this.modelHero.getHeroList(uid)
return heroes
} }
//查询英雄数量 //查询英雄数量
@ -109,10 +107,7 @@ func (this *Hero) QueryHeroAmount(uId string, heroCfgId string) (amount uint32)
// 删除指定卡牌 // 删除指定卡牌
func (this *Hero) DelCard(udi string, hero *pb.DBHero, amount int32) (code pb.ErrorCode) { func (this *Hero) DelCard(udi string, hero *pb.DBHero, amount int32) (code pb.ErrorCode) {
var ( err := this.modelHero.consumeHeroCard(udi, hero, amount)
err error
)
err = this.modelHero.consumeHeroCard(udi, hero, amount)
if err != nil { if err != nil {
code = pb.ErrorCode_DBError code = pb.ErrorCode_DBError
return return

4
modules/items/configure.go
View File

@ -63,7 +63,7 @@ func (this *ConfigureComp) GetItemConfigure(id string) (item *cfg.Game_itemData,
} }
//获取指定类型的物品列表 //获取指定类型的物品列表
func (this *ConfigureComp) GetPackItemByType(itmes []*pb.DB_UserItemData, usetype int32) (result []*pb.DB_UserItemData) { func (this *ConfigureComp) GetPackItemByType(itmes []*pb.DB_UserItemData, bagtype int32) (result []*pb.DB_UserItemData) {
result = make([]*pb.DB_UserItemData, 0, len(itmes)) result = make([]*pb.DB_UserItemData, 0, len(itmes))
var ( var (
v interface{} v interface{}
@ -79,7 +79,7 @@ func (this *ConfigureComp) GetPackItemByType(itmes []*pb.DB_UserItemData, usetyp
table = v.(*cfg.Game_item) table = v.(*cfg.Game_item)
for _, v := range itmes { for _, v := range itmes {
if item, ok = table.GetDataMap()[v.ItemId]; ok { if item, ok = table.GetDataMap()[v.ItemId]; ok {
if item.Usetype == usetype { if item.Bagtype == bagtype {
result = append(result, v) result = append(result, v)
} }
} else { } else {

9
modules/shop/api_buy.go
View File

@ -1,7 +1,6 @@
package shop package shop
import ( import (
"fmt"
"go_dreamfactory/comm" "go_dreamfactory/comm"
"go_dreamfactory/pb" "go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs" cfg "go_dreamfactory/sys/configure/structs"
@ -29,6 +28,10 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb
shopitem *pb.DBShopItem shopitem *pb.DBShopItem
need []*cfg.Game_atn need []*cfg.Game_atn
) )
if code = this.BuyCheck(session, req); code != pb.ErrorCode_Success {
return
}
if conf, err = this.module.configure.GetShopItemsConfigure(req.GoodsId); err != nil { if conf, err = this.module.configure.GetShopItemsConfigure(req.GoodsId); err != nil {
code = pb.ErrorCode_SystemError code = pb.ErrorCode_SystemError
return return
@ -68,8 +71,8 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb
this.module.modelShopItems.AddList(session.GetUserId(), shopitem.Id, shopitem) this.module.modelShopItems.AddList(session.GetUserId(), shopitem.Id, shopitem)
} else { } else {
this.module.modelShopItems.ChangeList(session.GetUserId(), shopitem.Id, map[string]interface{}{ this.module.modelShopItems.ChangeList(session.GetUserId(), shopitem.Id, map[string]interface{}{
fmt.Sprintf("buynum.%d", req.ShopType): shopitem.BuyNum, "buyNum": shopitem.BuyNum,
fmt.Sprintf("lastbuytime.%d", req.ShopType): shopitem.LastBuyTime, "lastBuyTime": shopitem.LastBuyTime,
}) })
} }
session.SendMsg(string(this.module.GetType()), "buy", &pb.ShopBuyResp{IsSucc: true}) session.SendMsg(string(this.module.GetType()), "buy", &pb.ShopBuyResp{IsSucc: true})

32
modules/task/api_receive.go
View File

@ -48,23 +48,27 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq)
return return
} }
//更新活跃度 if conf.Active > 0 {
ue, err := this.moduleTask.ModuleUser.GetUserExpand(session.GetUserId()) //更新活跃度
if err != nil { ue, err := this.moduleTask.ModuleUser.GetUserExpand(session.GetUserId())
code = pb.ErrorCode_DBError if err != nil {
return
}
if ue != nil {
update := make(map[string]interface{})
if comm.TaskTag(req.TaskTag) == comm.TASK_DAILY {
update["activeday"] = ue.Activeday + conf.Active
} else if comm.TaskTag(req.TaskTag) == comm.TASK_WEEKLY {
update["activeweek"] = ue.Activeweek + conf.Active
}
if err = this.moduleTask.ModuleUser.ChanageUserExpand(session.GetUserId(), update); err != nil {
code = pb.ErrorCode_DBError code = pb.ErrorCode_DBError
return return
} }
if ue != nil {
update := make(map[string]interface{})
if comm.TaskTag(req.TaskTag) == comm.TASK_DAILY {
update["activeday"] = ue.Activeday + conf.Active
} else if comm.TaskTag(req.TaskTag) == comm.TASK_WEEKLY {
update["activeweek"] = ue.Activeweek + conf.Active
}
if len(update) > 0 {
if err = this.moduleTask.ModuleUser.ChanageUserExpand(session.GetUserId(), update); err != nil {
code = pb.ErrorCode_DBError
return
}
}
}
} }
//奖励 //奖励

27
modules/user/module.go
View File

@ -83,6 +83,8 @@ func (this *User) QueryAttributeValue(uid string, attr string) (value int32) {
return user.Gold return user.Gold
case comm.ResExp: case comm.ResExp:
return user.Exp return user.Exp
case comm.ResDiamond:
return user.Diamond
} }
return return
} }
@ -148,29 +150,10 @@ func (this *User) AddAttributeValue(session comm.IUserSession, attr string, add
log.Errorf("AddAttributeValue err:%v", err) log.Errorf("AddAttributeValue err:%v", err)
code = pb.ErrorCode_DBError code = pb.ErrorCode_DBError
} }
data := &pb.UserResChangePush{}
var _cache = &pb.CacheUser{} if bPush { //推送玩家账号信息变化消息
err := this.modelUser.MCompModel.Get(session.GetUserId(), _cache) session.SendMsg(string(this.GetType()), "reschange", _change)
if err != nil {
this.SendMsgToUser(string(this.GetType()), "reschange", data, _cache)
} }
if bPush {
this.UserChangePush(session, _change) // 推送玩家数据变化
}
return
}
//推送玩家账号信息变化消息
func (this *User) UserChangePush(session comm.IUserSession, resChange *pb.UserResChangePush) (err error) {
session.SendMsg(string(this.GetType()), "reschange", resChange)
return
}
// 设置record
func (this *User) GetUserRecordData(uid string, typeValue int32, parmare int32) (value int32, err error) {
//pb.DBUserRecord
return return
} }

24
pb/shop_db.pb.go
View File

@ -146,13 +146,13 @@ type DBShop struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //装备id Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //装备id
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //装备id Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //装备id
GoldShop *UserShopData `protobuf:"bytes,3,opt,name=goldShop,proto3" json:"goldShop"` //@go_tags(`bson:"goldShop"`)金币商店数据 GoldShop *UserShopData `protobuf:"bytes,3,opt,name=goldShop,proto3" json:"goldShop" bson:"goldShop"` //金币商店数据
DiamondShop *UserShopData `protobuf:"bytes,4,opt,name=diamondShop,proto3" json:"diamondShop"` //@go_tags(`bson:"diamondShop"`)金币商店数据 DiamondShop *UserShopData `protobuf:"bytes,4,opt,name=diamondShop,proto3" json:"diamondShop" bson:"diamondShop"` //金币商店数据
PvpShop *UserShopData `protobuf:"bytes,5,opt,name=pvpShop,proto3" json:"pvpShop"` //@go_tags(`bson:"pvpShop"`)金币商店数据 PvpShop *UserShopData `protobuf:"bytes,5,opt,name=pvpShop,proto3" json:"pvpShop" bson:"pvpShop"` //金币商店数据
PveShop *UserShopData `protobuf:"bytes,6,opt,name=pveShop,proto3" json:"pveShop"` //@go_tags(`bson:"pveShop"`)金币商店数据 PveShop *UserShopData `protobuf:"bytes,6,opt,name=pveShop,proto3" json:"pveShop" bson:"pveShop"` //金币商店数据
AllianceShop *UserShopData `protobuf:"bytes,7,opt,name=allianceShop,proto3" json:"allianceShop"` //@go_tags(`bson:"allianceShop"`)金币商店数据 AllianceShop *UserShopData `protobuf:"bytes,7,opt,name=allianceShop,proto3" json:"allianceShop" bson:"allianceShop"` //金币商店数据
} }
func (x *DBShop) Reset() { func (x *DBShop) Reset() {
@ -241,11 +241,11 @@ type DBShopItem struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //装备id Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //装备id
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //装备id Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //装备id
GoodsId int32 `protobuf:"varint,3,opt,name=goodsId,proto3" json:"goodsId"` //@go_tags(`bson:"goodsId"`)商品Id GoodsId int32 `protobuf:"varint,3,opt,name=goodsId,proto3" json:"goodsId" bson:"goodsId"` //商品Id
BuyNum map[int32]int32 `protobuf:"bytes,4,rep,name=buyNum,proto3" json:"buyNum" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //@go_tags(`bson:"buyNum"`)购买数量 BuyNum map[int32]int32 `protobuf:"bytes,4,rep,name=buyNum,proto3" json:"buyNum" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"buyNum"` //购买数量
LastBuyTime map[int32]int64 `protobuf:"bytes,5,rep,name=lastBuyTime,proto3" json:"lastBuyTime" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //@go_tags(`bson:"lastBuyTime"`)最后一次购买的时间 LastBuyTime map[int32]int64 `protobuf:"bytes,5,rep,name=lastBuyTime,proto3" json:"lastBuyTime" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"lastBuyTime"` //最后一次购买的时间
} }
func (x *DBShopItem) Reset() { func (x *DBShopItem) Reset() {

108
pb/userrecord.pb.go
View File

@ -2,7 +2,7 @@
// versions: // versions:
// protoc-gen-go v1.28.0 // protoc-gen-go v1.28.0
// protoc v3.20.0 // protoc v3.20.0
// source: userrecord.proto // source: hero/userrecord.proto
package pb package pb
@ -32,7 +32,7 @@ type Floor struct {
func (x *Floor) Reset() { func (x *Floor) Reset() {
*x = Floor{} *x = Floor{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_userrecord_proto_msgTypes[0] mi := &file_hero_userrecord_proto_msgTypes[0]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -45,7 +45,7 @@ func (x *Floor) String() string {
func (*Floor) ProtoMessage() {} func (*Floor) ProtoMessage() {}
func (x *Floor) ProtoReflect() protoreflect.Message { func (x *Floor) ProtoReflect() protoreflect.Message {
mi := &file_userrecord_proto_msgTypes[0] mi := &file_hero_userrecord_proto_msgTypes[0]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -58,7 +58,7 @@ func (x *Floor) ProtoReflect() protoreflect.Message {
// Deprecated: Use Floor.ProtoReflect.Descriptor instead. // Deprecated: Use Floor.ProtoReflect.Descriptor instead.
func (*Floor) Descriptor() ([]byte, []int) { func (*Floor) Descriptor() ([]byte, []int) {
return file_userrecord_proto_rawDescGZIP(), []int{0} return file_hero_userrecord_proto_rawDescGZIP(), []int{0}
} }
func (x *Floor) GetH4() int32 { func (x *Floor) GetH4() int32 {
@ -96,7 +96,7 @@ type DBUserRecord struct {
func (x *DBUserRecord) Reset() { func (x *DBUserRecord) Reset() {
*x = DBUserRecord{} *x = DBUserRecord{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_userrecord_proto_msgTypes[1] mi := &file_hero_userrecord_proto_msgTypes[1]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -109,7 +109,7 @@ func (x *DBUserRecord) String() string {
func (*DBUserRecord) ProtoMessage() {} func (*DBUserRecord) ProtoMessage() {}
func (x *DBUserRecord) ProtoReflect() protoreflect.Message { func (x *DBUserRecord) ProtoReflect() protoreflect.Message {
mi := &file_userrecord_proto_msgTypes[1] mi := &file_hero_userrecord_proto_msgTypes[1]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -122,7 +122,7 @@ func (x *DBUserRecord) ProtoReflect() protoreflect.Message {
// Deprecated: Use DBUserRecord.ProtoReflect.Descriptor instead. // Deprecated: Use DBUserRecord.ProtoReflect.Descriptor instead.
func (*DBUserRecord) Descriptor() ([]byte, []int) { func (*DBUserRecord) Descriptor() ([]byte, []int) {
return file_userrecord_proto_rawDescGZIP(), []int{1} return file_hero_userrecord_proto_rawDescGZIP(), []int{1}
} }
func (x *DBUserRecord) GetId() string { func (x *DBUserRecord) GetId() string {
@ -195,52 +195,52 @@ func (x *DBUserRecord) GetMtime() int64 {
return 0 return 0
} }
var File_userrecord_proto protoreflect.FileDescriptor var File_hero_userrecord_proto protoreflect.FileDescriptor
var file_userrecord_proto_rawDesc = []byte{ var file_hero_userrecord_proto_rawDesc = []byte{
0x0a, 0x10, 0x75, 0x73, 0x65, 0x72, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x0a, 0x15, 0x68, 0x65, 0x72, 0x6f, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x72, 0x65, 0x63, 0x6f, 0x72,
0x74, 0x6f, 0x22, 0x27, 0x0a, 0x05, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x27, 0x0a, 0x05, 0x46, 0x6c, 0x6f, 0x6f, 0x72,
0x34, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x34, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x34, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x34,
0x35, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x35, 0x22, 0x9c, 0x02, 0x0a, 0x0c, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x35, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x35,
0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x22, 0x9c, 0x02, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72,
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69,
0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, 0x30, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, 0x30, 0x18, 0x03, 0x20, 0x01,
0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x30, 0x12, 0x1c, 0x0a, 0x05, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65,
0x72, 0x61, 0x63, 0x65, 0x31, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x30, 0x12, 0x1c, 0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, 0x31, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x31, 0x12, 0x1c, 0x0a, 0x05, 0x72, 0x61, 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x31, 0x12,
0x63, 0x65, 0x32, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x6f, 0x6f, 0x1c, 0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, 0x32, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06,
0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x32, 0x12, 0x1c, 0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x32, 0x12, 0x1c, 0x0a,
0x33, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x33, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46,
0x05, 0x72, 0x61, 0x63, 0x65, 0x33, 0x12, 0x1c, 0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, 0x34, 0x18, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x33, 0x12, 0x1c, 0x0a, 0x05, 0x72,
0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x34, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x46, 0x6c, 0x6f,
0x61, 0x63, 0x65, 0x34, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x6e, 0x6f, 0x72, 0x52, 0x05, 0x72, 0x61, 0x63, 0x65, 0x34, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x72, 0x69,
0x75, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x67, 0x67, 0x65, 0x72, 0x6e, 0x75, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74,
0x72, 0x6e, 0x75, 0x6d, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x6e, 0x75, 0x6d, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x74,
0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x69, 0x76, 0x69, 0x74, 0x79, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x61,
0x74, 0x79, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74, 0x69,
0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x42,
0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
file_userrecord_proto_rawDescOnce sync.Once file_hero_userrecord_proto_rawDescOnce sync.Once
file_userrecord_proto_rawDescData = file_userrecord_proto_rawDesc file_hero_userrecord_proto_rawDescData = file_hero_userrecord_proto_rawDesc
) )
func file_userrecord_proto_rawDescGZIP() []byte { func file_hero_userrecord_proto_rawDescGZIP() []byte {
file_userrecord_proto_rawDescOnce.Do(func() { file_hero_userrecord_proto_rawDescOnce.Do(func() {
file_userrecord_proto_rawDescData = protoimpl.X.CompressGZIP(file_userrecord_proto_rawDescData) file_hero_userrecord_proto_rawDescData = protoimpl.X.CompressGZIP(file_hero_userrecord_proto_rawDescData)
}) })
return file_userrecord_proto_rawDescData return file_hero_userrecord_proto_rawDescData
} }
var file_userrecord_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_hero_userrecord_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
var file_userrecord_proto_goTypes = []interface{}{ var file_hero_userrecord_proto_goTypes = []interface{}{
(*Floor)(nil), // 0: Floor (*Floor)(nil), // 0: Floor
(*DBUserRecord)(nil), // 1: DBUserRecord (*DBUserRecord)(nil), // 1: DBUserRecord
} }
var file_userrecord_proto_depIdxs = []int32{ var file_hero_userrecord_proto_depIdxs = []int32{
0, // 0: DBUserRecord.race0:type_name -> Floor 0, // 0: DBUserRecord.race0:type_name -> Floor
0, // 1: DBUserRecord.race1:type_name -> Floor 0, // 1: DBUserRecord.race1:type_name -> Floor
0, // 2: DBUserRecord.race2:type_name -> Floor 0, // 2: DBUserRecord.race2:type_name -> Floor
@ -253,13 +253,13 @@ var file_userrecord_proto_depIdxs = []int32{
0, // [0:5] is the sub-list for field type_name 0, // [0:5] is the sub-list for field type_name
} }
func init() { file_userrecord_proto_init() } func init() { file_hero_userrecord_proto_init() }
func file_userrecord_proto_init() { func file_hero_userrecord_proto_init() {
if File_userrecord_proto != nil { if File_hero_userrecord_proto != nil {
return return
} }
if !protoimpl.UnsafeEnabled { if !protoimpl.UnsafeEnabled {
file_userrecord_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { file_hero_userrecord_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Floor); i { switch v := v.(*Floor); i {
case 0: case 0:
return &v.state return &v.state
@ -271,7 +271,7 @@ func file_userrecord_proto_init() {
return nil return nil
} }
} }
file_userrecord_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { file_hero_userrecord_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBUserRecord); i { switch v := v.(*DBUserRecord); i {
case 0: case 0:
return &v.state return &v.state
@ -288,18 +288,18 @@ func file_userrecord_proto_init() {
out := protoimpl.TypeBuilder{ out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{ File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(), GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_userrecord_proto_rawDesc, RawDescriptor: file_hero_userrecord_proto_rawDesc,
NumEnums: 0, NumEnums: 0,
NumMessages: 2, NumMessages: 2,
NumExtensions: 0, NumExtensions: 0,
NumServices: 0, NumServices: 0,
}, },
GoTypes: file_userrecord_proto_goTypes, GoTypes: file_hero_userrecord_proto_goTypes,
DependencyIndexes: file_userrecord_proto_depIdxs, DependencyIndexes: file_hero_userrecord_proto_depIdxs,
MessageInfos: file_userrecord_proto_msgTypes, MessageInfos: file_hero_userrecord_proto_msgTypes,
}.Build() }.Build()
File_userrecord_proto = out.File File_hero_userrecord_proto = out.File
file_userrecord_proto_rawDesc = nil file_hero_userrecord_proto_rawDesc = nil
file_userrecord_proto_goTypes = nil file_hero_userrecord_proto_goTypes = nil
file_userrecord_proto_depIdxs = nil file_hero_userrecord_proto_depIdxs = nil
} }