From bc5251473a2e676a154575b053361c8d0501ad5a Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Mon, 9 Oct 2023 17:25:00 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E9=82=AE=E4=BB=B6RPC=20=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mail/module.go | 2 +- modules/web/api_creatmail.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/mail/module.go b/modules/mail/module.go index 9a411ed4c..c3cc45c59 100644 --- a/modules/mail/module.go +++ b/modules/mail/module.go @@ -140,7 +140,7 @@ func (this *Mail) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (red return } -func (this *Mail) Rpc_Mail(ctx context.Context, args *pb.DBMailData) (err error) { +func (this *Mail) Rpc_Mail(ctx context.Context, args *pb.DBMailData, reply *pb.EmptyResp) (err error) { this.Debug("Rpc_Mail", log.Field{Key: "args", Value: args.String()}) var ( conn *db.DBConn diff --git a/modules/web/api_creatmail.go b/modules/web/api_creatmail.go index 0e448bac0..de9953160 100644 --- a/modules/web/api_creatmail.go +++ b/modules/web/api_creatmail.go @@ -73,9 +73,9 @@ func (this *Api_Comp) CreateMail(c *engine.Context) { if len(req.Items) > 0 { mail.Reward = true } - + ctr, _ := context.WithTimeout(context.Background(), time.Second*5) if _, err = this.module.service.RpcGo( - context.Background(), + ctr, comm.Service_Worker, string(comm.Rpc_Mail), mail, nil); err != nil { From 0936223d7f67aab9ae98e37744b93e369451c506 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Mon, 9 Oct 2023 17:38:09 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mail/module.go | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/modules/mail/module.go b/modules/mail/module.go index c3cc45c59..91b36d8d8 100644 --- a/modules/mail/module.go +++ b/modules/mail/module.go @@ -143,20 +143,14 @@ func (this *Mail) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (red func (this *Mail) Rpc_Mail(ctx context.Context, args *pb.DBMailData, reply *pb.EmptyResp) (err error) { this.Debug("Rpc_Mail", log.Field{Key: "args", Value: args.String()}) var ( - conn *db.DBConn session comm.IUserSession online bool ) - tag, _, b := utils.UIdSplit(args.Uid) - if b { - if conn, err = db.ServerDBConn(tag); err == nil { - dbModel := db.NewDBModel(comm.TableMail, conn) - _, err = dbModel.DB.InsertOne(comm.TableMail, args) - if err != nil { - this.Error("Create Rpc_Mail failed", log.Field{Key: "uid", Value: args.Uid}, log.Field{Key: "err", Value: err.Error()}) - return - } - } + + _, err = this.modelMail.DB.InsertOne(comm.TableMail, args) + if err != nil { + this.Error("Create Rpc_Mail failed", log.Field{Key: "uid", Value: args.Uid}, log.Field{Key: "err", Value: err.Error()}) + return } defer func() { this.PutUserSession(session) From 2d233bb2cd29bfb8dd00815632a45e8029ca3b58 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Mon, 9 Oct 2023 17:45:14 +0800 Subject: [PATCH 3/8] =?UTF-8?q?GM=E9=82=AE=E4=BB=B6=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/web/api_creatmail.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/web/api_creatmail.go b/modules/web/api_creatmail.go index 63e81a285..a915aeb94 100644 --- a/modules/web/api_creatmail.go +++ b/modules/web/api_creatmail.go @@ -65,13 +65,14 @@ func (this *Api_Comp) CreateMail(c *engine.Context) { CreateTime: uint64(time.Now().Unix()), DueTime: uint64(time.Now().Unix() + 30*24*3600), Check: false, - Reward: false, + Reward: true, Items: req.Items, Cid: req.Cid, Param: req.Param, } - if len(req.Items) > 0 { - mail.Reward = true + + if len(mail.GetItems()) > 0 { + mail.Reward = false } ctr, _ := context.WithTimeout(context.Background(), time.Second*5) if _, err = this.module.service.RpcGo( From cbe0c9363504306b38f2afa18939516d4a6d9b76 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Mon, 9 Oct 2023 18:20:42 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=88=97=E8=BD=A6=E7=BB=93=E8=B4=A6?= =?UTF-8?q?=E6=94=B6=E7=9B=8A=E5=A5=96=E5=8A=B1=E9=A2=86=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/caravan/api_getreward.go | 79 +++++++++++++++++++------------ modules/caravan/comp_configure.go | 14 ++++++ 2 files changed, 63 insertions(+), 30 deletions(-) diff --git a/modules/caravan/api_getreward.go b/modules/caravan/api_getreward.go index bf68e9434..220b98012 100644 --- a/modules/caravan/api_getreward.go +++ b/modules/caravan/api_getreward.go @@ -25,52 +25,71 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.CaravanGetRewa } caravan, _ := this.module.modelCaravan.getCaravanList(session.GetUserId()) - reward := this.configure.GetCaravanReward() curProfit := this.module.ModuleUser.QueryAttributeValue(session.GetUserId(), "profit") if req.Lv == 0 { - for _, v := range reward { - if v.Key > 0 { - if curProfit > int64(v.Key) { - if _, ok := caravan.Reward[v.Key]; !ok { - res = append(res, v.Reward...) - caravan.Reward[v.Key] = true - } - } - } - } - } else { - for _, v := range reward { - if v.Key == req.Lv { - if curProfit < int64(v.Key) { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_TrollCantReward, - Title: pb.ErrorCode_TrollCantReward.ToString(), - } - return - } else { - res = append(res, v.Reward...) - } + var index int32 + for { + index++ + reward, err := this.configure.GetCaravanRewardById(index) + if err != nil { break } + if reward.Key < 0 { + break + } + if _, ok := caravan.Reward[req.Lv]; ok { + continue + } + if curProfit < int64(reward.Key) { + break + } else { + res = append(res, reward.Reward...) + caravan.Reward[req.Lv] = true + } } - if len(res) == 0 { + + } else { + reward, err := this.configure.GetCaravanRewardById(req.Lv) + if err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: err.Error(), + } + return + } + if reward.Key < 0 { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ReqParameterError, Title: pb.ErrorCode_ReqParameterError.ToString(), } return } - - if _, ok := caravan.Reward[req.Lv]; !ok { - caravan.Reward[req.Lv] = true - } else { // 重复领取 + if _, ok := caravan.Reward[req.Lv]; ok { errdata = &pb.ErrorData{ Code: pb.ErrorCode_TrollRepeatedReward, - Title: pb.ErrorCode_TrollRepeatedReward.ToString(), + Title: pb.ErrorCode_TrollRepeatedReward.ToString(), // 重复领取 } + return + } + if curProfit < int64(reward.Key) { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_TrollCantReward, + Title: pb.ErrorCode_TrollCantReward.ToString(), // 重复领取 + } + return + } else { + res = append(res, reward.Reward...) + caravan.Reward[req.Lv] = true } } - + if len(res) == 0 { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + } + return + } errdata, atno = this.module.DispenseAtno(session, res, true) update["reward"] = caravan.Reward this.module.modelCaravan.modifyCaravanDataByObjId(session.GetUserId(), update) diff --git a/modules/caravan/comp_configure.go b/modules/caravan/comp_configure.go index 6f883402d..c79f1777a 100644 --- a/modules/caravan/comp_configure.go +++ b/modules/caravan/comp_configure.go @@ -270,3 +270,17 @@ func (this *configureComp) GetCaravanEventById(id int32) (data *cfg.GameCaravanE err = comm.NewNotFoundConfErr(moduleName, game_caravan_event, id) return } + +func (this *configureComp) GetCaravanRewardById(id int32) (reward *cfg.GameCaravanRewardData, err error) { + var v interface{} + if v, err = this.GetConfigure(game_caravan_reward); err == nil { + if configure, ok := v.(*cfg.GameCaravanReward); ok { + reward = configure.Get(id) + if reward != nil { + return + } + } + } + log.Errorf("get GetCaravanRewardById conf err:%v", err) + return +} From 8b233d1ea464d1c027c1e88b15ecb37df27c687f Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Mon, 9 Oct 2023 18:22:59 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=B8=80=E9=94=AE=E9=A2=86=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/caravan/api_getreward.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/caravan/api_getreward.go b/modules/caravan/api_getreward.go index 220b98012..fcd829d53 100644 --- a/modules/caravan/api_getreward.go +++ b/modules/caravan/api_getreward.go @@ -37,14 +37,14 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.CaravanGetRewa if reward.Key < 0 { break } - if _, ok := caravan.Reward[req.Lv]; ok { + if _, ok := caravan.Reward[index]; ok { continue } if curProfit < int64(reward.Key) { break } else { res = append(res, reward.Reward...) - caravan.Reward[req.Lv] = true + caravan.Reward[index] = true } } From f2fd4ebb639c9a4e3aac01208ec83f63eeec439d Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 10 Oct 2023 11:49:26 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=95=86=E9=98=9F=E6=8E=92=E8=A1=8C?= =?UTF-8?q?=E6=94=B9=E8=B7=A8=E6=9C=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/const.go | 2 + modules/caravan/api_buyorsell.go | 1 + modules/caravan/api_ranklist.go | 3 +- modules/caravan/comp_configure.go | 2 +- modules/caravan/model_rank.go | 137 ++++++++++++++++++ modules/caravan/module.go | 77 ++++++----- modules/user/model_user.go | 4 + modules/viking/model_seasonrank.go | 57 -------- modules/viking/module.go | 14 +- pb/caravan_db.pb.go | 214 ++++++++++++++++++++++++----- 10 files changed, 375 insertions(+), 136 deletions(-) create mode 100644 modules/caravan/model_rank.go delete mode 100644 modules/viking/model_seasonrank.go diff --git a/comm/const.go b/comm/const.go index 275fb31d9..59a2113d1 100644 --- a/comm/const.go +++ b/comm/const.go @@ -378,6 +378,8 @@ const ( TableVentureSign = "venturesign" TableVentureLv = "venturelv" + + TableCaravanRank = "caravansrank" ) // RPC服务接口定义处 diff --git a/modules/caravan/api_buyorsell.go b/modules/caravan/api_buyorsell.go index 7b763b3c9..0d09e4e87 100644 --- a/modules/caravan/api_buyorsell.go +++ b/modules/caravan/api_buyorsell.go @@ -237,6 +237,7 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe Data: caravan, }) + this.module.rank.SetUsrRankList(session.GetUserId()) // 任务统计 var tasks []*pb.BuriedParam diff --git a/modules/caravan/api_ranklist.go b/modules/caravan/api_ranklist.go index 392ff845d..49fd9b527 100644 --- a/modules/caravan/api_ranklist.go +++ b/modules/caravan/api_ranklist.go @@ -20,7 +20,8 @@ func (this *apiComp) RankList(session comm.IUserSession, req *pb.CaravanRankList if errdata = this.RankListCheck(session, req); errdata != nil { return // 参数校验失败直接返回 } - resp.List, rankid = this.module.modelCaravan.GetRankListData(comm.MaxRankList, session.GetUserId()) + //resp.List, rankid = this.module.modelCaravan.GetRankListData(comm.MaxRankList, session.GetUserId()) + resp.List, rankid = this.module.rank.getRankList(session.GetUserId()) // 2023.10.10 改跨服 userinfo, err := this.module.ModuleUser.GetUser(session.GetUserId()) if err != nil { errdata = &pb.ErrorData{ diff --git a/modules/caravan/comp_configure.go b/modules/caravan/comp_configure.go index c79f1777a..20f0050c3 100644 --- a/modules/caravan/comp_configure.go +++ b/modules/caravan/comp_configure.go @@ -229,7 +229,7 @@ func (this *configureComp) GetCaravanMoreReward() (reward *cfg.GameCaravanReward ) if v, err = this.GetConfigure(game_caravan_reward); err == nil { if configure, ok := v.(*cfg.GameCaravanReward); ok { - if reward = configure.Get(this.overflow); err != nil { + if reward = configure.Get(this.overflow); err == nil { return } } diff --git a/modules/caravan/model_rank.go b/modules/caravan/model_rank.go new file mode 100644 index 000000000..f5c15e8df --- /dev/null +++ b/modules/caravan/model_rank.go @@ -0,0 +1,137 @@ +package caravan + +import ( + "context" + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/mgo" + "go_dreamfactory/modules" + "go_dreamfactory/pb" + "go_dreamfactory/sys/db" + + "go.mongodb.org/mongo-driver/bson" + "go.mongodb.org/mongo-driver/bson/primitive" + "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/mongo/options" + "go.mongodb.org/mongo-driver/x/bsonx" +) + +type ModelRank struct { + modules.MCompModel + module *Caravan +} + +func (this *ModelRank) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + this.TableName = comm.TableCaravanRank + err = this.MCompModel.Init(service, module, comp, options) + this.module = module.(*Caravan) + //创建uid索引 + this.DB.CreateIndex(core.SqlTable(comm.TableCaravanRank), mongo.IndexModel{ + Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, + }) + return +} + +func (this *ModelRank) SetUsrRankList(uid string) (result *pb.DBCaravanRank, err error) { + conn_, err := db.Cross() // 获取跨服数据库对象 + if err != nil { + return + } + user, err1 := this.module.ModuleUser.GetUser(uid) + if err1 != nil { + err = err1 + return + } + model := db.NewDBModelByExpired(comm.TableCaravanRank, conn_) + if model == nil { + return + } + result = &pb.DBCaravanRank{} + if err = model.Get(uid, result); err != nil { + if mgo.MongodbNil == err { + + result = &pb.DBCaravanRank{ + Id: primitive.NewObjectID().Hex(), + Uid: uid, + Name: user.Name, + Userlv: user.Lv, + Avatar: user.Avatar, + + Merchantmoney: user.Merchantmoney, + CaravanLv: user.Caravanlv, + Title: user.Curtitle, + } + err = nil + model.Add(uid, result) + } + return + } + data := make(map[string]interface{}, 0) + data["merchantmoney"] = user.Merchantmoney + data["caravanLv"] = user.Caravanlv + if err = model.Change(uid, data); err != nil { + return + } + return result, err +} + +func (this *ModelRank) ChangeRankList(uId string, data map[string]interface{}) (err error) { + conn_, err := db.Cross() // 获取跨服数据库对象 + if err != nil { + return + } + + model := db.NewDBModelByExpired(comm.TableCaravanRank, conn_) + if model == nil { + return + } + if err = model.Change(uId, data); err != nil { + return + } + return +} + +// 获取排行榜数据 +func (this *ModelRank) getRankList(uid string) (list []*pb.CaravanRankInfo, rankid int32) { + var ipos int32 + min := this.module.ModuleTools.GetGlobalConf().BusinessRankmoney + conn_, err := db.Cross() // 获取跨服数据库对象 + if err != nil { + return + } + + model := db.NewDBModelByExpired(comm.TableCaravanRank, conn_) + if model == nil { + return + } + + if _data, err := model.DB.Find(comm.TableCaravanRank, bson.M{"merchantmoney": bson.M{"$gte": min}}, options.Find().SetSort(bson.M{"merchantmoney": -1}).SetLimit(int64(comm.MaxRankNum))); err == nil { + for _data.Next(context.TODO()) { + temp := &pb.DBUser{} + if err = _data.Decode(temp); err == nil { + if temp.Name == "" { // 容错处理 防止没有创号的玩家入榜 + continue + } + ipos++ + list = append(list, &pb.CaravanRankInfo{ + Uid: temp.Uid, + Name: temp.Name, + Userlv: temp.Lv, + Avatar: temp.Avatar, + Rank: ipos, + Merchantmoney: temp.Merchantmoney, + CaravanLv: temp.Caravanlv, + Title: temp.Curtitle, + }) + + if temp.Uid == uid { + rankid = ipos + } + } + } + } else { + this.module.Errorln(err) + return + } + return +} diff --git a/modules/caravan/module.go b/modules/caravan/module.go index e6efb1352..acbdf9416 100644 --- a/modules/caravan/module.go +++ b/modules/caravan/module.go @@ -10,6 +10,7 @@ import ( "go_dreamfactory/pb" "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" + "go_dreamfactory/sys/db" "go_dreamfactory/utils" "math" "strconv" @@ -26,6 +27,7 @@ type Caravan struct { configure *configureComp service base.IRPCXService mail comm.Imail + rank *ModelRank } func NewModule() core.IModule { @@ -62,6 +64,7 @@ func (this *Caravan) OnInstallComp() { this.api = this.RegisterComp(new(apiComp)).(*apiComp) this.modelCaravan = this.RegisterComp(new(modelCaravan)).(*modelCaravan) this.configure = this.RegisterComp(new(configureComp)).(*configureComp) + this.rank = this.RegisterComp(new(ModelRank)).(*ModelRank) } // 接口信息 修改数据 @@ -438,18 +441,17 @@ func (this *Caravan) Rpc_ModuleCaravanSettlement(ctx context.Context, args *pb.E ) go func() { sTime := time.Now() - var rankIndex int32 - if _data, err := this.modelCaravan.DB.Find(comm.TableUser, bson.M{"merchantmoney": bson.M{"$gt": 0}}, options.Find().SetSort(bson.M{"merchantmoney": -1}).SetLimit(comm.MaxRankList)); err == nil { - for _data.Next(context.TODO()) { - rankIndex++ - temp := &pb.DBUser{} - if err = _data.Decode(temp); err == nil { - c, err := this.configure.GetCaravanRank(rankIndex) - if err == nil { - this.mail.SendMailByUID(temp.Uid, "CaravanRank", c.Reward, []string{strconv.Itoa(int(rankIndex))}) - } - } - } + var ( + rankIndex int32 + stag string + ) + conn_, err := db.Cross() // 获取跨服数据库对象 + if err != nil { + return + } + model := db.NewDBModelByExpired(comm.TableCaravanRank, conn_) + if model == nil { + return } var maxKey int32 for _, v := range this.configure.GetCaravanReward() { @@ -461,31 +463,44 @@ func (this *Caravan) Rpc_ModuleCaravanSettlement(ctx context.Context, args *pb.E if err != nil { return } - // 发送虚拟币奖励 - if _data, err := this.modelCaravan.DB.Find(comm.TableUser, bson.M{"merchantmoney": bson.M{"$gt": comm.CaravanMerchantmoney}}); err == nil { + min := this.ModuleTools.GetGlobalConf().BusinessRankmoney + if _data, err := model.DB.Find(comm.TableCaravanRank, bson.M{"merchantmoney": bson.M{"$gte": min}}, options.Find().SetSort(bson.M{"merchantmoney": -1}).SetLimit(int64(comm.MaxRankNum))); err == nil { + //if _data, err := this.modelCaravan.DB.Find(comm.TableUser, bson.M{"merchantmoney": bson.M{"$gt": 0}}, options.Find().SetSort(bson.M{"merchantmoney": -1}).SetLimit(comm.MaxRankList)); err == nil { for _data.Next(context.TODO()) { - temp := &pb.DBUser{} - + rankIndex++ + temp := &pb.DBCaravanRank{} if err = _data.Decode(temp); err == nil { - - if maxKey <= temp.Merchantmoney { - var res []*cfg.Gameatn - for _, v := range moreReard.Reward { - if v.N == 0 { - continue - } - atn := &cfg.Gameatn{ - A: v.A, - T: v.T, - N: v.N * (temp.Merchantmoney - maxKey), - } - res = append(res, atn) - } - this.mail.SendMailByUID(temp.Uid, "CaravanRewards", res, []string{}) + if stag, err = comm.UidToSTag(temp.Uid); err != nil { + return } + if this.service.GetTag() == stag { + if carConf, err := this.configure.GetCaravanRank(rankIndex); err == nil { + this.mail.SendMailByUID(temp.Uid, "CaravanRank", carConf.Reward, []string{strconv.Itoa(int(rankIndex))}) + } + if maxKey < temp.Merchantmoney { // 超过部分转换其他奖励发送 + var res []*cfg.Gameatn + for _, v := range moreReard.Reward { + if v.N == 0 { + continue + } + atn := &cfg.Gameatn{ + A: v.A, + T: v.T, + N: v.N * (temp.Merchantmoney - maxKey), + } + res = append(res, atn) + } + + this.mail.SendMailByUID(temp.Uid, "CaravanRewards", res, []string{}) + } + } + model.DB.UpdateOne(comm.TableCaravanRank, bson.M{"_id": temp.Id}, bson.M{"$set": bson.M{ + "merchantmoney": 0, + }}) } } } + Query := bson.M{} Query["merchantmoney"] = 0 _, err = this.modelCaravan.DB.UpdateMany(core.SqlTable(comm.TableUser), bson.M{"merchantmoney": bson.M{"$gt": 0}}, bson.M{"$set": Query}, options.MergeUpdateOptions().SetUpsert(true)) //, new(options.UpdateOptions).SetUpsert(true) diff --git a/modules/user/model_user.go b/modules/user/model_user.go index eaa217134..c85c8383e 100644 --- a/modules/user/model_user.go +++ b/modules/user/model_user.go @@ -294,6 +294,10 @@ func (this *ModelUser) CleanUserMerchantmoney(session comm.IUserSession) (err er update = make(map[string]interface{}, 0) update["profit"] = 0 update["merchantmoney"] = 0 + if user.Caravanlv == 0 { // 默认1级 + user.Caravanlv = 1 + update["caravanlv"] = user.Caravanlv + } if db.IsCross() { if model, err = this.module.GetDBModelByUid(uid, this.TableName); err == nil { if err := this.Get(uid, user); err != nil { diff --git a/modules/viking/model_seasonrank.go b/modules/viking/model_seasonrank.go deleted file mode 100644 index 6d038decd..000000000 --- a/modules/viking/model_seasonrank.go +++ /dev/null @@ -1,57 +0,0 @@ -package viking - -import ( - "go_dreamfactory/comm" - "go_dreamfactory/lego/core" - "go_dreamfactory/modules" - "go_dreamfactory/pb" - - "go.mongodb.org/mongo-driver/mongo" - "go.mongodb.org/mongo-driver/x/bsonx" -) - -type ModelSeasonRank struct { - modules.MCompModel - moduleViking *Viking -} - -func (this *ModelSeasonRank) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { - this.TableName = comm.TableVikingSRank - err = this.MCompModel.Init(service, module, comp, options) - this.moduleViking = module.(*Viking) - //创建uid索引 - this.DB.CreateIndex(core.SqlTable(comm.TableVikingSRank), mongo.IndexModel{ - Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, - }) - return -} -func (this *ModelSeasonRank) AddSeasonRankList(uId string, id string, data *pb.DBVSeasonRank) (err error) { - if err = this.AddList(uId, id, data); err != nil { - return - } - return nil -} - -// 获取排行榜数据 -func (this *ModelSeasonRank) getVikingSeasonRankList(uid string) []*pb.DBVSeasonRank { - ranks := make([]*pb.DBVSeasonRank, 0) - err := this.GetList(uid, &ranks) - if err != nil { - return nil - } - return ranks -} - -func (this *ModelSeasonRank) getVikingSeasonRankListByBossType(uid string, bossType int32) *pb.DBVSeasonRank { - ranks := make([]*pb.DBVSeasonRank, 0) - err := this.GetList(uid, &ranks) - if err != nil { - return nil - } - for _, v := range ranks { - if v.Bosstype == bossType { - return v - } - } - return nil -} diff --git a/modules/viking/module.go b/modules/viking/module.go index a6ca6f023..141ee314a 100644 --- a/modules/viking/module.go +++ b/modules/viking/module.go @@ -26,13 +26,12 @@ import ( type Viking struct { modules.ModuleBase - modelViking *modelViking - api *apiComp - configure *configureComp - modulerank *ModelRank - moduleseasonrank *ModelSeasonRank - battle comm.IBattle - service base.IRPCXService + modelViking *modelViking + api *apiComp + configure *configureComp + modulerank *ModelRank + battle comm.IBattle + service base.IRPCXService } const ( @@ -61,7 +60,6 @@ func (this *Viking) OnInstallComp() { this.api = this.RegisterComp(new(apiComp)).(*apiComp) this.modelViking = this.RegisterComp(new(modelViking)).(*modelViking) this.modulerank = this.RegisterComp(new(ModelRank)).(*ModelRank) - this.moduleseasonrank = this.RegisterComp(new(ModelSeasonRank)).(*ModelSeasonRank) this.configure = this.RegisterComp(new(configureComp)).(*configureComp) } diff --git a/pb/caravan_db.pb.go b/pb/caravan_db.pb.go index 389189409..e410d89a8 100644 --- a/pb/caravan_db.pb.go +++ b/pb/caravan_db.pb.go @@ -455,6 +455,117 @@ func (x *GoodsInfo) GetGoods() map[string]int32 { return nil } +type DBCaravanRank struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` + Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name"` + Userlv int32 `protobuf:"varint,4,opt,name=userlv,proto3" json:"userlv"` + Avatar string `protobuf:"bytes,5,opt,name=avatar,proto3" json:"avatar" bson:"avatar"` //头像 + Rank int32 `protobuf:"varint,6,opt,name=rank,proto3" json:"rank"` //排名 + Merchantmoney int32 `protobuf:"varint,7,opt,name=merchantmoney,proto3" json:"merchantmoney"` // 虚拟币 + CaravanLv int32 `protobuf:"varint,8,opt,name=caravanLv,proto3" json:"caravanLv"` // 商队等级 + Title string `protobuf:"bytes,9,opt,name=title,proto3" json:"title"` +} + +func (x *DBCaravanRank) Reset() { + *x = DBCaravanRank{} + if protoimpl.UnsafeEnabled { + mi := &file_caravan_caravan_db_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBCaravanRank) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBCaravanRank) ProtoMessage() {} + +func (x *DBCaravanRank) ProtoReflect() protoreflect.Message { + mi := &file_caravan_caravan_db_proto_msgTypes[5] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DBCaravanRank.ProtoReflect.Descriptor instead. +func (*DBCaravanRank) Descriptor() ([]byte, []int) { + return file_caravan_caravan_db_proto_rawDescGZIP(), []int{5} +} + +func (x *DBCaravanRank) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBCaravanRank) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + +func (x *DBCaravanRank) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *DBCaravanRank) GetUserlv() int32 { + if x != nil { + return x.Userlv + } + return 0 +} + +func (x *DBCaravanRank) GetAvatar() string { + if x != nil { + return x.Avatar + } + return "" +} + +func (x *DBCaravanRank) GetRank() int32 { + if x != nil { + return x.Rank + } + return 0 +} + +func (x *DBCaravanRank) GetMerchantmoney() int32 { + if x != nil { + return x.Merchantmoney + } + return 0 +} + +func (x *DBCaravanRank) GetCaravanLv() int32 { + if x != nil { + return x.CaravanLv + } + return 0 +} + +func (x *DBCaravanRank) GetTitle() string { + if x != nil { + return x.Title + } + return "" +} + type CaravanRankInfo struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -473,7 +584,7 @@ type CaravanRankInfo struct { func (x *CaravanRankInfo) Reset() { *x = CaravanRankInfo{} if protoimpl.UnsafeEnabled { - mi := &file_caravan_caravan_db_proto_msgTypes[5] + mi := &file_caravan_caravan_db_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -486,7 +597,7 @@ func (x *CaravanRankInfo) String() string { func (*CaravanRankInfo) ProtoMessage() {} func (x *CaravanRankInfo) ProtoReflect() protoreflect.Message { - mi := &file_caravan_caravan_db_proto_msgTypes[5] + mi := &file_caravan_caravan_db_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -499,7 +610,7 @@ func (x *CaravanRankInfo) ProtoReflect() protoreflect.Message { // Deprecated: Use CaravanRankInfo.ProtoReflect.Descriptor instead. func (*CaravanRankInfo) Descriptor() ([]byte, []int) { - return file_caravan_caravan_db_proto_rawDescGZIP(), []int{5} + return file_caravan_caravan_db_proto_rawDescGZIP(), []int{6} } func (x *CaravanRankInfo) GetUid() string { @@ -658,22 +769,36 @@ var file_caravan_caravan_db_proto_rawDesc = []byte{ 0x6f, 0x6f, 0x64, 0x73, 0x1a, 0x38, 0x0a, 0x0a, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xd5, - 0x01, 0x0a, 0x0f, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, - 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, - 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x76, - 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, - 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x24, 0x0a, 0x0d, - 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x18, 0x06, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e, - 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x4c, 0x76, 0x18, - 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x4c, 0x76, - 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xe3, + 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, + 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, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x76, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x76, 0x12, 0x16, + 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x06, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x65, + 0x72, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79, + 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x4c, 0x76, 0x18, 0x08, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x4c, 0x76, 0x12, 0x14, + 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, + 0x69, 0x74, 0x6c, 0x65, 0x22, 0xd5, 0x01, 0x0a, 0x0f, 0x43, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e, + 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, + 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, + 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, + 0x75, 0x73, 0x65, 0x72, 0x6c, 0x76, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x12, + 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, + 0x6e, 0x6b, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f, + 0x6e, 0x65, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, + 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x72, 0x61, + 0x76, 0x61, 0x6e, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x61, 0x72, + 0x61, 0x76, 0x61, 0x6e, 0x4c, 0x76, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, + 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x42, 0x06, 0x5a, 0x04, + 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -688,32 +813,33 @@ func file_caravan_caravan_db_proto_rawDescGZIP() []byte { return file_caravan_caravan_db_proto_rawDescData } -var file_caravan_caravan_db_proto_msgTypes = make([]protoimpl.MessageInfo, 14) +var file_caravan_caravan_db_proto_msgTypes = make([]protoimpl.MessageInfo, 15) var file_caravan_caravan_db_proto_goTypes = []interface{}{ (*CityInfo)(nil), // 0: CityInfo (*BagInfo)(nil), // 1: BagInfo (*DBCaravan)(nil), // 2: DBCaravan (*GoodPeriod)(nil), // 3: GoodPeriod (*GoodsInfo)(nil), // 4: GoodsInfo - (*CaravanRankInfo)(nil), // 5: CaravanRankInfo - nil, // 6: CityInfo.CountEntry - nil, // 7: DBCaravan.ItemsEntry - nil, // 8: DBCaravan.CityEntry - nil, // 9: DBCaravan.GroupEntry - nil, // 10: DBCaravan.RewardEntry - nil, // 11: DBCaravan.AllgoodsEntry - nil, // 12: DBCaravan.PeriodEntry - nil, // 13: GoodsInfo.GoodsEntry + (*DBCaravanRank)(nil), // 5: DBCaravanRank + (*CaravanRankInfo)(nil), // 6: CaravanRankInfo + nil, // 7: CityInfo.CountEntry + nil, // 8: DBCaravan.ItemsEntry + nil, // 9: DBCaravan.CityEntry + nil, // 10: DBCaravan.GroupEntry + nil, // 11: DBCaravan.RewardEntry + nil, // 12: DBCaravan.AllgoodsEntry + nil, // 13: DBCaravan.PeriodEntry + nil, // 14: GoodsInfo.GoodsEntry } var file_caravan_caravan_db_proto_depIdxs = []int32{ - 6, // 0: CityInfo.count:type_name -> CityInfo.CountEntry - 7, // 1: DBCaravan.items:type_name -> DBCaravan.ItemsEntry - 8, // 2: DBCaravan.city:type_name -> DBCaravan.CityEntry - 9, // 3: DBCaravan.group:type_name -> DBCaravan.GroupEntry - 10, // 4: DBCaravan.reward:type_name -> DBCaravan.RewardEntry - 11, // 5: DBCaravan.allgoods:type_name -> DBCaravan.AllgoodsEntry - 12, // 6: DBCaravan.period:type_name -> DBCaravan.PeriodEntry - 13, // 7: GoodsInfo.goods:type_name -> GoodsInfo.GoodsEntry + 7, // 0: CityInfo.count:type_name -> CityInfo.CountEntry + 8, // 1: DBCaravan.items:type_name -> DBCaravan.ItemsEntry + 9, // 2: DBCaravan.city:type_name -> DBCaravan.CityEntry + 10, // 3: DBCaravan.group:type_name -> DBCaravan.GroupEntry + 11, // 4: DBCaravan.reward:type_name -> DBCaravan.RewardEntry + 12, // 5: DBCaravan.allgoods:type_name -> DBCaravan.AllgoodsEntry + 13, // 6: DBCaravan.period:type_name -> DBCaravan.PeriodEntry + 14, // 7: GoodsInfo.goods:type_name -> GoodsInfo.GoodsEntry 1, // 8: DBCaravan.ItemsEntry.value:type_name -> BagInfo 0, // 9: DBCaravan.CityEntry.value:type_name -> CityInfo 4, // 10: DBCaravan.AllgoodsEntry.value:type_name -> GoodsInfo @@ -792,6 +918,18 @@ func file_caravan_caravan_db_proto_init() { } } file_caravan_caravan_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBCaravanRank); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_caravan_caravan_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CaravanRankInfo); i { case 0: return &v.state @@ -810,7 +948,7 @@ func file_caravan_caravan_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_caravan_caravan_db_proto_rawDesc, NumEnums: 0, - NumMessages: 14, + NumMessages: 15, NumExtensions: 0, NumServices: 0, }, From d42497f2ea583c91809d617b75531a4ca0985e67 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 10 Oct 2023 14:37:52 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/caravan/comp_configure.go | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/modules/caravan/comp_configure.go b/modules/caravan/comp_configure.go index 20f0050c3..60276daf2 100644 --- a/modules/caravan/comp_configure.go +++ b/modules/caravan/comp_configure.go @@ -24,10 +24,9 @@ const ( // /配置管理基础组件 type configureComp struct { modules.MCompConfigure - module *Caravan - lock sync.RWMutex - event map[int32][]*cfg.GameCaravanEventData - overflow int32 + module *Caravan + lock sync.RWMutex + event map[int32][]*cfg.GameCaravanEventData } // 组件初始化接口 @@ -50,16 +49,6 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp } this.lock.Unlock() }) - configure.RegisterConfigure(game_caravan_reward, cfg.NewGameCaravanReward, func() { - if v, err := this.GetConfigure(game_caravan_reward); err == nil { - for _, v := range v.(*cfg.GameCaravanReward).GetDataList() { - if v.Key < 0 { - this.overflow = v.Id - return - } - } - } - }) return } @@ -229,12 +218,14 @@ func (this *configureComp) GetCaravanMoreReward() (reward *cfg.GameCaravanReward ) if v, err = this.GetConfigure(game_caravan_reward); err == nil { if configure, ok := v.(*cfg.GameCaravanReward); ok { - if reward = configure.Get(this.overflow); err == nil { - return + for _, reward = range configure.GetDataList() { + if reward.Key < 0 { + return + } } } } - err = comm.NewNotFoundConfErr(moduleName, game_caravan_reward, this.overflow) + err = comm.NewNotFoundConfErr(moduleName, game_caravan_reward, "") return } From bbc07a95d1ff5a48965c0f0689616f99ba446132 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 10 Oct 2023 14:39:12 +0800 Subject: [PATCH 8/8] =?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_arenachallengenpc.json | 12 ++ bin/json/game_battleready.json | 20 +-- bin/json/game_buriedcondi.json | 4 +- bin/json/game_gm.json | 8 +- bin/json/game_item.json | 158 ++++++++-------- bin/json/game_loading.json | 112 +++++++++++- bin/json/game_mainstage.json | 77 +++++++- bin/json/game_mainventure.json | 168 ++++++++++++++++++ bin/json/game_monsterformat.json | 14 +- bin/json/game_skillafteratk.json | 159 +++++++++++++++-- bin/json/game_skillatk.json | 16 +- bin/json/game_skillpassive.json | 160 +++++++++++++++++ bin/json/game_stoneevent.json | 2 +- bin/json/game_stonetalent.json | 78 ++++---- bin/json/game_worldtask.json | 37 ++-- .../structs/Game.ArenaChallengeNpcData.go | 2 + 16 files changed, 847 insertions(+), 180 deletions(-) diff --git a/bin/json/game_arenachallengenpc.json b/bin/json/game_arenachallengenpc.json index ccf3a5416..0a00db33d 100644 --- a/bin/json/game_arenachallengenpc.json +++ b/bin/json/game_arenachallengenpc.json @@ -3,6 +3,7 @@ "id": 1, "open_cond": 1, "open_value": 6, + "afterid": 0, "BattleReadyID": 110, "monsterformat_id": [ 800005 @@ -38,6 +39,7 @@ "id": 2, "open_cond": 1, "open_value": 8, + "afterid": 1, "BattleReadyID": 110, "monsterformat_id": [ 800006 @@ -73,6 +75,7 @@ "id": 3, "open_cond": 1, "open_value": 10, + "afterid": 2, "BattleReadyID": 110, "monsterformat_id": [ 800007 @@ -108,6 +111,7 @@ "id": 4, "open_cond": 1, "open_value": 12, + "afterid": 3, "BattleReadyID": 110, "monsterformat_id": [ 800008 @@ -143,6 +147,7 @@ "id": 5, "open_cond": 1, "open_value": 14, + "afterid": 4, "BattleReadyID": 110, "monsterformat_id": [ 801005 @@ -178,6 +183,7 @@ "id": 6, "open_cond": 1, "open_value": 16, + "afterid": 5, "BattleReadyID": 110, "monsterformat_id": [ 801006 @@ -213,6 +219,7 @@ "id": 7, "open_cond": 1, "open_value": 18, + "afterid": 6, "BattleReadyID": 110, "monsterformat_id": [ 801007 @@ -248,6 +255,7 @@ "id": 8, "open_cond": 1, "open_value": 20, + "afterid": 7, "BattleReadyID": 110, "monsterformat_id": [ 801008 @@ -283,6 +291,7 @@ "id": 9, "open_cond": 1, "open_value": 22, + "afterid": 8, "BattleReadyID": 110, "monsterformat_id": [ 802005 @@ -318,6 +327,7 @@ "id": 10, "open_cond": 1, "open_value": 24, + "afterid": 9, "BattleReadyID": 110, "monsterformat_id": [ 802006 @@ -353,6 +363,7 @@ "id": 11, "open_cond": 1, "open_value": 27, + "afterid": 10, "BattleReadyID": 110, "monsterformat_id": [ 802007 @@ -388,6 +399,7 @@ "id": 12, "open_cond": 1, "open_value": 30, + "afterid": 11, "BattleReadyID": 110, "monsterformat_id": [ 802008 diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index 4b6286aa0..7b8d43743 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -1655,7 +1655,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": 1, "Numrounds": 0 }, { @@ -1689,7 +1689,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": 1, "Numrounds": 0 }, { @@ -1725,7 +1725,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": 1, "Numrounds": 0 }, { @@ -1759,7 +1759,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": 1, "Numrounds": 0 }, { @@ -1793,7 +1793,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": 1, "Numrounds": 0 }, { @@ -2010,7 +2010,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": 1, "Numrounds": 0 }, { @@ -2046,7 +2046,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": 1, "Numrounds": 0 }, { @@ -2082,7 +2082,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": 1, "Numrounds": 0 }, { @@ -2118,7 +2118,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": 1, "Numrounds": 0 }, { @@ -2152,7 +2152,7 @@ "HeroCheck": [], "RedAssistTeam": 0, "BlueAssistTeam": 0, - "CanFriendHelp": 0, + "CanFriendHelp": 1, "Numrounds": 0 }, { diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index e24957560..82d9d6ea4 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -14345,7 +14345,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_494", - "text": "击败阴影战士，收集宝箱碎片即可过关！" + "text": "击败阴影战士！" }, "type": 187, "valid": 0, @@ -14377,7 +14377,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_495", - "text": "搜集{1}{0}个，有完美通关奖励！" + "text": "搜集{0}/{1}个碎片，有完美通关奖励！" }, "type": 187, "valid": 0, diff --git a/bin/json/game_gm.json b/bin/json/game_gm.json index ffeb58533..b5783444a 100644 --- a/bin/json/game_gm.json +++ b/bin/json/game_gm.json @@ -134,10 +134,10 @@ "type": 1, "text": { "key": "GM_GM_text_14", - "text": "充值几次648（填数量）" + "text": "代金券发放1000（填次数）" }, "data": "1", - "prefix": "bingo:recharge,{0}" + "prefix": "bingo:item,10000035,1000" }, { "id": 15, @@ -236,7 +236,7 @@ "key": "GM_GM_text_25", "text": "跳到主线关卡XX关（填关卡Id）" }, - "data": "1100144", + "data": "1100545", "prefix": "bingo:mainline,{0}" }, { @@ -256,7 +256,7 @@ "key": "GM_GM_text_28", "text": "跳到世界任务XX任务（任务id）" }, - "data": "20230", + "data": "21190", "prefix": "bingo:worldtask,{0}" }, { diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 6c58b7d4a..ee587fbf3 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -13069,8 +13069,8 @@ "text": "旧时光用，进度表示道具。" }, "describe": { - "key": "item_item_describe_264", - "text": "旧时光用，进度表示道具。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_262", @@ -13117,8 +13117,8 @@ "text": "旧时光用，测试道具2。" }, "describe": { - "key": "item_item_describe_265", - "text": "旧时光用，测试道具2。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_263", @@ -13165,8 +13165,8 @@ "text": "旧时光用，测试道具3。" }, "describe": { - "key": "item_item_describe_266", - "text": "旧时光用，测试道具3。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_264", @@ -13213,8 +13213,8 @@ "text": "旧时光用，测试道具4。" }, "describe": { - "key": "item_item_describe_267", - "text": "旧时光用，测试道具4。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_265", @@ -13261,8 +13261,8 @@ "text": "旧时光用，测试道具5。" }, "describe": { - "key": "item_item_describe_268", - "text": "旧时光用，测试道具5。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_266", @@ -13309,8 +13309,8 @@ "text": "旧时光用，测试道具6。" }, "describe": { - "key": "item_item_describe_269", - "text": "旧时光用，测试道具6。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_267", @@ -13357,8 +13357,8 @@ "text": "旧时光用，测试道具7。" }, "describe": { - "key": "item_item_describe_270", - "text": "旧时光用，测试道具7。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_268", @@ -13405,8 +13405,8 @@ "text": "旧时光用，测试道具8。" }, "describe": { - "key": "item_item_describe_271", - "text": "旧时光用，测试道具8。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_269", @@ -13453,8 +13453,8 @@ "text": "旧时光用，测试道具9。" }, "describe": { - "key": "item_item_describe_272", - "text": "旧时光用，测试道具9。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_270", @@ -13501,8 +13501,8 @@ "text": "旧时光用，测试道具10。" }, "describe": { - "key": "item_item_describe_273", - "text": "旧时光用，测试道具10。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_271", @@ -13549,8 +13549,8 @@ "text": "旧时光用，测试道具11。" }, "describe": { - "key": "item_item_describe_274", - "text": "旧时光用，测试道具11。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_272", @@ -13597,8 +13597,8 @@ "text": "旧时光用，测试道具12。" }, "describe": { - "key": "item_item_describe_275", - "text": "旧时光用，测试道具12。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_273", @@ -13645,8 +13645,8 @@ "text": "旧时光用，测试道具13。" }, "describe": { - "key": "item_item_describe_276", - "text": "旧时光用，测试道具13。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_274", @@ -13693,8 +13693,8 @@ "text": "旧时光用，测试道具14。" }, "describe": { - "key": "item_item_describe_277", - "text": "旧时光用，测试道具14。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_275", @@ -13741,8 +13741,8 @@ "text": "旧时光用，测试道具15。" }, "describe": { - "key": "item_item_describe_278", - "text": "旧时光用，测试道具15。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_276", @@ -13789,8 +13789,8 @@ "text": "旧时光用，测试道具16。" }, "describe": { - "key": "item_item_describe_279", - "text": "旧时光用，测试道具16。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_277", @@ -13837,8 +13837,8 @@ "text": "旧时光用，测试道具17。" }, "describe": { - "key": "item_item_describe_280", - "text": "旧时光用，测试道具17。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_278", @@ -13885,8 +13885,8 @@ "text": "旧时光用，测试道具18。" }, "describe": { - "key": "item_item_describe_281", - "text": "旧时光用，测试道具18。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_279", @@ -13933,8 +13933,8 @@ "text": "旧时光用，测试道具19。" }, "describe": { - "key": "item_item_describe_282", - "text": "旧时光用，测试道具19。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_280", @@ -13981,8 +13981,8 @@ "text": "旧时光用，测试道具20。" }, "describe": { - "key": "item_item_describe_283", - "text": "旧时光用，测试道具20。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_281", @@ -14029,8 +14029,8 @@ "text": "旧时光用，测试道具21。" }, "describe": { - "key": "item_item_describe_284", - "text": "旧时光用，测试道具21。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_282", @@ -14077,8 +14077,8 @@ "text": "旧时光用，测试道具22。" }, "describe": { - "key": "item_item_describe_285", - "text": "旧时光用，测试道具22。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_283", @@ -14125,8 +14125,8 @@ "text": "旧时光用，测试道具23。" }, "describe": { - "key": "item_item_describe_286", - "text": "旧时光用，测试道具23。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_284", @@ -14173,8 +14173,8 @@ "text": "旧时光用，测试道具24。" }, "describe": { - "key": "item_item_describe_287", - "text": "旧时光用，测试道具24。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_285", @@ -14221,8 +14221,8 @@ "text": "旧时光用，测试道具25。" }, "describe": { - "key": "item_item_describe_288", - "text": "旧时光用，测试道具25。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_286", @@ -14269,8 +14269,8 @@ "text": "旧时光用，测试道具26。" }, "describe": { - "key": "item_item_describe_289", - "text": "旧时光用，测试道具26。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_287", @@ -14317,8 +14317,8 @@ "text": "旧时光用，测试道具27。" }, "describe": { - "key": "item_item_describe_290", - "text": "旧时光用，测试道具27。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_288", @@ -14365,8 +14365,8 @@ "text": "旧时光用，测试道具28。" }, "describe": { - "key": "item_item_describe_291", - "text": "旧时光用，测试道具28。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_289", @@ -14413,8 +14413,8 @@ "text": "旧时光用，测试道具29。" }, "describe": { - "key": "item_item_describe_292", - "text": "旧时光用，测试道具29。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_290", @@ -14461,8 +14461,8 @@ "text": "旧时光用，测试道具30。" }, "describe": { - "key": "item_item_describe_293", - "text": "旧时光用，测试道具30。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_291", @@ -14509,8 +14509,8 @@ "text": "旧时光用，测试道具31。" }, "describe": { - "key": "item_item_describe_294", - "text": "旧时光用，测试道具31。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_292", @@ -14557,8 +14557,8 @@ "text": "旧时光用，测试道具32。" }, "describe": { - "key": "item_item_describe_295", - "text": "旧时光用，测试道具32。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_293", @@ -14605,8 +14605,8 @@ "text": "旧时光用，测试道具33。" }, "describe": { - "key": "item_item_describe_296", - "text": "旧时光用，测试道具33。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_294", @@ -14653,8 +14653,8 @@ "text": "旧时光用，测试道具34。" }, "describe": { - "key": "item_item_describe_297", - "text": "旧时光用，测试道具34。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_295", @@ -14701,8 +14701,8 @@ "text": "旧时光用，测试道具35。" }, "describe": { - "key": "item_item_describe_298", - "text": "旧时光用，测试道具35。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_296", @@ -14749,8 +14749,8 @@ "text": "旧时光用，测试道具36。" }, "describe": { - "key": "item_item_describe_299", - "text": "旧时光用，测试道具36。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_297", @@ -14797,8 +14797,8 @@ "text": "旧时光用，测试道具37。" }, "describe": { - "key": "item_item_describe_300", - "text": "旧时光用，测试道具37。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_298", @@ -14845,8 +14845,8 @@ "text": "旧时光用，测试道具38。" }, "describe": { - "key": "item_item_describe_301", - "text": "旧时光用，测试道具38。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_299", @@ -14893,8 +14893,8 @@ "text": "旧时光用，测试道具39。" }, "describe": { - "key": "item_item_describe_302", - "text": "旧时光用，测试道具39。" + "key": "", + "text": "" }, "dialogue": { "key": "item_item_dialogue_300", @@ -19171,7 +19171,7 @@ }, "usetype": 2, "color": 2, - "bagtype": 1, + "bagtype": 0, "index": 1, "special_type": 0, "time": 0, diff --git a/bin/json/game_loading.json b/bin/json/game_loading.json index f27942a2c..7ee61288d 100644 --- a/bin/json/game_loading.json +++ b/bin/json/game_loading.json @@ -52,7 +52,7 @@ { "id": 1006, "scene": "GuildScene", - "image": "ld_5v5_bg1", + "image": "ld_mh_gh", "icon": "loading_icon_gh", "prompt": { "key": "loading_Sheet1_prompt_6", @@ -188,5 +188,115 @@ "key": "loading_Sheet1_prompt_19", "text": "波比的花园需要记得每周浇灌哦。" } + }, + { + "id": 1020, + "scene": "WorldMapScene", + "image": "ld_mh_bg_fc", + "icon": "loading_icon_fc", + "prompt": { + "key": "loading_Sheet1_prompt_20", + "text": "波比的花园需要记得每周浇灌哦。" + } + }, + { + "id": 1021, + "scene": "WorldMapScene", + "image": "ld_mh_bg_fc", + "icon": "loading_icon_fc", + "prompt": { + "key": "loading_Sheet1_prompt_21", + "text": "波比的花园需要记得每周浇灌哦。" + } + }, + { + "id": 1022, + "scene": "WorldMapScene", + "image": "ld_mh_bg_fc", + "icon": "loading_icon_fc", + "prompt": { + "key": "loading_Sheet1_prompt_22", + "text": "波比的花园需要记得每周浇灌哦。" + } + }, + { + "id": 1023, + "scene": "WorldMapScene", + "image": "ld_mh_bg_fc", + "icon": "loading_icon_fc", + "prompt": { + "key": "loading_Sheet1_prompt_23", + "text": "波比的花园需要记得每周浇灌哦。" + } + }, + { + "id": 1024, + "scene": "WorldMapScene", + "image": "ld_mh_bg_fc", + "icon": "loading_icon_fc", + "prompt": { + "key": "loading_Sheet1_prompt_24", + "text": "波比的花园需要记得每周浇灌哦。" + } + }, + { + "id": 1025, + "scene": "WorldMapScene", + "image": "ld_mh_bg_fc", + "icon": "loading_icon_fc", + "prompt": { + "key": "loading_Sheet1_prompt_25", + "text": "波比的花园需要记得每周浇灌哦。" + } + }, + { + "id": 1026, + "scene": "WorldMapScene", + "image": "ld_mh_bg_fc", + "icon": "loading_icon_fc", + "prompt": { + "key": "loading_Sheet1_prompt_26", + "text": "波比的花园需要记得每周浇灌哦。" + } + }, + { + "id": 1027, + "scene": "WorldMapScene", + "image": "ld_mh_bg_fc", + "icon": "loading_icon_fc", + "prompt": { + "key": "loading_Sheet1_prompt_27", + "text": "波比的花园需要记得每周浇灌哦。" + } + }, + { + "id": 1028, + "scene": "WorldMapScene", + "image": "ld_mh_bg_fc", + "icon": "loading_icon_fc", + "prompt": { + "key": "loading_Sheet1_prompt_28", + "text": "波比的花园需要记得每周浇灌哦。" + } + }, + { + "id": 1029, + "scene": "WorldMapScene", + "image": "ld_mh_bg_fc", + "icon": "loading_icon_fc", + "prompt": { + "key": "loading_Sheet1_prompt_29", + "text": "波比的花园需要记得每周浇灌哦。" + } + }, + { + "id": 1030, + "scene": "WorldMapScene", + "image": "ld_mh_bg_fc", + "icon": "loading_icon_fc", + "prompt": { + "key": "loading_Sheet1_prompt_30", + "text": "波比的花园需要记得每周浇灌哦。" + } } ] \ No newline at end of file diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 1216e57b7..ec7f2fc51 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -2980,6 +2980,77 @@ ], "challengeward": 0 }, + { + "id": 1100134, + "chapterid": 11001, + "group_id": 100132, + "previous_group_id": [ + 100130 + ], + "previoustage": 0, + "Episodetype": 3, + "stage_param": 0, + "battle_fail": 0, + "venturemodelspeed": 0, + "venturemodelscale": 0, + "move_type": 0, + "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, + "venturetype": 0, + "ventureavatar": [], + "scene_effect": [], + "scene_effectfilter": "", + "is_near": 0, + "openlevel": 1, + "EditorStage": 0, + "herocolor": 0, + "heroimg": "zxgq_qp_icon_gth", + "bubbletext": { + "key": "main_stage_bubbletext_32", + "text": "想来一场紧张刺激的捕羊大赛吗" + }, + "animation": [], + "hide": 0, + "destroy": 0, + "progress": 0, + "stroyshow": 0, + "frontstoryid": 200500, + "afterstoryid": 0, + "maingroupName": { + "key": "", + "text": "" + }, + "mainlineName": { + "key": "", + "text": "" + }, + "title": { + "key": "", + "text": "" + }, + "desc": { + "key": "", + "text": "" + }, + "exp": 0, + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], + "helphero": [], + "banhero": [], + "star": [], + "star_type": [], + "star_value": [], + "challengeward": 0 + }, { "id": 1100200, "chapterid": 11002, @@ -14032,7 +14103,7 @@ "chapterid": 11005, "group_id": 100500, "previous_group_id": [ - 100413 + 100500 ], "previoustage": 0, "Episodetype": 0, @@ -14151,7 +14222,7 @@ "chapterid": 11005, "group_id": 100501, "previous_group_id": [ - 100413 + 100500 ], "previoustage": 0, "Episodetype": 1, @@ -14270,7 +14341,7 @@ "chapterid": 11005, "group_id": 100502, "previous_group_id": [ - 100413 + 100500 ], "previoustage": 0, "Episodetype": 1, diff --git a/bin/json/game_mainventure.json b/bin/json/game_mainventure.json index ff5374759..434917a2f 100644 --- a/bin/json/game_mainventure.json +++ b/bin/json/game_mainventure.json @@ -58,5 +58,173 @@ "jumpidList": [ 10045 ] + }, + { + "chapterid": 11002, + "pos": 0, + "venturetext": { + "key": "mainchapter_main_venture_venturetext_7", + "text": "章节成就" + }, + "jumpidList": [] + }, + { + "chapterid": 11002, + "pos": 1, + "venturetext": { + "key": "mainchapter_main_venture_venturetext_8", + "text": "待定关卡" + }, + "jumpidList": [] + }, + { + "chapterid": 11002, + "pos": 2, + "venturetext": { + "key": "mainchapter_main_venture_venturetext_9", + "text": "精英关卡" + }, + "jumpidList": [] + }, + { + "chapterid": 11002, + "pos": 3, + "venturetext": { + "key": "mainchapter_main_venture_venturetext_10", + "text": "待定关卡" + }, + "jumpidList": [] + }, + { + "chapterid": 11002, + "pos": 4, + "venturetext": { + "key": "mainchapter_main_venture_venturetext_11", + "text": "待定关卡" + }, + "jumpidList": [] + }, + { + "chapterid": 11002, + "pos": 5, + "venturetext": { + "key": "mainchapter_main_venture_venturetext_12", + "text": "石阵秘境" + }, + "jumpidList": [ + 10027 + ] + }, + { + "chapterid": 11003, + "pos": 0, + "venturetext": { + "key": "mainchapter_main_venture_venturetext_13", + "text": "章节成就" + }, + "jumpidList": [ + 10044 + ] + }, + { + "chapterid": 11003, + "pos": 1, + "venturetext": { + "key": "mainchapter_main_venture_venturetext_14", + "text": "待定关卡" + }, + "jumpidList": [] + }, + { + "chapterid": 11003, + "pos": 2, + "venturetext": { + "key": "mainchapter_main_venture_venturetext_15", + "text": "精英关卡" + }, + "jumpidList": [] + }, + { + "chapterid": 11003, + "pos": 3, + "venturetext": { + "key": "mainchapter_main_venture_venturetext_16", + "text": "待定关卡" + }, + "jumpidList": [] + }, + { + "chapterid": 11003, + "pos": 4, + "venturetext": { + "key": "mainchapter_main_venture_venturetext_17", + "text": "待定关卡" + }, + "jumpidList": [] + }, + { + "chapterid": 11003, + "pos": 5, + "venturetext": { + "key": "mainchapter_main_venture_venturetext_18", + "text": "待定关卡" + }, + "jumpidList": [] + }, + { + "chapterid": 11004, + "pos": 0, + "venturetext": { + "key": "mainchapter_main_venture_venturetext_19", + "text": "章节成就" + }, + "jumpidList": [ + 10044 + ] + }, + { + "chapterid": 11004, + "pos": 1, + "venturetext": { + "key": "mainchapter_main_venture_venturetext_20", + "text": "待定关卡" + }, + "jumpidList": [] + }, + { + "chapterid": 11004, + "pos": 2, + "venturetext": { + "key": "mainchapter_main_venture_venturetext_21", + "text": "精英关卡" + }, + "jumpidList": [] + }, + { + "chapterid": 11004, + "pos": 3, + "venturetext": { + "key": "mainchapter_main_venture_venturetext_22", + "text": "待定关卡" + }, + "jumpidList": [] + }, + { + "chapterid": 11004, + "pos": 4, + "venturetext": { + "key": "mainchapter_main_venture_venturetext_23", + "text": "待定关卡" + }, + "jumpidList": [] + }, + { + "chapterid": 11004, + "pos": 5, + "venturetext": { + "key": "mainchapter_main_venture_venturetext_24", + "text": "待定关卡" + }, + "jumpidList": [] } ] \ No newline at end of file diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index d2d43ce18..d37a22ea3 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -238409,7 +238409,7 @@ "captainId": 1, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 13003, + "heroid": 34007, "star": 3, "equip": [], "newskill": [], @@ -238509,7 +238509,7 @@ "captainId": 1, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 13003, + "heroid": 23004, "star": 3, "equip": [], "newskill": [], @@ -238589,7 +238589,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 43003, + "heroid": 34007, "star": 3, "equip": [], "newskill": [], @@ -238809,7 +238809,7 @@ "captainId": 1, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 13003, + "heroid": 34007, "star": 3, "equip": [], "newskill": [], @@ -239149,7 +239149,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 13004, + "heroid": 34007, "star": 3, "equip": [], "newskill": [], @@ -239909,7 +239909,7 @@ "captainId": 1, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 13001, + "heroid": 34007, "star": 4, "equip": [], "newskill": [], @@ -240029,7 +240029,7 @@ "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 43003, + "heroid": 34007, "star": 4, "equip": [], "newskill": [], diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 0c6b44ccb..83c629e53 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -24008,7 +24008,6 @@ 3200 ], "FollowSK": [ - 215002112, 215002113 ], "SucFollowSK": [], @@ -50819,7 +50818,7 @@ "ExecuteCnt": 1, "Type": 2, "Argu": [ - 425004311, + 482500421, -1, -1 ], @@ -50903,6 +50902,29 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 825004216, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 482500423, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 835002211, "EmitPR": 1000, @@ -51149,7 +51171,7 @@ 390001003, 1000, 1, - 1 + 2 ], "FollowSK": [], "SucFollowSK": [], @@ -51183,6 +51205,52 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 824003215, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 482400322, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 824003216, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 482400323, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 834006211, "EmitPR": 1000, @@ -51348,19 +51416,18 @@ "RevisiParams": [] }, { - "Id": 834006311, - "EmitPR": 300, + "Id": 834006218, + "EmitPR": 1000, "From": 3, "Where": [], "Order": "", "Limit": 10, "ExecuteCnt": 1, - "Type": 3, + "Type": 2, "Argu": [ - 390001004, - 1000, - 1, - 2 + 483400624, + -1, + -1 ], "FollowSK": [], "SucFollowSK": [], @@ -51487,6 +51554,29 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 825001216, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 482500123, + -1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 844005211, "EmitPR": 1000, @@ -51607,6 +51697,29 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 844005217, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 484400523, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 835001211, "EmitPR": 1000, @@ -55124,11 +55237,12 @@ "From": 4, "Where": [], "Order": "", - "Limit": 10, + "Limit": 1, "ExecuteCnt": 1, "Type": 33, "Argu": [ 3, + 1, 1 ], "FollowSK": [], @@ -55140,6 +55254,29 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 815002112, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 481500211, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 815002211, "EmitPR": 1000, diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 2bab06350..101b206ab 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -18753,7 +18753,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_115002111_1", - "text": "船长对敌方1个目标造成320%伤害，夺取该目标1个增益状态，并有100%概率为自身附加2回合[color=#37d8a9]攻击提升[/color]状态。" + "text": "船长对敌方1个目标造成320%伤害，并有100%概率为自身附加2回合[color=#37d8a9]攻击提升[/color]状态。" }, "buffid": [ 390001001 @@ -40897,7 +40897,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 824003213 + 824003215 ] }, "passSkill": [], @@ -40927,7 +40927,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 824003214 + 824003216 ] }, "passSkill": [], @@ -42008,10 +42008,12 @@ "Target": 0, "ChildSkill": { "Id": [ - 825004215 + 825004216 ] }, - "passSkill": [], + "passSkill": [ + 825004216 + ], "Desc": { "key": "skill_skill_atk_Desc_825004423_1", "text": "2技能平衡血量后立即回复所有目标15%血量" @@ -43271,7 +43273,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 834006217 + 834006218 ] }, "passSkill": [], @@ -45795,7 +45797,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 844005216 + 844005217 ] }, "passSkill": [], diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 922651382..58775b924 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -8917,5 +8917,165 @@ "Callback": [ 913003320 ] + }, + { + "Id": 481500211, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=1", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 815002111 + ] + }, + { + "Id": 482500431, + "When": 16, + "FromCheck": "Target=3,Hpproless=1000", + "TargetCheck": "", + "MainSkillCheck": "", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 825004212 + ] + }, + { + "Id": 482500423, + "When": 20, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=2", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 825004215 + ] + }, + { + "Id": 482400322, + "When": 20, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=2", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 824003213 + ] + }, + { + "Id": 482400323, + "When": 20, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=2", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 824003214 + ] + }, + { + "Id": 483400624, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=3", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 1, + "Callback": [ + 834006217 + ] + }, + { + "Id": 482500123, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=2", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 1, + "Callback": [ + 825001213 + ] + }, + { + "Id": 484400523, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "SkillPos=2", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 1, + "Callback": [ + 844005216 + ] } ] \ No newline at end of file diff --git a/bin/json/game_stoneevent.json b/bin/json/game_stoneevent.json index aa12039a7..a77e13ef6 100644 --- a/bin/json/game_stoneevent.json +++ b/bin/json/game_stoneevent.json @@ -292,7 +292,7 @@ "EventType": 17, "EventResource": "event_rewardbox_2", "Value1": 200, - "Value2": 3, + "Value2": 5, "Value3": 0, "Value4": 0, "CostItem": [], diff --git a/bin/json/game_stonetalent.json b/bin/json/game_stonetalent.json index 0bee7bdb1..acfec1bed 100644 --- a/bin/json/game_stonetalent.json +++ b/bin/json/game_stonetalent.json @@ -7,7 +7,7 @@ "Front": [], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 100 } @@ -38,7 +38,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 50 } @@ -65,7 +65,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 50 } @@ -93,7 +93,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 200 } @@ -115,7 +115,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 100 } @@ -142,7 +142,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 100 } @@ -170,7 +170,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 300 } @@ -192,7 +192,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 150 } @@ -219,7 +219,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 150 } @@ -247,7 +247,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 400 } @@ -269,7 +269,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 200 } @@ -296,7 +296,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 200 } @@ -324,7 +324,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 500 } @@ -346,7 +346,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 250 } @@ -373,7 +373,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 250 } @@ -401,7 +401,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 600 } @@ -423,7 +423,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 300 } @@ -450,7 +450,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 300 } @@ -478,7 +478,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 800 } @@ -500,7 +500,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 400 } @@ -527,7 +527,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 400 } @@ -555,7 +555,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 1000 } @@ -577,7 +577,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 500 } @@ -604,7 +604,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 500 } @@ -632,7 +632,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 1500 } @@ -663,7 +663,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 750 } @@ -690,7 +690,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 750 } @@ -717,7 +717,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 750 } @@ -744,7 +744,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 750 } @@ -771,7 +771,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 750 } @@ -798,7 +798,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 750 } @@ -826,7 +826,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 2000 } @@ -848,7 +848,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 1000 } @@ -875,7 +875,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 1000 } @@ -902,7 +902,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 1000 } @@ -929,7 +929,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 1000 } @@ -956,7 +956,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 1000 } @@ -983,7 +983,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 1000 } @@ -1011,7 +1011,7 @@ ], "CostItem": [ { - "a": "atn", + "a": "item", "t": "10000037", "n": 2000 } diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index c93c2289a..538eb26fd 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -48,6 +48,11 @@ "a": "attr", "t": "diamond", "n": 20 + }, + { + "a": "title", + "t": "10001", + "n": 1 } ], "module": [] @@ -913,7 +918,7 @@ }, { "key": 20130, - "opencond": "", + "opencond": "sss", "lock": 1, "lockend": 999, "ontxe": 20128, @@ -5537,7 +5542,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20270, + "ontxe": 20250, "id_after": 0, "group": 301, "exgroup": 310, @@ -5578,7 +5583,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20280, + "ontxe": 20250, "id_after": 300050, "group": 302, "exgroup": 310, @@ -5871,7 +5876,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20280, + "ontxe": 20250, "id_after": 0, "group": 320, "exgroup": 310, @@ -5914,7 +5919,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20370, + "ontxe": 20250, "id_after": 0, "group": 320, "exgroup": 310, @@ -5957,7 +5962,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20230, + "ontxe": 20250, "id_after": 0, "group": 320, "exgroup": 310, @@ -5998,7 +6003,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20370, + "ontxe": 20250, "id_after": 0, "group": 320, "exgroup": 310, @@ -6209,7 +6214,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20290, + "ontxe": 20250, "id_after": 0, "group": 320, "exgroup": 310, @@ -6250,7 +6255,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20300, + "ontxe": 20250, "id_after": 0, "group": 320, "exgroup": 310, @@ -6291,7 +6296,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20370, + "ontxe": 20250, "id_after": 0, "group": 320, "exgroup": 310, @@ -6332,7 +6337,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20370, + "ontxe": 20250, "id_after": 0, "group": 320, "exgroup": 310, @@ -6373,7 +6378,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20370, + "ontxe": 20250, "id_after": 0, "group": 320, "exgroup": 310, @@ -6414,7 +6419,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20370, + "ontxe": 20250, "id_after": 320231, "group": 320, "exgroup": 310, @@ -6496,7 +6501,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20370, + "ontxe": 20250, "id_after": 0, "group": 320, "exgroup": 310, @@ -6537,7 +6542,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20370, + "ontxe": 20250, "id_after": 0, "group": 320, "exgroup": 310, @@ -6578,7 +6583,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20370, + "ontxe": 20250, "id_after": 0, "group": 320, "exgroup": 310, diff --git a/sys/configure/structs/Game.ArenaChallengeNpcData.go b/sys/configure/structs/Game.ArenaChallengeNpcData.go index f2a5b7521..362858a3c 100644 --- a/sys/configure/structs/Game.ArenaChallengeNpcData.go +++ b/sys/configure/structs/Game.ArenaChallengeNpcData.go @@ -14,6 +14,7 @@ type GameArenaChallengeNpcData struct { Id int32 OpenCond int32 OpenValue int32 + Afterid int32 BattleReadyID int32 MonsterformatId []int32 StroyIdFront int32 @@ -34,6 +35,7 @@ func (_v *GameArenaChallengeNpcData)Deserialize(_buf map[string]interface{}) (er { 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["open_cond"].(float64); !_ok_ { err = errors.New("open_cond error"); return }; _v.OpenCond = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["open_value"].(float64); !_ok_ { err = errors.New("open_value error"); return }; _v.OpenValue = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["afterid"].(float64); !_ok_ { err = errors.New("afterid error"); return }; _v.Afterid = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) } { var _arr_ []interface{}