From 84e96db42dcff968fbefa7ea5138fe794c56f666 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 7 Sep 2023 14:17:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=A1=A5=E7=BE=8A?= =?UTF-8?q?=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/robot.txt | 23 ---- bin/robot001.txt | 22 +++ modules/capturesheep/api_matche.go | 12 ++ modules/capturesheep/api_over.go | 61 +++++++-- modules/capturesheep/configure.go | 56 +++++--- modules/capturesheep/modelCaptureSheep.go | 49 ------- modules/capturesheep/modelrank.go | 125 ------------------ modules/capturesheep/module.go | 2 - pb/capturesheep_db.pb.go | 112 +++++++++------- pb/capturesheep_msg.pb.go | 123 +++++++++++------ pb/errorcode.pb.go | 12 +- sys/configure/structs/Game.BuffType.go | 1 + .../structs/Game.BuzkashiMountData.go | 6 +- sys/configure/structs/Game.DragonPlayData.go | 2 + sys/configure/structs/Tables.go | 7 - 15 files changed, 283 insertions(+), 330 deletions(-) delete mode 100644 bin/robot.txt create mode 100644 bin/robot001.txt delete mode 100644 modules/capturesheep/modelrank.go diff --git a/bin/robot.txt b/bin/robot.txt deleted file mode 100644 index ddec176fa..000000000 --- a/bin/robot.txt +++ /dev/null @@ -1,23 +0,0 @@ -机器人总数: 1 -成功数量: 1 -失败数量: 0 -消息总吞吐量: 46 ----消息压测详情---------------------------------------------------------------------------------------------------- -消息名:wtask.accept 请求次数:12 耗时最小:1 ms 耗时最大:5 ms 平均耗时:2.83 ms 中位耗时:3.00 ms -消息名:wtask.completecondi 请求次数:3 耗时最小:1 ms 耗时最大:5 ms 平均耗时:3.67 ms 中位耗时:5.00 ms -消息名:wtask.finish 请求次数:10 耗时最小:2 ms 耗时最大:19 ms 平均耗时:8.40 ms 中位耗时:9.00 ms -消息名:practice.practice 请求次数:1 耗时最小:6 ms 耗时最大:6 ms 平均耗时:6.00 ms 中位耗时:6.00 ms -消息名:mainline.info 请求次数:1 耗时最小:5 ms 耗时最大:5 ms 平均耗时:5.00 ms 中位耗时:5.00 ms -消息名:sys.funcgetlist 请求次数:1 耗时最小:21 ms 耗时最大:21 ms 平均耗时:21.00ms 中位耗时:21.00ms -消息名:equipment.getlist 请求次数:1 耗时最小:0 ms 耗时最大:0 ms 平均耗时:0.00 ms 中位耗时:0.00 ms -消息名:wtask.info 请求次数:1 耗时最小:0 ms 耗时最大:0 ms 平均耗时:0.00 ms 中位耗时:0.00 ms -消息名:wtask.battlefinish 请求次数:4 耗时最小:1 ms 耗时最大:9 ms 平均耗时:3.50 ms 中位耗时:2.00 ms -消息名:practice.info 请求次数:1 耗时最小:8 ms 耗时最大:8 ms 平均耗时:8.00 ms 中位耗时:8.00 ms -消息名:user.login 请求次数:1 耗时最小:586 ms 耗时最大:586 ms 平均耗时:586.00ms 中位耗时:586.00ms -消息名:user.create 请求次数:1 耗时最小:16 ms 耗时最大:16 ms 平均耗时:16.00ms 中位耗时:16.00ms -消息名:items.getlist 请求次数:1 耗时最小:0 ms 耗时最大:0 ms 平均耗时:0.00 ms 中位耗时:0.00 ms -消息名:sys.funcactivate 请求次数:1 耗时最小:3 ms 耗时最大:3 ms 平均耗时:3.00 ms 中位耗时:3.00 ms -消息名:hero.list 请求次数:1 耗时最小:1 ms 耗时最大:1 ms 平均耗时:1.00 ms 中位耗时:1.00 ms -消息名:hero.talentlist 请求次数:1 耗时最小:0 ms 耗时最大:0 ms 平均耗时:0.00 ms 中位耗时:0.00 ms -消息名:wtask.battlestart 请求次数:4 耗时最小:1 ms 耗时最大:4 ms 平均耗时:2.25 ms 中位耗时:2.00 ms -消息名:hero.drawcard 请求次数:1 耗时最小:15 ms 耗时最大:15 ms 平均耗时:15.00ms 中位耗时:15.00ms diff --git a/bin/robot001.txt b/bin/robot001.txt new file mode 100644 index 000000000..f8c7eff29 --- /dev/null +++ b/bin/robot001.txt @@ -0,0 +1,22 @@ +机器人总数: 100 +成功数量: 100 +失败数量: 0 +消息总吞吐量: 4209 +---消息压测详情---------------------------------------------------------------------------------------------------- +消息名:sys.funcgetlist 请求次数:99 耗时最小:225 ms 耗时最大:2054 ms 平均耗时:1159.22ms 中位耗时:1067.00ms +消息名:user.create 请求次数:100 耗时最小:15 ms 耗时最大:590 ms 平均耗时:227.31ms 中位耗时:193.00ms +消息名:hero.list 请求次数:99 耗时最小:26 ms 耗时最大:215 ms 平均耗时:65.18ms 中位耗时:53.00ms +消息名:equipment.getlist 请求次数:99 耗时最小:15 ms 耗时最大:53 ms 平均耗时:27.45ms 中位耗时:25.00ms +消息名:wtask.info 请求次数:99 耗时最小:22 ms 耗时最大:178 ms 平均耗时:70.98ms 中位耗时:64.00ms +消息名:wtask.battlestart 请求次数:396 耗时最小:15 ms 耗时最大:97 ms 平均耗时:34.66ms 中位耗时:29.00ms +消息名:wtask.battlefinish 请求次数:396 耗时最小:15 ms 耗时最大:482 ms 平均耗时:102.37ms 中位耗时:82.00ms +消息名:hero.drawcard 请求次数:99 耗时最小:66 ms 耗时最大:728 ms 平均耗时:328.85ms 中位耗时:295.00ms +消息名:practice.practice 请求次数:99 耗时最小:15 ms 耗时最大:43 ms 平均耗时:22.32ms 中位耗时:22.00ms +消息名:user.login 请求次数:100 耗时最小:177 ms 耗时最大:7431 ms 平均耗时:2092.23ms 中位耗时:1376.50ms +消息名:items.getlist 请求次数:99 耗时最小:22 ms 耗时最大:119 ms 平均耗时:53.21ms 中位耗时:50.00ms +消息名:wtask.completecondi 请求次数:297 耗时最小:23 ms 耗时最大:517 ms 平均耗时:63.37ms 中位耗时:39.00ms +消息名:wtask.finish 请求次数:792 耗时最小:34 ms 耗时最大:777 ms 平均耗时:174.03ms 中位耗时:142.00ms +消息名:practice.info 请求次数:99 耗时最小:19 ms 耗时最大:473 ms 平均耗时:57.72ms 中位耗时:36.00ms +消息名:hero.talentlist 请求次数:99 耗时最小:18 ms 耗时最大:66 ms 平均耗时:27.80ms 中位耗时:26.00ms +消息名:wtask.accept 请求次数:940 耗时最小:21 ms 耗时最大:314 ms 平均耗时:78.23ms 中位耗时:75.00ms +消息名:sys.funcactivate 请求次数:297 耗时最小:14 ms 耗时最大:470 ms 平均耗时:24.28ms 中位耗时:21.00ms diff --git a/modules/capturesheep/api_matche.go b/modules/capturesheep/api_matche.go index 2239a3ddd..2a0358073 100644 --- a/modules/capturesheep/api_matche.go +++ b/modules/capturesheep/api_matche.go @@ -26,6 +26,18 @@ func (this *apiComp) Matche(session comm.IUserSession, req *pb.CapturesheepMatch if errdata = this.MatcheCheck(session, req); errdata != nil { return } + + if req.Rtype == pb.CaptureSheepRaceType_ranked { + if !this.module.configure.isopen() { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_CapturesheepRankCloseed, + Title: pb.ErrorCode_CapturesheepRankCloseed.ToString(), + Message: "currTime is rank close", + } + return + } + } + if info, err = this.module.modelCaptureSheep.queryInfo(session.GetUserId()); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/modules/capturesheep/api_over.go b/modules/capturesheep/api_over.go index e169f38e7..50a9bc816 100644 --- a/modules/capturesheep/api_over.go +++ b/modules/capturesheep/api_over.go @@ -4,6 +4,7 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/mgo" "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" ) // 参数校验 @@ -17,8 +18,11 @@ func (this *apiComp) Over(session comm.IUserSession, req *pb.CapturesheepOverReq var ( redScores, blueScores int32 info *pb.DBCaptureSheep - selfMenber *pb.CaptureSheepRaceMember - otherMenber *pb.CaptureSheepRaceMember + conf *cfg.GameQualifyingData + isred bool + iswin bool + awards []*cfg.Gameatn + award []*pb.UserAtno err error ) @@ -33,25 +37,54 @@ func (this *apiComp) Over(session comm.IUserSession, req *pb.CapturesheepOverReq } return } + + if conf, err = this.module.configure.getActiveRewardById(info.Dan); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } for _, v := range req.Race.Redmember { redScores += v.Scores if v.Uid == session.GetUserId() { - selfMenber = v + isred = true } } for _, v := range req.Race.Bulemember { blueScores += v.Scores if v.Uid == session.GetUserId() { - selfMenber = v + isred = true } } - if redScores > blueScores { //红方胜利 - this.module.modelCaptureSheep.integralCompute(selfMenber, otherMenber, true) + if redScores > blueScores && isred { //红方胜利 + info.Integral += conf.WinValue + iswin = true + if req.Race.Rtype == pb.CaptureSheepRaceType_train { + awards = conf.MatewinReward + } else { + awards = conf.RankwinReward + } + + } else if redScores < blueScores && !isred { + info.Integral += conf.WinValue + iswin = true + if req.Race.Rtype == pb.CaptureSheepRaceType_train { + awards = conf.MatewinReward + } else { + awards = conf.RankwinReward + } } else { - this.module.modelCaptureSheep.integralCompute(selfMenber, otherMenber, false) + info.Integral += conf.FailValue + if req.Race.Rtype == pb.CaptureSheepRaceType_train { + awards = conf.MatefailReward + } else { + awards = conf.RankfailReward + } } - info.Integral = selfMenber.Integral + if info.Dan, err = this.module.modelCaptureSheep.computedan(info.Integral); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ConfigNoFound, @@ -60,6 +93,11 @@ func (this *apiComp) Over(session comm.IUserSession, req *pb.CapturesheepOverReq } return } + + if errdata, award = this.module.DispenseAtno(session, awards, true); errdata != nil { + return + } + if err = this.module.modelCaptureSheep.Change(session.GetUserId(), map[string]interface{}{ "integral": info.Integral, "dan": info.Dan, @@ -71,6 +109,11 @@ func (this *apiComp) Over(session comm.IUserSession, req *pb.CapturesheepOverReq } return } - session.SendMsg(string(this.module.GetType()), "info", &pb.CapturesheepOverResp{}) + session.SendMsg(string(this.module.GetType()), "info", &pb.CapturesheepOverResp{ + Iswin: iswin, + Integral: info.Integral, + Dan: info.Dan, + Award: award, + }) return } diff --git a/modules/capturesheep/configure.go b/modules/capturesheep/configure.go index bcdce854f..a27f686d3 100644 --- a/modules/capturesheep/configure.go +++ b/modules/capturesheep/configure.go @@ -5,13 +5,14 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/core" "go_dreamfactory/modules" + "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" ) const ( - game_arenarobot = "game_arenarobot.json" //ai配置表 - game_qualifying = "game_qualifying.json" //段位 - game_arenarankreward = "game_arenarankreward.json" //比赛奖励配置 + game_buzkashiopen = "game_buzkashiopen.json" + game_arenarobot = "game_arenarobot.json" //ai配置表 + game_qualifying = "game_qualifying.json" //段位 ) type configureComp struct { @@ -23,11 +24,41 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp err = this.MCompConfigure.Init(service, module, comp, options) this.module = module.(*CaptureSheep) err = this.LoadMultiConfigure(map[string]interface{}{ - game_arenarobot: cfg.NewGameArenaRobot, + game_arenarobot: cfg.NewGameArenaRobot, + game_buzkashiopen: cfg.NewGameBuzkashiOpen, + game_qualifying: cfg.NewGameQualifying, }) return } +// 查询开启表 +func (this *configureComp) isopen() (open bool) { + var ( + v interface{} + config *cfg.GameBuzkashiOpen + currtime string = configure.Now().Format("15:04") + err error + ok bool + ) + if v, err = this.GetConfigure(game_buzkashiopen); err != nil { + this.module.Errorln(err) + return + } else { + if config, ok = v.(*cfg.GameBuzkashiOpen); !ok { + err = fmt.Errorf("config type err:%T", v) + return + } else { + for _, v := range config.GetDataList() { + if currtime >= fmt.Sprintf("%d:%d", v.Shtime, v.Smtime) && currtime < fmt.Sprintf("%d:%d", v.Ehtime, v.Emtime) { + open = true + return + } + } + } + } + return +} + //查询积分段位信息 func (this *configureComp) getActiveReward(integral int32) (result *cfg.GameQualifyingData, err error) { var ( @@ -48,7 +79,7 @@ func (this *configureComp) getActiveReward(integral int32) (result *cfg.GameQual } //查询积分段位信息 -func (this *configureComp) getActiveRewardById(lv int32) (result *cfg.GameArenaActiveRewardData, err error) { +func (this *configureComp) getActiveRewardById(lv int32) (result *cfg.GameQualifyingData, err error) { var ( v interface{} ok bool @@ -56,23 +87,10 @@ func (this *configureComp) getActiveRewardById(lv int32) (result *cfg.GameArenaA if v, err = this.GetConfigure(game_qualifying); err != nil { this.module.Errorln(err) } else { - if result, ok = v.(*cfg.GameArenaActiveReward).GetDataMap()[lv]; !ok { + if result, ok = v.(*cfg.GameQualifying).GetDataMap()[lv]; !ok { err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_qualifying, lv) this.module.Errorln(err) } } return } - -//查询比赛奖励 -func (this *configureComp) getRankReward() (result *cfg.GameArenaRankReward, err error) { - var ( - v interface{} - ) - if v, err = this.GetConfigure(game_arenarankreward); err != nil { - this.module.Errorln(err) - } else { - result = v.(*cfg.GameArenaRankReward) - } - return -} diff --git a/modules/capturesheep/modelCaptureSheep.go b/modules/capturesheep/modelCaptureSheep.go index aea11a687..2e3df5381 100644 --- a/modules/capturesheep/modelCaptureSheep.go +++ b/modules/capturesheep/modelCaptureSheep.go @@ -116,27 +116,6 @@ func (this *ModelCaptureSheep) matcheAI(dan, num int32) (results []*pb.CaptureSh return } -func (this *ModelCaptureSheep) modifyIntegral(uid string, integral int32) (err error) { - var ( - dan int32 - player *pb.ArenaPlayer - ) - if dan, err = this.computedan(integral); err != nil { - return - } - player = &pb.ArenaPlayer{Uid: uid, Integral: integral} - if err = this.module.modelRank.updateArenaRank(player); err != nil { - this.module.Errorln(err) - return - } - this.Change(uid, map[string]interface{}{ - "integral": integral, - "dan": dan, - "rank": player.Rank, - }) - return -} - func (this *ModelCaptureSheep) computedan(integral int32) (dan int32, err error) { var ( active *cfg.GameQualifyingData @@ -149,31 +128,3 @@ func (this *ModelCaptureSheep) computedan(integral int32) (dan int32, err error) dan = active.LvId return } - -// 积分计算 -func (this *ModelCaptureSheep) integralCompute(red, bule *pb.CaptureSheepRaceMember, iswin bool) { - var ( - redactive *cfg.GameArenaActiveRewardData - buleactive *cfg.GameArenaActiveRewardData - err error - ) - if redactive, err = this.module.configure.getActiveRewardById(red.Dan); err != nil { - this.module.Errorln(err) - return - } - if buleactive, err = this.module.configure.getActiveRewardById(bule.Dan); err != nil { - this.module.Errorln(err) - return - } - if iswin { - red.Changeintegral = int32(redactive.KValue * float32(1-1/float32(1+10^(bule.Integral-red.Integral)/400))) - red.Integral = red.Integral + red.Changeintegral - bule.Changeintegral = int32(buleactive.KValue * float32(0-1/float32(1+10^(red.Integral-bule.Integral)/400))) - bule.Integral = bule.Integral + bule.Changeintegral - } else { - red.Changeintegral = int32(redactive.KValue * float32(0-1/float32(1+10^(bule.Integral-red.Integral)/400))) - red.Integral = red.Integral + red.Changeintegral - bule.Changeintegral = int32(redactive.KValue * float32(1-1/float32(1+10^(red.Integral-bule.Integral)/400))) - bule.Integral = bule.Integral + bule.Changeintegral - } -} diff --git a/modules/capturesheep/modelrank.go b/modules/capturesheep/modelrank.go deleted file mode 100644 index 3dc858498..000000000 --- a/modules/capturesheep/modelrank.go +++ /dev/null @@ -1,125 +0,0 @@ -package capturesheep - -import ( - "context" - "fmt" - "go_dreamfactory/comm" - "go_dreamfactory/lego/core" - "go_dreamfactory/lego/sys/redis/pipe" - "go_dreamfactory/modules" - "go_dreamfactory/pb" - "go_dreamfactory/sys/configure" - cfg "go_dreamfactory/sys/configure/structs" - - "github.com/go-redis/redis/v8" -) - -// /竞技场 数据组件 -type modelRank struct { - modules.MCompModel - module *CaptureSheep -} - -// 组件初始化接口 -func (this *modelRank) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) { - this.TableName = comm.TableCapturesheepRank - this.MCompModel.Init(service, module, comp, opt) - this.module = module.(*CaptureSheep) - - return -} - -// 更新排名 -func (this *modelRank) updateArenaRank(users ...*pb.ArenaPlayer) (err error) { - var ( - pipe *pipe.RedisPipe = this.DBModel.Redis.RedisPipe(context.TODO()) - menbers []*redis.Z - cmd *redis.IntCmd - menbersCmd []*redis.IntCmd = make([]*redis.IntCmd, len(users)) - rank int64 - ) - menbers = make([]*redis.Z, len(users)) - for i, v := range users { - menbers[i] = &redis.Z{Score: float64(v.Integral), Member: v.Uid} - } - if cmd = pipe.ZAdd(this.TableName, menbers...); err != nil { - this.module.Errorln(err) - } - for i, v := range users { - menbersCmd[i] = pipe.ZRevRank(this.TableName, v.Uid) - } - if _, err = pipe.Exec(); err != nil { - this.module.Errorln(err) - return - } - if _, err = cmd.Result(); err != nil { - this.module.Errorln(err) - return - } - for i, v := range menbersCmd { - if rank, err = v.Result(); err != nil { - this.module.Errorln(err) - return - } - users[i].Rank = int32(rank + 1) - } - return -} - -// 获取排行榜前50的用户名单 -func (this *modelRank) queryRankUser() (ranks []string, err error) { - var ( - result []string - ) - if result, err = this.DBModel.Redis.ZRevRange(this.TableName, 0, 50).Result(); err != nil { - this.module.Errorln(err) - return - } - ranks = make([]string, 0) - for i := 0; i < len(result); i += 1 { - ranks = append(ranks, result[i]) - } - return -} - -// 比赛结算 -func (this *modelRank) raceSettlement() { - var ( - reward *cfg.GameArenaRankReward - result []string - uids []string - Items []*pb.UserAssets - err error - ) - if reward, err = this.module.configure.getRankReward(); err != nil { - this.module.Errorln(err) - return - } - for _, v := range reward.GetDataList() { - if result, err = this.DBModel.Redis.ZRevRange(this.TableName, int64(v.RankLow-1), int64(v.RankUp)).Result(); err != nil { - this.module.Errorln(err) - return - } - this.module.Debugf("uid:%v", uids) - - Items = make([]*pb.UserAssets, len(v.RankReward)) - for i, v := range v.RankReward { - Items[i] = &pb.UserAssets{ - A: v.A, - T: v.T, - N: v.N, - } - } - for i := 0; i < len(result); i += 2 { - // uids = append(uids, result[i]) - //发邮件 - this.module.mail.SendNewMail(&pb.DBMailData{ - Cid: "ArenaRankingReward", - Param: []string{fmt.Sprintf("%d", v.RankLow+int32(i))}, - CreateTime: uint64(configure.Now().Unix()), - Items: Items, - }, result[i]) - } - } - -} diff --git a/modules/capturesheep/module.go b/modules/capturesheep/module.go index d3b14793b..6d545a332 100644 --- a/modules/capturesheep/module.go +++ b/modules/capturesheep/module.go @@ -20,7 +20,6 @@ type CaptureSheep struct { api *apiComp configure *configureComp modelCaptureSheep *ModelCaptureSheep - modelRank *modelRank } func NewModule() core.IModule { @@ -55,7 +54,6 @@ func (this *CaptureSheep) OnInstallComp() { this.ModuleBase.OnInstallComp() this.api = this.RegisterComp(new(apiComp)).(*apiComp) this.modelCaptureSheep = this.RegisterComp(new(ModelCaptureSheep)).(*ModelCaptureSheep) - this.modelRank = this.RegisterComp(new(modelRank)).(*modelRank) this.configure = this.RegisterComp(new(configureComp)).(*configureComp) } diff --git a/pb/capturesheep_db.pb.go b/pb/capturesheep_db.pb.go index 5207dfc68..575cc7ade 100644 --- a/pb/capturesheep_db.pb.go +++ b/pb/capturesheep_db.pb.go @@ -79,9 +79,8 @@ type DBCaptureSheep struct { Skin string `protobuf:"bytes,5,opt,name=skin,proto3" json:"skin"` //时装 Dan int32 `protobuf:"varint,6,opt,name=dan,proto3" json:"dan"` //段位 Integral int32 `protobuf:"varint,7,opt,name=integral,proto3" json:"integral"` //当前积分 - Rank int32 `protobuf:"varint,8,opt,name=rank,proto3" json:"rank"` //排名 - Defmts string `protobuf:"bytes,9,opt,name=defmts,proto3" json:"defmts"` //默认坐骑 - Loc []float64 `protobuf:"fixed64,13,rep,packed,name=loc,proto3" json:"loc"` //地图索引 匹配系统使用 + Defmts string `protobuf:"bytes,8,opt,name=defmts,proto3" json:"defmts"` //默认坐骑 + Loc []float64 `protobuf:"fixed64,9,rep,packed,name=loc,proto3" json:"loc"` //地图索引 匹配系统使用 } func (x *DBCaptureSheep) Reset() { @@ -165,13 +164,6 @@ func (x *DBCaptureSheep) GetIntegral() int32 { return 0 } -func (x *DBCaptureSheep) GetRank() int32 { - if x != nil { - return x.Rank - } - return 0 -} - func (x *DBCaptureSheep) GetDefmts() string { if x != nil { return x.Defmts @@ -203,6 +195,8 @@ type CaptureSheepRaceMember struct { Maxhp int32 `protobuf:"varint,10,opt,name=maxhp,proto3" json:"maxhp"` //初始血量 Currhp int32 `protobuf:"varint,11,opt,name=currhp,proto3" json:"currhp"` //当前血量 Scores int32 `protobuf:"varint,12,opt,name=scores,proto3" json:"scores"` //当前分数 + Showscores int32 `protobuf:"varint,13,opt,name=showscores,proto3" json:"showscores"` //表现分数 + Dodge int32 `protobuf:"varint,14,opt,name=dodge,proto3" json:"dodge"` //闪避次数 } func (x *CaptureSheepRaceMember) Reset() { @@ -321,6 +315,20 @@ func (x *CaptureSheepRaceMember) GetScores() int32 { return 0 } +func (x *CaptureSheepRaceMember) GetShowscores() int32 { + if x != nil { + return x.Showscores + } + return 0 +} + +func (x *CaptureSheepRaceMember) GetDodge() int32 { + if x != nil { + return x.Dodge + } + return 0 +} + //捕养比赛 type DBCaptureSheepRace struct { state protoimpl.MessageState @@ -406,7 +414,7 @@ var File_capturesheep_capturesheep_db_proto protoreflect.FileDescriptor var file_capturesheep_capturesheep_db_proto_rawDesc = []byte{ 0x0a, 0x22, 0x63, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x2f, 0x63, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x5f, 0x64, 0x62, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd8, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, + 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc4, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 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, 0x0e, 0x0a, @@ -416,47 +424,49 @@ var file_capturesheep_capturesheep_db_proto_rawDesc = []byte{ 0x6b, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, - 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x6d, 0x74, 0x73, 0x18, - 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x65, 0x66, 0x6d, 0x74, 0x73, 0x12, 0x10, 0x0a, - 0x03, 0x6c, 0x6f, 0x63, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x01, 0x52, 0x03, 0x6c, 0x6f, 0x63, 0x22, - 0xaa, 0x02, 0x0a, 0x16, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, - 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 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, 0x12, 0x0a, 0x04, 0x73, 0x6b, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, - 0x73, 0x6b, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x05, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, - 0x67, 0x72, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, - 0x67, 0x72, 0x61, 0x6c, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x69, 0x6e, - 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x63, 0x68, - 0x61, 0x6e, 0x67, 0x65, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x12, 0x0a, 0x04, - 0x69, 0x73, 0x61, 0x69, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69, - 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x05, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61, 0x78, 0x68, 0x70, 0x18, - 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6d, 0x61, 0x78, 0x68, 0x70, 0x12, 0x16, 0x0a, 0x06, - 0x63, 0x75, 0x72, 0x72, 0x68, 0x70, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x75, - 0x72, 0x72, 0x68, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x18, 0x0c, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x22, 0xdb, 0x01, 0x0a, - 0x12, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, - 0x61, 0x63, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x02, 0x69, 0x64, 0x12, 0x2b, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x0e, 0x32, 0x15, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, - 0x70, 0x52, 0x61, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, - 0x12, 0x18, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x12, 0x35, 0x0a, 0x09, 0x72, 0x65, - 0x64, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, + 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x6d, 0x74, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x06, 0x64, 0x65, 0x66, 0x6d, 0x74, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x6c, 0x6f, 0x63, + 0x18, 0x09, 0x20, 0x03, 0x28, 0x01, 0x52, 0x03, 0x6c, 0x6f, 0x63, 0x22, 0xe0, 0x02, 0x0a, 0x16, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, - 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x09, 0x72, 0x65, 0x64, 0x6d, 0x65, 0x6d, 0x62, 0x65, - 0x72, 0x12, 0x37, 0x0a, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, - 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, - 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x0a, - 0x62, 0x75, 0x6c, 0x65, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x2a, 0x2d, 0x0a, 0x14, 0x43, 0x61, - 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x54, 0x79, - 0x70, 0x65, 0x12, 0x09, 0x0a, 0x05, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x0a, 0x0a, - 0x06, 0x72, 0x61, 0x6e, 0x6b, 0x65, 0x64, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, - 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 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, 0x12, 0x0a, 0x04, + 0x73, 0x6b, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x6b, 0x69, 0x6e, + 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x73, + 0x65, 0x78, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x03, 0x64, 0x61, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, + 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, + 0x61, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, + 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x61, 0x69, + 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69, 0x12, 0x14, 0x0a, 0x05, + 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x75, + 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61, 0x78, 0x68, 0x70, 0x18, 0x0a, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x6d, 0x61, 0x78, 0x68, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x75, 0x72, 0x72, + 0x68, 0x70, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x75, 0x72, 0x72, 0x68, 0x70, + 0x12, 0x16, 0x0a, 0x06, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x06, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x68, 0x6f, 0x77, + 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x68, + 0x6f, 0x77, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x6f, 0x64, 0x67, + 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x64, 0x6f, 0x64, 0x67, 0x65, 0x22, 0xdb, + 0x01, 0x0a, 0x12, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, + 0x70, 0x52, 0x61, 0x63, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2b, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x0e, 0x32, 0x15, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, + 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x72, 0x74, 0x79, + 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x12, 0x35, 0x0a, 0x09, + 0x72, 0x65, 0x64, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x17, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, + 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x09, 0x72, 0x65, 0x64, 0x6d, 0x65, 0x6d, + 0x62, 0x65, 0x72, 0x12, 0x37, 0x0a, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x6d, 0x65, 0x6d, 0x62, 0x65, + 0x72, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, + 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, + 0x52, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x2a, 0x2d, 0x0a, 0x14, + 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, + 0x54, 0x79, 0x70, 0x65, 0x12, 0x09, 0x0a, 0x05, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x10, 0x00, 0x12, + 0x0a, 0x0a, 0x06, 0x72, 0x61, 0x6e, 0x6b, 0x65, 0x64, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/capturesheep_msg.pb.go b/pb/capturesheep_msg.pb.go index 8f3cf3a4c..67ad65e96 100644 --- a/pb/capturesheep_msg.pb.go +++ b/pb/capturesheep_msg.pb.go @@ -454,6 +454,11 @@ type CapturesheepOverResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + + Iswin bool `protobuf:"varint,1,opt,name=iswin,proto3" json:"iswin"` + Dan int32 `protobuf:"varint,2,opt,name=dan,proto3" json:"dan"` //段位 + Integral int32 `protobuf:"varint,4,opt,name=integral,proto3" json:"integral"` //当前积分 + Award []*UserAtno `protobuf:"bytes,5,rep,name=award,proto3" json:"award"` //奖励 } func (x *CapturesheepOverResp) Reset() { @@ -488,6 +493,34 @@ func (*CapturesheepOverResp) Descriptor() ([]byte, []int) { return file_capturesheep_capturesheep_msg_proto_rawDescGZIP(), []int{9} } +func (x *CapturesheepOverResp) GetIswin() bool { + if x != nil { + return x.Iswin + } + return false +} + +func (x *CapturesheepOverResp) GetDan() int32 { + if x != nil { + return x.Dan + } + return 0 +} + +func (x *CapturesheepOverResp) GetIntegral() int32 { + if x != nil { + return x.Integral + } + return 0 +} + +func (x *CapturesheepOverResp) GetAward() []*UserAtno { + if x != nil { + return x.Award + } + return nil +} + var File_capturesheep_capturesheep_msg_proto protoreflect.FileDescriptor var file_capturesheep_capturesheep_msg_proto_rawDesc = []byte{ @@ -495,41 +528,48 @@ var file_capturesheep_capturesheep_msg_proto_rawDesc = []byte{ 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x22, 0x63, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x2f, 0x63, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, - 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x15, 0x0a, 0x13, 0x43, 0x61, 0x70, - 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, - 0x22, 0x3b, 0x0a, 0x14, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, - 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, - 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x2c, 0x0a, - 0x18, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x43, 0x68, 0x61, - 0x6e, 0x67, 0x65, 0x4d, 0x74, 0x73, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 0x22, 0x2d, 0x0a, 0x19, 0x43, - 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x43, 0x68, 0x61, 0x6e, 0x67, - 0x65, 0x4d, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 0x22, 0x5e, 0x0a, 0x15, 0x43, 0x61, - 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, - 0x52, 0x65, 0x71, 0x12, 0x2b, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0e, 0x32, 0x15, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, - 0x70, 0x52, 0x61, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, - 0x12, 0x18, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x22, 0x61, 0x0a, 0x16, 0x43, 0x61, - 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x74, 0x69, - 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, - 0x74, 0x69, 0x6d, 0x65, 0x12, 0x27, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, - 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x22, 0x28, 0x0a, - 0x16, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x55, 0x73, 0x65, - 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x19, 0x0a, 0x17, 0x43, 0x61, 0x70, 0x74, 0x75, - 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x55, 0x73, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, - 0x73, 0x70, 0x22, 0x3e, 0x0a, 0x13, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, - 0x65, 0x70, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x27, 0x0a, 0x04, 0x72, 0x61, 0x63, - 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, - 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x52, 0x04, 0x72, 0x61, - 0x63, 0x65, 0x22, 0x16, 0x0a, 0x14, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, - 0x65, 0x70, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, - 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x15, 0x0a, 0x13, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, + 0x73, 0x68, 0x65, 0x65, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x3b, 0x0a, 0x14, + 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x49, 0x6e, 0x66, 0x6f, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, + 0x65, 0x65, 0x70, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x2c, 0x0a, 0x18, 0x43, 0x61, 0x70, + 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4d, + 0x74, 0x73, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 0x22, 0x2d, 0x0a, 0x19, 0x43, 0x61, 0x70, 0x74, 0x75, + 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4d, 0x74, 0x73, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 0x22, 0x5e, 0x0a, 0x15, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, + 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x52, 0x65, 0x71, 0x12, + 0x2b, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x15, + 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, + 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, + 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, + 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x22, 0x61, 0x0a, 0x16, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, + 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x1e, 0x0a, 0x0a, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x74, 0x69, 0x6d, 0x65, + 0x12, 0x27, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, + 0x2e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, + 0x61, 0x63, 0x65, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x22, 0x28, 0x0a, 0x16, 0x43, 0x61, 0x70, + 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x55, 0x73, 0x65, 0x49, 0x74, 0x65, 0x6d, + 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x02, 0x69, 0x64, 0x22, 0x19, 0x0a, 0x17, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, + 0x65, 0x65, 0x70, 0x55, 0x73, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x22, 0x3e, + 0x0a, 0x13, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x4f, 0x76, + 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x27, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, + 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x22, 0x7b, + 0x0a, 0x14, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x4f, 0x76, + 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, + 0x64, 0x61, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x1a, + 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, + 0x61, 0x72, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, + 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -559,17 +599,19 @@ var file_capturesheep_capturesheep_msg_proto_goTypes = []interface{}{ (*DBCaptureSheep)(nil), // 10: DBCaptureSheep (CaptureSheepRaceType)(0), // 11: CaptureSheepRaceType (*DBCaptureSheepRace)(nil), // 12: DBCaptureSheepRace + (*UserAtno)(nil), // 13: UserAtno } var file_capturesheep_capturesheep_msg_proto_depIdxs = []int32{ 10, // 0: CapturesheepInfoResp.info:type_name -> DBCaptureSheep 11, // 1: CapturesheepMatcheReq.rtype:type_name -> CaptureSheepRaceType 12, // 2: CapturesheepMatcheResp.race:type_name -> DBCaptureSheepRace 12, // 3: CapturesheepOverReq.race:type_name -> DBCaptureSheepRace - 4, // [4:4] is the sub-list for method output_type - 4, // [4:4] is the sub-list for method input_type - 4, // [4:4] is the sub-list for extension type_name - 4, // [4:4] is the sub-list for extension extendee - 0, // [0:4] is the sub-list for field type_name + 13, // 4: CapturesheepOverResp.award:type_name -> UserAtno + 5, // [5:5] is the sub-list for method output_type + 5, // [5:5] is the sub-list for method input_type + 5, // [5:5] is the sub-list for extension type_name + 5, // [5:5] is the sub-list for extension extendee + 0, // [0:5] is the sub-list for field type_name } func init() { file_capturesheep_capturesheep_msg_proto_init() } @@ -578,6 +620,7 @@ func file_capturesheep_capturesheep_msg_proto_init() { return } file_capturesheep_capturesheep_db_proto_init() + file_comm_proto_init() if !protoimpl.UnsafeEnabled { file_capturesheep_capturesheep_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CapturesheepInfoReq); i { diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index ee4b4bd19..6fd367f13 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -443,6 +443,8 @@ const ( ErrorCode_ActivityNotIntime ErrorCode = 5004 // 不在活动时间范围 ErrorCode_ActivityInvalid ErrorCode = 5005 // 不存在的活动 ErrorCode_ActivityCantReward ErrorCode = 5006 // 还不能领奖 + //捕羊大赛的 + ErrorCode_CapturesheepRankCloseed ErrorCode = 5101 //排位比赛不在开启时间内 ) // Enum value maps for ErrorCode. @@ -825,6 +827,7 @@ var ( 5004: "ActivityNotIntime", 5005: "ActivityInvalid", 5006: "ActivityCantReward", + 5101: "CapturesheepRankCloseed", } ErrorCode_value = map[string]int32{ "Success": 0, @@ -1204,6 +1207,7 @@ var ( "ActivityNotIntime": 5004, "ActivityInvalid": 5005, "ActivityCantReward": 5006, + "CapturesheepRankCloseed": 5101, } ) @@ -1238,7 +1242,7 @@ var File_errorcode_proto protoreflect.FileDescriptor var file_errorcode_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2a, 0xf3, 0x45, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0x91, 0x46, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, @@ -1797,8 +1801,10 @@ var file_errorcode_proto_rawDesc = []byte{ 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x10, 0x8c, 0x27, 0x12, 0x14, 0x0a, 0x0f, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x8d, 0x27, 0x12, 0x17, 0x0a, 0x12, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x43, 0x61, 0x6e, 0x74, 0x52, 0x65, - 0x77, 0x61, 0x72, 0x64, 0x10, 0x8e, 0x27, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x77, 0x61, 0x72, 0x64, 0x10, 0x8e, 0x27, 0x12, 0x1c, 0x0a, 0x17, 0x43, 0x61, 0x70, 0x74, 0x75, + 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x6e, 0x6b, 0x43, 0x6c, 0x6f, 0x73, 0x65, + 0x65, 0x64, 0x10, 0xed, 0x27, 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 690ad23fd..b679738d3 100644 --- a/sys/configure/structs/Game.BuffType.go +++ b/sys/configure/structs/Game.BuffType.go @@ -123,4 +123,5 @@ const ( GameBuffType_VIKING_ROAR = 130 GameBuffType_VIKING_FLAG = 131 GameBuffType_MASTER_SHIELD = 132 + GameBuffType_MODIFYHPTYPE_ADD_DMG = 133 ) diff --git a/sys/configure/structs/Game.BuzkashiMountData.go b/sys/configure/structs/Game.BuzkashiMountData.go index b6701d023..3103e5701 100644 --- a/sys/configure/structs/Game.BuzkashiMountData.go +++ b/sys/configure/structs/Game.BuzkashiMountData.go @@ -19,9 +19,10 @@ type GameBuzkashiMountData struct { Img string Access []int32 Model string + Controller string Point string - Stime int32 Etime int32 + Stime int32 Hp int32 Moderate int32 Sprint int32 @@ -62,9 +63,10 @@ func (_v *GameBuzkashiMountData)Deserialize(_buf map[string]interface{}) (err er } { var _ok_ bool; if _v.Model, _ok_ = _buf["model"].(string); !_ok_ { err = errors.New("model error"); return } } + { var _ok_ bool; if _v.Controller, _ok_ = _buf["controller"].(string); !_ok_ { err = errors.New("controller error"); return } } { var _ok_ bool; if _v.Point, _ok_ = _buf["point"].(string); !_ok_ { err = errors.New("point error"); return } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stime"].(float64); !_ok_ { err = errors.New("stime error"); return }; _v.Stime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["etime"].(float64); !_ok_ { err = errors.New("etime error"); return }; _v.Etime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stime"].(float64); !_ok_ { err = errors.New("stime error"); return }; _v.Stime = int32(_tempNum_) } { 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["moderate"].(float64); !_ok_ { err = errors.New("moderate error"); return }; _v.Moderate = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sprint"].(float64); !_ok_ { err = errors.New("sprint error"); return }; _v.Sprint = int32(_tempNum_) } diff --git a/sys/configure/structs/Game.DragonPlayData.go b/sys/configure/structs/Game.DragonPlayData.go index 5571abcae..cff31914e 100644 --- a/sys/configure/structs/Game.DragonPlayData.go +++ b/sys/configure/structs/Game.DragonPlayData.go @@ -19,6 +19,7 @@ type GameDragonPlayData struct { Time int32 Cd int32 Deplete []*Gameatn + Bubble int32 Group int32 } @@ -50,6 +51,7 @@ func (_v *GameDragonPlayData)Deserialize(_buf map[string]interface{}) (err error } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bubble"].(float64); !_ok_ { err = errors.New("bubble error"); return }; _v.Bubble = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["group"].(float64); !_ok_ { err = errors.New("group error"); return }; _v.Group = int32(_tempNum_) } return } diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index de5f8e068..f273eb76a 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -178,7 +178,6 @@ type Tables struct { BuzkashiLv *GameBuzkashiLv BuzkashiQteLv *GameBuzkashiQteLv BuzkashiGrade *GameBuzkashiGrade - BuzkashiReward *GameBuzkashiReward BuzkashiFm *GameBuzkashiFm BuzkashiOpen *GameBuzkashiOpen BuzkashiTrack *GameBuzkashiTrack @@ -1268,12 +1267,6 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.BuzkashiGrade, err = NewGameBuzkashiGrade(buf) ; err != nil { return nil, err } - if buf, err = loader("game_buzkashireward") ; err != nil { - return nil, err - } - if tables.BuzkashiReward, err = NewGameBuzkashiReward(buf) ; err != nil { - return nil, err - } if buf, err = loader("game_buzkashifm") ; err != nil { return nil, err } From 74c00fd9b0014bb45a7d6d3e603ce241d2d2e442 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 7 Sep 2023 14:44:55 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_battleready.json | 12 +- bin/json/game_buriedcondi.json | 12 +- bin/json/game_buzkashimount.json | 199 ++++++++-------- bin/json/game_dragonplay.json | 11 + bin/json/game_equipattribute.json | 32 +-- bin/json/game_gm.json | 10 + bin/json/game_horoscope.json | 96 ++++---- bin/json/game_item.json | 132 +++++------ bin/json/game_mainstage.json | 372 ++++++------------------------ bin/json/game_monsterformat.json | 4 +- bin/json/game_pandamasjx.json | 48 ++-- bin/json/game_pandamasyxjx.json | 8 +- bin/json/game_rdtasknpc.json | 4 +- bin/json/game_skillafteratk.json | 139 +++++------ bin/json/game_skillatk.json | 99 ++++---- bin/json/game_skillbuff.json | 126 ++++++++-- bin/json/game_skillpassive.json | 60 ++--- bin/json/game_vikingboss.json | 48 ++-- 18 files changed, 632 insertions(+), 780 deletions(-) diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index 17c3c7d02..ff5b76dfd 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -970,7 +970,7 @@ "HideAlienSpace": 0, "RuleTips": { "key": "battleready_battleready_RuleTips_1", - "text": "只能上阵真诚属性的守护者" + "text": "只能上阵火的热情属性的守护者" }, "BattleTips": { "key": "", @@ -1004,7 +1004,7 @@ "HideAlienSpace": 0, "RuleTips": { "key": "battleready_battleready_RuleTips_2", - "text": "只能上阵直觉属性的守护者" + "text": "只能上阵林的感观属性的守护者" }, "BattleTips": { "key": "", @@ -1038,7 +1038,7 @@ "HideAlienSpace": 0, "RuleTips": { "key": "battleready_battleready_RuleTips_3", - "text": "只能上阵共情属性的守护者" + "text": "只能上阵水的包容属性的守护者" }, "BattleTips": { "key": "", @@ -1705,7 +1705,7 @@ "HideAlienSpace": 0, "RuleTips": { "key": "battleready_battleready_RuleTips_1", - "text": "只能上阵真诚属性的守护者" + "text": "只能上阵火的热情属性的守护者" }, "BattleTips": { "key": "", @@ -1739,7 +1739,7 @@ "HideAlienSpace": 0, "RuleTips": { "key": "battleready_battleready_RuleTips_2", - "text": "只能上阵直觉属性的守护者" + "text": "只能上阵林的感观属性的守护者" }, "BattleTips": { "key": "", @@ -1773,7 +1773,7 @@ "HideAlienSpace": 0, "RuleTips": { "key": "battleready_battleready_RuleTips_3", - "text": "只能上阵共情属性的守护者" + "text": "只能上阵水的包容属性的守护者" }, "BattleTips": { "key": "", diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 5d24aa13d..8d4e45bac 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -21559,7 +21559,7 @@ "NPC": 10104, "value": 1, "filter": [ - 1100124 + 1100113 ], "filter2": [ "关卡ID", @@ -22094,7 +22094,7 @@ "NPC": 10284, "value": 1, "filter": [ - 1100208 + 1100224 ], "filter2": [ "关卡ID", @@ -22305,7 +22305,7 @@ "NPC": 10334, "value": 1, "filter": [ - 1100304 + 1100305 ], "filter2": [ "关卡ID", @@ -22426,7 +22426,7 @@ "NPC": 10364, "value": 1, "filter": [ - 1100308 + 1100312 ], "filter2": [ "关卡ID", @@ -22635,7 +22635,7 @@ "NPC": 10334, "value": 1, "filter": [ - 1100408 + 1100413 ], "filter2": [ "剧情ID", @@ -28922,7 +28922,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1009", - "text": "种族塔通关真诚阵容2层" + "text": "种族塔通关火的热情阵容2层" }, "type": 232, "valid": 0, diff --git a/bin/json/game_buzkashimount.json b/bin/json/game_buzkashimount.json index d4d952ac6..a4293f37a 100644 --- a/bin/json/game_buzkashimount.json +++ b/bin/json/game_buzkashimount.json @@ -4,31 +4,32 @@ "type": 1, "name": { "key": "buzkashi_Mount_name_1", - "text": "无牙仔（蛋）" + "text": "夜煞（蛋）" }, "intr": { "key": "buzkashi_Mount_intr_1", - "text": "测试描述1" + "text": "夜煞的蛋，撒点胡椒和盐，味道应该会很很不错！" }, - "Color": 1, + "Color": 5, "Img": "by_img_54101", "access": [ 166 ], "model": "54101_3", - "point": "", - "stime": 20, + "controller": "Person/mount/10000M_54101.controller", + "point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos", "etime": 0, - "hp": 7, - "moderate": 10, - "sprint": 200, - "sprinttime": 3000, - "acceleration": 100, - "deceleration": 100, + "stime": 0, + "hp": 0, + "moderate": 0, + "sprint": 0, + "sprinttime": 0, + "acceleration": 0, + "deceleration": 0, "caddtime": 0, "csubtime": 0, "energyrecover": 0, - "maxenergy": 100 + "maxenergy": 0 }, { "id": "20030001", @@ -39,27 +40,28 @@ }, "intr": { "key": "buzkashi_Mount_intr_2", - "text": "测试描述2" + "text": "弱小无助但能吃
\"你不会指望幼龙能载人飞行吧?\"" }, - "Color": 1, + "Color": 5, "Img": "by_img_54101", "access": [ 166 ], "model": "54101_3", - "point": "", - "stime": 20, + "controller": "Person/mount/10000M_54101.controller", + "point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos", "etime": 0, - "hp": 7, - "moderate": 10, - "sprint": 200, - "sprinttime": 3000, - "acceleration": 100, - "deceleration": 100, + "stime": 0, + "hp": 0, + "moderate": 0, + "sprint": 0, + "sprinttime": 0, + "acceleration": 0, + "deceleration": 0, "caddtime": 0, "csubtime": 0, "energyrecover": 0, - "maxenergy": 100 + "maxenergy": 0 }, { "id": "20030001", @@ -72,24 +74,25 @@ "key": "buzkashi_Mount_intr_3", "text": "无牙/没牙仔（Toothless）品种为夜煞。夜煞是龙族非常稀有且最危险聪明的龙，与其它龙的造型很不一样，类似蝙蝠，身体附有黑色鳞片。体积娇小，表情动作灵巧可爱，双翼比例在龙的排行中最大。翼面多达三对，因此飞行时间更长，速度更快更灵活。" }, - "Color": 1, + "Color": 5, "Img": "by_img_54101", "access": [ 166 ], "model": "54101_3", - "point": "", - "stime": 20, - "etime": 40, - "hp": 7, + "controller": "Person/mount/10000M_54101.controller", + "point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos", + "etime": 75, + "stime": 15, + "hp": 50, "moderate": 10, - "sprint": 200, - "sprinttime": 3000, + "sprint": 150, + "sprinttime": 5500, "acceleration": 100, "deceleration": 100, "caddtime": 10, "csubtime": 10, - "energyrecover": 100, + "energyrecover": 30, "maxenergy": 100 }, { @@ -97,62 +100,64 @@ "type": 1, "name": { "key": "buzkashi_Mount_name_4", - "text": "风里飞" + "text": "风里飞（蛋）" }, "intr": { "key": "buzkashi_Mount_intr_4", - "text": "测试描述4" + "text": "风里飞的蛋，撒点胡椒和盐，味道应该会很很不错！" }, - "Color": 1, + "Color": 3, "Img": "by_img_54102", "access": [ 166 ], "model": "54101_3", - "point": "", - "stime": 20, + "controller": "Person/mount/10000M_54101.controller", + "point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos", "etime": 0, - "hp": 7, - "moderate": 10, - "sprint": 200, - "sprinttime": 3000, - "acceleration": 100, - "deceleration": 100, + "stime": 0, + "hp": 0, + "moderate": 0, + "sprint": 0, + "sprinttime": 0, + "acceleration": 0, + "deceleration": 0, "caddtime": 0, "csubtime": 0, "energyrecover": 0, - "maxenergy": 100 + "maxenergy": 0 }, { "id": "20030002", "type": 2, "name": { "key": "buzkashi_Mount_name_5", - "text": "风里飞" + "text": "风里飞（幼）" }, "intr": { "key": "buzkashi_Mount_intr_5", - "text": "测试描述5" + "text": "弱小无助但能吃
\"你不会指望幼龙能载人飞行吧?\"" }, - "Color": 1, + "Color": 3, "Img": "by_img_54102", "access": [ 166 ], "model": "54101_3", - "point": "", - "stime": 20, + "controller": "Person/mount/10000M_54101.controller", + "point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos", "etime": 0, - "hp": 7, - "moderate": 10, - "sprint": 200, - "sprinttime": 3000, - "acceleration": 100, - "deceleration": 100, + "stime": 0, + "hp": 0, + "moderate": 0, + "sprint": 0, + "sprinttime": 0, + "acceleration": 0, + "deceleration": 0, "caddtime": 0, "csubtime": 0, "energyrecover": 0, - "maxenergy": 100 + "maxenergy": 0 }, { "id": "20030002", @@ -165,24 +170,25 @@ "key": "buzkashi_Mount_intr_6", "text": "它是龙族最漂亮、精力最充沛的一员，皮肤色彩斑斓，有鹦鹉一样的习性、鸸鹋的步态和雷克斯暴龙的姿势，是鸟类的祖先。纳得的性格暴躁，经常发脾气。" }, - "Color": 1, + "Color": 3, "Img": "by_img_54102", "access": [ 166 ], "model": "54101_3", - "point": "", - "stime": 20, - "etime": 0, - "hp": 7, + "controller": "Person/mount/10000M_54101.controller", + "point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos", + "etime": 70, + "stime": 15, + "hp": 70, "moderate": 10, - "sprint": 200, - "sprinttime": 3000, + "sprint": 140, + "sprinttime": 6000, "acceleration": 100, "deceleration": 100, "caddtime": 0, "csubtime": 0, - "energyrecover": 0, + "energyrecover": 30, "maxenergy": 100 }, { @@ -190,62 +196,64 @@ "type": 1, "name": { "key": "buzkashi_Mount_name_7", - "text": "葛伦科" + "text": "葛伦科（蛋）" }, "intr": { "key": "buzkashi_Mount_intr_7", - "text": "测试描述7" + "text": "葛伦科的蛋，撒点胡椒和盐，味道应该会很很不错！" }, - "Color": 1, + "Color": 3, "Img": "by_img_54103", "access": [ 166 ], "model": "54101_3", - "point": "", - "stime": 20, + "controller": "Person/mount/10000M_54101.controller", + "point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos", "etime": 0, - "hp": 7, - "moderate": 10, - "sprint": 200, - "sprinttime": 3000, - "acceleration": 100, - "deceleration": 100, + "stime": 0, + "hp": 0, + "moderate": 0, + "sprint": 0, + "sprinttime": 0, + "acceleration": 0, + "deceleration": 0, "caddtime": 0, "csubtime": 0, "energyrecover": 0, - "maxenergy": 100 + "maxenergy": 0 }, { "id": "20030003", "type": 2, "name": { "key": "buzkashi_Mount_name_8", - "text": "葛伦科" + "text": "葛伦科（幼）" }, "intr": { "key": "buzkashi_Mount_intr_8", - "text": "测试描述8" + "text": "弱小无助但能吃
\"你不会指望幼龙能载人飞行吧?\"" }, - "Color": 1, + "Color": 3, "Img": "by_img_54103", "access": [ 166 ], "model": "54101_3", - "point": "", - "stime": 20, + "controller": "Person/mount/10000M_54101.controller", + "point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos", "etime": 0, - "hp": 7, - "moderate": 10, - "sprint": 200, - "sprinttime": 3000, - "acceleration": 100, - "deceleration": 100, + "stime": 0, + "hp": 0, + "moderate": 0, + "sprint": 0, + "sprinttime": 0, + "acceleration": 0, + "deceleration": 0, "caddtime": 0, "csubtime": 0, "energyrecover": 0, - "maxenergy": 100 + "maxenergy": 0 }, { "id": "20030003", @@ -258,24 +266,25 @@ "key": "buzkashi_Mount_intr_9", "text": "葛伦科是巨石类龙，长约4米，高约1.7米，全身披满装甲，尾巴像一个锤子，体态较胖。鱼脚司是他的好朋友（更像父亲），起名为肉球。" }, - "Color": 1, + "Color": 3, "Img": "by_img_54103", "access": [ 166 ], "model": "54101_3", - "point": "", - "stime": 20, - "etime": 0, - "hp": 7, + "controller": "Person/mount/10000M_54101.controller", + "point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos", + "etime": 65, + "stime": 17, + "hp": 110, "moderate": 10, - "sprint": 200, - "sprinttime": 3000, + "sprint": 130, + "sprinttime": 6500, "acceleration": 100, "deceleration": 100, "caddtime": 0, "csubtime": 0, - "energyrecover": 0, + "energyrecover": 30, "maxenergy": 100 } ] \ No newline at end of file diff --git a/bin/json/game_dragonplay.json b/bin/json/game_dragonplay.json index a2a177b86..8e672c939 100644 --- a/bin/json/game_dragonplay.json +++ b/bin/json/game_dragonplay.json @@ -14,6 +14,7 @@ "n": 1 } ], + "bubble": 14005, "group": 0 }, { @@ -31,6 +32,7 @@ "n": 2 } ], + "bubble": 14005, "group": 10001 }, { @@ -48,6 +50,7 @@ "n": 3 } ], + "bubble": 14005, "group": 0 }, { @@ -65,6 +68,7 @@ "n": 4 } ], + "bubble": 14005, "group": 0 }, { @@ -82,6 +86,7 @@ "n": 5 } ], + "bubble": 14005, "group": 0 }, { @@ -99,6 +104,7 @@ "n": 6 } ], + "bubble": 14005, "group": 10002 }, { @@ -116,6 +122,7 @@ "n": 7 } ], + "bubble": 14005, "group": 0 }, { @@ -133,6 +140,7 @@ "n": 8 } ], + "bubble": 14005, "group": 0 }, { @@ -150,6 +158,7 @@ "n": 9 } ], + "bubble": 14005, "group": 0 }, { @@ -167,6 +176,7 @@ "n": 10 } ], + "bubble": 14005, "group": 0 }, { @@ -184,6 +194,7 @@ "n": 11 } ], + "bubble": 14005, "group": 0 } ] \ No newline at end of file diff --git a/bin/json/game_equipattribute.json b/bin/json/game_equipattribute.json index 15f49a48b..56b2064f6 100644 --- a/bin/json/game_equipattribute.json +++ b/bin/json/game_equipattribute.json @@ -4,11 +4,11 @@ "skill_id": 125004011, "attribute_text": { "key": "equip_equip_attribute_attribute_text_1", - "text": "对直觉属性守护者伤害增加" + "text": "对林的感观属性守护者伤害增加" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_1", - "text": "对直觉属性守护者伤害增加" + "text": "对林的感观属性守护者伤害增加" }, "skill_parameter": [ "1%", @@ -24,11 +24,11 @@ "skill_id": 125004011, "attribute_text": { "key": "equip_equip_attribute_attribute_text_2", - "text": "对真诚属性守护者伤害增加" + "text": "对火的热情属性守护者伤害增加" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_2", - "text": "对真诚属性守护者伤害增加" + "text": "对火的热情属性守护者伤害增加" }, "skill_parameter": [ "1%", @@ -44,11 +44,11 @@ "skill_id": 125004011, "attribute_text": { "key": "equip_equip_attribute_attribute_text_3", - "text": "对共情属性守护者伤害增加" + "text": "对水的包容属性守护者伤害增加" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_3", - "text": "对共情属性守护者伤害增加" + "text": "对水的包容属性守护者伤害增加" }, "skill_parameter": [ "1%", @@ -64,11 +64,11 @@ "skill_id": 125004011, "attribute_text": { "key": "equip_equip_attribute_attribute_text_4", - "text": "对责任属性守护者伤害增加" + "text": "对光的荣耀属性守护者伤害增加" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_4", - "text": "对责任属性守护者伤害增加" + "text": "对光的荣耀属性守护者伤害增加" }, "skill_parameter": [ "1%", @@ -84,11 +84,11 @@ "skill_id": 125004011, "attribute_text": { "key": "equip_equip_attribute_attribute_text_5", - "text": "减少受到的直觉属性守护者伤害" + "text": "减少受到的林的感观属性守护者伤害" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_5", - "text": "减少受到的直觉属性守护者伤害" + "text": "减少受到的林的感观属性守护者伤害" }, "skill_parameter": [ "1%", @@ -104,11 +104,11 @@ "skill_id": 125004011, "attribute_text": { "key": "equip_equip_attribute_attribute_text_6", - "text": "减少受到的真诚属性守护者伤害" + "text": "减少受到的火的热情属性守护者伤害" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_6", - "text": "减少受到的真诚属性守护者伤害" + "text": "减少受到的火的热情属性守护者伤害" }, "skill_parameter": [ "1%", @@ -124,11 +124,11 @@ "skill_id": 125004011, "attribute_text": { "key": "equip_equip_attribute_attribute_text_7", - "text": "减少受到的共情属性守护者伤害" + "text": "减少受到的水的包容属性守护者伤害" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_7", - "text": "减少受到的共情属性守护者伤害" + "text": "减少受到的水的包容属性守护者伤害" }, "skill_parameter": [ "1%", @@ -144,11 +144,11 @@ "skill_id": 125004011, "attribute_text": { "key": "equip_equip_attribute_attribute_text_8", - "text": "减少受到的责任属性守护者伤害" + "text": "减少受到的光的荣耀属性守护者伤害" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_8", - "text": "减少受到的责任属性守护者伤害" + "text": "减少受到的光的荣耀属性守护者伤害" }, "skill_parameter": [ "1%", diff --git a/bin/json/game_gm.json b/bin/json/game_gm.json index bbbeb1d48..b42cf98cb 100644 --- a/bin/json/game_gm.json +++ b/bin/json/game_gm.json @@ -378,5 +378,15 @@ }, "data": "", "prefix": "bingo:groumet" + }, + { + "id": 41, + "type": 2, + "text": { + "key": "GM_GM_text_41", + "text": "守护者好感度等级全满" + }, + "data": "", + "prefix": "bingo:library" } ] \ No newline at end of file diff --git a/bin/json/game_horoscope.json b/bin/json/game_horoscope.json index 80f28648c..f6bf4cfcd 100644 --- a/bin/json/game_horoscope.json +++ b/bin/json/game_horoscope.json @@ -171,7 +171,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_6", - "text": "真诚属性攻击提升" + "text": "火的热情属性攻击提升" }, "comicon": "Attack", "lv": 0, @@ -204,7 +204,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_7", - "text": "真诚属性攻击提升" + "text": "火的热情属性攻击提升" }, "comicon": "Attack", "lv": 1, @@ -237,7 +237,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_8", - "text": "真诚属性攻击提升" + "text": "火的热情属性攻击提升" }, "comicon": "Attack", "lv": 2, @@ -270,7 +270,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_9", - "text": "真诚属性攻击提升" + "text": "火的热情属性攻击提升" }, "comicon": "Attack", "lv": 3, @@ -297,7 +297,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_10", - "text": "真诚属性防御提升" + "text": "火的热情属性防御提升" }, "comicon": "Defense", "lv": 0, @@ -330,7 +330,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_11", - "text": "真诚属性防御提升" + "text": "火的热情属性防御提升" }, "comicon": "Defense", "lv": 1, @@ -363,7 +363,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_12", - "text": "真诚属性防御提升" + "text": "火的热情属性防御提升" }, "comicon": "Defense", "lv": 2, @@ -396,7 +396,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_13", - "text": "真诚属性防御提升" + "text": "火的热情属性防御提升" }, "comicon": "Defense", "lv": 3, @@ -423,7 +423,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_14", - "text": "真诚属性生命提升" + "text": "火的热情属性生命提升" }, "comicon": "Life", "lv": 0, @@ -456,7 +456,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_15", - "text": "真诚属性生命提升" + "text": "火的热情属性生命提升" }, "comicon": "Life", "lv": 1, @@ -489,7 +489,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_16", - "text": "真诚属性生命提升" + "text": "火的热情属性生命提升" }, "comicon": "Life", "lv": 2, @@ -522,7 +522,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_17", - "text": "真诚属性生命提升" + "text": "火的热情属性生命提升" }, "comicon": "Life", "lv": 3, @@ -828,7 +828,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_27", - "text": "直觉属性攻击提升" + "text": "林的感观属性攻击提升" }, "comicon": "Attack", "lv": 0, @@ -861,7 +861,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_28", - "text": "直觉属性攻击提升" + "text": "林的感观属性攻击提升" }, "comicon": "Attack", "lv": 1, @@ -894,7 +894,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_29", - "text": "直觉属性攻击提升" + "text": "林的感观属性攻击提升" }, "comicon": "Attack", "lv": 2, @@ -927,7 +927,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_30", - "text": "直觉属性攻击提升" + "text": "林的感观属性攻击提升" }, "comicon": "Attack", "lv": 3, @@ -954,7 +954,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_31", - "text": "直觉属性防御提升" + "text": "林的感观属性防御提升" }, "comicon": "Defense", "lv": 0, @@ -987,7 +987,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_32", - "text": "直觉属性防御提升" + "text": "林的感观属性防御提升" }, "comicon": "Defense", "lv": 1, @@ -1020,7 +1020,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_33", - "text": "直觉属性防御提升" + "text": "林的感观属性防御提升" }, "comicon": "Defense", "lv": 2, @@ -1053,7 +1053,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_34", - "text": "直觉属性防御提升" + "text": "林的感观属性防御提升" }, "comicon": "Defense", "lv": 3, @@ -1080,7 +1080,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_35", - "text": "直觉属性生命提升" + "text": "林的感观属性生命提升" }, "comicon": "Life", "lv": 0, @@ -1113,7 +1113,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_36", - "text": "直觉属性生命提升" + "text": "林的感观属性生命提升" }, "comicon": "Life", "lv": 1, @@ -1146,7 +1146,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_37", - "text": "直觉属性生命提升" + "text": "林的感观属性生命提升" }, "comicon": "Life", "lv": 2, @@ -1179,7 +1179,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_38", - "text": "直觉属性生命提升" + "text": "林的感观属性生命提升" }, "comicon": "Life", "lv": 3, @@ -1485,7 +1485,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_48", - "text": "共情属性攻击提升" + "text": "水的包容属性攻击提升" }, "comicon": "Attack", "lv": 0, @@ -1518,7 +1518,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_49", - "text": "共情属性攻击提升" + "text": "水的包容属性攻击提升" }, "comicon": "Attack", "lv": 1, @@ -1551,7 +1551,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_50", - "text": "共情属性攻击提升" + "text": "水的包容属性攻击提升" }, "comicon": "Attack", "lv": 2, @@ -1584,7 +1584,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_51", - "text": "共情属性攻击提升" + "text": "水的包容属性攻击提升" }, "comicon": "Attack", "lv": 3, @@ -1611,7 +1611,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_52", - "text": "共情属性防御提升" + "text": "水的包容属性防御提升" }, "comicon": "Defense", "lv": 0, @@ -1644,7 +1644,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_53", - "text": "共情属性防御提升" + "text": "水的包容属性防御提升" }, "comicon": "Defense", "lv": 1, @@ -1677,7 +1677,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_54", - "text": "共情属性防御提升" + "text": "水的包容属性防御提升" }, "comicon": "Defense", "lv": 2, @@ -1710,7 +1710,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_55", - "text": "共情属性防御提升" + "text": "水的包容属性防御提升" }, "comicon": "Defense", "lv": 3, @@ -1737,7 +1737,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_56", - "text": "共情属性生命提升" + "text": "水的包容属性生命提升" }, "comicon": "Life", "lv": 0, @@ -1770,7 +1770,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_57", - "text": "共情属性生命提升" + "text": "水的包容属性生命提升" }, "comicon": "Life", "lv": 1, @@ -1803,7 +1803,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_58", - "text": "共情属性生命提升" + "text": "水的包容属性生命提升" }, "comicon": "Life", "lv": 2, @@ -1836,7 +1836,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_59", - "text": "共情属性生命提升" + "text": "水的包容属性生命提升" }, "comicon": "Life", "lv": 3, @@ -2142,7 +2142,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_69", - "text": "责任属性攻击提升" + "text": "光的荣耀属性攻击提升" }, "comicon": "Attack", "lv": 0, @@ -2175,7 +2175,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_70", - "text": "责任属性攻击提升" + "text": "光的荣耀属性攻击提升" }, "comicon": "Attack", "lv": 1, @@ -2208,7 +2208,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_71", - "text": "责任属性攻击提升" + "text": "光的荣耀属性攻击提升" }, "comicon": "Attack", "lv": 2, @@ -2241,7 +2241,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_72", - "text": "责任属性攻击提升" + "text": "光的荣耀属性攻击提升" }, "comicon": "Attack", "lv": 3, @@ -2268,7 +2268,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_73", - "text": "责任属性防御提升" + "text": "光的荣耀属性防御提升" }, "comicon": "Defense", "lv": 0, @@ -2301,7 +2301,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_74", - "text": "责任属性防御提升" + "text": "光的荣耀属性防御提升" }, "comicon": "Defense", "lv": 1, @@ -2334,7 +2334,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_75", - "text": "责任属性防御提升" + "text": "光的荣耀属性防御提升" }, "comicon": "Defense", "lv": 2, @@ -2367,7 +2367,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_76", - "text": "责任属性防御提升" + "text": "光的荣耀属性防御提升" }, "comicon": "Defense", "lv": 3, @@ -2394,7 +2394,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_77", - "text": "责任属性生命提升" + "text": "光的荣耀属性生命提升" }, "comicon": "Life", "lv": 0, @@ -2427,7 +2427,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_78", - "text": "责任属性生命提升" + "text": "光的荣耀属性生命提升" }, "comicon": "Life", "lv": 1, @@ -2460,7 +2460,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_79", - "text": "责任属性生命提升" + "text": "光的荣耀属性生命提升" }, "comicon": "Life", "lv": 2, @@ -2493,7 +2493,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_80", - "text": "责任属性生命提升" + "text": "光的荣耀属性生命提升" }, "comicon": "Life", "lv": 3, diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 78cd323a6..88fa35182 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -700,11 +700,11 @@ "img": "wp_icon_10020", "intr": { "key": "item_item_intr_14", - "text": "蕴含着真诚力量的圣枝，用于属性招募抽取守护者。" + "text": "蕴含着火的热情力量的圣枝，用于属性招募抽取守护者。" }, "describe": { "key": "item_item_describe_14", - "text": "熊熊燃烧的火焰，热情的红色，就像那些真诚直率的守护者。" + "text": "熊熊燃烧的火焰，热情的红色，就像那些热情直率的守护者。" }, "dialogue": { "key": "item_item_dialogue_14", @@ -748,7 +748,7 @@ "img": "wp_icon_10021", "intr": { "key": "item_item_intr_15", - "text": "蕴含着直觉力量的圣枝，用于属性招募抽取守护者。" + "text": "蕴含着林的感观力量的圣枝，用于属性招募抽取守护者。" }, "describe": { "key": "item_item_describe_15", @@ -796,7 +796,7 @@ "img": "wp_icon_10022", "intr": { "key": "item_item_intr_16", - "text": "蕴含着共情力量的圣枝，用于属性招募抽取守护者。" + "text": "蕴含着水的包容力量的圣枝，用于属性招募抽取守护者。" }, "describe": { "key": "item_item_describe_16", @@ -844,7 +844,7 @@ "img": "wp_icon_10024", "intr": { "key": "item_item_intr_17", - "text": "蕴含着责任力量的圣枝，用于属性招募抽取守护者。" + "text": "蕴含着光的荣耀力量的圣枝，用于属性招募抽取守护者。" }, "describe": { "key": "item_item_describe_17", @@ -892,7 +892,7 @@ "img": "wp_icon_10020", "intr": { "key": "item_item_intr_18", - "text": "蕴含着真诚力量的圣枝的碎片，消耗10个可用于属性招募抽取守护者。" + "text": "蕴含着火的热情力量的圣枝的碎片，消耗10个可用于属性招募抽取守护者。" }, "describe": { "key": "item_item_describe_18", @@ -940,7 +940,7 @@ "img": "wp_icon_10021", "intr": { "key": "item_item_intr_19", - "text": "蕴含着直觉力量的圣枝的碎片，消耗10个可用于属性招募抽取守护者。" + "text": "蕴含着林的感观力量的圣枝的碎片，消耗10个可用于属性招募抽取守护者。" }, "describe": { "key": "item_item_describe_19", @@ -988,7 +988,7 @@ "img": "wp_icon_10022", "intr": { "key": "item_item_intr_20", - "text": "蕴含着共情力量的圣枝的碎片，消耗10个可用于属性招募抽取守护者。" + "text": "蕴含着水的包容力量的圣枝的碎片，消耗10个可用于属性招募抽取守护者。" }, "describe": { "key": "item_item_describe_20", @@ -1036,7 +1036,7 @@ "img": "wp_icon_10024", "intr": { "key": "item_item_intr_21", - "text": "蕴含着责任力量的圣枝的碎片，消耗10个可用于属性招募抽取守护者。" + "text": "蕴含着光的荣耀力量的圣枝的碎片，消耗10个可用于属性招募抽取守护者。" }, "describe": { "key": "item_item_describe_21", @@ -12286,11 +12286,11 @@ "img": "item_15000101", "intr": { "key": "item_item_intr_252", - "text": "猎魂头目的初级掉落物，可在守护者界面提升真诚属性守护者的回响等级。" + "text": "猎魂头目的初级掉落物，可在守护者界面提升火的热情属性守护者的回响等级。" }, "describe": { "key": "item_item_describe_252", - "text": "小小的火花，发出噼啪之声，会主动向人靠近。猎魂头目的初级掉落物，可用于真诚阵营守护者回响。" + "text": "小小的火花，发出噼啪之声，会主动向人靠近。猎魂头目的初级掉落物，可用于火的热情阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_250", @@ -12346,11 +12346,11 @@ "img": "item_15000102", "intr": { "key": "item_item_intr_253", - "text": "猎魂头目的初级掉落物，可在守护者界面提升直觉属性守护者的回响等级。" + "text": "猎魂头目的初级掉落物，可在守护者界面提升林的感观属性守护者的回响等级。" }, "describe": { "key": "item_item_describe_253", - "text": "细密的水滴，发出滴答之声，若抱着友好的态度靠近，它不会抗拒。猎魂头目的初级掉落物，可用于直觉阵营守护者回响。" + "text": "细密的水滴，发出滴答之声，若抱着友好的态度靠近，它不会抗拒。猎魂头目的初级掉落物，可用于林的感观阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_251", @@ -12406,11 +12406,11 @@ "img": "item_15000103", "intr": { "key": "item_item_intr_254", - "text": "猎魂头目的初级掉落物，可在守护者界面提升共情属性守护者的回响等级。" + "text": "猎魂头目的初级掉落物，可在守护者界面提升水的包容属性守护者的回响等级。" }, "describe": { "key": "item_item_describe_254", - "text": "古老的朽木，几乎无声无息，只是在一处静止不动。猎魂头目的初级掉落物，可用于共情阵营守护者回响。" + "text": "古老的朽木，几乎无声无息，只是在一处静止不动。猎魂头目的初级掉落物，可用于水的包容阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_252", @@ -12466,11 +12466,11 @@ "img": "item_15000104", "intr": { "key": "item_item_intr_255", - "text": "猎魂头目的初级掉落物，可在守护者界面提升责任属性守护者的回响等级。" + "text": "猎魂头目的初级掉落物，可在守护者界面提升光的荣耀属性守护者的回响等级。" }, "describe": { "key": "item_item_describe_255", - "text": "微弱的光芒，忽明忽暗，四处飘散，照亮漆黑的路。猎魂头目的初级掉落物，可用于责任阵营守护者回响。" + "text": "微弱的光芒，忽明忽暗，四处飘散，照亮漆黑的路。猎魂头目的初级掉落物，可用于光的荣耀阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_253", @@ -12538,11 +12538,11 @@ "img": "item_15000201", "intr": { "key": "item_item_intr_256", - "text": "猎魂头目的中级掉落物，可在守护者界面提升真诚属性守护者的回响等级。" + "text": "猎魂头目的中级掉落物，可在守护者界面提升火的热情属性守护者的回响等级。" }, "describe": { "key": "item_item_describe_256", - "text": "燃烧的烈焰，散发着滚烫的热气，会围绕着人转动。猎魂头目的中级掉落物，可用于真诚阵营守护者回响。" + "text": "燃烧的烈焰，散发着滚烫的热气，会围绕着人转动。猎魂头目的中级掉落物，可用于火的热情阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_254", @@ -12610,11 +12610,11 @@ "img": "item_15000202", "intr": { "key": "item_item_intr_257", - "text": "猎魂头目的中级掉落物，可在守护者界面提升直觉属性守护者的回响等级。" + "text": "猎魂头目的中级掉落物，可在守护者界面提升林的感观属性守护者的回响等级。" }, "describe": { "key": "item_item_describe_257", - "text": "澎湃的浪花，散发着冰冷的海气，只是静静团成一团。猎魂头目的中级掉落物，可用于直觉阵营守护者回响。" + "text": "澎湃的浪花，散发着冰冷的海气，只是静静团成一团。猎魂头目的中级掉落物，可用于林的感观阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_255", @@ -12682,11 +12682,11 @@ "img": "item_15000203", "intr": { "key": "item_item_intr_258", - "text": "猎魂头目的中级掉落物，可在守护者界面提升共情属性守护者的回响等级。" + "text": "猎魂头目的中级掉落物，可在守护者界面提升水的包容属性守护者的回响等级。" }, "describe": { "key": "item_item_describe_258", - "text": "蜿蜒的荆枝，散发着温暖的木香，以肉眼轻微可察觉的状态生长着。猎魂头目的中级掉落物，可用于共情阵营守护者回响。" + "text": "蜿蜒的荆枝，散发着温暖的木香，以肉眼轻微可察觉的状态生长着。猎魂头目的中级掉落物，可用于水的包容阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_256", @@ -12754,11 +12754,11 @@ "img": "item_15000204", "intr": { "key": "item_item_intr_259", - "text": "猎魂头目的中级掉落物，可在守护者界面提升责任属性守护者的回响等级。" + "text": "猎魂头目的中级掉落物，可在守护者界面提升光的荣耀属性守护者的回响等级。" }, "describe": { "key": "item_item_describe_259", - "text": "明亮的阳光，散发着生机的朝气，在岔路口点亮前方的路。猎魂头目的中级掉落物，可用于责任阵营守护者回响。" + "text": "明亮的阳光，散发着生机的朝气，在岔路口点亮前方的路。猎魂头目的中级掉落物，可用于光的荣耀阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_257", @@ -12814,11 +12814,11 @@ "img": "item_15000301", "intr": { "key": "item_item_intr_260", - "text": "猎魂头目的高级掉落物，可在守护者界面提升真诚属性守护者的回响等级。" + "text": "猎魂头目的高级掉落物，可在守护者界面提升火的热情属性守护者的回响等级。" }, "describe": { "key": "item_item_describe_260", - "text": "爆裂的火炎球，仿佛下一秒就要将靠近的人炸得粉身碎骨，空气中充满了火药味。猎魂头目的高级掉落物，可用于真诚阵营守护者回响。" + "text": "爆裂的火炎球，仿佛下一秒就要将靠近的人炸得粉身碎骨，空气中充满了火药味。猎魂头目的高级掉落物，可用于火的热情阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_258", @@ -12874,11 +12874,11 @@ "img": "item_15000302", "intr": { "key": "item_item_intr_261", - "text": "猎魂头目的高级掉落物，可在守护者界面提升直觉属性守护者的回响等级。" + "text": "猎魂头目的高级掉落物，可在守护者界面提升林的感观属性守护者的回响等级。" }, "describe": { "key": "item_item_describe_261", - "text": "汹涌的滔天巨浪，会将冒犯者囫囵淹没，浓烈的海腥味令人窒息。猎魂头目的高级掉落物，可用于直觉阵营守护者回响。" + "text": "汹涌的滔天巨浪，会将冒犯者囫囵淹没，浓烈的海腥味令人窒息。猎魂头目的高级掉落物，可用于林的感观阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_259", @@ -12934,11 +12934,11 @@ "img": "item_15000303", "intr": { "key": "item_item_intr_262", - "text": "猎魂头目的高级掉落物，可在守护者界面提升共情属性守护者的回响等级。" + "text": "猎魂头目的高级掉落物，可在守护者界面提升水的包容属性守护者的回响等级。" }, "describe": { "key": "item_item_describe_262", - "text": "交错环绕的林木，以飞快的速度疯狂生长着。虽是木枝，却弥漫着馥郁的花香。猎魂头目的高级掉落物，可用于共情阵营守护者回响。" + "text": "交错环绕的林木，以飞快的速度疯狂生长着。虽是木枝，却弥漫着馥郁的花香。猎魂头目的高级掉落物，可用于水的包容阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_260", @@ -12994,11 +12994,11 @@ "img": "item_15000304", "intr": { "key": "item_item_intr_263", - "text": "猎魂头目的高级掉落物，可在守护者界面提升责任属性守护者的回响等级。" + "text": "猎魂头目的高级掉落物，可在守护者界面提升光的荣耀属性守护者的回响等级。" }, "describe": { "key": "item_item_describe_263", - "text": "绚丽夺目的天光，辉煌覆盖了肉眼所见的一切。无形无味，却给人纯净之感。猎魂头目的高级掉落物，可用于责任阵营守护者回响。" + "text": "绚丽夺目的天光，辉煌覆盖了肉眼所见的一切。无形无味，却给人纯净之感。猎魂头目的高级掉落物，可用于光的荣耀阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_261", @@ -15127,7 +15127,7 @@ "id": "17050002", "name": { "key": "item_item_name_306", - "text": "5星真诚自选宝箱" + "text": "5星火的热情自选宝箱" }, "usetype": 4, "color": 5, @@ -15150,11 +15150,11 @@ "img": "item_17050002", "intr": { "key": "item_item_intr_308", - "text": "开启后，可以从5星真诚属性守护者中自选一名守护者。" + "text": "开启后，可以从5星火的热情属性守护者中自选一名守护者。" }, "describe": { "key": "item_item_describe_308", - "text": "5星真诚自选宝箱。" + "text": "5星火的热情自选宝箱。" }, "dialogue": { "key": "item_item_dialogue_306", @@ -15173,7 +15173,7 @@ "id": "17050003", "name": { "key": "item_item_name_307", - "text": "5星直觉自选宝箱" + "text": "5星林的感观自选宝箱" }, "usetype": 4, "color": 5, @@ -15196,11 +15196,11 @@ "img": "item_17050003", "intr": { "key": "item_item_intr_309", - "text": "开启后，可以从5星直觉属性守护者中自选一名守护者。" + "text": "开启后，可以从5星林的感观属性守护者中自选一名守护者。" }, "describe": { "key": "item_item_describe_309", - "text": "5星直觉自选宝箱。" + "text": "5星林的感观自选宝箱。" }, "dialogue": { "key": "item_item_dialogue_307", @@ -15219,7 +15219,7 @@ "id": "17050004", "name": { "key": "item_item_name_308", - "text": "5星共情自选宝箱" + "text": "5星水的包容自选宝箱" }, "usetype": 4, "color": 5, @@ -15242,11 +15242,11 @@ "img": "item_17050004", "intr": { "key": "item_item_intr_310", - "text": "开启后，可以从5星共情属性守护者中自选一名守护者。" + "text": "开启后，可以从5星水的包容属性守护者中自选一名守护者。" }, "describe": { "key": "item_item_describe_310", - "text": "5星共情自选宝箱。" + "text": "5星水的包容自选宝箱。" }, "dialogue": { "key": "item_item_dialogue_308", @@ -15265,7 +15265,7 @@ "id": "17050005", "name": { "key": "item_item_name_309", - "text": "5星责任自选宝箱" + "text": "5星光的荣耀自选宝箱" }, "usetype": 4, "color": 5, @@ -15288,11 +15288,11 @@ "img": "item_17050005", "intr": { "key": "item_item_intr_311", - "text": "开启后，可以从5星责任属性守护者中自选一名守护者。" + "text": "开启后，可以从5星光的荣耀属性守护者中自选一名守护者。" }, "describe": { "key": "item_item_describe_311", - "text": "5星责任自选宝箱。" + "text": "5星光的荣耀自选宝箱。" }, "dialogue": { "key": "item_item_dialogue_309", @@ -15449,7 +15449,7 @@ "id": "17060002", "name": { "key": "item_item_name_313", - "text": "真诚回响材料宝箱" + "text": "火的热情回响材料宝箱" }, "usetype": 4, "color": 5, @@ -15472,11 +15472,11 @@ "img": "item_17060002", "intr": { "key": "item_item_intr_315", - "text": "开启后，可以获得真诚属性守护者的回响材料。" + "text": "开启后，可以获得火的热情属性守护者的回响材料。" }, "describe": { "key": "item_item_describe_315", - "text": "真诚回响材料宝箱。" + "text": "火的热情回响材料宝箱。" }, "dialogue": { "key": "item_item_dialogue_313", @@ -15495,7 +15495,7 @@ "id": "17060003", "name": { "key": "item_item_name_314", - "text": "直觉回响材料宝箱" + "text": "林的感观回响材料宝箱" }, "usetype": 4, "color": 5, @@ -15518,11 +15518,11 @@ "img": "item_17060003", "intr": { "key": "item_item_intr_316", - "text": "开启后，可以获得直觉属性守护者的回响材料。" + "text": "开启后，可以获得林的感观属性守护者的回响材料。" }, "describe": { "key": "item_item_describe_316", - "text": "直觉回响材料宝箱。" + "text": "林的感观回响材料宝箱。" }, "dialogue": { "key": "item_item_dialogue_314", @@ -15541,7 +15541,7 @@ "id": "17060004", "name": { "key": "item_item_name_315", - "text": "共情回响材料宝箱" + "text": "水的包容回响材料宝箱" }, "usetype": 4, "color": 5, @@ -15564,11 +15564,11 @@ "img": "item_17060004", "intr": { "key": "item_item_intr_317", - "text": "开启后，可以获得共情属性守护者的回响材料。" + "text": "开启后，可以获得水的包容属性守护者的回响材料。" }, "describe": { "key": "item_item_describe_317", - "text": "共情回响材料宝箱。" + "text": "水的包容回响材料宝箱。" }, "dialogue": { "key": "item_item_dialogue_315", @@ -15587,7 +15587,7 @@ "id": "17060005", "name": { "key": "item_item_name_316", - "text": "责任回响材料宝箱" + "text": "光的荣耀回响材料宝箱" }, "usetype": 4, "color": 5, @@ -15610,11 +15610,11 @@ "img": "item_17060005", "intr": { "key": "item_item_intr_318", - "text": "开启后，可以获得责任属性守护者的回响材料。" + "text": "开启后，可以获得光的荣耀属性守护者的回响材料。" }, "describe": { "key": "item_item_describe_318", - "text": "责任回响材料宝箱。" + "text": "光的荣耀回响材料宝箱。" }, "dialogue": { "key": "item_item_dialogue_316", @@ -15817,7 +15817,7 @@ "id": "17060010", "name": { "key": "item_item_name_321", - "text": "4星直觉守护者自选箱" + "text": "4星林的感观守护者自选箱" }, "usetype": 4, "color": 3, @@ -15840,11 +15840,11 @@ "img": "item_17060010", "intr": { "key": "item_item_intr_323", - "text": "开启后，从宝箱中自选一名紫色直觉守护者的碎片" + "text": "开启后，从宝箱中自选一名紫色林的感观守护者的碎片" }, "describe": { "key": "item_item_describe_323", - "text": "紫色直觉守护者自选箱。" + "text": "紫色林的感观守护者自选箱。" }, "dialogue": { "key": "item_item_dialogue_321", @@ -15863,7 +15863,7 @@ "id": "17060011", "name": { "key": "item_item_name_322", - "text": "4星真诚守护者自选箱" + "text": "4星火的热情守护者自选箱" }, "usetype": 4, "color": 3, @@ -15886,11 +15886,11 @@ "img": "item_17060011", "intr": { "key": "item_item_intr_324", - "text": "开启后，从宝箱中自选一名紫色真诚守护者的碎片" + "text": "开启后，从宝箱中自选一名紫色火的热情守护者的碎片" }, "describe": { "key": "item_item_describe_324", - "text": "紫色真诚守护者自选箱。" + "text": "紫色火的热情守护者自选箱。" }, "dialogue": { "key": "item_item_dialogue_322", @@ -15909,7 +15909,7 @@ "id": "17060012", "name": { "key": "item_item_name_323", - "text": "4星共情守护者自选箱" + "text": "4星水的包容守护者自选箱" }, "usetype": 4, "color": 3, @@ -15932,11 +15932,11 @@ "img": "item_17060012", "intr": { "key": "item_item_intr_325", - "text": "开启后，从宝箱中自选一名紫色共情守护者的碎片" + "text": "开启后，从宝箱中自选一名紫色水的包容守护者的碎片" }, "describe": { "key": "item_item_describe_325", - "text": "紫色共情守护者自选箱。" + "text": "紫色水的包容守护者自选箱。" }, "dialogue": { "key": "item_item_dialogue_323", diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index a471ad8eb..b8d71cb72 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -173,7 +173,7 @@ 100101 ], "previoustage": 0, - "Episodetype": 1, + "Episodetype": 7, "is_near": 0, "openlevel": 1, "EditorStage": 0, @@ -216,57 +216,19 @@ "text": "竟被原始人当成抢鸟蛋的人，为了打听月光原石的下落得快些解开误会。" }, "exp": 0, - "hero_exp": 300, - "ps_consume": [ - { - "a": "attr", - "t": "ps", - "n": 9 - } - ], - "ps_mg": [ - { - "a": "attr", - "t": "ps", - "n": 1 - } - ], - "firstaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "lotteryward": 17110110, - "commonaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "BattleReadyID": 204, - "FormatList": [ - 101011 - ], + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], "helphero": [], "banhero": [], - "star": [ - 1, - 1, - 1 - ], - "star_type": [ - 1, - 2, - 2 - ], - "star_value": [ - 0, - 2, - 1 - ], + "star": [], + "star_type": [], + "star_value": [], "challengeward": 0 }, { @@ -485,7 +447,7 @@ 100104 ], "previoustage": 0, - "Episodetype": 1, + "Episodetype": 7, "is_near": 0, "openlevel": 1, "EditorStage": 0, @@ -528,57 +490,19 @@ "text": "竟被原始人当成抢鸟蛋的人，为了打听月光原石的下落得快些解开误会。" }, "exp": 0, - "hero_exp": 300, - "ps_consume": [ - { - "a": "attr", - "t": "ps", - "n": 9 - } - ], - "ps_mg": [ - { - "a": "attr", - "t": "ps", - "n": 1 - } - ], - "firstaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "lotteryward": 17110110, - "commonaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "BattleReadyID": 204, - "FormatList": [ - 101011 - ], + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], "helphero": [], "banhero": [], - "star": [ - 1, - 1, - 1 - ], - "star_type": [ - 1, - 2, - 2 - ], - "star_value": [ - 0, - 2, - 1 - ], + "star": [], + "star_type": [], + "star_value": [], "challengeward": 0 }, { @@ -589,7 +513,7 @@ 100105 ], "previoustage": 0, - "Episodetype": 1, + "Episodetype": 7, "is_near": 0, "openlevel": 1, "EditorStage": 0, @@ -632,57 +556,19 @@ "text": "竟被原始人当成抢鸟蛋的人，为了打听月光原石的下落得快些解开误会。" }, "exp": 0, - "hero_exp": 300, - "ps_consume": [ - { - "a": "attr", - "t": "ps", - "n": 9 - } - ], - "ps_mg": [ - { - "a": "attr", - "t": "ps", - "n": 1 - } - ], - "firstaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "lotteryward": 17110110, - "commonaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "BattleReadyID": 204, - "FormatList": [ - 101011 - ], + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], "helphero": [], "banhero": [], - "star": [ - 1, - 1, - 1 - ], - "star_type": [ - 1, - 2, - 2 - ], - "star_value": [ - 0, - 2, - 1 - ], + "star": [], + "star_type": [], + "star_value": [], "challengeward": 0 }, { @@ -797,7 +683,7 @@ 100107 ], "previoustage": 0, - "Episodetype": 1, + "Episodetype": 7, "is_near": 0, "openlevel": 1, "EditorStage": 0, @@ -840,57 +726,19 @@ "text": "竟被原始人当成抢鸟蛋的人，为了打听月光原石的下落得快些解开误会。" }, "exp": 0, - "hero_exp": 300, - "ps_consume": [ - { - "a": "attr", - "t": "ps", - "n": 9 - } - ], - "ps_mg": [ - { - "a": "attr", - "t": "ps", - "n": 1 - } - ], - "firstaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "lotteryward": 17110110, - "commonaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "BattleReadyID": 204, - "FormatList": [ - 101011 - ], + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], "helphero": [], "banhero": [], - "star": [ - 1, - 1, - 1 - ], - "star_type": [ - 1, - 2, - 2 - ], - "star_value": [ - 0, - 2, - 1 - ], + "star": [], + "star_type": [], + "star_value": [], "challengeward": 0 }, { @@ -1213,7 +1061,7 @@ 100111 ], "previoustage": 0, - "Episodetype": 1, + "Episodetype": 7, "is_near": 0, "openlevel": 1, "EditorStage": 0, @@ -1256,57 +1104,19 @@ "text": "竟被原始人当成抢鸟蛋的人，为了打听月光原石的下落得快些解开误会。" }, "exp": 0, - "hero_exp": 300, - "ps_consume": [ - { - "a": "attr", - "t": "ps", - "n": 9 - } - ], - "ps_mg": [ - { - "a": "attr", - "t": "ps", - "n": 1 - } - ], - "firstaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "lotteryward": 17110110, - "commonaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "BattleReadyID": 204, - "FormatList": [ - 101011 - ], + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], "helphero": [], "banhero": [], - "star": [ - 1, - 1, - 1 - ], - "star_type": [ - 1, - 2, - 2 - ], - "star_value": [ - 0, - 2, - 1 - ], + "star": [], + "star_type": [], + "star_value": [], "challengeward": 0 }, { @@ -1317,7 +1127,7 @@ 100112 ], "previoustage": 0, - "Episodetype": 1, + "Episodetype": 7, "is_near": 0, "openlevel": 1, "EditorStage": 0, @@ -1360,57 +1170,19 @@ "text": "竟被原始人当成抢鸟蛋的人，为了打听月光原石的下落得快些解开误会。" }, "exp": 0, - "hero_exp": 300, - "ps_consume": [ - { - "a": "attr", - "t": "ps", - "n": 9 - } - ], - "ps_mg": [ - { - "a": "attr", - "t": "ps", - "n": 1 - } - ], - "firstaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "lotteryward": 17110110, - "commonaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "BattleReadyID": 204, - "FormatList": [ - 101011 - ], + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], "helphero": [], "banhero": [], - "star": [ - 1, - 1, - 1 - ], - "star_type": [ - 1, - 2, - 2 - ], - "star_value": [ - 0, - 2, - 1 - ], + "star": [], + "star_type": [], + "star_value": [], "challengeward": 0 }, { diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 8072dee56..35953a56d 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -238281,7 +238281,7 @@ }, { "Id": 720017, - "pos": 4, + "pos": 1, "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, @@ -238301,7 +238301,7 @@ }, { "Id": 720017, - "pos": 5, + "pos": 2, "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, diff --git a/bin/json/game_pandamasjx.json b/bin/json/game_pandamasjx.json index 483041fc7..531b359bd 100644 --- a/bin/json/game_pandamasjx.json +++ b/bin/json/game_pandamasjx.json @@ -15,7 +15,7 @@ "img": "sbkp_js_13002", "intr": { "key": "item_pandamas_jx_intr_1", - "text": "训练直觉守护者时，训练时长提升20%" + "text": "训练林的感观守护者时，训练时长提升20%" }, "standard_text": 25001, "special_text": 25002, @@ -25,7 +25,7 @@ ], "description": { "key": "item_pandamas_jx_description_1", - "text": "训练直觉守护者时，训练时长提升20%" + "text": "训练林的感观守护者时，训练时长提升20%" }, "duration": 200, "exp": 0, @@ -52,7 +52,7 @@ "img": "sbkp_js_13001", "intr": { "key": "item_pandamas_jx_intr_2", - "text": "训练真诚守护者时，训练时长提升20%" + "text": "训练火的热情守护者时，训练时长提升20%" }, "standard_text": 25001, "special_text": 25002, @@ -62,7 +62,7 @@ ], "description": { "key": "item_pandamas_jx_description_2", - "text": "训练真诚守护者时，训练时长提升20%" + "text": "训练火的热情守护者时，训练时长提升20%" }, "duration": 200, "exp": 0, @@ -89,7 +89,7 @@ "img": "sbkp_js_44002", "intr": { "key": "item_pandamas_jx_intr_3", - "text": "训练共情守护者时，训练时长提升20%" + "text": "训练水的包容守护者时，训练时长提升20%" }, "standard_text": 25001, "special_text": 25002, @@ -99,7 +99,7 @@ ], "description": { "key": "item_pandamas_jx_description_3", - "text": "训练共情守护者时，训练时长提升20%" + "text": "训练水的包容守护者时，训练时长提升20%" }, "duration": 200, "exp": 0, @@ -126,7 +126,7 @@ "img": "sbkp_js_24005", "intr": { "key": "item_pandamas_jx_intr_4", - "text": "训练责任守护者时，训练时长提升20%" + "text": "训练光的荣耀守护者时，训练时长提升20%" }, "standard_text": 25001, "special_text": 25002, @@ -136,7 +136,7 @@ ], "description": { "key": "item_pandamas_jx_description_4", - "text": "训练责任守护者时，训练时长提升20%" + "text": "训练光的荣耀守护者时，训练时长提升20%" }, "duration": 200, "exp": 0, @@ -163,7 +163,7 @@ "img": "sbkp_js_14005", "intr": { "key": "item_pandamas_jx_intr_5", - "text": "训练直觉守护者时，经验收益提升10%" + "text": "训练林的感观守护者时，经验收益提升10%" }, "standard_text": 25001, "special_text": 25002, @@ -173,7 +173,7 @@ ], "description": { "key": "item_pandamas_jx_description_5", - "text": "训练直觉守护者时，经验收益提升10%" + "text": "训练林的感观守护者时，经验收益提升10%" }, "duration": 0, "exp": 10, @@ -200,7 +200,7 @@ "img": "sbkp_js_44006", "intr": { "key": "item_pandamas_jx_intr_6", - "text": "训练真诚守护者时，经验收益提升10%" + "text": "训练火的热情守护者时，经验收益提升10%" }, "standard_text": 25001, "special_text": 25002, @@ -210,7 +210,7 @@ ], "description": { "key": "item_pandamas_jx_description_6", - "text": "训练真诚守护者时，经验收益提升10%" + "text": "训练火的热情守护者时，经验收益提升10%" }, "duration": 0, "exp": 10, @@ -237,7 +237,7 @@ "img": "sbkp_js_45003", "intr": { "key": "item_pandamas_jx_intr_7", - "text": "训练共情守护者时，经验收益提升10%" + "text": "训练水的包容守护者时，经验收益提升10%" }, "standard_text": 25001, "special_text": 25002, @@ -247,7 +247,7 @@ ], "description": { "key": "item_pandamas_jx_description_7", - "text": "训练共情守护者时，经验收益提升10%" + "text": "训练水的包容守护者时，经验收益提升10%" }, "duration": 0, "exp": 10, @@ -370,7 +370,7 @@ "img": "sbkp_js_35001", "intr": { "key": "item_pandamas_jx_intr_10", - "text": "训练责任守护者时，经验收益提升10%" + "text": "训练光的荣耀守护者时，经验收益提升10%" }, "standard_text": 25001, "special_text": 25002, @@ -380,7 +380,7 @@ ], "description": { "key": "item_pandamas_jx_description_10", - "text": "训练责任守护者时，经验收益提升10%" + "text": "训练光的荣耀守护者时，经验收益提升10%" }, "duration": 0, "exp": 10, @@ -513,7 +513,7 @@ ], "description": { "key": "item_pandamas_jx_description_13", - "text": "训练直觉守护者时，经验收益提升10%" + "text": "训练林的感观守护者时，经验收益提升10%" }, "duration": 0, "exp": 10, @@ -561,7 +561,7 @@ ], "description": { "key": "item_pandamas_jx_description_14", - "text": "训练真诚守护者时，经验收益提升10%" + "text": "训练火的热情守护者时，经验收益提升10%" }, "duration": 0, "exp": 10, @@ -598,7 +598,7 @@ ], "description": { "key": "item_pandamas_jx_description_15", - "text": "训练共情守护者时，经验收益提升10%" + "text": "训练水的包容守护者时，经验收益提升10%" }, "duration": 0, "exp": 10, @@ -635,7 +635,7 @@ ], "description": { "key": "item_pandamas_jx_description_16", - "text": "训练责任守护者时，经验收益提升10%" + "text": "训练光的荣耀守护者时，经验收益提升10%" }, "duration": 0, "exp": 10, @@ -672,7 +672,7 @@ ], "description": { "key": "item_pandamas_jx_description_17", - "text": "训练直觉守护者，可得2个初级直觉回响材料" + "text": "训练林的感观守护者，可得2个初级林的感观回响材料" }, "duration": 0, "exp": 0, @@ -720,7 +720,7 @@ ], "description": { "key": "item_pandamas_jx_description_18", - "text": "训练真诚守护者，可得2个初级真诚回响材料" + "text": "训练火的热情守护者，可得2个初级火的热情回响材料" }, "duration": 0, "exp": 0, @@ -768,7 +768,7 @@ ], "description": { "key": "item_pandamas_jx_description_19", - "text": "训练共情守护者，可得2个初级共情回响材料" + "text": "训练水的包容守护者，可得2个初级水的包容回响材料" }, "duration": 0, "exp": 0, @@ -816,7 +816,7 @@ ], "description": { "key": "item_pandamas_jx_description_20", - "text": "训练共情守护者，可得2个初级责任回响材料" + "text": "训练水的包容守护者，可得2个初级光的荣耀回响材料" }, "duration": 0, "exp": 0, diff --git a/bin/json/game_pandamasyxjx.json b/bin/json/game_pandamasyxjx.json index 37563ef84..1c633a452 100644 --- a/bin/json/game_pandamasyxjx.json +++ b/bin/json/game_pandamasyxjx.json @@ -3,7 +3,7 @@ "id": 1, "describe": { "key": "pandamas_pandamas_yxjx_describe_1", - "text": "添加真诚属性的守护者获得额外经验值加成" + "text": "添加火的热情属性的守护者获得额外经验值加成" }, "camp": 1, "occupation": 0, @@ -14,7 +14,7 @@ "id": 2, "describe": { "key": "pandamas_pandamas_yxjx_describe_2", - "text": "添加共情属性的守护者获得额外经验值加成" + "text": "添加水的包容属性的守护者获得额外经验值加成" }, "camp": 2, "occupation": 0, @@ -25,7 +25,7 @@ "id": 3, "describe": { "key": "pandamas_pandamas_yxjx_describe_3", - "text": "添加直觉属性的守护者获得额外经验值加成" + "text": "添加林的感观属性的守护者获得额外经验值加成" }, "camp": 3, "occupation": 0, @@ -36,7 +36,7 @@ "id": 4, "describe": { "key": "pandamas_pandamas_yxjx_describe_4", - "text": "添加责任属性的守护者获得额外经验值加成" + "text": "添加光的荣耀属性的守护者获得额外经验值加成" }, "camp": 4, "occupation": 0, diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 8d5e29dc0..ed4a77d51 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -437,7 +437,7 @@ "Levelid": 0, "datas": [ "GameMain", - "20030_邦尼兔", + "20020_邦尼兔_常驻", "901" ], "event": [ @@ -452,7 +452,7 @@ "Levelid": 0, "datas": [ "GameMain", - "20030_邦尼兔", + "20020_邦尼兔_常驻", "901" ], "event": [ diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 528fa902c..1836ae695 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -6750,9 +6750,7 @@ 250 ], "FollowSK": [], - "SucFollowSK": [ - 915005314 - ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -6806,7 +6804,7 @@ "MustHit": false, "DpsRevisiType": 300, "DpsCondition": "", - "RevisiCondition": "EnemyNoBuff=1", + "RevisiCondition": "EnemyHasBuff=1", "RevisiParams": [] }, { @@ -6824,9 +6822,7 @@ 280 ], "FollowSK": [], - "SucFollowSK": [ - 915005314 - ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -6849,9 +6845,7 @@ 310 ], "FollowSK": [], - "SucFollowSK": [ - 915005314 - ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -6874,9 +6868,7 @@ 350 ], "FollowSK": [], - "SucFollowSK": [ - 915005314 - ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -23331,9 +23323,9 @@ { "Id": 243003311, "EmitPR": 1000, - "From": 4, + "From": 14, "Where": [], - "Order": "", + "Order": "PropertyUp=3", "Limit": 1, "ExecuteCnt": 1, "Type": 5, @@ -23343,10 +23335,10 @@ 200 ], "FollowSK": [], - "SucFollowSK": [ + "SucFollowSK": [], + "FailFollowSK": [ 243003312 ], - "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, "DpsCondition": "", @@ -23356,8 +23348,10 @@ { "Id": 243003312, "EmitPR": 1000, - "From": 13, - "Where": [], + "From": 1, + "Where": [ + "EnemyHpproless=0" + ], "Order": "", "Limit": 1, "ExecuteCnt": 1, @@ -23366,27 +23360,6 @@ 200 ], "FollowSK": [], - "SucFollowSK": [ - 243003313 - ], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 243003313, - "EmitPR": 1000, - "From": 3, - "Where": [], - "Order": "", - "Limit": 1, - "ExecuteCnt": 1, - "Type": 29, - "Argu": [], - "FollowSK": [], "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, @@ -56063,7 +56036,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 391000037, + 391000054, 1000, 1, -1 @@ -56087,7 +56060,7 @@ "ExecuteCnt": 1, "Type": 2, "Argu": [ - 425004311, + 492500431, -1, -1 ], @@ -56438,7 +56411,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 391000037, + 391000054, 1000, 1, -1 @@ -56462,9 +56435,9 @@ "ExecuteCnt": 1, "Type": 2, "Argu": [ - 482500122, + 492500131, -1, - 1 + -1 ], "FollowSK": [], "SucFollowSK": [], @@ -56972,10 +56945,8 @@ { "Id": 915005314, "EmitPR": 1000, - "From": 9, - "Where": [ - "SelfHasBuff=391000072" - ], + "From": 12, + "Where": [], "Order": "", "Limit": 1, "ExecuteCnt": 1, @@ -57004,11 +56975,10 @@ "Order": "", "Limit": 10, "ExecuteCnt": 1, - "Type": 3, + "Type": 2, "Argu": [ - 391000072, - 1000, - 1, + 491500532, + -1, -1 ], "FollowSK": [], @@ -57494,8 +57464,8 @@ }, { "Id": 945003311, - "EmitPR": 0, - "From": 0, + "EmitPR": 1000, + "From": 3, "Where": [], "Order": "", "Limit": 10, @@ -57518,8 +57488,8 @@ }, { "Id": 945003312, - "EmitPR": 0, - "From": 0, + "EmitPR": 1000, + "From": 3, "Where": [], "Order": "", "Limit": 10, @@ -57602,7 +57572,9 @@ 40 ], "FollowSK": [], - "SucFollowSK": [], + "SucFollowSK": [ + 913003314 + ], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -57618,11 +57590,9 @@ "Order": "", "Limit": 1, "ExecuteCnt": 1, - "Type": 5, + "Type": 31, "Argu": [ - 2, - 2, - 40 + 1000 ], "FollowSK": [], "SucFollowSK": [], @@ -57765,7 +57735,7 @@ 390001111, 1000, 1, - 2 + 4 ], "FollowSK": [], "SucFollowSK": [], @@ -57809,7 +57779,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 390001007, + 391000000, 1000, 1, -1 @@ -57833,7 +57803,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 390001007, + 391000074, 1000, 1, -1 @@ -58108,7 +58078,7 @@ { "Id": 924008314, "EmitPR": 1000, - "From": 3, + "From": 12, "Where": [], "Order": "", "Limit": 10, @@ -58551,7 +58521,7 @@ { "Id": 934002311, "EmitPR": 1000, - "From": 4, + "From": 3, "Where": [], "Order": "", "Limit": 10, @@ -58605,7 +58575,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 391000042, + 391000043, 1000, 1, -1 @@ -58888,7 +58858,7 @@ "Argu": [ 391000000, 1000, - -1, + 1, -1 ], "FollowSK": [], @@ -59052,7 +59022,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 391000006, + 391000000, 1000, 1, -1 @@ -59171,7 +59141,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 391000042, + 391000043, 1000, 1, -1 @@ -59313,10 +59283,10 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 391000008, + 391000073, 1000, 1, - 1 + -1 ], "FollowSK": [], "SucFollowSK": [], @@ -59337,10 +59307,10 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 391000048, + 390001130, 1000, 1, - -1 + 2 ], "FollowSK": [], "SucFollowSK": [], @@ -59361,7 +59331,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 391000042, + 391000043, 1000, 1, -1 @@ -59425,7 +59395,7 @@ { "Id": 943006215, "EmitPR": 1000, - "From": 4, + "From": 3, "Where": [], "Order": "", "Limit": 10, @@ -59736,7 +59706,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 390001106, + 391000000, 1000, 1, -1 @@ -59787,7 +59757,7 @@ 390001007, 1000, 1, - 2 + 4 ], "FollowSK": [], "SucFollowSK": [], @@ -59855,7 +59825,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 391000042, + 391000043, 1000, 1, -1 @@ -60807,9 +60777,10 @@ "Order": "", "Limit": 10, "ExecuteCnt": 1, - "Type": 2, + "Type": 3, "Argu": [ - 492300331, + 391000075, + 1000, -1, -1 ], @@ -60879,7 +60850,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 390001004, + 390001001, 1000, 1, 2 @@ -60998,7 +60969,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 390001004, + 391000000, 1000, 1, -1 diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index ce16dff45..2793ec487 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -31363,7 +31363,7 @@ "MaxLV": 2, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_770000111", + "key": "skill_skill_atk_Name_770001111", "text": "疯狂坦克" }, "ico": "", @@ -31381,7 +31381,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_770000111_1", + "key": "skill_skill_atk_Desc_770001111_1", "text": "攻击提升20%。" }, "buffid": [], @@ -38529,7 +38529,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_814002431", + "key": "skill_skill_atk_Name_814002433", "text": "回响三阶段" }, "ico": "", @@ -38547,7 +38547,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_814002431_1", + "key": "skill_skill_atk_Desc_814002433_1", "text": "3技能每次伤害有10%概率额外为目标附加2回合【速度下降】" }, "buffid": [], @@ -38619,7 +38619,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_914002431", + "key": "skill_skill_atk_Name_914002433", "text": "觉醒三阶段" }, "ico": "", @@ -38637,7 +38637,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_914002431_1", + "key": "skill_skill_atk_Desc_914002433_1", "text": "自身受击时有15%概率使用嚣张气焰反击，并为自身回复最大血量10%的血量。" }, "buffid": [], @@ -39039,7 +39039,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_815002411", + "key": "skill_skill_atk_Name_815002412", "text": "回响二阶段" }, "ico": "", @@ -39057,7 +39057,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_815002411_1", + "key": "skill_skill_atk_Desc_815002412_1", "text": "1技能每次攻击时额外夺取目标一个增益" }, "buffid": [], @@ -39069,7 +39069,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_815002422", + "key": "skill_skill_atk_Name_815002423", "text": "回响三阶段" }, "ico": "", @@ -39087,7 +39087,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_815002422_1", + "key": "skill_skill_atk_Desc_815002423_1", "text": "【发号施令】达到8层后为立即获得1回合【无敌】" }, "buffid": [], @@ -39399,7 +39399,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_815004411", + "key": "skill_skill_atk_Name_815004412", "text": "回响二阶段" }, "ico": "", @@ -39417,7 +39417,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_815004411_1", + "key": "skill_skill_atk_Desc_815004412_1", "text": "1技能攻击时额外偷取目标10%行动值" }, "buffid": [], @@ -39429,7 +39429,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_815004422", + "key": "skill_skill_atk_Name_815004423", "text": "回响三阶段" }, "ico": "", @@ -39447,7 +39447,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_815004422_1", + "key": "skill_skill_atk_Desc_815004423_1", "text": "攻击行动值为0的目标时额外附加1回合【眩晕】" }, "buffid": [], @@ -39898,7 +39898,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_923003433_1", - "text": "3技能为己方目标附加2回合【暴击提升】 状态。" + "text": "3技能为己方目标附加2回合【攻击提升】 状态。" }, "buffid": [], "map": "" @@ -40072,7 +40072,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 923004313 + 923004314 ] }, "passSkill": [], @@ -40149,7 +40149,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_824001411", + "key": "skill_skill_atk_Name_824001413", "text": "回响三阶段" }, "ico": "", @@ -40167,7 +40167,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_824001411_1", + "key": "skill_skill_atk_Desc_824001413_1", "text": "1技能若成功击杀目标，则获得额外回合。" }, "buffid": [], @@ -40599,7 +40599,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_924003432", + "key": "skill_skill_atk_Name_924003433", "text": "觉醒三阶段" }, "ico": "", @@ -40617,7 +40617,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_924003432_1", + "key": "skill_skill_atk_Desc_924003433_1", "text": "3技能额外附加2回合【禁疗】状态。" }, "buffid": [], @@ -40629,7 +40629,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_824004422", + "key": "skill_skill_atk_Name_824004421", "text": "回响一阶段" }, "ico": "", @@ -40647,7 +40647,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_824004422_1", + "key": "skill_skill_atk_Desc_824004421_1", "text": "敌方有目标死亡时自身增加20点速度" }, "buffid": [], @@ -40870,7 +40870,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_824005431", + "key": "skill_skill_atk_Name_824005433", "text": "回响三阶段" }, "ico": "", @@ -40888,7 +40888,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_824005431_1", + "key": "skill_skill_atk_Desc_824005433_1", "text": "3技能新增为随机1个友方附加2回合【不灭金身】" }, "buffid": [], @@ -41950,7 +41950,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_833002411", + "key": "skill_skill_atk_Name_833002413", "text": "回响三阶段" }, "ico": "", @@ -41968,7 +41968,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_833002411_1", + "key": "skill_skill_atk_Desc_833002413_1", "text": "释放1技能时有50%概率额外附加2回合【攻击下降】" }, "buffid": [], @@ -43134,7 +43134,8 @@ "Target": 0, "ChildSkill": { "Id": [ - 934007313 + 934007313, + 934007314 ] }, "passSkill": [], @@ -43903,7 +43904,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_835005421", + "key": "skill_skill_atk_Name_835005422", "text": "回响二阶段" }, "ico": "", @@ -43921,7 +43922,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_835005421_1", + "key": "skill_skill_atk_Desc_835005422_1", "text": "2技能30%概率附带1回合【攻击下降】" }, "buffid": [], @@ -43933,7 +43934,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_835005422", + "key": "skill_skill_atk_Name_835005423", "text": "回响三阶段" }, "ico": "", @@ -43952,7 +43953,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_835005422_1", + "key": "skill_skill_atk_Desc_835005423_1", "text": "攻击时附带消耗自身血量5%，附带消耗血量100%的伤害" }, "buffid": [], @@ -44684,7 +44685,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_943003311", + "key": "skill_skill_atk_Name_943003431", "text": "觉醒一阶段" }, "ico": "", @@ -44702,7 +44703,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_943003311_1", + "key": "skill_skill_atk_Desc_943003431_1", "text": "3技能最终治疗量增加10%" }, "buffid": [], @@ -44714,7 +44715,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_943003312", + "key": "skill_skill_atk_Name_943003432", "text": "觉醒二阶段" }, "ico": "", @@ -44732,7 +44733,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_943003312_1", + "key": "skill_skill_atk_Desc_943003432_1", "text": "增加10%最大血量" }, "buffid": [], @@ -44744,7 +44745,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_943003313", + "key": "skill_skill_atk_Name_943003433", "text": "觉醒三阶段" }, "ico": "", @@ -44762,7 +44763,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_943003313_1", + "key": "skill_skill_atk_Desc_943003433_1", "text": "3技能复活目标后，自身获得额外回合。" }, "buffid": [], @@ -44804,7 +44805,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_843006421", + "key": "skill_skill_atk_Name_843006422", "text": "回响二阶段" }, "ico": "", @@ -44822,7 +44823,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_843006421_1", + "key": "skill_skill_atk_Desc_843006422_1", "text": "自身处于无法行动状态时受到伤害降低16%" }, "buffid": [], @@ -44834,7 +44835,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_843006422", + "key": "skill_skill_atk_Name_843006423", "text": "回响三阶段" }, "ico": "", @@ -44852,7 +44853,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_843006422_1", + "key": "skill_skill_atk_Desc_843006423_1", "text": "附加增益时每个增益回复自身2%最大血量" }, "buffid": [], @@ -44894,7 +44895,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_943006431", + "key": "skill_skill_atk_Name_943006432", "text": "觉醒二阶段" }, "ico": "", @@ -44912,7 +44913,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_943006431_1", + "key": "skill_skill_atk_Desc_943006432_1", "text": "增加10%最大血量" }, "buffid": [], @@ -44924,7 +44925,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_943006432", + "key": "skill_skill_atk_Name_943006433", "text": "觉醒三阶段" }, "ico": "", @@ -44942,7 +44943,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_943006432_1", + "key": "skill_skill_atk_Desc_943006433_1", "text": "目标血量低于50%时额外附加1回合复苏" }, "buffid": [], @@ -45916,7 +45917,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_845003431", + "key": "skill_skill_atk_Name_845003433", "text": "回响三阶段" }, "ico": "", @@ -45934,7 +45935,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_845003431_1", + "key": "skill_skill_atk_Desc_845003433_1", "text": "3技能有25%概率附加2回合【复苏】" }, "buffid": [], @@ -46006,7 +46007,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_945003421", + "key": "skill_skill_atk_Name_945003423", "text": "觉醒三阶段" }, "ico": "", @@ -46024,7 +46025,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_945003421_1", + "key": "skill_skill_atk_Desc_945003423_1", "text": "2技能给复活的角色额外回复15%最大血量" }, "buffid": [], diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 8c8902ab6..f2c213923 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -8456,7 +8456,7 @@ "BuffType": 78, "EffectArgu": [ 3, - 100 + 1000 ], "BufParNum": 1, "RelyCheckArgu": [], @@ -10014,7 +10014,7 @@ "key": "skill_skill_buff_Desc_391000048", "text": "受到的伤害降低5%。" }, - "BuffType": 119, + "BuffType": 117, "EffectArgu": [ -50, 390001119, @@ -10599,7 +10599,7 @@ "golbalbufficon": "", "buffIcon": "", "buffeffect": "", - "buffpos": "", + "buffpos": "根节点", "forbidFloat": 0 }, { @@ -10632,7 +10632,7 @@ "golbalbufficon": "", "buffIcon": "", "buffeffect": "", - "buffpos": "", + "buffpos": "根节点", "forbidFloat": 0 }, { @@ -10663,9 +10663,9 @@ "OverlayTimes": 25, "SameID": false, "golbalbufficon": "", - "buffIcon": "", + "buffIcon": "ty_icon_buff_wjzj", "buffeffect": "", - "buffpos": "", + "buffpos": "根节点", "forbidFloat": 0 }, { @@ -10702,9 +10702,9 @@ "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", - "buffIcon": "", + "buffIcon": "ty_icon_buff_wjzh", "buffeffect": "", - "buffpos": "", + "buffpos": "根节点", "forbidFloat": 0 }, { @@ -10739,9 +10739,9 @@ "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", - "buffIcon": "", + "buffIcon": "ty_icon_buff_bj", "buffeffect": "", - "buffpos": "", + "buffpos": "根节点", "forbidFloat": 0 }, { @@ -10775,7 +10775,7 @@ "golbalbufficon": "", "buffIcon": "", "buffeffect": "", - "buffpos": "", + "buffpos": "根节点", "forbidFloat": 0 }, { @@ -10785,7 +10785,7 @@ "text": "狮子3技能回血标记" }, "Desc": { - "key": "skill_skill_buff_Desc_391000070", + "key": "skill_skill_buff_Desc_391000072", "text": "" }, "BuffType": 0, @@ -10805,7 +10805,107 @@ "golbalbufficon": "", "buffIcon": "", "buffeffect": "", - "buffpos": "", + "buffpos": "根节点", + "forbidFloat": 0 + }, + { + "Id": 391000073, + "Name": { + "key": "skill_skill_buff_Name_391000073", + "text": "暴击时伤害增加30%" + }, + "Desc": { + "key": "skill_skill_buff_Desc_391000073", + "text": "暴击时伤害增加30%" + }, + "BuffType": 133, + "EffectArgu": [ + 3, + 300 + ], + "BufParNum": 1, + "RelyCheckArgu": [], + "CoexistCheckArgu": [], + "Effect": [ + 3 + ], + "AddEffect": false, + "RemoveType": false, + "Priority": 0, + "NotOverlay": 0, + "OverlayTimes": 1, + "SameID": false, + "golbalbufficon": "", + "buffIcon": "", + "buffeffect": "", + "buffpos": "根节点", + "forbidFloat": 0 + }, + { + "Id": 391000074, + "Name": { + "key": "skill_skill_buff_Name_391000074", + "text": "[color=#37d8a9]攻击提升[/color]" + }, + "Desc": { + "key": "skill_skill_buff_Desc_390001477", + "text": "攻击提升10%。" + }, + "BuffType": 20, + "EffectArgu": [ + 22, + 100 + ], + "BufParNum": 1, + "RelyCheckArgu": [], + "CoexistCheckArgu": [], + "Effect": [ + 8 + ], + "AddEffect": false, + "RemoveType": false, + "Priority": 0, + "NotOverlay": 0, + "OverlayTimes": 99, + "SameID": true, + "golbalbufficon": "", + "buffIcon": "", + "buffeffect": "", + "buffpos": "根节点", + "forbidFloat": 0 + }, + { + "Id": 391000075, + "Name": { + "key": "skill_skill_buff_Name_391000001", + "text": "目标血量低于40%时3技能最终治疗量增加" + }, + "Desc": { + "key": "skill_skill_buff_Desc_391000001", + "text": "3技能最终治疗量增加10%" + }, + "BuffType": 79, + "EffectArgu": [ + 3, + 100, + 400 + ], + "BufParNum": 1, + "RelyCheckArgu": [], + "CoexistCheckArgu": [], + "Effect": [ + 3 + ], + "AddEffect": false, + "RemoveType": false, + "Priority": 0, + "NotOverlay": 0, + "OverlayTimes": 1, + "SameID": true, + "golbalbufficon": "", + "buffIcon": "", + "buffeffect": "", + "buffpos": "根节点", "forbidFloat": 0 } ] \ No newline at end of file diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 74b65d6fa..236c90fca 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -1267,7 +1267,7 @@ "MaxEmitTimes": 0, "MaxEmitTimesInRound": 1, "Callback": [ - 234007314 + 234007315 ] }, { @@ -2145,7 +2145,7 @@ "FromCheck": "Target=3", "TargetCheck": "Target=2", "MainSkillCheck": "", - "AfterSkillCheck": "SkillID=255006212", + "AfterSkillCheck": "SkillID=255006213", "BuffCheck": "", "DpsCheck": "", "AddCon": [], @@ -5391,9 +5391,9 @@ "MaxEmitTimes": 0, "MaxEmitTimesInRound": 99, "Callback": [ + 99, 390001401, - 390001404, - 99 + 390001404 ] }, { @@ -7264,7 +7264,7 @@ "Id": 491300311, "When": 2, "FromCheck": "", - "TargetCheck": "Target=2,HasBuff=3390001113", + "TargetCheck": "Target=2,HasBuff=390001113", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -7277,8 +7277,7 @@ "MaxEmitTimes": 0, "MaxEmitTimesInRound": 0, "Callback": [ - 913003313, - 913003314 + 913003313 ] }, { @@ -7543,7 +7542,7 @@ }, { "Id": 491500532, - "When": 5, + "When": 17, "FromCheck": "Target=3", "TargetCheck": "", "MainSkillCheck": "SkillPos=3", @@ -7561,35 +7560,15 @@ 915005314 ] }, - { - "Id": 492300331, - "When": 7, - "FromCheck": "Target=3", - "TargetCheck": "Target=1,Hpproless=400", - "MainSkillCheck": "", - "AfterSkillCheck": "", - "BuffCheck": "", - "DpsCheck": "", - "AddCon": [], - "PasPr": 1000, - "PasCorrection": 0, - "Type": "CallSkillPas", - "MaxEmitTimesInRoundByRole": 0, - "MaxEmitTimes": 0, - "MaxEmitTimesInRound": 0, - "Callback": [ - 923003313 - ] - }, { "Id": 492400831, - "When": 4, - "FromCheck": "", + "When": 16, + "FromCheck": "Target=3", "TargetCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", - "DpsCheck": "", + "DpsCheck": "DmgType=0", "AddCon": [ "RoleALive=34008,HasFriendRole=34008" ], @@ -7681,15 +7660,15 @@ "MaxEmitTimes": 0, "MaxEmitTimesInRound": 99, "Callback": [ - 390001401, - 99 + 99, + 390001401 ] }, { "Id": 493400331, "When": 4, "FromCheck": "", - "TargetCheck": "Target=2,NoBuff=1", + "TargetCheck": "Target=2,NoBuff=3", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -7811,7 +7790,7 @@ "When": 16, "FromCheck": "", "TargetCheck": "Target=1,Hpproless=500", - "MainSkillCheck": "", + "MainSkillCheck": "SkillPos=3", "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", @@ -8247,8 +8226,7 @@ "MaxEmitTimes": 0, "MaxEmitTimesInRound": 0, "Callback": [ - 913003315, - 913003316 + 913003315 ] }, { @@ -8515,8 +8493,8 @@ "Id": 493500231, "When": 16, "FromCheck": "Target=3", - "TargetCheck": "", - "MainSkillCheck": "SkillPos=3", + "TargetCheck": "Target=2", + "MainSkillCheck": "MainSkillID=135002311", "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", @@ -8553,10 +8531,10 @@ }, { "Id": 493500631, - "When": 16, + "When": 20, "FromCheck": "Target=3", "TargetCheck": "", - "MainSkillCheck": "SkillPos=3", + "MainSkillCheck": "MainSkillID=135006311", "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", diff --git a/bin/json/game_vikingboss.json b/bin/json/game_vikingboss.json index b4f5e61a4..ef3277922 100644 --- a/bin/json/game_vikingboss.json +++ b/bin/json/game_vikingboss.json @@ -726,7 +726,7 @@ "text": "冰霜泰坦" }, "difficulty": 1, - "BattleReadyID": 10500002, + "BattleReadyID": 10500003, "captionrecommend": [ 14007, 25003, @@ -785,7 +785,7 @@ "text": "冰霜泰坦" }, "difficulty": 2, - "BattleReadyID": 10500002, + "BattleReadyID": 10500003, "captionrecommend": [ 14007, 25003, @@ -839,7 +839,7 @@ "text": "冰霜泰坦" }, "difficulty": 3, - "BattleReadyID": 10500002, + "BattleReadyID": 10500003, "captionrecommend": [ 14007, 25003, @@ -898,7 +898,7 @@ "text": "冰霜泰坦" }, "difficulty": 4, - "BattleReadyID": 10500002, + "BattleReadyID": 10500003, "captionrecommend": [ 14007, 25003, @@ -952,7 +952,7 @@ "text": "冰霜泰坦" }, "difficulty": 5, - "BattleReadyID": 10500002, + "BattleReadyID": 10500003, "captionrecommend": [ 14007, 25003, @@ -1011,7 +1011,7 @@ "text": "冰霜泰坦" }, "difficulty": 6, - "BattleReadyID": 10500002, + "BattleReadyID": 10500003, "captionrecommend": [ 14007, 25003, @@ -1070,7 +1070,7 @@ "text": "冰霜泰坦" }, "difficulty": 7, - "BattleReadyID": 10500002, + "BattleReadyID": 10500003, "captionrecommend": [ 14007, 25003, @@ -1134,7 +1134,7 @@ "text": "冰霜泰坦" }, "difficulty": 8, - "BattleReadyID": 10500002, + "BattleReadyID": 10500003, "captionrecommend": [ 14007, 25003, @@ -1193,7 +1193,7 @@ "text": "冰霜泰坦" }, "difficulty": 9, - "BattleReadyID": 10500002, + "BattleReadyID": 10500003, "captionrecommend": [ 14007, 25003, @@ -1257,7 +1257,7 @@ "text": "冰霜泰坦" }, "difficulty": 10, - "BattleReadyID": 10500002, + "BattleReadyID": 10500003, "captionrecommend": [ 14007, 25003, @@ -1321,7 +1321,7 @@ "text": "冰霜泰坦" }, "difficulty": 11, - "BattleReadyID": 10500002, + "BattleReadyID": 10500003, "captionrecommend": [ 14007, 25003, @@ -1385,7 +1385,7 @@ "text": "冰霜泰坦" }, "difficulty": 12, - "BattleReadyID": 10500002, + "BattleReadyID": 10500003, "captionrecommend": [ 14007, 25003, @@ -1444,7 +1444,7 @@ "text": "森林泰坦" }, "difficulty": 1, - "BattleReadyID": 10500003, + "BattleReadyID": 10500002, "captionrecommend": [ 25003, 34006, @@ -1502,7 +1502,7 @@ "text": "森林泰坦" }, "difficulty": 2, - "BattleReadyID": 10500003, + "BattleReadyID": 10500002, "captionrecommend": [ 25003, 34006, @@ -1555,7 +1555,7 @@ "text": "森林泰坦" }, "difficulty": 3, - "BattleReadyID": 10500003, + "BattleReadyID": 10500002, "captionrecommend": [ 25003, 34006, @@ -1613,7 +1613,7 @@ "text": "森林泰坦" }, "difficulty": 4, - "BattleReadyID": 10500003, + "BattleReadyID": 10500002, "captionrecommend": [ 25003, 34006, @@ -1666,7 +1666,7 @@ "text": "森林泰坦" }, "difficulty": 5, - "BattleReadyID": 10500003, + "BattleReadyID": 10500002, "captionrecommend": [ 25003, 34006, @@ -1724,7 +1724,7 @@ "text": "森林泰坦" }, "difficulty": 6, - "BattleReadyID": 10500003, + "BattleReadyID": 10500002, "captionrecommend": [ 25003, 34006, @@ -1782,7 +1782,7 @@ "text": "森林泰坦" }, "difficulty": 7, - "BattleReadyID": 10500003, + "BattleReadyID": 10500002, "captionrecommend": [ 25003, 34006, @@ -1845,7 +1845,7 @@ "text": "森林泰坦" }, "difficulty": 8, - "BattleReadyID": 10500003, + "BattleReadyID": 10500002, "captionrecommend": [ 25003, 34006, @@ -1903,7 +1903,7 @@ "text": "森林泰坦" }, "difficulty": 9, - "BattleReadyID": 10500003, + "BattleReadyID": 10500002, "captionrecommend": [ 25003, 34006, @@ -1966,7 +1966,7 @@ "text": "森林泰坦" }, "difficulty": 10, - "BattleReadyID": 10500003, + "BattleReadyID": 10500002, "captionrecommend": [ 25003, 34006, @@ -2029,7 +2029,7 @@ "text": "森林泰坦" }, "difficulty": 11, - "BattleReadyID": 10500003, + "BattleReadyID": 10500002, "captionrecommend": [ 25003, 34006, @@ -2092,7 +2092,7 @@ "text": "森林泰坦" }, "difficulty": 12, - "BattleReadyID": 10500003, + "BattleReadyID": 10500002, "captionrecommend": [ 25003, 34006, From 116962fb5cd45d2e9835711cc73c417916844b8d Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 7 Sep 2023 14:48:46 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E6=AE=B5=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/capturesheep/modelCaptureSheep.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/capturesheep/modelCaptureSheep.go b/modules/capturesheep/modelCaptureSheep.go index 2e3df5381..22d845116 100644 --- a/modules/capturesheep/modelCaptureSheep.go +++ b/modules/capturesheep/modelCaptureSheep.go @@ -45,6 +45,9 @@ func (this *ModelCaptureSheep) queryInfo(uid string) (results *pb.DBCaptureSheep results = &pb.DBCaptureSheep{ Uid: uid, } + if results.Dan, err = this.computedan(results.Integral); err != nil { + return + } err = this.Add(uid, results) } return From 10e8095c9abdac1e8732c3cbb1cf02b472908ba4 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 7 Sep 2023 14:51:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/capturesheep/api_over.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/capturesheep/api_over.go b/modules/capturesheep/api_over.go index 50a9bc816..795f87b5e 100644 --- a/modules/capturesheep/api_over.go +++ b/modules/capturesheep/api_over.go @@ -109,7 +109,7 @@ func (this *apiComp) Over(session comm.IUserSession, req *pb.CapturesheepOverReq } return } - session.SendMsg(string(this.module.GetType()), "info", &pb.CapturesheepOverResp{ + session.SendMsg(string(this.module.GetType()), "over", &pb.CapturesheepOverResp{ Iswin: iswin, Integral: info.Integral, Dan: info.Dan,