From 3102a7729f70f62a1ffefde3b611c9131cc24f77 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 15 Feb 2023 19:28:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=93=81=E5=8C=A0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/const.go | 5 ++- modules/smithy/api_forgeequip.go | 2 +- modules/smithy/api_getstoveinfo.go | 2 +- modules/smithy/api_orderequip.go | 2 +- modules/smithy/api_rise.go | 2 +- modules/smithy/api_stoveup.go | 8 ++-- modules/smithy/api_toolsup.go | 2 +- modules/smithy/model_smithy.go | 30 --------------- modules/smithy/model_stove.go | 60 ++++++++++++++++++++++++++++++ modules/smithy/module.go | 2 + 10 files changed, 75 insertions(+), 40 deletions(-) create mode 100644 modules/smithy/model_stove.go diff --git a/comm/const.go b/comm/const.go index 7428fa987..2dcd76464 100644 --- a/comm/const.go +++ b/comm/const.go @@ -140,7 +140,7 @@ const ( TableSeasonRecord = "seasonRecord" // 赛季塔记录 /// 美食馆 - TableSmithy = "smithy" + TableSmithy = "smithy" TableSmithyTrade = "trade" /// 赛季塔数据表 TableSeasonPagoda = "seasonpagoda" @@ -222,6 +222,9 @@ const ( // pvp TablePvp = "pvp" + + // 铁匠铺铸造台 + TableStove = "stove" ) // RPC服务接口定义处 diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go index 2776c12f4..4ebe80892 100644 --- a/modules/smithy/api_forgeequip.go +++ b/modules/smithy/api_forgeequip.go @@ -24,7 +24,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 } - stove, err := this.module.modelSmithy.getSmithyStoveList(session.GetUserId()) + stove, err := this.module.modelStove.getSmithyStoveList(session.GetUserId()) if err != nil { code = pb.ErrorCode_DBError return diff --git a/modules/smithy/api_getstoveinfo.go b/modules/smithy/api_getstoveinfo.go index ee80cc7da..4af360c3c 100644 --- a/modules/smithy/api_getstoveinfo.go +++ b/modules/smithy/api_getstoveinfo.go @@ -20,7 +20,7 @@ func (this *apiComp) GetStoveInfo(session comm.IUserSession, req *pb.SmithyGetSt if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 } - _smithy, err := this.module.modelSmithy.getSmithyStoveList(session.GetUserId()) + _smithy, err := this.module.modelStove.getSmithyStoveList(session.GetUserId()) if err != nil { code = pb.ErrorCode_DBError return diff --git a/modules/smithy/api_orderequip.go b/modules/smithy/api_orderequip.go index 2077d094d..55c08b842 100644 --- a/modules/smithy/api_orderequip.go +++ b/modules/smithy/api_orderequip.go @@ -24,7 +24,7 @@ func (this *apiComp) OrderEquip(session comm.IUserSession, req *pb.SmithyOrderEq if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 } - stove, err := this.module.modelSmithy.getSmithyStoveList(session.GetUserId()) + stove, err := this.module.modelStove.getSmithyStoveList(session.GetUserId()) if err != nil { code = pb.ErrorCode_DBError return diff --git a/modules/smithy/api_rise.go b/modules/smithy/api_rise.go index 49a203fbe..f25f4bc66 100644 --- a/modules/smithy/api_rise.go +++ b/modules/smithy/api_rise.go @@ -23,7 +23,7 @@ func (this *apiComp) Rise(session comm.IUserSession, req *pb.SmithyRiseReq) (cod if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 } - stove, err := this.module.modelSmithy.getSmithyStoveList(session.GetUserId()) + stove, err := this.module.modelStove.getSmithyStoveList(session.GetUserId()) if err != nil { code = pb.ErrorCode_DBError return diff --git a/modules/smithy/api_stoveup.go b/modules/smithy/api_stoveup.go index 126464119..d20d150e3 100644 --- a/modules/smithy/api_stoveup.go +++ b/modules/smithy/api_stoveup.go @@ -8,18 +8,18 @@ import ( ) //参数校验 -func (this *apiComp) StrveUpCheck(session comm.IUserSession, req *pb.SmithyStoveUpReq) (code pb.ErrorCode) { +func (this *apiComp) StoveUpCheck(session comm.IUserSession, req *pb.SmithyStoveUpReq) (code pb.ErrorCode) { return } // 炉子升级 -func (this *apiComp) StrveUp(session comm.IUserSession, req *pb.SmithyStoveUpReq) (code pb.ErrorCode, data proto.Message) { - code = this.StrveUpCheck(session, req) +func (this *apiComp) StoveUp(session comm.IUserSession, req *pb.SmithyStoveUpReq) (code pb.ErrorCode, data proto.Message) { + code = this.StoveUpCheck(session, req) if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 } - stove, err := this.module.modelSmithy.getSmithyStoveList(session.GetUserId()) + stove, err := this.module.modelStove.getSmithyStoveList(session.GetUserId()) if err != nil { code = pb.ErrorCode_DBError return diff --git a/modules/smithy/api_toolsup.go b/modules/smithy/api_toolsup.go index 685abf26c..365db72e8 100644 --- a/modules/smithy/api_toolsup.go +++ b/modules/smithy/api_toolsup.go @@ -19,7 +19,7 @@ func (this *apiComp) ToolsUp(session comm.IUserSession, req *pb.SmithyToolsUpReq if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 } - stove, err := this.module.modelSmithy.getSmithyStoveList(session.GetUserId()) + stove, err := this.module.modelStove.getSmithyStoveList(session.GetUserId()) if err != nil { code = pb.ErrorCode_DBError return diff --git a/modules/smithy/model_smithy.go b/modules/smithy/model_smithy.go index bee6178c8..728863f21 100644 --- a/modules/smithy/model_smithy.go +++ b/modules/smithy/model_smithy.go @@ -186,33 +186,3 @@ func (this *modelSmithy) CalculationStoveSkillLv(uid string, Smithy *pb.DBSmithy mapData["orderCostTime"] = Smithy.OrderCostTime this.module.ModifySmithyData(uid, mapData) } - -// 获取铁匠铺信息 -func (this *modelSmithy) getSmithyStoveList(uid string) (result *pb.DBStove, err error) { - result = &pb.DBStove{} - if err = this.Get(uid, result); err != nil { - if redis.RedisNil != err { // 没有数据直接创建新的数据 - result.Id = primitive.NewObjectID().Hex() - result.Uid = uid - result.Data = make(map[int32]int32, 0) - result.Skill = make(map[int32]int32, 0) - result.Lv = 1 - result.Temperature = 20000 // 配置 - result.RecoveTime = 0 - - if err = this.Add(uid, result); err != nil { - this.module.Errorf("err:%v", err) - err = nil - return - } - } - return - } - err = nil - return result, err -} - -func (this *modelSmithy) updateSmithyStove(uid string, update map[string]interface{}) (err error) { - err = this.Change(uid, update) - return err -} diff --git a/modules/smithy/model_stove.go b/modules/smithy/model_stove.go new file mode 100644 index 000000000..5ecf93815 --- /dev/null +++ b/modules/smithy/model_stove.go @@ -0,0 +1,60 @@ +package smithy + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/redis" + "go_dreamfactory/modules" + "go_dreamfactory/pb" + + "go.mongodb.org/mongo-driver/bson/primitive" + "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/x/bsonx" +) + +type modelStove struct { + modules.MCompModel + module *Smithy +} + +func (this *modelStove) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + this.TableName = string(comm.TableStove) + err = this.MCompModel.Init(service, module, comp, options) + this.module = module.(*Smithy) + // uid 创建索引 + this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ + Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, + }) + return +} + +// 获取铁匠铺信息 +func (this *modelStove) getSmithyStoveList(uid string) (result *pb.DBStove, err error) { + result = &pb.DBStove{} + if err = this.Get(uid, result); err != nil { + if redis.RedisNil != err { // 没有数据直接创建新的数据 + result.Id = primitive.NewObjectID().Hex() + result.Uid = uid + result.Data = make(map[int32]int32, 0) + result.Skill = make(map[int32]int32, 0) + result.Forge = make(map[int32]int32, 0) + result.Lv = 1 + result.Temperature = 20000 // 配置 + result.RecoveTime = 0 + + if err = this.Add(uid, result); err != nil { + this.module.Errorf("err:%v", err) + err = nil + return + } + } + return + } + err = nil + return result, err +} + +func (this *modelStove) updateSmithyStove(uid string, update map[string]interface{}) (err error) { + err = this.Change(uid, update) + return err +} diff --git a/modules/smithy/module.go b/modules/smithy/module.go index 319c74782..a1b888948 100644 --- a/modules/smithy/module.go +++ b/modules/smithy/module.go @@ -18,6 +18,7 @@ type Smithy struct { modelTrade *modelTrade api *apiComp configure *configureComp + modelStove *modelStove } func NewModule() core.IModule { @@ -40,6 +41,7 @@ func (this *Smithy) OnInstallComp() { this.modelSmithy = this.RegisterComp(new(modelSmithy)).(*modelSmithy) this.configure = this.RegisterComp(new(configureComp)).(*configureComp) this.modelTrade = this.RegisterComp(new(modelTrade)).(*modelTrade) + this.modelStove = this.RegisterComp(new(modelStove)).(*modelStove) } // 接口信息 From f72724b0909b51899e1554672d7a268eddc5494a Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 16 Feb 2023 11:21:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=85=8D=E7=BD=AE+=20=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_battleready.json | 10 + bin/json/game_drawcard.json | 697 ++++++++----- bin/json/game_extservers.json | 10 + bin/json/game_global.json | 34 +- bin/json/game_model.json | 6 +- bin/json/game_msgdistrib.json | 6 - bin/json/game_newsmithy.json | 377 +++++++ bin/json/game_opencond.json | 236 +---- bin/json/game_privilege.json | 12 +- bin/json/game_smithyproficiency.json | 376 +++++++ bin/json/game_smithystovev1.json | 262 +++++ bin/json/game_smithytool.json | 962 ++++++++++++++++++ bin/json/game_teaching.json | 30 +- bin/json/game_trollgoods.json | 180 +++- bin/json/game_worldtask.json | 432 ++++++++ modules/smithy/model_stove.go | 2 +- pb/smithy_db.pb.go | 430 ++++---- sys/configure/structs/Game.NewSmithy.go | 42 + sys/configure/structs/Game.NewSmithyData.go | 39 + .../structs/Game.SmithyProficiency.go | 42 + .../structs/Game.SmithyProficiencyData.go | 51 + sys/configure/structs/Game.SmithyStoveV1.go | 42 + .../structs/Game.SmithyStoveV1Data.go | 56 + sys/configure/structs/Game.SmithyTool.go | 42 + sys/configure/structs/Game.SmithyToolData.go | 62 ++ sys/configure/structs/Game.TrollGoodsData.go | 8 +- sys/configure/structs/Game.WorldTaskData.go | 6 + sys/configure/structs/Tables.go | 28 + 28 files changed, 3702 insertions(+), 778 deletions(-) create mode 100644 bin/json/game_newsmithy.json create mode 100644 bin/json/game_smithyproficiency.json create mode 100644 bin/json/game_smithystovev1.json create mode 100644 bin/json/game_smithytool.json create mode 100644 sys/configure/structs/Game.NewSmithy.go create mode 100644 sys/configure/structs/Game.NewSmithyData.go create mode 100644 sys/configure/structs/Game.SmithyProficiency.go create mode 100644 sys/configure/structs/Game.SmithyProficiencyData.go create mode 100644 sys/configure/structs/Game.SmithyStoveV1.go create mode 100644 sys/configure/structs/Game.SmithyStoveV1Data.go create mode 100644 sys/configure/structs/Game.SmithyTool.go create mode 100644 sys/configure/structs/Game.SmithyToolData.go diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index ad4babbd0..442a33030 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -108,5 +108,15 @@ "LockSlots": [], "AssistTeam": 0, "CanFriendHelp": 0 + }, + { + "id": 111, + "PlayType": "pvp", + "HeroCount": 5, + "DefaultHero": 0, + "DisableHero": [], + "LockSlots": [], + "AssistTeam": 0, + "CanFriendHelp": 0 } ] \ No newline at end of file diff --git a/bin/json/game_drawcard.json b/bin/json/game_drawcard.json index c0a5bec5b..04c7ab53c 100644 --- a/bin/json/game_drawcard.json +++ b/bin/json/game_drawcard.json @@ -5,7 +5,7 @@ "card_pool_type": "base_pool1", "star": 3, "race": 1, - "id": "24002", + "id": "24004", "weight": 1000 }, { @@ -14,7 +14,7 @@ "card_pool_type": "base_pool1", "star": 4, "race": 1, - "id": "24002", + "id": "24004", "weight": 1000 }, { @@ -23,20 +23,155 @@ "card_pool_type": "base_pool1", "star": 5, "race": 1, - "id": "24002", + "id": "24004", "weight": 1000 }, { "key": 4, "recruitment_type": 1, "card_pool_type": "base_pool2", + "star": 3, + "race": 1, + "id": "25001", + "weight": 1000 + }, + { + "key": 5, + "recruitment_type": 1, + "card_pool_type": "base_pool2", + "star": 4, + "race": 1, + "id": "25001", + "weight": 1000 + }, + { + "key": 6, + "recruitment_type": 1, + "card_pool_type": "base_pool2", + "star": 5, + "race": 1, + "id": "25001", + "weight": 1000 + }, + { + "key": 7, + "recruitment_type": 1, + "card_pool_type": "base_pool3", + "star": 3, + "race": 1, + "id": "25004", + "weight": 1000 + }, + { + "key": 8, + "recruitment_type": 1, + "card_pool_type": "base_pool3", + "star": 4, + "race": 1, + "id": "25004", + "weight": 1000 + }, + { + "key": 9, + "recruitment_type": 1, + "card_pool_type": "base_pool3", + "star": 5, + "race": 1, + "id": "25004", + "weight": 1000 + }, + { + "key": 10, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 3, + "race": 1, + "id": "24008", + "weight": 1000 + }, + { + "key": 11, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 4, + "race": 1, + "id": "24008", + "weight": 1000 + }, + { + "key": 12, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 5, + "race": 1, + "id": "24008", + "weight": 1000 + }, + { + "key": 13, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 3, + "race": 1, + "id": "24003", + "weight": 1000 + }, + { + "key": 14, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 4, + "race": 1, + "id": "24003", + "weight": 1000 + }, + { + "key": 15, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 5, + "race": 1, + "id": "24003", + "weight": 1000 + }, + { + "key": 16, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 3, + "race": 1, + "id": "44002", + "weight": 1000 + }, + { + "key": 17, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 4, + "race": 1, + "id": "44002", + "weight": 1000 + }, + { + "key": 18, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 5, + "race": 1, + "id": "44002", + "weight": 1000 + }, + { + "key": 19, + "recruitment_type": 1, + "card_pool_type": "base_pool2", "star": 4, "race": 3, "id": "34006", "weight": 1000 }, { - "key": 5, + "key": 20, "recruitment_type": 1, "card_pool_type": "base_pool2", "star": 5, @@ -44,145 +179,10 @@ "id": "45003", "weight": 1000 }, - { - "key": 6, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 4, - "race": 4, - "id": "44005", - "weight": 1000 - }, - { - "key": 7, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 4, - "race": 1, - "id": "14003", - "weight": 1000 - }, - { - "key": 8, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 5, - "race": 1, - "id": "15005", - "weight": 1000 - }, - { - "key": 9, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 4, - "race": 2, - "id": "24003", - "weight": 1000 - }, - { - "key": 10, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 4, - "race": 2, - "id": "24008", - "weight": 1000 - }, - { - "key": 11, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 5, - "race": 2, - "id": "25001", - "weight": 1000 - }, - { - "key": 12, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 5, - "race": 2, - "id": "25004", - "weight": 1000 - }, - { - "key": 13, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 5, - "race": 3, - "id": "35006", - "weight": 1000 - }, - { - "key": 14, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 4, - "race": 4, - "id": "44002", - "weight": 1000 - }, - { - "key": 15, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 3, - "race": 2, - "id": "24002", - "weight": 1000 - }, - { - "key": 16, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 4, - "race": 2, - "id": "24004", - "weight": 1000 - }, - { - "key": 17, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 5, - "race": 2, - "id": "35001", - "weight": 1000 - }, - { - "key": 18, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 3, - "race": 1, - "id": "13003", - "weight": 1000 - }, - { - "key": 19, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 4, - "race": 4, - "id": "44006", - "weight": 1000 - }, - { - "key": 20, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 5, - "race": 2, - "id": "35001", - "weight": 1000 - }, { "key": 21, "recruitment_type": 1, - "card_pool_type": "base_pool6", + "card_pool_type": "base_pool2", "star": 4, "race": 4, "id": "44005", @@ -191,106 +191,106 @@ { "key": 22, "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 5, - "race": 1, - "id": "15004", - "weight": 1000 - }, - { - "key": 23, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 3, - "race": 2, - "id": "24002", - "weight": 1000 - }, - { - "key": 24, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 4, - "race": 4, - "id": "45003", - "weight": 1000 - }, - { - "key": 25, - "recruitment_type": 1, - "card_pool_type": "base_pool6", + "card_pool_type": "base_pool2", "star": 4, "race": 1, "id": "14003", "weight": 1000 }, { - "key": 26, + "key": 23, "recruitment_type": 1, - "card_pool_type": "base_pool6", + "card_pool_type": "base_pool2", "star": 5, "race": 1, "id": "15005", "weight": 1000 }, { - "key": 27, + "key": 24, "recruitment_type": 1, - "card_pool_type": "base_pool6", + "card_pool_type": "base_pool2", "star": 4, "race": 2, "id": "24003", "weight": 1000 }, { - "key": 28, + "key": 25, "recruitment_type": 1, - "card_pool_type": "base_pool6", + "card_pool_type": "base_pool2", "star": 4, "race": 2, - "id": "24004", + "id": "24008", "weight": 1000 }, { - "key": 29, + "key": 26, "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 5, - "race": 2, - "id": "25004", - "weight": 1000 - }, - { - "key": 30, - "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 4, - "race": 3, - "id": "34006", - "weight": 1000 - }, - { - "key": 31, - "recruitment_type": 1, - "card_pool_type": "base_pool6", + "card_pool_type": "base_pool2", "star": 5, "race": 2, "id": "25001", "weight": 1000 }, + { + "key": 27, + "recruitment_type": 1, + "card_pool_type": "base_pool2", + "star": 5, + "race": 2, + "id": "25004", + "weight": 1000 + }, + { + "key": 28, + "recruitment_type": 1, + "card_pool_type": "base_pool2", + "star": 5, + "race": 3, + "id": "35006", + "weight": 1000 + }, + { + "key": 29, + "recruitment_type": 1, + "card_pool_type": "base_pool2", + "star": 4, + "race": 4, + "id": "44002", + "weight": 1000 + }, + { + "key": 30, + "recruitment_type": 1, + "card_pool_type": "base_pool2", + "star": 3, + "race": 2, + "id": "24002", + "weight": 1000 + }, + { + "key": 31, + "recruitment_type": 1, + "card_pool_type": "base_pool2", + "star": 4, + "race": 2, + "id": "24004", + "weight": 1000 + }, { "key": 32, "recruitment_type": 1, - "card_pool_type": "base_pool6", - "star": 4, - "race": 1, - "id": "14007", + "card_pool_type": "base_pool2", + "star": 5, + "race": 2, + "id": "35001", "weight": 1000 }, { "key": 33, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 3, "race": 1, "id": "13003", @@ -299,7 +299,7 @@ { "key": 34, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 4, "race": 4, "id": "44006", @@ -308,7 +308,7 @@ { "key": 35, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 5, "race": 2, "id": "35001", @@ -317,7 +317,7 @@ { "key": 36, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 4, "race": 4, "id": "44005", @@ -326,7 +326,7 @@ { "key": 37, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 5, "race": 1, "id": "15004", @@ -335,7 +335,7 @@ { "key": 38, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 3, "race": 2, "id": "24002", @@ -344,7 +344,7 @@ { "key": 39, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 4, "race": 4, "id": "45003", @@ -353,7 +353,7 @@ { "key": 40, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 4, "race": 1, "id": "14003", @@ -362,7 +362,7 @@ { "key": 41, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 5, "race": 1, "id": "15005", @@ -371,7 +371,7 @@ { "key": 42, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 4, "race": 2, "id": "24003", @@ -380,7 +380,7 @@ { "key": 43, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 4, "race": 2, "id": "24004", @@ -389,7 +389,7 @@ { "key": 44, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 5, "race": 2, "id": "25004", @@ -398,7 +398,7 @@ { "key": 45, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 4, "race": 3, "id": "34006", @@ -407,7 +407,7 @@ { "key": 46, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 5, "race": 2, "id": "25001", @@ -416,7 +416,7 @@ { "key": 47, "recruitment_type": 1, - "card_pool_type": "base_pool7", + "card_pool_type": "base_pool6", "star": 4, "race": 1, "id": "14007", @@ -424,6 +424,141 @@ }, { "key": 48, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, + "race": 1, + "id": "13003", + "weight": 1000 + }, + { + "key": 49, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "race": 4, + "id": "44006", + "weight": 1000 + }, + { + "key": 50, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 5, + "race": 2, + "id": "35001", + "weight": 1000 + }, + { + "key": 51, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "race": 4, + "id": "44005", + "weight": 1000 + }, + { + "key": 52, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 5, + "race": 1, + "id": "15004", + "weight": 1000 + }, + { + "key": 53, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, + "race": 2, + "id": "24002", + "weight": 1000 + }, + { + "key": 54, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "race": 4, + "id": "45003", + "weight": 1000 + }, + { + "key": 55, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "race": 1, + "id": "14003", + "weight": 1000 + }, + { + "key": 56, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 5, + "race": 1, + "id": "15005", + "weight": 1000 + }, + { + "key": 57, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "race": 2, + "id": "24003", + "weight": 1000 + }, + { + "key": 58, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "race": 2, + "id": "24004", + "weight": 1000 + }, + { + "key": 59, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 5, + "race": 2, + "id": "25004", + "weight": 1000 + }, + { + "key": 60, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "race": 3, + "id": "34006", + "weight": 1000 + }, + { + "key": 61, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 5, + "race": 2, + "id": "25001", + "weight": 1000 + }, + { + "key": 62, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "race": 1, + "id": "14007", + "weight": 1000 + }, + { + "key": 63, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -432,7 +567,7 @@ "weight": 1000 }, { - "key": 49, + "key": 64, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -441,7 +576,7 @@ "weight": 1000 }, { - "key": 50, + "key": 65, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -450,7 +585,7 @@ "weight": 1000 }, { - "key": 51, + "key": 66, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -459,7 +594,7 @@ "weight": 1000 }, { - "key": 52, + "key": 67, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -468,7 +603,7 @@ "weight": 1000 }, { - "key": 53, + "key": 68, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -477,7 +612,7 @@ "weight": 1000 }, { - "key": 54, + "key": 69, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -486,7 +621,7 @@ "weight": 1000 }, { - "key": 55, + "key": 70, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -495,7 +630,7 @@ "weight": 1000 }, { - "key": 56, + "key": 71, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -504,7 +639,7 @@ "weight": 1000 }, { - "key": 57, + "key": 72, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -513,7 +648,7 @@ "weight": 1000 }, { - "key": 58, + "key": 73, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -522,7 +657,7 @@ "weight": 1000 }, { - "key": 59, + "key": 74, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -531,7 +666,7 @@ "weight": 1000 }, { - "key": 60, + "key": 75, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 5, @@ -540,7 +675,7 @@ "weight": 1000 }, { - "key": 61, + "key": 76, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 5, @@ -549,7 +684,7 @@ "weight": 1000 }, { - "key": 62, + "key": 77, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 5, @@ -558,7 +693,7 @@ "weight": 1000 }, { - "key": 63, + "key": 78, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 5, @@ -567,7 +702,7 @@ "weight": 1000 }, { - "key": 64, + "key": 79, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 3, @@ -576,7 +711,7 @@ "weight": 1000 }, { - "key": 65, + "key": 80, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 3, @@ -585,7 +720,7 @@ "weight": 1000 }, { - "key": 66, + "key": 81, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 3, @@ -594,7 +729,7 @@ "weight": 1000 }, { - "key": 67, + "key": 82, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 3, @@ -603,7 +738,7 @@ "weight": 1000 }, { - "key": 68, + "key": 83, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -612,7 +747,7 @@ "weight": 1000 }, { - "key": 69, + "key": 84, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 3, @@ -621,7 +756,7 @@ "weight": 1000 }, { - "key": 70, + "key": 85, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -630,7 +765,7 @@ "weight": 1000 }, { - "key": 71, + "key": 86, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -639,7 +774,7 @@ "weight": 1000 }, { - "key": 72, + "key": 87, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -648,7 +783,7 @@ "weight": 1000 }, { - "key": 73, + "key": 88, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -657,7 +792,7 @@ "weight": 1000 }, { - "key": 74, + "key": 89, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -666,7 +801,7 @@ "weight": 1000 }, { - "key": 75, + "key": 90, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -675,7 +810,7 @@ "weight": 1000 }, { - "key": 76, + "key": 91, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -684,7 +819,7 @@ "weight": 1000 }, { - "key": 77, + "key": 92, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 5, @@ -693,7 +828,7 @@ "weight": 1000 }, { - "key": 78, + "key": 93, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 5, @@ -702,7 +837,7 @@ "weight": 1000 }, { - "key": 79, + "key": 94, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 5, @@ -711,7 +846,7 @@ "weight": 1000 }, { - "key": 80, + "key": 95, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 5, @@ -720,7 +855,7 @@ "weight": 1000 }, { - "key": 81, + "key": 96, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -729,7 +864,7 @@ "weight": 1000 }, { - "key": 82, + "key": 97, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -738,7 +873,7 @@ "weight": 1000 }, { - "key": 83, + "key": 98, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -747,7 +882,7 @@ "weight": 1000 }, { - "key": 84, + "key": 99, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -756,7 +891,7 @@ "weight": 1000 }, { - "key": 85, + "key": 100, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -765,7 +900,7 @@ "weight": 1000 }, { - "key": 86, + "key": 101, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -774,7 +909,7 @@ "weight": 1000 }, { - "key": 87, + "key": 102, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -783,7 +918,7 @@ "weight": 1000 }, { - "key": 88, + "key": 103, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -792,7 +927,7 @@ "weight": 1000 }, { - "key": 89, + "key": 104, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -801,7 +936,7 @@ "weight": 1000 }, { - "key": 90, + "key": 105, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -810,7 +945,7 @@ "weight": 1000 }, { - "key": 91, + "key": 106, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -819,7 +954,7 @@ "weight": 1000 }, { - "key": 92, + "key": 107, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -828,7 +963,7 @@ "weight": 1000 }, { - "key": 93, + "key": 108, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -837,7 +972,7 @@ "weight": 1000 }, { - "key": 94, + "key": 109, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -846,7 +981,7 @@ "weight": 1000 }, { - "key": 95, + "key": 110, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -855,7 +990,7 @@ "weight": 1000 }, { - "key": 96, + "key": 111, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -864,7 +999,7 @@ "weight": 1000 }, { - "key": 97, + "key": 112, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -873,7 +1008,7 @@ "weight": 1000 }, { - "key": 98, + "key": 113, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -882,7 +1017,7 @@ "weight": 1000 }, { - "key": 99, + "key": 114, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -891,7 +1026,7 @@ "weight": 1000 }, { - "key": 100, + "key": 115, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -900,7 +1035,7 @@ "weight": 1000 }, { - "key": 101, + "key": 116, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -909,7 +1044,7 @@ "weight": 1000 }, { - "key": 102, + "key": 117, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -918,7 +1053,7 @@ "weight": 1000 }, { - "key": 103, + "key": 118, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -927,7 +1062,7 @@ "weight": 1000 }, { - "key": 104, + "key": 119, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -936,7 +1071,7 @@ "weight": 1000 }, { - "key": 105, + "key": 120, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -945,7 +1080,7 @@ "weight": 1000 }, { - "key": 106, + "key": 121, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -954,7 +1089,7 @@ "weight": 1000 }, { - "key": 107, + "key": 122, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -963,7 +1098,7 @@ "weight": 1000 }, { - "key": 108, + "key": 123, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -972,7 +1107,7 @@ "weight": 1000 }, { - "key": 109, + "key": 124, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -981,7 +1116,7 @@ "weight": 1000 }, { - "key": 110, + "key": 125, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -990,7 +1125,7 @@ "weight": 1000 }, { - "key": 111, + "key": 126, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -999,7 +1134,7 @@ "weight": 1000 }, { - "key": 112, + "key": 127, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -1008,7 +1143,7 @@ "weight": 1000 }, { - "key": 113, + "key": 128, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -1017,7 +1152,7 @@ "weight": 1000 }, { - "key": 114, + "key": 129, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -1026,7 +1161,7 @@ "weight": 1000 }, { - "key": 115, + "key": 130, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, diff --git a/bin/json/game_extservers.json b/bin/json/game_extservers.json index 0a8093432..9bdd18a84 100644 --- a/bin/json/game_extservers.json +++ b/bin/json/game_extservers.json @@ -48,5 +48,15 @@ "ips": "10.0.0.85:7891", "debug": true, "sid": "dfmxf" + }, + { + "index": 6, + "name": { + "key": "debug_server_04", + "text": "hjl" + }, + "ips": "10.0.0.208:7891", + "debug": true, + "sid": "dfjl" } ] \ No newline at end of file diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 50af3dc5b..0e5c07f48 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -104,37 +104,37 @@ "camp3_pool1": "camp3_pool", "camp4_pool1": "camp4_pool", "base_pool1": { - "s": 0, - "e": 0, + "s": 1, + "e": 1, "p": "base_pool1" }, "base_pool2": { - "s": 1, - "e": 99999, + "s": 2, + "e": 2, "p": "base_pool2" }, "base_pool3": { - "s": 100000, - "e": 999999999, - "p": "base_pool6" + "s": 3, + "e": 3, + "p": "base_pool3" }, "base_pool4": { - "s": 99999999, - "e": 999999999, - "p": "base_pool7" + "s": 4, + "e": 4, + "p": "base_pool4" }, "base_pool5": { - "s": 99999999, - "e": 999999999, - "p": "base_pool7" + "s": 5, + "e": 5, + "p": "base_pool5" }, "base_pool6": { - "s": 99999999, - "e": 999999999, - "p": "base_pool7" + "s": 6, + "e": 6, + "p": "base_pool6" }, "base_pool7": { - "s": 99999999, + "s": 7, "e": 999999999, "p": "base_pool7" }, diff --git a/bin/json/game_model.json b/bin/json/game_model.json index bcfb1eb96..2f68152d9 100644 --- a/bin/json/game_model.json +++ b/bin/json/game_model.json @@ -2601,9 +2601,9 @@ }, { "id": "55006", - "preson": "11020", - "presonshow": "11020_exhibition", - "presonstory": "11020", + "preson": "11021", + "presonshow": "11021_exhibition", + "presonstory": "11021", "presondraw": "", "height": 1, "weight": 1, diff --git a/bin/json/game_msgdistrib.json b/bin/json/game_msgdistrib.json index 494ce155d..8f4a883ee 100644 --- a/bin/json/game_msgdistrib.json +++ b/bin/json/game_msgdistrib.json @@ -100,11 +100,5 @@ "open": true, "routrules": "~/worker", "describe": "附魔副本排行榜数据" - }, - { - "msgid": "pvp", - "open": true, - "routrules": "~/worker", - "describe": "同步竞技场" } ] \ No newline at end of file diff --git a/bin/json/game_newsmithy.json b/bin/json/game_newsmithy.json new file mode 100644 index 000000000..110cd12df --- /dev/null +++ b/bin/json/game_newsmithy.json @@ -0,0 +1,377 @@ +[ + { + "id": 1, + "item_id": 0, + "type": 1 + }, + { + "id": 2, + "item_id": 0, + "type": 1 + }, + { + "id": 3, + "item_id": 0, + "type": 1 + }, + { + "id": 4, + "item_id": 0, + "type": 1 + }, + { + "id": 5, + "item_id": 0, + "type": 1 + }, + { + "id": 6, + "item_id": 0, + "type": 1 + }, + { + "id": 7, + "item_id": 0, + "type": 1 + }, + { + "id": 8, + "item_id": 0, + "type": 1 + }, + { + "id": 9, + "item_id": 0, + "type": 1 + }, + { + "id": 10, + "item_id": 0, + "type": 1 + }, + { + "id": 11, + "item_id": 0, + "type": 1 + }, + { + "id": 12, + "item_id": 0, + "type": 1 + }, + { + "id": 13, + "item_id": 0, + "type": 1 + }, + { + "id": 14, + "item_id": 0, + "type": 1 + }, + { + "id": 15, + "item_id": 0, + "type": 1 + }, + { + "id": 16, + "item_id": 0, + "type": 1 + }, + { + "id": 17, + "item_id": 0, + "type": 1 + }, + { + "id": 18, + "item_id": 0, + "type": 1 + }, + { + "id": 19, + "item_id": 0, + "type": 1 + }, + { + "id": 20, + "item_id": 0, + "type": 1 + }, + { + "id": 21, + "item_id": 0, + "type": 1 + }, + { + "id": 22, + "item_id": 0, + "type": 1 + }, + { + "id": 23, + "item_id": 0, + "type": 1 + }, + { + "id": 24, + "item_id": 0, + "type": 1 + }, + { + "id": 25, + "item_id": 0, + "type": 1 + }, + { + "id": 26, + "item_id": 0, + "type": 2 + }, + { + "id": 27, + "item_id": 0, + "type": 2 + }, + { + "id": 28, + "item_id": 0, + "type": 2 + }, + { + "id": 29, + "item_id": 0, + "type": 2 + }, + { + "id": 30, + "item_id": 0, + "type": 2 + }, + { + "id": 31, + "item_id": 0, + "type": 2 + }, + { + "id": 32, + "item_id": 0, + "type": 2 + }, + { + "id": 33, + "item_id": 0, + "type": 2 + }, + { + "id": 34, + "item_id": 0, + "type": 2 + }, + { + "id": 35, + "item_id": 0, + "type": 2 + }, + { + "id": 36, + "item_id": 0, + "type": 2 + }, + { + "id": 37, + "item_id": 0, + "type": 2 + }, + { + "id": 38, + "item_id": 0, + "type": 2 + }, + { + "id": 39, + "item_id": 0, + "type": 2 + }, + { + "id": 40, + "item_id": 0, + "type": 2 + }, + { + "id": 41, + "item_id": 0, + "type": 2 + }, + { + "id": 42, + "item_id": 0, + "type": 2 + }, + { + "id": 43, + "item_id": 0, + "type": 2 + }, + { + "id": 44, + "item_id": 0, + "type": 2 + }, + { + "id": 45, + "item_id": 0, + "type": 2 + }, + { + "id": 46, + "item_id": 0, + "type": 2 + }, + { + "id": 47, + "item_id": 0, + "type": 2 + }, + { + "id": 48, + "item_id": 0, + "type": 2 + }, + { + "id": 49, + "item_id": 0, + "type": 2 + }, + { + "id": 50, + "item_id": 0, + "type": 2 + }, + { + "id": 51, + "item_id": 0, + "type": 3 + }, + { + "id": 52, + "item_id": 0, + "type": 3 + }, + { + "id": 53, + "item_id": 0, + "type": 3 + }, + { + "id": 54, + "item_id": 0, + "type": 3 + }, + { + "id": 55, + "item_id": 0, + "type": 3 + }, + { + "id": 56, + "item_id": 0, + "type": 3 + }, + { + "id": 57, + "item_id": 0, + "type": 3 + }, + { + "id": 58, + "item_id": 0, + "type": 3 + }, + { + "id": 59, + "item_id": 0, + "type": 3 + }, + { + "id": 60, + "item_id": 0, + "type": 3 + }, + { + "id": 61, + "item_id": 0, + "type": 3 + }, + { + "id": 62, + "item_id": 0, + "type": 3 + }, + { + "id": 63, + "item_id": 0, + "type": 3 + }, + { + "id": 64, + "item_id": 0, + "type": 3 + }, + { + "id": 65, + "item_id": 0, + "type": 3 + }, + { + "id": 66, + "item_id": 0, + "type": 3 + }, + { + "id": 67, + "item_id": 0, + "type": 3 + }, + { + "id": 68, + "item_id": 0, + "type": 3 + }, + { + "id": 69, + "item_id": 0, + "type": 3 + }, + { + "id": 70, + "item_id": 0, + "type": 3 + }, + { + "id": 71, + "item_id": 0, + "type": 3 + }, + { + "id": 72, + "item_id": 0, + "type": 3 + }, + { + "id": 73, + "item_id": 0, + "type": 3 + }, + { + "id": 74, + "item_id": 0, + "type": 3 + }, + { + "id": 75, + "item_id": 0, + "type": 3 + } +] \ No newline at end of file diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index ae1a108ca..ea76a9aff 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -9,10 +9,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -35,10 +31,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -61,10 +53,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -109,10 +97,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -135,10 +119,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -161,10 +141,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -187,10 +163,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -213,10 +185,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -239,10 +207,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -265,10 +229,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -291,10 +251,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -317,10 +273,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -343,10 +295,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -369,10 +317,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -395,10 +339,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -421,10 +361,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -447,10 +383,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -473,10 +405,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -499,10 +427,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -525,10 +449,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -551,10 +471,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -577,10 +493,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -603,10 +515,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -629,10 +537,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -655,10 +559,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -681,10 +581,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -707,10 +603,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -755,10 +647,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -781,10 +669,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -807,10 +691,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -833,10 +713,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -859,10 +735,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -885,10 +757,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -911,10 +779,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -937,10 +801,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -963,10 +823,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -989,10 +845,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1015,10 +867,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1041,10 +889,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1067,10 +911,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1093,10 +933,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1119,10 +955,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1145,10 +977,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1171,10 +999,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1197,10 +1021,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1289,10 +1109,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1315,10 +1131,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1341,10 +1153,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1367,10 +1175,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1393,10 +1197,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1419,10 +1219,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1445,10 +1241,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1471,10 +1263,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1497,10 +1285,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1523,10 +1307,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1549,10 +1329,6 @@ { "key": 1, "param": 1 - }, - { - "key": 2, - "param": 1100101 } ], "optional": "", @@ -1573,8 +1349,8 @@ }, "main": [ { - "key": 3, - "param": 20010 + "key": 1, + "param": 1 } ], "optional": "", @@ -1595,8 +1371,8 @@ }, "main": [ { - "key": 3, - "param": 20010 + "key": 1, + "param": 1 } ], "optional": "", @@ -1617,8 +1393,8 @@ }, "main": [ { - "key": 3, - "param": 20010 + "key": 1, + "param": 1 } ], "optional": "", diff --git a/bin/json/game_privilege.json b/bin/json/game_privilege.json index b26e55b3e..167133f88 100644 --- a/bin/json/game_privilege.json +++ b/bin/json/game_privilege.json @@ -4,7 +4,7 @@ "privilege_type": 1, "privilege_DescribeFront": { "key": "privilege_10101", - "text": "每日获得" + "text": "购买后获得" }, "privilege_DescribeAfter": { "key": "PrivilegeAfter_10101", @@ -43,7 +43,7 @@ "privilege_type": 1, "privilege_DescribeFront": { "key": "privilege_10201", - "text": "每日获得" + "text": "每日免费刷新商店" }, "privilege_DescribeAfter": { "key": "PrivilegeAfter_10201", @@ -56,11 +56,11 @@ "privilege_type": 2, "privilege_DescribeFront": { "key": "privilege_10202", - "text": "金币商店每日" + "text": "每日获得" }, "privilege_DescribeAfter": { "key": "PrivilegeAfter_10202", - "text": "免费刷新次数+1" + "text": "免费刷新次数+2" }, "privilege_parameter": 1 }, @@ -69,11 +69,11 @@ "privilege_type": 7, "privilege_DescribeFront": { "key": "privilege_10203", - "text": "巨怪商队" + "text": "每周获得" }, "privilege_DescribeAfter": { "key": "PrivilegeAfter_10203", - "text": "背包容量+1" + "text": "背包容量+2" }, "privilege_parameter": 1 }, diff --git a/bin/json/game_smithyproficiency.json b/bin/json/game_smithyproficiency.json new file mode 100644 index 000000000..8f26b84f8 --- /dev/null +++ b/bin/json/game_smithyproficiency.json @@ -0,0 +1,376 @@ +[ + { + "id": 1, + "proficiency": 20, + "reelId": 1, + "proficiency_lv": 1, + "title_text": { + "key": "1", + "text": "lv.{0}:熟练度{1}" + }, + "content_text": { + "key": "1", + "text": "炉温消耗-{0}%" + }, + "type": 1, + "value1": 100, + "value2": 0 + }, + { + "id": 2, + "proficiency": 40, + "reelId": 1, + "proficiency_lv": 2, + "title_text": { + "key": "1", + "text": "lv.{0}:熟练度{1}" + }, + "content_text": { + "key": "2", + "text": "材料消耗减少" + }, + "type": 2, + "value1": 10001, + "value2": -275 + }, + { + "id": 3, + "proficiency": 60, + "reelId": 1, + "proficiency_lv": 3, + "title_text": { + "key": "1", + "text": "lv.{0}:熟练度{1}" + }, + "content_text": { + "key": "3", + "text": "解锁图纸【紫金雷神锤】" + }, + "type": 3, + "value1": 2, + "value2": 0 + }, + { + "id": 4, + "proficiency": 80, + "reelId": 1, + "proficiency_lv": 4, + "title_text": { + "key": "1", + "text": "lv.{0}:熟练度{1}" + }, + "content_text": { + "key": "4", + "text": "解锁套装" + }, + "type": 4, + "value1": 5, + "value2": 0 + }, + { + "id": 5, + "proficiency": 100, + "reelId": 1, + "proficiency_lv": 5, + "title_text": { + "key": "1", + "text": "lv.{0}:熟练度{1}" + }, + "content_text": { + "key": "5", + "text": "{0}级装备售价提高{1}%" + }, + "type": 5, + "value1": 1, + "value2": 10 + }, + { + "id": 6, + "proficiency": 120, + "reelId": 0, + "proficiency_lv": 0, + "title_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "", + "text": "" + }, + "type": 1, + "value1": 0, + "value2": 0 + }, + { + "id": 7, + "proficiency": 140, + "reelId": 0, + "proficiency_lv": 0, + "title_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "", + "text": "" + }, + "type": 0, + "value1": 0, + "value2": 0 + }, + { + "id": 8, + "proficiency": 160, + "reelId": 0, + "proficiency_lv": 0, + "title_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "", + "text": "" + }, + "type": 0, + "value1": 0, + "value2": 0 + }, + { + "id": 9, + "proficiency": 180, + "reelId": 0, + "proficiency_lv": 0, + "title_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "", + "text": "" + }, + "type": 0, + "value1": 0, + "value2": 0 + }, + { + "id": 10, + "proficiency": 200, + "reelId": 0, + "proficiency_lv": 0, + "title_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "", + "text": "" + }, + "type": 0, + "value1": 0, + "value2": 0 + }, + { + "id": 11, + "proficiency": 220, + "reelId": 0, + "proficiency_lv": 0, + "title_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "", + "text": "" + }, + "type": 0, + "value1": 0, + "value2": 0 + }, + { + "id": 12, + "proficiency": 240, + "reelId": 0, + "proficiency_lv": 0, + "title_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "", + "text": "" + }, + "type": 0, + "value1": 0, + "value2": 0 + }, + { + "id": 13, + "proficiency": 260, + "reelId": 0, + "proficiency_lv": 0, + "title_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "", + "text": "" + }, + "type": 0, + "value1": 0, + "value2": 0 + }, + { + "id": 14, + "proficiency": 280, + "reelId": 0, + "proficiency_lv": 0, + "title_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "", + "text": "" + }, + "type": 0, + "value1": 0, + "value2": 0 + }, + { + "id": 15, + "proficiency": 300, + "reelId": 0, + "proficiency_lv": 0, + "title_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "", + "text": "" + }, + "type": 0, + "value1": 0, + "value2": 0 + }, + { + "id": 16, + "proficiency": 0, + "reelId": 0, + "proficiency_lv": 0, + "title_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "", + "text": "" + }, + "type": 0, + "value1": 0, + "value2": 0 + }, + { + "id": 17, + "proficiency": 0, + "reelId": 0, + "proficiency_lv": 0, + "title_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "", + "text": "" + }, + "type": 0, + "value1": 0, + "value2": 0 + }, + { + "id": 18, + "proficiency": 0, + "reelId": 0, + "proficiency_lv": 0, + "title_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "", + "text": "" + }, + "type": 0, + "value1": 0, + "value2": 0 + }, + { + "id": 19, + "proficiency": 0, + "reelId": 0, + "proficiency_lv": 0, + "title_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "", + "text": "" + }, + "type": 0, + "value1": 0, + "value2": 0 + }, + { + "id": 20, + "proficiency": 0, + "reelId": 0, + "proficiency_lv": 0, + "title_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "", + "text": "" + }, + "type": 0, + "value1": 0, + "value2": 0 + }, + { + "id": 21, + "proficiency": 0, + "reelId": 0, + "proficiency_lv": 0, + "title_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "", + "text": "" + }, + "type": 0, + "value1": 0, + "value2": 0 + }, + { + "id": 22, + "proficiency": 0, + "reelId": 0, + "proficiency_lv": 0, + "title_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "", + "text": "" + }, + "type": 0, + "value1": 0, + "value2": 0 + } +] \ No newline at end of file diff --git a/bin/json/game_smithystovev1.json b/bin/json/game_smithystovev1.json new file mode 100644 index 000000000..248b61975 --- /dev/null +++ b/bin/json/game_smithystovev1.json @@ -0,0 +1,262 @@ +[ + { + "star": 1, + "max_temperature": 2000, + "temperature_recovery": 60, + "up_material": [ + { + "a": "item", + "t": "10001", + "n": 1 + }, + { + "a": "item", + "t": "10001", + "n": 2 + }, + { + "a": "item", + "t": "10001", + "n": 3 + } + ], + "title_text": { + "key": "1", + "text": "冶炼炉lv.1" + } + }, + { + "star": 2, + "max_temperature": 2100, + "temperature_recovery": 63, + "up_material": [ + { + "a": "item", + "t": "10001", + "n": 1 + }, + { + "a": "item", + "t": "10001", + "n": 2 + }, + { + "a": "item", + "t": "10001", + "n": 3 + } + ], + "title_text": { + "key": "2", + "text": "冶炼炉lv.2" + } + }, + { + "star": 3, + "max_temperature": 2200, + "temperature_recovery": 66, + "up_material": [ + { + "a": "item", + "t": "10001", + "n": 1 + }, + { + "a": "item", + "t": "10001", + "n": 2 + }, + { + "a": "item", + "t": "10001", + "n": 3 + } + ], + "title_text": { + "key": "3", + "text": "冶炼炉lv.3" + } + }, + { + "star": 4, + "max_temperature": 2300, + "temperature_recovery": 69, + "up_material": [ + { + "a": "item", + "t": "10001", + "n": 1 + }, + { + "a": "item", + "t": "10001", + "n": 2 + }, + { + "a": "item", + "t": "10001", + "n": 3 + } + ], + "title_text": { + "key": "4", + "text": "冶炼炉lv.4" + } + }, + { + "star": 5, + "max_temperature": 2400, + "temperature_recovery": 72, + "up_material": [ + { + "a": "item", + "t": "10001", + "n": 1 + }, + { + "a": "item", + "t": "10001", + "n": 2 + }, + { + "a": "item", + "t": "10001", + "n": 3 + } + ], + "title_text": { + "key": "5", + "text": "冶炼炉lv.5" + } + }, + { + "star": 6, + "max_temperature": 2500, + "temperature_recovery": 75, + "up_material": [ + { + "a": "item", + "t": "10001", + "n": 1 + }, + { + "a": "item", + "t": "10001", + "n": 2 + }, + { + "a": "item", + "t": "10001", + "n": 3 + } + ], + "title_text": { + "key": "6", + "text": "冶炼炉lv.6" + } + }, + { + "star": 7, + "max_temperature": 2600, + "temperature_recovery": 78, + "up_material": [ + { + "a": "item", + "t": "10001", + "n": 1 + }, + { + "a": "item", + "t": "10001", + "n": 2 + }, + { + "a": "item", + "t": "10001", + "n": 3 + } + ], + "title_text": { + "key": "7", + "text": "冶炼炉lv.7" + } + }, + { + "star": 8, + "max_temperature": 2700, + "temperature_recovery": 81, + "up_material": [ + { + "a": "item", + "t": "10001", + "n": 1 + }, + { + "a": "item", + "t": "10001", + "n": 2 + }, + { + "a": "item", + "t": "10001", + "n": 3 + } + ], + "title_text": { + "key": "8", + "text": "冶炼炉lv.8" + } + }, + { + "star": 9, + "max_temperature": 2800, + "temperature_recovery": 84, + "up_material": [ + { + "a": "item", + "t": "10001", + "n": 1 + }, + { + "a": "item", + "t": "10001", + "n": 2 + }, + { + "a": "item", + "t": "10001", + "n": 3 + } + ], + "title_text": { + "key": "9", + "text": "冶炼炉lv.9" + } + }, + { + "star": 10, + "max_temperature": 3000, + "temperature_recovery": 90, + "up_material": [ + { + "a": "item", + "t": "10001", + "n": 1 + }, + { + "a": "item", + "t": "10001", + "n": 2 + }, + { + "a": "item", + "t": "10001", + "n": 3 + } + ], + "title_text": { + "key": "10", + "text": "冶炼炉lv.10" + } + } +] \ No newline at end of file diff --git a/bin/json/game_smithytool.json b/bin/json/game_smithytool.json new file mode 100644 index 000000000..4e2fd0e9d --- /dev/null +++ b/bin/json/game_smithytool.json @@ -0,0 +1,962 @@ +[ + { + "id": 1, + "skill_type": 1, + "skill_lv": 1, + "preconditions": 0, + "up_material": [ + { + "a": "item", + "t": "10001", + "n": 1 + }, + { + "a": "item", + "t": "10001", + "n": 2 + }, + { + "a": "item", + "t": "10001", + "n": 3 + } + ], + "name_text": { + "key": "1", + "text": "测量尺lv.{0}" + }, + "content_text": { + "key": "1", + "text": "史诗品质概率提升{0}%" + }, + "value": 5 + }, + { + "id": 2, + "skill_type": 1, + "skill_lv": 2, + "preconditions": 0, + "up_material": [ + { + "a": "item", + "t": "10001", + "n": 1 + }, + { + "a": "item", + "t": "10001", + "n": 2 + }, + { + "a": "item", + "t": "10001", + "n": 3 + } + ], + "name_text": { + "key": "2", + "text": "测量尺lv.{0}" + }, + "content_text": { + "key": "2", + "text": "史诗品质概率提升{0}%" + }, + "value": 10 + }, + { + "id": 3, + "skill_type": 1, + "skill_lv": 3, + "preconditions": 0, + "up_material": [ + { + "a": "item", + "t": "10001", + "n": 1 + }, + { + "a": "item", + "t": "10001", + "n": 2 + }, + { + "a": "item", + "t": "10001", + "n": 3 + } + ], + "name_text": { + "key": "3", + "text": "测量尺lv.{0}" + }, + "content_text": { + "key": "3", + "text": "史诗品质概率提升{0}%" + }, + "value": 15 + }, + { + "id": 4, + "skill_type": 1, + "skill_lv": 4, + "preconditions": 0, + "up_material": [ + { + "a": "item", + "t": "10001", + "n": 1 + }, + { + "a": "item", + "t": "10001", + "n": 2 + }, + { + "a": "item", + "t": "10001", + "n": 3 + } + ], + "name_text": { + "key": "4", + "text": "测量尺lv.{0}" + }, + "content_text": { + "key": "4", + "text": "史诗品质概率提升{0}%" + }, + "value": 20 + }, + { + "id": 5, + "skill_type": 1, + "skill_lv": 5, + "preconditions": 0, + "up_material": [ + { + "a": "item", + "t": "10001", + "n": 1 + }, + { + "a": "item", + "t": "10001", + "n": 2 + }, + { + "a": "item", + "t": "10001", + "n": 3 + } + ], + "name_text": { + "key": "5", + "text": "测量尺lv.{0}" + }, + "content_text": { + "key": "5", + "text": "史诗品质概率提升{0}%" + }, + "value": 25 + }, + { + "id": 6, + "skill_type": 1, + "skill_lv": 6, + "preconditions": 0, + "up_material": [ + { + "a": "item", + "t": "10001", + "n": 1 + }, + { + "a": "item", + "t": "10001", + "n": 2 + }, + { + "a": "item", + "t": "10001", + "n": 3 + } + ], + "name_text": { + "key": "6", + "text": "测量尺lv.{0}" + }, + "content_text": { + "key": "6", + "text": "史诗品质概率提升{0}%" + }, + "value": 30 + }, + { + "id": 7, + "skill_type": 1, + "skill_lv": 7, + "preconditions": 0, + "up_material": [ + { + "a": "item", + "t": "10001", + "n": 1 + }, + { + "a": "item", + "t": "10001", + "n": 2 + }, + { + "a": "item", + "t": "10001", + "n": 3 + } + ], + "name_text": { + "key": "7", + "text": "测量尺lv.{0}" + }, + "content_text": { + "key": "7", + "text": "史诗品质概率提升{0}%" + }, + "value": 35 + }, + { + "id": 8, + "skill_type": 1, + "skill_lv": 8, + "preconditions": 0, + "up_material": [ + { + "a": "item", + "t": "10001", + "n": 1 + }, + { + "a": "item", + "t": "10001", + "n": 2 + }, + { + "a": "item", + "t": "10001", + "n": 3 + } + ], + "name_text": { + "key": "8", + "text": "测量尺lv.{0}" + }, + "content_text": { + "key": "8", + "text": "史诗品质概率提升{0}%" + }, + "value": 40 + }, + { + "id": 9, + "skill_type": 1, + "skill_lv": 9, + "preconditions": 0, + "up_material": [ + { + "a": "item", + "t": "10001", + "n": 1 + }, + { + "a": "item", + "t": "10001", + "n": 2 + }, + { + "a": "item", + "t": "10001", + "n": 3 + } + ], + "name_text": { + "key": "9", + "text": "测量尺lv.{0}" + }, + "content_text": { + "key": "9", + "text": "史诗品质概率提升{0}%" + }, + "value": 45 + }, + { + "id": 10, + "skill_type": 1, + "skill_lv": 10, + "preconditions": 0, + "up_material": [ + { + "a": "item", + "t": "10001", + "n": 1 + }, + { + "a": "item", + "t": "10001", + "n": 2 + }, + { + "a": "item", + "t": "10001", + "n": 3 + } + ], + "name_text": { + "key": "10", + "text": "测量尺lv.{0}" + }, + "content_text": { + "key": "10", + "text": "史诗品质概率提升{0}%" + }, + "value": 50 + }, + { + "id": 11, + "skill_type": 2, + "skill_lv": 1, + "preconditions": 5, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "11", + "text": "所有装备售价提升{0}%" + }, + "value": 0 + }, + { + "id": 12, + "skill_type": 2, + "skill_lv": 2, + "preconditions": 15, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "12", + "text": "所有装备售价提升{0}%" + }, + "value": 0 + }, + { + "id": 13, + "skill_type": 2, + "skill_lv": 3, + "preconditions": 15, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "13", + "text": "所有装备售价提升{0}%" + }, + "value": 0 + }, + { + "id": 14, + "skill_type": 2, + "skill_lv": 4, + "preconditions": 15, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "14", + "text": "所有装备售价提升{0}%" + }, + "value": 0 + }, + { + "id": 15, + "skill_type": 2, + "skill_lv": 5, + "preconditions": 15, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "15", + "text": "所有装备售价提升{0}%" + }, + "value": 0 + }, + { + "id": 16, + "skill_type": 2, + "skill_lv": 6, + "preconditions": 15, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "16", + "text": "所有装备售价提升{0}%" + }, + "value": 0 + }, + { + "id": 17, + "skill_type": 2, + "skill_lv": 7, + "preconditions": 15, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "17", + "text": "所有装备售价提升{0}%" + }, + "value": 0 + }, + { + "id": 18, + "skill_type": 2, + "skill_lv": 8, + "preconditions": 15, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "18", + "text": "所有装备售价提升{0}%" + }, + "value": 0 + }, + { + "id": 19, + "skill_type": 2, + "skill_lv": 9, + "preconditions": 15, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "19", + "text": "所有装备售价提升{0}%" + }, + "value": 0 + }, + { + "id": 20, + "skill_type": 2, + "skill_lv": 10, + "preconditions": 15, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "20", + "text": "所有装备售价提升{0}%" + }, + "value": 0 + }, + { + "id": 21, + "skill_type": 3, + "skill_lv": 1, + "preconditions": 25, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "21", + "text": "所有图纸炉温消耗减少{0}%" + }, + "value": 0 + }, + { + "id": 22, + "skill_type": 3, + "skill_lv": 2, + "preconditions": 25, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "22", + "text": "所有图纸炉温消耗减少{0}%" + }, + "value": 0 + }, + { + "id": 23, + "skill_type": 3, + "skill_lv": 3, + "preconditions": 25, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "23", + "text": "所有图纸炉温消耗减少{0}%" + }, + "value": 0 + }, + { + "id": 24, + "skill_type": 3, + "skill_lv": 4, + "preconditions": 25, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "24", + "text": "所有图纸炉温消耗减少{0}%" + }, + "value": 0 + }, + { + "id": 25, + "skill_type": 3, + "skill_lv": 5, + "preconditions": 25, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "25", + "text": "所有图纸炉温消耗减少{0}%" + }, + "value": 0 + }, + { + "id": 26, + "skill_type": 3, + "skill_lv": 6, + "preconditions": 25, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "26", + "text": "所有图纸炉温消耗减少{0}%" + }, + "value": 0 + }, + { + "id": 27, + "skill_type": 3, + "skill_lv": 7, + "preconditions": 25, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "27", + "text": "所有图纸炉温消耗减少{0}%" + }, + "value": 0 + }, + { + "id": 28, + "skill_type": 3, + "skill_lv": 8, + "preconditions": 25, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "28", + "text": "所有图纸炉温消耗减少{0}%" + }, + "value": 0 + }, + { + "id": 29, + "skill_type": 3, + "skill_lv": 9, + "preconditions": 25, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "29", + "text": "所有图纸炉温消耗减少{0}%" + }, + "value": 0 + }, + { + "id": 30, + "skill_type": 3, + "skill_lv": 10, + "preconditions": 25, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "30", + "text": "所有图纸炉温消耗减少{0}%" + }, + "value": 0 + }, + { + "id": 31, + "skill_type": 4, + "skill_lv": 1, + "preconditions": 35, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "31", + "text": "每日顾客数量提升至{0}人" + }, + "value": 0 + }, + { + "id": 32, + "skill_type": 4, + "skill_lv": 2, + "preconditions": 35, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "32", + "text": "每日顾客数量提升至{0}人" + }, + "value": 0 + }, + { + "id": 33, + "skill_type": 4, + "skill_lv": 3, + "preconditions": 35, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "33", + "text": "每日顾客数量提升至{0}人" + }, + "value": 0 + }, + { + "id": 34, + "skill_type": 4, + "skill_lv": 4, + "preconditions": 35, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "34", + "text": "每日顾客数量提升至{0}人" + }, + "value": 0 + }, + { + "id": 35, + "skill_type": 4, + "skill_lv": 5, + "preconditions": 35, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "35", + "text": "每日顾客数量提升至{0}人" + }, + "value": 0 + }, + { + "id": 36, + "skill_type": 4, + "skill_lv": 6, + "preconditions": 35, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "36", + "text": "每日顾客数量提升至{0}人" + }, + "value": 0 + }, + { + "id": 37, + "skill_type": 4, + "skill_lv": 7, + "preconditions": 35, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "37", + "text": "每日顾客数量提升至{0}人" + }, + "value": 0 + }, + { + "id": 38, + "skill_type": 4, + "skill_lv": 8, + "preconditions": 35, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "38", + "text": "每日顾客数量提升至{0}人" + }, + "value": 0 + }, + { + "id": 39, + "skill_type": 4, + "skill_lv": 9, + "preconditions": 35, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "39", + "text": "每日顾客数量提升至{0}人" + }, + "value": 0 + }, + { + "id": 40, + "skill_type": 4, + "skill_lv": 10, + "preconditions": 35, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "40", + "text": "每日顾客数量提升至{0}人" + }, + "value": 0 + }, + { + "id": 41, + "skill_type": 5, + "skill_lv": 1, + "preconditions": 45, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "41", + "text": "顾客购买装备数量上限提高至{0}件" + }, + "value": 0 + }, + { + "id": 42, + "skill_type": 5, + "skill_lv": 2, + "preconditions": 45, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "42", + "text": "顾客购买装备数量上限提高至{0}件" + }, + "value": 0 + }, + { + "id": 43, + "skill_type": 5, + "skill_lv": 3, + "preconditions": 45, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "43", + "text": "顾客购买装备数量上限提高至{0}件" + }, + "value": 0 + }, + { + "id": 44, + "skill_type": 5, + "skill_lv": 4, + "preconditions": 45, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "44", + "text": "顾客购买装备数量上限提高至{0}件" + }, + "value": 0 + }, + { + "id": 45, + "skill_type": 5, + "skill_lv": 5, + "preconditions": 45, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "45", + "text": "顾客购买装备数量上限提高至{0}件" + }, + "value": 0 + }, + { + "id": 46, + "skill_type": 5, + "skill_lv": 6, + "preconditions": 45, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "46", + "text": "顾客购买装备数量上限提高至{0}件" + }, + "value": 0 + }, + { + "id": 47, + "skill_type": 5, + "skill_lv": 7, + "preconditions": 45, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "47", + "text": "顾客购买装备数量上限提高至{0}件" + }, + "value": 0 + }, + { + "id": 48, + "skill_type": 5, + "skill_lv": 8, + "preconditions": 45, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "48", + "text": "顾客购买装备数量上限提高至{0}件" + }, + "value": 0 + }, + { + "id": 49, + "skill_type": 5, + "skill_lv": 9, + "preconditions": 45, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "49", + "text": "顾客购买装备数量上限提高至{0}件" + }, + "value": 0 + }, + { + "id": 50, + "skill_type": 5, + "skill_lv": 10, + "preconditions": 45, + "up_material": [], + "name_text": { + "key": "", + "text": "" + }, + "content_text": { + "key": "50", + "text": "顾客购买装备数量上限提高至{0}件" + }, + "value": 0 + } +] \ No newline at end of file diff --git a/bin/json/game_teaching.json b/bin/json/game_teaching.json index 028808a46..41f3296d7 100644 --- a/bin/json/game_teaching.json +++ b/bin/json/game_teaching.json @@ -22,7 +22,7 @@ "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_10001", + "key": "mainline_desc_X", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -67,7 +67,7 @@ "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_10001", + "key": "mainline_desc_X", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -112,7 +112,7 @@ "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_10001", + "key": "mainline_desc_X", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -157,7 +157,7 @@ "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_10001", + "key": "mainline_desc_X", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -202,7 +202,7 @@ "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_10001", + "key": "mainline_desc_X", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -247,7 +247,7 @@ "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_10001", + "key": "mainline_desc_X", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -292,7 +292,7 @@ "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_10001", + "key": "mainline_desc_X", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -337,7 +337,7 @@ "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_10001", + "key": "mainline_desc_X", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -382,7 +382,7 @@ "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_10001", + "key": "mainline_desc_X", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -427,7 +427,7 @@ "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_10001", + "key": "mainline_desc_X", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -472,7 +472,7 @@ "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_10001", + "key": "mainline_desc_X", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -517,7 +517,7 @@ "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_10001", + "key": "mainline_desc_X", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -562,7 +562,7 @@ "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_10001", + "key": "mainline_desc_X", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -607,7 +607,7 @@ "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_10001", + "key": "mainline_desc_X", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -652,7 +652,7 @@ "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_10001", + "key": "mainline_desc_X", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ diff --git a/bin/json/game_trollgoods.json b/bin/json/game_trollgoods.json index 52114be33..6f54c5137 100644 --- a/bin/json/game_trollgoods.json +++ b/bin/json/game_trollgoods.json @@ -1,110 +1,218 @@ [ { "id": 1, - "goodsname": "物品1", + "goodsname": { + "key": "itemname_40002", + "text": "物品1" + }, "goodsfor": 1, - "goodsinfor": "物品1货品信息", + "goodsinfor": { + "key": "itemname_40002", + "text": "物品1货品信息" + }, "goodsicon": "clmsg_ll_01", "goodsprice": 2000, "star_money": 12000, - "uptext": "听说最近黑色峡谷的蘑菇供应不求，如果碰上，你或许可以囤积一些", - "suptext": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！", + "uptext": { + "key": "hearsay1", + "text": "听说最近黑色峡谷的蘑菇供应不求，如果碰上，你或许可以囤积一些" + }, + "suptext": { + "key": "suphearsay", + "text": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！" + }, "max": 40 }, { "id": 2, - "goodsname": "物品2", + "goodsname": { + "key": "itemname_40002", + "text": "物品2" + }, "goodsfor": 1, - "goodsinfor": "物品2货品信息", + "goodsinfor": { + "key": "itemname_40002", + "text": "物品2货品信息" + }, "goodsicon": "clmsg_ll_02", "goodsprice": 2000, "star_money": 13000, - "uptext": "嘿，你有听说过老人与海的故事吗，没听过也不打紧，一些贵族正在收购一批海鱼，价格都已经被炒上天了，留意这个发财的机会，兄弟。", - "suptext": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！", + "uptext": { + "key": "hearsay2", + "text": "嘿，你有听说过老人与海的故事吗，没听过也不打紧，一些贵族正在收购一批海鱼，价格都已经被炒上天了，留意这个发财的机会，兄弟。" + }, + "suptext": { + "key": "suphearsay", + "text": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！" + }, "max": 40 }, { "id": 3, - "goodsname": "物品3", + "goodsname": { + "key": "itemname_40002", + "text": "物品3" + }, "goodsfor": 1, - "goodsinfor": "物品3货品信息", + "goodsinfor": { + "key": "itemname_40002", + "text": "物品3货品信息" + }, "goodsicon": "clmsg_ll_03", "goodsprice": 2000, "star_money": 14000, - "uptext": "没人会拒绝寻香草的诱惑，尤其是商人，你说对吧。我有一个老主顾，他的孩子满月，现在正需要很多这个玩意，记得留心一下哦~", - "suptext": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！", + "uptext": { + "key": "hearsay3", + "text": "没人会拒绝寻香草的诱惑，尤其是商人，你说对吧。我有一个老主顾，他的孩子满月，现在正需要很多这个玩意，记得留心一下哦~" + }, + "suptext": { + "key": "suphearsay", + "text": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！" + }, "max": 40 }, { "id": 4, - "goodsname": "物品4", + "goodsname": { + "key": "itemname_40002", + "text": "物品4" + }, "goodsfor": 2, - "goodsinfor": "物品4货品信息", + "goodsinfor": { + "key": "itemname_40002", + "text": "物品4货品信息" + }, "goodsicon": "clmsg_ll_04", "goodsprice": 2000, "star_money": 11000, - "uptext": "好吧，你消息你运气来了，神龙大年久失修，正需要一批上好的木材，而你的下一个目的地......啧啧啧，有时候我真羡慕你的运气。", - "suptext": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！", + "uptext": { + "key": "hearsay4", + "text": "好吧，你消息你运气来了，神龙大年久失修，正需要一批上好的木材，而你的下一个目的地......啧啧啧，有时候我真羡慕你的运气。" + }, + "suptext": { + "key": "suphearsay", + "text": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！" + }, "max": 40 }, { "id": 5, - "goodsname": "物品5", + "goodsname": { + "key": "itemname_40002", + "text": "物品5" + }, "goodsfor": 2, - "goodsinfor": "物品5货品信息", + "goodsinfor": { + "key": "itemname_40002", + "text": "物品5货品信息" + }, "goodsicon": "clmsg_ll_05", "goodsprice": 2000, "star_money": 1000, - "uptext": "这次是我的私人消息，听说阿宝的某一个师兄越狱了，正在到处进行破坏，各地的村民都在收购铁器以备不时之需。我知道这很缺德，但咱们可是商人，赚谁的钱不是赚？", - "suptext": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！", + "uptext": { + "key": "hearsay5", + "text": "这次是我的私人消息，听说阿宝的某一个师兄越狱了，正在到处进行破坏，各地的村民都在收购铁器以备不时之需。我知道这很缺德，但咱们可是商人，赚谁的钱不是赚？" + }, + "suptext": { + "key": "suphearsay", + "text": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！" + }, "max": 30 }, { "id": 6, - "goodsname": "物品6", + "goodsname": { + "key": "itemname_40002", + "text": "物品6" + }, "goodsfor": 2, - "goodsinfor": "物品6货品信息", + "goodsinfor": { + "key": "itemname_40002", + "text": "物品6货品信息" + }, "goodsicon": "wp_icon_0003", "goodsprice": 2000, "star_money": 2000, - "uptext": "一根上号的雪茄，一杯威士忌，还有一把趁手的兵器，这或许就是男人最大的浪漫了。那帮维京人马上就要开始捕羊大赛了，你猜猜他们现在最需要什么？那可是场庆典，你懂得~", - "suptext": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！", + "uptext": { + "key": "hearsay6", + "text": "一根上号的雪茄，一杯威士忌，还有一把趁手的兵器，这或许就是男人最大的浪漫了。那帮维京人马上就要开始捕羊大赛了，你猜猜他们现在最需要什么？那可是场庆典，你懂得~" + }, + "suptext": { + "key": "suphearsay", + "text": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！" + }, "max": 30 }, { "id": 7, - "goodsname": "物品7", + "goodsname": { + "key": "itemname_40002", + "text": "物品7" + }, "goodsfor": 3, - "goodsinfor": "物品7货品信息", + "goodsinfor": { + "key": "itemname_40002", + "text": "物品7货品信息" + }, "goodsicon": "wp_icon_10002", "goodsprice": 2000, "star_money": 1000, - "uptext": "听说了吗，维京人的山谷总是会传来恐怖的怒吼，那嗓门，一听就知道肯定是一个大家伙，现在我认识的很多部落的族长都在收购武器，你知道该怎么做，不是吗？", - "suptext": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！", + "uptext": { + "key": "hearsay7", + "text": "听说了吗，维京人的山谷总是会传来恐怖的怒吼，那嗓门，一听就知道肯定是一个大家伙，现在我认识的很多部落的族长都在收购武器，你知道该怎么做，不是吗？" + }, + "suptext": { + "key": "suphearsay", + "text": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！" + }, "max": 30 }, { "id": 8, - "goodsname": "物品8", + "goodsname": { + "key": "itemname_40002", + "text": "物品8" + }, "goodsfor": 3, - "goodsinfor": "物品8货品信息", + "goodsinfor": { + "key": "itemname_40002", + "text": "物品8货品信息" + }, "goodsicon": "wp_icon_10012", "goodsprice": 2000, "star_money": 3000, - "uptext": "怪物史莱克你听说过吗，最近有消息他要带着他的公主一起来中轴城，并决定举办一场庆典，虽然我不知道他哪儿来的钱办庆典，但对于我们这种优良的商人来说，庆典就意味着可以赚大把的钱，你知道该准备什么了吗？", - "suptext": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！", + "uptext": { + "key": "hearsay8", + "text": "怪物史莱克你听说过吗，最近有消息他要带着他的公主一起来中轴城，并决定举办一场庆典，虽然我不知道他哪儿来的钱办庆典，但对于我们这种优良的商人来说，庆典就意味着可以赚大把的钱，你知道该准备什么了吗？" + }, + "suptext": { + "key": "suphearsay", + "text": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！" + }, "max": 30 }, { "id": 9, - "goodsname": "物品9", + "goodsname": { + "key": "itemname_40002", + "text": "物品9" + }, "goodsfor": 3, - "goodsinfor": "物品9货品信息", + "goodsinfor": { + "key": "itemname_40002", + "text": "物品9货品信息" + }, "goodsicon": "wp_icon_10014", "goodsprice": 2000, "star_money": 4000, - "uptext": "我很喜欢完游戏，因为我总能在里面不劳而获的得到诸多宝藏，你听说了吗，最近一个神秘的洞穴出现在丛林区，而当地的那些原始人，可是从中捞了不少宝贝，我们说不定可以从那些原始人手里捞上一笔，然后去中轴城高价卖出。", - "suptext": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！", + "uptext": { + "key": "hearsay9", + "text": "我很喜欢完游戏，因为我总能在里面不劳而获的得到诸多宝藏，你听说了吗，最近一个神秘的洞穴出现在丛林区，而当地的那些原始人，可是从中捞了不少宝贝，我们说不定可以从那些原始人手里捞上一笔，然后去中轴城高价卖出。" + }, + "suptext": { + "key": "suphearsay", + "text": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！" + }, "max": 30 } ] \ No newline at end of file diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 6b0951aa3..f41e766d2 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -7,6 +7,18 @@ "group": 101, "des": 3, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "旧时光" + }, + "task_name": { + "key": "story_80", + "text": "阿宝学功夫" + }, + "task_display": { + "key": "story_80", + "text": "新剧情" + }, "npc": [ "scenes_boundary_01", "旧时光1-指挥部杰克", @@ -29,6 +41,18 @@ "group": 101, "des": 3, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "旧时光" + }, + "task_name": { + "key": "story_80", + "text": "阿宝学功夫" + }, + "task_display": { + "key": "story_80", + "text": "新剧情" + }, "npc": [ "display_platform_04_02", "旧时光1-住所主角", @@ -51,6 +75,18 @@ "group": 101, "des": 3, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "旧时光" + }, + "task_name": { + "key": "story_80", + "text": "阿宝学功夫" + }, + "task_display": { + "key": "story_80", + "text": "新剧情" + }, "npc": [ "display_platform_04_02", "旧时光1-住所平先生", @@ -73,6 +109,18 @@ "group": 101, "des": 3, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "旧时光" + }, + "task_name": { + "key": "story_80", + "text": "阿宝学功夫" + }, + "task_display": { + "key": "story_80", + "text": "新剧情" + }, "npc": [ "display_platform_04_02", "旧时光1-住所平先生", @@ -95,6 +143,18 @@ "group": 101, "des": 3, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "旧时光" + }, + "task_name": { + "key": "story_80", + "text": "阿宝学功夫" + }, + "task_display": { + "key": "story_80", + "text": "新剧情" + }, "npc": [ "scenes_boundary_01_recordtask", "旧时光1-指挥部阿宝", @@ -117,6 +177,18 @@ "group": 101, "des": 3, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "旧时光" + }, + "task_name": { + "key": "story_80", + "text": "阿宝学功夫" + }, + "task_display": { + "key": "story_80", + "text": "新剧情" + }, "npc": [ "scenes_boundary_01_recordtask", "旧时光1-指挥部杰克", @@ -139,6 +211,18 @@ "group": 101, "des": 3, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "旧时光" + }, + "task_name": { + "key": "story_80", + "text": "阿宝学功夫" + }, + "task_display": { + "key": "story_80", + "text": "新剧情" + }, "npc": [ "dreamwork_jungle_playershow_01", "旧时光1-森林小道阿宝", @@ -161,6 +245,18 @@ "group": 101, "des": 3, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "旧时光" + }, + "task_name": { + "key": "story_80", + "text": "阿宝学功夫" + }, + "task_display": { + "key": "story_80", + "text": "新剧情" + }, "npc": [ "dreamwork_jungle_playershow_01", "旧时光1-森林小道 阿宝", @@ -183,6 +279,18 @@ "group": 101, "des": 3, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "旧时光" + }, + "task_name": { + "key": "story_80", + "text": "阿宝学功夫" + }, + "task_display": { + "key": "story_80", + "text": "新剧情" + }, "npc": [ "scenesfight_03_02", "旧时光1-竹林豺狼小怪", @@ -205,6 +313,18 @@ "group": 101, "des": 3, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "旧时光" + }, + "task_name": { + "key": "story_80", + "text": "阿宝学功夫" + }, + "task_display": { + "key": "story_80", + "text": "新剧情" + }, "npc": [ "scenesfight_03_02", "旧时光1-竹林阿宝", @@ -227,6 +347,18 @@ "group": 101, "des": 3, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "旧时光" + }, + "task_name": { + "key": "story_80", + "text": "阿宝学功夫" + }, + "task_display": { + "key": "story_80", + "text": "新剧情" + }, "npc": [ "scenes_boundary_01_recordtask", "旧时光1-指挥部杰克", @@ -249,6 +381,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_boundary_01_recordtask", "0新手引导-杰克-中轴城常驻待机", @@ -271,6 +415,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_boundary_01_recordtask", "0新手引导-杰克-中轴城常驻待机", @@ -293,6 +449,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_boundary_01_recordtask", "1.新手引导-花朵-中轴城", @@ -315,6 +483,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_boundary_01_recordtask", "1.新手引导-花朵-中轴城", @@ -337,6 +517,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_boundary_01_recordtask", "0新手引导-杰克-中轴城常驻待机", @@ -359,6 +551,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_boundary_01_recordtask", "3新手引导-波比-正常待机-中轴城", @@ -381,6 +585,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_boundary_01_recordtask", "2新手引导-邦尼兔-正常待机-中轴城", @@ -409,6 +625,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_boundary_01_recordtask", "新手引导-波比-右屏圣树1", @@ -431,6 +659,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_kongfupanda_01", "新手引导-波比-右屏圣树2", @@ -453,6 +693,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_kongfupanda_01", "新手引导-豺狼人-右屏圣树", @@ -481,6 +733,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_kongfupanda_01", "新手引导-豺狼人-右屏圣树", @@ -503,6 +767,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_kongfupanda_01", "新手引导-圣树下的黑洞", @@ -525,6 +801,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_kongfupanda_01", "新手引导-波比-犀牛守卫", @@ -547,6 +835,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_kongfupanda_01", "新手引导-波比-右屏圣树3", @@ -569,6 +869,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_kongfupanda_01", "新手引导-波比-右屏圣树3", @@ -591,6 +903,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_boundary_01_recordtask", "0新手引导-杰克-中轴城常驻待机", @@ -613,6 +937,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_boundary_01_recordtask", "0新手引导-杰克-中轴城常驻待机", @@ -635,6 +971,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_boundary_01_recordtask", "0新手引导-杰克-中轴城常驻待机", @@ -657,6 +1005,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_boundary_01_recordtask", "0新手引导-杰克-中轴城常驻待机", @@ -685,6 +1045,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_smithy_01", "暴夫纳特铁匠铺", @@ -707,6 +1079,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_smithy_01", "暴夫纳特铁匠铺", @@ -729,6 +1113,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_boundary_01_recordtask", "0新手引导-杰克-中轴城常驻待机", @@ -751,6 +1147,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_boundary_01_recordtask", "0新手引导-杰克-中轴城常驻待机", @@ -773,6 +1181,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_boundary_01_recordtask", "0新手引导-杰克-中轴城常驻待机", @@ -795,6 +1215,18 @@ "group": 2, "des": 2, "icon": "", + "task_Tname": { + "key": "story_80", + "text": "新手引导" + }, + "task_name": { + "key": "story_80", + "text": "新手引导" + }, + "task_display": { + "key": "story_80", + "text": "新手引导" + }, "npc": [ "scenes_boundary_01_recordtask", "0新手引导-杰克-中轴城常驻待机", diff --git a/modules/smithy/model_stove.go b/modules/smithy/model_stove.go index 5ecf93815..6697bb076 100644 --- a/modules/smithy/model_stove.go +++ b/modules/smithy/model_stove.go @@ -35,7 +35,7 @@ func (this *modelStove) getSmithyStoveList(uid string) (result *pb.DBStove, err if redis.RedisNil != err { // 没有数据直接创建新的数据 result.Id = primitive.NewObjectID().Hex() result.Uid = uid - result.Data = make(map[int32]int32, 0) + result.Data = make(map[int32]*pb.Mastery, 0) result.Skill = make(map[int32]int32, 0) result.Forge = make(map[int32]int32, 0) result.Lv = 1 diff --git a/pb/smithy_db.pb.go b/pb/smithy_db.pb.go index 7ae947142..8074c955c 100644 --- a/pb/smithy_db.pb.go +++ b/pb/smithy_db.pb.go @@ -20,26 +20,81 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +type Mastery struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Lv int32 `protobuf:"varint,1,opt,name=lv,proto3" json:"lv"` + Value int32 `protobuf:"varint,2,opt,name=value,proto3" json:"value"` +} + +func (x *Mastery) Reset() { + *x = Mastery{} + if protoimpl.UnsafeEnabled { + mi := &file_smithy_smithy_db_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Mastery) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Mastery) ProtoMessage() {} + +func (x *Mastery) ProtoReflect() protoreflect.Message { + mi := &file_smithy_smithy_db_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 Mastery.ProtoReflect.Descriptor instead. +func (*Mastery) Descriptor() ([]byte, []int) { + return file_smithy_smithy_db_proto_rawDescGZIP(), []int{0} +} + +func (x *Mastery) GetLv() int32 { + if x != nil { + return x.Lv + } + return 0 +} + +func (x *Mastery) GetValue() int32 { + if x != nil { + return x.Value + } + return 0 +} + // 炉子信息 type DBStove struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - 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 - Lv int32 `protobuf:"varint,3,opt,name=lv,proto3" json:"lv"` // 炉子等级 - Data map[int32]int32 `protobuf:"bytes,4,rep,name=data,proto3" json:"data" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 套装类型 value 熟练度 - Skill map[int32]int32 `protobuf:"bytes,5,rep,name=skill,proto3" json:"skill" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 台子技能 - Forge map[int32]int32 `protobuf:"bytes,6,rep,name=forge,proto3" json:"forge" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 套装类型 value 打造次数 - Temperature int32 `protobuf:"varint,7,opt,name=temperature,proto3" json:"temperature"` // 炉子温度 - RecoveTime int64 `protobuf:"varint,8,opt,name=recoveTime,proto3" json:"recoveTime"` // 恢复满时间 + 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 + Lv int32 `protobuf:"varint,3,opt,name=lv,proto3" json:"lv"` // 炉子等级 + Data map[int32]*Mastery `protobuf:"bytes,4,rep,name=data,proto3" json:"data" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // key 图纸ID value 熟练度 + Skill map[int32]int32 `protobuf:"bytes,5,rep,name=skill,proto3" json:"skill" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 台子技能 + Forge map[int32]int32 `protobuf:"bytes,6,rep,name=forge,proto3" json:"forge" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 套装类型 value 打造次数 + Temperature int32 `protobuf:"varint,7,opt,name=temperature,proto3" json:"temperature"` // 炉子温度 + RecoveTime int64 `protobuf:"varint,8,opt,name=recoveTime,proto3" json:"recoveTime"` // 恢复满时间 } func (x *DBStove) Reset() { *x = DBStove{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_db_proto_msgTypes[0] + mi := &file_smithy_smithy_db_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -52,7 +107,7 @@ func (x *DBStove) String() string { func (*DBStove) ProtoMessage() {} func (x *DBStove) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_db_proto_msgTypes[0] + mi := &file_smithy_smithy_db_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -65,7 +120,7 @@ func (x *DBStove) ProtoReflect() protoreflect.Message { // Deprecated: Use DBStove.ProtoReflect.Descriptor instead. func (*DBStove) Descriptor() ([]byte, []int) { - return file_smithy_smithy_db_proto_rawDescGZIP(), []int{0} + return file_smithy_smithy_db_proto_rawDescGZIP(), []int{1} } func (x *DBStove) GetId() string { @@ -89,7 +144,7 @@ func (x *DBStove) GetLv() int32 { return 0 } -func (x *DBStove) GetData() map[int32]int32 { +func (x *DBStove) GetData() map[int32]*Mastery { if x != nil { return x.Data } @@ -136,7 +191,7 @@ type DBBusiness struct { func (x *DBBusiness) Reset() { *x = DBBusiness{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_db_proto_msgTypes[1] + mi := &file_smithy_smithy_db_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -149,7 +204,7 @@ func (x *DBBusiness) String() string { func (*DBBusiness) ProtoMessage() {} func (x *DBBusiness) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_db_proto_msgTypes[1] + mi := &file_smithy_smithy_db_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -162,7 +217,7 @@ func (x *DBBusiness) ProtoReflect() protoreflect.Message { // Deprecated: Use DBBusiness.ProtoReflect.Descriptor instead. func (*DBBusiness) Descriptor() ([]byte, []int) { - return file_smithy_smithy_db_proto_rawDescGZIP(), []int{1} + return file_smithy_smithy_db_proto_rawDescGZIP(), []int{2} } func (x *DBBusiness) GetShop() map[int32]int32 { @@ -187,7 +242,7 @@ type DBBusinessData struct { func (x *DBBusinessData) Reset() { *x = DBBusinessData{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_db_proto_msgTypes[2] + mi := &file_smithy_smithy_db_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -200,7 +255,7 @@ func (x *DBBusinessData) String() string { func (*DBBusinessData) ProtoMessage() {} func (x *DBBusinessData) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_db_proto_msgTypes[2] + mi := &file_smithy_smithy_db_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -213,7 +268,7 @@ func (x *DBBusinessData) ProtoReflect() protoreflect.Message { // Deprecated: Use DBBusinessData.ProtoReflect.Descriptor instead. func (*DBBusinessData) Descriptor() ([]byte, []int) { - return file_smithy_smithy_db_proto_rawDescGZIP(), []int{2} + return file_smithy_smithy_db_proto_rawDescGZIP(), []int{3} } func (x *DBBusinessData) GetId() string { @@ -266,7 +321,7 @@ type DBTujian struct { func (x *DBTujian) Reset() { *x = DBTujian{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_db_proto_msgTypes[3] + mi := &file_smithy_smithy_db_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -279,7 +334,7 @@ func (x *DBTujian) String() string { func (*DBTujian) ProtoMessage() {} func (x *DBTujian) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_db_proto_msgTypes[3] + mi := &file_smithy_smithy_db_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -292,7 +347,7 @@ func (x *DBTujian) ProtoReflect() protoreflect.Message { // Deprecated: Use DBTujian.ProtoReflect.Descriptor instead. func (*DBTujian) Descriptor() ([]byte, []int) { - return file_smithy_smithy_db_proto_rawDescGZIP(), []int{3} + return file_smithy_smithy_db_proto_rawDescGZIP(), []int{4} } func (x *DBTujian) GetId() string { @@ -336,7 +391,7 @@ type ForgeData struct { func (x *ForgeData) Reset() { *x = ForgeData{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_db_proto_msgTypes[4] + mi := &file_smithy_smithy_db_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -349,7 +404,7 @@ func (x *ForgeData) String() string { func (*ForgeData) ProtoMessage() {} func (x *ForgeData) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_db_proto_msgTypes[4] + mi := &file_smithy_smithy_db_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -362,7 +417,7 @@ func (x *ForgeData) ProtoReflect() protoreflect.Message { // Deprecated: Use ForgeData.ProtoReflect.Descriptor instead. func (*ForgeData) Descriptor() ([]byte, []int) { - return file_smithy_smithy_db_proto_rawDescGZIP(), []int{4} + return file_smithy_smithy_db_proto_rawDescGZIP(), []int{5} } func (x *ForgeData) GetForgeCount() int32 { @@ -400,7 +455,7 @@ type Clang struct { func (x *Clang) Reset() { *x = Clang{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_db_proto_msgTypes[5] + mi := &file_smithy_smithy_db_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -413,7 +468,7 @@ func (x *Clang) String() string { func (*Clang) ProtoMessage() {} func (x *Clang) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_db_proto_msgTypes[5] + mi := &file_smithy_smithy_db_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -426,7 +481,7 @@ func (x *Clang) ProtoReflect() protoreflect.Message { // Deprecated: Use Clang.ProtoReflect.Descriptor instead. func (*Clang) Descriptor() ([]byte, []int) { - return file_smithy_smithy_db_proto_rawDescGZIP(), []int{5} + return file_smithy_smithy_db_proto_rawDescGZIP(), []int{6} } func (x *Clang) GetDeskType() int32 { @@ -463,7 +518,7 @@ type OrderClang struct { func (x *OrderClang) Reset() { *x = OrderClang{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_db_proto_msgTypes[6] + mi := &file_smithy_smithy_db_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -476,7 +531,7 @@ func (x *OrderClang) String() string { func (*OrderClang) ProtoMessage() {} func (x *OrderClang) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_db_proto_msgTypes[6] + mi := &file_smithy_smithy_db_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -489,7 +544,7 @@ func (x *OrderClang) ProtoReflect() protoreflect.Message { // Deprecated: Use OrderClang.ProtoReflect.Descriptor instead. func (*OrderClang) Descriptor() ([]byte, []int) { - return file_smithy_smithy_db_proto_rawDescGZIP(), []int{6} + return file_smithy_smithy_db_proto_rawDescGZIP(), []int{7} } func (x *OrderClang) GetDeskType() int32 { @@ -535,7 +590,7 @@ type DBSmithy struct { func (x *DBSmithy) Reset() { *x = DBSmithy{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_db_proto_msgTypes[7] + mi := &file_smithy_smithy_db_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -548,7 +603,7 @@ func (x *DBSmithy) String() string { func (*DBSmithy) ProtoMessage() {} func (x *DBSmithy) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_db_proto_msgTypes[7] + mi := &file_smithy_smithy_db_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -561,7 +616,7 @@ func (x *DBSmithy) ProtoReflect() protoreflect.Message { // Deprecated: Use DBSmithy.ProtoReflect.Descriptor instead. func (*DBSmithy) Descriptor() ([]byte, []int) { - return file_smithy_smithy_db_proto_rawDescGZIP(), []int{7} + return file_smithy_smithy_db_proto_rawDescGZIP(), []int{8} } func (x *DBSmithy) GetId() string { @@ -653,111 +708,114 @@ var File_smithy_smithy_db_proto protoreflect.FileDescriptor var file_smithy_smithy_db_proto_rawDesc = []byte{ 0x0a, 0x16, 0x73, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2f, 0x73, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa8, 0x03, 0x0a, 0x07, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, - 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, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, - 0x6c, 0x76, 0x12, 0x26, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x12, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x29, 0x0a, 0x05, 0x73, 0x6b, - 0x69, 0x6c, 0x6c, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x53, 0x74, - 0x6f, 0x76, 0x65, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, - 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x29, 0x0a, 0x05, 0x66, 0x6f, 0x72, 0x67, 0x65, 0x18, 0x06, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x2e, 0x46, - 0x6f, 0x72, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x67, 0x65, - 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, - 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, - 0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x54, 0x69, 0x6d, 0x65, - 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x54, 0x69, - 0x6d, 0x65, 0x1a, 0x37, 0x0a, 0x09, 0x44, 0x61, 0x74, 0x61, 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, 0x1a, 0x38, 0x0a, 0x0a, 0x53, - 0x6b, 0x69, 0x6c, 0x6c, 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, 0x1a, 0x38, 0x0a, 0x0a, 0x46, 0x6f, 0x72, 0x67, 0x65, 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, 0x22, - 0x70, 0x0a, 0x0a, 0x44, 0x42, 0x42, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x12, 0x29, 0x0a, - 0x04, 0x73, 0x68, 0x6f, 0x70, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, - 0x42, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x6f, 0x70, 0x1a, 0x37, 0x0a, 0x09, 0x53, 0x68, 0x6f, 0x70, - 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, 0x22, 0x8b, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x42, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, - 0x44, 0x61, 0x74, 0x61, 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, 0x1f, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x42, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, - 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x20, 0x0a, - 0x0b, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x0b, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x22, - 0xba, 0x01, 0x0a, 0x08, 0x44, 0x42, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 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, 0x2d, - 0x0a, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, - 0x2e, 0x44, 0x42, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x2e, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x12, 0x16, 0x0a, - 0x06, 0x73, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, - 0x6c, 0x69, 0x64, 0x65, 0x72, 0x1a, 0x45, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, + 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x2f, 0x0a, 0x07, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x79, 0x12, + 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, + 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xb2, 0x03, 0x0a, 0x07, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, + 0x65, 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, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x02, 0x6c, 0x76, 0x12, 0x26, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x2e, 0x44, 0x61, 0x74, 0x61, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x29, 0x0a, 0x05, 0x73, + 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x53, + 0x74, 0x6f, 0x76, 0x65, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x29, 0x0a, 0x05, 0x66, 0x6f, 0x72, 0x67, 0x65, 0x18, + 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x2e, + 0x46, 0x6f, 0x72, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x67, + 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, + 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, + 0x75, 0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x54, 0x69, 0x6d, + 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x54, + 0x69, 0x6d, 0x65, 0x1a, 0x41, 0x0a, 0x09, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, + 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x79, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, - 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x55, 0x0a, 0x09, - 0x46, 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1e, 0x0a, 0x0a, 0x66, 0x6f, 0x72, - 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x66, - 0x6f, 0x72, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, 0x61, - 0x6c, 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x71, 0x75, 0x61, 0x6c, - 0x69, 0x74, 0x79, 0x22, 0x4f, 0x0a, 0x05, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, - 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, - 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, - 0x0a, 0x05, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, - 0x54, 0x69, 0x6d, 0x65, 0x22, 0x5a, 0x0a, 0x0a, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, - 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, - 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, - 0x22, 0x82, 0x04, 0x0a, 0x08, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 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, - 0x1c, 0x0a, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, - 0x2e, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x23, 0x0a, - 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, - 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x06, 0x6f, 0x72, 0x64, 0x65, - 0x72, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, - 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x2a, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x06, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2e, - 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, - 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x12, 0x24, 0x0a, 0x0d, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, - 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x36, 0x0a, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, - 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x53, - 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, - 0x1e, 0x0a, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0b, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, - 0x1c, 0x0a, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x38, 0x0a, - 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 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, 0x1a, 0x3c, 0x0a, 0x0e, 0x44, 0x65, 0x73, 0x6b, 0x46, - 0x6c, 0x6f, 0x6f, 0x72, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 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, + 0x1a, 0x38, 0x0a, 0x0a, 0x46, 0x6f, 0x72, 0x67, 0x65, 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, 0x22, 0x70, 0x0a, 0x0a, 0x44, 0x42, + 0x42, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x12, 0x29, 0x0a, 0x04, 0x73, 0x68, 0x6f, 0x70, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, 0x42, 0x75, 0x73, 0x69, 0x6e, + 0x65, 0x73, 0x73, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, + 0x68, 0x6f, 0x70, 0x1a, 0x37, 0x0a, 0x09, 0x53, 0x68, 0x6f, 0x70, 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, 0x22, 0x8b, 0x01, 0x0a, + 0x0e, 0x44, 0x42, 0x42, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x44, 0x61, 0x74, 0x61, 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, 0x1f, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x0b, 0x2e, 0x44, 0x42, 0x42, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x52, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x66, 0x72, + 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x72, + 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x22, 0xba, 0x01, 0x0a, 0x08, 0x44, + 0x42, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 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, 0x2d, 0x0a, 0x06, 0x74, 0x75, 0x6a, + 0x69, 0x61, 0x6e, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, 0x54, 0x75, + 0x6a, 0x69, 0x61, 0x6e, 0x2e, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x52, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x6c, 0x69, 0x64, + 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x6c, 0x69, 0x64, 0x65, 0x72, + 0x1a, 0x45, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, + 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, + 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x0a, 0x2e, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x55, 0x0a, 0x09, 0x46, 0x6f, 0x72, 0x67, 0x65, + 0x44, 0x61, 0x74, 0x61, 0x12, 0x1e, 0x0a, 0x0a, 0x66, 0x6f, 0x72, 0x67, 0x65, 0x43, 0x6f, 0x75, + 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x66, 0x6f, 0x72, 0x67, 0x65, 0x43, + 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x02, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x22, 0x4f, + 0x0a, 0x05, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, + 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, + 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x54, 0x69, + 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x22, + 0x5a, 0x0a, 0x0a, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a, + 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, + 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, + 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x82, 0x04, 0x0a, 0x08, + 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 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, 0x1c, 0x0a, 0x05, 0x63, 0x6c, + 0x61, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x43, 0x6c, 0x61, 0x6e, + 0x67, 0x52, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x23, 0x0a, 0x06, 0x6f, 0x72, 0x64, 0x65, + 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, + 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x12, 0x21, 0x0a, + 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, + 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, + 0x12, 0x2a, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x14, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x18, 0x0a, 0x07, + 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, + 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x12, 0x24, 0x0a, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, + 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, + 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, + 0x6d, 0x65, 0x12, 0x36, 0x0a, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, + 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, + 0x2e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x74, + 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, + 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x6f, + 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x74, + 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, + 0x6c, 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, 0x1a, 0x3c, 0x0a, 0x0e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 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, + 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -772,43 +830,45 @@ func file_smithy_smithy_db_proto_rawDescGZIP() []byte { return file_smithy_smithy_db_proto_rawDescData } -var file_smithy_smithy_db_proto_msgTypes = make([]protoimpl.MessageInfo, 15) +var file_smithy_smithy_db_proto_msgTypes = make([]protoimpl.MessageInfo, 16) var file_smithy_smithy_db_proto_goTypes = []interface{}{ - (*DBStove)(nil), // 0: DBStove - (*DBBusiness)(nil), // 1: DBBusiness - (*DBBusinessData)(nil), // 2: DBBusinessData - (*DBTujian)(nil), // 3: DBTujian - (*ForgeData)(nil), // 4: ForgeData - (*Clang)(nil), // 5: Clang - (*OrderClang)(nil), // 6: OrderClang - (*DBSmithy)(nil), // 7: DBSmithy - nil, // 8: DBStove.DataEntry - nil, // 9: DBStove.SkillEntry - nil, // 10: DBStove.ForgeEntry - nil, // 11: DBBusiness.ShopEntry - nil, // 12: DBTujian.TujianEntry - nil, // 13: DBSmithy.SkillEntry - nil, // 14: DBSmithy.DeskFloorEntry - (*UserAssets)(nil), // 15: UserAssets + (*Mastery)(nil), // 0: Mastery + (*DBStove)(nil), // 1: DBStove + (*DBBusiness)(nil), // 2: DBBusiness + (*DBBusinessData)(nil), // 3: DBBusinessData + (*DBTujian)(nil), // 4: DBTujian + (*ForgeData)(nil), // 5: ForgeData + (*Clang)(nil), // 6: Clang + (*OrderClang)(nil), // 7: OrderClang + (*DBSmithy)(nil), // 8: DBSmithy + nil, // 9: DBStove.DataEntry + nil, // 10: DBStove.SkillEntry + nil, // 11: DBStove.ForgeEntry + nil, // 12: DBBusiness.ShopEntry + nil, // 13: DBTujian.TujianEntry + nil, // 14: DBSmithy.SkillEntry + nil, // 15: DBSmithy.DeskFloorEntry + (*UserAssets)(nil), // 16: UserAssets } var file_smithy_smithy_db_proto_depIdxs = []int32{ - 8, // 0: DBStove.data:type_name -> DBStove.DataEntry - 9, // 1: DBStove.skill:type_name -> DBStove.SkillEntry - 10, // 2: DBStove.forge:type_name -> DBStove.ForgeEntry - 11, // 3: DBBusiness.shop:type_name -> DBBusiness.ShopEntry - 1, // 4: DBBusinessData.data:type_name -> DBBusiness - 12, // 5: DBTujian.tujian:type_name -> DBTujian.TujianEntry - 5, // 6: DBSmithy.clang:type_name -> Clang - 6, // 7: DBSmithy.orders:type_name -> OrderClang - 15, // 8: DBSmithy.items:type_name -> UserAssets - 13, // 9: DBSmithy.skill:type_name -> DBSmithy.SkillEntry - 14, // 10: DBSmithy.deskFloor:type_name -> DBSmithy.DeskFloorEntry - 4, // 11: DBTujian.TujianEntry.value:type_name -> ForgeData - 12, // [12:12] is the sub-list for method output_type - 12, // [12:12] is the sub-list for method input_type - 12, // [12:12] is the sub-list for extension type_name - 12, // [12:12] is the sub-list for extension extendee - 0, // [0:12] is the sub-list for field type_name + 9, // 0: DBStove.data:type_name -> DBStove.DataEntry + 10, // 1: DBStove.skill:type_name -> DBStove.SkillEntry + 11, // 2: DBStove.forge:type_name -> DBStove.ForgeEntry + 12, // 3: DBBusiness.shop:type_name -> DBBusiness.ShopEntry + 2, // 4: DBBusinessData.data:type_name -> DBBusiness + 13, // 5: DBTujian.tujian:type_name -> DBTujian.TujianEntry + 6, // 6: DBSmithy.clang:type_name -> Clang + 7, // 7: DBSmithy.orders:type_name -> OrderClang + 16, // 8: DBSmithy.items:type_name -> UserAssets + 14, // 9: DBSmithy.skill:type_name -> DBSmithy.SkillEntry + 15, // 10: DBSmithy.deskFloor:type_name -> DBSmithy.DeskFloorEntry + 0, // 11: DBStove.DataEntry.value:type_name -> Mastery + 5, // 12: DBTujian.TujianEntry.value:type_name -> ForgeData + 13, // [13:13] is the sub-list for method output_type + 13, // [13:13] is the sub-list for method input_type + 13, // [13:13] is the sub-list for extension type_name + 13, // [13:13] is the sub-list for extension extendee + 0, // [0:13] is the sub-list for field type_name } func init() { file_smithy_smithy_db_proto_init() } @@ -819,7 +879,7 @@ func file_smithy_smithy_db_proto_init() { file_comm_proto_init() if !protoimpl.UnsafeEnabled { file_smithy_smithy_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DBStove); i { + switch v := v.(*Mastery); i { case 0: return &v.state case 1: @@ -831,7 +891,7 @@ func file_smithy_smithy_db_proto_init() { } } file_smithy_smithy_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DBBusiness); i { + switch v := v.(*DBStove); i { case 0: return &v.state case 1: @@ -843,7 +903,7 @@ func file_smithy_smithy_db_proto_init() { } } file_smithy_smithy_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DBBusinessData); i { + switch v := v.(*DBBusiness); i { case 0: return &v.state case 1: @@ -855,7 +915,7 @@ func file_smithy_smithy_db_proto_init() { } } file_smithy_smithy_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DBTujian); i { + switch v := v.(*DBBusinessData); i { case 0: return &v.state case 1: @@ -867,7 +927,7 @@ func file_smithy_smithy_db_proto_init() { } } file_smithy_smithy_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ForgeData); i { + switch v := v.(*DBTujian); i { case 0: return &v.state case 1: @@ -879,7 +939,7 @@ func file_smithy_smithy_db_proto_init() { } } file_smithy_smithy_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Clang); i { + switch v := v.(*ForgeData); i { case 0: return &v.state case 1: @@ -891,7 +951,7 @@ func file_smithy_smithy_db_proto_init() { } } file_smithy_smithy_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OrderClang); i { + switch v := v.(*Clang); i { case 0: return &v.state case 1: @@ -903,6 +963,18 @@ func file_smithy_smithy_db_proto_init() { } } file_smithy_smithy_db_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*OrderClang); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_smithy_smithy_db_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DBSmithy); i { case 0: return &v.state @@ -921,7 +993,7 @@ func file_smithy_smithy_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_smithy_smithy_db_proto_rawDesc, NumEnums: 0, - NumMessages: 15, + NumMessages: 16, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/Game.NewSmithy.go b/sys/configure/structs/Game.NewSmithy.go new file mode 100644 index 000000000..02cb87f30 --- /dev/null +++ b/sys/configure/structs/Game.NewSmithy.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// 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 GameNewSmithy struct { + _dataMap map[int32]*GameNewSmithyData + _dataList []*GameNewSmithyData +} + +func NewGameNewSmithy(_buf []map[string]interface{}) (*GameNewSmithy, error) { + _dataList := make([]*GameNewSmithyData, 0, len(_buf)) + dataMap := make(map[int32]*GameNewSmithyData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameNewSmithyData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameNewSmithy{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameNewSmithy) GetDataMap() map[int32]*GameNewSmithyData { + return table._dataMap +} + +func (table *GameNewSmithy) GetDataList() []*GameNewSmithyData { + return table._dataList +} + +func (table *GameNewSmithy) Get(key int32) *GameNewSmithyData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.NewSmithyData.go b/sys/configure/structs/Game.NewSmithyData.go new file mode 100644 index 000000000..8b64cbc45 --- /dev/null +++ b/sys/configure/structs/Game.NewSmithyData.go @@ -0,0 +1,39 @@ +//------------------------------------------------------------------------------ +// +// 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 GameNewSmithyData struct { + Id int32 + ItemId int32 + Type int32 +} + +const TypeId_GameNewSmithyData = -1249020316 + +func (*GameNewSmithyData) GetTypeId() int32 { + return -1249020316 +} + +func (_v *GameNewSmithyData)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["item_id"].(float64); !_ok_ { err = errors.New("item_id error"); return }; _v.ItemId = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + return +} + +func DeserializeGameNewSmithyData(_buf map[string]interface{}) (*GameNewSmithyData, error) { + v := &GameNewSmithyData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.SmithyProficiency.go b/sys/configure/structs/Game.SmithyProficiency.go new file mode 100644 index 000000000..028d83ad8 --- /dev/null +++ b/sys/configure/structs/Game.SmithyProficiency.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// 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 GameSmithyProficiency struct { + _dataMap map[int32]*GameSmithyProficiencyData + _dataList []*GameSmithyProficiencyData +} + +func NewGameSmithyProficiency(_buf []map[string]interface{}) (*GameSmithyProficiency, error) { + _dataList := make([]*GameSmithyProficiencyData, 0, len(_buf)) + dataMap := make(map[int32]*GameSmithyProficiencyData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameSmithyProficiencyData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameSmithyProficiency{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameSmithyProficiency) GetDataMap() map[int32]*GameSmithyProficiencyData { + return table._dataMap +} + +func (table *GameSmithyProficiency) GetDataList() []*GameSmithyProficiencyData { + return table._dataList +} + +func (table *GameSmithyProficiency) Get(key int32) *GameSmithyProficiencyData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.SmithyProficiencyData.go b/sys/configure/structs/Game.SmithyProficiencyData.go new file mode 100644 index 000000000..996f2ef40 --- /dev/null +++ b/sys/configure/structs/Game.SmithyProficiencyData.go @@ -0,0 +1,51 @@ +//------------------------------------------------------------------------------ +// +// 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 GameSmithyProficiencyData struct { + Id int32 + Proficiency int32 + ReelId int32 + ProficiencyLv int32 + TitleText string + ContentText string + Type int32 + Value1 int32 + Value2 int32 +} + +const TypeId_GameSmithyProficiencyData = -1024047859 + +func (*GameSmithyProficiencyData) GetTypeId() int32 { + return -1024047859 +} + +func (_v *GameSmithyProficiencyData)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["proficiency"].(float64); !_ok_ { err = errors.New("proficiency error"); return }; _v.Proficiency = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["reelId"].(float64); !_ok_ { err = errors.New("reelId error"); return }; _v.ReelId = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["proficiency_lv"].(float64); !_ok_ { err = errors.New("proficiency_lv error"); return }; _v.ProficiencyLv = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["title_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TitleText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TitleText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["content_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ContentText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ContentText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value1"].(float64); !_ok_ { err = errors.New("value1 error"); return }; _v.Value1 = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value2"].(float64); !_ok_ { err = errors.New("value2 error"); return }; _v.Value2 = int32(_tempNum_) } + return +} + +func DeserializeGameSmithyProficiencyData(_buf map[string]interface{}) (*GameSmithyProficiencyData, error) { + v := &GameSmithyProficiencyData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.SmithyStoveV1.go b/sys/configure/structs/Game.SmithyStoveV1.go new file mode 100644 index 000000000..3f017af1c --- /dev/null +++ b/sys/configure/structs/Game.SmithyStoveV1.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// 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 GameSmithyStoveV1 struct { + _dataMap map[int32]*GameSmithyStoveV1Data + _dataList []*GameSmithyStoveV1Data +} + +func NewGameSmithyStoveV1(_buf []map[string]interface{}) (*GameSmithyStoveV1, error) { + _dataList := make([]*GameSmithyStoveV1Data, 0, len(_buf)) + dataMap := make(map[int32]*GameSmithyStoveV1Data) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameSmithyStoveV1Data(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Star] = _v + } + } + return &GameSmithyStoveV1{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameSmithyStoveV1) GetDataMap() map[int32]*GameSmithyStoveV1Data { + return table._dataMap +} + +func (table *GameSmithyStoveV1) GetDataList() []*GameSmithyStoveV1Data { + return table._dataList +} + +func (table *GameSmithyStoveV1) Get(key int32) *GameSmithyStoveV1Data { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.SmithyStoveV1Data.go b/sys/configure/structs/Game.SmithyStoveV1Data.go new file mode 100644 index 000000000..9c6272f48 --- /dev/null +++ b/sys/configure/structs/Game.SmithyStoveV1Data.go @@ -0,0 +1,56 @@ +//------------------------------------------------------------------------------ +// +// 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 GameSmithyStoveV1Data struct { + Star int32 + MaxTemperature int32 + TemperatureRecovery int32 + UpMaterial []*Gameatn + TitleText string +} + +const TypeId_GameSmithyStoveV1Data = -1332837680 + +func (*GameSmithyStoveV1Data) GetTypeId() int32 { + return -1332837680 +} + +func (_v *GameSmithyStoveV1Data)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["max_temperature"].(float64); !_ok_ { err = errors.New("max_temperature error"); return }; _v.MaxTemperature = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["temperature_recovery"].(float64); !_ok_ { err = errors.New("temperature_recovery error"); return }; _v.TemperatureRecovery = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["up_material"].([]interface{}); !_ok_ { err = errors.New("up_material error"); return } + + _v.UpMaterial = 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.UpMaterial = append(_v.UpMaterial, _list_v_) + } + } + + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["title_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TitleText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TitleText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + return +} + +func DeserializeGameSmithyStoveV1Data(_buf map[string]interface{}) (*GameSmithyStoveV1Data, error) { + v := &GameSmithyStoveV1Data{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.SmithyTool.go b/sys/configure/structs/Game.SmithyTool.go new file mode 100644 index 000000000..8aa538c9d --- /dev/null +++ b/sys/configure/structs/Game.SmithyTool.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// 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 GameSmithyTool struct { + _dataMap map[int32]*GameSmithyToolData + _dataList []*GameSmithyToolData +} + +func NewGameSmithyTool(_buf []map[string]interface{}) (*GameSmithyTool, error) { + _dataList := make([]*GameSmithyToolData, 0, len(_buf)) + dataMap := make(map[int32]*GameSmithyToolData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameSmithyToolData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameSmithyTool{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameSmithyTool) GetDataMap() map[int32]*GameSmithyToolData { + return table._dataMap +} + +func (table *GameSmithyTool) GetDataList() []*GameSmithyToolData { + return table._dataList +} + +func (table *GameSmithyTool) Get(key int32) *GameSmithyToolData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.SmithyToolData.go b/sys/configure/structs/Game.SmithyToolData.go new file mode 100644 index 000000000..0449033f9 --- /dev/null +++ b/sys/configure/structs/Game.SmithyToolData.go @@ -0,0 +1,62 @@ +//------------------------------------------------------------------------------ +// +// 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 GameSmithyToolData struct { + Id int32 + SkillType int32 + SkillLv int32 + Preconditions int32 + UpMaterial []*Gameatn + NameText string + ContentText string + Value int32 +} + +const TypeId_GameSmithyToolData = -2056914476 + +func (*GameSmithyToolData) GetTypeId() int32 { + return -2056914476 +} + +func (_v *GameSmithyToolData)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["skill_type"].(float64); !_ok_ { err = errors.New("skill_type error"); return }; _v.SkillType = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill_lv"].(float64); !_ok_ { err = errors.New("skill_lv error"); return }; _v.SkillLv = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["preconditions"].(float64); !_ok_ { err = errors.New("preconditions error"); return }; _v.Preconditions = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["up_material"].([]interface{}); !_ok_ { err = errors.New("up_material error"); return } + + _v.UpMaterial = 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.UpMaterial = append(_v.UpMaterial, _list_v_) + } + } + + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.NameText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.NameText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["content_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ContentText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ContentText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) } + return +} + +func DeserializeGameSmithyToolData(_buf map[string]interface{}) (*GameSmithyToolData, error) { + v := &GameSmithyToolData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.TrollGoodsData.go b/sys/configure/structs/Game.TrollGoodsData.go index 856d2d27a..ae3323e3e 100644 --- a/sys/configure/structs/Game.TrollGoodsData.go +++ b/sys/configure/structs/Game.TrollGoodsData.go @@ -31,14 +31,14 @@ func (*GameTrollGoodsData) GetTypeId() int32 { func (_v *GameTrollGoodsData)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; if _v.Goodsname, _ok_ = _buf["goodsname"].(string); !_ok_ { err = errors.New("goodsname error"); return } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["goodsname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Goodsname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Goodsname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["goodsfor"].(float64); !_ok_ { err = errors.New("goodsfor error"); return }; _v.Goodsfor = int32(_tempNum_) } - { var _ok_ bool; if _v.Goodsinfor, _ok_ = _buf["goodsinfor"].(string); !_ok_ { err = errors.New("goodsinfor error"); return } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["goodsinfor"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Goodsinfor error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Goodsinfor, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; if _v.Goodsicon, _ok_ = _buf["goodsicon"].(string); !_ok_ { err = errors.New("goodsicon error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["goodsprice"].(float64); !_ok_ { err = errors.New("goodsprice error"); return }; _v.Goodsprice = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star_money"].(float64); !_ok_ { err = errors.New("star_money error"); return }; _v.StarMoney = int32(_tempNum_) } - { var _ok_ bool; if _v.Uptext, _ok_ = _buf["uptext"].(string); !_ok_ { err = errors.New("uptext error"); return } } - { var _ok_ bool; if _v.Suptext, _ok_ = _buf["suptext"].(string); !_ok_ { err = errors.New("suptext error"); return } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["uptext"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Uptext error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Uptext, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["suptext"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Suptext error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Suptext, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["max"].(float64); !_ok_ { err = errors.New("max error"); return }; _v.Max = int32(_tempNum_) } return } diff --git a/sys/configure/structs/Game.WorldTaskData.go b/sys/configure/structs/Game.WorldTaskData.go index 5a75bbb7b..82ee4ef1a 100644 --- a/sys/configure/structs/Game.WorldTaskData.go +++ b/sys/configure/structs/Game.WorldTaskData.go @@ -18,6 +18,9 @@ type GameWorldTaskData struct { Group int32 Des int32 Icon string + TaskTname string + TaskName string + TaskDisplay string Npc []string GetafterEvent []int32 Completetask int32 @@ -40,6 +43,9 @@ func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error) { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["group"].(float64); !_ok_ { err = errors.New("group error"); return }; _v.Group = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["des"].(float64); !_ok_ { err = errors.New("des error"); return }; _v.Des = int32(_tempNum_) } { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["task_Tname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskTname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskTname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["task_name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskName, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["task_display"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskDisplay error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskDisplay, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 08f904c55..f405a1c42 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -159,6 +159,10 @@ type Tables struct { MainStartype *GameMainStartype Battletasktesting *GameBattletasktesting BattleReady *GameBattleReady + NewSmithy *GameNewSmithy + SmithyProficiency *GameSmithyProficiency + SmithyStoveV1 *GameSmithyStoveV1 + SmithyTool *GameSmithyTool } func NewTables(loader JsonLoader) (*Tables, error) { @@ -1054,5 +1058,29 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.BattleReady, err = NewGameBattleReady(buf) ; err != nil { return nil, err } + if buf, err = loader("game_newsmithy") ; err != nil { + return nil, err + } + if tables.NewSmithy, err = NewGameNewSmithy(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_smithyproficiency") ; err != nil { + return nil, err + } + if tables.SmithyProficiency, err = NewGameSmithyProficiency(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_smithystovev1") ; err != nil { + return nil, err + } + if tables.SmithyStoveV1, err = NewGameSmithyStoveV1(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_smithytool") ; err != nil { + return nil, err + } + if tables.SmithyTool, err = NewGameSmithyTool(buf) ; err != nil { + return nil, err + } return tables, nil } From ef74f429caff76aa0ca6833ffebcd65e9dc3f981 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 16 Feb 2023 15:37:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=89=93=E9=80=A0=E8=A3=85=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_newsmithy.json | 841 ++++++++++++-- bin/json/game_pandsmasexp.json | 1006 +++++++++++++++++ bin/json/game_smithycustomer.json | 42 + comm/const.go | 7 + modules/smithy/api_forgeequip.go | 65 +- modules/smithy/comp_configure.go | 108 +- pb/errorcode.pb.go | 16 +- pb/smithy_db.pb.go | 362 +++--- pb/smithy_msg.pb.go | 248 ++-- sys/configure/structs/Game.NewSmithyData.go | 23 + sys/configure/structs/Game.SmithyCustomer.go | 42 + .../structs/Game.SmithyCustomerData.go | 69 ++ sys/configure/structs/Game.pandsmasexp.go | 42 + sys/configure/structs/Game.pandsmasexpData.go | 143 +++ sys/configure/structs/Tables.go | 14 + 15 files changed, 2600 insertions(+), 428 deletions(-) create mode 100644 bin/json/game_pandsmasexp.json create mode 100644 bin/json/game_smithycustomer.json create mode 100644 sys/configure/structs/Game.SmithyCustomer.go create mode 100644 sys/configure/structs/Game.SmithyCustomerData.go create mode 100644 sys/configure/structs/Game.pandsmasexp.go create mode 100644 sys/configure/structs/Game.pandsmasexpData.go diff --git a/bin/json/game_newsmithy.json b/bin/json/game_newsmithy.json index 110cd12df..8f8a6a1f5 100644 --- a/bin/json/game_newsmithy.json +++ b/bin/json/game_newsmithy.json @@ -2,376 +2,1067 @@ { "id": 1, "item_id": 0, - "type": 1 + "type": 1, + "consume": [ + { + "a": "item", + "t": "10001", + "n": 1 + }, + { + "a": "item", + "t": "10201", + "n": 2 + }, + { + "a": "item", + "t": "10301", + "n": 3 + } + ], + "temperature": 50, + "quality": { + "a": "item", + "t": "20201", + "n": 2 + }, + "nDrop": 10001, + "qDrop": 20001 }, { "id": 2, "item_id": 0, - "type": 1 + "type": 1, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 3 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 3, "item_id": 0, - "type": 1 + "type": 1, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 4 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 4, "item_id": 0, - "type": 1 + "type": 1, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 5 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 5, "item_id": 0, - "type": 1 + "type": 1, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 6 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 6, "item_id": 0, - "type": 1 + "type": 1, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 7 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 7, "item_id": 0, - "type": 1 + "type": 1, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 8 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 8, "item_id": 0, - "type": 1 + "type": 1, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 9 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 9, "item_id": 0, - "type": 1 + "type": 1, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 10 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 10, "item_id": 0, - "type": 1 + "type": 1, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 11 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 11, "item_id": 0, - "type": 1 + "type": 1, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 12 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 12, "item_id": 0, - "type": 1 + "type": 1, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 13 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 13, "item_id": 0, - "type": 1 + "type": 1, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 14 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 14, "item_id": 0, - "type": 1 + "type": 1, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 15 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 15, "item_id": 0, - "type": 1 + "type": 1, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 16 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 16, "item_id": 0, - "type": 1 + "type": 1, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 17 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 17, "item_id": 0, - "type": 1 + "type": 1, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 18 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 18, "item_id": 0, - "type": 1 + "type": 1, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 19 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 19, "item_id": 0, - "type": 1 + "type": 1, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 20 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 20, "item_id": 0, - "type": 1 + "type": 1, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 21 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 21, "item_id": 0, - "type": 1 + "type": 1, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 22 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 22, "item_id": 0, - "type": 1 + "type": 1, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 23 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 23, "item_id": 0, - "type": 1 + "type": 1, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 24 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 24, "item_id": 0, - "type": 1 + "type": 1, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 25 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 25, "item_id": 0, - "type": 1 + "type": 1, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 26 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 26, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 27 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 27, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 28 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 28, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 29 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 29, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 30 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 30, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 31 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 31, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 32 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 32, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 33 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 33, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 34 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 34, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 35 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 35, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 36 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 36, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 37 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 37, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 38 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 38, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 39 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 39, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 40 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 40, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 41 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 41, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 42 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 42, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 43 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 43, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 44 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 44, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 45 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 45, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 46 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 46, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 47 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 47, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 48 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 48, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 49 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 49, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 50 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 50, "item_id": 0, - "type": 2 + "type": 2, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 51 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 51, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 52 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 52, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 53 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 53, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 54 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 54, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 55 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 55, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 56 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 56, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 57 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 57, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 58 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 58, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 59 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 59, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 60 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 60, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 61 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 61, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 62 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 62, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 63 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 63, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 64 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 64, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 65 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 65, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 66 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 66, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 67 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 67, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 68 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 68, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 69 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 69, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 70 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 70, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 71 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 71, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 72 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 72, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 73 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 73, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 74 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 74, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 75 + }, + "nDrop": 0, + "qDrop": 0 }, { "id": 75, "item_id": 0, - "type": 3 + "type": 3, + "consume": [], + "temperature": 0, + "quality": { + "a": "item", + "t": "20201", + "n": 76 + }, + "nDrop": 0, + "qDrop": 0 } ] \ No newline at end of file diff --git a/bin/json/game_pandsmasexp.json b/bin/json/game_pandsmasexp.json new file mode 100644 index 000000000..6be4649f3 --- /dev/null +++ b/bin/json/game_pandsmasexp.json @@ -0,0 +1,1006 @@ +[ + { + "id": 110, + "bossid": 1, + "name": { + "key": "viking_boss_1001", + "text": "火焰泰坦" + }, + "ReadyID": 104, + "difficulty": 1, + "BattleReadyID": 104, + "captionrecommend": [ + 25001, + 25004, + 34006, + 35001, + 35002 + ], + "firstprize": [ + { + "a": "attr", + "t": "diamond", + "n": 100 + } + ], + "dropshow": [ + { + "a": "equi", + "t": "10110", + "n": 1 + }, + { + "a": "equi", + "t": "10111", + "n": 1 + }, + { + "a": "equi", + "t": "10112", + "n": 1 + }, + { + "a": "equi", + "t": "10113", + "n": 1 + }, + { + "a": "equi", + "t": "11114", + "n": 1 + }, + { + "a": "equi", + "t": "11115", + "n": 1 + } + ], + "drop": 1001, + "scene": "", + "bossmodel": 11009, + "boss_skill": 51004, + "boss": [ + 301011 + ], + "ps_consume": [ + { + "a": "item", + "t": "100100", + "n": 6 + } + ], + "ps_mg": [ + { + "a": "item", + "t": "100100", + "n": 5 + } + ] + }, + { + "id": 120, + "bossid": 1, + "name": { + "key": "viking_boss_1001", + "text": "火焰泰坦" + }, + "ReadyID": 104, + "difficulty": 2, + "BattleReadyID": 104, + "captionrecommend": [ + 25001, + 25004, + 34006, + 35001, + 35002 + ], + "firstprize": [ + { + "a": "attr", + "t": "diamond", + "n": 100 + } + ], + "dropshow": [ + { + "a": "equi", + "t": "10120", + "n": 1 + }, + { + "a": "equi", + "t": "10121", + "n": 1 + }, + { + "a": "equi", + "t": "10122", + "n": 1 + }, + { + "a": "equi", + "t": "10113", + "n": 1 + }, + { + "a": "equi", + "t": "11114", + "n": 1 + }, + { + "a": "equi", + "t": "11115", + "n": 1 + } + ], + "drop": 1002, + "scene": "", + "bossmodel": 11009, + "boss_skill": 51004, + "boss": [ + 301014 + ], + "ps_consume": [ + { + "a": "item", + "t": "100100", + "n": 7 + } + ], + "ps_mg": [ + { + "a": "item", + "t": "100100", + "n": 6 + } + ] + }, + { + "id": 130, + "bossid": 1, + "name": { + "key": "viking_boss_1001", + "text": "火焰泰坦" + }, + "ReadyID": 104, + "difficulty": 3, + "BattleReadyID": 104, + "captionrecommend": [ + 25001, + 25004, + 34006, + 35001, + 35002 + ], + "firstprize": [ + { + "a": "attr", + "t": "diamond", + "n": 100 + } + ], + "dropshow": [ + { + "a": "equi", + "t": "10120", + "n": 1 + }, + { + "a": "equi", + "t": "10121", + "n": 1 + }, + { + "a": "equi", + "t": "10122", + "n": 1 + }, + { + "a": "equi", + "t": "10123", + "n": 1 + }, + { + "a": "equi", + "t": "11124", + "n": 1 + }, + { + "a": "equi", + "t": "11125", + "n": 1 + } + ], + "drop": 1003, + "scene": "", + "bossmodel": 11009, + "boss_skill": 51004, + "boss": [ + 301017 + ], + "ps_consume": [ + { + "a": "item", + "t": "100100", + "n": 8 + } + ], + "ps_mg": [ + { + "a": "item", + "t": "100100", + "n": 7 + } + ] + }, + { + "id": 140, + "bossid": 1, + "name": { + "key": "viking_boss_1001", + "text": "火焰泰坦" + }, + "ReadyID": 104, + "difficulty": 4, + "BattleReadyID": 104, + "captionrecommend": [ + 25001, + 25004, + 34006, + 35001, + 35002 + ], + "firstprize": [ + { + "a": "attr", + "t": "diamond", + "n": 100 + } + ], + "dropshow": [ + { + "a": "equi", + "t": "10130", + "n": 1 + }, + { + "a": "equi", + "t": "10131", + "n": 1 + }, + { + "a": "equi", + "t": "10132", + "n": 1 + }, + { + "a": "equi", + "t": "10123", + "n": 1 + }, + { + "a": "equi", + "t": "11124", + "n": 1 + }, + { + "a": "equi", + "t": "11125", + "n": 1 + } + ], + "drop": 1004, + "scene": "", + "bossmodel": 11009, + "boss_skill": 51004, + "boss": [ + 301020 + ], + "ps_consume": [ + { + "a": "item", + "t": "100100", + "n": 9 + } + ], + "ps_mg": [ + { + "a": "item", + "t": "100100", + "n": 8 + } + ] + }, + { + "id": 210, + "bossid": 2, + "name": { + "key": "viking_boss_1002", + "text": "冰之泰坦" + }, + "ReadyID": 104, + "difficulty": 1, + "BattleReadyID": 104, + "captionrecommend": [ + 25001, + 25004, + 34006, + 35001, + 35002 + ], + "firstprize": [ + { + "a": "attr", + "t": "diamond", + "n": 100 + } + ], + "dropshow": [ + { + "a": "equi", + "t": "10110", + "n": 1 + }, + { + "a": "equi", + "t": "10111", + "n": 1 + }, + { + "a": "equi", + "t": "10112", + "n": 1 + }, + { + "a": "equi", + "t": "10113", + "n": 1 + }, + { + "a": "equi", + "t": "11114", + "n": 1 + }, + { + "a": "equi", + "t": "11115", + "n": 1 + } + ], + "drop": 1011, + "scene": "", + "bossmodel": 11003, + "boss_skill": 51004, + "boss": [ + 302011 + ], + "ps_consume": [ + { + "a": "item", + "t": "100100", + "n": 6 + } + ], + "ps_mg": [ + { + "a": "item", + "t": "100100", + "n": 5 + } + ] + }, + { + "id": 220, + "bossid": 2, + "name": { + "key": "viking_boss_1002", + "text": "冰之泰坦" + }, + "ReadyID": 104, + "difficulty": 2, + "BattleReadyID": 104, + "captionrecommend": [ + 25001, + 25004, + 34006, + 35001, + 35002 + ], + "firstprize": [ + { + "a": "attr", + "t": "diamond", + "n": 100 + } + ], + "dropshow": [ + { + "a": "equi", + "t": "10120", + "n": 1 + }, + { + "a": "equi", + "t": "10121", + "n": 1 + }, + { + "a": "equi", + "t": "10122", + "n": 1 + }, + { + "a": "equi", + "t": "10113", + "n": 1 + }, + { + "a": "equi", + "t": "11114", + "n": 1 + }, + { + "a": "equi", + "t": "11115", + "n": 1 + } + ], + "drop": 1012, + "scene": "", + "bossmodel": 11003, + "boss_skill": 51004, + "boss": [ + 302014 + ], + "ps_consume": [ + { + "a": "item", + "t": "100100", + "n": 7 + } + ], + "ps_mg": [ + { + "a": "item", + "t": "100100", + "n": 6 + } + ] + }, + { + "id": 230, + "bossid": 2, + "name": { + "key": "viking_boss_1002", + "text": "冰之泰坦" + }, + "ReadyID": 104, + "difficulty": 3, + "BattleReadyID": 104, + "captionrecommend": [ + 25001, + 25004, + 34006, + 35001, + 35002 + ], + "firstprize": [ + { + "a": "attr", + "t": "diamond", + "n": 100 + } + ], + "dropshow": [ + { + "a": "equi", + "t": "10120", + "n": 1 + }, + { + "a": "equi", + "t": "10121", + "n": 1 + }, + { + "a": "equi", + "t": "10122", + "n": 1 + }, + { + "a": "equi", + "t": "10123", + "n": 1 + }, + { + "a": "equi", + "t": "11124", + "n": 1 + }, + { + "a": "equi", + "t": "11125", + "n": 1 + } + ], + "drop": 1013, + "scene": "", + "bossmodel": 11003, + "boss_skill": 51004, + "boss": [ + 302017 + ], + "ps_consume": [ + { + "a": "item", + "t": "100100", + "n": 8 + } + ], + "ps_mg": [ + { + "a": "item", + "t": "100100", + "n": 7 + } + ] + }, + { + "id": 240, + "bossid": 2, + "name": { + "key": "viking_boss_1002", + "text": "冰之泰坦" + }, + "ReadyID": 104, + "difficulty": 4, + "BattleReadyID": 104, + "captionrecommend": [ + 25001, + 25004, + 34006, + 35001, + 35002 + ], + "firstprize": [ + { + "a": "attr", + "t": "diamond", + "n": 100 + } + ], + "dropshow": [ + { + "a": "equi", + "t": "10130", + "n": 1 + }, + { + "a": "equi", + "t": "10131", + "n": 1 + }, + { + "a": "equi", + "t": "10132", + "n": 1 + }, + { + "a": "equi", + "t": "10123", + "n": 1 + }, + { + "a": "equi", + "t": "11124", + "n": 1 + }, + { + "a": "equi", + "t": "11125", + "n": 1 + } + ], + "drop": 1014, + "scene": "", + "bossmodel": 11003, + "boss_skill": 51004, + "boss": [ + 302020 + ], + "ps_consume": [ + { + "a": "item", + "t": "100100", + "n": 9 + } + ], + "ps_mg": [ + { + "a": "item", + "t": "100100", + "n": 8 + } + ] + }, + { + "id": 310, + "bossid": 3, + "name": { + "key": "viking_boss_1003", + "text": "森林泰坦" + }, + "ReadyID": 104, + "difficulty": 1, + "BattleReadyID": 104, + "captionrecommend": [ + 25001, + 25004, + 34006, + 35001, + 35002 + ], + "firstprize": [ + { + "a": "attr", + "t": "diamond", + "n": 100 + } + ], + "dropshow": [ + { + "a": "equi", + "t": "10110", + "n": 1 + }, + { + "a": "equi", + "t": "10111", + "n": 1 + }, + { + "a": "equi", + "t": "10112", + "n": 1 + }, + { + "a": "equi", + "t": "10113", + "n": 1 + }, + { + "a": "equi", + "t": "11114", + "n": 1 + }, + { + "a": "equi", + "t": "11115", + "n": 1 + } + ], + "drop": 1021, + "scene": "", + "bossmodel": 11018, + "boss_skill": 51004, + "boss": [ + 303011 + ], + "ps_consume": [ + { + "a": "item", + "t": "100100", + "n": 6 + } + ], + "ps_mg": [ + { + "a": "item", + "t": "100100", + "n": 5 + } + ] + }, + { + "id": 320, + "bossid": 3, + "name": { + "key": "viking_boss_1003", + "text": "森林泰坦" + }, + "ReadyID": 104, + "difficulty": 2, + "BattleReadyID": 104, + "captionrecommend": [ + 25001, + 25004, + 34006, + 35001, + 35002 + ], + "firstprize": [ + { + "a": "attr", + "t": "diamond", + "n": 100 + } + ], + "dropshow": [ + { + "a": "equi", + "t": "10120", + "n": 1 + }, + { + "a": "equi", + "t": "10121", + "n": 1 + }, + { + "a": "equi", + "t": "10122", + "n": 1 + }, + { + "a": "equi", + "t": "10113", + "n": 1 + }, + { + "a": "equi", + "t": "11114", + "n": 1 + }, + { + "a": "equi", + "t": "11115", + "n": 1 + } + ], + "drop": 1022, + "scene": "", + "bossmodel": 11018, + "boss_skill": 51004, + "boss": [ + 303014 + ], + "ps_consume": [ + { + "a": "item", + "t": "100100", + "n": 7 + } + ], + "ps_mg": [ + { + "a": "item", + "t": "100100", + "n": 6 + } + ] + }, + { + "id": 330, + "bossid": 3, + "name": { + "key": "viking_boss_1003", + "text": "森林泰坦" + }, + "ReadyID": 104, + "difficulty": 3, + "BattleReadyID": 104, + "captionrecommend": [ + 25001, + 25004, + 34006, + 35001, + 35002 + ], + "firstprize": [ + { + "a": "attr", + "t": "diamond", + "n": 100 + } + ], + "dropshow": [ + { + "a": "equi", + "t": "10120", + "n": 1 + }, + { + "a": "equi", + "t": "10121", + "n": 1 + }, + { + "a": "equi", + "t": "10122", + "n": 1 + }, + { + "a": "equi", + "t": "10123", + "n": 1 + }, + { + "a": "equi", + "t": "11124", + "n": 1 + }, + { + "a": "equi", + "t": "11125", + "n": 1 + } + ], + "drop": 1023, + "scene": "", + "bossmodel": 11018, + "boss_skill": 51004, + "boss": [ + 303017 + ], + "ps_consume": [ + { + "a": "item", + "t": "100100", + "n": 8 + } + ], + "ps_mg": [ + { + "a": "item", + "t": "100100", + "n": 7 + } + ] + }, + { + "id": 340, + "bossid": 3, + "name": { + "key": "viking_boss_1003", + "text": "森林泰坦" + }, + "ReadyID": 104, + "difficulty": 4, + "BattleReadyID": 104, + "captionrecommend": [ + 25001, + 25004, + 34006, + 35001, + 35002 + ], + "firstprize": [ + { + "a": "attr", + "t": "diamond", + "n": 100 + } + ], + "dropshow": [ + { + "a": "equi", + "t": "10130", + "n": 1 + }, + { + "a": "equi", + "t": "10131", + "n": 1 + }, + { + "a": "equi", + "t": "10132", + "n": 1 + }, + { + "a": "equi", + "t": "10123", + "n": 1 + }, + { + "a": "equi", + "t": "11124", + "n": 1 + }, + { + "a": "equi", + "t": "11125", + "n": 1 + } + ], + "drop": 1024, + "scene": "", + "bossmodel": 11018, + "boss_skill": 51004, + "boss": [ + 303020 + ], + "ps_consume": [ + { + "a": "item", + "t": "100100", + "n": 9 + } + ], + "ps_mg": [ + { + "a": "item", + "t": "100100", + "n": 8 + } + ] + }, + { + "id": 410, + "bossid": 11, + "name": { + "key": "viking_boss_1001", + "text": "武器BOSS" + }, + "ReadyID": 104, + "difficulty": 1, + "BattleReadyID": 104, + "captionrecommend": [ + 25001, + 25004, + 34006, + 35001, + 35002 + ], + "firstprize": [ + { + "a": "attr", + "t": "diamond", + "n": 100 + } + ], + "dropshow": [ + { + "a": "equi", + "t": "20010", + "n": 1 + }, + { + "a": "equi", + "t": "20011", + "n": 1 + }, + { + "a": "equi", + "t": "20012", + "n": 1 + }, + { + "a": "equi", + "t": "20013", + "n": 1 + } + ], + "drop": 1001, + "scene": "", + "bossmodel": 11009, + "boss_skill": 51004, + "boss": [ + 301011 + ], + "ps_consume": [ + { + "a": "item", + "t": "100100", + "n": 6 + } + ], + "ps_mg": [ + { + "a": "item", + "t": "100100", + "n": 5 + } + ] + } +] \ No newline at end of file diff --git a/bin/json/game_smithycustomer.json b/bin/json/game_smithycustomer.json new file mode 100644 index 000000000..aaad93b63 --- /dev/null +++ b/bin/json/game_smithycustomer.json @@ -0,0 +1,42 @@ +[ + { + "customer_id": 1, + "customer_type": 1, + "customer_speak": { + "key": "我需要{0}件【{1}】，如果你暂时没有备货的话我可以在这等一段时间，但不会太久。", + "text": "" + }, + "goods": [], + "reword": [] + }, + { + "customer_id": 2, + "customer_type": 2, + "customer_speak": { + "key": "我需要{0}件【{1}】，如果你暂时没有备货的话我可以在这等一段时间，但不会太久。", + "text": "" + }, + "goods": [], + "reword": [] + }, + { + "customer_id": 3, + "customer_type": 3, + "customer_speak": { + "key": "", + "text": "" + }, + "goods": [], + "reword": [] + }, + { + "customer_id": 4, + "customer_type": 4, + "customer_speak": { + "key": "我有个宝贝，你要是喜欢的话便宜你点卖你。", + "text": "" + }, + "goods": [], + "reword": [] + } +] \ No newline at end of file diff --git a/comm/const.go b/comm/const.go index 2dcd76464..3c1c9711c 100644 --- a/comm/const.go +++ b/comm/const.go @@ -726,3 +726,10 @@ const ( UseType1 int32 = 1 //英雄碎片 UseType8 int32 = 8 //觉醒材料合成 ) + +const ( + SmithyReelType1 = 1 //炉温消耗减少 + SmithyReelType2 = 2 // 材料消耗减少 + SmithyReelType3 = 3 // 解锁图纸【紫金雷神锤】 + SmithyReelType4 = 4 +) diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go index 4ebe80892..653e9e9ac 100644 --- a/modules/smithy/api_forgeequip.go +++ b/modules/smithy/api_forgeequip.go @@ -3,13 +3,14 @@ package smithy import ( "go_dreamfactory/comm" "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" "google.golang.org/protobuf/proto" ) //参数校验 func (this *apiComp) ForgeEquipCheck(session comm.IUserSession, req *pb.SmithyForgeEquipReq) (code pb.ErrorCode) { - if req.EquipType == 0 { + if req.ReelId == 0 { code = pb.ErrorCode_ReqParameterError return } @@ -18,18 +19,76 @@ func (this *apiComp) ForgeEquipCheck(session comm.IUserSession, req *pb.SmithyFo // 打造装备 func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEquipReq) (code pb.ErrorCode, data proto.Message) { - var () + var ( + stove *pb.DBStove + err error + update map[string]interface{} + costRes []*cfg.Gameatn + ) + update = make(map[string]interface{}) code = this.ForgeEquipCheck(session, req) if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 } - stove, err := this.module.modelStove.getSmithyStoveList(session.GetUserId()) + stove, err = this.module.modelStove.getSmithyStoveList(session.GetUserId()) if err != nil { code = pb.ErrorCode_DBError return } + reelcfg := this.module.configure.GetSmithyReelConfigData(req.ReelId) + if reelcfg == nil { + code = pb.ErrorCode_ReqParameterError // 没有找到该类型的图纸信息 + return + } + // 校验图纸是否激活 + if _, ok := stove.Data[req.ReelId]; !ok { // 是不是首次打造 + if !this.module.configure.CheckSmithyFirstReelConfigData(reelcfg.Type, req.ReelId) { // 没有激活图纸 + code = pb.ErrorCode_SmithyNoReel + return + } + stove.Data[req.ReelId] = &pb.Mastery{ + Lv: 1, + Value: 0, + } + //update["data"] = stove.Data + } + stove.Data[req.ReelId].Value += 1 + // 是否是精益打造 + if req.Quality > 0 { + costRes = append(costRes, reelcfg.Quality) + } + costRes = append(costRes, reelcfg.Consume...) + if code = this.module.CheckRes(session, costRes); code != pb.ErrorCode_Success { + return + } + // 检查炉温 是否够 + if stove.Temperature < reelcfg.Temperature { + code = pb.ErrorCode_SmithyNoTemperature // 炉温不够 直接返回 + return + } + + // 检查是否提升了熟练度等级 + nextProficiency := this.module.configure.GetSmithyProficileData(req.ReelId, stove.Data[req.ReelId].Lv+1) + if nextProficiency != nil && nextProficiency.Proficiency >= stove.Data[req.ReelId].Value { // 提升熟练度 + stove.Data[req.ReelId].Lv += 1 + stove.Data[req.ReelId].Value = 0 + // 校验是否解锁了新的图纸 + if nextProficiency.Type == comm.SmithyReelType3 { + stove.Data[nextProficiency.Value1] = &pb.Mastery{ + Lv: 1, + Value: 0, + } + } + } + if code = this.module.ConsumeRes(session, costRes, true); code != pb.ErrorCode_Success { + return + } + stove.Temperature -= reelcfg.Temperature // 消耗温度 + update["data"] = stove.Data + update["temperature"] = stove.Temperature + this.module.modelStove.updateSmithyStove(session.GetUserId(), update) session.SendMsg(string(this.module.GetType()), "forgeequip", &pb.SmithyForgeEquipResp{Data: stove}) return } diff --git a/modules/smithy/comp_configure.go b/modules/smithy/comp_configure.go index 3487bcfb7..21089c1d1 100644 --- a/modules/smithy/comp_configure.go +++ b/modules/smithy/comp_configure.go @@ -10,8 +10,13 @@ import ( ) const ( - game_smithy = "game_smithy.json" - game_smithystove = "game_smithystove.json" + game_smithy = "game_smithy.json" + game_smithystoveold = "game_smithystove.json" + + game_smithyreel = "game_newsmithy.json" // 新版铁匠铺卷轴 + game_smproficiency = "game_smithyproficiency.json" // 铁匠铺熟练度 + game_smithystove = "game_smithystovev1.json" // 铁匠铺台子 打造配置 + game_smithytools = "game_smithytool.json" // 铁匠铺工具台 ) ///配置管理基础组件 @@ -20,13 +25,15 @@ type configureComp struct { module *Smithy hlock sync.RWMutex _smithyMap map[int64]*cfg.GameSmithyData + + _mapProficile map[int64]*cfg.GameSmithyProficiencyData // 熟练度 key 卷轴ID+ 等级 } //组件初始化接口 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._smithyMap = make(map[int64]*cfg.GameSmithyData, 0) this.module = module.(*Smithy) + this._smithyMap = make(map[int64]*cfg.GameSmithyData, 0) configure.RegisterConfigure(game_smithy, cfg.NewGameSmithy, func() { if v, err := this.GetConfigure(game_smithy); err == nil { if configure, ok := v.(*cfg.GameSmithy); ok { @@ -41,7 +48,14 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp log.Errorf("get game_pagoda conf err:%v", err) return }) - err = this.LoadConfigure(game_smithystove, cfg.NewGameSmithyStove) + + this._mapProficile = make(map[int64]*cfg.GameSmithyProficiencyData, 0) + configure.RegisterConfigure(game_smproficiency, cfg.NewGameSmithyProficiency, this.LoadProficileData) + err = this.LoadConfigure(game_smithyreel, cfg.NewGameSmithyStove) + err = this.LoadConfigure(game_smithystove, cfg.NewGameSmithyStoveV1) + err = this.LoadConfigure(game_smithytools, cfg.NewGameSmithyTool) + err = this.LoadConfigure(game_smithystoveold, cfg.NewGameSmithyStove) + return } @@ -66,7 +80,7 @@ func (this *configureComp) GetSmithyTypeConfigData() (mapType map[int32]struct{} // 获取炉子配置数据 func (this *configureComp) GetSmithyStoveConfigData(level int32) (data *cfg.GameSmithyStoveData) { - if v, err := this.GetConfigure(game_smithystove); err == nil { + if v, err := this.GetConfigure(game_smithystoveold); err == nil { if configure, ok := v.(*cfg.GameSmithyStove); ok { data = configure.Get(int32(level)) return @@ -91,3 +105,87 @@ func (this *configureComp) LoadMultiConfigure(confs map[string]interface{}) (err func (this *configureComp) GetConfigure(name string) (v interface{}, err error) { return configure.GetConfigure(name) } + +// 获取图纸信息 +func (this *configureComp) GetSmithyReelConfigData(id int32) (data *cfg.GameNewSmithyData) { + if v, err := this.GetConfigure(game_smithyreel); err == nil { + if configure, ok := v.(*cfg.GameNewSmithy); ok { + data = configure.Get(int32(id)) + return + } + } + return +} + +func (this *configureComp) CheckSmithyFirstReelConfigData(etype int32, id int32) bool { + if v, err := this.GetConfigure(game_smithyreel); err == nil { + if configure, ok := v.(*cfg.GameNewSmithy); ok { + for _, v := range configure.GetDataList() { + if v.Type == etype { + if v.Id == id { + return true + } else { + return false + } + } + } + return true + } + } + return false +} + +// 获取铁匠铺熟练度数据 +func (this *configureComp) GetSmithProficiencyConf(id int32) (data *cfg.GameSmithyProficiencyData) { + if v, err := this.GetConfigure(game_smproficiency); err == nil { + if configure, ok := v.(*cfg.GameSmithyProficiency); ok { + data = configure.Get(int32(id)) + return + } + } + return +} + +func (this *configureComp) LoadProficileData() { + + if v, err := this.GetConfigure(game_smproficiency); err == nil { + if configure, ok := v.(*cfg.GameSmithyProficiency); ok { + this.hlock.Lock() + defer this.hlock.Unlock() + for _, value := range configure.GetDataList() { + this._mapProficile[int64(value.ReelId<<16)+int64(value.ProficiencyLv)] = value + } + return + } + } else { + log.Errorf("get game_pagoda conf err:%v", err) + + } + return +} + +func (this *configureComp) GetSmithyProficileData(reelid int32, proficile int32) *cfg.GameSmithyProficiencyData { + return this._mapProficile[int64(reelid<<16)+int64(proficile)] +} + +// 获取铁匠铺工作台信息 +func (this *configureComp) GetSmithyStoveConf(star int32) (data *cfg.GameSmithyStoveV1Data) { + if v, err := this.GetConfigure(game_smithystove); err == nil { + if configure, ok := v.(*cfg.GameSmithyStoveV1); ok { + data = configure.Get(int32(star)) + return + } + } + return +} + +// 获取铁匠铺工作台信息 +func (this *configureComp) GetSmithyStoveConf1(id int32) (data *cfg.GameSmithyToolData) { + if v, err := this.GetConfigure(game_smithytools); err == nil { + if configure, ok := v.(*cfg.GameSmithyTool); ok { + data = configure.Get(int32(id)) + return + } + } + return +} diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index 85d31b146..011b826e5 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -315,6 +315,9 @@ const ( // AutoBattle ErrorCode_AutoBattleNoData ErrorCode = 4001 //没有正在自动战斗的数据 ErrorCode_AutoBattleStatesErr ErrorCode = 4002 // 自动战斗状态错误 + // smithy + ErrorCode_SmithyNoReel ErrorCode = 4101 // 没有激活图纸信息 + ErrorCode_SmithyNoTemperature ErrorCode = 4102 // 炉温不够不能打造 ) // Enum value maps for ErrorCode. @@ -581,6 +584,8 @@ var ( 3901: "AcademyTaskNoCompleteTask", 4001: "AutoBattleNoData", 4002: "AutoBattleStatesErr", + 4101: "SmithyNoReel", + 4102: "SmithyNoTemperature", } ErrorCode_value = map[string]int32{ "Success": 0, @@ -844,6 +849,8 @@ var ( "AcademyTaskNoCompleteTask": 3901, "AutoBattleNoData": 4001, "AutoBattleStatesErr": 4002, + "SmithyNoReel": 4101, + "SmithyNoTemperature": 4102, } ) @@ -878,7 +885,7 @@ var File_errorcode_proto protoreflect.FileDescriptor var file_errorcode_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2a, 0x92, 0x2f, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0xbf, 0x2f, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12, 0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, @@ -1255,8 +1262,11 @@ var file_errorcode_proto_rawDesc = []byte{ 0x73, 0x6b, 0x10, 0xbd, 0x1e, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xa1, 0x1f, 0x12, 0x18, 0x0a, 0x13, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, - 0x45, 0x72, 0x72, 0x10, 0xa2, 0x1f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x45, 0x72, 0x72, 0x10, 0xa2, 0x1f, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, + 0x4e, 0x6f, 0x52, 0x65, 0x65, 0x6c, 0x10, 0x85, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, + 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x54, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, + 0x10, 0x86, 0x20, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/pb/smithy_db.pb.go b/pb/smithy_db.pb.go index 8074c955c..1d360c4b2 100644 --- a/pb/smithy_db.pb.go +++ b/pb/smithy_db.pb.go @@ -179,17 +179,20 @@ func (x *DBStove) GetRecoveTime() int64 { return 0 } -// 商人信息 -type DBBusiness struct { +type DBCustomer struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Shop map[int32]int32 `protobuf:"bytes,1,rep,name=shop,proto3" json:"shop" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` + 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"` // + CustomerIds []int32 `protobuf:"varint,3,rep,packed,name=customerIds,proto3" json:"customerIds" bson:"customerIds"` // 顾客Ids + Total int32 `protobuf:"varint,4,opt,name=total,proto3" json:"total" bson:"total"` //顾客累计数 + LastRefreshTime int64 `protobuf:"varint,5,opt,name=lastRefreshTime,proto3" json:"lastRefreshTime" bson:"lastRefreshTime"` // 上次更新时间 } -func (x *DBBusiness) Reset() { - *x = DBBusiness{} +func (x *DBCustomer) Reset() { + *x = DBCustomer{} if protoimpl.UnsafeEnabled { mi := &file_smithy_smithy_db_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -197,13 +200,13 @@ func (x *DBBusiness) Reset() { } } -func (x *DBBusiness) String() string { +func (x *DBCustomer) String() string { return protoimpl.X.MessageStringOf(x) } -func (*DBBusiness) ProtoMessage() {} +func (*DBCustomer) ProtoMessage() {} -func (x *DBBusiness) ProtoReflect() protoreflect.Message { +func (x *DBCustomer) ProtoReflect() protoreflect.Message { mi := &file_smithy_smithy_db_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -215,93 +218,42 @@ func (x *DBBusiness) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use DBBusiness.ProtoReflect.Descriptor instead. -func (*DBBusiness) Descriptor() ([]byte, []int) { +// Deprecated: Use DBCustomer.ProtoReflect.Descriptor instead. +func (*DBCustomer) Descriptor() ([]byte, []int) { return file_smithy_smithy_db_proto_rawDescGZIP(), []int{2} } -func (x *DBBusiness) GetShop() map[int32]int32 { - if x != nil { - return x.Shop - } - return nil -} - -type DBBusinessData struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - 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 - Data []*DBBusiness `protobuf:"bytes,3,rep,name=data,proto3" json:"data"` - Count int32 `protobuf:"varint,4,opt,name=count,proto3" json:"count"` // 刷新次数 - RefreshTime int64 `protobuf:"varint,5,opt,name=refreshTime,proto3" json:"refreshTime" bson:"refreshTime"` //刷新开始时间 -} - -func (x *DBBusinessData) Reset() { - *x = DBBusinessData{} - if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_db_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *DBBusinessData) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*DBBusinessData) ProtoMessage() {} - -func (x *DBBusinessData) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_db_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 DBBusinessData.ProtoReflect.Descriptor instead. -func (*DBBusinessData) Descriptor() ([]byte, []int) { - return file_smithy_smithy_db_proto_rawDescGZIP(), []int{3} -} - -func (x *DBBusinessData) GetId() string { +func (x *DBCustomer) GetId() string { if x != nil { return x.Id } return "" } -func (x *DBBusinessData) GetUid() string { +func (x *DBCustomer) GetUid() string { if x != nil { return x.Uid } return "" } -func (x *DBBusinessData) GetData() []*DBBusiness { +func (x *DBCustomer) GetCustomerIds() []int32 { if x != nil { - return x.Data + return x.CustomerIds } return nil } -func (x *DBBusinessData) GetCount() int32 { +func (x *DBCustomer) GetTotal() int32 { if x != nil { - return x.Count + return x.Total } return 0 } -func (x *DBBusinessData) GetRefreshTime() int64 { +func (x *DBCustomer) GetLastRefreshTime() int64 { if x != nil { - return x.RefreshTime + return x.LastRefreshTime } return 0 } @@ -321,7 +273,7 @@ type DBTujian struct { func (x *DBTujian) Reset() { *x = DBTujian{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_db_proto_msgTypes[4] + mi := &file_smithy_smithy_db_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -334,7 +286,7 @@ func (x *DBTujian) String() string { func (*DBTujian) ProtoMessage() {} func (x *DBTujian) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_db_proto_msgTypes[4] + mi := &file_smithy_smithy_db_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -347,7 +299,7 @@ func (x *DBTujian) ProtoReflect() protoreflect.Message { // Deprecated: Use DBTujian.ProtoReflect.Descriptor instead. func (*DBTujian) Descriptor() ([]byte, []int) { - return file_smithy_smithy_db_proto_rawDescGZIP(), []int{4} + return file_smithy_smithy_db_proto_rawDescGZIP(), []int{3} } func (x *DBTujian) GetId() string { @@ -391,7 +343,7 @@ type ForgeData struct { func (x *ForgeData) Reset() { *x = ForgeData{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_db_proto_msgTypes[5] + mi := &file_smithy_smithy_db_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -404,7 +356,7 @@ func (x *ForgeData) String() string { func (*ForgeData) ProtoMessage() {} func (x *ForgeData) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_db_proto_msgTypes[5] + mi := &file_smithy_smithy_db_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -417,7 +369,7 @@ func (x *ForgeData) ProtoReflect() protoreflect.Message { // Deprecated: Use ForgeData.ProtoReflect.Descriptor instead. func (*ForgeData) Descriptor() ([]byte, []int) { - return file_smithy_smithy_db_proto_rawDescGZIP(), []int{5} + return file_smithy_smithy_db_proto_rawDescGZIP(), []int{4} } func (x *ForgeData) GetForgeCount() int32 { @@ -455,7 +407,7 @@ type Clang struct { func (x *Clang) Reset() { *x = Clang{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_db_proto_msgTypes[6] + mi := &file_smithy_smithy_db_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -468,7 +420,7 @@ func (x *Clang) String() string { func (*Clang) ProtoMessage() {} func (x *Clang) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_db_proto_msgTypes[6] + mi := &file_smithy_smithy_db_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -481,7 +433,7 @@ func (x *Clang) ProtoReflect() protoreflect.Message { // Deprecated: Use Clang.ProtoReflect.Descriptor instead. func (*Clang) Descriptor() ([]byte, []int) { - return file_smithy_smithy_db_proto_rawDescGZIP(), []int{6} + return file_smithy_smithy_db_proto_rawDescGZIP(), []int{5} } func (x *Clang) GetDeskType() int32 { @@ -518,7 +470,7 @@ type OrderClang struct { func (x *OrderClang) Reset() { *x = OrderClang{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_db_proto_msgTypes[7] + mi := &file_smithy_smithy_db_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -531,7 +483,7 @@ func (x *OrderClang) String() string { func (*OrderClang) ProtoMessage() {} func (x *OrderClang) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_db_proto_msgTypes[7] + mi := &file_smithy_smithy_db_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -544,7 +496,7 @@ func (x *OrderClang) ProtoReflect() protoreflect.Message { // Deprecated: Use OrderClang.ProtoReflect.Descriptor instead. func (*OrderClang) Descriptor() ([]byte, []int) { - return file_smithy_smithy_db_proto_rawDescGZIP(), []int{7} + return file_smithy_smithy_db_proto_rawDescGZIP(), []int{6} } func (x *OrderClang) GetDeskType() int32 { @@ -590,7 +542,7 @@ type DBSmithy struct { func (x *DBSmithy) Reset() { *x = DBSmithy{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_db_proto_msgTypes[8] + mi := &file_smithy_smithy_db_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -603,7 +555,7 @@ func (x *DBSmithy) String() string { func (*DBSmithy) ProtoMessage() {} func (x *DBSmithy) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_db_proto_msgTypes[8] + mi := &file_smithy_smithy_db_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -616,7 +568,7 @@ func (x *DBSmithy) ProtoReflect() protoreflect.Message { // Deprecated: Use DBSmithy.ProtoReflect.Descriptor instead. func (*DBSmithy) Descriptor() ([]byte, []int) { - return file_smithy_smithy_db_proto_rawDescGZIP(), []int{8} + return file_smithy_smithy_db_proto_rawDescGZIP(), []int{7} } func (x *DBSmithy) GetId() string { @@ -738,84 +690,78 @@ var file_smithy_smithy_db_proto_rawDesc = []byte{ 0x1a, 0x38, 0x0a, 0x0a, 0x46, 0x6f, 0x72, 0x67, 0x65, 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, 0x22, 0x70, 0x0a, 0x0a, 0x44, 0x42, - 0x42, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x12, 0x29, 0x0a, 0x04, 0x73, 0x68, 0x6f, 0x70, - 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, 0x42, 0x75, 0x73, 0x69, 0x6e, - 0x65, 0x73, 0x73, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, - 0x68, 0x6f, 0x70, 0x1a, 0x37, 0x0a, 0x09, 0x53, 0x68, 0x6f, 0x70, 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, 0x22, 0x8b, 0x01, 0x0a, - 0x0e, 0x44, 0x42, 0x42, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x44, 0x61, 0x74, 0x61, 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, 0x1f, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x0b, 0x2e, 0x44, 0x42, 0x42, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x52, 0x04, 0x64, 0x61, - 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x66, 0x72, - 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x72, - 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x22, 0xba, 0x01, 0x0a, 0x08, 0x44, - 0x42, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 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, 0x2d, 0x0a, 0x06, 0x74, 0x75, 0x6a, - 0x69, 0x61, 0x6e, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, 0x54, 0x75, - 0x6a, 0x69, 0x61, 0x6e, 0x2e, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x52, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x6c, 0x69, 0x64, - 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x6c, 0x69, 0x64, 0x65, 0x72, - 0x1a, 0x45, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, - 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, - 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x0a, 0x2e, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x55, 0x0a, 0x09, 0x46, 0x6f, 0x72, 0x67, 0x65, - 0x44, 0x61, 0x74, 0x61, 0x12, 0x1e, 0x0a, 0x0a, 0x66, 0x6f, 0x72, 0x67, 0x65, 0x43, 0x6f, 0x75, - 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x66, 0x6f, 0x72, 0x67, 0x65, 0x43, - 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x02, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x22, 0x4f, - 0x0a, 0x05, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, - 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, - 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x54, 0x69, - 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x22, - 0x5a, 0x0a, 0x0a, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a, - 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, - 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x82, 0x04, 0x0a, 0x08, - 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 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, 0x1c, 0x0a, 0x05, 0x63, 0x6c, - 0x61, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x43, 0x6c, 0x61, 0x6e, - 0x67, 0x52, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x23, 0x0a, 0x06, 0x6f, 0x72, 0x64, 0x65, - 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, - 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x12, 0x21, 0x0a, - 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, - 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, - 0x12, 0x2a, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x14, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x18, 0x0a, 0x07, - 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, - 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x12, 0x24, 0x0a, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, - 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, - 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, - 0x6d, 0x65, 0x12, 0x36, 0x0a, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, - 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, - 0x2e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, - 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x74, - 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, - 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x6f, - 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x74, - 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, - 0x6c, 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, 0x1a, 0x3c, 0x0a, 0x0e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 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, - 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x90, 0x01, 0x0a, 0x0a, 0x44, + 0x42, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 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, 0x20, 0x0a, 0x0b, 0x63, + 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, + 0x52, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x73, 0x12, 0x14, 0x0a, + 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, + 0x74, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x66, 0x72, 0x65, + 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x6c, 0x61, + 0x73, 0x74, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x22, 0xba, 0x01, + 0x0a, 0x08, 0x44, 0x42, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 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, 0x2d, 0x0a, 0x06, + 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, + 0x42, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x2e, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x73, + 0x6c, 0x69, 0x64, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x6c, 0x69, + 0x64, 0x65, 0x72, 0x1a, 0x45, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x55, 0x0a, 0x09, 0x46, 0x6f, + 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1e, 0x0a, 0x0a, 0x66, 0x6f, 0x72, 0x67, 0x65, + 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x66, 0x6f, 0x72, + 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, + 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, + 0x79, 0x22, 0x4f, 0x0a, 0x05, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, + 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, + 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, + 0x73, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x54, 0x69, + 0x6d, 0x65, 0x22, 0x5a, 0x0a, 0x0a, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, + 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, + 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x82, + 0x04, 0x0a, 0x08, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 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, 0x1c, 0x0a, + 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x43, + 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x23, 0x0a, 0x06, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x4f, 0x72, + 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, + 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, + 0x65, 0x6d, 0x73, 0x12, 0x2a, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x06, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2e, 0x53, 0x6b, + 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12, + 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x12, 0x24, 0x0a, 0x0d, 0x6f, 0x72, 0x64, + 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, + 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, + 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x36, 0x0a, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, + 0x6f, 0x72, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, + 0x74, 0x68, 0x79, 0x2e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x52, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1e, 0x0a, + 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1c, 0x0a, + 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x53, + 0x6b, 0x69, 0x6c, 0x6c, 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, 0x1a, 0x3c, 0x0a, 0x0e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, + 0x6f, 0x72, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( @@ -830,45 +776,41 @@ func file_smithy_smithy_db_proto_rawDescGZIP() []byte { return file_smithy_smithy_db_proto_rawDescData } -var file_smithy_smithy_db_proto_msgTypes = make([]protoimpl.MessageInfo, 16) +var file_smithy_smithy_db_proto_msgTypes = make([]protoimpl.MessageInfo, 14) var file_smithy_smithy_db_proto_goTypes = []interface{}{ - (*Mastery)(nil), // 0: Mastery - (*DBStove)(nil), // 1: DBStove - (*DBBusiness)(nil), // 2: DBBusiness - (*DBBusinessData)(nil), // 3: DBBusinessData - (*DBTujian)(nil), // 4: DBTujian - (*ForgeData)(nil), // 5: ForgeData - (*Clang)(nil), // 6: Clang - (*OrderClang)(nil), // 7: OrderClang - (*DBSmithy)(nil), // 8: DBSmithy - nil, // 9: DBStove.DataEntry - nil, // 10: DBStove.SkillEntry - nil, // 11: DBStove.ForgeEntry - nil, // 12: DBBusiness.ShopEntry - nil, // 13: DBTujian.TujianEntry - nil, // 14: DBSmithy.SkillEntry - nil, // 15: DBSmithy.DeskFloorEntry - (*UserAssets)(nil), // 16: UserAssets + (*Mastery)(nil), // 0: Mastery + (*DBStove)(nil), // 1: DBStove + (*DBCustomer)(nil), // 2: DBCustomer + (*DBTujian)(nil), // 3: DBTujian + (*ForgeData)(nil), // 4: ForgeData + (*Clang)(nil), // 5: Clang + (*OrderClang)(nil), // 6: OrderClang + (*DBSmithy)(nil), // 7: DBSmithy + nil, // 8: DBStove.DataEntry + nil, // 9: DBStove.SkillEntry + nil, // 10: DBStove.ForgeEntry + nil, // 11: DBTujian.TujianEntry + nil, // 12: DBSmithy.SkillEntry + nil, // 13: DBSmithy.DeskFloorEntry + (*UserAssets)(nil), // 14: UserAssets } var file_smithy_smithy_db_proto_depIdxs = []int32{ - 9, // 0: DBStove.data:type_name -> DBStove.DataEntry - 10, // 1: DBStove.skill:type_name -> DBStove.SkillEntry - 11, // 2: DBStove.forge:type_name -> DBStove.ForgeEntry - 12, // 3: DBBusiness.shop:type_name -> DBBusiness.ShopEntry - 2, // 4: DBBusinessData.data:type_name -> DBBusiness - 13, // 5: DBTujian.tujian:type_name -> DBTujian.TujianEntry - 6, // 6: DBSmithy.clang:type_name -> Clang - 7, // 7: DBSmithy.orders:type_name -> OrderClang - 16, // 8: DBSmithy.items:type_name -> UserAssets - 14, // 9: DBSmithy.skill:type_name -> DBSmithy.SkillEntry - 15, // 10: DBSmithy.deskFloor:type_name -> DBSmithy.DeskFloorEntry - 0, // 11: DBStove.DataEntry.value:type_name -> Mastery - 5, // 12: DBTujian.TujianEntry.value:type_name -> ForgeData - 13, // [13:13] is the sub-list for method output_type - 13, // [13:13] is the sub-list for method input_type - 13, // [13:13] is the sub-list for extension type_name - 13, // [13:13] is the sub-list for extension extendee - 0, // [0:13] is the sub-list for field type_name + 8, // 0: DBStove.data:type_name -> DBStove.DataEntry + 9, // 1: DBStove.skill:type_name -> DBStove.SkillEntry + 10, // 2: DBStove.forge:type_name -> DBStove.ForgeEntry + 11, // 3: DBTujian.tujian:type_name -> DBTujian.TujianEntry + 5, // 4: DBSmithy.clang:type_name -> Clang + 6, // 5: DBSmithy.orders:type_name -> OrderClang + 14, // 6: DBSmithy.items:type_name -> UserAssets + 12, // 7: DBSmithy.skill:type_name -> DBSmithy.SkillEntry + 13, // 8: DBSmithy.deskFloor:type_name -> DBSmithy.DeskFloorEntry + 0, // 9: DBStove.DataEntry.value:type_name -> Mastery + 4, // 10: DBTujian.TujianEntry.value:type_name -> ForgeData + 11, // [11:11] is the sub-list for method output_type + 11, // [11:11] is the sub-list for method input_type + 11, // [11:11] is the sub-list for extension type_name + 11, // [11:11] is the sub-list for extension extendee + 0, // [0:11] is the sub-list for field type_name } func init() { file_smithy_smithy_db_proto_init() } @@ -903,7 +845,7 @@ func file_smithy_smithy_db_proto_init() { } } file_smithy_smithy_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DBBusiness); i { + switch v := v.(*DBCustomer); i { case 0: return &v.state case 1: @@ -915,18 +857,6 @@ func file_smithy_smithy_db_proto_init() { } } file_smithy_smithy_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DBBusinessData); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_smithy_smithy_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DBTujian); i { case 0: return &v.state @@ -938,7 +868,7 @@ func file_smithy_smithy_db_proto_init() { return nil } } - file_smithy_smithy_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_smithy_smithy_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ForgeData); i { case 0: return &v.state @@ -950,7 +880,7 @@ func file_smithy_smithy_db_proto_init() { return nil } } - file_smithy_smithy_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_smithy_smithy_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Clang); i { case 0: return &v.state @@ -962,7 +892,7 @@ func file_smithy_smithy_db_proto_init() { return nil } } - file_smithy_smithy_db_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_smithy_smithy_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*OrderClang); i { case 0: return &v.state @@ -974,7 +904,7 @@ func file_smithy_smithy_db_proto_init() { return nil } } - file_smithy_smithy_db_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_smithy_smithy_db_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DBSmithy); i { case 0: return &v.state @@ -993,7 +923,7 @@ func file_smithy_smithy_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_smithy_smithy_db_proto_rawDesc, NumEnums: 0, - NumMessages: 16, + NumMessages: 14, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/smithy_msg.pb.go b/pb/smithy_msg.pb.go index 0fbe0ff3e..894916d5d 100644 --- a/pb/smithy_msg.pb.go +++ b/pb/smithy_msg.pb.go @@ -112,9 +112,9 @@ type SmithyForgeEquipReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - EquipType int32 `protobuf:"varint,1,opt,name=equipType,proto3" json:"equipType"` // 装备类型 - Lava int32 `protobuf:"varint,2,opt,name=lava,proto3" json:"lava"` // 添加熔岩 - Quality int32 `protobuf:"varint,3,opt,name=quality,proto3" json:"quality"` // 精益制造 + ReelId int32 `protobuf:"varint,1,opt,name=reelId,proto3" json:"reelId"` // 卷轴ID + Lava int32 `protobuf:"varint,2,opt,name=lava,proto3" json:"lava"` // 添加熔岩 + Quality int32 `protobuf:"varint,3,opt,name=quality,proto3" json:"quality"` // 精益制造 } func (x *SmithyForgeEquipReq) Reset() { @@ -149,9 +149,9 @@ func (*SmithyForgeEquipReq) Descriptor() ([]byte, []int) { return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{2} } -func (x *SmithyForgeEquipReq) GetEquipType() int32 { +func (x *SmithyForgeEquipReq) GetReelId() int32 { if x != nil { - return x.EquipType + return x.ReelId } return 0 } @@ -680,7 +680,7 @@ type SmithyRefreshShopResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Data *DBBusiness `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` + CustomerIds []int32 `protobuf:"varint,1,rep,packed,name=customerIds,proto3" json:"customerIds"` //顾客 } func (x *SmithyRefreshShopResp) Reset() { @@ -715,9 +715,9 @@ func (*SmithyRefreshShopResp) Descriptor() ([]byte, []int) { return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{13} } -func (x *SmithyRefreshShopResp) GetData() *DBBusiness { +func (x *SmithyRefreshShopResp) GetCustomerIds() []int32 { if x != nil { - return x.Data + return x.CustomerIds } return nil } @@ -728,8 +728,7 @@ type SmithySellItemReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` // 装备ID - Count int32 `protobuf:"varint,2,opt,name=count,proto3" json:"count"` // 数量 + Ids []int32 `protobuf:"varint,1,rep,packed,name=ids,proto3" json:"ids"` // 装备ID } func (x *SmithySellItemReq) Reset() { @@ -764,18 +763,11 @@ func (*SmithySellItemReq) Descriptor() ([]byte, []int) { return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{14} } -func (x *SmithySellItemReq) GetId() int32 { +func (x *SmithySellItemReq) GetIds() []int32 { if x != nil { - return x.Id + return x.Ids } - return 0 -} - -func (x *SmithySellItemReq) GetCount() int32 { - if x != nil { - return x.Count - } - return 0 + return nil } type SmithySellItemResp struct { @@ -783,7 +775,8 @@ type SmithySellItemResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Data *DBBusiness `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` + CustomerId int32 `protobuf:"varint,1,opt,name=customerId,proto3" json:"customerId"` //顾客ID + Ids []int32 `protobuf:"varint,2,rep,packed,name=ids,proto3" json:"ids"` //出售的装备 } func (x *SmithySellItemResp) Reset() { @@ -818,9 +811,16 @@ func (*SmithySellItemResp) Descriptor() ([]byte, []int) { return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{15} } -func (x *SmithySellItemResp) GetData() *DBBusiness { +func (x *SmithySellItemResp) GetCustomerId() int32 { if x != nil { - return x.Data + return x.CustomerId + } + return 0 +} + +func (x *SmithySellItemResp) GetIds() []int32 { + if x != nil { + return x.Ids } return nil } @@ -1380,95 +1380,94 @@ var file_smithy_smithy_msg_proto_rawDesc = []byte{ 0x0a, 0x16, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, - 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x61, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, - 0x46, 0x6f, 0x72, 0x67, 0x65, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, - 0x09, 0x65, 0x71, 0x75, 0x69, 0x70, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x09, 0x65, 0x71, 0x75, 0x69, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6c, - 0x61, 0x76, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x6c, 0x61, 0x76, 0x61, 0x12, - 0x18, 0x0a, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x22, 0x4a, 0x0a, 0x14, 0x53, 0x6d, 0x69, - 0x74, 0x68, 0x79, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52, - 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x79, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4f, - 0x72, 0x64, 0x65, 0x72, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, - 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, - 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x61, 0x76, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x04, 0x6c, 0x61, 0x76, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, - 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, - 0x22, 0x4a, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x45, - 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x71, 0x75, 0x69, - 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x12, 0x1c, - 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, - 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x12, 0x0a, 0x10, - 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x55, 0x70, 0x52, 0x65, 0x71, - 0x22, 0x31, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x55, + 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x5b, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, + 0x46, 0x6f, 0x72, 0x67, 0x65, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, + 0x06, 0x72, 0x65, 0x65, 0x6c, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x72, + 0x65, 0x65, 0x6c, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x61, 0x76, 0x61, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x04, 0x6c, 0x61, 0x76, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, 0x61, + 0x6c, 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x71, 0x75, 0x61, 0x6c, + 0x69, 0x74, 0x79, 0x22, 0x4a, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x46, 0x6f, 0x72, + 0x67, 0x65, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x65, + 0x71, 0x75, 0x69, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x65, 0x71, 0x75, 0x69, + 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, + 0x79, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x45, 0x71, + 0x75, 0x69, 0x70, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, + 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, + 0x6c, 0x61, 0x76, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x6c, 0x61, 0x76, 0x61, + 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x22, 0x4a, 0x0a, 0x14, 0x53, 0x6d, + 0x69, 0x74, 0x68, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, + 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, + 0x53, 0x74, 0x6f, 0x76, 0x65, 0x55, 0x70, 0x52, 0x65, 0x71, 0x22, 0x31, 0x0a, 0x11, 0x53, 0x6d, + 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x55, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, + 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x3d, 0x0a, + 0x0d, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x69, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, + 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2e, 0x0a, 0x0e, + 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x69, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, + 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, + 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x22, 0x0a, 0x10, + 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x55, 0x70, 0x52, 0x65, 0x71, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, + 0x22, 0x31, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x55, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64, - 0x61, 0x74, 0x61, 0x22, 0x3d, 0x0a, 0x0d, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x69, 0x73, - 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, - 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x22, 0x2e, 0x0a, 0x0e, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x69, 0x73, 0x65, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64, 0x61, - 0x74, 0x61, 0x22, 0x22, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x6f, 0x6f, 0x6c, - 0x73, 0x55, 0x70, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x31, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, - 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x55, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, - 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, - 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x16, 0x0a, 0x14, 0x53, 0x6d, 0x69, - 0x74, 0x68, 0x79, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x65, - 0x71, 0x22, 0x38, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x65, 0x66, 0x72, 0x65, - 0x73, 0x68, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x64, 0x61, - 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x42, 0x75, 0x73, - 0x69, 0x6e, 0x65, 0x73, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x39, 0x0a, 0x11, 0x53, - 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, - 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, - 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x35, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, - 0x53, 0x65, 0x6c, 0x6c, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, - 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x42, - 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x39, 0x0a, - 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, - 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x21, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x01, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, - 0x67, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, - 0x68, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, + 0x61, 0x74, 0x61, 0x22, 0x16, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x65, 0x66, + 0x72, 0x65, 0x73, 0x68, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x65, 0x71, 0x22, 0x39, 0x0a, 0x15, 0x53, + 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x53, 0x68, 0x6f, 0x70, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, + 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, + 0x6d, 0x65, 0x72, 0x49, 0x64, 0x73, 0x22, 0x25, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, + 0x53, 0x65, 0x6c, 0x6c, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x69, + 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x03, 0x69, 0x64, 0x73, 0x22, 0x46, 0x0a, + 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x49, 0x74, 0x65, 0x6d, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, + 0x72, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x69, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, + 0x52, 0x03, 0x69, 0x64, 0x73, 0x22, 0x39, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x21, 0x0a, + 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x4f, + 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, + 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, + 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, + 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, + 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, + 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x34, + 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, + 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, + 0x64, 0x61, 0x74, 0x61, 0x22, 0x32, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x44, 0x65, + 0x73, 0x6b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, + 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, + 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, + 0x68, 0x79, 0x44, 0x65, 0x73, 0x6b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, - 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, - 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x34, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, - 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, - 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, - 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x32, 0x0a, 0x14, - 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x44, 0x65, 0x73, 0x6b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, - 0x76, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, - 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x44, 0x65, 0x73, 0x6b, 0x53, 0x6b, - 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, - 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, - 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x17, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, - 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, - 0x71, 0x22, 0x37, 0x0a, 0x16, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, - 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, - 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, - 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x14, 0x53, 0x6d, - 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, - 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x65, 0x6f, 0x70, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x06, 0x70, 0x65, 0x6f, 0x70, 0x6c, 0x65, 0x22, 0x34, 0x0a, 0x15, 0x53, 0x6d, - 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, - 0x22, 0x12, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, - 0x74, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, - 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, - 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, - 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x22, 0x17, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x53, + 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, 0x16, 0x53, 0x6d, 0x69, + 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, + 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x65, + 0x6f, 0x70, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x65, 0x6f, 0x70, + 0x6c, 0x65, 0x22, 0x34, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, + 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x75, + 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, + 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, + 0x68, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x11, + 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, + 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1514,10 +1513,9 @@ var file_smithy_smithy_msg_proto_goTypes = []interface{}{ (*SmithyGetListReq)(nil), // 26: SmithyGetListReq (*SmithyGetListResp)(nil), // 27: SmithyGetListResp (*DBStove)(nil), // 28: DBStove - (*DBBusiness)(nil), // 29: DBBusiness - (*OrderClang)(nil), // 30: OrderClang - (*DBSmithy)(nil), // 31: DBSmithy - (*DBUser)(nil), // 32: DBUser + (*OrderClang)(nil), // 29: OrderClang + (*DBSmithy)(nil), // 30: DBSmithy + (*DBUser)(nil), // 31: DBUser } var file_smithy_smithy_msg_proto_depIdxs = []int32{ 28, // 0: SmithyGetStoveInfoResp.data:type_name -> DBStove @@ -1526,20 +1524,18 @@ var file_smithy_smithy_msg_proto_depIdxs = []int32{ 28, // 3: SmithyStoveUpResp.data:type_name -> DBStove 28, // 4: SmithyRiseResp.data:type_name -> DBStove 28, // 5: SmithyToolsUpResp.data:type_name -> DBStove - 29, // 6: SmithyRefreshShopResp.data:type_name -> DBBusiness - 29, // 7: SmithySellItemResp.data:type_name -> DBBusiness - 30, // 8: SmithyCreateOrderReq.order:type_name -> OrderClang - 31, // 9: SmithyCreateOrderResp.data:type_name -> DBSmithy - 31, // 10: SmithyGetRewardResp.data:type_name -> DBSmithy - 31, // 11: SmithyDeskSkillLvResp.data:type_name -> DBSmithy - 31, // 12: SmithyStoveSkillLvResp.data:type_name -> DBSmithy - 32, // 13: SmithyGetRandUserResp.user:type_name -> DBUser - 31, // 14: SmithyGetListResp.data:type_name -> DBSmithy - 15, // [15:15] is the sub-list for method output_type - 15, // [15:15] is the sub-list for method input_type - 15, // [15:15] is the sub-list for extension type_name - 15, // [15:15] is the sub-list for extension extendee - 0, // [0:15] is the sub-list for field type_name + 29, // 6: SmithyCreateOrderReq.order:type_name -> OrderClang + 30, // 7: SmithyCreateOrderResp.data:type_name -> DBSmithy + 30, // 8: SmithyGetRewardResp.data:type_name -> DBSmithy + 30, // 9: SmithyDeskSkillLvResp.data:type_name -> DBSmithy + 30, // 10: SmithyStoveSkillLvResp.data:type_name -> DBSmithy + 31, // 11: SmithyGetRandUserResp.user:type_name -> DBUser + 30, // 12: SmithyGetListResp.data:type_name -> DBSmithy + 13, // [13:13] is the sub-list for method output_type + 13, // [13:13] is the sub-list for method input_type + 13, // [13:13] is the sub-list for extension type_name + 13, // [13:13] is the sub-list for extension extendee + 0, // [0:13] is the sub-list for field type_name } func init() { file_smithy_smithy_msg_proto_init() } diff --git a/sys/configure/structs/Game.NewSmithyData.go b/sys/configure/structs/Game.NewSmithyData.go index 8b64cbc45..8e683c059 100644 --- a/sys/configure/structs/Game.NewSmithyData.go +++ b/sys/configure/structs/Game.NewSmithyData.go @@ -14,6 +14,11 @@ type GameNewSmithyData struct { Id int32 ItemId int32 Type int32 + Consume []*Gameatn + Temperature int32 + Quality *Gameatn + NDrop int32 + QDrop int32 } const TypeId_GameNewSmithyData = -1249020316 @@ -26,6 +31,24 @@ func (_v *GameNewSmithyData)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["item_id"].(float64); !_ok_ { err = errors.New("item_id error"); return }; _v.ItemId = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["consume"].([]interface{}); !_ok_ { err = errors.New("consume error"); return } + + _v.Consume = 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.Consume = append(_v.Consume, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["temperature"].(float64); !_ok_ { err = errors.New("temperature error"); return }; _v.Temperature = int32(_tempNum_) } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["quality"].(map[string]interface{}); !_ok_ { err = errors.New("quality error"); return }; if _v.Quality, err = DeserializeGameatn(_x_); err != nil { return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["nDrop"].(float64); !_ok_ { err = errors.New("nDrop error"); return }; _v.NDrop = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["qDrop"].(float64); !_ok_ { err = errors.New("qDrop error"); return }; _v.QDrop = int32(_tempNum_) } return } diff --git a/sys/configure/structs/Game.SmithyCustomer.go b/sys/configure/structs/Game.SmithyCustomer.go new file mode 100644 index 000000000..64362a62a --- /dev/null +++ b/sys/configure/structs/Game.SmithyCustomer.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// 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 GameSmithyCustomer struct { + _dataMap map[int32]*GameSmithyCustomerData + _dataList []*GameSmithyCustomerData +} + +func NewGameSmithyCustomer(_buf []map[string]interface{}) (*GameSmithyCustomer, error) { + _dataList := make([]*GameSmithyCustomerData, 0, len(_buf)) + dataMap := make(map[int32]*GameSmithyCustomerData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameSmithyCustomerData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.CustomerId] = _v + } + } + return &GameSmithyCustomer{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameSmithyCustomer) GetDataMap() map[int32]*GameSmithyCustomerData { + return table._dataMap +} + +func (table *GameSmithyCustomer) GetDataList() []*GameSmithyCustomerData { + return table._dataList +} + +func (table *GameSmithyCustomer) Get(key int32) *GameSmithyCustomerData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.SmithyCustomerData.go b/sys/configure/structs/Game.SmithyCustomerData.go new file mode 100644 index 000000000..5f13ad2b8 --- /dev/null +++ b/sys/configure/structs/Game.SmithyCustomerData.go @@ -0,0 +1,69 @@ +//------------------------------------------------------------------------------ +// +// 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 GameSmithyCustomerData struct { + CustomerId int32 + CustomerType int32 + CustomerSpeak string + Goods []*Gameatn + Reword []*Gameatn +} + +const TypeId_GameSmithyCustomerData = 1314583578 + +func (*GameSmithyCustomerData) GetTypeId() int32 { + return 1314583578 +} + +func (_v *GameSmithyCustomerData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["customer_id"].(float64); !_ok_ { err = errors.New("customer_id error"); return }; _v.CustomerId = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["customer_type"].(float64); !_ok_ { err = errors.New("customer_type error"); return }; _v.CustomerType = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["customer_speak"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.CustomerSpeak error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.CustomerSpeak, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["goods"].([]interface{}); !_ok_ { err = errors.New("goods error"); return } + + _v.Goods = 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.Goods = append(_v.Goods, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["reword"].([]interface{}); !_ok_ { err = errors.New("reword error"); return } + + _v.Reword = 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.Reword = append(_v.Reword, _list_v_) + } + } + + return +} + +func DeserializeGameSmithyCustomerData(_buf map[string]interface{}) (*GameSmithyCustomerData, error) { + v := &GameSmithyCustomerData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.pandsmasexp.go b/sys/configure/structs/Game.pandsmasexp.go new file mode 100644 index 000000000..669833432 --- /dev/null +++ b/sys/configure/structs/Game.pandsmasexp.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// 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 Gamepandsmasexp struct { + _dataMap map[int32]*GamepandsmasexpData + _dataList []*GamepandsmasexpData +} + +func NewGamepandsmasexp(_buf []map[string]interface{}) (*Gamepandsmasexp, error) { + _dataList := make([]*GamepandsmasexpData, 0, len(_buf)) + dataMap := make(map[int32]*GamepandsmasexpData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGamepandsmasexpData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &Gamepandsmasexp{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *Gamepandsmasexp) GetDataMap() map[int32]*GamepandsmasexpData { + return table._dataMap +} + +func (table *Gamepandsmasexp) GetDataList() []*GamepandsmasexpData { + return table._dataList +} + +func (table *Gamepandsmasexp) Get(key int32) *GamepandsmasexpData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.pandsmasexpData.go b/sys/configure/structs/Game.pandsmasexpData.go new file mode 100644 index 000000000..5ad352ff6 --- /dev/null +++ b/sys/configure/structs/Game.pandsmasexpData.go @@ -0,0 +1,143 @@ +//------------------------------------------------------------------------------ +// +// 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 GamepandsmasexpData struct { + Id int32 + Bossid int32 + Name string + ReadyID int32 + Difficulty int32 + BattleReadyID int32 + Captionrecommend []int32 + Firstprize []*Gameatn + Dropshow []*Gameatn + Drop int32 + Scene string + Bossmodel int32 + BossSkill int32 + Boss []int32 + PsConsume []*Gameatn + PsMg []*Gameatn +} + +const TypeId_GamepandsmasexpData = 192857656 + +func (*GamepandsmasexpData) GetTypeId() int32 { + return 192857656 +} + +func (_v *GamepandsmasexpData)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["bossid"].(float64); !_ok_ { err = errors.New("bossid error"); return }; _v.Bossid = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ReadyID"].(float64); !_ok_ { err = errors.New("ReadyID error"); return }; _v.ReadyID = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["difficulty"].(float64); !_ok_ { err = errors.New("difficulty error"); return }; _v.Difficulty = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["captionrecommend"].([]interface{}); !_ok_ { err = errors.New("captionrecommend error"); return } + + _v.Captionrecommend = 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.Captionrecommend = append(_v.Captionrecommend, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["firstprize"].([]interface{}); !_ok_ { err = errors.New("firstprize error"); return } + + _v.Firstprize = 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.Firstprize = append(_v.Firstprize, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["dropshow"].([]interface{}); !_ok_ { err = errors.New("dropshow error"); return } + + _v.Dropshow = 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.Dropshow = append(_v.Dropshow, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["drop"].(float64); !_ok_ { err = errors.New("drop error"); return }; _v.Drop = int32(_tempNum_) } + { var _ok_ bool; if _v.Scene, _ok_ = _buf["scene"].(string); !_ok_ { err = errors.New("scene error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bossmodel"].(float64); !_ok_ { err = errors.New("bossmodel error"); return }; _v.Bossmodel = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["boss_skill"].(float64); !_ok_ { err = errors.New("boss_skill error"); return }; _v.BossSkill = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["boss"].([]interface{}); !_ok_ { err = errors.New("boss error"); return } + + _v.Boss = 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.Boss = append(_v.Boss, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["ps_consume"].([]interface{}); !_ok_ { err = errors.New("ps_consume error"); return } + + _v.PsConsume = 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.PsConsume = append(_v.PsConsume, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["ps_mg"].([]interface{}); !_ok_ { err = errors.New("ps_mg error"); return } + + _v.PsMg = 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.PsMg = append(_v.PsMg, _list_v_) + } + } + + return +} + +func DeserializeGamepandsmasexpData(_buf map[string]interface{}) (*GamepandsmasexpData, error) { + v := &GamepandsmasexpData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index f405a1c42..d2557223b 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -163,6 +163,8 @@ type Tables struct { SmithyProficiency *GameSmithyProficiency SmithyStoveV1 *GameSmithyStoveV1 SmithyTool *GameSmithyTool + pandsmasexp *Gamepandsmasexp + SmithyCustomer *GameSmithyCustomer } func NewTables(loader JsonLoader) (*Tables, error) { @@ -1082,5 +1084,17 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.SmithyTool, err = NewGameSmithyTool(buf) ; err != nil { return nil, err } + if buf, err = loader("game_pandsmasexp") ; err != nil { + return nil, err + } + if tables.pandsmasexp, err = NewGamepandsmasexp(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_smithycustomer") ; err != nil { + return nil, err + } + if tables.SmithyCustomer, err = NewGameSmithyCustomer(buf) ; err != nil { + return nil, err + } return tables, nil }