diff --git a/bin/json/game_dispatch_all.json b/bin/json/game_dispatch_all.json deleted file mode 100644 index 9ada55054..000000000 --- a/bin/json/game_dispatch_all.json +++ /dev/null @@ -1,34 +0,0 @@ -[ - { - "id": 101, - "quantity": 1 - }, - { - "id": 102, - "quantity": 12 - }, - { - "id": 103, - "quantity": 1000 - }, - { - "id": 104, - "quantity": 6 - }, - { - "id": 105, - "quantity": 6 - }, - { - "id": 106, - "quantity": 10012 - }, - { - "id": 107, - "quantity": 20 - }, - { - "id": 108, - "quantity": 2 - } -] \ No newline at end of file diff --git a/bin/json/game_dispatch_reward.json b/bin/json/game_dispatch_reward.json deleted file mode 100644 index 03865c91c..000000000 --- a/bin/json/game_dispatch_reward.json +++ /dev/null @@ -1,28 +0,0 @@ -[ - { - "id": 1, - "num": [ - 1, - 2, - 3 - ], - "reward": [ - { - "a": "attr", - "t": "gold", - "n": 999 - }, - { - "a": "attr", - "t": "gold", - "n": 9999 - }, - { - "a": "attr", - "t": "gold", - "n": 99999 - } - ], - "day": 7 - } -] \ No newline at end of file diff --git a/bin/json/game_global.json b/bin/json/game_global.json index f4636e56e..64ad9cd2d 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -550,7 +550,7 @@ ], "raise_temperature": { "a": "item", - "t": "1110001", + "t": "10013", "n": 1 }, "raise_temperatureNum": 50, diff --git a/comm/const.go b/comm/const.go index ddad16cd1..4bc6d8de0 100644 --- a/comm/const.go +++ b/comm/const.go @@ -34,53 +34,55 @@ const ( // 模块名定义处 const ( - ModuleSys core.M_Modules = "sys" //系统 - ModuleGate core.M_Modules = "gateway" //gate模块 网关服务模块 - ModuleWeb core.M_Modules = "web" //后台模块 - ModuleUser core.M_Modules = "user" //用户模块 - ModulePack core.M_Modules = "pack" //背包模块 - ModuleMail core.M_Modules = "mail" //邮件模块 - ModuleFriend core.M_Modules = "friend" //好友模块 - ModuleMgoLog core.M_Modules = "mgolog" //日志模块 - ModuleEquipment core.M_Modules = "equipment" //装备模块 - ModuleHero core.M_Modules = "hero" //英雄模块 - ModuleForum core.M_Modules = "forum" //论坛模块 - ModuleItems core.M_Modules = "items" //道具模块 - ModuleShop core.M_Modules = "shop" //商店模块 - ModuleTask core.M_Modules = "task" //任务模块 - ModuleMainline core.M_Modules = "mainline" //主线模块 - ModuleNotify core.M_Modules = "notify" //公告模块 - ModuleChat core.M_Modules = "chat" //聊天模块 - ModuleGM core.M_Modules = "gm" //gm模块 - ModulePagoda core.M_Modules = "pagoda" //魔塔模块 - ModuleMartialhall core.M_Modules = "martialhall" //武馆模块 - ModuleGourmet core.M_Modules = "gourmet" //美食馆 - ModuleRtask core.M_Modules = "rtask" //随机任务 - ModuleSmithy core.M_Modules = "smithy" //铁匠铺 - ModuleTimer core.M_Modules = "timer" //定时任务模块 - ModuleViking core.M_Modules = "viking" //维京远征 - ModuleMoonfantasy core.M_Modules = "moonfantasy" //月之秘境模块 - ModuleHunting core.M_Modules = "hunting" //狩猎 - ModuleLinestory core.M_Modules = "linestory" //支线剧情 - ModuleBattle core.M_Modules = "battle" //战斗 - ModuleLibrary core.M_Modules = "library" //藏书馆 - ModuleArena core.M_Modules = "arena" //竞技场 - ModuleTroll core.M_Modules = "troll" //巨怪商队 - ModuleHoroscope core.M_Modules = "horoscope" //星座图 - ModuleSociaty core.M_Modules = "sociaty" //公会 - ModulePay core.M_Modules = "pay" //支付 - ModuleAcademy core.M_Modules = "academy" //联盟学院 - ModulePrivilege core.M_Modules = "privilege" //特权 - ModuleGrowtask core.M_Modules = "growtask" //成长任务 - ModuleWorldtask core.M_Modules = "worldtask" //世界任务 - ModuleReddot core.M_Modules = "reddot" //红点 - ModuleCombat core.M_Modules = "combat" //关卡编辑 - ModuleEnchant core.M_Modules = "enchant" //附魔 - ModuleAutoBattle core.M_Modules = "autobattle" //自动战斗 - ModuleMline core.M_Modules = "mline" //主线模块 - ModulePvp core.M_Modules = "pvp" //实时pvp - ModulePractice core.M_Modules = "practice" //熊猫武馆 练功系统 - ModuleFitness core.M_Modules = "fitness" //熊猫武馆 每日一健 + ModuleSys core.M_Modules = "sys" //系统 + ModuleGate core.M_Modules = "gateway" //gate模块 网关服务模块 + ModuleWeb core.M_Modules = "web" //后台模块 + ModuleUser core.M_Modules = "user" //用户模块 + ModulePack core.M_Modules = "pack" //背包模块 + ModuleMail core.M_Modules = "mail" //邮件模块 + ModuleFriend core.M_Modules = "friend" //好友模块 + ModuleMgoLog core.M_Modules = "mgolog" //日志模块 + ModuleEquipment core.M_Modules = "equipment" //装备模块 + ModuleHero core.M_Modules = "hero" //英雄模块 + ModuleForum core.M_Modules = "forum" //论坛模块 + ModuleItems core.M_Modules = "items" //道具模块 + ModuleShop core.M_Modules = "shop" //商店模块 + ModuleTask core.M_Modules = "task" //任务模块 + ModuleMainline core.M_Modules = "mainline" //主线模块 + ModuleNotify core.M_Modules = "notify" //公告模块 + ModuleChat core.M_Modules = "chat" //聊天模块 + ModuleGM core.M_Modules = "gm" //gm模块 + ModulePagoda core.M_Modules = "pagoda" //魔塔模块 + ModuleMartialhall core.M_Modules = "martialhall" //武馆模块 + ModuleGourmet core.M_Modules = "gourmet" //美食馆 + ModuleRtask core.M_Modules = "rtask" //随机任务 + ModuleSmithy core.M_Modules = "smithy" //铁匠铺 + ModuleTimer core.M_Modules = "timer" //定时任务模块 + ModuleViking core.M_Modules = "viking" //维京远征 + ModuleMoonfantasy core.M_Modules = "moonfantasy" //月之秘境模块 + ModuleHunting core.M_Modules = "hunting" //狩猎 + ModuleLinestory core.M_Modules = "linestory" //支线剧情 + ModuleBattle core.M_Modules = "battle" //战斗 + ModuleLibrary core.M_Modules = "library" //藏书馆 + ModuleArena core.M_Modules = "arena" //竞技场 + ModuleTroll core.M_Modules = "troll" //巨怪商队 + ModuleHoroscope core.M_Modules = "horoscope" //星座图 + ModuleSociaty core.M_Modules = "sociaty" //公会 + ModulePay core.M_Modules = "pay" //支付 + ModuleAcademy core.M_Modules = "academy" //联盟学院 + ModulePrivilege core.M_Modules = "privilege" //特权 + ModuleGrowtask core.M_Modules = "growtask" //成长任务 + ModuleWorldtask core.M_Modules = "worldtask" //世界任务 + ModuleReddot core.M_Modules = "reddot" //红点 + ModuleCombat core.M_Modules = "combat" //关卡编辑 + ModuleEnchant core.M_Modules = "enchant" //附魔 + ModuleAutoBattle core.M_Modules = "autobattle" //自动战斗 + ModuleMline core.M_Modules = "mline" //主线模块 + ModulePvp core.M_Modules = "pvp" //实时pvp + ModulePandaTakekan core.M_Modules = "pandatakekan" //熊猫武馆 + ModuleDispatch core.M_Modules = "dispatch" //武馆派遣 + ModulePractice core.M_Modules = "practice" //熊猫武馆 练功系统 + ModuleFitness core.M_Modules = "fitness" //熊猫武馆 每日一健 ) // 数据表名定义处 @@ -233,6 +235,8 @@ const ( ///熊猫物管部 TablePandata = "pandata" + // 熊猫武馆派遣 + TableDispatch = "dispatch" ) // RPC服务接口定义处 diff --git a/modules/dispatch/api.go b/modules/dispatch/api.go new file mode 100644 index 000000000..c4cc19b86 --- /dev/null +++ b/modules/dispatch/api.go @@ -0,0 +1,17 @@ +package dispatch + +import ( + "go_dreamfactory/lego/core" + "go_dreamfactory/modules" +) + +type apiComp struct { + modules.MCompGate + module *Dispatch +} + +func(this *apiComp) Init(service core.IService, module core.IModule,comp core.IModuleComp, options core.IModuleOptions) (err error){ + _ = this.MCompGate.Init(service, module, comp, options) + this.module = module.(*Dispatch) + return +} \ No newline at end of file diff --git a/modules/dispatch/model_dispatch.go b/modules/dispatch/model_dispatch.go new file mode 100644 index 000000000..347acabc4 --- /dev/null +++ b/modules/dispatch/model_dispatch.go @@ -0,0 +1,28 @@ +package dispatch + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/modules" + + "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/x/bsonx" +) + +type modelDispatch struct { + modules.MCompModel + module *Dispatch + service core.IService +} + +func (this *modelDispatch) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + err = this.MCompModel.Init(service, module, comp, options) + this.TableName = comm.TableDispatch + this.module = module.(*Dispatch) + this.service = service + this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ + Keys: bsonx.Doc{{Key: "_id", Value: bsonx.Int32(1)}}, + }) + + return +} diff --git a/modules/dispatch/module.go b/modules/dispatch/module.go new file mode 100644 index 000000000..3ab56bfb5 --- /dev/null +++ b/modules/dispatch/module.go @@ -0,0 +1,27 @@ +package dispatch + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/modules" +) + +// 派遣 +type Dispatch struct { + modules.ModuleBase + api *apiComp +} + +func NewModule() core.IModule { + return &Dispatch{} +} + +func (this *Dispatch) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error){ + err = this.ModuleBase.Init(service, module, options) + return +} + + +func (this *Dispatch) GetType() core.M_Modules { + return comm.ModuleDispatch +} diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go index 4b92f4f31..82d08cd58 100644 --- a/modules/smithy/api_forgeequip.go +++ b/modules/smithy/api_forgeequip.go @@ -193,7 +193,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq // 更新图鉴信息 for _, v := range rsp.Equip { if equipConf := this.module.configure.GetEquipmentConfigureById(v.CId); equipConf != nil { // 获取装备等级 - this.module.modelAtlas.CheckActivateAtlas(session.GetUserId(), v.CId, equipConf.Star, int32(len(v.AdverbEntry)), stove.Forge[req.ReelId]) + this.module.modelAtlas.CheckActivateAtlas(session.GetUserId(), v.CId, equipConf.Star, int32(len(v.AdverbEntry)+1), stove.Forge[req.ReelId]) } } diff --git a/modules/smithy/api_getlist.go b/modules/smithy/api_getlist.go index f95832ef1..3b66b7061 100644 --- a/modules/smithy/api_getlist.go +++ b/modules/smithy/api_getlist.go @@ -15,7 +15,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.SmithyGetLi ///获取美食城基本信息 func (this *apiComp) GetList(session comm.IUserSession, req *pb.SmithyGetListReq) (code pb.ErrorCode, data proto.Message) { - + this.AtlasList(session, &pb.SmithyAtlasListReq{}) code = this.GetListCheck(session, req) if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 diff --git a/modules/smithy/api_rise.go b/modules/smithy/api_rise.go index 395f16bbc..29f354afe 100644 --- a/modules/smithy/api_rise.go +++ b/modules/smithy/api_rise.go @@ -44,7 +44,7 @@ func (this *apiComp) Rise(session comm.IUserSession, req *pb.SmithyRiseReq) (cod N: raise.N * req.Count, }) - if stove.Temperature+req.Count*raise_temperatureNum >= conf.MaxTemperature-raise_temperatureNum { + if stove.Temperature+req.Count*raise_temperatureNum <= (conf.MaxTemperature - raise_temperatureNum) { code = pb.ErrorCode_SmithyMaxTemperature return } @@ -57,6 +57,6 @@ func (this *apiComp) Rise(session comm.IUserSession, req *pb.SmithyRiseReq) (cod this.module.modelStove.updateSmithyStove(session.GetUserId(), update) session.SendMsg(string(this.module.GetType()), "rise", &pb.SmithyRiseResp{Data: stove}) } - code = pb.ErrorCode_ConfigNoFound + return } diff --git a/modules/smithy/model_atlas.go b/modules/smithy/model_atlas.go index 5c96ed25b..4e5102ba6 100644 --- a/modules/smithy/model_atlas.go +++ b/modules/smithy/model_atlas.go @@ -29,7 +29,14 @@ func (this *modelAtlas) Init(service core.IService, module core.IModule, comp co } func (this *modelAtlas) getSmithyAtlasList(uid string) (result *pb.DBAtlas, err error) { - result = &pb.DBAtlas{} + result = &pb.DBAtlas{ + Id: "", + Uid: uid, + Atlas: map[string]*pb.ForgeList{}, + Collect: map[string]*pb.CollectData{}, + Score: 0, + Award: 0, + } if err = this.Get(uid, result); err != nil { if mongo.ErrNoDocuments == err { result.Id = primitive.NewObjectID().Hex() diff --git a/modules/smithy/model_stove.go b/modules/smithy/model_stove.go index e278827a5..22b501184 100644 --- a/modules/smithy/model_stove.go +++ b/modules/smithy/model_stove.go @@ -147,14 +147,8 @@ func (this *modelStove) calculationRecoveryT(uid string, stove *pb.DBStove) { // 通过技能获取额外的提升 func (this *modelStove) StoveToolsQualityProbability(stove *pb.DBStove) int32 { - if v, ok := stove.Skill[comm.SmithyToolsSkill1]; ok { - if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, v); conf != nil { - return conf.Value - } else { - if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, 0); conf != nil { - return conf.Value - } - } + if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, stove.Skill[comm.SmithyToolsSkill1]); conf != nil { + return conf.Value } return 0 } @@ -162,14 +156,8 @@ func (this *modelStove) StoveToolsQualityProbability(stove *pb.DBStove) int32 { // 所有装备售价提升{0}% func (this *modelStove) StoveToolsSellUp(uid string) int32 { if stove, err := this.module.modelStove.getSmithyStoveList(uid); err == nil { - if v, ok := stove.Skill[comm.SmithyToolsSkill2]; ok { - if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, v); conf != nil { - return conf.Value - } else { - if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, 0); conf != nil { - return conf.Value - } - } + if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, stove.Skill[comm.SmithyToolsSkill2]); conf != nil { + return conf.Value } } return 0 @@ -177,14 +165,8 @@ func (this *modelStove) StoveToolsSellUp(uid string) int32 { // 所有图纸炉温消耗减少 func (this *modelStove) StoveToolsTemperature(stove *pb.DBStove) int32 { - if v, ok := stove.Skill[comm.SmithyToolsSkill3]; ok { - if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, v); conf != nil { - return conf.Value - } else { - if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, 0); conf != nil { - return conf.Value - } - } + if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, stove.Skill[comm.SmithyToolsSkill3]); conf != nil { + return conf.Value } return 0 } @@ -192,14 +174,8 @@ func (this *modelStove) StoveToolsTemperature(stove *pb.DBStove) int32 { //每日顾客数量提升至{0}人 func (this *modelStove) StoveSkillAddCustomer(uid string) int32 { if stove, err := this.module.modelStove.getSmithyStoveList(uid); err == nil { - if v, ok := stove.Skill[comm.SmithyToolsSkill4]; ok { - if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, v); conf != nil { - return conf.Value - } - } else { - if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, 0); conf != nil { - return conf.Value - } + if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, stove.Skill[comm.SmithyToolsSkill4]); conf != nil { + return conf.Value } } return 0 @@ -208,10 +184,8 @@ func (this *modelStove) StoveSkillAddCustomer(uid string) int32 { //顾客购买装备数量上限提高至{0}件 func (this *modelStove) StoveSkillBuyEquip(uid string) int32 { if stove, err := this.module.modelStove.getSmithyStoveList(uid); err == nil { - if v, ok := stove.Skill[comm.SmithyToolsSkill5]; ok { - if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, v); conf != nil { - return conf.Value - } + if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, stove.Skill[comm.SmithyToolsSkill5]); conf != nil { + return conf.Value } } return 0 diff --git a/pb/practice_msg.pb.go b/pb/practice_msg.pb.go deleted file mode 100644 index 8d9f27d66..000000000 --- a/pb/practice_msg.pb.go +++ /dev/null @@ -1,731 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.28.0 -// protoc v3.20.0 -// source: practice/practice_msg.proto - -package pb - -import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -///信息请求 -type PracticeInfoReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *PracticeInfoReq) Reset() { - *x = PracticeInfoReq{} - if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_msg_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *PracticeInfoReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*PracticeInfoReq) ProtoMessage() {} - -func (x *PracticeInfoReq) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_msg_proto_msgTypes[0] - 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 PracticeInfoReq.ProtoReflect.Descriptor instead. -func (*PracticeInfoReq) Descriptor() ([]byte, []int) { - return file_practice_practice_msg_proto_rawDescGZIP(), []int{0} -} - -///信息请求 回应 -type PracticeInfoResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Info *DBPracticeRoom `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` -} - -func (x *PracticeInfoResp) Reset() { - *x = PracticeInfoResp{} - if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_msg_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *PracticeInfoResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*PracticeInfoResp) ProtoMessage() {} - -func (x *PracticeInfoResp) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_msg_proto_msgTypes[1] - 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 PracticeInfoResp.ProtoReflect.Descriptor instead. -func (*PracticeInfoResp) Descriptor() ([]byte, []int) { - return file_practice_practice_msg_proto_rawDescGZIP(), []int{1} -} - -func (x *PracticeInfoResp) GetInfo() *DBPracticeRoom { - if x != nil { - return x.Info - } - return nil -} - -///解锁请求 -type PracticeUnLockReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *PracticeUnLockReq) Reset() { - *x = PracticeUnLockReq{} - if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_msg_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *PracticeUnLockReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*PracticeUnLockReq) ProtoMessage() {} - -func (x *PracticeUnLockReq) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_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 PracticeUnLockReq.ProtoReflect.Descriptor instead. -func (*PracticeUnLockReq) Descriptor() ([]byte, []int) { - return file_practice_practice_msg_proto_rawDescGZIP(), []int{2} -} - -type PracticeUnLockResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *PracticeUnLockResp) Reset() { - *x = PracticeUnLockResp{} - if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_msg_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *PracticeUnLockResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*PracticeUnLockResp) ProtoMessage() {} - -func (x *PracticeUnLockResp) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_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 PracticeUnLockResp.ProtoReflect.Descriptor instead. -func (*PracticeUnLockResp) Descriptor() ([]byte, []int) { - return file_practice_practice_msg_proto_rawDescGZIP(), []int{3} -} - -///练功请求 -type PracticePracticeReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *PracticePracticeReq) Reset() { - *x = PracticePracticeReq{} - if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_msg_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *PracticePracticeReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*PracticePracticeReq) ProtoMessage() {} - -func (x *PracticePracticeReq) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_msg_proto_msgTypes[4] - 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 PracticePracticeReq.ProtoReflect.Descriptor instead. -func (*PracticePracticeReq) Descriptor() ([]byte, []int) { - return file_practice_practice_msg_proto_rawDescGZIP(), []int{4} -} - -type PracticePracticeResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *PracticePracticeResp) Reset() { - *x = PracticePracticeResp{} - if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_msg_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *PracticePracticeResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*PracticePracticeResp) ProtoMessage() {} - -func (x *PracticePracticeResp) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_msg_proto_msgTypes[5] - 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 PracticePracticeResp.ProtoReflect.Descriptor instead. -func (*PracticePracticeResp) Descriptor() ([]byte, []int) { - return file_practice_practice_msg_proto_rawDescGZIP(), []int{5} -} - -///蹭馆请求 -type PracticeLootReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *PracticeLootReq) Reset() { - *x = PracticeLootReq{} - if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_msg_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *PracticeLootReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*PracticeLootReq) ProtoMessage() {} - -func (x *PracticeLootReq) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_msg_proto_msgTypes[6] - 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 PracticeLootReq.ProtoReflect.Descriptor instead. -func (*PracticeLootReq) Descriptor() ([]byte, []int) { - return file_practice_practice_msg_proto_rawDescGZIP(), []int{6} -} - -type PracticeLootResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *PracticeLootResp) Reset() { - *x = PracticeLootResp{} - if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_msg_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *PracticeLootResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*PracticeLootResp) ProtoMessage() {} - -func (x *PracticeLootResp) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_msg_proto_msgTypes[7] - 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 PracticeLootResp.ProtoReflect.Descriptor instead. -func (*PracticeLootResp) Descriptor() ([]byte, []int) { - return file_practice_practice_msg_proto_rawDescGZIP(), []int{7} -} - -///驱逐 -type PracticeExpulsionReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *PracticeExpulsionReq) Reset() { - *x = PracticeExpulsionReq{} - if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_msg_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *PracticeExpulsionReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*PracticeExpulsionReq) ProtoMessage() {} - -func (x *PracticeExpulsionReq) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_msg_proto_msgTypes[8] - 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 PracticeExpulsionReq.ProtoReflect.Descriptor instead. -func (*PracticeExpulsionReq) Descriptor() ([]byte, []int) { - return file_practice_practice_msg_proto_rawDescGZIP(), []int{8} -} - -type PracticeExpulsionResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *PracticeExpulsionResp) Reset() { - *x = PracticeExpulsionResp{} - if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_msg_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *PracticeExpulsionResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*PracticeExpulsionResp) ProtoMessage() {} - -func (x *PracticeExpulsionResp) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_msg_proto_msgTypes[9] - 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 PracticeExpulsionResp.ProtoReflect.Descriptor instead. -func (*PracticeExpulsionResp) Descriptor() ([]byte, []int) { - return file_practice_practice_msg_proto_rawDescGZIP(), []int{9} -} - -///领取收益 -type PracticeReceiveReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *PracticeReceiveReq) Reset() { - *x = PracticeReceiveReq{} - if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_msg_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *PracticeReceiveReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*PracticeReceiveReq) ProtoMessage() {} - -func (x *PracticeReceiveReq) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_msg_proto_msgTypes[10] - 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 PracticeReceiveReq.ProtoReflect.Descriptor instead. -func (*PracticeReceiveReq) Descriptor() ([]byte, []int) { - return file_practice_practice_msg_proto_rawDescGZIP(), []int{10} -} - -type PracticeReceiveResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *PracticeReceiveResp) Reset() { - *x = PracticeReceiveResp{} - if protoimpl.UnsafeEnabled { - mi := &file_practice_practice_msg_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *PracticeReceiveResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*PracticeReceiveResp) ProtoMessage() {} - -func (x *PracticeReceiveResp) ProtoReflect() protoreflect.Message { - mi := &file_practice_practice_msg_proto_msgTypes[11] - 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 PracticeReceiveResp.ProtoReflect.Descriptor instead. -func (*PracticeReceiveResp) Descriptor() ([]byte, []int) { - return file_practice_practice_msg_proto_rawDescGZIP(), []int{11} -} - -var File_practice_practice_msg_proto protoreflect.FileDescriptor - -var file_practice_practice_msg_proto_rawDesc = []byte{ - 0x0a, 0x1b, 0x70, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x2f, 0x70, 0x72, 0x61, 0x63, 0x74, - 0x69, 0x63, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1a, 0x70, - 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x2f, 0x70, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, - 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x11, 0x0a, 0x0f, 0x50, 0x72, 0x61, - 0x63, 0x74, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, 0x10, - 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x23, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, - 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, - 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x13, 0x0a, 0x11, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, - 0x65, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x22, 0x14, 0x0a, 0x12, 0x50, 0x72, - 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, - 0x22, 0x15, 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x72, 0x61, 0x63, - 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x71, 0x22, 0x16, 0x0a, 0x14, 0x50, 0x72, 0x61, 0x63, 0x74, - 0x69, 0x63, 0x65, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, - 0x11, 0x0a, 0x0f, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4c, 0x6f, 0x6f, 0x74, 0x52, - 0x65, 0x71, 0x22, 0x12, 0x0a, 0x10, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4c, 0x6f, - 0x6f, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x16, 0x0a, 0x14, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, - 0x63, 0x65, 0x45, 0x78, 0x70, 0x75, 0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x17, - 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x78, 0x70, 0x75, 0x6c, 0x73, - 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x22, 0x14, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, - 0x69, 0x63, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x22, 0x15, 0x0a, - 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, - 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, -} - -var ( - file_practice_practice_msg_proto_rawDescOnce sync.Once - file_practice_practice_msg_proto_rawDescData = file_practice_practice_msg_proto_rawDesc -) - -func file_practice_practice_msg_proto_rawDescGZIP() []byte { - file_practice_practice_msg_proto_rawDescOnce.Do(func() { - file_practice_practice_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_practice_practice_msg_proto_rawDescData) - }) - return file_practice_practice_msg_proto_rawDescData -} - -var file_practice_practice_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 12) -var file_practice_practice_msg_proto_goTypes = []interface{}{ - (*PracticeInfoReq)(nil), // 0: PracticeInfoReq - (*PracticeInfoResp)(nil), // 1: PracticeInfoResp - (*PracticeUnLockReq)(nil), // 2: PracticeUnLockReq - (*PracticeUnLockResp)(nil), // 3: PracticeUnLockResp - (*PracticePracticeReq)(nil), // 4: PracticePracticeReq - (*PracticePracticeResp)(nil), // 5: PracticePracticeResp - (*PracticeLootReq)(nil), // 6: PracticeLootReq - (*PracticeLootResp)(nil), // 7: PracticeLootResp - (*PracticeExpulsionReq)(nil), // 8: PracticeExpulsionReq - (*PracticeExpulsionResp)(nil), // 9: PracticeExpulsionResp - (*PracticeReceiveReq)(nil), // 10: PracticeReceiveReq - (*PracticeReceiveResp)(nil), // 11: PracticeReceiveResp - (*DBPracticeRoom)(nil), // 12: DBPracticeRoom -} -var file_practice_practice_msg_proto_depIdxs = []int32{ - 12, // 0: PracticeInfoResp.info:type_name -> DBPracticeRoom - 1, // [1:1] is the sub-list for method output_type - 1, // [1:1] is the sub-list for method input_type - 1, // [1:1] is the sub-list for extension type_name - 1, // [1:1] is the sub-list for extension extendee - 0, // [0:1] is the sub-list for field type_name -} - -func init() { file_practice_practice_msg_proto_init() } -func file_practice_practice_msg_proto_init() { - if File_practice_practice_msg_proto != nil { - return - } - file_practice_practice_db_proto_init() - if !protoimpl.UnsafeEnabled { - file_practice_practice_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PracticeInfoReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_practice_practice_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PracticeInfoResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_practice_practice_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PracticeUnLockReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_practice_practice_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PracticeUnLockResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_practice_practice_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PracticePracticeReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_practice_practice_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PracticePracticeResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_practice_practice_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PracticeLootReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_practice_practice_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PracticeLootResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_practice_practice_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PracticeExpulsionReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_practice_practice_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PracticeExpulsionResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_practice_practice_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PracticeReceiveReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_practice_practice_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PracticeReceiveResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_practice_practice_msg_proto_rawDesc, - NumEnums: 0, - NumMessages: 12, - NumExtensions: 0, - NumServices: 0, - }, - GoTypes: file_practice_practice_msg_proto_goTypes, - DependencyIndexes: file_practice_practice_msg_proto_depIdxs, - MessageInfos: file_practice_practice_msg_proto_msgTypes, - }.Build() - File_practice_practice_msg_proto = out.File - file_practice_practice_msg_proto_rawDesc = nil - file_practice_practice_msg_proto_goTypes = nil - file_practice_practice_msg_proto_depIdxs = nil -} diff --git a/services/worker/main.go b/services/worker/main.go index 810177926..168949c73 100644 --- a/services/worker/main.go +++ b/services/worker/main.go @@ -8,6 +8,7 @@ import ( "go_dreamfactory/modules/battle" "go_dreamfactory/modules/chat" "go_dreamfactory/modules/combat" + "go_dreamfactory/modules/dispatch" "go_dreamfactory/modules/enchant" "go_dreamfactory/modules/equipment" "go_dreamfactory/modules/forum" @@ -112,6 +113,7 @@ func main() { enchant.NewModule(), mline.NewModule(), pvp.NewModule(), + dispatch.NewModule(), ) } diff --git a/sys/configure/structs/Game.Dispatch_All.go b/sys/configure/structs/Game.Dispatch_All.go deleted file mode 100644 index c09f6442c..000000000 --- a/sys/configure/structs/Game.Dispatch_All.go +++ /dev/null @@ -1,42 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -package cfg - -type GameDispatch_All struct { - _dataMap map[int32]*GameDispatch_AllData - _dataList []*GameDispatch_AllData -} - -func NewGameDispatch_All(_buf []map[string]interface{}) (*GameDispatch_All, error) { - _dataList := make([]*GameDispatch_AllData, 0, len(_buf)) - dataMap := make(map[int32]*GameDispatch_AllData) - for _, _ele_ := range _buf { - if _v, err2 := DeserializeGameDispatch_AllData(_ele_); err2 != nil { - return nil, err2 - } else { - _dataList = append(_dataList, _v) - dataMap[_v.Id] = _v - } - } - return &GameDispatch_All{_dataList:_dataList, _dataMap:dataMap}, nil -} - -func (table *GameDispatch_All) GetDataMap() map[int32]*GameDispatch_AllData { - return table._dataMap -} - -func (table *GameDispatch_All) GetDataList() []*GameDispatch_AllData { - return table._dataList -} - -func (table *GameDispatch_All) Get(key int32) *GameDispatch_AllData { - return table._dataMap[key] -} - - diff --git a/sys/configure/structs/Game.Dispatch_AllData.go b/sys/configure/structs/Game.Dispatch_AllData.go deleted file mode 100644 index f7dc896c4..000000000 --- a/sys/configure/structs/Game.Dispatch_AllData.go +++ /dev/null @@ -1,37 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -package cfg - -import "errors" - -type GameDispatch_AllData struct { - Id int32 - Quantity float32 -} - -const TypeId_GameDispatch_AllData = 1167514754 - -func (*GameDispatch_AllData) GetTypeId() int32 { - return 1167514754 -} - -func (_v *GameDispatch_AllData)Deserialize(_buf map[string]interface{}) (err error) { - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["quantity"].(float64); !_ok_ { err = errors.New("quantity error"); return }; _v.Quantity = float32(_tempNum_) } - return -} - -func DeserializeGameDispatch_AllData(_buf map[string]interface{}) (*GameDispatch_AllData, error) { - v := &GameDispatch_AllData{} - if err := v.Deserialize(_buf); err == nil { - return v, nil - } else { - return nil, err - } -} diff --git a/sys/configure/structs/Game.Dispatch_Reward.go b/sys/configure/structs/Game.Dispatch_Reward.go deleted file mode 100644 index ff1ae14b5..000000000 --- a/sys/configure/structs/Game.Dispatch_Reward.go +++ /dev/null @@ -1,42 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -package cfg - -type GameDispatch_Reward struct { - _dataMap map[int32]*GameDispatch_RewardData - _dataList []*GameDispatch_RewardData -} - -func NewGameDispatch_Reward(_buf []map[string]interface{}) (*GameDispatch_Reward, error) { - _dataList := make([]*GameDispatch_RewardData, 0, len(_buf)) - dataMap := make(map[int32]*GameDispatch_RewardData) - for _, _ele_ := range _buf { - if _v, err2 := DeserializeGameDispatch_RewardData(_ele_); err2 != nil { - return nil, err2 - } else { - _dataList = append(_dataList, _v) - dataMap[_v.Id] = _v - } - } - return &GameDispatch_Reward{_dataList:_dataList, _dataMap:dataMap}, nil -} - -func (table *GameDispatch_Reward) GetDataMap() map[int32]*GameDispatch_RewardData { - return table._dataMap -} - -func (table *GameDispatch_Reward) GetDataList() []*GameDispatch_RewardData { - return table._dataList -} - -func (table *GameDispatch_Reward) Get(key int32) *GameDispatch_RewardData { - return table._dataMap[key] -} - - diff --git a/sys/configure/structs/Game.Dispatch_RewardData.go b/sys/configure/structs/Game.Dispatch_RewardData.go deleted file mode 100644 index fa0809315..000000000 --- a/sys/configure/structs/Game.Dispatch_RewardData.go +++ /dev/null @@ -1,67 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -package cfg - -import "errors" - -type GameDispatch_RewardData struct { - Id int32 - Num []int32 - Reward []*Gameatn - Day int32 -} - -const TypeId_GameDispatch_RewardData = -356577150 - -func (*GameDispatch_RewardData) GetTypeId() int32 { - return -356577150 -} - -func (_v *GameDispatch_RewardData)Deserialize(_buf map[string]interface{}) (err error) { - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["num"].([]interface{}); !_ok_ { err = errors.New("num error"); return } - - _v.Num = make([]int32, 0, len(_arr_)) - - for _, _e_ := range _arr_ { - var _list_v_ int32 - { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } - _v.Num = append(_v.Num, _list_v_) - } - } - - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["reward"].([]interface{}); !_ok_ { err = errors.New("reward error"); return } - - _v.Reward = make([]*Gameatn, 0, len(_arr_)) - - for _, _e_ := range _arr_ { - var _list_v_ *Gameatn - { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } - _v.Reward = append(_v.Reward, _list_v_) - } - } - - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["day"].(float64); !_ok_ { err = errors.New("day error"); return }; _v.Day = int32(_tempNum_) } - return -} - -func DeserializeGameDispatch_RewardData(_buf map[string]interface{}) (*GameDispatch_RewardData, error) { - v := &GameDispatch_RewardData{} - if err := v.Deserialize(_buf); err == nil { - return v, nil - } else { - return nil, err - } -}