From 5b5d24041d39013540a3fd447484f53fc0ac541c Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 17 May 2023 10:27:05 +0800 Subject: [PATCH 1/7] uopdate --- modules/caravan/api_getstory.go | 34 +++++++++++++++-------- modules/caravan/module.go | 29 ++++++++++++------- pb/caravan_db.pb.go | 49 +++++++++++++++++---------------- 3 files changed, 67 insertions(+), 45 deletions(-) diff --git a/modules/caravan/api_getstory.go b/modules/caravan/api_getstory.go index aa5d5ab8a..96bf89a68 100644 --- a/modules/caravan/api_getstory.go +++ b/modules/caravan/api_getstory.go @@ -16,8 +16,9 @@ func (this *apiComp) GetStoryCheck(session comm.IUserSession, req *pb.CaravanGet func (this *apiComp) GetStory(session comm.IUserSession, req *pb.CaravanGetStoryReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( - resp *pb.CaravanGetStoryResp - update map[string]interface{} + resp *pb.CaravanGetStoryResp + update map[string]interface{} + bAccept bool ) update = make(map[string]interface{}) if code = this.GetStoryCheck(session, req); code != pb.ErrorCode_Success { @@ -39,20 +40,31 @@ func (this *apiComp) GetStory(session comm.IUserSession, req *pb.CaravanGetStory return } if req.Citystory == conf.Citynormal { //接受剧情 - list.Eventid = req.Citystory - list.Task = conf.Worldtask - list.Tasktime = configure.Now().Unix() - update["eventid"] = list.Eventid - update["task"] = list.Task - update["tasktime"] = list.Tasktime - } else { // 拒绝剧情 重置 + module, err := this.service.GetModule(comm.ModuleWorldtask) + if err != nil { + return + } + if wt, ok := module.(comm.IWorldtask); ok { + list.Taskid = wt.GetWorldTaskBy(session.GetUserId(), conf.Worldtask) + if list.Taskid != 0 { // 任务接取成功 + bAccept = true + list.Eventid = req.Citystory + list.Taskid = conf.Worldtask + list.Tasktime = configure.Now().Unix() + update["eventid"] = list.Eventid + update["task"] = list.Taskid + update["tasktime"] = list.Tasktime + } + } + } + if !bAccept { // 拒绝剧情 重置 list.Eventid = 0 - list.Task = 0 + list.Taskid = 0 list.Tasktime = 0 update["eventid"] = list.Eventid - update["task"] = list.Task + update["task"] = list.Taskid update["tasktime"] = list.Tasktime } this.module.modelCaravan.modifyCaravanDataByObjId(session.GetUserId(), update) diff --git a/modules/caravan/module.go b/modules/caravan/module.go index 145cd1967..896d18fdb 100644 --- a/modules/caravan/module.go +++ b/modules/caravan/module.go @@ -17,6 +17,7 @@ type Caravan struct { modelCaravan *modelCaravan api *apiComp configure *configureComp + service core.IService } func NewModule() core.IModule { @@ -29,7 +30,7 @@ func (this *Caravan) GetType() core.M_Modules { func (this *Caravan) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { err = this.ModuleBase.Init(service, module, options) - + this.service = service return } @@ -219,24 +220,32 @@ func (this *Caravan) refreshCaravanItemInfo(uid string, data *pb.DBCaravan) { // 校验随机事件是否超时 func (this *Caravan) CheckCaravanTask(session comm.IUserSession, data *pb.DBCaravan) { if data.Eventid != 0 { - if even := this.configure.GetCaravanEventById(data.Eventid); even != nil { + if list := this.configure.GetCaravanEventById(data.Eventid); list != nil { // 校验任务是否超时 - if data.Tasktime-configure.Now().Unix() > int64(even.Eventtime) { //TODO 任务超时 通知任务模块处理 并清理相关数据 + if data.Tasktime-configure.Now().Unix() > int64(list.Eventtime) { //TODO 任务超时 通知任务模块处理 并清理相关数据 + module, err := this.service.GetModule(comm.ModuleWorldtask) + if err != nil { + return + } + if wt, ok := module.(comm.IWorldtask); ok { + wt.UpdateTaskStatus(session.GetUserId(), data.Taskid) // 通知任务模块 任务超时 + } + this.CleanCaravanTask(session.GetUserId(), data) //任务超时 清理任务数据 // 任务超时发送任务失败推送 resp := &pb.CaravanTaskCompletePush{} resp.Data = data resp.BSuccess = false - if len(even.Unreword) == 2 && even.Unreword[0] == 1 { + if len(list.Unreword) == 2 && list.Unreword[0] == 1 { // 类型为1 的 直接扣除虚拟币 this.ConsumeRes(session, []*cfg.Gameatn{{ A: "attr", T: "merchantmoney", - N: even.Unreword[1], + N: list.Unreword[1], }}, true) resp.Reward = append(resp.Reward, &pb.UserAssets{ A: "attr", T: "merchantmoney", - N: -even.Unreword[1], + N: -list.Unreword[1], // 扣除虚拟币 }) } session.SendMsg(string(this.GetType()), "taskcomplete", resp) @@ -247,18 +256,18 @@ func (this *Caravan) CheckCaravanTask(session comm.IUserSession, data *pb.DBCara func (this *Caravan) CleanCaravanTask(uid string, data *pb.DBCaravan) { if data.Eventid != 0 { data.Eventid = 0 - data.Task = 0 + data.Taskid = 0 data.Tasktime = 0 update := make(map[string]interface{}) update["eventid"] = data.Eventid - update["task"] = data.Task + update["task"] = data.Taskid update["tasktime"] = data.Tasktime this.modelCaravan.modifyCaravanDataByObjId(uid, update) } } func (this *Caravan) TaskComplete(session comm.IUserSession, taskid int32) { - this.Debug("TaskComplete", + this.Debug("Caravan TaskComplete", log.Field{Key: "session", Value: session.GetUserId()}, log.Field{Key: "taskid", Value: taskid}, ) @@ -269,7 +278,7 @@ func (this *Caravan) TaskComplete(session comm.IUserSession, taskid int32) { if conf := this.configure.GetCaravanEventById(taskid); conf != nil { if list, err := this.modelCaravan.getCaravanList(session.GetUserId()); err != nil { - if list.Eventid == taskid { + if list.Taskid == taskid { this.CleanCaravanTask(session.GetUserId(), list) //任务完成 清理任务数据 resp = &pb.CaravanTaskCompletePush{} resp.Data = list diff --git a/pb/caravan_db.pb.go b/pb/caravan_db.pb.go index d540bd2d1..09c551cf4 100644 --- a/pb/caravan_db.pb.go +++ b/pb/caravan_db.pb.go @@ -232,7 +232,7 @@ type DBCaravan struct { Profit int64 `protobuf:"varint,8,opt,name=profit,proto3" json:"profit"` // 虚拟货利润 Resettime int64 `protobuf:"varint,9,opt,name=resettime,proto3" json:"resettime"` // 最后一次重置时间 Curcity int32 `protobuf:"varint,10,opt,name=curcity,proto3" json:"curcity"` // 当前城市 - Task int32 `protobuf:"varint,11,opt,name=task,proto3" json:"task"` // 对应对应世界任务组 worldtask 210 + Taskid int32 `protobuf:"varint,11,opt,name=taskid,proto3" json:"taskid"` // 对应对应世界任务组 worldtask Eventid int32 `protobuf:"varint,12,opt,name=eventid,proto3" json:"eventid"` // 特殊事件ID(事件配置唯一id) Tasktime int64 `protobuf:"varint,13,opt,name=tasktime,proto3" json:"tasktime"` // 任务触发时间 Baglimit int32 `protobuf:"varint,14,opt,name=baglimit,proto3" json:"baglimit"` // 背包上限 @@ -340,9 +340,9 @@ func (x *DBCaravan) GetCurcity() int32 { return 0 } -func (x *DBCaravan) GetTask() int32 { +func (x *DBCaravan) GetTaskid() int32 { if x != nil { - return x.Task + return x.Taskid } return 0 } @@ -394,7 +394,7 @@ var file_caravan_caravan_db_proto_rawDesc = []byte{ 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x22, - 0xdd, 0x04, 0x0a, 0x09, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x12, 0x0e, 0x0a, + 0xe1, 0x04, 0x0a, 0x09, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 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, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, @@ -413,26 +413,27 @@ var file_caravan_caravan_db_proto_rawDesc = []byte{ 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x72, 0x65, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x63, 0x69, 0x74, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x75, 0x72, 0x63, 0x69, 0x74, 0x79, 0x12, - 0x12, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, - 0x61, 0x73, 0x6b, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x0c, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x1a, 0x0a, - 0x08, 0x74, 0x61, 0x73, 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x08, 0x74, 0x61, 0x73, 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x67, - 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x61, 0x67, - 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x42, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d, 0x73, 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, 0x42, 0x61, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x40, 0x0a, 0x0a, 0x47, 0x6f, 0x6f, - 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x47, 0x6f, 0x6f, 0x64, 0x73, - 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42, 0x0a, 0x09, 0x43, - 0x69, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x43, 0x69, 0x74, 0x79, - 0x49, 0x6e, 0x66, 0x6f, 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, + 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x69, 0x64, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x06, 0x74, 0x61, 0x73, 0x6b, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, + 0x69, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, + 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0d, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, + 0x08, 0x62, 0x61, 0x67, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x08, 0x62, 0x61, 0x67, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x42, 0x0a, 0x0a, 0x49, 0x74, 0x65, + 0x6d, 0x73, 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, 0x42, 0x61, 0x67, 0x49, 0x6e, + 0x66, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x40, 0x0a, + 0x0a, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x47, + 0x6f, 0x6f, 0x64, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, + 0x42, 0x0a, 0x09, 0x43, 0x69, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, + 0x43, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 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 ( From 4359c2ac173cccd20ffe1f0cfe5710aba2653994 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Wed, 17 May 2023 11:19:42 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_arenarankreward.json | 40 +- bin/json/game_battleready.json | 30 +- bin/json/game_buzkashigrade.json | 8 +- bin/json/game_coin.json | 59 ++- bin/json/game_global.json | 17 +- bin/json/game_initial.json | 10 + bin/json/game_itemlink.json | 91 +++++ bin/json/game_loading.json | 32 +- bin/json/game_namelibrary.json | 378 ++++++++++++------ bin/json/game_navigation.json | 63 ++- bin/json/game_opencond.json | 2 +- bin/json/game_playerinfor_overview.json | 35 ++ bin/json/game_ruledesc.json | 37 ++ bin/json/game_teaching.json | 150 +++---- bin/json/game_trollgoods.json | 72 ++-- bin/json/game_vikingboss.json | 124 +++--- bin/json/game_vikingbossskill.json | 24 +- bin/json/game_vikingentrance.json | 18 +- bin/json/game_vip.json | 30 +- bin/json/game_worldall.json | 40 +- bin/json/game_worldtask.json | 200 ++++----- comm/core.go | 1 + pb/user_db.pb.go | 144 +++---- sys/configure/structs/Game.BuffType.go | 1 + .../structs/Game.BuzkashiGradeData.go | 4 +- sys/configure/structs/Game.NameLibraryData.go | 2 + .../structs/Game.PlayerInfor_overview.go | 42 ++ .../structs/Game.PlayerInfor_overviewData.go | 60 +++ sys/configure/structs/Game.RuleDesc.go | 42 ++ sys/configure/structs/Game.RuleDescData.go | 39 ++ sys/configure/structs/Tables.go | 14 + sys/configure/structs/game.coinData.go | 17 +- sys/configure/structs/game.globalData.go | 6 + 33 files changed, 1186 insertions(+), 646 deletions(-) create mode 100644 bin/json/game_playerinfor_overview.json create mode 100644 bin/json/game_ruledesc.json create mode 100644 sys/configure/structs/Game.PlayerInfor_overview.go create mode 100644 sys/configure/structs/Game.PlayerInfor_overviewData.go create mode 100644 sys/configure/structs/Game.RuleDesc.go create mode 100644 sys/configure/structs/Game.RuleDescData.go diff --git a/bin/json/game_arenarankreward.json b/bin/json/game_arenarankreward.json index 274a06534..1b708afdc 100644 --- a/bin/json/game_arenarankreward.json +++ b/bin/json/game_arenarankreward.json @@ -11,12 +11,12 @@ { "a": "attr", "t": "gold", - "n": 10000 + "n": 30000 }, { "a": "attr", "t": "diamond", - "n": 50 + "n": 250 } ] }, @@ -32,12 +32,12 @@ { "a": "attr", "t": "gold", - "n": 12000 + "n": 28000 }, { "a": "attr", "t": "diamond", - "n": 70 + "n": 230 } ] }, @@ -53,12 +53,12 @@ { "a": "attr", "t": "gold", - "n": 14000 + "n": 26000 }, { "a": "attr", "t": "diamond", - "n": 90 + "n": 210 } ] }, @@ -74,12 +74,12 @@ { "a": "attr", "t": "gold", - "n": 16000 + "n": 24000 }, { "a": "attr", "t": "diamond", - "n": 110 + "n": 190 } ] }, @@ -95,12 +95,12 @@ { "a": "attr", "t": "gold", - "n": 18000 + "n": 22000 }, { "a": "attr", "t": "diamond", - "n": 130 + "n": 170 } ] }, @@ -137,12 +137,12 @@ { "a": "attr", "t": "gold", - "n": 22000 + "n": 18000 }, { "a": "attr", "t": "diamond", - "n": 170 + "n": 130 } ] }, @@ -158,12 +158,12 @@ { "a": "attr", "t": "gold", - "n": 24000 + "n": 16000 }, { "a": "attr", "t": "diamond", - "n": 190 + "n": 110 } ] }, @@ -179,12 +179,12 @@ { "a": "attr", "t": "gold", - "n": 26000 + "n": 14000 }, { "a": "attr", "t": "diamond", - "n": 210 + "n": 90 } ] }, @@ -200,12 +200,12 @@ { "a": "attr", "t": "gold", - "n": 28000 + "n": 12000 }, { "a": "attr", "t": "diamond", - "n": 230 + "n": 70 } ] }, @@ -221,12 +221,12 @@ { "a": "attr", "t": "gold", - "n": 30000 + "n": 10000 }, { "a": "attr", "t": "diamond", - "n": 250 + "n": 50 } ] } diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index c9d4cfb9e..6e4e87171 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -3,7 +3,7 @@ "id": 100, "PlayType": 3, "HeroCount": 5, - "readyScene": "scenesfight_role_interface_02", + "readyScene": "scenesfight_role_interface_06", "battleScenes": [ "scenesfight_07" ], @@ -19,7 +19,7 @@ "id": 101, "PlayType": 6, "HeroCount": 5, - "readyScene": "scenesfight_role_interface_02", + "readyScene": "scenesfight_role_interface_06", "battleScenes": [ "scenesfight_07" ], @@ -51,7 +51,7 @@ "id": 103, "PlayType": 2, "HeroCount": 5, - "readyScene": "scenesfight_role_interface_03", + "readyScene": "scenesfight_role_interface_05", "battleScenes": [ "scenesfight_06" ], @@ -83,7 +83,7 @@ "id": 105, "PlayType": 7, "HeroCount": 5, - "readyScene": "scenesfight_role_interface_02", + "readyScene": "scenesfight_role_interface_06", "battleScenes": [ "scenesfight_07" ], @@ -99,7 +99,7 @@ "id": 106, "PlayType": 8, "HeroCount": 5, - "readyScene": "scenesfight_role_interface_02", + "readyScene": "scenesfight_role_interface_06", "battleScenes": [ "scenesfight_07" ], @@ -131,7 +131,7 @@ "id": 108, "PlayType": 11, "HeroCount": 5, - "readyScene": "scenesfight_role_interface_02", + "readyScene": "scenesfight_role_interface_06", "battleScenes": [ "scenesfight_07" ], @@ -147,7 +147,7 @@ "id": 109, "PlayType": 10, "HeroCount": 5, - "readyScene": "scenesfight_role_interface_02", + "readyScene": "scenesfight_role_interface_06", "battleScenes": [ "scenesfight_07" ], @@ -163,7 +163,7 @@ "id": 110, "PlayType": 14, "HeroCount": 5, - "readyScene": "scenesfight_role_interface_02", + "readyScene": "scenesfight_role_interface_06", "battleScenes": [ "scenesfight_07" ], @@ -179,7 +179,7 @@ "id": 111, "PlayType": 13, "HeroCount": 5, - "readyScene": "scenesfight_role_interface_02", + "readyScene": "scenesfight_role_interface_06", "battleScenes": [ "scenesfight_07" ], @@ -195,7 +195,7 @@ "id": 112, "PlayType": 2, "HeroCount": 5, - "readyScene": "scenesfight_role_interface_02", + "readyScene": "scenesfight_role_interface_06", "battleScenes": [ "scenesfight_07" ], @@ -211,7 +211,7 @@ "id": 113, "PlayType": 9, "HeroCount": 5, - "readyScene": "scenesfight_role_interface_02", + "readyScene": "scenesfight_role_interface_06", "battleScenes": [ "scenesfight_07" ], @@ -227,7 +227,7 @@ "id": 114, "PlayType": 0, "HeroCount": 5, - "readyScene": "scenesfight_role_interface_02", + "readyScene": "scenesfight_role_interface_06", "battleScenes": [ "scenesfight_07" ], @@ -243,7 +243,7 @@ "id": 115, "PlayType": 0, "HeroCount": 5, - "readyScene": "scenesfight_role_interface_03", + "readyScene": "scenesfight_role_interface_05", "battleScenes": [ "scenesfight_06" ], @@ -259,7 +259,7 @@ "id": 116, "PlayType": 0, "HeroCount": 5, - "readyScene": "scenesfight_role_interface_02", + "readyScene": "scenesfight_role_interface_06", "battleScenes": [ "scenesfight_07" ], @@ -275,7 +275,7 @@ "id": 117, "PlayType": 0, "HeroCount": 5, - "readyScene": "scenesfight_role_interface_03", + "readyScene": "scenesfight_role_interface_05", "battleScenes": [ "scenesfight_06" ], diff --git a/bin/json/game_buzkashigrade.json b/bin/json/game_buzkashigrade.json index 5777e7c27..b2ab8783a 100644 --- a/bin/json/game_buzkashigrade.json +++ b/bin/json/game_buzkashigrade.json @@ -1,22 +1,22 @@ [ { "num": 1, - "distance": "1", + "distance": 1, "value": 8 }, { "num": 2, - "distance": "2", + "distance": 2, "value": 6 }, { "num": 3, - "distance": "3", + "distance": 3, "value": 4 }, { "num": 4, - "distance": "4", + "distance": 4, "value": 2 } ] \ No newline at end of file diff --git a/bin/json/game_coin.json b/bin/json/game_coin.json index 9451289e5..9d6bdd796 100644 --- a/bin/json/game_coin.json +++ b/bin/json/game_coin.json @@ -7,7 +7,9 @@ }, "color": 1, "effects": "", - "access": 123, + "access": [ + 123 + ], "img": "wp_icon_10035", "intr": { "key": "item_coin_intr_1", @@ -22,7 +24,10 @@ }, "color": 2, "effects": "", - "access": 158, + "access": [ + 158, + 165 + ], "img": "wp_icon_10036", "intr": { "key": "item_coin_intr_2", @@ -37,7 +42,9 @@ }, "color": 3, "effects": "", - "access": 113, + "access": [ + 113 + ], "img": "icon_hy", "intr": { "key": "item_coin_intr_3", @@ -52,7 +59,9 @@ }, "color": 1, "effects": "", - "access": 115, + "access": [ + 115 + ], "img": "wp_icon_10014", "intr": { "key": "item_coin_intr_4", @@ -67,7 +76,9 @@ }, "color": 3, "effects": "", - "access": 113, + "access": [ + 113 + ], "img": "wp_icon_0002", "intr": { "key": "item_coin_intr_5", @@ -82,7 +93,9 @@ }, "color": 1, "effects": "", - "access": 157, + "access": [ + 157 + ], "img": "wp_icon_10024", "intr": { "key": "item_coin_intr_6", @@ -97,7 +110,9 @@ }, "color": 1, "effects": "", - "access": 157, + "access": [ + 157 + ], "img": "wp_icon_0001", "intr": { "key": "item_coin_intr_7", @@ -112,7 +127,9 @@ }, "color": 3, "effects": "", - "access": 157, + "access": [ + 157 + ], "img": "wp_icon_10017", "intr": { "key": "item_coin_intr_8", @@ -127,7 +144,9 @@ }, "color": 3, "effects": "", - "access": 158, + "access": [ + 158 + ], "img": "wp_icon_10017", "intr": { "key": "item_coin_intr_9", @@ -142,7 +161,9 @@ }, "color": 3, "effects": "", - "access": 158, + "access": [ + 158 + ], "img": "wp_icon_0002", "intr": { "key": "item_coin_intr_10", @@ -157,7 +178,9 @@ }, "color": 3, "effects": "", - "access": 156, + "access": [ + 156 + ], "img": "icon_ry", "intr": { "key": "item_coin_intr_11", @@ -172,7 +195,9 @@ }, "color": 3, "effects": "", - "access": 156, + "access": [ + 156 + ], "img": "wp_icon_0002", "intr": { "key": "item_coin_intr_12", @@ -187,7 +212,7 @@ }, "color": 3, "effects": "", - "access": 0, + "access": [], "img": "wp_icon_10009", "intr": { "key": "item_coin_intr_13", @@ -202,7 +227,9 @@ }, "color": 5, "effects": "", - "access": 107, + "access": [ + 107 + ], "img": "wp_icon_10009", "intr": { "key": "item_coin_intr_14", @@ -217,7 +244,9 @@ }, "color": 5, "effects": "", - "access": 107, + "access": [ + 107 + ], "img": "wp_icon_10009", "intr": { "key": "item_coin_intr_15", diff --git a/bin/json/game_global.json b/bin/json/game_global.json index dd07edf31..2c76435ee 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -286,14 +286,10 @@ "arena_RecordMax": 10, "arena_RefreshCd": 10, "show_male": [ - 100001, - 100002, - 100003 + 100001 ], "show_female": [ - 200001, - 200002, - 200003 + 200001 ], "horoscope_reset_cost": { "a": "attr", @@ -738,8 +734,11 @@ "mounts": "20030001", "buzkashi_recentPlayer": 10, "task_activation": 15010101, - "buzkashi_speedbumptime": 1000, - "buzkashi_recovertime": 1000, - "buzkashi_recoverHp": 1 + "buzkashi_speedbumptime": 3000, + "buzkashi_recovertime": 2000, + "buzkashi_recoverHp": 1, + "buzkashi_deathspeed": 800, + "buzkashi_goal": 2000, + "buzkashi_goalspeed": 800 } ] \ No newline at end of file diff --git a/bin/json/game_initial.json b/bin/json/game_initial.json index 369d70f05..0e24d6e5b 100644 --- a/bin/json/game_initial.json +++ b/bin/json/game_initial.json @@ -1858,5 +1858,15 @@ "n": 33 } ] + }, + { + "index": "352", + "var": [ + { + "a": "mts", + "t": "20030001", + "n": 1 + } + ] } ] \ No newline at end of file diff --git a/bin/json/game_itemlink.json b/bin/json/game_itemlink.json index 9ed264b08..8006812f6 100644 --- a/bin/json/game_itemlink.json +++ b/bin/json/game_itemlink.json @@ -89,5 +89,96 @@ }, "jumpid": 1128, "icon": "zc_icon_04_ct" + }, + { + "id": 158, + "title": { + "key": "jump_explain158", + "text": "充值钻石" + }, + "desc": { + "key": "jump_explain158", + "text": "充值钻石" + }, + "jumpid": 158, + "icon": "zc_icon_03" + }, + { + "id": 113, + "title": { + "key": "jump_explain113", + "text": "主线章节界面" + }, + "desc": { + "key": "jump_explain113", + "text": "主线章节界面" + }, + "jumpid": 113, + "icon": "zc_icon_05_ct" + }, + { + "id": 115, + "title": { + "key": "jump_explain115", + "text": "好友列表" + }, + "desc": { + "key": "jump_explain115", + "text": "好友列表" + }, + "jumpid": 115, + "icon": "zc_shuru02" + }, + { + "id": 157, + "title": { + "key": "jump_explain157", + "text": "公会" + }, + "desc": { + "key": "jump_explain157", + "text": "公会" + }, + "jumpid": 157, + "icon": "icon_sytj" + }, + { + "id": 156, + "title": { + "key": "jump_explain156", + "text": "竞技场" + }, + "desc": { + "key": "jump_explain156", + "text": "竞技场" + }, + "jumpid": 156, + "icon": "ty_qp_jjc" + }, + { + "id": 107, + "title": { + "key": "jump_explain107", + "text": "普通招募" + }, + "desc": { + "key": "jump_explain107", + "text": "普通招募" + }, + "jumpid": 107, + "icon": "icon_zm" + }, + { + "id": 165, + "title": { + "key": "jump_explain165", + "text": "前往vip" + }, + "desc": { + "key": "jump_explain165", + "text": "前往vip" + }, + "jumpid": 165, + "icon": "icon_sytj" } ] \ No newline at end of file diff --git a/bin/json/game_loading.json b/bin/json/game_loading.json index 438b62f55..69e2db481 100644 --- a/bin/json/game_loading.json +++ b/bin/json/game_loading.json @@ -5,7 +5,7 @@ "image": "loading_2", "prompt": { "key": "loading_Sheet1_prompt_1", - "text": "这里是提示语这里是提示语这里是提示语这里是提示语这里是提示语这里是提示语这里是提示语这里是提示语这里是提示语这里是提示语这里是提示语这里是提示语这里是提示语" + "text": "中轴城是终极之战后重建的世界首都，靠先进技术串联幸存世界。" } }, { @@ -14,7 +14,7 @@ "image": "ld_5v5_bg1", "prompt": { "key": "loading_Sheet1_prompt_2", - "text": "这里是提示语" + "text": "指挥部里储存着很多月光原石，看起来有大用处。" } }, { @@ -23,7 +23,7 @@ "image": "ld_boss_bg", "prompt": { "key": "loading_Sheet1_prompt_3", - "text": "这里是提示语" + "text": "快跟着浣熊师父学功夫吧，争取像阿宝一样成为让世人尊敬的大侠。" } }, { @@ -32,7 +32,7 @@ "image": "ld_5v5_bg", "prompt": { "key": "loading_Sheet1_prompt_4", - "text": "这里是提示语" + "text": "艺术家戈伯随时等你带着好酒好菜去找他打造装备哦。" } }, { @@ -41,7 +41,7 @@ "image": "loading_2", "prompt": { "key": "loading_Sheet1_prompt_5", - "text": "这里是提示语" + "text": "想知道用速度与激情捕羊的乐趣吗？" } }, { @@ -50,7 +50,7 @@ "image": "ld_5v5_bg1", "prompt": { "key": "loading_Sheet1_prompt_6", - "text": "这里是提示语" + "text": "公会是一处和其他守护者拉近距离的好地方呢。" } }, { @@ -59,7 +59,7 @@ "image": "ld_boss_bg", "prompt": { "key": "loading_Sheet1_prompt_7", - "text": "这里是提示语" + "text": "想体会友好切磋的魅力吗？竞技场是不二的选择。" } }, { @@ -68,7 +68,7 @@ "image": "ld_5v5_bg", "prompt": { "key": "loading_Sheet1_prompt_8", - "text": "这里是提示语" + "text": "商人们经常乘着巨怪列车外出，回来时总会带些新奇的小玩意。" } }, { @@ -77,7 +77,7 @@ "image": "loading_2", "prompt": { "key": "loading_Sheet1_prompt_9", - "text": "这里是提示语" + "text": "遇到困境时，不妨去圣桃树看看，或许能找到破除困境的方法。" } }, { @@ -86,7 +86,7 @@ "image": "ld_5v5_bg1", "prompt": { "key": "loading_Sheet1_prompt_10", - "text": "这里是提示语" + "text": "穿越时间地图，重温过去那些精彩瞬间，获得新的战斗经验。" } }, { @@ -95,7 +95,7 @@ "image": "ld_boss_bg", "prompt": { "key": "loading_Sheet1_prompt_11", - "text": "这里是提示语" + "text": "在这个融合首都里，似乎隐藏着什么危机......" } }, { @@ -104,7 +104,7 @@ "image": "ld_5v5_bg", "prompt": { "key": "loading_Sheet1_prompt_12", - "text": "这里是提示语" + "text": "疯狂原始人 力气大是原始人的特点之一。" } }, { @@ -113,7 +113,7 @@ "image": "loading_2", "prompt": { "key": "loading_Sheet1_prompt_13", - "text": "这里是提示语" + "text": "相信自己是特别的，是习得绝世神功的秘钥。" } }, { @@ -122,7 +122,7 @@ "image": "ld_5v5_bg1", "prompt": { "key": "loading_Sheet1_prompt_14", - "text": "这里是提示语" + "text": "坏蛋联盟心中有一朵善良之花，花开时，全身蔓延着愉快的刺激感。" } }, { @@ -131,7 +131,7 @@ "image": "ld_boss_bg", "prompt": { "key": "loading_Sheet1_prompt_15", - "text": "这里是提示语" + "text": "森林深处的巨型猩猩身上似乎藏着很多觉醒材料。" } }, { @@ -140,7 +140,7 @@ "image": "ld_boss_bg", "prompt": { "key": "loading_Sheet1_prompt_16", - "text": "这里是提示语" + "text": "打败森林泰坦就能获得打造辅助套装的材料。" } } ] \ No newline at end of file diff --git a/bin/json/game_namelibrary.json b/bin/json/game_namelibrary.json index aa7c3d502..bc508572d 100644 --- a/bin/json/game_namelibrary.json +++ b/bin/json/game_namelibrary.json @@ -8,7 +8,8 @@ "name": { "key": "name_name_name_1", "text": "辛巴达" - } + }, + "sex": 2 }, { "id": 2, @@ -19,7 +20,8 @@ "name": { "key": "name_name_name_2", "text": "艾丽莎" - } + }, + "sex": 2 }, { "id": 3, @@ -30,7 +32,8 @@ "name": { "key": "name_name_name_3", "text": "海柔尔" - } + }, + "sex": 2 }, { "id": 4, @@ -41,7 +44,8 @@ "name": { "key": "name_name_name_4", "text": "塞莉亚" - } + }, + "sex": 2 }, { "id": 5, @@ -52,7 +56,8 @@ "name": { "key": "name_name_name_5", "text": "灰姑凉" - } + }, + "sex": 2 }, { "id": 6, @@ -63,7 +68,8 @@ "name": { "key": "name_name_name_6", "text": "哈迪" - } + }, + "sex": 2 }, { "id": 7, @@ -74,7 +80,8 @@ "name": { "key": "name_name_name_7", "text": "爱莉儿" - } + }, + "sex": 2 }, { "id": 8, @@ -85,7 +92,8 @@ "name": { "key": "name_name_name_8", "text": "贝尔" - } + }, + "sex": 2 }, { "id": 9, @@ -96,7 +104,8 @@ "name": { "key": "name_name_name_9", "text": "爱洛" - } + }, + "sex": 2 }, { "id": 10, @@ -107,7 +116,8 @@ "name": { "key": "name_name_name_10", "text": "茉莉" - } + }, + "sex": 2 }, { "id": 11, @@ -118,7 +128,8 @@ "name": { "key": "name_name_name_11", "text": "蒂安娜" - } + }, + "sex": 2 }, { "id": 12, @@ -129,7 +140,8 @@ "name": { "key": "name_name_name_12", "text": "乐佩" - } + }, + "sex": 2 }, { "id": 13, @@ -140,7 +152,8 @@ "name": { "key": "name_name_name_13", "text": "爱罗拉" - } + }, + "sex": 2 }, { "id": 14, @@ -151,7 +164,8 @@ "name": { "key": "name_name_name_14", "text": "塔利娅" - } + }, + "sex": 2 }, { "id": 15, @@ -162,7 +176,8 @@ "name": { "key": "name_name_name_15", "text": "佩洛" - } + }, + "sex": 2 }, { "id": 16, @@ -173,7 +188,8 @@ "name": { "key": "name_name_name_16", "text": "汉塞尔" - } + }, + "sex": 2 }, { "id": 17, @@ -184,7 +200,8 @@ "name": { "key": "name_name_name_17", "text": "桃乐丝" - } + }, + "sex": 2 }, { "id": 18, @@ -195,7 +212,8 @@ "name": { "key": "name_name_name_18", "text": "爱丽丝" - } + }, + "sex": 2 }, { "id": 19, @@ -206,7 +224,8 @@ "name": { "key": "name_name_name_19", "text": "小矮人" - } + }, + "sex": 2 }, { "id": 20, @@ -217,7 +236,8 @@ "name": { "key": "name_name_name_20", "text": "白雪" - } + }, + "sex": 2 }, { "id": 21, @@ -228,7 +248,8 @@ "name": { "key": "name_name_name_21", "text": "玛娅" - } + }, + "sex": 2 }, { "id": 22, @@ -239,7 +260,8 @@ "name": { "key": "name_name_name_22", "text": "阿拉丁" - } + }, + "sex": 2 }, { "id": 23, @@ -250,7 +272,8 @@ "name": { "key": "name_name_name_23", "text": "查理" - } + }, + "sex": 2 }, { "id": 24, @@ -261,7 +284,8 @@ "name": { "key": "name_name_name_24", "text": "伊凡" - } + }, + "sex": 2 }, { "id": 25, @@ -272,7 +296,8 @@ "name": { "key": "name_name_name_25", "text": "奥斯汀" - } + }, + "sex": 2 }, { "id": 26, @@ -283,7 +308,8 @@ "name": { "key": "name_name_name_26", "text": "赫瑟尔" - } + }, + "sex": 2 }, { "id": 27, @@ -294,7 +320,8 @@ "name": { "key": "name_name_name_27", "text": "夏洛特" - } + }, + "sex": 2 }, { "id": 28, @@ -305,7 +332,8 @@ "name": { "key": "name_name_name_28", "text": "海洛伊" - } + }, + "sex": 2 }, { "id": 29, @@ -316,7 +344,8 @@ "name": { "key": "name_name_name_29", "text": "克莱儿" - } + }, + "sex": 2 }, { "id": 30, @@ -327,7 +356,8 @@ "name": { "key": "name_name_name_30", "text": "巴比特" - } + }, + "sex": 2 }, { "id": 31, @@ -338,7 +368,8 @@ "name": { "key": "name_name_name_31", "text": "胡尔达" - } + }, + "sex": 2 }, { "id": 32, @@ -349,7 +380,8 @@ "name": { "key": "name_name_name_32", "text": "克莱拉" - } + }, + "sex": 2 }, { "id": 33, @@ -360,7 +392,8 @@ "name": { "key": "name_name_name_33", "text": "艾尔玛" - } + }, + "sex": 2 }, { "id": 34, @@ -371,7 +404,8 @@ "name": { "key": "name_name_name_34", "text": "康斯坦" - } + }, + "sex": 2 }, { "id": 35, @@ -382,7 +416,8 @@ "name": { "key": "name_name_name_35", "text": "鲍德温" - } + }, + "sex": 2 }, { "id": 36, @@ -393,7 +428,8 @@ "name": { "key": "name_name_name_36", "text": "伊莎尔" - } + }, + "sex": 2 }, { "id": 37, @@ -404,7 +440,8 @@ "name": { "key": "name_name_name_37", "text": "巴纳德" - } + }, + "sex": 2 }, { "id": 38, @@ -415,7 +452,8 @@ "name": { "key": "name_name_name_38", "text": "杰奎琳" - } + }, + "sex": 2 }, { "id": 39, @@ -426,7 +464,8 @@ "name": { "key": "name_name_name_39", "text": "卡洛儿" - } + }, + "sex": 2 }, { "id": 40, @@ -437,7 +476,8 @@ "name": { "key": "name_name_name_40", "text": "妮莉雅" - } + }, + "sex": 2 }, { "id": 41, @@ -448,7 +488,8 @@ "name": { "key": "name_name_name_41", "text": "巴雷特" - } + }, + "sex": 2 }, { "id": 42, @@ -459,7 +500,8 @@ "name": { "key": "name_name_name_42", "text": "希伯来" - } + }, + "sex": 2 }, { "id": 43, @@ -470,7 +512,8 @@ "name": { "key": "name_name_name_43", "text": "乔伊斯" - } + }, + "sex": 2 }, { "id": 44, @@ -481,7 +524,8 @@ "name": { "key": "name_name_name_44", "text": "黛芙妮" - } + }, + "sex": 2 }, { "id": 45, @@ -492,7 +536,8 @@ "name": { "key": "name_name_name_45", "text": "巴塞洛" - } + }, + "sex": 2 }, { "id": 46, @@ -503,7 +548,8 @@ "name": { "key": "name_name_name_46", "text": "达莲娜" - } + }, + "sex": 2 }, { "id": 47, @@ -514,7 +560,8 @@ "name": { "key": "name_name_name_47", "text": "巴利特" - } + }, + "sex": 2 }, { "id": 48, @@ -525,7 +572,8 @@ "name": { "key": "name_name_name_48", "text": "迪得莉" - } + }, + "sex": 2 }, { "id": 49, @@ -536,7 +584,8 @@ "name": { "key": "name_name_name_49", "text": "金百莉" - } + }, + "sex": 2 }, { "id": 50, @@ -547,7 +596,8 @@ "name": { "key": "name_name_name_50", "text": "迪丽雅" - } + }, + "sex": 2 }, { "id": 51, @@ -558,7 +608,8 @@ "name": { "key": "name_name_name_51", "text": "丹尼丝" - } + }, + "sex": 2 }, { "id": 52, @@ -569,7 +620,8 @@ "name": { "key": "name_name_name_52", "text": "比尔德" - } + }, + "sex": 2 }, { "id": 53, @@ -580,7 +632,8 @@ "name": { "key": "name_name_name_53", "text": "克里斯" - } + }, + "sex": 2 }, { "id": 54, @@ -591,7 +644,8 @@ "name": { "key": "name_name_name_54", "text": "黛安娜" - } + }, + "sex": 2 }, { "id": 55, @@ -602,7 +656,8 @@ "name": { "key": "name_name_name_55", "text": "博福特" - } + }, + "sex": 2 }, { "id": 56, @@ -613,7 +668,8 @@ "name": { "key": "name_name_name_56", "text": "罗瑞尔" - } + }, + "sex": 2 }, { "id": 57, @@ -624,7 +680,8 @@ "name": { "key": "name_name_name_57", "text": "伊迪丝" - } + }, + "sex": 2 }, { "id": 58, @@ -635,7 +692,8 @@ "name": { "key": "name_name_name_58", "text": "弗伦丝" - } + }, + "sex": 2 }, { "id": 59, @@ -646,7 +704,8 @@ "name": { "key": "name_name_name_59", "text": "弗莉达" - } + }, + "sex": 2 }, { "id": 60, @@ -657,7 +716,8 @@ "name": { "key": "name_name_name_60", "text": "菲蕾卡" - } + }, + "sex": 2 }, { "id": 61, @@ -668,7 +728,8 @@ "name": { "key": "name_name_name_61", "text": "维多利" - } + }, + "sex": 2 }, { "id": 62, @@ -679,7 +740,8 @@ "name": { "key": "name_name_name_62", "text": "嘉比拉" - } + }, + "sex": 2 }, { "id": 63, @@ -690,7 +752,8 @@ "name": { "key": "name_name_name_63", "text": "乔治亚" - } + }, + "sex": 2 }, { "id": 64, @@ -701,7 +764,8 @@ "name": { "key": "name_name_name_64", "text": "比勒尔" - } + }, + "sex": 2 }, { "id": 65, @@ -712,7 +776,8 @@ "name": { "key": "name_name_name_65", "text": "珍妮芙" - } + }, + "sex": 2 }, { "id": 66, @@ -723,7 +788,8 @@ "name": { "key": "name_name_name_66", "text": "吉榭尔" - } + }, + "sex": 2 }, { "id": 67, @@ -734,7 +800,8 @@ "name": { "key": "name_name_name_67", "text": "雷德姬" - } + }, + "sex": 2 }, { "id": 68, @@ -745,7 +812,8 @@ "name": { "key": "name_name_name_68", "text": "布莱克" - } + }, + "sex": 2 }, { "id": 69, @@ -756,7 +824,8 @@ "name": { "key": "name_name_name_69", "text": "桑席" - } + }, + "sex": 2 }, { "id": 70, @@ -767,7 +836,8 @@ "name": { "key": "name_name_name_70", "text": "格拉迪" - } + }, + "sex": 2 }, { "id": 71, @@ -778,7 +848,8 @@ "name": { "key": "name_name_name_71", "text": "布卢默" - } + }, + "sex": 2 }, { "id": 72, @@ -789,7 +860,8 @@ "name": { "key": "name_name_name_72", "text": "耶达" - } + }, + "sex": 2 }, { "id": 73, @@ -800,7 +872,8 @@ "name": { "key": "name_name_name_73", "text": "葛瑞丝" - } + }, + "sex": 2 }, { "id": 74, @@ -811,7 +884,8 @@ "name": { "key": "name_name_name_74", "text": "菲尔德" - } + }, + "sex": 2 }, { "id": 75, @@ -822,7 +896,8 @@ "name": { "key": "name_name_name_75", "text": "小仙女" - } + }, + "sex": 2 }, { "id": 76, @@ -833,7 +908,8 @@ "name": { "key": "name_name_name_76", "text": "谢尔达" - } + }, + "sex": 2 }, { "id": 77, @@ -844,7 +920,8 @@ "name": { "key": "name_name_name_77", "text": "丝塔芙" - } + }, + "sex": 2 }, { "id": 78, @@ -855,7 +932,8 @@ "name": { "key": "name_name_name_78", "text": "布卢尔" - } + }, + "sex": 1 }, { "id": 79, @@ -866,7 +944,8 @@ "name": { "key": "name_name_name_79", "text": "关德琳" - } + }, + "sex": 1 }, { "id": 80, @@ -877,7 +956,8 @@ "name": { "key": "name_name_name_80", "text": "希伯来" - } + }, + "sex": 1 }, { "id": 81, @@ -888,7 +968,8 @@ "name": { "key": "name_name_name_81", "text": "布卢姆" - } + }, + "sex": 1 }, { "id": 82, @@ -899,7 +980,8 @@ "name": { "key": "name_name_name_82", "text": "哈莉特" - } + }, + "sex": 1 }, { "id": 83, @@ -910,7 +992,8 @@ "name": { "key": "name_name_name_83", "text": "乔伊斯" - } + }, + "sex": 1 }, { "id": 84, @@ -921,7 +1004,8 @@ "name": { "key": "name_name_name_84", "text": "赫瑟尔" - } + }, + "sex": 1 }, { "id": 85, @@ -932,7 +1016,8 @@ "name": { "key": "name_name_name_85", "text": "博斯韦" - } + }, + "sex": 1 }, { "id": 86, @@ -943,7 +1028,8 @@ "name": { "key": "name_name_name_86", "text": "罗瑞尔" - } + }, + "sex": 1 }, { "id": 87, @@ -954,7 +1040,8 @@ "name": { "key": "name_name_name_87", "text": "希尔达" - } + }, + "sex": 1 }, { "id": 88, @@ -965,7 +1052,8 @@ "name": { "key": "name_name_name_88", "text": "希拉莉" - } + }, + "sex": 1 }, { "id": 89, @@ -976,7 +1064,8 @@ "name": { "key": "name_name_name_89", "text": "波伊尔" - } + }, + "sex": 1 }, { "id": 90, @@ -987,7 +1076,8 @@ "name": { "key": "name_name_name_90", "text": "汉妮" - } + }, + "sex": 1 }, { "id": 91, @@ -998,7 +1088,8 @@ "name": { "key": "name_name_name_91", "text": "布拉德" - } + }, + "sex": 1 }, { "id": 92, @@ -1009,7 +1100,8 @@ "name": { "key": "name_name_name_92", "text": "埃达" - } + }, + "sex": 1 }, { "id": 93, @@ -1020,7 +1112,8 @@ "name": { "key": "name_name_name_93", "text": "艾娜" - } + }, + "sex": 1 }, { "id": 94, @@ -1031,7 +1124,8 @@ "name": { "key": "name_name_name_94", "text": "英格丽" - } + }, + "sex": 1 }, { "id": 95, @@ -1042,7 +1136,8 @@ "name": { "key": "name_name_name_95", "text": "薇薇安" - } + }, + "sex": 1 }, { "id": 96, @@ -1053,7 +1148,8 @@ "name": { "key": "name_name_name_96", "text": "塞尔特" - } + }, + "sex": 1 }, { "id": 97, @@ -1064,7 +1160,8 @@ "name": { "key": "name_name_name_97", "text": "布里奇" - } + }, + "sex": 1 }, { "id": 98, @@ -1075,7 +1172,8 @@ "name": { "key": "name_name_name_98", "text": "艾琳" - } + }, + "sex": 1 }, { "id": 99, @@ -1086,7 +1184,8 @@ "name": { "key": "name_name_name_99", "text": "麦格" - } + }, + "sex": 1 }, { "id": 100, @@ -1097,7 +1196,8 @@ "name": { "key": "name_name_name_100", "text": "布赖特" - } + }, + "sex": 1 }, { "id": 101, @@ -1108,7 +1208,8 @@ "name": { "key": "name_name_name_101", "text": "爱莉丝" - } + }, + "sex": 1 }, { "id": 102, @@ -1119,7 +1220,8 @@ "name": { "key": "name_name_name_102", "text": "梅根" - } + }, + "sex": 1 }, { "id": 103, @@ -1130,7 +1232,8 @@ "name": { "key": "name_name_name_103", "text": "布罗德" - } + }, + "sex": 1 }, { "id": 104, @@ -1141,7 +1244,8 @@ "name": { "key": "name_name_name_104", "text": "艾尔玛" - } + }, + "sex": 1 }, { "id": 105, @@ -1152,7 +1256,8 @@ "name": { "key": "name_name_name_105", "text": "欧尔佳" - } + }, + "sex": 1 }, { "id": 106, @@ -1163,7 +1268,8 @@ "name": { "key": "name_name_name_106", "text": "白朗蒂" - } + }, + "sex": 1 }, { "id": 107, @@ -1174,7 +1280,8 @@ "name": { "key": "name_name_name_107", "text": "伊莎蓓" - } + }, + "sex": 1 }, { "id": 108, @@ -1185,7 +1292,8 @@ "name": { "key": "name_name_name_108", "text": "波比" - } + }, + "sex": 1 }, { "id": 109, @@ -1196,7 +1304,8 @@ "name": { "key": "name_name_name_109", "text": "艾薇" - } + }, + "sex": 1 }, { "id": 110, @@ -1207,7 +1316,8 @@ "name": { "key": "name_name_name_110", "text": "罗伯塔" - } + }, + "sex": 1 }, { "id": 111, @@ -1218,7 +1328,8 @@ "name": { "key": "name_name_name_111", "text": "布鲁克" - } + }, + "sex": 1 }, { "id": 112, @@ -1229,7 +1340,8 @@ "name": { "key": "name_name_name_112", "text": "杰奎琳" - } + }, + "sex": 1 }, { "id": 113, @@ -1240,7 +1352,8 @@ "name": { "key": "name_name_name_113", "text": "鲁思" - } + }, + "sex": 1 }, { "id": 114, @@ -1251,7 +1364,8 @@ "name": { "key": "name_name_name_114", "text": "丝柏凌" - } + }, + "sex": 1 }, { "id": 115, @@ -1262,7 +1376,8 @@ "name": { "key": "name_name_name_115", "text": "布朗" - } + }, + "sex": 1 }, { "id": 116, @@ -1273,7 +1388,8 @@ "name": { "key": "name_name_name_116", "text": "丝特勒" - } + }, + "sex": 1 }, { "id": 117, @@ -1284,7 +1400,8 @@ "name": { "key": "name_name_name_117", "text": "布朗宁" - } + }, + "sex": 1 }, { "id": 118, @@ -1295,7 +1412,8 @@ "name": { "key": "name_name_name_118", "text": "珍妮特" - } + }, + "sex": 1 }, { "id": 119, @@ -1306,7 +1424,8 @@ "name": { "key": "name_name_name_119", "text": "托比" - } + }, + "sex": 1 }, { "id": 120, @@ -1317,7 +1436,8 @@ "name": { "key": "name_name_name_120", "text": "勃朗宁" - } + }, + "sex": 1 }, { "id": 121, @@ -1328,7 +1448,8 @@ "name": { "key": "name_name_name_121", "text": "珍尼丝" - } + }, + "sex": 1 }, { "id": 122, @@ -1339,7 +1460,8 @@ "name": { "key": "name_name_name_122", "text": "厄休拉" - } + }, + "sex": 1 }, { "id": 123, @@ -1350,7 +1472,8 @@ "name": { "key": "name_name_name_123", "text": "布鲁斯" - } + }, + "sex": 1 }, { "id": 124, @@ -1361,7 +1484,8 @@ "name": { "key": "name_name_name_124", "text": "维隆卡" - } + }, + "sex": 1 }, { "id": 125, @@ -1372,7 +1496,8 @@ "name": { "key": "name_name_name_125", "text": "布鲁诺" - } + }, + "sex": 1 }, { "id": 126, @@ -1383,6 +1508,7 @@ "name": { "key": "name_name_name_126", "text": "维基" - } + }, + "sex": 1 } ] \ No newline at end of file diff --git a/bin/json/game_navigation.json b/bin/json/game_navigation.json index fd9ee2a4c..150652301 100644 --- a/bin/json/game_navigation.json +++ b/bin/json/game_navigation.json @@ -70,30 +70,13 @@ { "Id": 5, "scene": "GameMain", - "scenename": { - "key": "navigation_Sheet1_scenename_5", - "text": "中轴城" - }, - "sceneicon": "ty_qp_my01", - "functionname": { - "key": "navigation_Sheet1_functionname_5", - "text": "签到" - }, - "npcName": [ - "功能入口-签到" - ], - "functionicon": "icon_qd" - }, - { - "Id": 6, - "scene": "GameMain", "scenename": { "key": "navigation_Sheet1_scenename_6", "text": "中轴城" }, "sceneicon": "ty_qp_my01", "functionname": { - "key": "navigation_Sheet1_functionname_6", + "key": "navigation_Sheet1_functionname_5", "text": "魔药" }, "npcName": [ @@ -102,7 +85,7 @@ "functionicon": "ty_qp_my" }, { - "Id": 7, + "Id": 6, "scene": "GameMain", "scenename": { "key": "navigation_Sheet1_scenename_7", @@ -110,7 +93,7 @@ }, "sceneicon": "ty_qp_my01", "functionname": { - "key": "navigation_Sheet1_functionname_7", + "key": "navigation_Sheet1_functionname_6", "text": "烹饪" }, "npcName": [ @@ -119,7 +102,7 @@ "functionicon": "ty_qp_pr" }, { - "Id": 8, + "Id": 7, "scene": "GameMain", "scenename": { "key": "navigation_Sheet1_scenename_8", @@ -127,7 +110,7 @@ }, "sceneicon": "ty_qp_my01", "functionname": { - "key": "navigation_Sheet1_functionname_8", + "key": "navigation_Sheet1_functionname_7", "text": "指挥部" }, "npcName": [ @@ -136,7 +119,7 @@ "functionicon": "ty_qp_zhb" }, { - "Id": 9, + "Id": 8, "scene": "GameMain", "scenename": { "key": "navigation_Sheet1_scenename_9", @@ -144,7 +127,7 @@ }, "sceneicon": "ty_qp_my01", "functionname": { - "key": "navigation_Sheet1_functionname_9", + "key": "navigation_Sheet1_functionname_8", "text": "竞技场" }, "npcName": [ @@ -153,7 +136,7 @@ "functionicon": "ty_qp_jjc" }, { - "Id": 10, + "Id": 9, "scene": "GameMain", "scenename": { "key": "navigation_Sheet1_scenename_10", @@ -161,7 +144,7 @@ }, "sceneicon": "ty_qp_my01", "functionname": { - "key": "navigation_Sheet1_functionname_10", + "key": "navigation_Sheet1_functionname_9", "text": "工会" }, "npcName": [ @@ -171,7 +154,7 @@ "functionicon": "ty_qp_gh" }, { - "Id": 11, + "Id": 10, "scene": "SmithyScene", "scenename": { "key": "navigation_Sheet1_scenename_11", @@ -179,7 +162,7 @@ }, "sceneicon": "ty_qp_tjp", "functionname": { - "key": "navigation_Sheet1_functionname_11", + "key": "navigation_Sheet1_functionname_10", "text": "打造" }, "npcName": [ @@ -188,7 +171,7 @@ "functionicon": "ty_qp_zm" }, { - "Id": 12, + "Id": 11, "scene": "SmithyScene", "scenename": { "key": "navigation_Sheet1_scenename_12", @@ -196,7 +179,7 @@ }, "sceneicon": "ty_qp_tjp", "functionname": { - "key": "navigation_Sheet1_functionname_12", + "key": "navigation_Sheet1_functionname_11", "text": "锻造炉" }, "npcName": [ @@ -205,7 +188,7 @@ "functionicon": "ty_qp_wdj" }, { - "Id": 13, + "Id": 12, "scene": "SmithyScene", "scenename": { "key": "navigation_Sheet1_scenename_13", @@ -213,7 +196,7 @@ }, "sceneicon": "ty_qp_tjp", "functionname": { - "key": "navigation_Sheet1_functionname_13", + "key": "navigation_Sheet1_functionname_12", "text": "手册台" }, "npcName": [ @@ -222,7 +205,7 @@ "functionicon": "ty_qp_sj" }, { - "Id": 14, + "Id": 13, "scene": "WuGuanScene", "scenename": { "key": "navigation_Sheet1_scenename_14", @@ -230,7 +213,7 @@ }, "sceneicon": "ty_qp_xmwg", "functionname": { - "key": "navigation_Sheet1_functionname_14", + "key": "navigation_Sheet1_functionname_13", "text": "总教习" }, "npcName": [ @@ -239,7 +222,7 @@ "functionicon": "ty_qp_jx" }, { - "Id": 15, + "Id": 14, "scene": "WuGuanScene", "scenename": { "key": "navigation_Sheet1_scenename_15", @@ -247,7 +230,7 @@ }, "sceneicon": "ty_qp_xmwg", "functionname": { - "key": "navigation_Sheet1_functionname_15", + "key": "navigation_Sheet1_functionname_14", "text": "阿宝" }, "npcName": [ @@ -256,7 +239,7 @@ "functionicon": "ty_qp_mryj" }, { - "Id": 16, + "Id": 15, "scene": "WuGuanScene", "scenename": { "key": "navigation_Sheet1_scenename_16", @@ -264,7 +247,7 @@ }, "sceneicon": "ty_qp_xmwg", "functionname": { - "key": "navigation_Sheet1_functionname_16", + "key": "navigation_Sheet1_functionname_15", "text": "告示板" }, "npcName": [ @@ -273,7 +256,7 @@ "functionicon": "ty_qp_gsb" }, { - "Id": 17, + "Id": 16, "scene": "WuGuanScene", "scenename": { "key": "navigation_Sheet1_scenename_17", @@ -281,7 +264,7 @@ }, "sceneicon": "ty_qp_xmwg", "functionname": { - "key": "navigation_Sheet1_functionname_17", + "key": "navigation_Sheet1_functionname_16", "text": "木桩1" }, "npcName": [ diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index 3cfd937ff..772027509 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -146,7 +146,7 @@ "main": [ { "key": 1, - "param": 1 + "param": 10 } ], "wkqbx": 0, diff --git a/bin/json/game_playerinfor_overview.json b/bin/json/game_playerinfor_overview.json new file mode 100644 index 000000000..f24ed1660 --- /dev/null +++ b/bin/json/game_playerinfor_overview.json @@ -0,0 +1,35 @@ +[ + { + "id": 1001, + "type": 1, + "icon": "wp_icon_10019", + "tujing": [ + 107 + ], + "url": "", + "playerhead": "wp_icon_10019", + "name": "普通头像" + }, + { + "id": 2001, + "type": 2, + "icon": "wp_icon_10019", + "tujing": [ + 107 + ], + "url": "", + "playerhead": "wp_icon_10019", + "name": "普通动作" + }, + { + "id": 3001, + "type": 3, + "icon": "wp_icon_10019", + "tujing": [ + 107 + ], + "url": "", + "playerhead": "wp_icon_10019", + "name": "普通背景" + } +] \ No newline at end of file diff --git a/bin/json/game_ruledesc.json b/bin/json/game_ruledesc.json new file mode 100644 index 000000000..261f43e8a --- /dev/null +++ b/bin/json/game_ruledesc.json @@ -0,0 +1,37 @@ +[ + { + "id": 10001, + "title": "Fetter_help_title", + "content": "Fetter_help_content" + }, + { + "id": 10002, + "title": "Fetter_help_title", + "content": "Fetter_help_content" + }, + { + "id": 10003, + "title": "GoodImpression_help_title", + "content": "GoodImpression_help_content" + }, + { + "id": 10004, + "title": "GoodImpression_help_title", + "content": "GoodImpression_help_content" + }, + { + "id": 10005, + "title": "Panda_paiqian", + "content": "Panda_paiqian1" + }, + { + "id": 10006, + "title": "Panda_meiriyilian", + "content": "Panda_meiriyilian1" + }, + { + "id": 10007, + "title": "Potions help information", + "content": "Potions help information01" + } +] \ No newline at end of file diff --git a/bin/json/game_teaching.json b/bin/json/game_teaching.json index c2a4b84fe..8eeb0eb3b 100644 --- a/bin/json/game_teaching.json +++ b/bin/json/game_teaching.json @@ -6,24 +6,24 @@ "suittype": 1, "png1": "buff_2", "png1_text": { - "key": "TeachingPngTextbuff_2", + "key": "teaching_teaching_png1_text_1", "text": "攻击上升" }, "png2": "ty_zd_buff_j015", "png2_text": { - "key": "TeachingPngTextty_zd_buff_j015", + "key": "teaching_teaching_png2_text_1", "text": "防御下降" }, "suitname": { - "key": "Teaching_suitname", + "key": "Teaching_teaching_suitname_1", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "desc": { - "key": "Teaching_desc", + "key": "Teaching_teaching_desc_1", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_X", + "key": "Teaching_teaching_tips_1", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -52,24 +52,24 @@ "suittype": 1, "png1": "debuff_1", "png1_text": { - "key": "TeachingPngTextdebuff_1", + "key": "teaching_teaching_png1_text_2", "text": "冰冻" }, "png2": "ty_zd_buff_z005", "png2_text": { - "key": "TeachingPngTextty_zd_buff_z005", + "key": "teaching_teaching_png2_text_2", "text": "免疫" }, "suitname": { - "key": "Teaching_suitname", + "key": "Teaching_teaching_suitname_2", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "desc": { - "key": "Teaching_desc", + "key": "Teaching_teaching_desc_2", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_X", + "key": "Teaching_teaching_tips_2", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -98,24 +98,24 @@ "suittype": 1, "png1": "buff_2", "png1_text": { - "key": "TeachingPngTextbuff_2", + "key": "teaching_teaching_png1_text_3", "text": "攻击上升" }, "png2": "ty_zd_buff_j015", "png2_text": { - "key": "TeachingPngTextty_zd_buff_j015", + "key": "teaching_teaching_png2_text_3", "text": "防御下降" }, "suitname": { - "key": "Teaching_suitname", + "key": "Teaching_teaching_suitname_3", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "desc": { - "key": "Teaching_desc", + "key": "Teaching_teaching_desc_3", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_X", + "key": "Teaching_teaching_tips_3", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -144,24 +144,24 @@ "suittype": 2, "png1": "buff_2", "png1_text": { - "key": "TeachingPngTextbuff_2", + "key": "teaching_teaching_png1_text_4", "text": "攻击上升" }, "png2": "ty_zd_buff_j015", "png2_text": { - "key": "TeachingPngTextty_zd_buff_j015", + "key": "teaching_teaching_png2_text_4", "text": "防御下降" }, "suitname": { - "key": "Teaching_suitname", + "key": "Teaching_teaching_suitname_4", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "desc": { - "key": "Teaching_desc", + "key": "Teaching_teaching_desc_4", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_X", + "key": "Teaching_teaching_tips_4", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -190,24 +190,24 @@ "suittype": 2, "png1": "buff_2", "png1_text": { - "key": "TeachingPngTextbuff_2", + "key": "teaching_teaching_png1_text_5", "text": "攻击上升" }, "png2": "ty_zd_buff_j015", "png2_text": { - "key": "TeachingPngTextty_zd_buff_j015", + "key": "teaching_teaching_png2_text_5", "text": "防御下降" }, "suitname": { - "key": "Teaching_suitname", + "key": "Teaching_teaching_suitname_5", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "desc": { - "key": "Teaching_desc", + "key": "Teaching_teaching_desc_5", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_X", + "key": "Teaching_teaching_tips_5", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -236,24 +236,24 @@ "suittype": 2, "png1": "buff_2", "png1_text": { - "key": "TeachingPngTextbuff_2", + "key": "teaching_teaching_png1_text_6", "text": "攻击上升" }, "png2": "ty_zd_buff_j015", "png2_text": { - "key": "TeachingPngTextty_zd_buff_j015", + "key": "teaching_teaching_png2_text_6", "text": "防御下降" }, "suitname": { - "key": "Teaching_suitname", + "key": "Teaching_teaching_suitname_6", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "desc": { - "key": "Teaching_desc", + "key": "Teaching_teaching_desc_6", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_X", + "key": "Teaching_teaching_tips_6", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -282,24 +282,24 @@ "suittype": 3, "png1": "buff_2", "png1_text": { - "key": "TeachingPngTextbuff_2", + "key": "teaching_teaching_png1_text_7", "text": "攻击上升" }, "png2": "ty_zd_buff_j015", "png2_text": { - "key": "TeachingPngTextty_zd_buff_j015", + "key": "teaching_teaching_png2_text_7", "text": "防御下降" }, "suitname": { - "key": "Teaching_suitname", + "key": "Teaching_teaching_suitname_7", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "desc": { - "key": "Teaching_desc", + "key": "Teaching_teaching_desc_7", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_X", + "key": "Teaching_teaching_tips_7", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -328,24 +328,24 @@ "suittype": 3, "png1": "buff_2", "png1_text": { - "key": "TeachingPngTextbuff_2", + "key": "teaching_teaching_png1_text_8", "text": "攻击上升" }, "png2": "ty_zd_buff_j015", "png2_text": { - "key": "TeachingPngTextty_zd_buff_j015", + "key": "teaching_teaching_png2_text_8", "text": "防御下降" }, "suitname": { - "key": "Teaching_suitname", + "key": "Teaching_teaching_suitname_8", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "desc": { - "key": "Teaching_desc", + "key": "Teaching_teaching_desc_8", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_X", + "key": "Teaching_teaching_tips_8", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -374,24 +374,24 @@ "suittype": 3, "png1": "buff_2", "png1_text": { - "key": "TeachingPngTextbuff_2", + "key": "teaching_teaching_png1_text_9", "text": "攻击上升" }, "png2": "ty_zd_buff_j015", "png2_text": { - "key": "TeachingPngTextty_zd_buff_j015", + "key": "teaching_teaching_png2_text_9", "text": "防御下降" }, "suitname": { - "key": "Teaching_suitname", + "key": "Teaching_teaching_suitname_9", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "desc": { - "key": "Teaching_desc", + "key": "Teaching_teaching_desc_9", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_X", + "key": "Teaching_teaching_tips_9", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -420,24 +420,24 @@ "suittype": 4, "png1": "buff_2", "png1_text": { - "key": "TeachingPngTextbuff_2", + "key": "teaching_teaching_png1_text_10", "text": "攻击上升" }, "png2": "ty_zd_buff_j015", "png2_text": { - "key": "TeachingPngTextty_zd_buff_j015", + "key": "teaching_teaching_png2_text_10", "text": "防御下降" }, "suitname": { - "key": "Teaching_suitname", + "key": "Teaching_teaching_suitname_10", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "desc": { - "key": "Teaching_desc", + "key": "Teaching_teaching_desc_10", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_X", + "key": "Teaching_teaching_tips_10", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -466,24 +466,24 @@ "suittype": 4, "png1": "buff_2", "png1_text": { - "key": "TeachingPngTextbuff_2", + "key": "teaching_teaching_png1_text_11", "text": "攻击上升" }, "png2": "ty_zd_buff_j015", "png2_text": { - "key": "TeachingPngTextty_zd_buff_j015", + "key": "teaching_teaching_png2_text_11", "text": "防御下降" }, "suitname": { - "key": "Teaching_suitname", + "key": "Teaching_teaching_suitname_11", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "desc": { - "key": "Teaching_desc", + "key": "Teaching_teaching_desc_11", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_X", + "key": "Teaching_teaching_tips_11", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -512,24 +512,24 @@ "suittype": 4, "png1": "buff_2", "png1_text": { - "key": "TeachingPngTextbuff_2", + "key": "teaching_teaching_png1_text_12", "text": "攻击上升" }, "png2": "ty_zd_buff_j015", "png2_text": { - "key": "TeachingPngTextty_zd_buff_j015", + "key": "teaching_teaching_png2_text_12", "text": "防御下降" }, "suitname": { - "key": "Teaching_suitname", + "key": "Teaching_teaching_suitname_12", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "desc": { - "key": "Teaching_desc", + "key": "Teaching_teaching_desc_12", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_X", + "key": "Teaching_teaching_tips_12", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -558,24 +558,24 @@ "suittype": 5, "png1": "buff_2", "png1_text": { - "key": "TeachingPngTextbuff_2", + "key": "teaching_teaching_png1_text_13", "text": "攻击上升" }, "png2": "ty_zd_buff_j015", "png2_text": { - "key": "TeachingPngTextty_zd_buff_j015", + "key": "teaching_teaching_png2_text_13", "text": "防御下降" }, "suitname": { - "key": "Teaching_suitname", + "key": "Teaching_teaching_suitname_13", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "desc": { - "key": "Teaching_desc", + "key": "Teaching_teaching_desc_13", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_X", + "key": "Teaching_teaching_tips_13", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -604,24 +604,24 @@ "suittype": 5, "png1": "buff_2", "png1_text": { - "key": "TeachingPngTextbuff_2", + "key": "teaching_teaching_png1_text_14", "text": "攻击上升" }, "png2": "ty_zd_buff_j015", "png2_text": { - "key": "TeachingPngTextty_zd_buff_j015", + "key": "teaching_teaching_png2_text_14", "text": "防御下降" }, "suitname": { - "key": "Teaching_suitname", + "key": "Teaching_teaching_suitname_14", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "desc": { - "key": "Teaching_desc", + "key": "Teaching_teaching_desc_14", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_X", + "key": "Teaching_teaching_tips_14", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ @@ -650,24 +650,24 @@ "suittype": 5, "png1": "buff_2", "png1_text": { - "key": "TeachingPngTextbuff_2", + "key": "teaching_teaching_png1_text_15", "text": "攻击上升" }, "png2": "ty_zd_buff_j015", "png2_text": { - "key": "TeachingPngTextty_zd_buff_j015", + "key": "teaching_teaching_png2_text_15", "text": "防御下降" }, "suitname": { - "key": "Teaching_suitname", + "key": "Teaching_teaching_suitname_15", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "desc": { - "key": "Teaching_desc", + "key": "Teaching_teaching_desc_15", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "tips": { - "key": "mainline_desc_X", + "key": "Teaching_teaching_tips_15", "text": "在实战中学习能够影响攻击力和防御力的技能作用" }, "task": [ diff --git a/bin/json/game_trollgoods.json b/bin/json/game_trollgoods.json index 6f54c5137..c60a37cd9 100644 --- a/bin/json/game_trollgoods.json +++ b/bin/json/game_trollgoods.json @@ -2,23 +2,23 @@ { "id": 1, "goodsname": { - "key": "itemname_40002", + "key": "trolltrain_troll_goods_goodsname_1", "text": "物品1" }, "goodsfor": 1, "goodsinfor": { - "key": "itemname_40002", + "key": "trolltrain_troll_goods_goodsinfor_1", "text": "物品1货品信息" }, "goodsicon": "clmsg_ll_01", "goodsprice": 2000, "star_money": 12000, "uptext": { - "key": "hearsay1", + "key": "trolltrain_troll_goods_uptext_1", "text": "听说最近黑色峡谷的蘑菇供应不求，如果碰上，你或许可以囤积一些" }, "suptext": { - "key": "suphearsay", + "key": "trolltrain_troll_goods_suptext_1", "text": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！" }, "max": 40 @@ -26,23 +26,23 @@ { "id": 2, "goodsname": { - "key": "itemname_40002", + "key": "trolltrain_troll_goods_goodsname_2", "text": "物品2" }, "goodsfor": 1, "goodsinfor": { - "key": "itemname_40002", + "key": "trolltrain_troll_goods_goodsinfor_2", "text": "物品2货品信息" }, "goodsicon": "clmsg_ll_02", "goodsprice": 2000, "star_money": 13000, "uptext": { - "key": "hearsay2", + "key": "trolltrain_troll_goods_uptext_2", "text": "嘿，你有听说过老人与海的故事吗，没听过也不打紧，一些贵族正在收购一批海鱼，价格都已经被炒上天了，留意这个发财的机会，兄弟。" }, "suptext": { - "key": "suphearsay", + "key": "trolltrain_troll_goods_suptext_2", "text": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！" }, "max": 40 @@ -50,23 +50,23 @@ { "id": 3, "goodsname": { - "key": "itemname_40002", + "key": "trolltrain_troll_goods_goodsname_3", "text": "物品3" }, "goodsfor": 1, "goodsinfor": { - "key": "itemname_40002", + "key": "trolltrain_troll_goods_goodsinfor_3", "text": "物品3货品信息" }, "goodsicon": "clmsg_ll_03", "goodsprice": 2000, "star_money": 14000, "uptext": { - "key": "hearsay3", + "key": "trolltrain_troll_goods_uptext_3", "text": "没人会拒绝寻香草的诱惑，尤其是商人，你说对吧。我有一个老主顾，他的孩子满月，现在正需要很多这个玩意，记得留心一下哦~" }, "suptext": { - "key": "suphearsay", + "key": "trolltrain_troll_goods_suptext_3", "text": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！" }, "max": 40 @@ -74,23 +74,23 @@ { "id": 4, "goodsname": { - "key": "itemname_40002", + "key": "trolltrain_troll_goods_goodsname_4", "text": "物品4" }, "goodsfor": 2, "goodsinfor": { - "key": "itemname_40002", + "key": "trolltrain_troll_goods_goodsinfor_4", "text": "物品4货品信息" }, "goodsicon": "clmsg_ll_04", "goodsprice": 2000, "star_money": 11000, "uptext": { - "key": "hearsay4", + "key": "trolltrain_troll_goods_uptext_4", "text": "好吧，你消息你运气来了，神龙大年久失修，正需要一批上好的木材，而你的下一个目的地......啧啧啧，有时候我真羡慕你的运气。" }, "suptext": { - "key": "suphearsay", + "key": "trolltrain_troll_goods_suptext_4", "text": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！" }, "max": 40 @@ -98,23 +98,23 @@ { "id": 5, "goodsname": { - "key": "itemname_40002", + "key": "trolltrain_troll_goods_goodsname_5", "text": "物品5" }, "goodsfor": 2, "goodsinfor": { - "key": "itemname_40002", + "key": "trolltrain_troll_goods_goodsinfor_5", "text": "物品5货品信息" }, "goodsicon": "clmsg_ll_05", "goodsprice": 2000, "star_money": 1000, "uptext": { - "key": "hearsay5", + "key": "trolltrain_troll_goods_uptext_5", "text": "这次是我的私人消息，听说阿宝的某一个师兄越狱了，正在到处进行破坏，各地的村民都在收购铁器以备不时之需。我知道这很缺德，但咱们可是商人，赚谁的钱不是赚？" }, "suptext": { - "key": "suphearsay", + "key": "trolltrain_troll_goods_suptext_5", "text": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！" }, "max": 30 @@ -122,23 +122,23 @@ { "id": 6, "goodsname": { - "key": "itemname_40002", + "key": "trolltrain_troll_goods_goodsname_6", "text": "物品6" }, "goodsfor": 2, "goodsinfor": { - "key": "itemname_40002", + "key": "trolltrain_troll_goods_goodsinfor_6", "text": "物品6货品信息" }, "goodsicon": "wp_icon_0003", "goodsprice": 2000, "star_money": 2000, "uptext": { - "key": "hearsay6", + "key": "trolltrain_troll_goods_uptext_6", "text": "一根上号的雪茄，一杯威士忌，还有一把趁手的兵器，这或许就是男人最大的浪漫了。那帮维京人马上就要开始捕羊大赛了，你猜猜他们现在最需要什么？那可是场庆典，你懂得~" }, "suptext": { - "key": "suphearsay", + "key": "trolltrain_troll_goods_suptext_6", "text": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！" }, "max": 30 @@ -146,23 +146,23 @@ { "id": 7, "goodsname": { - "key": "itemname_40002", + "key": "trolltrain_troll_goods_goodsname_7", "text": "物品7" }, "goodsfor": 3, "goodsinfor": { - "key": "itemname_40002", + "key": "trolltrain_troll_goods_goodsinfor_7", "text": "物品7货品信息" }, "goodsicon": "wp_icon_10002", "goodsprice": 2000, "star_money": 1000, "uptext": { - "key": "hearsay7", + "key": "trolltrain_troll_goods_uptext_7", "text": "听说了吗，维京人的山谷总是会传来恐怖的怒吼，那嗓门，一听就知道肯定是一个大家伙，现在我认识的很多部落的族长都在收购武器，你知道该怎么做，不是吗？" }, "suptext": { - "key": "suphearsay", + "key": "trolltrain_troll_goods_suptext_7", "text": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！" }, "max": 30 @@ -170,23 +170,23 @@ { "id": 8, "goodsname": { - "key": "itemname_40002", + "key": "trolltrain_troll_goods_goodsname_8", "text": "物品8" }, "goodsfor": 3, "goodsinfor": { - "key": "itemname_40002", + "key": "trolltrain_troll_goods_goodsinfor_8", "text": "物品8货品信息" }, "goodsicon": "wp_icon_10012", "goodsprice": 2000, "star_money": 3000, "uptext": { - "key": "hearsay8", + "key": "trolltrain_troll_goods_uptext_8", "text": "怪物史莱克你听说过吗，最近有消息他要带着他的公主一起来中轴城，并决定举办一场庆典，虽然我不知道他哪儿来的钱办庆典，但对于我们这种优良的商人来说，庆典就意味着可以赚大把的钱，你知道该准备什么了吗？" }, "suptext": { - "key": "suphearsay", + "key": "trolltrain_troll_goods_suptext_8", "text": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！" }, "max": 30 @@ -194,23 +194,23 @@ { "id": 9, "goodsname": { - "key": "itemname_40002", + "key": "trolltrain_troll_goods_goodsname_9", "text": "物品9" }, "goodsfor": 3, "goodsinfor": { - "key": "itemname_40002", + "key": "trolltrain_troll_goods_goodsinfor_9", "text": "物品9货品信息" }, "goodsicon": "wp_icon_10014", "goodsprice": 2000, "star_money": 4000, "uptext": { - "key": "hearsay9", + "key": "trolltrain_troll_goods_uptext_9", "text": "我很喜欢完游戏，因为我总能在里面不劳而获的得到诸多宝藏，你听说了吗，最近一个神秘的洞穴出现在丛林区，而当地的那些原始人，可是从中捞了不少宝贝，我们说不定可以从那些原始人手里捞上一笔，然后去中轴城高价卖出。" }, "suptext": { - "key": "suphearsay", + "key": "trolltrain_troll_goods_suptext_9", "text": "我有一个好消息告诉你，咱们即将赚大发了，在下一个地区！" }, "max": 30 diff --git a/bin/json/game_vikingboss.json b/bin/json/game_vikingboss.json index 2395bb832..750c96d1b 100644 --- a/bin/json/game_vikingboss.json +++ b/bin/json/game_vikingboss.json @@ -4,7 +4,7 @@ "copytype": 1, "bossid": 1, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_1", "text": "火焰泰坦" }, "difficulty": 1, @@ -88,7 +88,7 @@ "copytype": 1, "bossid": 1, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_2", "text": "火焰泰坦" }, "difficulty": 2, @@ -172,7 +172,7 @@ "copytype": 1, "bossid": 1, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_3", "text": "火焰泰坦" }, "difficulty": 3, @@ -256,7 +256,7 @@ "copytype": 1, "bossid": 1, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_4", "text": "火焰泰坦" }, "difficulty": 4, @@ -340,7 +340,7 @@ "copytype": 1, "bossid": 1, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_5", "text": "火焰泰坦" }, "difficulty": 5, @@ -424,7 +424,7 @@ "copytype": 1, "bossid": 1, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_6", "text": "火焰泰坦" }, "difficulty": 6, @@ -508,7 +508,7 @@ "copytype": 1, "bossid": 1, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_7", "text": "火焰泰坦" }, "difficulty": 7, @@ -592,7 +592,7 @@ "copytype": 1, "bossid": 1, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_8", "text": "火焰泰坦" }, "difficulty": 8, @@ -676,7 +676,7 @@ "copytype": 1, "bossid": 1, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_9", "text": "火焰泰坦" }, "difficulty": 9, @@ -760,7 +760,7 @@ "copytype": 1, "bossid": 1, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_10", "text": "火焰泰坦" }, "difficulty": 10, @@ -844,7 +844,7 @@ "copytype": 1, "bossid": 2, "name": { - "key": "viking_boss_1002", + "key": "vikingexpedition_boss_name_11", "text": "冰之泰坦" }, "difficulty": 1, @@ -928,7 +928,7 @@ "copytype": 1, "bossid": 2, "name": { - "key": "viking_boss_1002", + "key": "vikingexpedition_boss_name_12", "text": "冰之泰坦" }, "difficulty": 2, @@ -1012,7 +1012,7 @@ "copytype": 1, "bossid": 2, "name": { - "key": "viking_boss_1002", + "key": "vikingexpedition_boss_name_13", "text": "冰之泰坦" }, "difficulty": 3, @@ -1096,7 +1096,7 @@ "copytype": 1, "bossid": 2, "name": { - "key": "viking_boss_1002", + "key": "vikingexpedition_boss_name_14", "text": "冰之泰坦" }, "difficulty": 4, @@ -1180,7 +1180,7 @@ "copytype": 1, "bossid": 2, "name": { - "key": "viking_boss_1002", + "key": "vikingexpedition_boss_name_15", "text": "冰之泰坦" }, "difficulty": 5, @@ -1264,7 +1264,7 @@ "copytype": 1, "bossid": 2, "name": { - "key": "viking_boss_1002", + "key": "vikingexpedition_boss_name_16", "text": "冰之泰坦" }, "difficulty": 6, @@ -1348,7 +1348,7 @@ "copytype": 1, "bossid": 2, "name": { - "key": "viking_boss_1002", + "key": "vikingexpedition_boss_name_17", "text": "冰之泰坦" }, "difficulty": 7, @@ -1432,7 +1432,7 @@ "copytype": 1, "bossid": 2, "name": { - "key": "viking_boss_1002", + "key": "vikingexpedition_boss_name_18", "text": "冰之泰坦" }, "difficulty": 8, @@ -1516,7 +1516,7 @@ "copytype": 1, "bossid": 2, "name": { - "key": "viking_boss_1002", + "key": "vikingexpedition_boss_name_19", "text": "冰之泰坦" }, "difficulty": 9, @@ -1600,7 +1600,7 @@ "copytype": 1, "bossid": 2, "name": { - "key": "viking_boss_1002", + "key": "vikingexpedition_boss_name_20", "text": "冰之泰坦" }, "difficulty": 10, @@ -1684,7 +1684,7 @@ "copytype": 1, "bossid": 3, "name": { - "key": "viking_boss_1003", + "key": "vikingexpedition_boss_name_21", "text": "森林泰坦" }, "difficulty": 1, @@ -1768,7 +1768,7 @@ "copytype": 1, "bossid": 3, "name": { - "key": "viking_boss_1003", + "key": "vikingexpedition_boss_name_22", "text": "森林泰坦" }, "difficulty": 2, @@ -1852,7 +1852,7 @@ "copytype": 1, "bossid": 3, "name": { - "key": "viking_boss_1003", + "key": "vikingexpedition_boss_name_23", "text": "森林泰坦" }, "difficulty": 3, @@ -1936,7 +1936,7 @@ "copytype": 1, "bossid": 3, "name": { - "key": "viking_boss_1003", + "key": "vikingexpedition_boss_name_24", "text": "森林泰坦" }, "difficulty": 4, @@ -2020,7 +2020,7 @@ "copytype": 1, "bossid": 3, "name": { - "key": "viking_boss_1003", + "key": "vikingexpedition_boss_name_25", "text": "森林泰坦" }, "difficulty": 5, @@ -2104,7 +2104,7 @@ "copytype": 1, "bossid": 3, "name": { - "key": "viking_boss_1003", + "key": "vikingexpedition_boss_name_26", "text": "森林泰坦" }, "difficulty": 6, @@ -2188,7 +2188,7 @@ "copytype": 1, "bossid": 3, "name": { - "key": "viking_boss_1003", + "key": "vikingexpedition_boss_name_27", "text": "森林泰坦" }, "difficulty": 7, @@ -2272,7 +2272,7 @@ "copytype": 1, "bossid": 3, "name": { - "key": "viking_boss_1003", + "key": "vikingexpedition_boss_name_28", "text": "森林泰坦" }, "difficulty": 8, @@ -2356,7 +2356,7 @@ "copytype": 1, "bossid": 3, "name": { - "key": "viking_boss_1003", + "key": "vikingexpedition_boss_name_29", "text": "森林泰坦" }, "difficulty": 9, @@ -2440,7 +2440,7 @@ "copytype": 1, "bossid": 3, "name": { - "key": "viking_boss_1003", + "key": "vikingexpedition_boss_name_30", "text": "森林泰坦" }, "difficulty": 10, @@ -2524,7 +2524,7 @@ "copytype": 2, "bossid": 11, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_31", "text": "武器BOSS" }, "difficulty": 1, @@ -2608,7 +2608,7 @@ "copytype": 2, "bossid": 11, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_32", "text": "武器BOSS" }, "difficulty": 2, @@ -2692,7 +2692,7 @@ "copytype": 2, "bossid": 11, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_33", "text": "武器BOSS" }, "difficulty": 3, @@ -2776,7 +2776,7 @@ "copytype": 2, "bossid": 11, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_34", "text": "武器BOSS" }, "difficulty": 4, @@ -2860,7 +2860,7 @@ "copytype": 2, "bossid": 11, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_35", "text": "武器BOSS" }, "difficulty": 5, @@ -2944,7 +2944,7 @@ "copytype": 2, "bossid": 11, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_36", "text": "武器BOSS" }, "difficulty": 6, @@ -3028,7 +3028,7 @@ "copytype": 2, "bossid": 11, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_37", "text": "武器BOSS" }, "difficulty": 7, @@ -3112,7 +3112,7 @@ "copytype": 2, "bossid": 11, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_38", "text": "武器BOSS" }, "difficulty": 8, @@ -3196,7 +3196,7 @@ "copytype": 2, "bossid": 11, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_39", "text": "武器BOSS" }, "difficulty": 9, @@ -3280,7 +3280,7 @@ "copytype": 2, "bossid": 11, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_40", "text": "武器BOSS" }, "difficulty": 10, @@ -3364,7 +3364,7 @@ "copytype": 3, "bossid": 21, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_41", "text": "饰品BOSS" }, "difficulty": 1, @@ -3448,7 +3448,7 @@ "copytype": 3, "bossid": 21, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_42", "text": "饰品BOSS" }, "difficulty": 2, @@ -3532,7 +3532,7 @@ "copytype": 3, "bossid": 21, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_43", "text": "饰品BOSS" }, "difficulty": 3, @@ -3616,7 +3616,7 @@ "copytype": 3, "bossid": 21, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_44", "text": "饰品BOSS" }, "difficulty": 4, @@ -3700,7 +3700,7 @@ "copytype": 3, "bossid": 21, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_45", "text": "饰品BOSS" }, "difficulty": 5, @@ -3784,7 +3784,7 @@ "copytype": 3, "bossid": 21, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_46", "text": "饰品BOSS" }, "difficulty": 6, @@ -3868,7 +3868,7 @@ "copytype": 3, "bossid": 21, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_47", "text": "饰品BOSS" }, "difficulty": 7, @@ -3952,7 +3952,7 @@ "copytype": 3, "bossid": 21, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_48", "text": "饰品BOSS" }, "difficulty": 8, @@ -4036,7 +4036,7 @@ "copytype": 3, "bossid": 21, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_49", "text": "饰品BOSS" }, "difficulty": 9, @@ -4120,7 +4120,7 @@ "copytype": 3, "bossid": 21, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_50", "text": "饰品BOSS" }, "difficulty": 10, @@ -4204,7 +4204,7 @@ "copytype": 4, "bossid": 31, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_51", "text": "阿宝" }, "difficulty": 1, @@ -4263,7 +4263,7 @@ "copytype": 4, "bossid": 31, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_52", "text": "阿宝" }, "difficulty": 2, @@ -4327,7 +4327,7 @@ "copytype": 4, "bossid": 31, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_53", "text": "阿宝" }, "difficulty": 3, @@ -4396,7 +4396,7 @@ "copytype": 4, "bossid": 31, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_54", "text": "阿宝" }, "difficulty": 4, @@ -4465,7 +4465,7 @@ "copytype": 4, "bossid": 31, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_55", "text": "阿宝" }, "difficulty": 5, @@ -4534,7 +4534,7 @@ "copytype": 4, "bossid": 31, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_56", "text": "阿宝" }, "difficulty": 6, @@ -4603,7 +4603,7 @@ "copytype": 4, "bossid": 31, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_57", "text": "阿宝" }, "difficulty": 7, @@ -4672,7 +4672,7 @@ "copytype": 4, "bossid": 31, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_58", "text": "阿宝" }, "difficulty": 8, @@ -4741,7 +4741,7 @@ "copytype": 4, "bossid": 31, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_59", "text": "阿宝" }, "difficulty": 9, @@ -4810,7 +4810,7 @@ "copytype": 4, "bossid": 31, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_60", "text": "阿宝" }, "difficulty": 10, @@ -4879,7 +4879,7 @@ "copytype": 4, "bossid": 31, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_61", "text": "阿宝" }, "difficulty": 11, @@ -4948,7 +4948,7 @@ "copytype": 4, "bossid": 31, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_boss_name_62", "text": "阿宝" }, "difficulty": 12, diff --git a/bin/json/game_vikingbossskill.json b/bin/json/game_vikingbossskill.json index 71917a426..6fc3d3177 100644 --- a/bin/json/game_vikingbossskill.json +++ b/bin/json/game_vikingbossskill.json @@ -3,12 +3,12 @@ "bossid": 1, "copytype": 1, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_bossskill_name_1", "text": "火焰泰坦" }, "back_png": "wjyz_img003", "introduce": { - "key": "viking_boss_1004", + "key": "vikingexpedition_bossskill_introduce_1", "text": "熔岩泰坦巨人来自于遥远的火山，它的火焰属性使得所到之处，一片荒芜" }, "icon": "wjyz_img012", @@ -21,12 +21,12 @@ "bossid": 2, "copytype": 1, "name": { - "key": "viking_boss_1002", + "key": "vikingexpedition_bossskill_name_2", "text": "冰之泰坦" }, "back_png": "wjyz_img001", "introduce": { - "key": "viking_boss_1005", + "key": "vikingexpedition_bossskill_introduce_2", "text": "冰霜泰坦巨人从极寒之地而来，没有什么比它更寒冷了" }, "icon": "wjyz_img011", @@ -39,12 +39,12 @@ "bossid": 3, "copytype": 1, "name": { - "key": "viking_boss_1003", + "key": "vikingexpedition_bossskill_name_3", "text": "森林泰坦" }, "back_png": "wjyz_img002", "introduce": { - "key": "viking_boss_1006", + "key": "vikingexpedition_bossskill_introduce_3", "text": "森林泰坦诞生于广袤的森林之中，是所有动物们的守护神" }, "icon": "wjyz_img013", @@ -57,12 +57,12 @@ "bossid": 11, "copytype": 2, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_bossskill_name_4", "text": "火焰泰坦" }, "back_png": "wjyz_img001", "introduce": { - "key": "viking_boss_10001", + "key": "vikingexpedition_bossskill_introduce_4", "text": "熔岩泰坦巨人来自于遥远的火山，它的火焰属性使得所到之处，一片荒芜" }, "icon": "wjyz_img011", @@ -75,12 +75,12 @@ "bossid": 21, "copytype": 3, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_bossskill_name_5", "text": "火焰泰坦" }, "back_png": "wjyz_img002", "introduce": { - "key": "viking_boss_20001", + "key": "vikingexpedition_bossskill_introduce_5", "text": "熔岩泰坦巨人来自于遥远的火山，它的火焰属性使得所到之处，一片荒芜" }, "icon": "wjyz_img013", @@ -93,12 +93,12 @@ "bossid": 31, "copytype": 4, "name": { - "key": "viking_boss_1001", + "key": "vikingexpedition_bossskill_name_6", "text": "阿宝" }, "back_png": "xmwg_jyfb_boss1", "introduce": { - "key": "viking_boss_20001", + "key": "vikingexpedition_bossskill_introduce_6", "text": "一只来自于中国的滚滚" }, "icon": "action_11001", diff --git a/bin/json/game_vikingentrance.json b/bin/json/game_vikingentrance.json index a766d6d86..57bf9711d 100644 --- a/bin/json/game_vikingentrance.json +++ b/bin/json/game_vikingentrance.json @@ -2,15 +2,15 @@ { "type_id": 1, "title": { - "key": "VikingTitle1", + "key": "vikingexpedition_entrance_title_1", "text": "装备副本" }, "introduce": { - "key": "VikingIntroduce1", + "key": "vikingexpedition_entrance_introduce_1", "text": "通过挑战三大泰坦，获得强力装备吧" }, "unlock": { - "key": "VikingUnlock1", + "key": "vikingexpedition_entrance_unlock_1", "text": "Level {0} unlocking" }, "bg": "fb_rk_wjyz1", @@ -19,15 +19,15 @@ { "type_id": 2, "title": { - "key": "VikingTitle2", + "key": "vikingexpedition_entrance_title_2", "text": "武器副本" }, "introduce": { - "key": "VikingIntroduce2", + "key": "vikingexpedition_entrance_introduce_2", "text": "武器副本描述" }, "unlock": { - "key": "VikingUnlock2", + "key": "vikingexpedition_entrance_unlock_2", "text": "Level {0} unlocking" }, "bg": "fb_rk_wjyz2", @@ -36,15 +36,15 @@ { "type_id": 3, "title": { - "key": "VikingTitle3", + "key": "vikingexpedition_entrance_title_3", "text": "饰品副本" }, "introduce": { - "key": "VikingIntroduce3", + "key": "vikingexpedition_entrance_introduce_3", "text": "饰品副本描述" }, "unlock": { - "key": "VikingUnlock3", + "key": "vikingexpedition_entrance_unlock_3", "text": "Level {0} unlocking" }, "bg": "fb_rk_wjyz3", diff --git a/bin/json/game_vip.json b/bin/json/game_vip.json index c630a83c0..1d2eca1ee 100644 --- a/bin/json/game_vip.json +++ b/bin/json/game_vip.json @@ -3,7 +3,7 @@ "vip_lv": 1, "up_exp": 100, "vip_name": { - "key": "vipname1", + "key": "vip_vip_vip_name_1", "text": "特邀会员" }, "vip_lv_png": "wp_icon_bydw02", @@ -45,7 +45,7 @@ "vip_lv": 2, "up_exp": 500, "vip_name": { - "key": "vipname2", + "key": "vip_vip_vip_name_2", "text": "高级会员" }, "vip_lv_png": "wp_icon_bydw02", @@ -88,7 +88,7 @@ "vip_lv": 3, "up_exp": 1000, "vip_name": { - "key": "vipname3", + "key": "vip_vip_vip_name_3", "text": "资深会员" }, "vip_lv_png": "wp_icon_bydw02", @@ -131,7 +131,7 @@ "vip_lv": 4, "up_exp": 2000, "vip_name": { - "key": "vipname4", + "key": "vip_vip_vip_name_4", "text": "理事" }, "vip_lv_png": "wp_icon_bydw02", @@ -175,7 +175,7 @@ "vip_lv": 5, "up_exp": 4000, "vip_name": { - "key": "vipname5", + "key": "vip_vip_vip_name_5", "text": "高级理事" }, "vip_lv_png": "wp_icon_bydw02", @@ -219,7 +219,7 @@ "vip_lv": 6, "up_exp": 7000, "vip_name": { - "key": "vipname6", + "key": "vip_vip_vip_name_6", "text": "理事长" }, "vip_lv_png": "wp_icon_bydw02", @@ -263,7 +263,7 @@ "vip_lv": 7, "up_exp": 12000, "vip_name": { - "key": "vipname7", + "key": "vip_vip_vip_name_7", "text": "监事" }, "vip_lv_png": "wp_icon_bydw02", @@ -308,7 +308,7 @@ "vip_lv": 8, "up_exp": 22000, "vip_name": { - "key": "vipname8", + "key": "vip_vip_vip_name_8", "text": "高级监事" }, "vip_lv_png": "wp_icon_bydw02", @@ -353,7 +353,7 @@ "vip_lv": 9, "up_exp": 39000, "vip_name": { - "key": "vipname9", + "key": "vip_vip_vip_name_9", "text": "监事长" }, "vip_lv_png": "wp_icon_bydw02", @@ -398,7 +398,7 @@ "vip_lv": 10, "up_exp": 52000, "vip_name": { - "key": "vipname10", + "key": "vip_vip_vip_name_10", "text": "荣誉副会长" }, "vip_lv_png": "wp_icon_bydw02", @@ -445,7 +445,7 @@ "vip_lv": 11, "up_exp": 80000, "vip_name": { - "key": "vipname11", + "key": "vip_vip_vip_name_11", "text": "执行副会长" }, "vip_lv_png": "wp_icon_bydw02", @@ -492,7 +492,7 @@ "vip_lv": 12, "up_exp": 130000, "vip_name": { - "key": "vipname12", + "key": "vip_vip_vip_name_12", "text": "常务副会长" }, "vip_lv_png": "wp_icon_bydw02", @@ -539,7 +539,7 @@ "vip_lv": 13, "up_exp": 200000, "vip_name": { - "key": "vipname13", + "key": "vip_vip_vip_name_13", "text": "秘书长" }, "vip_lv_png": "wp_icon_bydw02", @@ -587,7 +587,7 @@ "vip_lv": 14, "up_exp": 250000, "vip_name": { - "key": "vipname14", + "key": "vip_vip_vip_name_14", "text": "执行会长" }, "vip_lv_png": "wp_icon_bydw02", @@ -635,7 +635,7 @@ "vip_lv": 15, "up_exp": 400000, "vip_name": { - "key": "vipname15", + "key": "vip_vip_vip_name_15", "text": "商会主席" }, "vip_lv_png": "wp_icon_bydw02", diff --git a/bin/json/game_worldall.json b/bin/json/game_worldall.json index 7eaa011e3..cde58bc1a 100644 --- a/bin/json/game_worldall.json +++ b/bin/json/game_worldall.json @@ -2,12 +2,12 @@ { "id": 210, "name": { - "key": "Mainline_Tasks1", + "key": "worldtask_world_all_name_1", "text": "章节1全部任务" }, "task_icon": "", "task_txt": { - "key": "story_80", + "key": "worldtask_world_all_task_txt_1", "text": "完成所有任务有可以领取额外奖励" }, "reword": [ @@ -21,12 +21,12 @@ { "id": 300, "name": { - "key": "welcom_txt", + "key": "worldtask_world_all_name_2", "text": "欢迎到来" }, "task_icon": "", "task_txt": { - "key": "story_80", + "key": "worldtask_world_all_task_txt_2", "text": "完成所有任务有可以领取额外奖励" }, "reword": [ @@ -40,12 +40,12 @@ { "id": 310, "name": { - "key": "Side_Quest1", + "key": "worldtask_world_all_name_3", "text": "武馆内勤奋的身影是？" }, "task_icon": "", "task_txt": { - "key": "story_80", + "key": "worldtask_world_all_task_txt_3", "text": "完成所有任务有可以领取额外奖励" }, "reword": [ @@ -64,12 +64,12 @@ { "id": 320, "name": { - "key": "Side_Quest2", + "key": "worldtask_world_all_name_4", "text": "铁匠铺门口身影是?" }, "task_icon": "", "task_txt": { - "key": "story_80", + "key": "worldtask_world_all_task_txt_4", "text": "完成所有任务有可以领取额外奖励" }, "reword": [ @@ -88,12 +88,12 @@ { "id": 330, "name": { - "key": "Side_Quest3", + "key": "worldtask_world_all_name_5", "text": "戈伯的嘱托" }, "task_icon": "", "task_txt": { - "key": "story_80", + "key": "worldtask_world_all_task_txt_5", "text": "完成所有任务有可以领取额外奖励" }, "reword": [ @@ -112,12 +112,12 @@ { "id": 340, "name": { - "key": "Side_Quest4", + "key": "worldtask_world_all_name_6", "text": "武馆秘闻" }, "task_icon": "", "task_txt": { - "key": "story_80", + "key": "worldtask_world_all_task_txt_6", "text": "完成所有任务有可以领取额外奖励" }, "reword": [ @@ -136,12 +136,12 @@ { "id": 350, "name": { - "key": "Side_Quest5", + "key": "worldtask_world_all_name_7", "text": "好像有人再看我？" }, "task_icon": "", "task_txt": { - "key": "story_80", + "key": "worldtask_world_all_task_txt_7", "text": "完成所有任务有可以领取额外奖励" }, "reword": [ @@ -160,12 +160,12 @@ { "id": 360, "name": { - "key": "Side_Quest6", + "key": "worldtask_world_all_name_8", "text": "戈伯的委托" }, "task_icon": "", "task_txt": { - "key": "story_80", + "key": "worldtask_world_all_task_txt_8", "text": "完成所有任务有可以领取额外奖励" }, "reword": [ @@ -184,12 +184,12 @@ { "id": 113, "name": { - "key": "story_80", + "key": "worldtask_world_all_name_9", "text": "日常测试任务" }, "task_icon": "", "task_txt": { - "key": "story_80", + "key": "worldtask_world_all_task_txt_9", "text": "完成所有任务有可以领取额外奖励" }, "reword": [ @@ -203,12 +203,12 @@ { "id": 410, "name": { - "key": "story_80", + "key": "worldtask_world_all_name_10", "text": "周常测试任务" }, "task_icon": "", "task_txt": { - "key": "story_80", + "key": "worldtask_world_all_task_txt_10", "text": "完成所有任务有可以领取额外奖励" }, "reword": [ diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index fc993d095..234826a2c 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -9,20 +9,20 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks1", + "key": "worldtask_world_task_task_Tname_1", "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks1_1", + "key": "worldtask_world_task_task_name_1", "text": "初来乍到" }, "npctxt": { - "key": "Mainline_Tasks1_1_Receiving", + "key": "worldtask_world_task_npctxt_1", "text": "和阿宝聊聊" }, "npc": 10010, "completetasktxt": { - "key": "Mainline_Tasks1_1_Receiving", + "key": "worldtask_world_task_completetasktxt_1", "text": "寻找熊猫" }, "completetask": [ @@ -53,20 +53,20 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks1", + "key": "worldtask_world_task_task_Tname_2", "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks1_2", + "key": "worldtask_world_task_task_name_2", "text": "参观中轴城" }, "npctxt": { - "key": "Mainline_Tasks1_2_Receiving", + "key": "worldtask_world_task_npctxt_2", "text": "去路口寻找阿宝" }, "npc": 10020, "completetasktxt": { - "key": "Mainline_Tasks1_2_Receiving", + "key": "worldtask_world_task_completetasktxt_2", "text": "美好的风景总是让人流连，忍不住心向往之，倾心守护。" }, "completetask": [ @@ -97,20 +97,20 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks1", + "key": "worldtask_world_task_task_Tname_3", "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks1_3", + "key": "worldtask_world_task_task_name_3", "text": "邦尼兔的质疑" }, "npctxt": { - "key": "Mainline_Tasks1_3_Receiving", + "key": "worldtask_world_task_npctxt_3", "text": "相信或不相信，能做到或不能做到，守护者与你，命运的齿轮早已开始转动……" }, "npc": 10021, "completetasktxt": { - "key": "Mainline_Tasks1_3_Receiving", + "key": "worldtask_world_task_completetasktxt_3", "text": "相信或不相信，能做到或不能做到，守护者与你，命运的齿轮早已开始转动……" }, "completetask": [ @@ -141,20 +141,20 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks1", + "key": "worldtask_world_task_task_Tname_4", "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks1_4", + "key": "worldtask_world_task_task_name_4", "text": "可疑之人" }, "npctxt": { - "key": "Mainline_Tasks1_4_Receiving", + "key": "worldtask_world_task_npctxt_4", "text": "它究竟从何而来，又预示着怎样的命运，一切不得而知……" }, "npc": 10031, "completetasktxt": { - "key": "Mainline_Tasks1_4_Receiving", + "key": "worldtask_world_task_completetasktxt_4", "text": "它究竟从何而来，又预示着怎样的命运，一切不得而知……" }, "completetask": [ @@ -185,20 +185,20 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks1", + "key": "worldtask_world_task_task_Tname_5", "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks1_5", + "key": "worldtask_world_task_task_name_5", "text": "熊猫武馆" }, "npctxt": { - "key": "Mainline_Tasks1_5_Receiving", + "key": "worldtask_world_task_npctxt_5", "text": "在熊猫武馆细细搜索，或许会有意外收获。" }, "npc": 103, "completetasktxt": { - "key": "Mainline_Tasks1_5_Receiving", + "key": "worldtask_world_task_completetasktxt_5", "text": "在熊猫武馆细细搜索，或许会有意外收获。" }, "completetask": [ @@ -229,20 +229,20 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks1", + "key": "worldtask_world_task_task_Tname_6", "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks1_6", + "key": "worldtask_world_task_task_name_6", "text": "紧急任务" }, "npctxt": { - "key": "Mainline_Tasks1_6_Receiving", + "key": "worldtask_world_task_npctxt_6", "text": "和阿宝聊聊" }, "npc": 10060, "completetasktxt": { - "key": "Mainline_Tasks1_6_Receiving", + "key": "worldtask_world_task_completetasktxt_6", "text": "被月中人选中之人，终将为守护而生。" }, "completetask": [ @@ -273,20 +273,20 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks1", + "key": "worldtask_world_task_task_Tname_7", "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks1_7", + "key": "worldtask_world_task_task_name_7", "text": "出发前的叮嘱" }, "npctxt": { - "key": "Mainline_Tasks1_7_Receiving", + "key": "worldtask_world_task_npctxt_7", "text": "试炼的终点，是名为勇者的觉醒。" }, "npc": 10070, "completetasktxt": { - "key": "Mainline_Tasks1_7_Receiving", + "key": "worldtask_world_task_completetasktxt_7", "text": "试炼的终点，是名为勇者的觉醒。" }, "completetask": [ @@ -327,20 +327,20 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks1", + "key": "worldtask_world_task_task_Tname_8", "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks1_8", + "key": "worldtask_world_task_task_name_8", "text": "戈伯铁匠铺" }, "npctxt": { - "key": "Mainline_Tasks1_8_Receiving", + "key": "worldtask_world_task_npctxt_8", "text": "听说维京人热爱海上的风浪、甘醇的啤酒、勇猛的龙，还有那无与伦比的艺术品……" }, "npc": 10080, "completetasktxt": { - "key": "Mainline_Tasks1_8_Receiving", + "key": "worldtask_world_task_completetasktxt_8", "text": "听说维京人热爱海上的风浪、甘醇的啤酒、勇猛的龙，还有那无与伦比的艺术品……" }, "completetask": [ @@ -371,20 +371,20 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks1", + "key": "worldtask_world_task_task_Tname_9", "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks1_9", + "key": "worldtask_world_task_task_name_9", "text": "试炼再起" }, "npctxt": { - "key": "Mainline_Tasks1_9_Receiving", + "key": "worldtask_world_task_npctxt_9", "text": "这就是维京人的工艺技术吗，我现在感觉自己的实力确实增长不少。" }, "npc": 10090, "completetasktxt": { - "key": "Mainline_Tasks1_9_Receiving", + "key": "worldtask_world_task_completetasktxt_9", "text": "我迫不及待的想要体验新获得的历练了" }, "completetask": [ @@ -415,20 +415,20 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks1", + "key": "worldtask_world_task_task_Tname_10", "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks1_10", + "key": "worldtask_world_task_task_name_10", "text": "归还原石" }, "npctxt": { - "key": "Mainline_Tasks1_10_Receiving", + "key": "worldtask_world_task_npctxt_10", "text": "骇客蛛会教我怎么做" }, "npc": 10100, "completetasktxt": { - "key": "Mainline_Tasks1_10_Receiving", + "key": "worldtask_world_task_completetasktxt_10", "text": "月光原石回到了它应该在的位置。" }, "completetask": [ @@ -459,20 +459,20 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks1", + "key": "worldtask_world_task_task_Tname_11", "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks1_11", + "key": "worldtask_world_task_task_name_11", "text": "召唤英雄" }, "npctxt": { - "key": "Mainline_Tasks1_11_Receiving", + "key": "worldtask_world_task_npctxt_11", "text": "叩响【守护之地】的门扉，迎接英雄的到来。" }, "npc": 10110, "completetasktxt": { - "key": "Mainline_Tasks1_11_Receiving", + "key": "worldtask_world_task_completetasktxt_11", "text": "叩响【守护之地】的门扉，迎接英雄的到来。" }, "completetask": [ @@ -503,20 +503,20 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks1", + "key": "worldtask_world_task_task_Tname_12", "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks1_12", + "key": "worldtask_world_task_task_name_12", "text": "梦魇的诞生" }, "npctxt": { - "key": "Mainline_Tasks1_12_Receiving", + "key": "worldtask_world_task_npctxt_12", "text": "沉睡梦魇，向死而生，追寻恐惧的身影、弧光与暗夜轮舞……" }, "npc": 10120, "completetasktxt": { - "key": "Mainline_Tasks1_12_Receiving", + "key": "worldtask_world_task_completetasktxt_12", "text": "沉睡梦魇，向死而生，追寻恐惧的身影、弧光与暗夜轮舞……" }, "completetask": [ @@ -547,20 +547,20 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks1", + "key": "worldtask_world_task_task_Tname_13", "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks1_13", + "key": "worldtask_world_task_task_name_13", "text": "消失的阴影" }, "npctxt": { - "key": "Mainline_Tasks1_13_Receiving", + "key": "worldtask_world_task_npctxt_13", "text": "找骇客蛛指定战术" }, "npc": 10130, "completetasktxt": { - "key": "Mainline_Tasks1_13_Receiving", + "key": "worldtask_world_task_completetasktxt_13", "text": "梦魇消失了，虽然危险的根源并未被根除，但至少现在我们安全了，暂时的。" }, "completetask": [ @@ -591,20 +591,20 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks1", + "key": "worldtask_world_task_task_Tname_14", "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks1_999", + "key": "worldtask_world_task_task_name_14", "text": "敬请期待" }, "npctxt": { - "key": "Mainline_Tasks1_999", + "key": "worldtask_world_task_npctxt_14", "text": "敬请期待" }, "npc": 10110, "completetasktxt": { - "key": "Mainline_Tasks1_999", + "key": "worldtask_world_task_completetasktxt_14", "text": "敬请期待！" }, "completetask": [ @@ -635,20 +635,20 @@ "des": 3, "icon": "", "task_Tname": { - "key": "Side_Quest0_task_Tname", + "key": "worldtask_world_task_task_Tname_15", "text": "欢迎到来" }, "task_name": { - "key": "Side_Quest0_task_name", + "key": "worldtask_world_task_task_name_15", "text": "初次来到世界" }, "npctxt": { - "key": "Side_Quest0_npctxt", + "key": "worldtask_world_task_npctxt_15", "text": "和门口的小家伙聊聊" }, "npc": 70070, "completetasktxt": { - "key": "Side_Quest0_npctxt", + "key": "worldtask_world_task_completetasktxt_15", "text": "和门口的小家伙聊聊" }, "completetask": [ @@ -679,20 +679,20 @@ "des": 3, "icon": "", "task_Tname": { - "key": "Side_Quest1", + "key": "worldtask_world_task_task_Tname_16", "text": "武馆内勤奋的身影是？" }, "task_name": { - "key": "Side_Quest1_1", + "key": "worldtask_world_task_task_name_16", "text": "盖在做什么" }, "npctxt": { - "key": "Side_Quest1_1_Receiving", + "key": "worldtask_world_task_npctxt_16", "text": "盖在哪里坐着一些看上去像是太极的姿势，我或许可以找他聊聊。" }, "npc": 70010, "completetasktxt": { - "key": "Side_Quest1_1_Receiving", + "key": "worldtask_world_task_completetasktxt_16", "text": "盖在哪里坐着一些看上去像是太极的姿势，我或许可以找他聊聊。" }, "completetask": [ @@ -723,20 +723,20 @@ "des": 3, "icon": "", "task_Tname": { - "key": "Side_Quest2", + "key": "worldtask_world_task_task_Tname_17", "text": "铁匠铺门口身影是?" }, "task_name": { - "key": "Side_Quest2_1", + "key": "worldtask_world_task_task_name_17", "text": "格里森" }, "npctxt": { - "key": "Side_Quest2_1_Receiving", + "key": "worldtask_world_task_npctxt_17", "text": "那个绿色的小家伙，好像是叫格林森，看上去有些闷闷不乐，是发生了什么事情吗？" }, "npc": 70020, "completetasktxt": { - "key": "Side_Quest2_1_Receiving", + "key": "worldtask_world_task_completetasktxt_17", "text": "那个绿色的小家伙，好像是叫格林森，看上去有些闷闷不乐，是发生了什么事情吗？" }, "completetask": [ @@ -767,20 +767,20 @@ "des": 3, "icon": "", "task_Tname": { - "key": "Side_Quest2", + "key": "worldtask_world_task_task_Tname_18", "text": "铁匠铺门口身影是?" }, "task_name": { - "key": "Side_Quest2_2", + "key": "worldtask_world_task_task_name_18", "text": "戈伯的唠叨" }, "npctxt": { - "key": "Side_Quest2_2_Receiving", + "key": "worldtask_world_task_npctxt_18", "text": "戈伯在他的铁匠铺里干活，但我现在需要去找他聊聊。" }, "npc": 70021, "completetasktxt": { - "key": "Side_Quest2_2_Receiving", + "key": "worldtask_world_task_completetasktxt_18", "text": "戈伯在他的铁匠铺里干活，但我现在需要去找他聊聊。" }, "completetask": [ @@ -811,20 +811,20 @@ "des": 3, "icon": "", "task_Tname": { - "key": "Side_Quest3", + "key": "worldtask_world_task_task_Tname_19", "text": "戈伯的嘱托" }, "task_name": { - "key": "Side_Quest3_1", + "key": "worldtask_world_task_task_name_19", "text": "戈伯在等你" }, "npctxt": { - "key": "Side_Quest3_1_Receiving", + "key": "worldtask_world_task_npctxt_19", "text": "戈伯有事情找我，我或许该去看看。" }, "npc": 70030, "completetasktxt": { - "key": "Side_Quest3_1_Receiving", + "key": "worldtask_world_task_completetasktxt_19", "text": "戈伯有事情找我，我或许该去看看。" }, "completetask": [ @@ -855,20 +855,20 @@ "des": 3, "icon": "", "task_Tname": { - "key": "Side_Quest3", + "key": "worldtask_world_task_task_Tname_20", "text": "戈伯的嘱托" }, "task_name": { - "key": "Side_Quest3_2", + "key": "worldtask_world_task_task_name_20", "text": "戈伯的思考" }, "npctxt": { - "key": "Side_Quest3_2_Receiving", + "key": "worldtask_world_task_npctxt_20", "text": "去找戈伯聊聊，然后再看具体需要做些什么。" }, "npc": 70031, "completetasktxt": { - "key": "Side_Quest3_2_Receiving", + "key": "worldtask_world_task_completetasktxt_20", "text": "任务完成了，是时候去找戈伯聊聊了。" }, "completetask": [ @@ -899,20 +899,20 @@ "des": 3, "icon": "", "task_Tname": { - "key": "Side_Quest4", + "key": "worldtask_world_task_task_Tname_21", "text": "武馆秘闻" }, "task_name": { - "key": "Side_Quest4_1", + "key": "worldtask_world_task_task_name_21", "text": "瓦希尔指挥官" }, "npctxt": { - "key": "Side_Quest4_1_Receiving", + "key": "worldtask_world_task_npctxt_21", "text": "瓦希尔指挥官在哪里做些什么，我或或许可以去看看" }, "npc": 70040, "completetasktxt": { - "key": "Side_Quest4_1_Receiving", + "key": "worldtask_world_task_completetasktxt_21", "text": "瓦希尔指挥官在哪里做些什么，我或或许可以去看看" }, "completetask": [ @@ -943,20 +943,20 @@ "des": 3, "icon": "", "task_Tname": { - "key": "Side_Quest5", + "key": "worldtask_world_task_task_Tname_22", "text": "好像有人再看我？" }, "task_name": { - "key": "Side_Quest5_1", + "key": "worldtask_world_task_task_name_22", "text": "小伊" }, "npctxt": { - "key": "Side_Quest5_1_Receiving", + "key": "worldtask_world_task_npctxt_22", "text": "那不是小伊吗，她是在.....练武吗？" }, "npc": 70050, "completetasktxt": { - "key": "Side_Quest5_1_Receiving", + "key": "worldtask_world_task_completetasktxt_22", "text": "那不是小伊吗，她是在.....练武吗？" }, "completetask": [ @@ -987,20 +987,20 @@ "des": 3, "icon": "", "task_Tname": { - "key": "Side_Quest6", + "key": "worldtask_world_task_task_Tname_23", "text": "戈伯的委托" }, "task_name": { - "key": "Side_Quest6_1", + "key": "worldtask_world_task_task_name_23", "text": "鼻涕粗" }, "npctxt": { - "key": "Side_Quest6_1_Receiving", + "key": "worldtask_world_task_npctxt_23", "text": "鼻涕粗为什么会一个人在这里，是遇到了什么事情吗？" }, "npc": 70060, "completetasktxt": { - "key": "Side_Quest6_1_Receiving", + "key": "worldtask_world_task_completetasktxt_23", "text": "鼻涕粗为什么会一个人在这里，是遇到了什么事情吗？" }, "completetask": [ @@ -1031,20 +1031,20 @@ "des": 1, "icon": "", "task_Tname": { - "key": "richang", + "key": "worldtask_world_task_task_Tname_24", "text": "魔药处" }, "task_name": { - "key": "richang", + "key": "worldtask_world_task_task_name_24", "text": "魔药处" }, "npctxt": { - "key": "Talk_to_Fiona", + "key": "worldtask_world_task_npctxt_24", "text": "和菲欧娜聊聊" }, "npc": 80010, "completetasktxt": { - "key": "Talk_to_Fiona", + "key": "worldtask_world_task_completetasktxt_24", "text": "和菲欧娜聊聊" }, "completetask": [ @@ -1075,20 +1075,20 @@ "des": 4, "icon": "", "task_Tname": { - "key": "zhouchang", + "key": "worldtask_world_task_task_Tname_25", "text": "烹饪处" }, "task_name": { - "key": "zhouchang", + "key": "worldtask_world_task_task_name_25", "text": "烹饪处" }, "npctxt": { - "key": "Talk_to_Peace", + "key": "worldtask_world_task_npctxt_25", "text": "和平先生聊聊" }, "npc": 80020, "completetasktxt": { - "key": "Talk_to_Peace", + "key": "worldtask_world_task_completetasktxt_25", "text": "和平先生聊聊" }, "completetask": [ diff --git a/comm/core.go b/comm/core.go index c5936134e..53f909092 100644 --- a/comm/core.go +++ b/comm/core.go @@ -27,6 +27,7 @@ type ISC_GateRouteComp interface { //游戏类资源类型 const ( AttrType = "attr" //用户属性资源 例如货币 经验 之类的 + PerType = "per" //用户皮肤,动作,背景 相关资源 ItemType = "item" //道具物品资源 HeroType = "hero" //卡片资源 例如英雄卡,检验卡 EquipmentType = "equi" //武器资源 diff --git a/pb/user_db.pb.go b/pb/user_db.pb.go index 0df2da944..329babcde 100644 --- a/pb/user_db.pb.go +++ b/pb/user_db.pb.go @@ -104,38 +104,39 @@ type DBUser struct { 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 - Uuid string `protobuf:"bytes,3,opt,name=uuid,proto3" json:"uuid" bson:"uuid"` //玩家唯一uuid - Binduid string `protobuf:"bytes,4,opt,name=binduid,proto3" json:"binduid" bson:"binduid"` //玩家账号 - Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name" bson:"name"` //玩家名 - Sid string `protobuf:"bytes,6,opt,name=sid,proto3" json:"sid" bson:"sid"` //区服id - Createip string `protobuf:"bytes,7,opt,name=createip,proto3" json:"createip" bson:"createip"` //创建账号时的ip - Lastloginip string `protobuf:"bytes,8,opt,name=lastloginip,proto3" json:"lastloginip" bson:"lastloginip"` //最后一次登录时的ip - Ctime int64 `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime" bson:"ctime"` //玩家创号时间戳 - Logintime int64 `protobuf:"varint,10,opt,name=logintime,proto3" json:"logintime" bson:"logintime"` //最后一次登录时间 - Gender int32 `protobuf:"varint,11,opt,name=gender,proto3" json:"gender" bson:"gender"` //性别 0男1女 - Avatar string `protobuf:"bytes,12,opt,name=avatar,proto3" json:"avatar" bson:"avatar"` //头像 - Gold int64 `protobuf:"varint,13,opt,name=gold,proto3" json:"gold" bson:"gold"` //金币 - Exp int64 `protobuf:"varint,14,opt,name=exp,proto3" json:"exp" bson:"exp"` //经验 - Vipexp int64 `protobuf:"varint,15,opt,name=vipexp,proto3" json:"vipexp" bson:"vipexp"` //vip经验 - Starcoin int64 `protobuf:"varint,16,opt,name=starcoin,proto3" json:"starcoin" bson:"starcoin"` //星座图币 - Created bool `protobuf:"varint,17,opt,name=created,proto3" json:"created" bson:"created"` //创角 - Lv int32 `protobuf:"varint,18,opt,name=lv,proto3" json:"lv" bson:"lv"` //等级 - Vip int32 `protobuf:"varint,19,opt,name=vip,proto3" json:"vip" bson:"vip"` // vip等级 - Diamond int64 `protobuf:"varint,20,opt,name=diamond,proto3" json:"diamond" bson:"diamond"` // 钻石 - Title int32 `protobuf:"varint,21,opt,name=title,proto3" json:"title" bson:"title"` //头衔 - Offlinetime int64 `protobuf:"varint,22,opt,name=offlinetime,proto3" json:"offlinetime" bson:"offlinetime"` //离线时间 - Figure int32 `protobuf:"varint,23,opt,name=figure,proto3" json:"figure" bson:"figure"` //主角形象 - Bgp string `protobuf:"bytes,24,opt,name=bgp,proto3" json:"bgp" bson:"bgp"` //背景 - Ps int32 `protobuf:"varint,25,opt,name=ps,proto3" json:"ps" bson:"ps"` //体力 - LastRecoverPsSec int64 `protobuf:"varint,26,opt,name=lastRecoverPsSec,proto3" json:"lastRecoverPsSec" bson:"lastRecoverPsSec"` // 上次体会恢复时间 - Moongold int32 `protobuf:"varint,27,opt,name=moongold,proto3" json:"moongold" bson:"moongold"` //纯净月髓 - Talent1 int32 `protobuf:"varint,28,opt,name=talent1,proto3" json:"talent1" bson:"talent1"` //阵营1天赋点 - Talent2 int32 `protobuf:"varint,29,opt,name=talent2,proto3" json:"talent2" bson:"talent2"` //阵营2天赋点 - Talent3 int32 `protobuf:"varint,30,opt,name=talent3,proto3" json:"talent3" bson:"talent3"` //阵营3天赋点 - Talent4 int32 `protobuf:"varint,31,opt,name=talent4,proto3" json:"talent4" bson:"talent4"` //阵营4天赋点 - Merchantmoney int32 `protobuf:"varint,32,opt,name=merchantmoney,proto3" json:"merchantmoney" bson:"merchantmoney"` //虚拟币（商队) + 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 + Uuid string `protobuf:"bytes,3,opt,name=uuid,proto3" json:"uuid" bson:"uuid"` //玩家唯一uuid + Binduid string `protobuf:"bytes,4,opt,name=binduid,proto3" json:"binduid" bson:"binduid"` //玩家账号 + Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name" bson:"name"` //玩家名 + Sid string `protobuf:"bytes,6,opt,name=sid,proto3" json:"sid" bson:"sid"` //区服id + Createip string `protobuf:"bytes,7,opt,name=createip,proto3" json:"createip" bson:"createip"` //创建账号时的ip + Lastloginip string `protobuf:"bytes,8,opt,name=lastloginip,proto3" json:"lastloginip" bson:"lastloginip"` //最后一次登录时的ip + Ctime int64 `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime" bson:"ctime"` //玩家创号时间戳 + Logintime int64 `protobuf:"varint,10,opt,name=logintime,proto3" json:"logintime" bson:"logintime"` //最后一次登录时间 + Gender int32 `protobuf:"varint,11,opt,name=gender,proto3" json:"gender" bson:"gender"` //性别 0男1女 + Avatar string `protobuf:"bytes,12,opt,name=avatar,proto3" json:"avatar" bson:"avatar"` //头像 + Gold int64 `protobuf:"varint,13,opt,name=gold,proto3" json:"gold" bson:"gold"` //金币 + Exp int64 `protobuf:"varint,14,opt,name=exp,proto3" json:"exp" bson:"exp"` //经验 + Vipexp int64 `protobuf:"varint,15,opt,name=vipexp,proto3" json:"vipexp" bson:"vipexp"` //vip经验 + Starcoin int64 `protobuf:"varint,16,opt,name=starcoin,proto3" json:"starcoin" bson:"starcoin"` //星座图币 + Created bool `protobuf:"varint,17,opt,name=created,proto3" json:"created" bson:"created"` //创角 + Lv int32 `protobuf:"varint,18,opt,name=lv,proto3" json:"lv" bson:"lv"` //等级 + Vip int32 `protobuf:"varint,19,opt,name=vip,proto3" json:"vip" bson:"vip"` // vip等级 + Diamond int64 `protobuf:"varint,20,opt,name=diamond,proto3" json:"diamond" bson:"diamond"` // 钻石 + Title int32 `protobuf:"varint,21,opt,name=title,proto3" json:"title" bson:"title"` //头衔 + Offlinetime int64 `protobuf:"varint,22,opt,name=offlinetime,proto3" json:"offlinetime" bson:"offlinetime"` //离线时间 + Figure int32 `protobuf:"varint,23,opt,name=figure,proto3" json:"figure" bson:"figure"` //主角形象 + Bgp string `protobuf:"bytes,24,opt,name=bgp,proto3" json:"bgp" bson:"bgp"` //背景 + Ps int32 `protobuf:"varint,25,opt,name=ps,proto3" json:"ps" bson:"ps"` //体力 + LastRecoverPsSec int64 `protobuf:"varint,26,opt,name=lastRecoverPsSec,proto3" json:"lastRecoverPsSec" bson:"lastRecoverPsSec"` // 上次体会恢复时间 + Moongold int32 `protobuf:"varint,27,opt,name=moongold,proto3" json:"moongold" bson:"moongold"` //纯净月髓 + Talent1 int32 `protobuf:"varint,28,opt,name=talent1,proto3" json:"talent1" bson:"talent1"` //阵营1天赋点 + Talent2 int32 `protobuf:"varint,29,opt,name=talent2,proto3" json:"talent2" bson:"talent2"` //阵营2天赋点 + Talent3 int32 `protobuf:"varint,30,opt,name=talent3,proto3" json:"talent3" bson:"talent3"` //阵营3天赋点 + Talent4 int32 `protobuf:"varint,31,opt,name=talent4,proto3" json:"talent4" bson:"talent4"` //阵营4天赋点 + Merchantmoney int32 `protobuf:"varint,32,opt,name=merchantmoney,proto3" json:"merchantmoney" bson:"merchantmoney"` //虚拟币（商队) + Perlist []int32 `protobuf:"varint,33,rep,packed,name=perlist,proto3" json:"perlist" bson:"perlist"` //皮肤,动作,背景 } func (x *DBUser) Reset() { @@ -394,6 +395,13 @@ func (x *DBUser) GetMerchantmoney() int32 { return 0 } +func (x *DBUser) GetPerlist() []int32 { + if x != nil { + return x.Perlist + } + return nil +} + type DBUserSetting struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -654,7 +662,7 @@ var file_user_user_db_proto_rawDesc = []byte{ 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x0e, - 0x0a, 0x02, 0x69, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x22, 0x98, + 0x0a, 0x02, 0x69, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x22, 0xb2, 0x06, 0x0a, 0x06, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x75, @@ -704,40 +712,42 @@ var file_user_user_db_proto_rawDesc = []byte{ 0x65, 0x6e, 0x74, 0x34, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x34, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x18, 0x20, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6d, 0x65, 0x72, 0x63, - 0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x22, 0xc7, 0x02, 0x0a, 0x0d, 0x44, 0x42, - 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x75, - 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, - 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x68, - 0x75, 0x61, 0x7a, 0x68, 0x69, 0x12, 0x1c, 0x0a, 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, - 0x68, 0x69, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, - 0x63, 0x68, 0x69, 0x12, 0x1a, 0x0a, 0x08, 0x67, 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, 0x67, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x67, 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, 0x67, 0x12, - 0x12, 0x0a, 0x04, 0x77, 0x75, 0x6c, 0x69, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x77, - 0x75, 0x6c, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x18, 0x07, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x05, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x66, 0x66, - 0x65, 0x63, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, - 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x75, 0x61, 0x6a, 0x69, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x05, 0x67, 0x75, 0x61, 0x6a, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, - 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x12, 0x16, 0x0a, - 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75, 0x6f, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x74, - 0x61, 0x6e, 0x73, 0x75, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, - 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x12, - 0x1c, 0x0a, 0x09, 0x78, 0x75, 0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x18, 0x0d, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x09, 0x78, 0x75, 0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x12, 0x14, 0x0a, - 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x73, 0x61, - 0x69, 0x6a, 0x69, 0x22, 0xb8, 0x01, 0x0a, 0x06, 0x44, 0x42, 0x53, 0x69, 0x67, 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, 0x1a, 0x0a, 0x08, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x08, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, - 0x73, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x09, 0x73, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, - 0x6f, 0x75, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, - 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, - 0x61, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x03, - 0x28, 0x05, 0x52, 0x06, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, - 0x70, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x69, 0x70, 0x73, 0x42, 0x06, - 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x65, 0x72, + 0x6c, 0x69, 0x73, 0x74, 0x18, 0x21, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x70, 0x65, 0x72, 0x6c, + 0x69, 0x73, 0x74, 0x22, 0xc7, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, + 0x74, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, + 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x12, + 0x1c, 0x0a, 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x0d, 0x52, 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x12, 0x1a, 0x0a, + 0x08, 0x67, 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x08, 0x67, 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x77, 0x75, 0x6c, + 0x69, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x77, 0x75, 0x6c, 0x69, 0x12, 0x14, 0x0a, + 0x05, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6d, 0x75, + 0x73, 0x69, 0x63, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x18, 0x08, 0x20, + 0x01, 0x28, 0x08, 0x52, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, + 0x75, 0x61, 0x6a, 0x69, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x67, 0x75, 0x61, 0x6a, + 0x69, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75, + 0x6f, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75, 0x6f, 0x12, + 0x18, 0x0a, 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x78, 0x75, 0x61, + 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x78, 0x75, + 0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, + 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, 0x22, 0xb8, 0x01, + 0x0a, 0x06, 0x44, 0x42, 0x53, 0x69, 0x67, 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, 0x1a, 0x0a, 0x08, 0x73, 0x69, + 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73, 0x69, + 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x43, 0x6f, + 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x43, + 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x05, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, + 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x79, 0x12, 0x16, 0x0a, 0x06, + 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x70, 0x75, + 0x7a, 0x7a, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x70, 0x73, 0x18, 0x08, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x04, 0x74, 0x69, 0x70, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/sys/configure/structs/Game.BuffType.go b/sys/configure/structs/Game.BuffType.go index b07fed1fa..69803d04d 100644 --- a/sys/configure/structs/Game.BuffType.go +++ b/sys/configure/structs/Game.BuffType.go @@ -76,4 +76,5 @@ const ( GameBuffType_FINAL_DMG_DOWN = 64 GameBuffType_TIGER_ROAR = 65 GameBuffType_FORGET = 66 + GameBuffType_RAMPAGE = 67 ) diff --git a/sys/configure/structs/Game.BuzkashiGradeData.go b/sys/configure/structs/Game.BuzkashiGradeData.go index 58cefc9c3..2fcee4121 100644 --- a/sys/configure/structs/Game.BuzkashiGradeData.go +++ b/sys/configure/structs/Game.BuzkashiGradeData.go @@ -12,7 +12,7 @@ import "errors" type GameBuzkashiGradeData struct { Num int32 - Distance string + Distance float32 Value int32 } @@ -24,7 +24,7 @@ func (*GameBuzkashiGradeData) GetTypeId() int32 { func (_v *GameBuzkashiGradeData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["num"].(float64); !_ok_ { err = errors.New("num error"); return }; _v.Num = int32(_tempNum_) } - { var _ok_ bool; if _v.Distance, _ok_ = _buf["distance"].(string); !_ok_ { err = errors.New("distance error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["distance"].(float64); !_ok_ { err = errors.New("distance error"); return }; _v.Distance = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) } return } diff --git a/sys/configure/structs/Game.NameLibraryData.go b/sys/configure/structs/Game.NameLibraryData.go index 88f40e89e..7349bc250 100644 --- a/sys/configure/structs/Game.NameLibraryData.go +++ b/sys/configure/structs/Game.NameLibraryData.go @@ -14,6 +14,7 @@ type GameNameLibraryData struct { Id int32 Surname string Name string + Sex int32 } const TypeId_GameNameLibraryData = 77094270 @@ -26,6 +27,7 @@ func (_v *GameNameLibraryData)Deserialize(_buf map[string]interface{}) (err erro { 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 __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["surname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Surname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Surname, _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["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["sex"].(float64); !_ok_ { err = errors.New("sex error"); return }; _v.Sex = int32(_tempNum_) } return } diff --git a/sys/configure/structs/Game.PlayerInfor_overview.go b/sys/configure/structs/Game.PlayerInfor_overview.go new file mode 100644 index 000000000..417e23828 --- /dev/null +++ b/sys/configure/structs/Game.PlayerInfor_overview.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 GamePlayerInfor_overview struct { + _dataMap map[int32]*GamePlayerInfor_overviewData + _dataList []*GamePlayerInfor_overviewData +} + +func NewGamePlayerInfor_overview(_buf []map[string]interface{}) (*GamePlayerInfor_overview, error) { + _dataList := make([]*GamePlayerInfor_overviewData, 0, len(_buf)) + dataMap := make(map[int32]*GamePlayerInfor_overviewData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGamePlayerInfor_overviewData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GamePlayerInfor_overview{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GamePlayerInfor_overview) GetDataMap() map[int32]*GamePlayerInfor_overviewData { + return table._dataMap +} + +func (table *GamePlayerInfor_overview) GetDataList() []*GamePlayerInfor_overviewData { + return table._dataList +} + +func (table *GamePlayerInfor_overview) Get(key int32) *GamePlayerInfor_overviewData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.PlayerInfor_overviewData.go b/sys/configure/structs/Game.PlayerInfor_overviewData.go new file mode 100644 index 000000000..39e111cd6 --- /dev/null +++ b/sys/configure/structs/Game.PlayerInfor_overviewData.go @@ -0,0 +1,60 @@ +//------------------------------------------------------------------------------ +// +// 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 GamePlayerInfor_overviewData struct { + Id int32 + Type int32 + Icon string + Tujing []int32 + Url string + Playerhead string + Name string +} + +const TypeId_GamePlayerInfor_overviewData = -725250341 + +func (*GamePlayerInfor_overviewData) GetTypeId() int32 { + return -725250341 +} + +func (_v *GamePlayerInfor_overviewData)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["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["tujing"].([]interface{}); !_ok_ { err = errors.New("tujing error"); return } + + _v.Tujing = 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.Tujing = append(_v.Tujing, _list_v_) + } + } + + { var _ok_ bool; if _v.Url, _ok_ = _buf["url"].(string); !_ok_ { err = errors.New("url error"); return } } + { var _ok_ bool; if _v.Playerhead, _ok_ = _buf["playerhead"].(string); !_ok_ { err = errors.New("playerhead error"); return } } + { var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name error"); return } } + return +} + +func DeserializeGamePlayerInfor_overviewData(_buf map[string]interface{}) (*GamePlayerInfor_overviewData, error) { + v := &GamePlayerInfor_overviewData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.RuleDesc.go b/sys/configure/structs/Game.RuleDesc.go new file mode 100644 index 000000000..e20cd0a85 --- /dev/null +++ b/sys/configure/structs/Game.RuleDesc.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 GameRuleDesc struct { + _dataMap map[int32]*GameRuleDescData + _dataList []*GameRuleDescData +} + +func NewGameRuleDesc(_buf []map[string]interface{}) (*GameRuleDesc, error) { + _dataList := make([]*GameRuleDescData, 0, len(_buf)) + dataMap := make(map[int32]*GameRuleDescData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameRuleDescData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameRuleDesc{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameRuleDesc) GetDataMap() map[int32]*GameRuleDescData { + return table._dataMap +} + +func (table *GameRuleDesc) GetDataList() []*GameRuleDescData { + return table._dataList +} + +func (table *GameRuleDesc) Get(key int32) *GameRuleDescData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.RuleDescData.go b/sys/configure/structs/Game.RuleDescData.go new file mode 100644 index 000000000..ec3dc718f --- /dev/null +++ b/sys/configure/structs/Game.RuleDescData.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 GameRuleDescData struct { + Id int32 + Title string + Content string +} + +const TypeId_GameRuleDescData = 1672994163 + +func (*GameRuleDescData) GetTypeId() int32 { + return 1672994163 +} + +func (_v *GameRuleDescData)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.Title, _ok_ = _buf["title"].(string); !_ok_ { err = errors.New("title error"); return } } + { var _ok_ bool; if _v.Content, _ok_ = _buf["content"].(string); !_ok_ { err = errors.New("content error"); return } } + return +} + +func DeserializeGameRuleDescData(_buf map[string]interface{}) (*GameRuleDescData, error) { + v := &GameRuleDescData{} + 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 e471dd1ea..9a0289a9e 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -86,6 +86,7 @@ type Tables struct { LinestoryMainTask *GameLinestoryMainTask Herofusion *GameHerofusion PlayerInfor *GamePlayerInfor + PlayerInfor_overview *GamePlayerInfor_overview HeroTalent *GameHeroTalent TalentSkill *GameTalentSkill ArenaBuyChallenge *GameArenaBuyChallenge @@ -194,6 +195,7 @@ type Tables struct { BuzkashiOpen *GameBuzkashiOpen Pricegroup *GamePricegroup Loading *GameLoading + RuleDesc *GameRuleDesc } func NewTables(loader JsonLoader) (*Tables, error) { @@ -651,6 +653,12 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.PlayerInfor, err = NewGamePlayerInfor(buf) ; err != nil { return nil, err } + if buf, err = loader("game_playerinfor_overview") ; err != nil { + return nil, err + } + if tables.PlayerInfor_overview, err = NewGamePlayerInfor_overview(buf) ; err != nil { + return nil, err + } if buf, err = loader("game_herotalent") ; err != nil { return nil, err } @@ -1299,5 +1307,11 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.Loading, err = NewGameLoading(buf) ; err != nil { return nil, err } + if buf, err = loader("game_ruledesc") ; err != nil { + return nil, err + } + if tables.RuleDesc, err = NewGameRuleDesc(buf) ; err != nil { + return nil, err + } return tables, nil } diff --git a/sys/configure/structs/game.coinData.go b/sys/configure/structs/game.coinData.go index 2ea0aa957..5d26249ba 100644 --- a/sys/configure/structs/game.coinData.go +++ b/sys/configure/structs/game.coinData.go @@ -15,7 +15,7 @@ type GameCoinData struct { Name string Color int32 Effects string - Access int32 + Access []int32 Img string Intr string } @@ -31,7 +31,20 @@ func (_v *GameCoinData)Deserialize(_buf map[string]interface{}) (err error) { {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["color"].(float64); !_ok_ { err = errors.New("color error"); return }; _v.Color = int32(_tempNum_) } { var _ok_ bool; if _v.Effects, _ok_ = _buf["effects"].(string); !_ok_ { err = errors.New("effects error"); return } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["access"].(float64); !_ok_ { err = errors.New("access error"); return }; _v.Access = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["access"].([]interface{}); !_ok_ { err = errors.New("access error"); return } + + _v.Access = 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.Access = append(_v.Access, _list_v_) + } + } + { var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["intr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Intr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Intr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } return diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index d4177415e..a69c46d3a 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -229,6 +229,9 @@ type GameGlobalData struct { BuzkashiSpeedbumptime int32 BuzkashiRecovertime int32 BuzkashiRecoverHp int32 + BuzkashiDeathspeed int32 + BuzkashiGoal int32 + BuzkashiGoalspeed int32 } const TypeId_GameGlobalData = 477542761 @@ -937,6 +940,9 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_speedbumptime"].(float64); !_ok_ { err = errors.New("buzkashi_speedbumptime error"); return }; _v.BuzkashiSpeedbumptime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_recovertime"].(float64); !_ok_ { err = errors.New("buzkashi_recovertime error"); return }; _v.BuzkashiRecovertime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_recoverHp"].(float64); !_ok_ { err = errors.New("buzkashi_recoverHp error"); return }; _v.BuzkashiRecoverHp = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_deathspeed"].(float64); !_ok_ { err = errors.New("buzkashi_deathspeed error"); return }; _v.BuzkashiDeathspeed = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_goal"].(float64); !_ok_ { err = errors.New("buzkashi_goal error"); return }; _v.BuzkashiGoal = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_goalspeed"].(float64); !_ok_ { err = errors.New("buzkashi_goalspeed error"); return }; _v.BuzkashiGoalspeed = int32(_tempNum_) } return } From d54263325716d72ff80ff12bfcacb122ec345539 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 17 May 2023 11:43:23 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=83=8C=E5=8C=85=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/caravan/api_buyorsell.go | 14 ++++++++++++-- modules/caravan/module.go | 23 +++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/modules/caravan/api_buyorsell.go b/modules/caravan/api_buyorsell.go index 5fb6104f0..cfe15cb48 100644 --- a/modules/caravan/api_buyorsell.go +++ b/modules/caravan/api_buyorsell.go @@ -51,8 +51,13 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe continue } for _, k1 := range cityInfo.Like { - if k == k1 && v < caravan.Items[k].Count { - caravan.Items[k].Count -= v + if k == k1 { + if v < caravan.Items[k].Count { + caravan.Items[k].Count -= v + } else { + code = pb.ErrorCode_TrollSellMax // 卖出数量不足 + return + } } } // 找到城市想要收购的物品 @@ -94,6 +99,10 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe } } caravan.Items[k].Count += v + if this.module.ArrayBag(caravan, upperLimit) { // 背包满了 + code = pb.ErrorCode_TrollMaxItemCount + return + } totla += price * v caravan.Items[k].Price = totla / caravan.Items[k].Count // 同步更新该城市的 出售货物信息 @@ -116,6 +125,7 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe this.module.Errorf("获得虚拟币失败:%d", code) } update["item"] = caravan.Items + update["baglimit"] = caravan.Baglimit this.module.modelCaravan.modifyCaravanDataByObjId(session.GetUserId(), update) session.SendMsg(string(this.module.GetType()), "buyorsell", &pb.CaravanBuyOrSellResp{ Data: caravan, diff --git a/modules/caravan/module.go b/modules/caravan/module.go index 896d18fdb..c0a239fa3 100644 --- a/modules/caravan/module.go +++ b/modules/caravan/module.go @@ -299,3 +299,26 @@ func (this *Caravan) TaskComplete(session comm.IUserSession, taskid int32) { } } } + +// 整理背包 (true 表示背包装不下) +func (this *Caravan) ArrayBag(data *pb.DBCaravan, limit int32) (bFull bool) { + var count int32 + for k, v := range data.Items { + if v.Count == 0 { + delete(data.Items, k) + } else { + for { + count++ + if v.Count > limit { + v.Count -= limit + } else { + break + } + } + } + } + if count > data.Baglimit { + return false + } + return true +} From c1b65c43143957e374c6719bfaee7ca0774570f1 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Wed, 17 May 2023 11:57:38 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=9A=AE=E8=82=A4?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/imodule.go | 2 + modules/modulebase.go | 8 ++ modules/user/module.go | 37 +++++ pb/user_db.pb.go | 171 ++++++++++++---------- pb/user_msg.pb.go | 314 +++++++++++++++++++++-------------------- 5 files changed, 309 insertions(+), 223 deletions(-) diff --git a/comm/imodule.go b/comm/imodule.go index ef0b6816c..02fa28359 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -152,6 +152,8 @@ type ( // bingo设置玩家等级 BingoSetUserLv(session IUserSession, lv int32) error BingoSetUserVipLv(session IUserSession, lv int32) error + //添加皮肤资源接口 + AddPer(session IUserSession, pers map[string]int32, bPush bool) (code pb.ErrorCode) } //武器模块 IEquipment interface { diff --git a/modules/modulebase.go b/modules/modulebase.go index 071dda54f..42aebd144 100644 --- a/modules/modulebase.go +++ b/modules/modulebase.go @@ -404,6 +404,7 @@ func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Gameat atlas map[string]int32 // 铁匠铺资源 panda map[string]int32 // 熊猫武馆资源 mts map[string]int32 // 捕羊大赛资源 + per map[string]int32 // 捕羊大赛资源 ) items = make(map[string]int32, 0) heros = make(map[string]int32, 0) @@ -413,6 +414,7 @@ func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Gameat atlas = make(map[string]int32, 0) panda = make(map[string]int32, 0) mts = make(map[string]int32, 0) + per = make(map[string]int32, 0) for _, v := range res { switch v.A { @@ -434,6 +436,8 @@ func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Gameat panda[v.T] = 1 case comm.MountsType: mts[v.T] = 1 + case comm.PerType: + per[v.T] = 1 default: this.Errorf("not found res type") // 找不到资源类型 } @@ -475,6 +479,10 @@ func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Gameat code = this.ModuleParkour.AddMounts(session, mts, bPush) this.Debugf("发放捕羊大赛资源: %v [%v]", mts, code) } + if len(per) > 0 { + code = this.ModuleUser.AddPer(session, per, bPush) + this.Debugf("发放用户皮肤资源资源: %v [%v]", mts, code) + } return } diff --git a/modules/user/module.go b/modules/user/module.go index 1cbcac42d..2331d0588 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -950,3 +950,40 @@ func (this *User) BingoSetUserVipLv(session comm.IUserSession, lv int32) error { } return nil } + +//添加用户皮肤数据 +func (this *User) AddPer(session comm.IUserSession, pers map[string]int32, bPush bool) (code pb.ErrorCode) { + var ( + err error + user *pb.DBUser + adds []string = make([]string, 0) + iskeep bool + ) + if user = this.GetUser(session.GetUserId()); user == nil { + code = pb.ErrorCode_UserSessionNobeing + return + } + + for k, _ := range pers { + iskeep = false + for _, v1 := range user.Perlist { + if k == v1 { + iskeep = true + break + } + } + if !iskeep { + adds = append(adds, k) + } + } + + user.Perlist = append(user.Perlist, adds...) + if err = this.modelUser.Change(session.GetUserId(), map[string]interface{}{"perlist": user.Perlist}); err != nil { + code = pb.ErrorCode_DBError + return + } + if bPush { + session.SendMsg(string(this.GetType()), "reschanged", &pb.UserResChangedPush{Perlist: user.Perlist}) + } + return +} diff --git a/pb/user_db.pb.go b/pb/user_db.pb.go index 329babcde..5c1a9203f 100644 --- a/pb/user_db.pb.go +++ b/pb/user_db.pb.go @@ -104,39 +104,42 @@ type DBUser struct { 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 - Uuid string `protobuf:"bytes,3,opt,name=uuid,proto3" json:"uuid" bson:"uuid"` //玩家唯一uuid - Binduid string `protobuf:"bytes,4,opt,name=binduid,proto3" json:"binduid" bson:"binduid"` //玩家账号 - Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name" bson:"name"` //玩家名 - Sid string `protobuf:"bytes,6,opt,name=sid,proto3" json:"sid" bson:"sid"` //区服id - Createip string `protobuf:"bytes,7,opt,name=createip,proto3" json:"createip" bson:"createip"` //创建账号时的ip - Lastloginip string `protobuf:"bytes,8,opt,name=lastloginip,proto3" json:"lastloginip" bson:"lastloginip"` //最后一次登录时的ip - Ctime int64 `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime" bson:"ctime"` //玩家创号时间戳 - Logintime int64 `protobuf:"varint,10,opt,name=logintime,proto3" json:"logintime" bson:"logintime"` //最后一次登录时间 - Gender int32 `protobuf:"varint,11,opt,name=gender,proto3" json:"gender" bson:"gender"` //性别 0男1女 - Avatar string `protobuf:"bytes,12,opt,name=avatar,proto3" json:"avatar" bson:"avatar"` //头像 - Gold int64 `protobuf:"varint,13,opt,name=gold,proto3" json:"gold" bson:"gold"` //金币 - Exp int64 `protobuf:"varint,14,opt,name=exp,proto3" json:"exp" bson:"exp"` //经验 - Vipexp int64 `protobuf:"varint,15,opt,name=vipexp,proto3" json:"vipexp" bson:"vipexp"` //vip经验 - Starcoin int64 `protobuf:"varint,16,opt,name=starcoin,proto3" json:"starcoin" bson:"starcoin"` //星座图币 - Created bool `protobuf:"varint,17,opt,name=created,proto3" json:"created" bson:"created"` //创角 - Lv int32 `protobuf:"varint,18,opt,name=lv,proto3" json:"lv" bson:"lv"` //等级 - Vip int32 `protobuf:"varint,19,opt,name=vip,proto3" json:"vip" bson:"vip"` // vip等级 - Diamond int64 `protobuf:"varint,20,opt,name=diamond,proto3" json:"diamond" bson:"diamond"` // 钻石 - Title int32 `protobuf:"varint,21,opt,name=title,proto3" json:"title" bson:"title"` //头衔 - Offlinetime int64 `protobuf:"varint,22,opt,name=offlinetime,proto3" json:"offlinetime" bson:"offlinetime"` //离线时间 - Figure int32 `protobuf:"varint,23,opt,name=figure,proto3" json:"figure" bson:"figure"` //主角形象 - Bgp string `protobuf:"bytes,24,opt,name=bgp,proto3" json:"bgp" bson:"bgp"` //背景 - Ps int32 `protobuf:"varint,25,opt,name=ps,proto3" json:"ps" bson:"ps"` //体力 - LastRecoverPsSec int64 `protobuf:"varint,26,opt,name=lastRecoverPsSec,proto3" json:"lastRecoverPsSec" bson:"lastRecoverPsSec"` // 上次体会恢复时间 - Moongold int32 `protobuf:"varint,27,opt,name=moongold,proto3" json:"moongold" bson:"moongold"` //纯净月髓 - Talent1 int32 `protobuf:"varint,28,opt,name=talent1,proto3" json:"talent1" bson:"talent1"` //阵营1天赋点 - Talent2 int32 `protobuf:"varint,29,opt,name=talent2,proto3" json:"talent2" bson:"talent2"` //阵营2天赋点 - Talent3 int32 `protobuf:"varint,30,opt,name=talent3,proto3" json:"talent3" bson:"talent3"` //阵营3天赋点 - Talent4 int32 `protobuf:"varint,31,opt,name=talent4,proto3" json:"talent4" bson:"talent4"` //阵营4天赋点 - Merchantmoney int32 `protobuf:"varint,32,opt,name=merchantmoney,proto3" json:"merchantmoney" bson:"merchantmoney"` //虚拟币（商队) - Perlist []int32 `protobuf:"varint,33,rep,packed,name=perlist,proto3" json:"perlist" bson:"perlist"` //皮肤,动作,背景 + 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 + Uuid string `protobuf:"bytes,3,opt,name=uuid,proto3" json:"uuid" bson:"uuid"` //玩家唯一uuid + Binduid string `protobuf:"bytes,4,opt,name=binduid,proto3" json:"binduid" bson:"binduid"` //玩家账号 + Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name" bson:"name"` //玩家名 + Sid string `protobuf:"bytes,6,opt,name=sid,proto3" json:"sid" bson:"sid"` //区服id + Createip string `protobuf:"bytes,7,opt,name=createip,proto3" json:"createip" bson:"createip"` //创建账号时的ip + Lastloginip string `protobuf:"bytes,8,opt,name=lastloginip,proto3" json:"lastloginip" bson:"lastloginip"` //最后一次登录时的ip + Ctime int64 `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime" bson:"ctime"` //玩家创号时间戳 + Logintime int64 `protobuf:"varint,10,opt,name=logintime,proto3" json:"logintime" bson:"logintime"` //最后一次登录时间 + Gender int32 `protobuf:"varint,11,opt,name=gender,proto3" json:"gender" bson:"gender"` //性别 0男1女 + Avatar string `protobuf:"bytes,12,opt,name=avatar,proto3" json:"avatar" bson:"avatar"` //头像 + Gold int64 `protobuf:"varint,13,opt,name=gold,proto3" json:"gold" bson:"gold"` //金币 + Exp int64 `protobuf:"varint,14,opt,name=exp,proto3" json:"exp" bson:"exp"` //经验 + Vipexp int64 `protobuf:"varint,15,opt,name=vipexp,proto3" json:"vipexp" bson:"vipexp"` //vip经验 + Starcoin int64 `protobuf:"varint,16,opt,name=starcoin,proto3" json:"starcoin" bson:"starcoin"` //星座图币 + Created bool `protobuf:"varint,17,opt,name=created,proto3" json:"created" bson:"created"` //创角 + Lv int32 `protobuf:"varint,18,opt,name=lv,proto3" json:"lv" bson:"lv"` //等级 + Vip int32 `protobuf:"varint,19,opt,name=vip,proto3" json:"vip" bson:"vip"` // vip等级 + Diamond int64 `protobuf:"varint,20,opt,name=diamond,proto3" json:"diamond" bson:"diamond"` // 钻石 + Title int32 `protobuf:"varint,21,opt,name=title,proto3" json:"title" bson:"title"` //头衔 + Offlinetime int64 `protobuf:"varint,22,opt,name=offlinetime,proto3" json:"offlinetime" bson:"offlinetime"` //离线时间 + Figure int32 `protobuf:"varint,23,opt,name=figure,proto3" json:"figure" bson:"figure"` //主角形象 + Bgp string `protobuf:"bytes,24,opt,name=bgp,proto3" json:"bgp" bson:"bgp"` //背景 + Ps int32 `protobuf:"varint,25,opt,name=ps,proto3" json:"ps" bson:"ps"` //体力 + LastRecoverPsSec int64 `protobuf:"varint,26,opt,name=lastRecoverPsSec,proto3" json:"lastRecoverPsSec" bson:"lastRecoverPsSec"` // 上次体会恢复时间 + Moongold int32 `protobuf:"varint,27,opt,name=moongold,proto3" json:"moongold" bson:"moongold"` //纯净月髓 + Talent1 int32 `protobuf:"varint,28,opt,name=talent1,proto3" json:"talent1" bson:"talent1"` //阵营1天赋点 + Talent2 int32 `protobuf:"varint,29,opt,name=talent2,proto3" json:"talent2" bson:"talent2"` //阵营2天赋点 + Talent3 int32 `protobuf:"varint,30,opt,name=talent3,proto3" json:"talent3" bson:"talent3"` //阵营3天赋点 + Talent4 int32 `protobuf:"varint,31,opt,name=talent4,proto3" json:"talent4" bson:"talent4"` //阵营4天赋点 + Merchantmoney int32 `protobuf:"varint,32,opt,name=merchantmoney,proto3" json:"merchantmoney" bson:"merchantmoney"` //虚拟币（商队) + Perlist []string `protobuf:"bytes,33,rep,name=perlist,proto3" json:"perlist" bson:"perlist"` //皮肤,动作,背景 + Defper1 string `protobuf:"bytes,34,opt,name=defper1,proto3" json:"defper1" bson:"defper1"` //默认皮肤 + Defper2 string `protobuf:"bytes,35,opt,name=defper2,proto3" json:"defper2" bson:"defper2"` //默认动作 + Defper3 string `protobuf:"bytes,36,opt,name=defper3,proto3" json:"defper3" bson:"defper3"` //默认背景 } func (x *DBUser) Reset() { @@ -395,13 +398,34 @@ func (x *DBUser) GetMerchantmoney() int32 { return 0 } -func (x *DBUser) GetPerlist() []int32 { +func (x *DBUser) GetPerlist() []string { if x != nil { return x.Perlist } return nil } +func (x *DBUser) GetDefper1() string { + if x != nil { + return x.Defper1 + } + return "" +} + +func (x *DBUser) GetDefper2() string { + if x != nil { + return x.Defper2 + } + return "" +} + +func (x *DBUser) GetDefper3() string { + if x != nil { + return x.Defper3 + } + return "" +} + type DBUserSetting struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -662,8 +686,8 @@ var file_user_user_db_proto_rawDesc = []byte{ 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x0e, - 0x0a, 0x02, 0x69, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x22, 0xb2, - 0x06, 0x0a, 0x06, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x0a, 0x02, 0x69, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x22, 0x80, + 0x07, 0x0a, 0x06, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x12, @@ -713,41 +737,46 @@ var file_user_user_db_proto_rawDesc = []byte{ 0x6e, 0x74, 0x34, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x18, 0x20, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x65, 0x72, - 0x6c, 0x69, 0x73, 0x74, 0x18, 0x21, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x70, 0x65, 0x72, 0x6c, - 0x69, 0x73, 0x74, 0x22, 0xc7, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, - 0x74, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, - 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x12, - 0x1c, 0x0a, 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x0d, 0x52, 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x12, 0x1a, 0x0a, - 0x08, 0x67, 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x08, 0x67, 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x77, 0x75, 0x6c, - 0x69, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x77, 0x75, 0x6c, 0x69, 0x12, 0x14, 0x0a, - 0x05, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6d, 0x75, - 0x73, 0x69, 0x63, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x18, 0x08, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, - 0x75, 0x61, 0x6a, 0x69, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x67, 0x75, 0x61, 0x6a, - 0x69, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75, - 0x6f, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75, 0x6f, 0x12, - 0x18, 0x0a, 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x78, 0x75, 0x61, - 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x78, 0x75, - 0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, - 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, 0x22, 0xb8, 0x01, - 0x0a, 0x06, 0x44, 0x42, 0x53, 0x69, 0x67, 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, 0x1a, 0x0a, 0x08, 0x73, 0x69, - 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73, 0x69, - 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x43, 0x6f, - 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x43, - 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x05, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, - 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x79, 0x12, 0x16, 0x0a, 0x06, - 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x70, 0x75, - 0x7a, 0x7a, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x70, 0x73, 0x18, 0x08, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x04, 0x74, 0x69, 0x70, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6c, 0x69, 0x73, 0x74, 0x18, 0x21, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x70, 0x65, 0x72, 0x6c, + 0x69, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x66, 0x70, 0x65, 0x72, 0x31, 0x18, 0x22, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x64, 0x65, 0x66, 0x70, 0x65, 0x72, 0x31, 0x12, 0x18, 0x0a, + 0x07, 0x64, 0x65, 0x66, 0x70, 0x65, 0x72, 0x32, 0x18, 0x23, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, + 0x64, 0x65, 0x66, 0x70, 0x65, 0x72, 0x32, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x66, 0x70, 0x65, + 0x72, 0x33, 0x18, 0x24, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x64, 0x65, 0x66, 0x70, 0x65, 0x72, + 0x33, 0x22, 0xc7, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, + 0x69, 0x6e, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x12, 0x1c, 0x0a, + 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, + 0x52, 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x12, 0x1a, 0x0a, 0x08, 0x67, + 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x67, + 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x77, 0x75, 0x6c, 0x69, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x77, 0x75, 0x6c, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x6d, + 0x75, 0x73, 0x69, 0x63, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6d, 0x75, 0x73, 0x69, + 0x63, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, + 0x08, 0x52, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x75, 0x61, + 0x6a, 0x69, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x67, 0x75, 0x61, 0x6a, 0x69, 0x12, + 0x14, 0x0a, 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, + 0x66, 0x75, 0x62, 0x65, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75, 0x6f, 0x18, + 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75, 0x6f, 0x12, 0x18, 0x0a, + 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, + 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x78, 0x75, 0x61, 0x6e, 0x73, + 0x68, 0x61, 0x6e, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x78, 0x75, 0x61, 0x6e, + 0x73, 0x68, 0x61, 0x6e, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, 0x18, 0x0e, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, 0x22, 0xb8, 0x01, 0x0a, 0x06, + 0x44, 0x42, 0x53, 0x69, 0x67, 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, 0x1a, 0x0a, 0x08, 0x73, 0x69, 0x67, 0x6e, + 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73, 0x69, 0x67, 0x6e, + 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x75, 0x6e, + 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x75, + 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x79, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x75, + 0x7a, 0x7a, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x70, 0x75, 0x7a, 0x7a, + 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x70, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x04, 0x74, 0x69, 0x70, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/user_msg.pb.go b/pb/user_msg.pb.go index eb85caab5..48dc76cff 100644 --- a/pb/user_msg.pb.go +++ b/pb/user_msg.pb.go @@ -585,21 +585,22 @@ type UserResChangedPush struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Gold int64 `protobuf:"varint,1,opt,name=gold,proto3" json:"gold" bson:"gold"` //金币 - Exp int64 `protobuf:"varint,2,opt,name=exp,proto3" json:"exp" bson:"exp"` //经验 - Vipexp int64 `protobuf:"varint,3,opt,name=vipexp,proto3" json:"vipexp" bson:"vipexp"` //经验 - Diamond int64 `protobuf:"varint,4,opt,name=diamond,proto3" json:"diamond" bson:"diamond"` // 钻石 - Friend int32 `protobuf:"varint,5,opt,name=friend,proto3" json:"friend" bson:"frined"` //友情点 - Starcoin int64 `protobuf:"varint,6,opt,name=starcoin,proto3" json:"starcoin" bson:"starcoin"` //星座币 - Guildcoin int32 `protobuf:"varint,7,opt,name=guildcoin,proto3" json:"guildcoin" bson:"guildcoin"` //公会币 - Arenacoin int32 `protobuf:"varint,8,opt,name=arenacoin,proto3" json:"arenacoin" bson:"arenacoin"` //竞技场币 - Ps int32 `protobuf:"varint,9,opt,name=ps,proto3" json:"ps" bson:"ps"` //体力 - Moongold int32 `protobuf:"varint,10,opt,name=moongold,proto3" json:"moongold" bson:"moongold"` //纯净月髓 - Talent1 int32 `protobuf:"varint,11,opt,name=talent1,proto3" json:"talent1" bson:"talent1"` //阵营1天赋点 - Talent2 int32 `protobuf:"varint,12,opt,name=talent2,proto3" json:"talent2" bson:"talent2"` //阵营2天赋点 - Talent3 int32 `protobuf:"varint,13,opt,name=talent3,proto3" json:"talent3" bson:"talent3"` //阵营3天赋点 - Talent4 int32 `protobuf:"varint,14,opt,name=talent4,proto3" json:"talent4" bson:"talent4"` //阵营4天赋点 - Merchantmoney int32 `protobuf:"varint,15,opt,name=merchantmoney,proto3" json:"merchantmoney" bson:"merchantmoney"` //商队虚拟币 + Gold int64 `protobuf:"varint,1,opt,name=gold,proto3" json:"gold" bson:"gold"` //金币 + Exp int64 `protobuf:"varint,2,opt,name=exp,proto3" json:"exp" bson:"exp"` //经验 + Vipexp int64 `protobuf:"varint,3,opt,name=vipexp,proto3" json:"vipexp" bson:"vipexp"` //经验 + Diamond int64 `protobuf:"varint,4,opt,name=diamond,proto3" json:"diamond" bson:"diamond"` // 钻石 + Friend int32 `protobuf:"varint,5,opt,name=friend,proto3" json:"friend" bson:"frined"` //友情点 + Starcoin int64 `protobuf:"varint,6,opt,name=starcoin,proto3" json:"starcoin" bson:"starcoin"` //星座币 + Guildcoin int32 `protobuf:"varint,7,opt,name=guildcoin,proto3" json:"guildcoin" bson:"guildcoin"` //公会币 + Arenacoin int32 `protobuf:"varint,8,opt,name=arenacoin,proto3" json:"arenacoin" bson:"arenacoin"` //竞技场币 + Ps int32 `protobuf:"varint,9,opt,name=ps,proto3" json:"ps" bson:"ps"` //体力 + Moongold int32 `protobuf:"varint,10,opt,name=moongold,proto3" json:"moongold" bson:"moongold"` //纯净月髓 + Talent1 int32 `protobuf:"varint,11,opt,name=talent1,proto3" json:"talent1" bson:"talent1"` //阵营1天赋点 + Talent2 int32 `protobuf:"varint,12,opt,name=talent2,proto3" json:"talent2" bson:"talent2"` //阵营2天赋点 + Talent3 int32 `protobuf:"varint,13,opt,name=talent3,proto3" json:"talent3" bson:"talent3"` //阵营3天赋点 + Talent4 int32 `protobuf:"varint,14,opt,name=talent4,proto3" json:"talent4" bson:"talent4"` //阵营4天赋点 + Merchantmoney int32 `protobuf:"varint,15,opt,name=merchantmoney,proto3" json:"merchantmoney" bson:"merchantmoney"` //商队虚拟币 + Perlist []string `protobuf:"bytes,16,rep,name=perlist,proto3" json:"perlist" bson:"perlist"` //皮肤资源 } func (x *UserResChangedPush) Reset() { @@ -739,6 +740,13 @@ func (x *UserResChangedPush) GetMerchantmoney() int32 { return 0 } +func (x *UserResChangedPush) GetPerlist() []string { + if x != nil { + return x.Perlist + } + return nil +} + // 玩家在其它终端登录的通知 type UserOtherTermLoginPush struct { state protoimpl.MessageState @@ -2847,7 +2855,7 @@ var file_user_user_msg_proto_rawDesc = []byte{ 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x22, 0x28, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0x96, 0x03, 0x0a, 0x12, 0x55, 0x73, + 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0xb0, 0x03, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, @@ -2873,144 +2881,146 @@ var file_user_user_msg_proto_rawDesc = []byte{ 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x34, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e, - 0x65, 0x79, 0x22, 0x2a, 0x0a, 0x16, 0x55, 0x73, 0x65, 0x72, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x54, - 0x65, 0x72, 0x6d, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, - 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x23, - 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x50, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, - 0x75, 0x73, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x70, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x02, 0x70, 0x73, 0x22, 0x13, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, - 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x22, 0x3e, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, - 0x47, 0x65, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x28, - 0x0a, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x0e, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, - 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x40, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, - 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, - 0x12, 0x28, 0x0a, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, - 0x67, 0x52, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x29, 0x0a, 0x15, 0x55, 0x73, - 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, - 0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x71, 0x22, 0x26, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, - 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, - 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, - 0x22, 0x25, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, - 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x24, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x49, - 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x27, 0x0a, - 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, - 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x50, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, - 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, - 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, - 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x31, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, - 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x52, 0x65, 0x71, 0x12, - 0x1a, 0x0a, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x22, 0x44, 0x0a, 0x14, 0x55, - 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, - 0x64, 0x22, 0x28, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x62, - 0x67, 0x70, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x22, 0x3b, 0x0a, 0x11, 0x55, - 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x62, 0x67, 0x70, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, - 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x22, 0x31, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, - 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, - 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x22, 0x44, 0x0a, 0x14, 0x55, - 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, - 0x64, 0x22, 0x12, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, - 0x61, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x2d, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, - 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, - 0x72, 0x6f, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, - 0x6f, 0x69, 0x64, 0x73, 0x22, 0x47, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x76, 0x43, 0x68, - 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, - 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, - 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x54, 0x0a, - 0x12, 0x55, 0x73, 0x65, 0x72, 0x56, 0x69, 0x70, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, - 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x76, 0x69, 0x70, 0x45, 0x78, 0x70, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x76, 0x69, 0x70, 0x45, 0x78, 0x70, 0x12, 0x14, 0x0a, - 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x69, - 0x70, 0x4c, 0x76, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, - 0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x67, 0x6e, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x22, 0x26, 0x0a, 0x12, - 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, - 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x03, 0x75, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, - 0x6c, 0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0xf0, 0x01, - 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x65, 0x63, 0x6f, - 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x64, - 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x02, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x0d, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x52, 0x02, - 0x65, 0x78, 0x12, 0x33, 0x0a, 0x0c, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, - 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x67, - 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x0c, 0x70, 0x61, 0x67, 0x6f, 0x64, - 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x34, 0x0a, 0x0d, 0x68, 0x75, 0x6e, 0x74, 0x69, - 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, - 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x0d, - 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x31, 0x0a, - 0x0c, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x05, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, - 0x6e, 0x6b, 0x52, 0x0c, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, - 0x22, 0x34, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x74, - 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, - 0x6a, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x68, 0x65, 0x72, 0x6f, - 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x27, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, - 0x74, 0x74, 0x69, 0x6e, 0x67, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, + 0x65, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x65, 0x72, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x10, 0x20, + 0x03, 0x28, 0x09, 0x52, 0x07, 0x70, 0x65, 0x72, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2a, 0x0a, 0x16, + 0x55, 0x73, 0x65, 0x72, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x54, 0x65, 0x72, 0x6d, 0x4c, 0x6f, 0x67, + 0x69, 0x6e, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x23, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, + 0x50, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x0e, 0x0a, + 0x02, 0x70, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x70, 0x73, 0x22, 0x13, 0x0a, + 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, + 0x65, 0x71, 0x22, 0x3e, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x74, + 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x28, 0x0a, 0x07, 0x73, 0x65, 0x74, 0x74, + 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x55, 0x73, + 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, + 0x6e, 0x67, 0x22, 0x40, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x12, 0x28, 0x0a, 0x07, 0x73, 0x65, + 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, + 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x73, 0x65, 0x74, + 0x74, 0x69, 0x6e, 0x67, 0x22, 0x29, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, - 0x11, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x77, 0x74, 0x65, 0x61, 0x6d, 0x52, - 0x65, 0x71, 0x22, 0x32, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x77, 0x74, 0x65, - 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, - 0x6a, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x68, 0x65, 0x72, 0x6f, - 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x32, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x4f, 0x6e, - 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, - 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x43, 0x61, 0x63, 0x68, 0x65, 0x55, - 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22, 0x31, 0x0a, 0x10, 0x55, 0x73, - 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, - 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, - 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22, 0x16, 0x0a, - 0x14, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, - 0x74, 0x61, 0x52, 0x65, 0x71, 0x22, 0x3a, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, - 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, - 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, - 0x42, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, - 0x61, 0x22, 0x0d, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, - 0x22, 0x2b, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, + 0x11, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, + 0x65, 0x71, 0x22, 0x26, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, + 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x25, 0x0a, 0x0f, 0x55, 0x73, + 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, + 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, + 0x65, 0x22, 0x24, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, + 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, + 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, + 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, + 0x22, 0x50, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, + 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, + 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, + 0x6d, 0x65, 0x22, 0x31, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, + 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x76, 0x61, + 0x74, 0x61, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x76, 0x61, + 0x74, 0x61, 0x72, 0x49, 0x64, 0x22, 0x44, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, + 0x69, 0x66, 0x79, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, + 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, + 0x1a, 0x0a, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x22, 0x28, 0x0a, 0x10, 0x55, + 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x62, 0x67, 0x70, 0x52, 0x65, 0x71, 0x12, + 0x14, 0x0a, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, + 0x62, 0x67, 0x70, 0x49, 0x64, 0x22, 0x3b, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, + 0x69, 0x66, 0x79, 0x62, 0x67, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, + 0x62, 0x67, 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x67, 0x70, + 0x49, 0x64, 0x22, 0x31, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, + 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x67, + 0x75, 0x72, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x69, 0x67, + 0x75, 0x72, 0x65, 0x49, 0x64, 0x22, 0x44, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, + 0x69, 0x66, 0x79, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, + 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, + 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x22, 0x12, 0x0a, 0x10, 0x55, + 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x22, + 0x2d, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x73, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x73, 0x22, 0x47, + 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x76, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, + 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x54, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x56, + 0x69, 0x70, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, + 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, + 0x16, 0x0a, 0x06, 0x76, 0x69, 0x70, 0x45, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x06, 0x76, 0x69, 0x70, 0x45, 0x78, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76, 0x22, 0x27, 0x0a, + 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, + 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x22, 0x26, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, + 0x64, 0x69, 0x66, 0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, + 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x27, + 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x65, 0x63, 0x6f, + 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0xf0, 0x01, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, + 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, - 0x2e, 0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2a, 0x0a, - 0x12, 0x55, 0x73, 0x65, 0x72, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, - 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x2b, 0x0a, 0x13, 0x55, 0x73, 0x65, - 0x72, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x43, 0x68, - 0x61, 0x6e, 0x67, 0x65, 0x54, 0x69, 0x70, 0x73, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x74, - 0x69, 0x70, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x69, 0x70, 0x73, 0x22, - 0x31, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x69, 0x70, - 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x04, 0x64, 0x61, - 0x74, 0x61, 0x22, 0x2f, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, - 0x73, 0x52, 0x65, 0x71, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x01, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, - 0x74, 0x6e, 0x6f, 0x22, 0x48, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x6c, 0x6c, 0x52, - 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x03, 0x61, 0x74, 0x6e, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, - 0x52, 0x03, 0x61, 0x74, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, - 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, + 0x02, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x55, 0x73, + 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x52, 0x02, 0x65, 0x78, 0x12, 0x33, 0x0a, 0x0c, + 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, + 0x6f, 0x72, 0x64, 0x52, 0x0c, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, + 0x64, 0x12, 0x34, 0x0a, 0x0d, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, + 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, + 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x0d, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, + 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x31, 0x0a, 0x0c, 0x76, 0x69, 0x6b, 0x69, 0x6e, + 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, + 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x0c, 0x76, 0x69, + 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x34, 0x0a, 0x12, 0x55, 0x73, + 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, + 0x12, 0x1e, 0x0a, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x18, 0x02, + 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, + 0x22, 0x27, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x74, + 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x55, 0x73, 0x65, + 0x72, 0x53, 0x68, 0x6f, 0x77, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x10, + 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x77, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x1e, 0x0a, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x18, 0x01, + 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, + 0x22, 0x32, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x20, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x0a, 0x2e, 0x43, 0x61, 0x63, 0x68, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, + 0x73, 0x65, 0x72, 0x73, 0x22, 0x31, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, + 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, + 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, + 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22, 0x16, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x47, + 0x65, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x22, + 0x3a, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, + 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x53, 0x65, 0x72, 0x76, 0x65, + 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x0d, 0x0a, 0x0b, 0x55, + 0x73, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x2b, 0x0a, 0x0c, 0x55, 0x73, + 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x53, 0x69, 0x67, + 0x6e, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2a, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x50, + 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, + 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, + 0x64, 0x65, 0x78, 0x22, 0x2b, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x50, 0x75, 0x7a, 0x7a, 0x6c, + 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, + 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, + 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x69, + 0x70, 0x73, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x70, 0x73, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x69, 0x70, 0x73, 0x22, 0x31, 0x0a, 0x12, 0x55, 0x73, 0x65, + 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x69, 0x70, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, + 0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2f, 0x0a, 0x0e, + 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x52, 0x65, 0x71, 0x12, 0x1d, + 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, + 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, 0x48, 0x0a, + 0x0f, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x1d, 0x0a, 0x03, 0x61, 0x74, 0x6e, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, + 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x61, 0x74, 0x6e, 0x12, + 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( From 6ccc98d3084eab9a74b54b7d8ccda88f76e4b6e7 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 17 May 2023 14:10:22 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=A4=A9=E8=B5=8B=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E6=96=B0=E5=A2=9E=E8=A7=A3=E9=94=81?= =?UTF-8?q?=E6=8A=80=E8=83=BD=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_herotalent.json | 595 +++++++++++++++---- bin/json/game_talentbox.json | 286 +++++++++ modules/hero/api_talentlearn.go | 12 +- modules/hero/configure_comp.go | 42 +- modules/hero/model_hero.go | 13 +- sys/configure/structs/Game.HeroTalent.go | 2 +- sys/configure/structs/Game.HeroTalentData.go | 32 +- sys/configure/structs/Game.TalentBox.go | 42 ++ sys/configure/structs/Game.TalentBoxData.go | 37 ++ sys/configure/structs/Tables.go | 35 +- 10 files changed, 926 insertions(+), 170 deletions(-) create mode 100644 bin/json/game_talentbox.json create mode 100644 sys/configure/structs/Game.TalentBox.go create mode 100644 sys/configure/structs/Game.TalentBoxData.go diff --git a/bin/json/game_herotalent.json b/bin/json/game_herotalent.json index 577b4b9b0..d0e7fe5ba 100644 --- a/bin/json/game_herotalent.json +++ b/bin/json/game_herotalent.json @@ -1,12 +1,26 @@ [ { - "id": 1, - "type": 1, - "typeline": 1, - "talentid": 40101, + "skillid": 40101, + "hid": "25001", + "skilltyp": 0, "before": [ 0 ], + "skillname": { + "key": "hppower", + "text": "生命核心" + }, + "skilltxt": { + "key": "Life increased by 1.6%", + "text": "这是生命天赋的描述tips" + }, + "skillicon": "js_jx_img_icon03", + "hp": 16, + "atk": -1, + "def": -1, + "cri": -1, + "speed": -1, + "skill": 0, "thing": [ { "a": "attr", @@ -22,13 +36,27 @@ "point": 20 }, { - "id": 2, - "type": 0, - "typeline": 1, - "talentid": 10101, + "skillid": 40102, + "hid": "25001", + "skilltyp": 0, "before": [ - 1 + 40101 ], + "skillname": { + "key": "atkpower", + "text": "攻击核心" + }, + "skilltxt": { + "key": "Attack increased by 1.0%", + "text": "这是攻击天赋的描述tips" + }, + "skillicon": "js_jx_img_icon01", + "hp": -1, + "atk": 10, + "def": -1, + "cri": -1, + "speed": -1, + "skill": 0, "thing": [ { "a": "attr", @@ -39,13 +67,27 @@ "point": 10 }, { - "id": 3, - "type": 0, - "typeline": 1, - "talentid": 10102, + "skillid": 40103, + "hid": "25001", + "skilltyp": 0, "before": [ - 2 + 40102 ], + "skillname": { + "key": "defpower", + "text": "防御核心" + }, + "skilltxt": { + "key": "Defence increased by 1.0%", + "text": "这是防御天赋的描述tips" + }, + "skillicon": "js_jx_img_icon02", + "hp": -1, + "atk": -1, + "def": 10, + "cri": -1, + "speed": -1, + "skill": 0, "thing": [ { "a": "attr", @@ -56,13 +98,27 @@ "point": 10 }, { - "id": 4, - "type": 0, - "typeline": 1, - "talentid": 10103, + "skillid": 10101, + "hid": "25001", + "skilltyp": 1, "before": [ - 3 + 40103 ], + "skillname": { + "key": "hppower", + "text": "生命天赋" + }, + "skilltxt": { + "key": "Life increased by 1.8%", + "text": "这是生命天赋的描述tips" + }, + "skillicon": "js_jx_img_icon03", + "hp": 10, + "atk": -1, + "def": -1, + "cri": -1, + "speed": -1, + "skill": 0, "thing": [ { "a": "attr", @@ -73,13 +129,27 @@ "point": 10 }, { - "id": 5, - "type": 0, - "typeline": 1, - "talentid": 10104, + "skillid": 10102, + "hid": "25001", + "skilltyp": 1, "before": [ - 4 + 10101 ], + "skillname": { + "key": "hppower", + "text": "生命天赋" + }, + "skilltxt": { + "key": "Life increased by 1.8%", + "text": "这是生命天赋的描述tips" + }, + "skillicon": "js_jx_img_icon03", + "hp": 10, + "atk": -1, + "def": -1, + "cri": -1, + "speed": -1, + "skill": 0, "thing": [ { "a": "attr", @@ -90,13 +160,27 @@ "point": 10 }, { - "id": 6, - "type": 0, - "typeline": 1, - "talentid": 10105, + "skillid": 10103, + "hid": "25001", + "skilltyp": 1, "before": [ - 5 + 10102 ], + "skillname": { + "key": "hppower", + "text": "生命天赋" + }, + "skilltxt": { + "key": "Life increased by 1.8%", + "text": "这是生命天赋的描述tips" + }, + "skillicon": "js_jx_img_icon03", + "hp": 18, + "atk": -1, + "def": -1, + "cri": -1, + "speed": -1, + "skill": 0, "thing": [ { "a": "attr", @@ -107,13 +191,27 @@ "point": 10 }, { - "id": 7, - "type": 0, - "typeline": 1, - "talentid": 10106, + "skillid": 10104, + "hid": "25001", + "skilltyp": 1, "before": [ - 6 + 10103 ], + "skillname": { + "key": "hppower", + "text": "生命天赋" + }, + "skilltxt": { + "key": "Life increased by 1.8%", + "text": "这是生命天赋的描述tips" + }, + "skillicon": "js_jx_img_icon03", + "hp": 18, + "atk": -1, + "def": -1, + "cri": -1, + "speed": -1, + "skill": 0, "thing": [ { "a": "attr", @@ -124,13 +222,27 @@ "point": 10 }, { - "id": 8, - "type": 1, - "typeline": 2, - "talentid": 40102, + "skillid": 10105, + "hid": "25001", + "skilltyp": 1, "before": [ - 0 + 10104 ], + "skillname": { + "key": "hppower", + "text": "生命天赋" + }, + "skilltxt": { + "key": "Life increased by 1.8%", + "text": "这是生命天赋的描述tips" + }, + "skillicon": "js_jx_img_icon03", + "hp": 18, + "atk": -1, + "def": -1, + "cri": -1, + "speed": -1, + "skill": 0, "thing": [ { "a": "attr", @@ -146,13 +258,27 @@ "point": 20 }, { - "id": 9, - "type": 0, - "typeline": 2, - "talentid": 20101, + "skillid": 10106, + "hid": "25001", + "skilltyp": 1, "before": [ - 8 + 10105 ], + "skillname": { + "key": "hppower", + "text": "生命天赋" + }, + "skilltxt": { + "key": "Life increased by 1.8%", + "text": "这是生命天赋的描述tips" + }, + "skillicon": "js_jx_img_icon03", + "hp": 18, + "atk": -1, + "def": -1, + "cri": -1, + "speed": -1, + "skill": 0, "thing": [ { "a": "attr", @@ -163,13 +289,27 @@ "point": 10 }, { - "id": 10, - "type": 0, - "typeline": 2, - "talentid": 20102, + "skillid": 20101, + "hid": "25001", + "skilltyp": 1, "before": [ - 9 + 10106 ], + "skillname": { + "key": "atkpower", + "text": "攻击天赋" + }, + "skilltxt": { + "key": "Attack increased by 1.5%", + "text": "这是攻击天赋的描述tips" + }, + "skillicon": "js_jx_img_icon01", + "hp": -1, + "atk": -1, + "def": 10, + "cri": -1, + "speed": -1, + "skill": 0, "thing": [ { "a": "attr", @@ -180,13 +320,27 @@ "point": 10 }, { - "id": 11, - "type": 0, - "typeline": 2, - "talentid": 20103, + "skillid": 20102, + "hid": "25001", + "skilltyp": 1, "before": [ - 10 + 20101 ], + "skillname": { + "key": "atkpower", + "text": "攻击天赋" + }, + "skilltxt": { + "key": "Attack increased by 1.5%", + "text": "这是攻击天赋的描述tips" + }, + "skillicon": "js_jx_img_icon01", + "hp": -1, + "atk": -1, + "def": 10, + "cri": -1, + "speed": -1, + "skill": 0, "thing": [ { "a": "attr", @@ -197,13 +351,27 @@ "point": 10 }, { - "id": 12, - "type": 0, - "typeline": 2, - "talentid": 20104, + "skillid": 20103, + "hid": "25001", + "skilltyp": 1, "before": [ - 11 + 20102 ], + "skillname": { + "key": "atkpower", + "text": "攻击天赋" + }, + "skilltxt": { + "key": "Attack increased by 1.5%", + "text": "这是攻击天赋的描述tips" + }, + "skillicon": "js_jx_img_icon01", + "hp": -1, + "atk": -1, + "def": 15, + "cri": -1, + "speed": -1, + "skill": 0, "thing": [ { "a": "attr", @@ -214,13 +382,27 @@ "point": 10 }, { - "id": 13, - "type": 0, - "typeline": 2, - "talentid": 20105, + "skillid": 20104, + "hid": "25001", + "skilltyp": 1, "before": [ - 12 + 20103 ], + "skillname": { + "key": "atkpower", + "text": "攻击天赋" + }, + "skilltxt": { + "key": "Attack increased by 1.5%", + "text": "这是攻击天赋的描述tips" + }, + "skillicon": "js_jx_img_icon01", + "hp": -1, + "atk": -1, + "def": 15, + "cri": -1, + "speed": -1, + "skill": 0, "thing": [ { "a": "attr", @@ -231,13 +413,27 @@ "point": 10 }, { - "id": 14, - "type": 0, - "typeline": 2, - "talentid": 20106, + "skillid": 20105, + "hid": "25001", + "skilltyp": 1, "before": [ - 13 + 20104 ], + "skillname": { + "key": "atkpower", + "text": "攻击天赋" + }, + "skilltxt": { + "key": "Attack increased by 1.5%", + "text": "这是攻击天赋的描述tips" + }, + "skillicon": "js_jx_img_icon01", + "hp": -1, + "atk": -1, + "def": 15, + "cri": -1, + "speed": -1, + "skill": 0, "thing": [ { "a": "attr", @@ -248,13 +444,27 @@ "point": 10 }, { - "id": 15, - "type": 1, - "typeline": 3, - "talentid": 40103, + "skillid": 20106, + "hid": "25001", + "skilltyp": 1, "before": [ - 0 + 20105 ], + "skillname": { + "key": "atkpower", + "text": "攻击天赋" + }, + "skilltxt": { + "key": "Attack increased by 1.5%", + "text": "这是攻击天赋的描述tips" + }, + "skillicon": "js_jx_img_icon01", + "hp": -1, + "atk": -1, + "def": 15, + "cri": -1, + "speed": -1, + "skill": 0, "thing": [ { "a": "attr", @@ -270,13 +480,27 @@ "point": 20 }, { - "id": 16, - "type": 0, - "typeline": 3, - "talentid": 30101, + "skillid": 30101, + "hid": "25001", + "skilltyp": 1, "before": [ - 15 + 20106 ], + "skillname": { + "key": "defpower", + "text": "防御天赋" + }, + "skilltxt": { + "key": "Defence increased by 1.5%", + "text": "这是防御天赋的描述tips" + }, + "skillicon": "js_jx_img_icon02", + "hp": -1, + "atk": 10, + "def": -1, + "cri": -1, + "speed": -1, + "skill": 0, "thing": [ { "a": "attr", @@ -287,13 +511,27 @@ "point": 10 }, { - "id": 17, - "type": 0, - "typeline": 3, - "talentid": 30102, + "skillid": 30102, + "hid": "25001", + "skilltyp": 1, "before": [ - 16 + 30101 ], + "skillname": { + "key": "defpower", + "text": "防御天赋" + }, + "skilltxt": { + "key": "Defence increased by 1.5%", + "text": "这是防御天赋的描述tips" + }, + "skillicon": "js_jx_img_icon02", + "hp": -1, + "atk": 10, + "def": -1, + "cri": -1, + "speed": -1, + "skill": 0, "thing": [ { "a": "attr", @@ -304,13 +542,27 @@ "point": 10 }, { - "id": 18, - "type": 0, - "typeline": 3, - "talentid": 30103, + "skillid": 30103, + "hid": "25001", + "skilltyp": 1, "before": [ - 17 + 30102 ], + "skillname": { + "key": "defpower", + "text": "防御天赋" + }, + "skilltxt": { + "key": "Defence increased by 1.5%", + "text": "这是防御天赋的描述tips" + }, + "skillicon": "js_jx_img_icon02", + "hp": -1, + "atk": 15, + "def": -1, + "cri": -1, + "speed": -1, + "skill": 0, "thing": [ { "a": "attr", @@ -321,13 +573,27 @@ "point": 10 }, { - "id": 19, - "type": 0, - "typeline": 3, - "talentid": 30104, + "skillid": 30104, + "hid": "25001", + "skilltyp": 1, "before": [ - 18 + 30103 ], + "skillname": { + "key": "defpower", + "text": "防御天赋" + }, + "skilltxt": { + "key": "Defence increased by 1.5%", + "text": "这是防御天赋的描述tips" + }, + "skillicon": "js_jx_img_icon02", + "hp": -1, + "atk": 15, + "def": -1, + "cri": -1, + "speed": -1, + "skill": 0, "thing": [ { "a": "attr", @@ -338,13 +604,27 @@ "point": 10 }, { - "id": 20, - "type": 0, - "typeline": 3, - "talentid": 30105, + "skillid": 30105, + "hid": "25001", + "skilltyp": 1, "before": [ - 19 + 30104 ], + "skillname": { + "key": "defpower", + "text": "防御天赋" + }, + "skilltxt": { + "key": "Defence increased by 1.5%", + "text": "这是防御天赋的描述tips" + }, + "skillicon": "js_jx_img_icon02", + "hp": -1, + "atk": 15, + "def": -1, + "cri": -1, + "speed": -1, + "skill": 0, "thing": [ { "a": "attr", @@ -355,13 +635,120 @@ "point": 10 }, { - "id": 21, - "type": 0, - "typeline": 3, - "talentid": 30106, + "skillid": 30106, + "hid": "25001", + "skilltyp": 1, "before": [ - 20 + 30105 ], + "skillname": { + "key": "defpower", + "text": "防御天赋" + }, + "skilltxt": { + "key": "Defence increased by 1.5%", + "text": "这是防御天赋的描述tips" + }, + "skillicon": "js_jx_img_icon02", + "hp": -1, + "atk": 15, + "def": -1, + "cri": -1, + "speed": -1, + "skill": 0, + "thing": [ + { + "a": "attr", + "t": "gold", + "n": 15000 + } + ], + "point": 10 + }, + { + "skillid": 99101, + "hid": "25001", + "skilltyp": 2, + "before": [ + 30106 + ], + "skillname": { + "key": "Attackspeed", + "text": "攻速天赋" + }, + "skilltxt": { + "key": "Attack speed increased by 3%", + "text": "这是攻速天赋的描述tips" + }, + "skillicon": "js_jx_img_icon04", + "hp": -1, + "atk": -1, + "def": -1, + "cri": -1, + "speed": 30, + "skill": 0, + "thing": [ + { + "a": "attr", + "t": "gold", + "n": 15000 + } + ], + "point": 10 + }, + { + "skillid": 99102, + "hid": "25001", + "skilltyp": 2, + "before": [ + 99101 + ], + "skillname": { + "key": "Attackspeed", + "text": "攻速天赋" + }, + "skilltxt": { + "key": "Attack speed increased by 4%", + "text": "这是攻速天赋的描述tips" + }, + "skillicon": "js_jx_img_icon04", + "hp": -1, + "atk": -1, + "def": -1, + "cri": -1, + "speed": 30, + "skill": 0, + "thing": [ + { + "a": "attr", + "t": "gold", + "n": 15000 + } + ], + "point": 10 + }, + { + "skillid": 99103, + "hid": "25001", + "skilltyp": 2, + "before": [ + 99102 + ], + "skillname": { + "key": "Criticalstrike", + "text": "暴击天赋" + }, + "skilltxt": { + "key": "Critical hit increased by 10%", + "text": "这是暴击天赋的描述tips" + }, + "skillicon": "js_jx_img_icon05", + "hp": -1, + "atk": -1, + "def": -1, + "cri": 100, + "speed": -1, + "skill": 0, "thing": [ { "a": "attr", diff --git a/bin/json/game_talentbox.json b/bin/json/game_talentbox.json new file mode 100644 index 000000000..f0205f6ec --- /dev/null +++ b/bin/json/game_talentbox.json @@ -0,0 +1,286 @@ +[ + { + "heroid": "13001", + "itemid": "513001" + }, + { + "heroid": "13002", + "itemid": "513002" + }, + { + "heroid": "13003", + "itemid": "513003" + }, + { + "heroid": "13004", + "itemid": "513004" + }, + { + "heroid": "13005", + "itemid": "513005" + }, + { + "heroid": "14001", + "itemid": "514001" + }, + { + "heroid": "14002", + "itemid": "514002" + }, + { + "heroid": "14003", + "itemid": "514003" + }, + { + "heroid": "14004", + "itemid": "514004" + }, + { + "heroid": "14005", + "itemid": "514005" + }, + { + "heroid": "14006", + "itemid": "514006" + }, + { + "heroid": "14007", + "itemid": "514007" + }, + { + "heroid": "15001", + "itemid": "515001" + }, + { + "heroid": "15002", + "itemid": "515002" + }, + { + "heroid": "15003", + "itemid": "515003" + }, + { + "heroid": "15004", + "itemid": "515004" + }, + { + "heroid": "23001", + "itemid": "523001" + }, + { + "heroid": "23002", + "itemid": "523002" + }, + { + "heroid": "23003", + "itemid": "523003" + }, + { + "heroid": "23004", + "itemid": "523004" + }, + { + "heroid": "24001", + "itemid": "524001" + }, + { + "heroid": "24002", + "itemid": "524002" + }, + { + "heroid": "24003", + "itemid": "524003" + }, + { + "heroid": "24004", + "itemid": "524004" + }, + { + "heroid": "24005", + "itemid": "524005" + }, + { + "heroid": "24006", + "itemid": "524006" + }, + { + "heroid": "24007", + "itemid": "524007" + }, + { + "heroid": "24008", + "itemid": "524008" + }, + { + "heroid": "24009", + "itemid": "524009" + }, + { + "heroid": "25001", + "itemid": "525001" + }, + { + "heroid": "25002", + "itemid": "525002" + }, + { + "heroid": "25003", + "itemid": "525003" + }, + { + "heroid": "25004", + "itemid": "525004" + }, + { + "heroid": "33001", + "itemid": "533001" + }, + { + "heroid": "33002", + "itemid": "533002" + }, + { + "heroid": "33003", + "itemid": "533003" + }, + { + "heroid": "33004", + "itemid": "533004" + }, + { + "heroid": "33005", + "itemid": "533005" + }, + { + "heroid": "33006", + "itemid": "533006" + }, + { + "heroid": "34001", + "itemid": "534001" + }, + { + "heroid": "34002", + "itemid": "534002" + }, + { + "heroid": "34003", + "itemid": "534003" + }, + { + "heroid": "34004", + "itemid": "534004" + }, + { + "heroid": "34005", + "itemid": "534005" + }, + { + "heroid": "34006", + "itemid": "534006" + }, + { + "heroid": "34007", + "itemid": "534007" + }, + { + "heroid": "34008", + "itemid": "534008" + }, + { + "heroid": "35001", + "itemid": "535001" + }, + { + "heroid": "35002", + "itemid": "535002" + }, + { + "heroid": "35003", + "itemid": "535003" + }, + { + "heroid": "35004", + "itemid": "535004" + }, + { + "heroid": "35005", + "itemid": "535005" + }, + { + "heroid": "35006", + "itemid": "535006" + }, + { + "heroid": "43001", + "itemid": "543001" + }, + { + "heroid": "43002", + "itemid": "543002" + }, + { + "heroid": "43003", + "itemid": "543003" + }, + { + "heroid": "43004", + "itemid": "543004" + }, + { + "heroid": "43005", + "itemid": "543005" + }, + { + "heroid": "43006", + "itemid": "543006" + }, + { + "heroid": "43007", + "itemid": "543007" + }, + { + "heroid": "44001", + "itemid": "544001" + }, + { + "heroid": "44002", + "itemid": "544002" + }, + { + "heroid": "44003", + "itemid": "544003" + }, + { + "heroid": "44004", + "itemid": "544004" + }, + { + "heroid": "44006", + "itemid": "544006" + }, + { + "heroid": "45001", + "itemid": "545001" + }, + { + "heroid": "45002", + "itemid": "545002" + }, + { + "heroid": "45003", + "itemid": "545003" + }, + { + "heroid": "45004", + "itemid": "545004" + }, + { + "heroid": "44005", + "itemid": "544005" + }, + { + "heroid": "15005", + "itemid": "515005" + } +] \ No newline at end of file diff --git a/modules/hero/api_talentlearn.go b/modules/hero/api_talentlearn.go index e3c6eeca7..6f8a3abf3 100644 --- a/modules/hero/api_talentlearn.go +++ b/modules/hero/api_talentlearn.go @@ -119,17 +119,17 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe if err = this.module.modelTalent.ChangeHeroTalent(talent, update); err != nil { this.module.Errorf("update failed :%v", err) } - talentSkill := this.module.configure.GetHeroTalentSkill(talentConf.Talentid) - if talentSkill == nil { - code = pb.ErrorCode_ConfigNoFound - return - } + // 同步修改属性 heroList := this.module.GetHeroList(session.GetUserId()) for _, v := range heroList { if v.HeroID == talent.HeroId { // 找到对应的英雄ID - this.module.modelHero.setTalentProperty(v, talentSkill) + this.module.modelHero.setTalentProperty(v, talentConf) chanegCard = append(chanegCard, v) // 添加推送属性变化信息 + // 天赋学技能 + if talentConf.Skill != 0 { + + } } } diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go index 0bb1bac76..cdc6bc1b4 100644 --- a/modules/hero/configure_comp.go +++ b/modules/hero/configure_comp.go @@ -27,12 +27,10 @@ const ( hero_drawupdraw = "game_drawupdraw.json" // 抽卡概率调整 hero_drawcost = "game_drawcost.json" // 抽卡消耗 hero_fusion = "game_herofusion.json" // 卡牌融合 - //hero_starupsp = "game_herostarupsp.json" // 精灵升星 - hero_talentskill = "game_talentskill.json" // 天赋 - hero_talent = "game_herotalent.json" // 天赋详细数据 - hero_itembox = "game_itembox.json" // 天赋详细数据 - game_shopitem = "game_shopitem.json" - hero_skill = "game_heroskill.json" + hero_talent = "game_herotalent.json" // 天赋详细数据 + hero_itembox = "game_itembox.json" // 天赋详细数据 + game_shopitem = "game_shopitem.json" + hero_skill = "game_heroskill.json" ) ///配置管理组件 @@ -61,12 +59,10 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp game_skillatk: cfg.NewGameSkillAtk, hero_drawcard: cfg.NewGameDrawCard, hero_fusion: cfg.NewGameHerofusion, - //hero_starupsp: cfg.NewGameHeroStarupSp, - hero_talentskill: cfg.NewGameTalentSkill, - hero_talent: cfg.NewGameHeroTalent, - hero_itembox: cfg.NewGameItemBox, - game_shopitem: cfg.NewGameShopitem, - hero_skill: cfg.NewGameHeroSkill, + hero_talent: cfg.NewGameHeroTalent, + hero_itembox: cfg.NewGameItemBox, + game_shopitem: cfg.NewGameShopitem, + hero_skill: cfg.NewGameHeroSkill, }) this.drawCardCfg = make(map[string]map[int32][]*cfg.GameDrawCardData, 0) configure.RegisterConfigure(hero_drawcard, cfg.NewGameDrawCard, this.SetHeroDrawConfig) @@ -286,17 +282,6 @@ func (this *configureComp) GetHeroFucionConfig(cid string) (data *cfg.GameHerofu return } -// func (this *configureComp) GetHeroSpriteStar(cid string) (hid string) { -// if v, err := this.GetConfigure(hero_starupsp); err == nil { -// if configure, ok := v.(*cfg.GameHeroStarupSp); ok { -// hid = configure.Get(cid).Starid -// return -// } -// } -// this.module.Errorf("cfg.GameHeroStarupSpData GetHeroSpriteStar:id = %s", cid) -// return "" -// } - func (this *configureComp) GetHeroTalent(id int32) (data *cfg.GameHeroTalentData) { if v, err := this.GetConfigure(hero_talent); err == nil { if configure, ok := v.(*cfg.GameHeroTalent); ok { @@ -308,17 +293,6 @@ func (this *configureComp) GetHeroTalent(id int32) (data *cfg.GameHeroTalentData return nil } -func (this *configureComp) GetHeroTalentSkill(skillId int32) (data *cfg.GameTalentSkillData) { - if v, err := this.GetConfigure(hero_talentskill); err == nil { - if configure, ok := v.(*cfg.GameTalentSkill); ok { - data = configure.Get(skillId) - return - } - } - this.module.Errorf("cfg.GameTalentSkillData GetHeroTalentSkill:skillId = %d", skillId) - return nil -} - // 天赋指定消耗 func (this *configureComp) GetHeroTalentBoxItem(heroid string) (itemid string) { if v, err := this.GetConfigure(hero_itembox); err == nil { diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index 791a2f3b3..3e29e5cfe 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -709,7 +709,7 @@ func (this *ModelHero) InitMonsterHero(heroCfgId string, star, lv int32) *pb.DBH } //设置天赋属性 -func (this *ModelHero) setTalentProperty(hero *pb.DBHero, conf *cfg.GameTalentSkillData) { +func (this *ModelHero) setTalentProperty(hero *pb.DBHero, conf *cfg.GameHeroTalentData) { if conf == nil || hero == nil { return } @@ -752,8 +752,15 @@ func (this *ModelHero) setTalentProperty(hero *pb.DBHero, conf *cfg.GameTalentSk hero.TalentProperty[comm.Speed] = int32(math.Floor((float64(conf.Speed) / 1000) * float64(hero.Property[comm.Speed]))) } } - _heroMap := make(map[string]interface{}, 0) + if conf.Skill != 0 { + hero.NormalSkill = append(hero.NormalSkill, &pb.SkillData{ + SkillID: conf.Skill, + SkillLv: 1, + }) + _heroMap["normalSkill"] = hero.NormalSkill + } + _heroMap["talentProperty"] = hero.TalentProperty if err := this.ChangeList(hero.Uid, hero.Id, _heroMap); err != nil { this.moduleHero.Errorf("mergeenegryProperty err %v", err) @@ -785,7 +792,7 @@ func (this *ModelHero) resetTalentProperty(hero *pb.DBHero) { for _, v := range rst { if v.HeroId == hero.HeroID { // 找到对应的英雄 for k := range v.Talent { - if conf := this.moduleHero.configure.GetHeroTalentSkill(k); conf != nil { //获取天赋树 + if conf := this.moduleHero.configure.GetHeroTalent(k); conf != nil { //获取天赋树 if conf.Hp != -1 { attr[0] += conf.Hp } diff --git a/sys/configure/structs/Game.HeroTalent.go b/sys/configure/structs/Game.HeroTalent.go index 740df43a3..791460e75 100644 --- a/sys/configure/structs/Game.HeroTalent.go +++ b/sys/configure/structs/Game.HeroTalent.go @@ -21,7 +21,7 @@ func NewGameHeroTalent(_buf []map[string]interface{}) (*GameHeroTalent, error) { return nil, err2 } else { _dataList = append(_dataList, _v) - dataMap[_v.Id] = _v + dataMap[_v.Skillid] = _v } } return &GameHeroTalent{_dataList:_dataList, _dataMap:dataMap}, nil diff --git a/sys/configure/structs/Game.HeroTalentData.go b/sys/configure/structs/Game.HeroTalentData.go index 1e2b88162..1c75588fd 100644 --- a/sys/configure/structs/Game.HeroTalentData.go +++ b/sys/configure/structs/Game.HeroTalentData.go @@ -11,11 +11,19 @@ package cfg import "errors" type GameHeroTalentData struct { - Id int32 - Type int32 - Typeline int32 - Talentid int32 + Skillid int32 + Hid string + Skilltyp int32 Before []int32 + Skillname string + Skilltxt string + Skillicon string + Hp int32 + Atk int32 + Def int32 + Cri int32 + Speed int32 + Skill int32 Thing []*Gameatn Point int32 } @@ -27,10 +35,9 @@ func (*GameHeroTalentData) GetTypeId() int32 { } func (_v *GameHeroTalentData)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["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["typeline"].(float64); !_ok_ { err = errors.New("typeline error"); return }; _v.Typeline = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["talentid"].(float64); !_ok_ { err = errors.New("talentid error"); return }; _v.Talentid = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skillid"].(float64); !_ok_ { err = errors.New("skillid error"); return }; _v.Skillid = int32(_tempNum_) } + { var _ok_ bool; if _v.Hid, _ok_ = _buf["hid"].(string); !_ok_ { err = errors.New("hid error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skilltyp"].(float64); !_ok_ { err = errors.New("skilltyp error"); return }; _v.Skilltyp = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool @@ -45,6 +52,15 @@ func (_v *GameHeroTalentData)Deserialize(_buf map[string]interface{}) (err error } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["skillname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Skillname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Skillname, _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["skilltxt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Skilltxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Skilltxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; if _v.Skillicon, _ok_ = _buf["skillicon"].(string); !_ok_ { err = errors.New("skillicon error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hp"].(float64); !_ok_ { err = errors.New("hp error"); return }; _v.Hp = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atk"].(float64); !_ok_ { err = errors.New("atk error"); return }; _v.Atk = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["def"].(float64); !_ok_ { err = errors.New("def error"); return }; _v.Def = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cri"].(float64); !_ok_ { err = errors.New("cri error"); return }; _v.Cri = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["speed"].(float64); !_ok_ { err = errors.New("speed error"); return }; _v.Speed = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill"].(float64); !_ok_ { err = errors.New("skill error"); return }; _v.Skill = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Game.TalentBox.go b/sys/configure/structs/Game.TalentBox.go new file mode 100644 index 000000000..48da1ce0b --- /dev/null +++ b/sys/configure/structs/Game.TalentBox.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 GameTalentBox struct { + _dataMap map[string]*GameTalentBoxData + _dataList []*GameTalentBoxData +} + +func NewGameTalentBox(_buf []map[string]interface{}) (*GameTalentBox, error) { + _dataList := make([]*GameTalentBoxData, 0, len(_buf)) + dataMap := make(map[string]*GameTalentBoxData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameTalentBoxData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Heroid] = _v + } + } + return &GameTalentBox{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameTalentBox) GetDataMap() map[string]*GameTalentBoxData { + return table._dataMap +} + +func (table *GameTalentBox) GetDataList() []*GameTalentBoxData { + return table._dataList +} + +func (table *GameTalentBox) Get(key string) *GameTalentBoxData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.TalentBoxData.go b/sys/configure/structs/Game.TalentBoxData.go new file mode 100644 index 000000000..06123e7b8 --- /dev/null +++ b/sys/configure/structs/Game.TalentBoxData.go @@ -0,0 +1,37 @@ +//------------------------------------------------------------------------------ +// +// 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 GameTalentBoxData struct { + Heroid string + Itemid string +} + +const TypeId_GameTalentBoxData = -1223889779 + +func (*GameTalentBoxData) GetTypeId() int32 { + return -1223889779 +} + +func (_v *GameTalentBoxData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; if _v.Heroid, _ok_ = _buf["heroid"].(string); !_ok_ { err = errors.New("heroid error"); return } } + { var _ok_ bool; if _v.Itemid, _ok_ = _buf["itemid"].(string); !_ok_ { err = errors.New("itemid error"); return } } + return +} + +func DeserializeGameTalentBoxData(_buf map[string]interface{}) (*GameTalentBoxData, error) { + v := &GameTalentBoxData{} + 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 9a0289a9e..05ca78b64 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -87,7 +87,6 @@ type Tables struct { Herofusion *GameHerofusion PlayerInfor *GamePlayerInfor PlayerInfor_overview *GamePlayerInfor_overview - HeroTalent *GameHeroTalent TalentSkill *GameTalentSkill ArenaBuyChallenge *GameArenaBuyChallenge ArenaActiveReward *GameArenaActiveReward @@ -182,7 +181,6 @@ type Tables struct { itinerant_battle *Gameitinerant_battle itinerant_event *Gameitinerant_event NewRedDot *GameNewRedDot - Talent *GameTalent Favorability *GameFavorability Friends *GameFriends CampLv *GameCampLv @@ -196,6 +194,9 @@ type Tables struct { Pricegroup *GamePricegroup Loading *GameLoading RuleDesc *GameRuleDesc + HeroTalent *GameHeroTalent + TalentBox *GameTalentBox + Talent *GameTalent } func NewTables(loader JsonLoader) (*Tables, error) { @@ -659,12 +660,6 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.PlayerInfor_overview, err = NewGamePlayerInfor_overview(buf) ; err != nil { return nil, err } - if buf, err = loader("game_herotalent") ; err != nil { - return nil, err - } - if tables.HeroTalent, err = NewGameHeroTalent(buf) ; err != nil { - return nil, err - } if buf, err = loader("game_talentskill") ; err != nil { return nil, err } @@ -1229,12 +1224,6 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.NewRedDot, err = NewGameNewRedDot(buf) ; err != nil { return nil, err } - if buf, err = loader("game_talent") ; err != nil { - return nil, err - } - if tables.Talent, err = NewGameTalent(buf) ; err != nil { - return nil, err - } if buf, err = loader("game_favorability") ; err != nil { return nil, err } @@ -1313,5 +1302,23 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.RuleDesc, err = NewGameRuleDesc(buf) ; err != nil { return nil, err } + if buf, err = loader("game_herotalent") ; err != nil { + return nil, err + } + if tables.HeroTalent, err = NewGameHeroTalent(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_talentbox") ; err != nil { + return nil, err + } + if tables.TalentBox, err = NewGameTalentBox(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_talent") ; err != nil { + return nil, err + } + if tables.Talent, err = NewGameTalent(buf) ; err != nil { + return nil, err + } return tables, nil } From 1da5837986106da24545860fde8b0eb9a29fc0c3 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 17 May 2023 14:13:41 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=A7=BB=E5=87=BA=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_itembox.json | 286 --------------------------------- modules/hero/configure_comp.go | 8 +- 2 files changed, 4 insertions(+), 290 deletions(-) delete mode 100644 bin/json/game_itembox.json diff --git a/bin/json/game_itembox.json b/bin/json/game_itembox.json deleted file mode 100644 index a58c3e876..000000000 --- a/bin/json/game_itembox.json +++ /dev/null @@ -1,286 +0,0 @@ -[ - { - "heroid": "13001", - "itemid": "513001" - }, - { - "heroid": "13002", - "itemid": "513002" - }, - { - "heroid": "13003", - "itemid": "513003" - }, - { - "heroid": "13004", - "itemid": "513004" - }, - { - "heroid": "13005", - "itemid": "513005" - }, - { - "heroid": "14001", - "itemid": "514001" - }, - { - "heroid": "14002", - "itemid": "514002" - }, - { - "heroid": "14003", - "itemid": "514003" - }, - { - "heroid": "14004", - "itemid": "514004" - }, - { - "heroid": "14005", - "itemid": "514005" - }, - { - "heroid": "14006", - "itemid": "514006" - }, - { - "heroid": "14007", - "itemid": "514007" - }, - { - "heroid": "15001", - "itemid": "515001" - }, - { - "heroid": "15002", - "itemid": "515002" - }, - { - "heroid": "15003", - "itemid": "515003" - }, - { - "heroid": "15004", - "itemid": "515004" - }, - { - "heroid": "23001", - "itemid": "523001" - }, - { - "heroid": "23002", - "itemid": "523002" - }, - { - "heroid": "23003", - "itemid": "523003" - }, - { - "heroid": "23004", - "itemid": "523004" - }, - { - "heroid": "24001", - "itemid": "524001" - }, - { - "heroid": "24002", - "itemid": "524002" - }, - { - "heroid": "24003", - "itemid": "524003" - }, - { - "heroid": "24004", - "itemid": "524004" - }, - { - "heroid": "24005", - "itemid": "524005" - }, - { - "heroid": "24006", - "itemid": "524006" - }, - { - "heroid": "24007", - "itemid": "524007" - }, - { - "heroid": "24008", - "itemid": "524008" - }, - { - "heroid": "24009", - "itemid": "524009" - }, - { - "heroid": "25001", - "itemid": "525001" - }, - { - "heroid": "25002", - "itemid": "525002" - }, - { - "heroid": "25003", - "itemid": "525003" - }, - { - "heroid": "25004", - "itemid": "525004" - }, - { - "heroid": "33001", - "itemid": "533001" - }, - { - "heroid": "33002", - "itemid": "533002" - }, - { - "heroid": "33003", - "itemid": "533003" - }, - { - "heroid": "33004", - "itemid": "533004" - }, - { - "heroid": "33005", - "itemid": "533005" - }, - { - "heroid": "33006", - "itemid": "533006" - }, - { - "heroid": "34001", - "itemid": "534001" - }, - { - "heroid": "34002", - "itemid": "534002" - }, - { - "heroid": "34003", - "itemid": "534003" - }, - { - "heroid": "34004", - "itemid": "534004" - }, - { - "heroid": "34005", - "itemid": "534005" - }, - { - "heroid": "34006", - "itemid": "534006" - }, - { - "heroid": "34007", - "itemid": "534007" - }, - { - "heroid": "34008", - "itemid": "534008" - }, - { - "heroid": "35001", - "itemid": "535001" - }, - { - "heroid": "35002", - "itemid": "535002" - }, - { - "heroid": "35003", - "itemid": "535003" - }, - { - "heroid": "35004", - "itemid": "535004" - }, - { - "heroid": "35005", - "itemid": "535005" - }, - { - "heroid": "35006", - "itemid": "535006" - }, - { - "heroid": "43001", - "itemid": "543001" - }, - { - "heroid": "43002", - "itemid": "543002" - }, - { - "heroid": "43003", - "itemid": "543003" - }, - { - "heroid": "43004", - "itemid": "543004" - }, - { - "heroid": "43005", - "itemid": "543005" - }, - { - "heroid": "43006", - "itemid": "543006" - }, - { - "heroid": "43007", - "itemid": "543007" - }, - { - "heroid": "44001", - "itemid": "544001" - }, - { - "heroid": "44002", - "itemid": "544002" - }, - { - "heroid": "44003", - "itemid": "544003" - }, - { - "heroid": "44004", - "itemid": "544004" - }, - { - "heroid": "44006", - "itemid": "544006" - }, - { - "heroid": "45001", - "itemid": "545001" - }, - { - "heroid": "45002", - "itemid": "545002" - }, - { - "heroid": "45003", - "itemid": "545003" - }, - { - "heroid": "45004", - "itemid": "545004" - }, - { - "heroid": "44005", - "itemid": "544005" - }, - { - "heroid": "15005", - "itemid": "515005" - } -] \ No newline at end of file diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go index cdc6bc1b4..a843fda7a 100644 --- a/modules/hero/configure_comp.go +++ b/modules/hero/configure_comp.go @@ -28,7 +28,7 @@ const ( hero_drawcost = "game_drawcost.json" // 抽卡消耗 hero_fusion = "game_herofusion.json" // 卡牌融合 hero_talent = "game_herotalent.json" // 天赋详细数据 - hero_itembox = "game_itembox.json" // 天赋详细数据 + hero_talentbox = "game_talentbox.json" // 天赋详细数据 game_shopitem = "game_shopitem.json" hero_skill = "game_heroskill.json" ) @@ -60,7 +60,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp hero_drawcard: cfg.NewGameDrawCard, hero_fusion: cfg.NewGameHerofusion, hero_talent: cfg.NewGameHeroTalent, - hero_itembox: cfg.NewGameItemBox, + hero_talentbox: cfg.NewGameTalentBox, game_shopitem: cfg.NewGameShopitem, hero_skill: cfg.NewGameHeroSkill, }) @@ -295,8 +295,8 @@ func (this *configureComp) GetHeroTalent(id int32) (data *cfg.GameHeroTalentData // 天赋指定消耗 func (this *configureComp) GetHeroTalentBoxItem(heroid string) (itemid string) { - if v, err := this.GetConfigure(hero_itembox); err == nil { - if configure, ok := v.(*cfg.GameItemBox); ok { + if v, err := this.GetConfigure(hero_talentbox); err == nil { + if configure, ok := v.(*cfg.GameTalentBox); ok { itemid = configure.Get(heroid).Itemid return } From 7246ba738a7896f000f192a28f6bcc92a88e1f0f Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 17 May 2023 14:17:28 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_herotalent.json | 90 +++++++++---------- bin/json/game_initial.json | 30 +++++++ bin/json/game_playerinfor_overview.json | 15 ++-- bin/json/game_playeroverview.json | 38 ++++++++ bin/json/game_rdtasknpc.json | 14 +++ bin/json/game_show.json | 48 ---------- bin/json/game_worldtask.json | 38 ++++++++ .../structs/Game.PlayerInfor_overview.go | 8 +- .../structs/Game.PlayerInfor_overviewData.go | 10 ++- sys/configure/structs/Game.PlayerOverview.go | 42 +++++++++ .../structs/Game.PlayerOverviewData.go | 62 +++++++++++++ sys/configure/structs/Tables.go | 35 +++----- 12 files changed, 302 insertions(+), 128 deletions(-) create mode 100644 bin/json/game_playeroverview.json create mode 100644 sys/configure/structs/Game.PlayerOverview.go create mode 100644 sys/configure/structs/Game.PlayerOverviewData.go diff --git a/bin/json/game_herotalent.json b/bin/json/game_herotalent.json index d0e7fe5ba..21dc27226 100644 --- a/bin/json/game_herotalent.json +++ b/bin/json/game_herotalent.json @@ -12,7 +12,7 @@ }, "skilltxt": { "key": "Life increased by 1.6%", - "text": "这是生命天赋的描述tips" + "text": "这是生命星象的描述tips" }, "skillicon": "js_jx_img_icon03", "hp": 16, @@ -48,7 +48,7 @@ }, "skilltxt": { "key": "Attack increased by 1.0%", - "text": "这是攻击天赋的描述tips" + "text": "这是攻击星象的描述tips" }, "skillicon": "js_jx_img_icon01", "hp": -1, @@ -79,7 +79,7 @@ }, "skilltxt": { "key": "Defence increased by 1.0%", - "text": "这是防御天赋的描述tips" + "text": "这是防御星象的描述tips" }, "skillicon": "js_jx_img_icon02", "hp": -1, @@ -106,11 +106,11 @@ ], "skillname": { "key": "hppower", - "text": "生命天赋" + "text": "生命星象" }, "skilltxt": { "key": "Life increased by 1.8%", - "text": "这是生命天赋的描述tips" + "text": "这是生命星象的描述tips" }, "skillicon": "js_jx_img_icon03", "hp": 10, @@ -137,11 +137,11 @@ ], "skillname": { "key": "hppower", - "text": "生命天赋" + "text": "生命星象" }, "skilltxt": { "key": "Life increased by 1.8%", - "text": "这是生命天赋的描述tips" + "text": "这是生命星象的描述tips" }, "skillicon": "js_jx_img_icon03", "hp": 10, @@ -168,11 +168,11 @@ ], "skillname": { "key": "hppower", - "text": "生命天赋" + "text": "生命星象" }, "skilltxt": { "key": "Life increased by 1.8%", - "text": "这是生命天赋的描述tips" + "text": "这是生命星象的描述tips" }, "skillicon": "js_jx_img_icon03", "hp": 18, @@ -199,11 +199,11 @@ ], "skillname": { "key": "hppower", - "text": "生命天赋" + "text": "生命星象" }, "skilltxt": { "key": "Life increased by 1.8%", - "text": "这是生命天赋的描述tips" + "text": "这是生命星象的描述tips" }, "skillicon": "js_jx_img_icon03", "hp": 18, @@ -230,11 +230,11 @@ ], "skillname": { "key": "hppower", - "text": "生命天赋" + "text": "生命星象" }, "skilltxt": { "key": "Life increased by 1.8%", - "text": "这是生命天赋的描述tips" + "text": "这是生命星象的描述tips" }, "skillicon": "js_jx_img_icon03", "hp": 18, @@ -266,11 +266,11 @@ ], "skillname": { "key": "hppower", - "text": "生命天赋" + "text": "生命星象" }, "skilltxt": { "key": "Life increased by 1.8%", - "text": "这是生命天赋的描述tips" + "text": "这是生命星象的描述tips" }, "skillicon": "js_jx_img_icon03", "hp": 18, @@ -297,11 +297,11 @@ ], "skillname": { "key": "atkpower", - "text": "攻击天赋" + "text": "攻击星象" }, "skilltxt": { "key": "Attack increased by 1.5%", - "text": "这是攻击天赋的描述tips" + "text": "这是攻击星象的描述tips" }, "skillicon": "js_jx_img_icon01", "hp": -1, @@ -328,11 +328,11 @@ ], "skillname": { "key": "atkpower", - "text": "攻击天赋" + "text": "攻击星象" }, "skilltxt": { "key": "Attack increased by 1.5%", - "text": "这是攻击天赋的描述tips" + "text": "这是攻击星象的描述tips" }, "skillicon": "js_jx_img_icon01", "hp": -1, @@ -359,11 +359,11 @@ ], "skillname": { "key": "atkpower", - "text": "攻击天赋" + "text": "攻击星象" }, "skilltxt": { "key": "Attack increased by 1.5%", - "text": "这是攻击天赋的描述tips" + "text": "这是攻击星象的描述tips" }, "skillicon": "js_jx_img_icon01", "hp": -1, @@ -390,11 +390,11 @@ ], "skillname": { "key": "atkpower", - "text": "攻击天赋" + "text": "攻击星象" }, "skilltxt": { "key": "Attack increased by 1.5%", - "text": "这是攻击天赋的描述tips" + "text": "这是攻击星象的描述tips" }, "skillicon": "js_jx_img_icon01", "hp": -1, @@ -421,11 +421,11 @@ ], "skillname": { "key": "atkpower", - "text": "攻击天赋" + "text": "攻击星象" }, "skilltxt": { "key": "Attack increased by 1.5%", - "text": "这是攻击天赋的描述tips" + "text": "这是攻击星象的描述tips" }, "skillicon": "js_jx_img_icon01", "hp": -1, @@ -452,11 +452,11 @@ ], "skillname": { "key": "atkpower", - "text": "攻击天赋" + "text": "攻击星象" }, "skilltxt": { "key": "Attack increased by 1.5%", - "text": "这是攻击天赋的描述tips" + "text": "这是攻击星象的描述tips" }, "skillicon": "js_jx_img_icon01", "hp": -1, @@ -488,11 +488,11 @@ ], "skillname": { "key": "defpower", - "text": "防御天赋" + "text": "防御星象" }, "skilltxt": { "key": "Defence increased by 1.5%", - "text": "这是防御天赋的描述tips" + "text": "这是防御星象的描述tips" }, "skillicon": "js_jx_img_icon02", "hp": -1, @@ -519,11 +519,11 @@ ], "skillname": { "key": "defpower", - "text": "防御天赋" + "text": "防御星象" }, "skilltxt": { "key": "Defence increased by 1.5%", - "text": "这是防御天赋的描述tips" + "text": "这是防御星象的描述tips" }, "skillicon": "js_jx_img_icon02", "hp": -1, @@ -550,11 +550,11 @@ ], "skillname": { "key": "defpower", - "text": "防御天赋" + "text": "防御星象" }, "skilltxt": { "key": "Defence increased by 1.5%", - "text": "这是防御天赋的描述tips" + "text": "这是防御星象的描述tips" }, "skillicon": "js_jx_img_icon02", "hp": -1, @@ -581,11 +581,11 @@ ], "skillname": { "key": "defpower", - "text": "防御天赋" + "text": "防御星象" }, "skilltxt": { "key": "Defence increased by 1.5%", - "text": "这是防御天赋的描述tips" + "text": "这是防御星象的描述tips" }, "skillicon": "js_jx_img_icon02", "hp": -1, @@ -612,11 +612,11 @@ ], "skillname": { "key": "defpower", - "text": "防御天赋" + "text": "防御星象" }, "skilltxt": { "key": "Defence increased by 1.5%", - "text": "这是防御天赋的描述tips" + "text": "这是防御星象的描述tips" }, "skillicon": "js_jx_img_icon02", "hp": -1, @@ -643,11 +643,11 @@ ], "skillname": { "key": "defpower", - "text": "防御天赋" + "text": "防御星象" }, "skilltxt": { "key": "Defence increased by 1.5%", - "text": "这是防御天赋的描述tips" + "text": "这是防御星象的描述tips" }, "skillicon": "js_jx_img_icon02", "hp": -1, @@ -674,11 +674,11 @@ ], "skillname": { "key": "Attackspeed", - "text": "攻速天赋" + "text": "攻速星象" }, "skilltxt": { "key": "Attack speed increased by 3%", - "text": "这是攻速天赋的描述tips" + "text": "这是攻速星象的描述tips" }, "skillicon": "js_jx_img_icon04", "hp": -1, @@ -705,11 +705,11 @@ ], "skillname": { "key": "Attackspeed", - "text": "攻速天赋" + "text": "攻速星象" }, "skilltxt": { "key": "Attack speed increased by 4%", - "text": "这是攻速天赋的描述tips" + "text": "这是攻速星象的描述tips" }, "skillicon": "js_jx_img_icon04", "hp": -1, @@ -736,11 +736,11 @@ ], "skillname": { "key": "Criticalstrike", - "text": "暴击天赋" + "text": "暴击星象" }, "skilltxt": { "key": "Critical hit increased by 10%", - "text": "这是暴击天赋的描述tips" + "text": "这是暴击星象的描述tips" }, "skillicon": "js_jx_img_icon05", "hp": -1, diff --git a/bin/json/game_initial.json b/bin/json/game_initial.json index 0e24d6e5b..3ad90386c 100644 --- a/bin/json/game_initial.json +++ b/bin/json/game_initial.json @@ -1868,5 +1868,35 @@ "n": 1 } ] + }, + { + "index": "353", + "var": [ + { + "a": "per", + "t": "16010101", + "n": 1 + } + ] + }, + { + "index": "354", + "var": [ + { + "a": "per", + "t": "16010201", + "n": 1 + } + ] + }, + { + "index": "355", + "var": [ + { + "a": "per", + "t": "16010301", + "n": 1 + } + ] } ] \ No newline at end of file diff --git a/bin/json/game_playerinfor_overview.json b/bin/json/game_playerinfor_overview.json index f24ed1660..d67aeb249 100644 --- a/bin/json/game_playerinfor_overview.json +++ b/bin/json/game_playerinfor_overview.json @@ -1,34 +1,37 @@ [ { - "id": 1001, + "id": "16010101", "type": 1, "icon": "wp_icon_10019", "tujing": [ 107 ], - "url": "", + "murl": "100001", + "wurl": "100001", "playerhead": "wp_icon_10019", "name": "普通头像" }, { - "id": 2001, + "id": "16010201", "type": 2, "icon": "wp_icon_10019", "tujing": [ 107 ], - "url": "", + "murl": "explore", + "wurl": "explore", "playerhead": "wp_icon_10019", "name": "普通动作" }, { - "id": 3001, + "id": "16010301", "type": 3, "icon": "wp_icon_10019", "tujing": [ 107 ], - "url": "", + "murl": "character_cardshow", + "wurl": "character_cardshow", "playerhead": "wp_icon_10019", "name": "普通背景" } diff --git a/bin/json/game_playeroverview.json b/bin/json/game_playeroverview.json new file mode 100644 index 000000000..d67aeb249 --- /dev/null +++ b/bin/json/game_playeroverview.json @@ -0,0 +1,38 @@ +[ + { + "id": "16010101", + "type": 1, + "icon": "wp_icon_10019", + "tujing": [ + 107 + ], + "murl": "100001", + "wurl": "100001", + "playerhead": "wp_icon_10019", + "name": "普通头像" + }, + { + "id": "16010201", + "type": 2, + "icon": "wp_icon_10019", + "tujing": [ + 107 + ], + "murl": "explore", + "wurl": "explore", + "playerhead": "wp_icon_10019", + "name": "普通动作" + }, + { + "id": "16010301", + "type": 3, + "icon": "wp_icon_10019", + "tujing": [ + 107 + ], + "murl": "character_cardshow", + "wurl": "character_cardshow", + "playerhead": "wp_icon_10019", + "name": "普通背景" + } +] \ No newline at end of file diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index ad95a6560..7323da8f9 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -600,5 +600,19 @@ 100020 ], "goto": 0 + }, + { + "id": 90010, + "heroid": 25001, + "datas": [ + "CaravanScene", + "商队事件测试组件", + "141" + ], + "event": [ + 2, + 9060 + ], + "goto": 0 } ] \ No newline at end of file diff --git a/bin/json/game_show.json b/bin/json/game_show.json index dc0960968..de2686f37 100644 --- a/bin/json/game_show.json +++ b/bin/json/game_show.json @@ -11,30 +11,6 @@ "resources": "Person/10000/10000M.prefab", "vague": "Person/10000/10000M.prefab" }, - { - "id": 100002, - "desc": { - "key": "show_100002", - "text": "男形象2" - }, - "access": 0, - "position": "", - "sex": 1, - "resources": "Person/10000/10000M.prefab", - "vague": "Person/10000/10000M.prefab" - }, - { - "id": 100003, - "desc": { - "key": "show_100003", - "text": "男形象3" - }, - "access": 0, - "position": "", - "sex": 1, - "resources": "Person/10000/10000M.prefab", - "vague": "Person/10000/10000M.prefab" - }, { "id": 200001, "desc": { @@ -46,29 +22,5 @@ "sex": 2, "resources": "Person/10000/10000M.prefab", "vague": "Person/10000/10000M.prefab" - }, - { - "id": 200002, - "desc": { - "key": "show_200002", - "text": "女形象2" - }, - "access": 0, - "position": "", - "sex": 2, - "resources": "Person/10000/10000M.prefab", - "vague": "Person/10000/10000M.prefab" - }, - { - "id": 200003, - "desc": { - "key": "show_200003", - "text": "女形象3" - }, - "access": 0, - "position": "", - "sex": 2, - "resources": "Person/10000/10000M.prefab", - "vague": "Person/10000/10000M.prefab" } ] \ No newline at end of file diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 234826a2c..6a60fc28a 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -1108,5 +1108,43 @@ } ], "module": [] + }, + { + "key": 600010, + "lock": 0, + "lockend": 0, + "ontxe": 0, + "id_after": 0, + "group": 610, + "des": 5, + "icon": "", + "task_Tname": { + "key": "worldtask_world_task_task_Tname_26", + "text": "商队测试" + }, + "task_name": { + "key": "worldtask_world_task_task_name_26", + "text": "商队测试" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_26", + "text": "商队测试" + }, + "npc": 90010, + "completetasktxt": { + "key": "worldtask_world_task_completetasktxt_26", + "text": "商队测试A" + }, + "completetask": [ + 0 + ], + "deliver_npctxt": { + "key": "Mainline_Tasks1_101", + "text": "商队测试A" + }, + "deliver_npc": 0, + "auto_accept": 0, + "reword": [], + "module": [] } ] \ No newline at end of file diff --git a/sys/configure/structs/Game.PlayerInfor_overview.go b/sys/configure/structs/Game.PlayerInfor_overview.go index 417e23828..5751b9e3f 100644 --- a/sys/configure/structs/Game.PlayerInfor_overview.go +++ b/sys/configure/structs/Game.PlayerInfor_overview.go @@ -9,13 +9,13 @@ package cfg type GamePlayerInfor_overview struct { - _dataMap map[int32]*GamePlayerInfor_overviewData + _dataMap map[string]*GamePlayerInfor_overviewData _dataList []*GamePlayerInfor_overviewData } func NewGamePlayerInfor_overview(_buf []map[string]interface{}) (*GamePlayerInfor_overview, error) { _dataList := make([]*GamePlayerInfor_overviewData, 0, len(_buf)) - dataMap := make(map[int32]*GamePlayerInfor_overviewData) + dataMap := make(map[string]*GamePlayerInfor_overviewData) for _, _ele_ := range _buf { if _v, err2 := DeserializeGamePlayerInfor_overviewData(_ele_); err2 != nil { return nil, err2 @@ -27,7 +27,7 @@ func NewGamePlayerInfor_overview(_buf []map[string]interface{}) (*GamePlayerInfo return &GamePlayerInfor_overview{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GamePlayerInfor_overview) GetDataMap() map[int32]*GamePlayerInfor_overviewData { +func (table *GamePlayerInfor_overview) GetDataMap() map[string]*GamePlayerInfor_overviewData { return table._dataMap } @@ -35,7 +35,7 @@ func (table *GamePlayerInfor_overview) GetDataList() []*GamePlayerInfor_overview return table._dataList } -func (table *GamePlayerInfor_overview) Get(key int32) *GamePlayerInfor_overviewData { +func (table *GamePlayerInfor_overview) Get(key string) *GamePlayerInfor_overviewData { return table._dataMap[key] } diff --git a/sys/configure/structs/Game.PlayerInfor_overviewData.go b/sys/configure/structs/Game.PlayerInfor_overviewData.go index 39e111cd6..613a05c77 100644 --- a/sys/configure/structs/Game.PlayerInfor_overviewData.go +++ b/sys/configure/structs/Game.PlayerInfor_overviewData.go @@ -11,11 +11,12 @@ package cfg import "errors" type GamePlayerInfor_overviewData struct { - Id int32 + Id string Type int32 Icon string Tujing []int32 - Url string + Murl string + Wurl string Playerhead string Name string } @@ -27,7 +28,7 @@ func (*GamePlayerInfor_overviewData) GetTypeId() int32 { } func (_v *GamePlayerInfor_overviewData)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.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id 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; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } { @@ -44,7 +45,8 @@ func (_v *GamePlayerInfor_overviewData)Deserialize(_buf map[string]interface{}) } } - { var _ok_ bool; if _v.Url, _ok_ = _buf["url"].(string); !_ok_ { err = errors.New("url error"); return } } + { var _ok_ bool; if _v.Murl, _ok_ = _buf["murl"].(string); !_ok_ { err = errors.New("murl error"); return } } + { var _ok_ bool; if _v.Wurl, _ok_ = _buf["wurl"].(string); !_ok_ { err = errors.New("wurl error"); return } } { var _ok_ bool; if _v.Playerhead, _ok_ = _buf["playerhead"].(string); !_ok_ { err = errors.New("playerhead error"); return } } { var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name error"); return } } return diff --git a/sys/configure/structs/Game.PlayerOverview.go b/sys/configure/structs/Game.PlayerOverview.go new file mode 100644 index 000000000..89704c219 --- /dev/null +++ b/sys/configure/structs/Game.PlayerOverview.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 GamePlayerOverview struct { + _dataMap map[string]*GamePlayerOverviewData + _dataList []*GamePlayerOverviewData +} + +func NewGamePlayerOverview(_buf []map[string]interface{}) (*GamePlayerOverview, error) { + _dataList := make([]*GamePlayerOverviewData, 0, len(_buf)) + dataMap := make(map[string]*GamePlayerOverviewData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGamePlayerOverviewData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GamePlayerOverview{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GamePlayerOverview) GetDataMap() map[string]*GamePlayerOverviewData { + return table._dataMap +} + +func (table *GamePlayerOverview) GetDataList() []*GamePlayerOverviewData { + return table._dataList +} + +func (table *GamePlayerOverview) Get(key string) *GamePlayerOverviewData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.PlayerOverviewData.go b/sys/configure/structs/Game.PlayerOverviewData.go new file mode 100644 index 000000000..2310ca4f6 --- /dev/null +++ b/sys/configure/structs/Game.PlayerOverviewData.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 GamePlayerOverviewData struct { + Id string + Type int32 + Icon string + Tujing []int32 + Murl string + Wurl string + Playerhead string + Name string +} + +const TypeId_GamePlayerOverviewData = -1442303552 + +func (*GamePlayerOverviewData) GetTypeId() int32 { + return -1442303552 +} + +func (_v *GamePlayerOverviewData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id 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; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["tujing"].([]interface{}); !_ok_ { err = errors.New("tujing error"); return } + + _v.Tujing = 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.Tujing = append(_v.Tujing, _list_v_) + } + } + + { var _ok_ bool; if _v.Murl, _ok_ = _buf["murl"].(string); !_ok_ { err = errors.New("murl error"); return } } + { var _ok_ bool; if _v.Wurl, _ok_ = _buf["wurl"].(string); !_ok_ { err = errors.New("wurl error"); return } } + { var _ok_ bool; if _v.Playerhead, _ok_ = _buf["playerhead"].(string); !_ok_ { err = errors.New("playerhead error"); return } } + { var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name error"); return } } + return +} + +func DeserializeGamePlayerOverviewData(_buf map[string]interface{}) (*GamePlayerOverviewData, error) { + v := &GamePlayerOverviewData{} + 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 05ca78b64..e0e3c2ef7 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -87,13 +87,11 @@ type Tables struct { Herofusion *GameHerofusion PlayerInfor *GamePlayerInfor PlayerInfor_overview *GamePlayerInfor_overview - TalentSkill *GameTalentSkill ArenaBuyChallenge *GameArenaBuyChallenge ArenaActiveReward *GameArenaActiveReward ArenaRobot *GameArenaRobot ArenaRankReward *GameArenaRankReward ArenaChallengeNpc *GameArenaChallengeNpc - ItemBox *GameItemBox Show *GameShow GuildLv *GameGuildLv GuildPng *GameGuildPng @@ -181,6 +179,7 @@ type Tables struct { itinerant_battle *Gameitinerant_battle itinerant_event *Gameitinerant_event NewRedDot *GameNewRedDot + Talent *GameTalent Favorability *GameFavorability Friends *GameFriends CampLv *GameCampLv @@ -194,9 +193,9 @@ type Tables struct { Pricegroup *GamePricegroup Loading *GameLoading RuleDesc *GameRuleDesc + PlayerOverview *GamePlayerOverview HeroTalent *GameHeroTalent TalentBox *GameTalentBox - Talent *GameTalent } func NewTables(loader JsonLoader) (*Tables, error) { @@ -660,12 +659,6 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.PlayerInfor_overview, err = NewGamePlayerInfor_overview(buf) ; err != nil { return nil, err } - if buf, err = loader("game_talentskill") ; err != nil { - return nil, err - } - if tables.TalentSkill, err = NewGameTalentSkill(buf) ; err != nil { - return nil, err - } if buf, err = loader("game_arenabuychallenge") ; err != nil { return nil, err } @@ -696,12 +689,6 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.ArenaChallengeNpc, err = NewGameArenaChallengeNpc(buf) ; err != nil { return nil, err } - if buf, err = loader("game_itembox") ; err != nil { - return nil, err - } - if tables.ItemBox, err = NewGameItemBox(buf) ; err != nil { - return nil, err - } if buf, err = loader("game_show") ; err != nil { return nil, err } @@ -1224,6 +1211,12 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.NewRedDot, err = NewGameNewRedDot(buf) ; err != nil { return nil, err } + if buf, err = loader("game_talent") ; err != nil { + return nil, err + } + if tables.Talent, err = NewGameTalent(buf) ; err != nil { + return nil, err + } if buf, err = loader("game_favorability") ; err != nil { return nil, err } @@ -1302,6 +1295,12 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.RuleDesc, err = NewGameRuleDesc(buf) ; err != nil { return nil, err } + if buf, err = loader("game_playeroverview") ; err != nil { + return nil, err + } + if tables.PlayerOverview, err = NewGamePlayerOverview(buf) ; err != nil { + return nil, err + } if buf, err = loader("game_herotalent") ; err != nil { return nil, err } @@ -1314,11 +1313,5 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.TalentBox, err = NewGameTalentBox(buf) ; err != nil { return nil, err } - if buf, err = loader("game_talent") ; err != nil { - return nil, err - } - if tables.Talent, err = NewGameTalent(buf) ; err != nil { - return nil, err - } return tables, nil }