From 5c0ff5165b9f0a5114c453dc5927cbb94d20019b Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 27 Sep 2022 21:25:46 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E5=A5=97=E8=A3=85=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/module.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/hero/module.go b/modules/hero/module.go index 0f723eb7e..0e1197d18 100644 --- a/modules/hero/module.go +++ b/modules/hero/module.go @@ -138,7 +138,7 @@ func (this *Hero) SendRdTask(session comm.IUserSession) { equipmap := make(map[int32]map[int32]int32, 0) // k 套装id k1 xx星 v 数量 list := this.GetHeroList(session.GetUserId()) for _, v := range list { - if v.SuiteId != 0 || v.SuiteExtId != 0 { + if v.SuiteId != 0 { if _, ok := equipmap[v.SuiteId]; !ok { equipmap[v.SuiteId] = make(map[int32]int32, 0) } From 69a790966dd292ff995129f6283b80d01ab357f2 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 27 Sep 2022 22:02:07 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E5=85=8B=E9=9A=86=E8=8B=B1=E9=9B=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E9=87=8D=E7=BD=AE=E5=A5=97=E8=A3=85id?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/model_hero.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index 43e49b806..c7f874d73 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -346,12 +346,20 @@ func (this *ModelHero) setEquipment(hero *pb.DBHero) (newHero *pb.DBHero, err er _suiteId = hero.SuiteId _equipID = hero.EquipID _suiteExtId = hero.SuiteExtId + suite1Star := hero.Suite1Star + suite2Star := hero.Suite2Star + suite1Lv := hero.Suite1Lv + suite2Lv := hero.Suite2Lv if hero.IsOverlying && hero.SameCount > 1 { // 克隆一个新的 hero.SameCount -= 1 + hero.Suite1Star = 0 + hero.Suite2Star = 0 + hero.Suite1Lv = 0 + hero.Suite2Lv = 0 hero.SuiteId = 0 - hero.EquipID = make([]string, 6) hero.SuiteExtId = 0 + hero.EquipID = make([]string, 6) newHero = this.CloneNewHero(hero) hero.EquipID = make([]string, 6) hero.SameCount = 1 @@ -363,6 +371,10 @@ func (this *ModelHero) setEquipment(hero *pb.DBHero) (newHero *pb.DBHero, err er update["suiteId"] = _suiteId update["suiteExtId"] = _suiteExtId update["equipID"] = _equipID + update["suite1Star"] = suite1Star + update["suite2Star"] = suite2Star + update["suite1Lv"] = suite1Lv + update["suite2Lv"] = suite2Lv if err = this.ChangeList(hero.Uid, hero.Id, update); err != nil { this.moduleHero.Errorf("%v", err) From e7653fbe3475e048759c2a3049d58be53d11f83a Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Tue, 27 Sep 2022 21:32:44 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/rtask/api_battlefinish.go | 5 +- modules/rtask/condiFindHandle.go | 96 +++++++++++++++---------------- modules/rtask/model_rtask.go | 20 ++++--- 3 files changed, 64 insertions(+), 57 deletions(-) diff --git a/modules/rtask/api_battlefinish.go b/modules/rtask/api_battlefinish.go index dac6f942d..c6600b25f 100644 --- a/modules/rtask/api_battlefinish.go +++ b/modules/rtask/api_battlefinish.go @@ -20,6 +20,8 @@ func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.RtaskBattle return } + this.moduleRtask.Debugf("随机任务请求 rtaskID:%v 完成 subtaskID:%v chooseID:%v", req.RtaskId, req.RtaskSubId, req.ChooseId) + defer func() { rsp := &pb.RtaskFinishPush{ RtaskId: req.RtaskId, @@ -27,8 +29,9 @@ func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.RtaskBattle if err := session.SendMsg(string(this.moduleRtask.GetType()), "finish", rsp); err != nil { code = pb.ErrorCode_SystemError } + this.moduleRtask.Debugf("随机任务完成 rtaskID:%v subtaskID:%v chooseID:%v", req.RtaskId, req.RtaskSubId, req.ChooseId) }() - + // 获取当前任务配置 conf := this.moduleRtask.configure.getRtaskById(req.RtaskId) if conf == nil { diff --git a/modules/rtask/condiFindHandle.go b/modules/rtask/condiFindHandle.go index 7415b3d5b..5316592e9 100644 --- a/modules/rtask/condiFindHandle.go +++ b/modules/rtask/condiFindHandle.go @@ -10,7 +10,7 @@ import ( func (this *ModelRtaskRecord) equalFirstParam(cfg *cfg.GameRdtaskCondiData, vals ...int32) (condiId int32, err error) { //只查询参数于配置相等的情况下设置condiId，否则返回0 if ok, err1 := soEqual(vals[0], cfg.Data1); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } condiId = cfg.Id @@ -19,7 +19,7 @@ func (this *ModelRtaskRecord) equalFirstParam(cfg *cfg.GameRdtaskCondiData, vals func (this *ModelRtaskRecord) greatEqualFirstParam(cfg *cfg.GameRdtaskCondiData, vals ...int32) (condiId int32, err error) { if ok, err1 := soGreatEqual(vals[0], cfg.Data1); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } condiId = cfg.Id @@ -28,7 +28,7 @@ func (this *ModelRtaskRecord) greatEqualFirstParam(cfg *cfg.GameRdtaskCondiData, func (this *ModelRtaskRecord) lessEqualFirstParam(cfg *cfg.GameRdtaskCondiData, vals ...int32) (condiId int32, err error) { if ok, err1 := soLessEqual(vals[0], cfg.Data1); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } condiId = cfg.Id @@ -47,67 +47,67 @@ func (this *ModelRtaskRecord) equalParams(cfg *cfg.GameRdtaskCondiData, vals ... switch paramLen { case 1: if ok, err1 := soEqual(vals[0], cfg.Data1); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } case 2: if ok, err1 := soEqual(vals[0], cfg.Data1); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } case 3: if ok, err1 := soEqual(vals[0], cfg.Data1); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[2], cfg.Data3); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } case 4: if ok, err1 := soEqual(vals[0], cfg.Data1); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[2], cfg.Data3); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[3], cfg.Data4); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } case 5: if ok, err1 := soEqual(vals[0], cfg.Data1); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[2], cfg.Data3); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[3], cfg.Data4); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[4], cfg.Data5); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } default: @@ -130,67 +130,67 @@ func (this *ModelRtaskRecord) greatThanParams(cfg *cfg.GameRdtaskCondiData, vals switch paramLen { case 1: if ok, err1 := soGreatEqual(vals[0], cfg.Data1); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } case 2: if ok, err1 := soGreatEqual(vals[0], cfg.Data1); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } case 3: if ok, err1 := soGreatEqual(vals[0], cfg.Data1); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[2], cfg.Data3); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } case 4: if ok, err1 := soGreatEqual(vals[0], cfg.Data1); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[2], cfg.Data3); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[3], cfg.Data4); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } case 5: if ok, err1 := soGreatEqual(vals[0], cfg.Data1); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[2], cfg.Data3); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[3], cfg.Data4); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[4], cfg.Data5); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } default: @@ -213,67 +213,67 @@ func (this *ModelRtaskRecord) lessThanParams(cfg *cfg.GameRdtaskCondiData, vals switch paramLen { case 1: if ok, err1 := soLessEqual(vals[0], cfg.Data1); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } case 2: if ok, err1 := soLessEqual(vals[0], cfg.Data1); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } case 3: if ok, err1 := soLessEqual(vals[0], cfg.Data1); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[2], cfg.Data3); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } case 4: if ok, err1 := soLessEqual(vals[0], cfg.Data1); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[2], cfg.Data3); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[3], cfg.Data4); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } case 5: if ok, err1 := soLessEqual(vals[0], cfg.Data1); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[2], cfg.Data3); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[3], cfg.Data4); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } if ok, err1 := soGreatEqual(vals[4], cfg.Data5); !ok { - err = errors.WithMessagef(err1, "id: %v type:%v", cfg.Id, cfg.Type) + err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } default: diff --git a/modules/rtask/model_rtask.go b/modules/rtask/model_rtask.go index 3e9b1669a..203b9f9ec 100644 --- a/modules/rtask/model_rtask.go +++ b/modules/rtask/model_rtask.go @@ -75,17 +75,21 @@ func (this *ModelRtask) checkHandle(uid string, frtaskIds []int32, conf *cfg.Gam // 确定选项前的校验 func (this *ModelRtask) checkCondi(uid string, condiId int32) (err error, ok bool) { if condiId == 0 { - return nil, true + return errors.New("condiId is nil"), true } //验证限定条件 var condi *rtaskCondi - if condi, ok = this.moduleRtask.handleMap[condiId]; ok { - if condi.verify != nil { - if ok, err = condi.verify(uid, condi.cfg); !ok { - err = errors.WithMessagef(err, "uid: %v do rtask %v condition not reach", uid, condiId) - return - } - } + if condi, ok = this.moduleRtask.handleMap[condiId]; !ok { + errors.Errorf("condiID: %v handle no found", condiId) + return + } + if condi.verify == nil { + errors.Errorf("condiID: %v", condiId) + return + } + if ok, err = condi.verify(uid, condi.cfg); !ok { + err = errors.WithMessagef(err, "uid: %v do rtask [condiId:%v] condition not reach", uid, condiId) + return } return } From a8f3add1a73d651c0c4ebc80bce56e98827e8b75 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Tue, 27 Sep 2022 21:58:59 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/rtask/api_battlefinish.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/rtask/api_battlefinish.go b/modules/rtask/api_battlefinish.go index c6600b25f..5f74fedc7 100644 --- a/modules/rtask/api_battlefinish.go +++ b/modules/rtask/api_battlefinish.go @@ -69,6 +69,7 @@ func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.RtaskBattle } // 校验完成条件 + var checkCondi bool for _, v := range sideConf.EndTid { if v == -1 { continue @@ -77,9 +78,15 @@ func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.RtaskBattle if err != nil { this.moduleRtask.Error(err.Error()) } - code = pb.ErrorCode_RtaskCondiNoReach - return + this.moduleRtask.Debugf("条件未达成 condiID:%v rtaskId:%v subRtaskId:%v chooseID:%v", v, req.RtaskId, req.RtaskSubId, req.ChooseId) + break } + checkCondi = true + } + + if !checkCondi { + code = pb.ErrorCode_RtaskCondiNoReach + return } // 更新完成的任务 From 50e376655cfc69cf5ab0fcde88e8dd25380ded53 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Tue, 27 Sep 2022 22:43:28 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/rtask/api_battlefinish.go | 21 ++++++++------------- modules/rtask/model_rtask.go | 4 ++-- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/modules/rtask/api_battlefinish.go b/modules/rtask/api_battlefinish.go index 5f74fedc7..dd9bfd0be 100644 --- a/modules/rtask/api_battlefinish.go +++ b/modules/rtask/api_battlefinish.go @@ -22,16 +22,6 @@ func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.RtaskBattle this.moduleRtask.Debugf("随机任务请求 rtaskID:%v 完成 subtaskID:%v chooseID:%v", req.RtaskId, req.RtaskSubId, req.ChooseId) - defer func() { - rsp := &pb.RtaskFinishPush{ - RtaskId: req.RtaskId, - } - if err := session.SendMsg(string(this.moduleRtask.GetType()), "finish", rsp); err != nil { - code = pb.ErrorCode_SystemError - } - this.moduleRtask.Debugf("随机任务完成 rtaskID:%v subtaskID:%v chooseID:%v", req.RtaskId, req.RtaskSubId, req.ChooseId) - }() - // 获取当前任务配置 conf := this.moduleRtask.configure.getRtaskById(req.RtaskId) if conf == nil { @@ -71,9 +61,6 @@ func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.RtaskBattle // 校验完成条件 var checkCondi bool for _, v := range sideConf.EndTid { - if v == -1 { - continue - } if err, ok := this.moduleRtask.modelRtask.checkCondi(session.GetUserId(), v); !ok { if err != nil { this.moduleRtask.Error(err.Error()) @@ -124,5 +111,13 @@ func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.RtaskBattle code = pb.ErrorCode_SystemError } + rsp := &pb.RtaskFinishPush{ + RtaskId: req.RtaskId, + } + if err := session.SendMsg(string(this.moduleRtask.GetType()), "finish", rsp); err != nil { + code = pb.ErrorCode_SystemError + } + this.moduleRtask.Debugf("随机任务完成 rtaskID:%v subtaskID:%v chooseID:%v", req.RtaskId, req.RtaskSubId, req.ChooseId) + return } diff --git a/modules/rtask/model_rtask.go b/modules/rtask/model_rtask.go index 203b9f9ec..422ebf0ef 100644 --- a/modules/rtask/model_rtask.go +++ b/modules/rtask/model_rtask.go @@ -74,8 +74,8 @@ func (this *ModelRtask) checkHandle(uid string, frtaskIds []int32, conf *cfg.Gam // 确定选项前的校验 func (this *ModelRtask) checkCondi(uid string, condiId int32) (err error, ok bool) { - if condiId == 0 { - return errors.New("condiId is nil"), true + if condiId <= 0 { + return nil, true } //验证限定条件 var condi *rtaskCondi From 303edd3b304f4b591c99242bd9df11163da96cf2 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Tue, 27 Sep 2022 23:01:36 +0800 Subject: [PATCH 06/19] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E6=97=B6=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/user/api_create.go | 3 +-- modules/user/api_login.go | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/user/api_create.go b/modules/user/api_create.go index e4ec7a7eb..4e65b9f93 100644 --- a/modules/user/api_create.go +++ b/modules/user/api_create.go @@ -89,7 +89,6 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (c //初始化用户设置 this.module.modelSetting.InitSetting(session.GetUserId()) - //初始化任务 - this.module.ModuleTask.InitTaskAll(self.Uid) + return } diff --git a/modules/user/api_login.go b/modules/user/api_login.go index e613ae938..0cf5f870e 100644 --- a/modules/user/api_login.go +++ b/modules/user/api_login.go @@ -67,6 +67,9 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod log.Errorf("User_CreateUser err %v", err) return } + + //初始化任务 + this.module.ModuleTask.InitTaskAll(user.Uid) isNewUser = true } else { if cu := this.module.modelSession.getUserSession(user.Uid); cu != nil { @@ -140,7 +143,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod // if this.module.ModuleSys.IsAccess("", user.Lv) { this.module.ModuleRtask.InitCondiData(user.Uid) // } - + // 日常登录任务 this.module.ModuleRtask.SendToRtask(session, comm.Rtype7, 1) From 7f438f8cb5c8e7b18c72cb4ea1754ac3e3213361 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Tue, 27 Sep 2022 23:29:13 +0800 Subject: [PATCH 07/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0userexpand?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/v2/ui/tool_gen.go | 34 +++++++++++++++++----------------- cmd/v2/ui/tool_term.go | 8 ++++++-- modules/task/api_receive.go | 6 +++--- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/cmd/v2/ui/tool_gen.go b/cmd/v2/ui/tool_gen.go index 9b0f3b144..28f3e7adc 100644 --- a/cmd/v2/ui/tool_gen.go +++ b/cmd/v2/ui/tool_gen.go @@ -97,23 +97,6 @@ func (this *appGen) LazyInit(obs observer.Observer) error { tmpDir.Text = gt.TmpDir } - // 打开目录 - openFolder := func(entry *widget.Entry) { - dConf := dialog.NewFolderOpen(func(lu fyne.ListableURI, err error) { - if lu == nil { - return - } - entry.Text = lu.Path() - entry.Refresh() - }, toolWin.w) - luri, _ := storage.ListerForURI(storage.NewFileURI(".")) - dConf.SetLocation(luri) - dConf.SetConfirmText("打开") - dConf.SetDismissText("取消") - dConf.Resize(fyne.NewSize(750, 500)) - dConf.Show() - } - form := widget.NewForm( widget.NewFormItem("服务地址", serverAddr), widget.NewFormItem("项目目录", container.NewBorder(nil, nil, nil, widget.NewButtonWithIcon("", theme.FolderIcon(), func() { @@ -392,6 +375,23 @@ func (this *appGen) LazyInit(obs observer.Observer) error { return nil } +// 打开目录 +func openFolder(entry *widget.Entry) { + dConf := dialog.NewFolderOpen(func(lu fyne.ListableURI, err error) { + if lu == nil { + return + } + entry.Text = lu.Path() + entry.Refresh() + }, toolWin.w) + luri, _ := storage.ListerForURI(storage.NewFileURI(".")) + dConf.SetLocation(luri) + dConf.SetConfirmText("打开") + dConf.SetDismissText("取消") + dConf.Resize(fyne.NewSize(750, 500)) + dConf.Show() +} + type fileList struct { selItemIds []string //选择的ID fileTotal int //文件总数 diff --git a/cmd/v2/ui/tool_term.go b/cmd/v2/ui/tool_term.go index 9d7534719..39b28c4d7 100644 --- a/cmd/v2/ui/tool_term.go +++ b/cmd/v2/ui/tool_term.go @@ -44,8 +44,12 @@ func (this *appTerm) LazyInit(obs observer.Observer) error { remoteDir.PlaceHolder = `远程目录` dirForm := widget.NewForm( - &widget.FormItem{Text: "本地目录:", Widget: localDir}, - &widget.FormItem{Text: "远程目录:", Widget: remoteDir}, + widget.NewFormItem("本地目录", container.NewBorder(nil, nil, nil, widget.NewButtonWithIcon("", theme.FolderIcon(), func() { + openFolder(localDir) + }), localDir)), + widget.NewFormItem("远程目录", container.NewBorder(nil, nil, nil, widget.NewButtonWithIcon("", theme.FolderIcon(), func() { + openFolder(remoteDir) + }), remoteDir)), ) // output panel diff --git a/modules/task/api_receive.go b/modules/task/api_receive.go index 08ed92f98..095855851 100644 --- a/modules/task/api_receive.go +++ b/modules/task/api_receive.go @@ -3,7 +3,6 @@ package task import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - "go_dreamfactory/utils" "google.golang.org/protobuf/proto" ) @@ -68,14 +67,15 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq) return } update := make(map[string]interface{}) - if ue.Uid != "" { + if ue != nil { if comm.TaskTag(req.TaskTag) == comm.TASK_DAILY { ue.Activeday = ue.Activeday + conf.Active + update["activeday"] = ue.Activeday } if comm.TaskTag(req.TaskTag) == comm.TASK_WEEKLY { ue.Activeweek = ue.Activeweek + conf.Active + update["activeweek"] = ue.Activeweek } - update = utils.StructToMap(ue) } if len(update) > 0 { From 0a6af317af133b75615ae4daa8e99b55d381db94 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 27 Sep 2022 23:53:16 +0800 Subject: [PATCH 08/19] =?UTF-8?q?=E6=8A=BD=E5=8D=A1=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8D=A1=E6=B1=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_drawcard.json | 363 +++++++++++-------------------- bin/json/game_global.json | 12 +- bin/json/game_hero.json | 2 +- bin/json/game_mainline.json | 2 +- bin/json/game_model.json | 2 +- bin/json/game_monsterformat.json | 6 +- bin/json/game_rdtaskcondi.json | 6 +- bin/json/game_rdtaskside.json | 12 +- bin/json/game_skillafteratk.json | 4 +- bin/json/game_skillbuff.json | 6 +- bin/json/game_skillpassive.json | 6 +- modules/hero/model_hero.go | 9 +- 12 files changed, 164 insertions(+), 266 deletions(-) diff --git a/bin/json/game_drawcard.json b/bin/json/game_drawcard.json index 589c027cf..6c84fbd1f 100644 --- a/bin/json/game_drawcard.json +++ b/bin/json/game_drawcard.json @@ -39,238 +39,139 @@ "key": 5, "recruitment_type": 1, "card_pool_type": "base_pool2", - "star": 3, - "race": 4, - "id": "44006", + "star": 4, + "race": 2, + "id": "25004", "weight": 1000 }, { "key": 6, "recruitment_type": 1, "card_pool_type": "base_pool2", + "star": 5, + "race": 2, + "id": "25004", + "weight": 1000 + }, + { + "key": 7, + "recruitment_type": 1, + "card_pool_type": "base_pool3", + "star": 3, + "race": 2, + "id": "25004", + "weight": 1000 + }, + { + "key": 8, + "recruitment_type": 1, + "card_pool_type": "base_pool3", + "star": 3, + "race": 4, + "id": "44006", + "weight": 1000 + }, + { + "key": 9, + "recruitment_type": 1, + "card_pool_type": "base_pool3", "star": 3, "race": 2, "id": "35001", "weight": 1000 }, { - "key": 7, + "key": 10, "recruitment_type": 1, - "card_pool_type": "base_pool2", + "card_pool_type": "base_pool3", "star": 3, "race": 4, "id": "44005", "weight": 1000 }, { - "key": 8, + "key": 11, "recruitment_type": 1, - "card_pool_type": "base_pool2", + "card_pool_type": "base_pool3", "star": 3, "race": 1, "id": "15004", "weight": 1000 }, { - "key": 9, + "key": 12, "recruitment_type": 1, - "card_pool_type": "base_pool2", + "card_pool_type": "base_pool3", "star": 3, "race": 2, "id": "24002", "weight": 1000 }, { - "key": 10, + "key": 13, "recruitment_type": 1, - "card_pool_type": "base_pool2", + "card_pool_type": "base_pool3", "star": 3, "race": 4, "id": "45003", "weight": 1000 }, { - "key": 11, + "key": 14, "recruitment_type": 1, - "card_pool_type": "base_pool2", + "card_pool_type": "base_pool3", "star": 3, "race": 2, "id": "24004", "weight": 1000 }, { - "key": 12, + "key": 15, "recruitment_type": 1, - "card_pool_type": "base_pool2", + "card_pool_type": "base_pool3", "star": 3, "race": 1, "id": "14003", "weight": 1000 }, { - "key": 13, + "key": 16, "recruitment_type": 1, - "card_pool_type": "base_pool2", + "card_pool_type": "base_pool3", "star": 3, "race": 1, "id": "15005", "weight": 1000 }, { - "key": 14, + "key": 17, "recruitment_type": 1, - "card_pool_type": "base_pool2", + "card_pool_type": "base_pool3", "star": 3, "race": 2, "id": "24003", "weight": 1000 }, - { - "key": 15, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 4, - "race": 3, - "id": "34006", - "weight": 1000 - }, - { - "key": 16, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 4, - "race": 2, - "id": "25001", - "weight": 1000 - }, - { - "key": 17, - "recruitment_type": 1, - "card_pool_type": "base_pool2", - "star": 5, - "race": 1, - "id": "14007", - "weight": 1000 - }, { "key": 18, "recruitment_type": 1, "card_pool_type": "base_pool3", - "star": 3, - "race": 2, - "id": "25004", + "star": 4, + "race": 3, + "id": "34006", "weight": 1000 }, { "key": 19, "recruitment_type": 1, "card_pool_type": "base_pool3", - "star": 3, - "race": 4, - "id": "44006", - "weight": 1000 - }, - { - "key": 20, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 2, - "id": "35001", - "weight": 1000 - }, - { - "key": 21, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 4, - "id": "44005", - "weight": 1000 - }, - { - "key": 22, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 1, - "id": "15004", - "weight": 1000 - }, - { - "key": 23, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 2, - "id": "24002", - "weight": 1000 - }, - { - "key": 24, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 4, - "id": "45003", - "weight": 1000 - }, - { - "key": 25, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 2, - "id": "24004", - "weight": 1000 - }, - { - "key": 26, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 1, - "id": "14003", - "weight": 1000 - }, - { - "key": 27, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 1, - "id": "15005", - "weight": 1000 - }, - { - "key": 28, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 2, - "id": "24003", - "weight": 1000 - }, - { - "key": 29, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 4, - "race": 3, - "id": "34006", - "weight": 1000 - }, - { - "key": 30, - "recruitment_type": 1, - "card_pool_type": "base_pool3", "star": 4, "race": 2, "id": "25001", "weight": 1000 }, { - "key": 31, + "key": 20, "recruitment_type": 1, "card_pool_type": "base_pool3", "star": 5, @@ -279,7 +180,7 @@ "weight": 1000 }, { - "key": 32, + "key": 21, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -288,7 +189,7 @@ "weight": 1000 }, { - "key": 33, + "key": 22, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -297,7 +198,7 @@ "weight": 1000 }, { - "key": 34, + "key": 23, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -306,7 +207,7 @@ "weight": 1000 }, { - "key": 35, + "key": 24, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -315,7 +216,7 @@ "weight": 1000 }, { - "key": 36, + "key": 25, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -324,7 +225,7 @@ "weight": 1000 }, { - "key": 37, + "key": 26, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -333,7 +234,7 @@ "weight": 1000 }, { - "key": 38, + "key": 27, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -342,7 +243,7 @@ "weight": 1000 }, { - "key": 39, + "key": 28, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -351,7 +252,7 @@ "weight": 1000 }, { - "key": 40, + "key": 29, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -360,7 +261,7 @@ "weight": 1000 }, { - "key": 41, + "key": 30, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -369,7 +270,7 @@ "weight": 1000 }, { - "key": 42, + "key": 31, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -378,7 +279,7 @@ "weight": 1000 }, { - "key": 43, + "key": 32, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 4, @@ -387,7 +288,7 @@ "weight": 1000 }, { - "key": 44, + "key": 33, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 4, @@ -396,7 +297,7 @@ "weight": 1000 }, { - "key": 45, + "key": 34, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 5, @@ -405,7 +306,7 @@ "weight": 1000 }, { - "key": 46, + "key": 35, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -414,7 +315,7 @@ "weight": 1000 }, { - "key": 47, + "key": 36, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -423,7 +324,7 @@ "weight": 1000 }, { - "key": 48, + "key": 37, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -432,7 +333,7 @@ "weight": 1000 }, { - "key": 49, + "key": 38, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -441,7 +342,7 @@ "weight": 1000 }, { - "key": 50, + "key": 39, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -450,7 +351,7 @@ "weight": 1000 }, { - "key": 51, + "key": 40, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -459,7 +360,7 @@ "weight": 1000 }, { - "key": 52, + "key": 41, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -468,7 +369,7 @@ "weight": 1000 }, { - "key": 53, + "key": 42, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -477,7 +378,7 @@ "weight": 1000 }, { - "key": 54, + "key": 43, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -486,7 +387,7 @@ "weight": 1000 }, { - "key": 55, + "key": 44, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -495,7 +396,7 @@ "weight": 1000 }, { - "key": 56, + "key": 45, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -504,7 +405,7 @@ "weight": 1000 }, { - "key": 57, + "key": 46, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -513,7 +414,7 @@ "weight": 1000 }, { - "key": 58, + "key": 47, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 5, @@ -522,7 +423,7 @@ "weight": 1000 }, { - "key": 59, + "key": 48, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 5, @@ -531,7 +432,7 @@ "weight": 1000 }, { - "key": 60, + "key": 49, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 5, @@ -540,7 +441,7 @@ "weight": 1000 }, { - "key": 61, + "key": 50, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 5, @@ -549,7 +450,7 @@ "weight": 1000 }, { - "key": 62, + "key": 51, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 3, @@ -558,7 +459,7 @@ "weight": 1000 }, { - "key": 63, + "key": 52, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 3, @@ -567,7 +468,7 @@ "weight": 1000 }, { - "key": 64, + "key": 53, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 3, @@ -576,7 +477,7 @@ "weight": 1000 }, { - "key": 65, + "key": 54, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 3, @@ -585,7 +486,7 @@ "weight": 1000 }, { - "key": 66, + "key": 55, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -594,7 +495,7 @@ "weight": 1000 }, { - "key": 67, + "key": 56, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -603,7 +504,7 @@ "weight": 1000 }, { - "key": 68, + "key": 57, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -612,7 +513,7 @@ "weight": 1000 }, { - "key": 69, + "key": 58, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -621,7 +522,7 @@ "weight": 1000 }, { - "key": 70, + "key": 59, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -630,7 +531,7 @@ "weight": 1000 }, { - "key": 71, + "key": 60, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -639,7 +540,7 @@ "weight": 1000 }, { - "key": 72, + "key": 61, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -648,7 +549,7 @@ "weight": 1000 }, { - "key": 73, + "key": 62, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -657,7 +558,7 @@ "weight": 1000 }, { - "key": 74, + "key": 63, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -666,7 +567,7 @@ "weight": 1000 }, { - "key": 75, + "key": 64, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 5, @@ -675,7 +576,7 @@ "weight": 1000 }, { - "key": 76, + "key": 65, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 5, @@ -684,7 +585,7 @@ "weight": 1000 }, { - "key": 77, + "key": 66, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 5, @@ -693,7 +594,7 @@ "weight": 1000 }, { - "key": 78, + "key": 67, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 5, @@ -702,7 +603,7 @@ "weight": 1000 }, { - "key": 79, + "key": 68, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -711,7 +612,7 @@ "weight": 1000 }, { - "key": 80, + "key": 69, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -720,7 +621,7 @@ "weight": 1000 }, { - "key": 81, + "key": 70, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -729,7 +630,7 @@ "weight": 1000 }, { - "key": 82, + "key": 71, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -738,7 +639,7 @@ "weight": 1000 }, { - "key": 83, + "key": 72, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -747,7 +648,7 @@ "weight": 1000 }, { - "key": 84, + "key": 73, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -756,7 +657,7 @@ "weight": 1000 }, { - "key": 85, + "key": 74, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -765,7 +666,7 @@ "weight": 1000 }, { - "key": 86, + "key": 75, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -774,7 +675,7 @@ "weight": 1000 }, { - "key": 87, + "key": 76, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -783,7 +684,7 @@ "weight": 1000 }, { - "key": 88, + "key": 77, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -792,7 +693,7 @@ "weight": 1000 }, { - "key": 89, + "key": 78, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -801,7 +702,7 @@ "weight": 1000 }, { - "key": 90, + "key": 79, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -810,7 +711,7 @@ "weight": 1000 }, { - "key": 91, + "key": 80, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -819,7 +720,7 @@ "weight": 1000 }, { - "key": 92, + "key": 81, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -828,7 +729,7 @@ "weight": 1000 }, { - "key": 93, + "key": 82, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -837,7 +738,7 @@ "weight": 1000 }, { - "key": 94, + "key": 83, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -846,7 +747,7 @@ "weight": 1000 }, { - "key": 95, + "key": 84, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -855,7 +756,7 @@ "weight": 1000 }, { - "key": 96, + "key": 85, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -864,7 +765,7 @@ "weight": 1000 }, { - "key": 97, + "key": 86, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -873,7 +774,7 @@ "weight": 1000 }, { - "key": 98, + "key": 87, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -882,7 +783,7 @@ "weight": 1000 }, { - "key": 99, + "key": 88, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -891,7 +792,7 @@ "weight": 1000 }, { - "key": 100, + "key": 89, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -900,7 +801,7 @@ "weight": 1000 }, { - "key": 101, + "key": 90, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -909,7 +810,7 @@ "weight": 1000 }, { - "key": 102, + "key": 91, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -918,7 +819,7 @@ "weight": 1000 }, { - "key": 103, + "key": 92, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -927,7 +828,7 @@ "weight": 1000 }, { - "key": 104, + "key": 93, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -936,7 +837,7 @@ "weight": 1000 }, { - "key": 105, + "key": 94, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -945,7 +846,7 @@ "weight": 1000 }, { - "key": 106, + "key": 95, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -954,7 +855,7 @@ "weight": 1000 }, { - "key": 107, + "key": 96, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -963,7 +864,7 @@ "weight": 1000 }, { - "key": 108, + "key": 97, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -972,7 +873,7 @@ "weight": 1000 }, { - "key": 109, + "key": 98, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -981,7 +882,7 @@ "weight": 1000 }, { - "key": 110, + "key": 99, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 5, @@ -990,7 +891,7 @@ "weight": 1000 }, { - "key": 111, + "key": 100, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 5, @@ -999,7 +900,7 @@ "weight": 1000 }, { - "key": 112, + "key": 101, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 5, @@ -1008,7 +909,7 @@ "weight": 1000 }, { - "key": 113, + "key": 102, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 5, diff --git a/bin/json/game_global.json b/bin/json/game_global.json index ea051e51e..a1b63da5a 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -105,21 +105,21 @@ "camp4_pool1": "camp4_pool", "base_pool1": { "s": 0, - "e": 1, + "e": 0, "p": "base_pool1" }, "base_pool2": { - "s": 2, - "e": 200, + "s": 1, + "e": 1, "p": "base_pool2" }, "base_pool3": { - "s": 201, - "e": 1000, + "s": 2, + "e": 200, "p": "base_pool3" }, "base_pool4": { - "s": 1001, + "s": 201, "e": 99999999, "p": "base_pool4" }, diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index e26182e41..90856e420 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -5712,7 +5712,7 @@ "type": 5, "ip": 1, "sd": 1, - "handbook": 1, + "handbook": -1, "prefab": "53001", "rotation": "0|0|0", "icon": "53001", diff --git a/bin/json/game_mainline.json b/bin/json/game_mainline.json index 61702b476..81458f9d3 100644 --- a/bin/json/game_mainline.json +++ b/bin/json/game_mainline.json @@ -46,7 +46,7 @@ "FormatList": [ 101011 ], - "captainId": "240044", + "captainId": "240023", "battlescene": "bg_zhandoulmboss", "award": [ { diff --git a/bin/json/game_model.json b/bin/json/game_model.json index 89d7048c0..90ca1220a 100644 --- a/bin/json/game_model.json +++ b/bin/json/game_model.json @@ -303,7 +303,7 @@ "id": "14007", "preson": "14007", "presonshow": "14007_exhibition", - "presonstory": "14007", + "presonstory": "14007_story", "presondraw": "14007_gachashow", "height": 1, "weight": 1, diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index f7aaf0248..a838d7ce4 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -20109,9 +20109,9 @@ -1, -1 ], - "lv": 4, - "hppro": 2, - "atkpro": 0.3, + "lv": 1, + "hppro": 0.6, + "atkpro": 1.2, "defpro": 1 } ] \ No newline at end of file diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json index fca743eb4..ebee0ca6c 100644 --- a/bin/json/game_rdtaskcondi.json +++ b/bin/json/game_rdtaskcondi.json @@ -37,7 +37,7 @@ "datatype": 2, "type": 4, "inited": [], - "data1": 25004, + "data1": 14007, "data2": 10, "data3": 0, "data4": 0, @@ -204,8 +204,8 @@ -1, -1 ], - "data1": 7, - "data2": 5, + "data1": 1, + "data2": 3, "data3": 0, "data4": 0, "data5": 0 diff --git a/bin/json/game_rdtaskside.json b/bin/json/game_rdtaskside.json index 453c5b67f..b62a0ef2f 100644 --- a/bin/json/game_rdtaskside.json +++ b/bin/json/game_rdtaskside.json @@ -497,11 +497,6 @@ "a": "hero", "t": "44005", "n": 1 - }, - { - "a": "hero", - "t": "25004", - "n": 1 } ] } @@ -681,11 +676,6 @@ "t": "44911", "n": 10 }, - { - "a": "hero", - "t": "25004", - "n": 1 - }, { "a": "attr", "t": "gold", @@ -1315,7 +1305,7 @@ "id": 2029, "objType": 1, "location": "middle", - "point": "model_11", + "point": "model_07", "storyBegin": 328, "Entity": [], "EntityChange": [], diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 12e02de6e..22fb80ae4 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -7533,7 +7533,7 @@ "Where": "", "Order": "", "Limit": 1, - "ExecuteCnt": 1, + "ExecuteCnt": 2, "Type": 1, "Argu": [ 1, @@ -7554,7 +7554,7 @@ "Where": "", "Order": "Type=Rand", "Limit": 1, - "ExecuteCnt": 1, + "ExecuteCnt": 2, "Type": 1, "Argu": [ 1, diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index cbfa6797c..2482d1223 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -579,7 +579,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, - "buffIcon": "", + "buffIcon": "ty_zd_buff_z010", "buffeffect": "", "buffpos": "Bip016 HeadNub" }, @@ -823,7 +823,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, - "buffIcon": "", + "buffIcon": "ty_zd_buff_z010", "buffeffect": "", "buffpos": "Bip026 HeadNub" }, @@ -851,7 +851,7 @@ "RemoveType": true, "OverlayTimes": 3, "SameID": false, - "buffIcon": "", + "buffIcon": "ty_zd_buff_z010", "buffeffect": "", "buffpos": "Bip027 HeadNub" }, diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 3387014bf..3bbac4220 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -382,7 +382,7 @@ "Type": "CallSkillPas", "MaxEmitTimes": 1, "Callback": [ - 124002213 + 224002213 ] }, { @@ -394,8 +394,8 @@ "Type": "CallSkillPas", "MaxEmitTimes": 1, "Callback": [ - 124002111, - 124002112 + 224002111, + 224002112 ] }, { diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index c7f874d73..250051782 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -580,8 +580,15 @@ func (this *ModelHero) CheckPool(drawCount int32, config *cfg.GameGlobalData) (p return config.BasePool2.P } else if config.BasePool3.S <= drawCount && config.BasePool3.E >= drawCount { return config.BasePool3.P + } else if config.BasePool4.S <= drawCount && config.BasePool4.E >= drawCount { + return config.BasePool4.P + } else if config.BasePool5.S <= drawCount && config.BasePool5.E >= drawCount { + return config.BasePool5.P + } else if config.BasePool6.S <= drawCount && config.BasePool6.E >= drawCount { + return config.BasePool6.P } - return config.BasePool4.P + + return config.BasePool7.P } // 通数组里的权重随机命中 返回值为数组的下标 From 64a93d0fb2b1dc182415bff745e3d5d57cf28715 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 27 Sep 2022 23:54:55 +0800 Subject: [PATCH 09/19] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=A1=E6=B1=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_drawcard.json | 819 +++++++++++++++++------ bin/json/game_global.json | 21 +- bin/json/game_hero.json | 4 +- sys/configure/structs/game.globalData.go | 6 + 4 files changed, 647 insertions(+), 203 deletions(-) diff --git a/bin/json/game_drawcard.json b/bin/json/game_drawcard.json index 6c84fbd1f..a61f17982 100644 --- a/bin/json/game_drawcard.json +++ b/bin/json/game_drawcard.json @@ -58,138 +58,30 @@ "recruitment_type": 1, "card_pool_type": "base_pool3", "star": 3, - "race": 2, - "id": "25004", + "race": 3, + "id": "34006", "weight": 1000 }, { "key": 8, "recruitment_type": 1, "card_pool_type": "base_pool3", - "star": 3, - "race": 4, - "id": "44006", + "star": 4, + "race": 3, + "id": "34006", "weight": 1000 }, { "key": 9, "recruitment_type": 1, "card_pool_type": "base_pool3", - "star": 3, - "race": 2, - "id": "35001", - "weight": 1000 - }, - { - "key": 10, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 4, - "id": "44005", - "weight": 1000 - }, - { - "key": 11, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 1, - "id": "15004", - "weight": 1000 - }, - { - "key": 12, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 2, - "id": "24002", - "weight": 1000 - }, - { - "key": 13, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 4, - "id": "45003", - "weight": 1000 - }, - { - "key": 14, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 2, - "id": "24004", - "weight": 1000 - }, - { - "key": 15, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 1, - "id": "14003", - "weight": 1000 - }, - { - "key": 16, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 1, - "id": "15005", - "weight": 1000 - }, - { - "key": 17, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 3, - "race": 2, - "id": "24003", - "weight": 1000 - }, - { - "key": 18, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 4, + "star": 5, "race": 3, "id": "34006", "weight": 1000 }, { - "key": 19, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 4, - "race": 2, - "id": "25001", - "weight": 1000 - }, - { - "key": 20, - "recruitment_type": 1, - "card_pool_type": "base_pool3", - "star": 5, - "race": 1, - "id": "14007", - "weight": 1000 - }, - { - "key": 21, - "recruitment_type": 1, - "card_pool_type": "base_pool4", - "star": 3, - "race": 2, - "id": "25004", - "weight": 1000 - }, - { - "key": 22, + "key": 10, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -198,7 +90,7 @@ "weight": 1000 }, { - "key": 23, + "key": 11, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -207,7 +99,7 @@ "weight": 1000 }, { - "key": 24, + "key": 12, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -216,7 +108,7 @@ "weight": 1000 }, { - "key": 25, + "key": 13, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -225,7 +117,7 @@ "weight": 1000 }, { - "key": 26, + "key": 14, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -234,7 +126,7 @@ "weight": 1000 }, { - "key": 27, + "key": 15, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -243,7 +135,7 @@ "weight": 1000 }, { - "key": 28, + "key": 16, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -252,7 +144,7 @@ "weight": 1000 }, { - "key": 29, + "key": 17, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -261,7 +153,7 @@ "weight": 1000 }, { - "key": 30, + "key": 18, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -270,7 +162,7 @@ "weight": 1000 }, { - "key": 31, + "key": 19, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, @@ -279,21 +171,129 @@ "weight": 1000 }, { - "key": 32, + "key": 20, "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 4, - "race": 3, - "id": "34006", + "race": 4, + "id": "44006", + "weight": 1000 + }, + { + "key": 21, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 4, + "race": 2, + "id": "35001", + "weight": 1000 + }, + { + "key": 22, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 4, + "race": 4, + "id": "44005", + "weight": 1000 + }, + { + "key": 23, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 4, + "race": 1, + "id": "15004", + "weight": 1000 + }, + { + "key": 24, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 4, + "race": 2, + "id": "24002", + "weight": 1000 + }, + { + "key": 25, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 4, + "race": 4, + "id": "45003", + "weight": 1000 + }, + { + "key": 26, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 4, + "race": 2, + "id": "24004", + "weight": 1000 + }, + { + "key": 27, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 4, + "race": 1, + "id": "14003", + "weight": 1000 + }, + { + "key": 28, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 4, + "race": 1, + "id": "15005", + "weight": 1000 + }, + { + "key": 29, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 4, + "race": 2, + "id": "24003", + "weight": 1000 + }, + { + "key": 30, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 5, + "race": 4, + "id": "44006", + "weight": 1000 + }, + { + "key": 31, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 5, + "race": 2, + "id": "35001", + "weight": 1000 + }, + { + "key": 32, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 5, + "race": 4, + "id": "44005", "weight": 1000 }, { "key": 33, "recruitment_type": 1, "card_pool_type": "base_pool4", - "star": 4, - "race": 2, - "id": "25001", + "star": 5, + "race": 1, + "id": "15004", "weight": 1000 }, { @@ -301,12 +301,435 @@ "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 5, + "race": 2, + "id": "24002", + "weight": 1000 + }, + { + "key": 35, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 5, + "race": 4, + "id": "45003", + "weight": 1000 + }, + { + "key": 36, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 5, + "race": 2, + "id": "24004", + "weight": 1000 + }, + { + "key": 37, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 5, + "race": 1, + "id": "14003", + "weight": 1000 + }, + { + "key": 38, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 5, + "race": 1, + "id": "15005", + "weight": 1000 + }, + { + "key": 39, + "recruitment_type": 1, + "card_pool_type": "base_pool4", + "star": 5, + "race": 2, + "id": "24003", + "weight": 1000 + }, + { + "key": 40, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 3, + "race": 4, + "id": "44006", + "weight": 1000 + }, + { + "key": 41, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 3, + "race": 2, + "id": "35001", + "weight": 1000 + }, + { + "key": 42, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 3, + "race": 4, + "id": "44005", + "weight": 1000 + }, + { + "key": 43, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 3, + "race": 1, + "id": "15004", + "weight": 1000 + }, + { + "key": 44, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 3, + "race": 2, + "id": "24002", + "weight": 1000 + }, + { + "key": 45, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 3, + "race": 4, + "id": "45003", + "weight": 1000 + }, + { + "key": 46, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 3, + "race": 2, + "id": "24004", + "weight": 1000 + }, + { + "key": 47, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 3, + "race": 1, + "id": "14003", + "weight": 1000 + }, + { + "key": 48, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 3, + "race": 1, + "id": "15005", + "weight": 1000 + }, + { + "key": 49, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 3, + "race": 2, + "id": "24003", + "weight": 1000 + }, + { + "key": 50, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 4, + "race": 2, + "id": "25004", + "weight": 1000 + }, + { + "key": 51, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 4, + "race": 3, + "id": "34006", + "weight": 1000 + }, + { + "key": 52, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 4, + "race": 2, + "id": "25001", + "weight": 1000 + }, + { + "key": 53, + "recruitment_type": 1, + "card_pool_type": "base_pool5", + "star": 5, "race": 1, "id": "14007", "weight": 1000 }, { - "key": 35, + "key": 54, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 3, + "race": 4, + "id": "44006", + "weight": 1000 + }, + { + "key": 55, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 3, + "race": 2, + "id": "35001", + "weight": 1000 + }, + { + "key": 56, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 3, + "race": 4, + "id": "44005", + "weight": 1000 + }, + { + "key": 57, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 3, + "race": 1, + "id": "15004", + "weight": 1000 + }, + { + "key": 58, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 3, + "race": 2, + "id": "24002", + "weight": 1000 + }, + { + "key": 59, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 3, + "race": 4, + "id": "45003", + "weight": 1000 + }, + { + "key": 60, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 3, + "race": 2, + "id": "24004", + "weight": 1000 + }, + { + "key": 61, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 3, + "race": 1, + "id": "14003", + "weight": 1000 + }, + { + "key": 62, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 3, + "race": 1, + "id": "15005", + "weight": 1000 + }, + { + "key": 63, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 3, + "race": 2, + "id": "24003", + "weight": 1000 + }, + { + "key": 64, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 4, + "race": 2, + "id": "25004", + "weight": 1000 + }, + { + "key": 65, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 4, + "race": 3, + "id": "34006", + "weight": 1000 + }, + { + "key": 66, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 4, + "race": 2, + "id": "25001", + "weight": 1000 + }, + { + "key": 67, + "recruitment_type": 1, + "card_pool_type": "base_pool6", + "star": 5, + "race": 1, + "id": "14007", + "weight": 1000 + }, + { + "key": 68, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, + "race": 4, + "id": "44006", + "weight": 1000 + }, + { + "key": 69, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, + "race": 2, + "id": "35001", + "weight": 1000 + }, + { + "key": 70, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, + "race": 4, + "id": "44005", + "weight": 1000 + }, + { + "key": 71, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, + "race": 1, + "id": "15004", + "weight": 1000 + }, + { + "key": 72, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, + "race": 2, + "id": "24002", + "weight": 1000 + }, + { + "key": 73, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, + "race": 4, + "id": "45003", + "weight": 1000 + }, + { + "key": 74, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, + "race": 2, + "id": "24004", + "weight": 1000 + }, + { + "key": 75, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, + "race": 1, + "id": "14003", + "weight": 1000 + }, + { + "key": 76, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, + "race": 1, + "id": "15005", + "weight": 1000 + }, + { + "key": 77, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 3, + "race": 2, + "id": "24003", + "weight": 1000 + }, + { + "key": 78, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "race": 2, + "id": "25004", + "weight": 1000 + }, + { + "key": 79, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "race": 3, + "id": "34006", + "weight": 1000 + }, + { + "key": 80, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "race": 2, + "id": "25001", + "weight": 1000 + }, + { + "key": 81, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 5, + "race": 1, + "id": "14007", + "weight": 1000 + }, + { + "key": 82, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -315,7 +738,7 @@ "weight": 1000 }, { - "key": 36, + "key": 83, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -324,7 +747,7 @@ "weight": 1000 }, { - "key": 37, + "key": 84, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -333,7 +756,7 @@ "weight": 1000 }, { - "key": 38, + "key": 85, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -342,7 +765,7 @@ "weight": 1000 }, { - "key": 39, + "key": 86, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 3, @@ -351,7 +774,7 @@ "weight": 1000 }, { - "key": 40, + "key": 87, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -360,7 +783,7 @@ "weight": 1000 }, { - "key": 41, + "key": 88, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -369,7 +792,7 @@ "weight": 1000 }, { - "key": 42, + "key": 89, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -378,7 +801,7 @@ "weight": 1000 }, { - "key": 43, + "key": 90, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -387,7 +810,7 @@ "weight": 1000 }, { - "key": 44, + "key": 91, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -396,7 +819,7 @@ "weight": 1000 }, { - "key": 45, + "key": 92, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -405,7 +828,7 @@ "weight": 1000 }, { - "key": 46, + "key": 93, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 4, @@ -414,7 +837,7 @@ "weight": 1000 }, { - "key": 47, + "key": 94, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 5, @@ -423,7 +846,7 @@ "weight": 1000 }, { - "key": 48, + "key": 95, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 5, @@ -432,7 +855,7 @@ "weight": 1000 }, { - "key": 49, + "key": 96, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 5, @@ -441,7 +864,7 @@ "weight": 1000 }, { - "key": 50, + "key": 97, "recruitment_type": 2, "card_pool_type": "camp1_pool", "star": 5, @@ -450,7 +873,7 @@ "weight": 1000 }, { - "key": 51, + "key": 98, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 3, @@ -459,7 +882,7 @@ "weight": 1000 }, { - "key": 52, + "key": 99, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 3, @@ -468,7 +891,7 @@ "weight": 1000 }, { - "key": 53, + "key": 100, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 3, @@ -477,7 +900,7 @@ "weight": 1000 }, { - "key": 54, + "key": 101, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 3, @@ -486,7 +909,7 @@ "weight": 1000 }, { - "key": 55, + "key": 102, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -495,7 +918,7 @@ "weight": 1000 }, { - "key": 56, + "key": 103, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -504,7 +927,7 @@ "weight": 1000 }, { - "key": 57, + "key": 104, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -513,7 +936,7 @@ "weight": 1000 }, { - "key": 58, + "key": 105, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -522,7 +945,7 @@ "weight": 1000 }, { - "key": 59, + "key": 106, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -531,7 +954,7 @@ "weight": 1000 }, { - "key": 60, + "key": 107, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -540,7 +963,7 @@ "weight": 1000 }, { - "key": 61, + "key": 108, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -549,7 +972,7 @@ "weight": 1000 }, { - "key": 62, + "key": 109, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -558,7 +981,7 @@ "weight": 1000 }, { - "key": 63, + "key": 110, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 4, @@ -567,7 +990,7 @@ "weight": 1000 }, { - "key": 64, + "key": 111, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 5, @@ -576,7 +999,7 @@ "weight": 1000 }, { - "key": 65, + "key": 112, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 5, @@ -585,7 +1008,7 @@ "weight": 1000 }, { - "key": 66, + "key": 113, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 5, @@ -594,7 +1017,7 @@ "weight": 1000 }, { - "key": 67, + "key": 114, "recruitment_type": 2, "card_pool_type": "camp2_pool", "star": 5, @@ -603,7 +1026,7 @@ "weight": 1000 }, { - "key": 68, + "key": 115, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -612,7 +1035,7 @@ "weight": 1000 }, { - "key": 69, + "key": 116, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -621,7 +1044,7 @@ "weight": 1000 }, { - "key": 70, + "key": 117, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -630,7 +1053,7 @@ "weight": 1000 }, { - "key": 71, + "key": 118, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -639,7 +1062,7 @@ "weight": 1000 }, { - "key": 72, + "key": 119, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -648,7 +1071,7 @@ "weight": 1000 }, { - "key": 73, + "key": 120, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 3, @@ -657,7 +1080,7 @@ "weight": 1000 }, { - "key": 74, + "key": 121, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -666,7 +1089,7 @@ "weight": 1000 }, { - "key": 75, + "key": 122, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -675,7 +1098,7 @@ "weight": 1000 }, { - "key": 76, + "key": 123, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -684,7 +1107,7 @@ "weight": 1000 }, { - "key": 77, + "key": 124, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -693,7 +1116,7 @@ "weight": 1000 }, { - "key": 78, + "key": 125, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -702,7 +1125,7 @@ "weight": 1000 }, { - "key": 79, + "key": 126, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -711,7 +1134,7 @@ "weight": 1000 }, { - "key": 80, + "key": 127, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -720,7 +1143,7 @@ "weight": 1000 }, { - "key": 81, + "key": 128, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 4, @@ -729,7 +1152,7 @@ "weight": 1000 }, { - "key": 82, + "key": 129, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -738,7 +1161,7 @@ "weight": 1000 }, { - "key": 83, + "key": 130, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -747,7 +1170,7 @@ "weight": 1000 }, { - "key": 84, + "key": 131, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -756,7 +1179,7 @@ "weight": 1000 }, { - "key": 85, + "key": 132, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -765,7 +1188,7 @@ "weight": 1000 }, { - "key": 86, + "key": 133, "recruitment_type": 2, "card_pool_type": "camp3_pool", "star": 5, @@ -774,7 +1197,7 @@ "weight": 1000 }, { - "key": 87, + "key": 134, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -783,7 +1206,7 @@ "weight": 1000 }, { - "key": 88, + "key": 135, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -792,7 +1215,7 @@ "weight": 1000 }, { - "key": 89, + "key": 136, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -801,7 +1224,7 @@ "weight": 1000 }, { - "key": 90, + "key": 137, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -810,7 +1233,7 @@ "weight": 1000 }, { - "key": 91, + "key": 138, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -819,7 +1242,7 @@ "weight": 1000 }, { - "key": 92, + "key": 139, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -828,7 +1251,7 @@ "weight": 1000 }, { - "key": 93, + "key": 140, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 3, @@ -837,7 +1260,7 @@ "weight": 1000 }, { - "key": 94, + "key": 141, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -846,7 +1269,7 @@ "weight": 1000 }, { - "key": 95, + "key": 142, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -855,7 +1278,7 @@ "weight": 1000 }, { - "key": 96, + "key": 143, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -864,7 +1287,7 @@ "weight": 1000 }, { - "key": 97, + "key": 144, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -873,7 +1296,7 @@ "weight": 1000 }, { - "key": 98, + "key": 145, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 4, @@ -882,7 +1305,7 @@ "weight": 1000 }, { - "key": 99, + "key": 146, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 5, @@ -891,7 +1314,7 @@ "weight": 1000 }, { - "key": 100, + "key": 147, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 5, @@ -900,7 +1323,7 @@ "weight": 1000 }, { - "key": 101, + "key": 148, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 5, @@ -909,7 +1332,7 @@ "weight": 1000 }, { - "key": 102, + "key": 149, "recruitment_type": 2, "card_pool_type": "camp4_pool", "star": 5, diff --git a/bin/json/game_global.json b/bin/json/game_global.json index a1b63da5a..7750bf552 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -115,14 +115,29 @@ }, "base_pool3": { "s": 2, - "e": 200, + "e": 2, "p": "base_pool3" }, "base_pool4": { - "s": 201, - "e": 99999999, + "s": 3, + "e": 10, "p": "base_pool4" }, + "base_pool5": { + "s": 11, + "e": 199, + "p": "base_pool5" + }, + "base_pool6": { + "s": 200, + "e": 999, + "p": "base_pool6" + }, + "base_pool7": { + "s": 1000, + "e": 99999999, + "p": "base_pool7" + }, "base_pool_star3": 9000, "base_pool_star4": 900, "base_pool_star5": 100, diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index 90856e420..1b3414494 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -1925,8 +1925,8 @@ "key": "hero_25004", "text": "波比" }, - "star": 3, - "color": 2, + "star": 4, + "color": 3, "race": 2, "job": 3, "type": 1, diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index 2db96f5c5..080512bb3 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -60,6 +60,9 @@ type GameGlobalData struct { BasePool2 *Gamebasepool BasePool3 *Gamebasepool BasePool4 *Gamebasepool + BasePool5 *Gamebasepool + BasePool6 *Gamebasepool + BasePool7 *Gamebasepool BasePoolStar3 int32 BasePoolStar4 int32 BasePoolStar5 int32 @@ -191,6 +194,9 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool2"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool2 error"); return }; if _v.BasePool2, err = DeserializeGamebasepool(_x_); err != nil { return } } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool3"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool3 error"); return }; if _v.BasePool3, err = DeserializeGamebasepool(_x_); err != nil { return } } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool4"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool4 error"); return }; if _v.BasePool4, err = DeserializeGamebasepool(_x_); err != nil { return } } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool5"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool5 error"); return }; if _v.BasePool5, err = DeserializeGamebasepool(_x_); err != nil { return } } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool6"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool6 error"); return }; if _v.BasePool6, err = DeserializeGamebasepool(_x_); err != nil { return } } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool7"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool7 error"); return }; if _v.BasePool7, err = DeserializeGamebasepool(_x_); err != nil { return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["base_pool_star3"].(float64); !_ok_ { err = errors.New("base_pool_star3 error"); return }; _v.BasePoolStar3 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["base_pool_star4"].(float64); !_ok_ { err = errors.New("base_pool_star4 error"); return }; _v.BasePoolStar4 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["base_pool_star5"].(float64); !_ok_ { err = errors.New("base_pool_star5 error"); return }; _v.BasePoolStar5 = int32(_tempNum_) } From 87ff90404918251721744c767ac24726de1b7791 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 28 Sep 2022 10:48:28 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E6=8A=BD=E5=8D=A1=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/api_drawCard.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go index bb1812152..d6a737aef 100644 --- a/modules/hero/api_drawCard.go +++ b/modules/hero/api_drawCard.go @@ -61,8 +61,8 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq } for i := 0; i < int(req.DrawCount); i++ { - drawCount += 1 pool = this.module.modelHero.CheckPool(drawCount, cfg) + drawCount += 1 strPool = append(strPool, pool) sz := make([]int32, 0) From 2c6b53ad074acb421629d44fd33289a25d732834 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 28 Sep 2022 14:20:25 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E5=85=B1=E9=B8=A3=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=20=E5=8F=96=E8=8B=B1=E9=9B=84=E5=8E=9F?= =?UTF-8?q?=E5=A7=8B=E6=98=9F=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/api_awaken.go | 4 ++-- modules/hero/api_resonance.go | 12 +++++++++--- modules/hero/api_resonanceSelect.go | 3 ++- modules/hero/api_strengthenUplv.go | 4 ++-- modules/hero/model_hero.go | 5 +++-- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go index 7bc1e0d1b..ea6d5b71a 100644 --- a/modules/hero/api_awaken.go +++ b/modules/hero/api_awaken.go @@ -113,8 +113,8 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c //xx英雄满级、共鸣、觉醒至最高状态 nextAwaken := this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv+1) if nextAwaken == nil { // 达到满级觉醒 - resonConfig := this.module.configure.GetHeroResonanceConfig(_hero.HeroID, _hero.Star+1) - if resonConfig == nil { // 满星 + resonConfig := this.module.configure.GetHeroResonanceConfig(_hero.HeroID, cfg.Star) + if resonConfig.Maxnum == _hero.ResonateNum { if _hero.Lv == _hero.Star*comm.HeroStarLvRatio { this.module.ModuleRtask.SendToRtask(session, comm.Rtype37, 1, cfg.Color) this.module.ModuleRtask.SendToRtask(session, comm.Rtype38, 1) diff --git a/modules/hero/api_resonance.go b/modules/hero/api_resonance.go index bc0203ee6..121fb905d 100644 --- a/modules/hero/api_resonance.go +++ b/modules/hero/api_resonance.go @@ -41,8 +41,14 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR if code != pb.ErrorCode_Success { return } + //获取原始星级 + conf := this.module.configure.GetHero(_hero.HeroID) + if conf == nil { + code = pb.ErrorCode_ConfigNoFound + return + } // 共鸣次数判断 - resonConfig := this.module.configure.GetHeroResonanceConfig(_hero.HeroID, _hero.Star) + resonConfig := this.module.configure.GetHeroResonanceConfig(_hero.HeroID, conf.Star) if resonConfig == nil { code = pb.ErrorCode_ConfigNoFound return @@ -160,8 +166,8 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR //xx英雄满级、共鸣、觉醒至最高状态 nextAwaken := this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv+1) if nextAwaken == nil { // 达到满级觉醒 - resonConfig := this.module.configure.GetHeroResonanceConfig(_hero.HeroID, _hero.Star+1) - if resonConfig == nil { // 满星 + resonConfig := this.module.configure.GetHeroResonanceConfig(_hero.HeroID, cfg.Star) + if resonConfig.Maxnum == _hero.ResonateNum { // 共鸣满 if _hero.Lv == _hero.Star*comm.HeroStarLvRatio { this.module.ModuleRtask.SendToRtask(session, comm.Rtype37, 1, cfg.Color) this.module.ModuleRtask.SendToRtask(session, comm.Rtype38, 1) diff --git a/modules/hero/api_resonanceSelect.go b/modules/hero/api_resonanceSelect.go index 53fe43784..ecfcbb6d9 100644 --- a/modules/hero/api_resonanceSelect.go +++ b/modules/hero/api_resonanceSelect.go @@ -63,8 +63,9 @@ func (this *apiComp) ResonanceUseEnergy(session comm.IUserSession, req *pb.HeroR this.module.Errorf("update hero skill failed:%v", err1) return } + conf := this.module.configure.GetHero(_hero.HeroID) // 计算属性 - this.module.modelHero.setEnergyProperty(_hero) + this.module.modelHero.setEnergyProperty(_hero, conf.Star) session.SendMsg(string(this.module.GetType()), ResonanceUseEnergy, &pb.HeroResonanceUseEnergyResp{Hero: _hero}) return } diff --git a/modules/hero/api_strengthenUplv.go b/modules/hero/api_strengthenUplv.go index 761c9f57e..fe7a428f5 100644 --- a/modules/hero/api_strengthenUplv.go +++ b/modules/hero/api_strengthenUplv.go @@ -201,8 +201,8 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren //xx英雄满级、共鸣、觉醒至最高状态 nextAwaken := this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv+1) if nextAwaken == nil { // 达到满级觉醒 - resonConfig := this.module.configure.GetHeroResonanceConfig(_hero.HeroID, _hero.Star+1) - if resonConfig == nil { // 满星 + resonConfig := this.module.configure.GetHeroResonanceConfig(_hero.HeroID, cfg.Star) + if resonConfig.Maxnum == _hero.ResonateNum { // 共鸣满 if _hero.Lv == _hero.Star*comm.HeroStarLvRatio { this.module.ModuleRtask.SendToRtask(session, comm.Rtype37, 1, cfg.Color) this.module.ModuleRtask.SendToRtask(session, comm.Rtype38, 1) diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index 250051782..9155ba429 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -282,8 +282,9 @@ func (this *ModelHero) setJuexingProperty(hero *pb.DBHero, key string, value int } // 设置共鸣能量点数属性 -func (this *ModelHero) setEnergyProperty(hero *pb.DBHero) { - resonConfig := this.moduleHero.configure.GetHeroResonanceConfig(hero.HeroID, hero.Star) +func (this *ModelHero) setEnergyProperty(hero *pb.DBHero, star int32) { + + resonConfig := this.moduleHero.configure.GetHeroResonanceConfig(hero.HeroID, star) if resonConfig == nil { return } From ea729876098be00463925a650516d3f7e326ef27 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 28 Sep 2022 14:38:54 +0800 Subject: [PATCH 12/19] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/api_resonance.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/hero/api_resonance.go b/modules/hero/api_resonance.go index 121fb905d..59b4f2a9e 100644 --- a/modules/hero/api_resonance.go +++ b/modules/hero/api_resonance.go @@ -21,10 +21,8 @@ func (this *apiComp) ResonanceCheck(session comm.IUserSession, req *pb.HeroReson /// 英雄共鸣 func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceReq) (code pb.ErrorCode, data proto.Message) { var ( - szCostHero map[string]int32 // k 卡牌配置id v 数量 - totalCostCard int32 //消耗卡总数量 - _hero *pb.DBHero - + szCostHero map[string]int32 // k 卡牌配置id v 数量 + _hero *pb.DBHero ChangeList []*pb.DBHero // 变化的英雄数据 _costMaphero map[string]*pb.DBHero count int32 // 共鸣升级次数 @@ -54,7 +52,6 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR return } - totalCostCard = resonConfig.Energy for _, k := range req.CostObjID { _costHero, c := this.module.GetHeroByObjID(session.GetUserId(), k) // 查询消耗卡是否存在 if c != pb.ErrorCode_Success { @@ -131,7 +128,7 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR } _hero.SameCount = 1 _hero.ResonateNum += count - _hero.DistributionResonate += resonConfig.Energy * totalCostCard + _hero.DistributionResonate += resonConfig.Energy * count _heroMap := map[string]interface{}{ "resonateNum": _hero.ResonateNum, "distributionResonate": _hero.DistributionResonate, From 7b0f50f21f0a058b17a2f3934ffdb3cfe6137031 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 28 Sep 2022 15:25:41 +0800 Subject: [PATCH 13/19] =?UTF-8?q?=E8=BF=94=E8=BF=98=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=9A=84=E5=8D=87=E6=98=9F=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/api_resonance.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/hero/api_resonance.go b/modules/hero/api_resonance.go index 59b4f2a9e..e3459f94d 100644 --- a/modules/hero/api_resonance.go +++ b/modules/hero/api_resonance.go @@ -111,7 +111,7 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR return } - for k, _ := range szCostHero { + for k, _ := range _costMaphero { if k == _hero.Id { _hero.SameCount = _costMaphero[k].SameCount break @@ -129,6 +129,7 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR _hero.SameCount = 1 _hero.ResonateNum += count _hero.DistributionResonate += resonConfig.Energy * count + _hero.IsOverlying = false _heroMap := map[string]interface{}{ "resonateNum": _hero.ResonateNum, "distributionResonate": _hero.DistributionResonate, @@ -144,12 +145,10 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR // 返还对应初始星级的卡 for _, v := range resonConfig.Prize { if v.A == comm.HeroType { - this.module.modelHero.createHeroOverlying(session.GetUserId(), v.T, v.N) + this.module.modelHero.createHeroOverlying(session.GetUserId(), v.T, v.N*count) } } - //this.module.modelHero.ChangeHeroProperty(session, _hero) // 推送属性变化 - ChangeList = append(ChangeList, _hero) session.SendMsg(string(this.module.GetType()), "change", &pb.HeroChangePush{List: ChangeList}) session.SendMsg(string(this.module.GetType()), Resonance, &pb.HeroResonanceResp{Hero: _hero}) From 0ef0451aebed8e8acee0f23b4180d96f05c71ec9 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 28 Sep 2022 16:06:16 +0800 Subject: [PATCH 14/19] =?UTF-8?q?=E5=85=B1=E9=B8=A3=E8=BF=94=E8=BF=98?= =?UTF-8?q?=E6=9D=90=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/api_resonance.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/hero/api_resonance.go b/modules/hero/api_resonance.go index e3459f94d..0997127b8 100644 --- a/modules/hero/api_resonance.go +++ b/modules/hero/api_resonance.go @@ -111,7 +111,7 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR return } - for k, _ := range _costMaphero { + for k := range _costMaphero { if k == _hero.Id { _hero.SameCount = _costMaphero[k].SameCount break @@ -143,12 +143,14 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR return } // 返还对应初始星级的卡 - for _, v := range resonConfig.Prize { - if v.A == comm.HeroType { - this.module.modelHero.createHeroOverlying(session.GetUserId(), v.T, v.N*count) - } - } + this.module.DispenseRes(session, resonConfig.Prize, true) + // for _, v := range resonConfig.Prize { + // if v.A == comm.HeroType { + // hero, _ := this.module.modelHero.createHeroOverlying(session.GetUserId(), v.T, v.N*count) + // ChangeList = append(ChangeList, hero) + // } + // } ChangeList = append(ChangeList, _hero) session.SendMsg(string(this.module.GetType()), "change", &pb.HeroChangePush{List: ChangeList}) session.SendMsg(string(this.module.GetType()), Resonance, &pb.HeroResonanceResp{Hero: _hero}) From 60e0219ab134326fa130763f23f7eb72c22b6d63 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 28 Sep 2022 16:20:21 +0800 Subject: [PATCH 15/19] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=A0=E6=95=88?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/api_resonance.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/modules/hero/api_resonance.go b/modules/hero/api_resonance.go index 0997127b8..7c7e1dba5 100644 --- a/modules/hero/api_resonance.go +++ b/modules/hero/api_resonance.go @@ -143,16 +143,9 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR return } // 返还对应初始星级的卡 - this.module.DispenseRes(session, resonConfig.Prize, true) - // for _, v := range resonConfig.Prize { - // if v.A == comm.HeroType { - - // hero, _ := this.module.modelHero.createHeroOverlying(session.GetUserId(), v.T, v.N*count) - // ChangeList = append(ChangeList, hero) - // } - // } ChangeList = append(ChangeList, _hero) session.SendMsg(string(this.module.GetType()), "change", &pb.HeroChangePush{List: ChangeList}) + this.module.DispenseRes(session, resonConfig.Prize, true) session.SendMsg(string(this.module.GetType()), Resonance, &pb.HeroResonanceResp{Hero: _hero}) // 任务相关 From 3578b8a0d55876e21396fc4d1b16535ea1c50fe2 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 28 Sep 2022 16:42:58 +0800 Subject: [PATCH 16/19] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_heroresonance.json | 144 +++++----- bin/json/game_item.json | 16 +- bin/json/game_mainline.json | 6 +- bin/json/game_monsterformat.json | 72 ++--- bin/json/game_pagoda.json | 6 +- bin/json/game_rdtaskchoose.json | 2 +- bin/json/game_rdtaskcondi.json | 2 +- bin/json/game_rdtaskside.json | 39 ++- bin/json/game_skillafteratk.json | 44 +-- bin/json/game_skillatk.json | 6 +- bin/json/game_skillpassive.json | 30 +- bin/json/game_stroy.json | 478 +++++++++++++++++-------------- 12 files changed, 451 insertions(+), 394 deletions(-) diff --git a/bin/json/game_heroresonance.json b/bin/json/game_heroresonance.json index 085739026..4c53ba090 100644 --- a/bin/json/game_heroresonance.json +++ b/bin/json/game_heroresonance.json @@ -6,7 +6,7 @@ "prize": [ { "a": "hero", - "t": "13001", + "t": "43901", "n": 1 } ], @@ -39,7 +39,7 @@ "prize": [ { "a": "hero", - "t": "13002", + "t": "43901", "n": 1 } ], @@ -72,7 +72,7 @@ "prize": [ { "a": "hero", - "t": "13003", + "t": "43901", "n": 1 } ], @@ -105,7 +105,7 @@ "prize": [ { "a": "hero", - "t": "13004", + "t": "43901", "n": 1 } ], @@ -138,7 +138,7 @@ "prize": [ { "a": "hero", - "t": "13005", + "t": "43901", "n": 1 } ], @@ -171,7 +171,7 @@ "prize": [ { "a": "hero", - "t": "14001", + "t": "43902", "n": 1 } ], @@ -204,7 +204,7 @@ "prize": [ { "a": "hero", - "t": "14002", + "t": "43902", "n": 1 } ], @@ -237,7 +237,7 @@ "prize": [ { "a": "hero", - "t": "14003", + "t": "43901", "n": 1 } ], @@ -270,7 +270,7 @@ "prize": [ { "a": "hero", - "t": "14004", + "t": "43902", "n": 1 } ], @@ -303,7 +303,7 @@ "prize": [ { "a": "hero", - "t": "14005", + "t": "43902", "n": 1 } ], @@ -336,7 +336,7 @@ "prize": [ { "a": "hero", - "t": "14006", + "t": "43902", "n": 1 } ], @@ -369,7 +369,7 @@ "prize": [ { "a": "hero", - "t": "14007", + "t": "43903", "n": 1 } ], @@ -402,7 +402,7 @@ "prize": [ { "a": "hero", - "t": "15001", + "t": "43903", "n": 1 } ], @@ -435,7 +435,7 @@ "prize": [ { "a": "hero", - "t": "15002", + "t": "43903", "n": 1 } ], @@ -468,7 +468,7 @@ "prize": [ { "a": "hero", - "t": "15003", + "t": "43903", "n": 1 } ], @@ -501,7 +501,7 @@ "prize": [ { "a": "hero", - "t": "15004", + "t": "43901", "n": 1 } ], @@ -534,7 +534,7 @@ "prize": [ { "a": "hero", - "t": "23001", + "t": "43901", "n": 1 } ], @@ -567,7 +567,7 @@ "prize": [ { "a": "hero", - "t": "23002", + "t": "43901", "n": 1 } ], @@ -600,7 +600,7 @@ "prize": [ { "a": "hero", - "t": "23003", + "t": "43901", "n": 1 } ], @@ -633,7 +633,7 @@ "prize": [ { "a": "hero", - "t": "23004", + "t": "43901", "n": 1 } ], @@ -666,7 +666,7 @@ "prize": [ { "a": "hero", - "t": "24001", + "t": "43902", "n": 1 } ], @@ -699,7 +699,7 @@ "prize": [ { "a": "hero", - "t": "24002", + "t": "43901", "n": 1 } ], @@ -732,7 +732,7 @@ "prize": [ { "a": "hero", - "t": "24003", + "t": "43901", "n": 1 } ], @@ -765,7 +765,7 @@ "prize": [ { "a": "hero", - "t": "24004", + "t": "43901", "n": 1 } ], @@ -798,7 +798,7 @@ "prize": [ { "a": "hero", - "t": "24005", + "t": "43902", "n": 1 } ], @@ -831,7 +831,7 @@ "prize": [ { "a": "hero", - "t": "24006", + "t": "43902", "n": 1 } ], @@ -864,7 +864,7 @@ "prize": [ { "a": "hero", - "t": "24007", + "t": "43902", "n": 1 } ], @@ -897,7 +897,7 @@ "prize": [ { "a": "hero", - "t": "24008", + "t": "43902", "n": 1 } ], @@ -930,7 +930,7 @@ "prize": [ { "a": "hero", - "t": "24009", + "t": "43902", "n": 1 } ], @@ -963,7 +963,7 @@ "prize": [ { "a": "hero", - "t": "25001", + "t": "43902", "n": 1 } ], @@ -996,7 +996,7 @@ "prize": [ { "a": "hero", - "t": "25002", + "t": "43903", "n": 1 } ], @@ -1029,7 +1029,7 @@ "prize": [ { "a": "hero", - "t": "25003", + "t": "43903", "n": 1 } ], @@ -1057,12 +1057,12 @@ }, { "hid": "25004", - "star": 3, + "star": 4, "energy": 6, "prize": [ { "a": "hero", - "t": "25004", + "t": "43902", "n": 1 } ], @@ -1095,7 +1095,7 @@ "prize": [ { "a": "hero", - "t": "33001", + "t": "43901", "n": 1 } ], @@ -1128,7 +1128,7 @@ "prize": [ { "a": "hero", - "t": "33002", + "t": "43901", "n": 1 } ], @@ -1161,7 +1161,7 @@ "prize": [ { "a": "hero", - "t": "33003", + "t": "43901", "n": 1 } ], @@ -1194,7 +1194,7 @@ "prize": [ { "a": "hero", - "t": "33004", + "t": "43901", "n": 1 } ], @@ -1227,7 +1227,7 @@ "prize": [ { "a": "hero", - "t": "33005", + "t": "43901", "n": 1 } ], @@ -1260,7 +1260,7 @@ "prize": [ { "a": "hero", - "t": "33006", + "t": "43901", "n": 1 } ], @@ -1293,7 +1293,7 @@ "prize": [ { "a": "hero", - "t": "34001", + "t": "43902", "n": 1 } ], @@ -1326,7 +1326,7 @@ "prize": [ { "a": "hero", - "t": "34002", + "t": "43902", "n": 1 } ], @@ -1359,7 +1359,7 @@ "prize": [ { "a": "hero", - "t": "34003", + "t": "43902", "n": 1 } ], @@ -1392,7 +1392,7 @@ "prize": [ { "a": "hero", - "t": "34004", + "t": "43902", "n": 1 } ], @@ -1425,7 +1425,7 @@ "prize": [ { "a": "hero", - "t": "34005", + "t": "43902", "n": 1 } ], @@ -1458,7 +1458,7 @@ "prize": [ { "a": "hero", - "t": "34006", + "t": "43902", "n": 1 } ], @@ -1491,7 +1491,7 @@ "prize": [ { "a": "hero", - "t": "34007", + "t": "43902", "n": 1 } ], @@ -1524,7 +1524,7 @@ "prize": [ { "a": "hero", - "t": "34008", + "t": "43902", "n": 1 } ], @@ -1557,7 +1557,7 @@ "prize": [ { "a": "hero", - "t": "35001", + "t": "43901", "n": 1 } ], @@ -1590,7 +1590,7 @@ "prize": [ { "a": "hero", - "t": "35002", + "t": "43903", "n": 1 } ], @@ -1623,7 +1623,7 @@ "prize": [ { "a": "hero", - "t": "35003", + "t": "43901", "n": 1 } ], @@ -1656,7 +1656,7 @@ "prize": [ { "a": "hero", - "t": "35004", + "t": "43903", "n": 1 } ], @@ -1689,7 +1689,7 @@ "prize": [ { "a": "hero", - "t": "35005", + "t": "43903", "n": 1 } ], @@ -1722,7 +1722,7 @@ "prize": [ { "a": "hero", - "t": "35006", + "t": "43903", "n": 1 } ], @@ -1755,7 +1755,7 @@ "prize": [ { "a": "hero", - "t": "43001", + "t": "43901", "n": 1 } ], @@ -1788,7 +1788,7 @@ "prize": [ { "a": "hero", - "t": "43002", + "t": "43901", "n": 1 } ], @@ -1821,7 +1821,7 @@ "prize": [ { "a": "hero", - "t": "43003", + "t": "43901", "n": 1 } ], @@ -1854,7 +1854,7 @@ "prize": [ { "a": "hero", - "t": "43004", + "t": "43901", "n": 1 } ], @@ -1887,7 +1887,7 @@ "prize": [ { "a": "hero", - "t": "43005", + "t": "43901", "n": 1 } ], @@ -1920,7 +1920,7 @@ "prize": [ { "a": "hero", - "t": "43006", + "t": "43901", "n": 1 } ], @@ -1953,7 +1953,7 @@ "prize": [ { "a": "hero", - "t": "43007", + "t": "43901", "n": 1 } ], @@ -1986,7 +1986,7 @@ "prize": [ { "a": "hero", - "t": "44001", + "t": "43902", "n": 1 } ], @@ -2019,7 +2019,7 @@ "prize": [ { "a": "hero", - "t": "44002", + "t": "43902", "n": 1 } ], @@ -2052,7 +2052,7 @@ "prize": [ { "a": "hero", - "t": "44003", + "t": "43902", "n": 1 } ], @@ -2085,7 +2085,7 @@ "prize": [ { "a": "hero", - "t": "44004", + "t": "43902", "n": 1 } ], @@ -2118,7 +2118,7 @@ "prize": [ { "a": "hero", - "t": "44006", + "t": "43901", "n": 1 } ], @@ -2151,7 +2151,7 @@ "prize": [ { "a": "hero", - "t": "45001", + "t": "43903", "n": 1 } ], @@ -2184,7 +2184,7 @@ "prize": [ { "a": "hero", - "t": "45002", + "t": "43903", "n": 1 } ], @@ -2217,7 +2217,7 @@ "prize": [ { "a": "hero", - "t": "45003", + "t": "43901", "n": 1 } ], @@ -2250,7 +2250,7 @@ "prize": [ { "a": "hero", - "t": "45004", + "t": "43903", "n": 1 } ], @@ -2283,7 +2283,7 @@ "prize": [ { "a": "hero", - "t": "44005", + "t": "43901", "n": 1 } ], @@ -2316,7 +2316,7 @@ "prize": [ { "a": "hero", - "t": "15005", + "t": "43901", "n": 1 } ], diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 3e8ba26b7..d3474dded 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -971,7 +971,7 @@ "special_type": 0, "time": 0, "effects": "", - "box_id": 0, + "box_id": 50005, "synthetize_num": 5, "access": [ 109 @@ -1020,7 +1020,7 @@ "special_type": 0, "time": 0, "effects": "", - "box_id": 0, + "box_id": 50006, "synthetize_num": 5, "access": [ 109 @@ -1069,7 +1069,7 @@ "special_type": 0, "time": 0, "effects": "", - "box_id": 0, + "box_id": 50007, "synthetize_num": 5, "access": [ 109 @@ -1118,7 +1118,7 @@ "special_type": 0, "time": 0, "effects": "", - "box_id": 0, + "box_id": 50008, "synthetize_num": 5, "access": [ 109 @@ -1167,7 +1167,7 @@ "special_type": 0, "time": 0, "effects": "", - "box_id": 0, + "box_id": 50009, "synthetize_num": 5, "access": [ 109 @@ -1216,7 +1216,7 @@ "special_type": 0, "time": 0, "effects": "", - "box_id": 0, + "box_id": 50010, "synthetize_num": 5, "access": [ 109 @@ -1265,7 +1265,7 @@ "special_type": 0, "time": 0, "effects": "", - "box_id": 0, + "box_id": 50011, "synthetize_num": 5, "access": [ 109 @@ -1314,7 +1314,7 @@ "special_type": 0, "time": 0, "effects": "", - "box_id": 0, + "box_id": 50012, "synthetize_num": 5, "access": [ 109 diff --git a/bin/json/game_mainline.json b/bin/json/game_mainline.json index 81458f9d3..f95c05e1d 100644 --- a/bin/json/game_mainline.json +++ b/bin/json/game_mainline.json @@ -46,7 +46,7 @@ "FormatList": [ 101011 ], - "captainId": "240023", + "captainId": "", "battlescene": "bg_zhandoulmboss", "award": [ { @@ -179,7 +179,7 @@ "FormatList": [ 101031 ], - "captainId": "240031", + "captainId": "", "battlescene": "bg_zhandoulmboss", "award": [ { @@ -359,7 +359,7 @@ 101061, 101062 ], - "captainId": "240031", + "captainId": "", "battlescene": "bg_zhandoulmboss", "award": [ { diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index a838d7ce4..d507bfc41 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -6656,7 +6656,7 @@ ], "lv": 7, "hppro": 1, - "atkpro": 1, + "atkpro": 0.5, "defpro": 1 }, { @@ -6671,7 +6671,7 @@ ], "lv": 7, "hppro": 1, - "atkpro": 1, + "atkpro": 0.5, "defpro": 1 }, { @@ -6686,7 +6686,7 @@ ], "lv": 9, "hppro": 1, - "atkpro": 1, + "atkpro": 0.5, "defpro": 1 }, { @@ -6701,7 +6701,7 @@ ], "lv": 9, "hppro": 1, - "atkpro": 1, + "atkpro": 0.6, "defpro": 1 }, { @@ -6716,7 +6716,7 @@ ], "lv": 11, "hppro": 1, - "atkpro": 1, + "atkpro": 0.6, "defpro": 1 }, { @@ -6731,7 +6731,7 @@ ], "lv": 11, "hppro": 1, - "atkpro": 1, + "atkpro": 0.6, "defpro": 1 }, { @@ -6746,7 +6746,7 @@ ], "lv": 13, "hppro": 1, - "atkpro": 1, + "atkpro": 0.6, "defpro": 1 }, { @@ -6761,7 +6761,7 @@ ], "lv": 13, "hppro": 1, - "atkpro": 1, + "atkpro": 0.6, "defpro": 1 }, { @@ -6776,7 +6776,7 @@ ], "lv": 15, "hppro": 1, - "atkpro": 1, + "atkpro": 0.6, "defpro": 1 }, { @@ -6791,7 +6791,7 @@ ], "lv": 15, "hppro": 1, - "atkpro": 1, + "atkpro": 0.7, "defpro": 1 }, { @@ -6806,7 +6806,7 @@ ], "lv": 17, "hppro": 1, - "atkpro": 1, + "atkpro": 0.7, "defpro": 1 }, { @@ -6821,7 +6821,7 @@ ], "lv": 17, "hppro": 1, - "atkpro": 1, + "atkpro": 0.7, "defpro": 1 }, { @@ -6836,7 +6836,7 @@ ], "lv": 19, "hppro": 1, - "atkpro": 1, + "atkpro": 0.7, "defpro": 1 }, { @@ -6851,7 +6851,7 @@ ], "lv": 19, "hppro": 1, - "atkpro": 1, + "atkpro": 0.7, "defpro": 1 }, { @@ -6866,7 +6866,7 @@ ], "lv": 21, "hppro": 1, - "atkpro": 1, + "atkpro": 0.7, "defpro": 1 }, { @@ -6881,7 +6881,7 @@ ], "lv": 21, "hppro": 1, - "atkpro": 1, + "atkpro": 0.6, "defpro": 1 }, { @@ -6896,7 +6896,7 @@ ], "lv": 23, "hppro": 1, - "atkpro": 1, + "atkpro": 0.6, "defpro": 1 }, { @@ -6911,7 +6911,7 @@ ], "lv": 23, "hppro": 1, - "atkpro": 1, + "atkpro": 0.6, "defpro": 1 }, { @@ -6926,7 +6926,7 @@ ], "lv": 25, "hppro": 1, - "atkpro": 1, + "atkpro": 0.6, "defpro": 1 }, { @@ -6941,7 +6941,7 @@ ], "lv": 25, "hppro": 1, - "atkpro": 1, + "atkpro": 0.6, "defpro": 1 }, { @@ -6956,7 +6956,7 @@ ], "lv": 27, "hppro": 1, - "atkpro": 1, + "atkpro": 0.6, "defpro": 1 }, { @@ -6971,7 +6971,7 @@ ], "lv": 27, "hppro": 1, - "atkpro": 1, + "atkpro": 0.7, "defpro": 1 }, { @@ -6986,7 +6986,7 @@ ], "lv": 29, "hppro": 1, - "atkpro": 1, + "atkpro": 0.7, "defpro": 1 }, { @@ -7001,7 +7001,7 @@ ], "lv": 29, "hppro": 1, - "atkpro": 1, + "atkpro": 0.7, "defpro": 1 }, { @@ -7016,7 +7016,7 @@ ], "lv": 31, "hppro": 1, - "atkpro": 1, + "atkpro": 0.7, "defpro": 1 }, { @@ -7031,7 +7031,7 @@ ], "lv": 31, "hppro": 1, - "atkpro": 1, + "atkpro": 0.7, "defpro": 1 }, { @@ -7046,7 +7046,7 @@ ], "lv": 33, "hppro": 1, - "atkpro": 1, + "atkpro": 0.7, "defpro": 1 }, { @@ -7061,7 +7061,7 @@ ], "lv": 33, "hppro": 1, - "atkpro": 1, + "atkpro": 0.7, "defpro": 1 }, { @@ -7076,7 +7076,7 @@ ], "lv": 35, "hppro": 1, - "atkpro": 1, + "atkpro": 0.7, "defpro": 1 }, { @@ -7091,7 +7091,7 @@ ], "lv": 35, "hppro": 1, - "atkpro": 1, + "atkpro": 0.7, "defpro": 1 }, { @@ -7106,7 +7106,7 @@ ], "lv": 37, "hppro": 1, - "atkpro": 1, + "atkpro": 0.7, "defpro": 1 }, { @@ -7121,7 +7121,7 @@ ], "lv": 37, "hppro": 1, - "atkpro": 1, + "atkpro": 0.7, "defpro": 1 }, { @@ -7136,7 +7136,7 @@ ], "lv": 39, "hppro": 1, - "atkpro": 1, + "atkpro": 0.7, "defpro": 1 }, { @@ -20105,13 +20105,13 @@ "monsterList": [ -1, -1, - 350012, + 510042, -1, -1 ], "lv": 1, - "hppro": 0.6, - "atkpro": 1.2, + "hppro": 1.1, + "atkpro": 1.1, "defpro": 1 } ] \ No newline at end of file diff --git a/bin/json/game_pagoda.json b/bin/json/game_pagoda.json index c109b6179..059cc34f2 100644 --- a/bin/json/game_pagoda.json +++ b/bin/json/game_pagoda.json @@ -5,7 +5,8 @@ "Level_type": 1, "layer_num": 1, "monster_id": [ - 501001 + 501001, + 501002 ], "reward": [ { @@ -33,7 +34,8 @@ "Level_type": 1, "layer_num": 2, "monster_id": [ - 501004 + 501004, + 501005 ], "reward": [ { diff --git a/bin/json/game_rdtaskchoose.json b/bin/json/game_rdtaskchoose.json index 9907d4e32..17c7c1f8a 100644 --- a/bin/json/game_rdtaskchoose.json +++ b/bin/json/game_rdtaskchoose.json @@ -153,7 +153,7 @@ "id": 20004, "num": 1, "preTid": 0, - "gotoLevel": 0, + "gotoLevel": 101, "needItem": [ 0 ], diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json index ebee0ca6c..0b6635b65 100644 --- a/bin/json/game_rdtaskcondi.json +++ b/bin/json/game_rdtaskcondi.json @@ -60,7 +60,7 @@ "type": 6, "inited": [], "data1": 25004, - "data2": 4, + "data2": 5, "data3": 0, "data4": 0, "data5": 0 diff --git a/bin/json/game_rdtaskside.json b/bin/json/game_rdtaskside.json index b62a0ef2f..354db0eb1 100644 --- a/bin/json/game_rdtaskside.json +++ b/bin/json/game_rdtaskside.json @@ -975,7 +975,18 @@ 158 ], "storyEnd": 0, - "reward": [], + "reward": [ + { + "ChooseId": 200017, + "Reward": [ + { + "a": "item", + "t": "30001", + "n": 10 + } + ] + } + ], "nextTid": 100216, "CD": 0 }, @@ -1007,7 +1018,7 @@ "endTid": [ -1 ], - "storyEnd": 322, + "storyEnd": 0, "reward": [], "nextTid": 100217, "CD": 0 @@ -1045,18 +1056,7 @@ -1 ], "storyEnd": 0, - "reward": [ - { - "ChooseId": 0, - "Reward": [ - { - "a": "item", - "t": "30001", - "n": 10 - } - ] - } - ], + "reward": [], "nextTid": 100218, "CD": 0 }, @@ -1149,7 +1149,7 @@ 200020 ], "endTid": [ - 118 + 117 ], "storyEnd": 0, "reward": [ @@ -1458,7 +1458,7 @@ ], "storyEnd": 0, "reward": [], - "nextTid": 100206, + "nextTid": 100204, "CD": 0 }, { @@ -1548,8 +1548,7 @@ "boxreplace": "", "timeline": "", "chooseId": [ - 200023, - 200015 + 200023 ], "endTid": [ 146 @@ -1688,7 +1687,7 @@ "objType": 1, "location": "middle", "point": "model_03", - "storyBegin": 343, + "storyBegin": 302, "Entity": [], "EntityChange": [], "EntityStateChange": [], @@ -1763,7 +1762,7 @@ "objType": 1, "location": "middle", "point": "model_03", - "storyBegin": 344, + "storyBegin": 303, "Entity": [], "EntityChange": [], "EntityStateChange": [], diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 22fb80ae4..adb843633 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -2076,12 +2076,12 @@ "Where": "", "Order": "", "Limit": 10, - "ExecuteCnt": 1, + "ExecuteCnt": 3, "Type": 1, "Argu": [ 1, 4, - 700 + 222 ], "FollowSK": [], "SucFollowSK": [ @@ -2100,7 +2100,7 @@ "ExecuteCnt": 1, "Type": 11, "Argu": [ - -300 + -100 ], "FollowSK": [], "SucFollowSK": [], @@ -2114,12 +2114,12 @@ "Where": "", "Order": "", "Limit": 10, - "ExecuteCnt": 1, + "ExecuteCnt": 3, "Type": 1, "Argu": [ 1, 4, - 750 + 250 ], "FollowSK": [], "SucFollowSK": [ @@ -2138,7 +2138,7 @@ "ExecuteCnt": 1, "Type": 11, "Argu": [ - -300 + -100 ], "FollowSK": [], "SucFollowSK": [], @@ -2152,12 +2152,12 @@ "Where": "", "Order": "", "Limit": 10, - "ExecuteCnt": 1, + "ExecuteCnt": 3, "Type": 1, "Argu": [ 1, 4, - 750 + 250 ], "FollowSK": [], "SucFollowSK": [ @@ -2176,7 +2176,7 @@ "ExecuteCnt": 1, "Type": 11, "Argu": [ - -300 + -100 ], "FollowSK": [], "SucFollowSK": [], @@ -2190,12 +2190,12 @@ "Where": "", "Order": "", "Limit": 10, - "ExecuteCnt": 1, + "ExecuteCnt": 3, "Type": 1, "Argu": [ 1, 4, - 800 + 287 ], "FollowSK": [], "SucFollowSK": [ @@ -2214,7 +2214,7 @@ "ExecuteCnt": 1, "Type": 11, "Argu": [ - -300 + -100 ], "FollowSK": [], "SucFollowSK": [], @@ -8343,7 +8343,7 @@ "Argu": [ 1, 5, - 100 + 150 ], "FollowSK": [], "SucFollowSK": [], @@ -8362,7 +8362,7 @@ "Argu": [ 1, 5, - 200 + 300 ], "FollowSK": [], "SucFollowSK": [ @@ -8424,7 +8424,7 @@ "Argu": [ 1, 5, - 100 + 150 ], "FollowSK": [], "SucFollowSK": [], @@ -8443,7 +8443,7 @@ "Argu": [ 1, 5, - 250 + 400 ], "FollowSK": [], "SucFollowSK": [ @@ -8505,7 +8505,7 @@ "Argu": [ 1, 5, - 100 + 150 ], "FollowSK": [], "SucFollowSK": [], @@ -8524,7 +8524,7 @@ "Argu": [ 1, 5, - 250 + 400 ], "FollowSK": [], "SucFollowSK": [ @@ -8586,7 +8586,7 @@ "Argu": [ 1, 5, - 100 + 150 ], "FollowSK": [], "SucFollowSK": [], @@ -8605,7 +8605,7 @@ "Argu": [ 1, 5, - 300 + 500 ], "FollowSK": [], "SucFollowSK": [ @@ -8667,7 +8667,7 @@ "Argu": [ 1, 5, - 100 + 150 ], "FollowSK": [], "SucFollowSK": [], @@ -8686,7 +8686,7 @@ "Argu": [ 1, 5, - 300 + 500 ], "FollowSK": [], "SucFollowSK": [ diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 511f8285f..9e24d0b0b 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -186,7 +186,7 @@ "act": "Skill_2", "Type": 1, "CD": 5, - "Target": 1, + "Target": 0, "ChildSkill": { "Id": [ 225004211, @@ -213,7 +213,7 @@ "act": "Skill_2", "Type": 1, "CD": 4, - "Target": 1, + "Target": 0, "ChildSkill": { "Id": [ 225004211, @@ -240,7 +240,7 @@ "act": "Skill_2", "Type": 1, "CD": 3, - "Target": 1, + "Target": 0, "ChildSkill": { "Id": [ 225004211, diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 3bbac4220..0aefd27e9 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -74,7 +74,7 @@ }, { "Id": 425001212, - "When": "SufEnd", + "When": "BeDamage", "TargetCheck": 3, "AddCon": "EffID=390001209", "PasPr": 1000, @@ -110,7 +110,7 @@ }, { "Id": 425001222, - "When": "SufEnd", + "When": "BeDamage", "TargetCheck": 3, "AddCon": "EffID=390001209", "PasPr": 1000, @@ -146,7 +146,7 @@ }, { "Id": 425001232, - "When": "SufEnd", + "When": "BeDamage", "TargetCheck": 3, "AddCon": "EffID=390001209", "PasPr": 1000, @@ -182,7 +182,7 @@ }, { "Id": 425001242, - "When": "SufEnd", + "When": "BeDamage", "TargetCheck": 3, "AddCon": "EffID=390001209", "PasPr": 1000, @@ -218,7 +218,7 @@ }, { "Id": 425001252, - "When": "SufEnd", + "When": "BeDamage", "TargetCheck": 3, "AddCon": "EffID=390001209", "PasPr": 1000, @@ -254,7 +254,7 @@ }, { "Id": 435001211, - "When": "AtkEnd", + "When": "Damage", "TargetCheck": 3, "AddCon": "", "PasPr": 1000, @@ -266,7 +266,7 @@ }, { "Id": 435001212, - "When": "AtkEnd", + "When": "Damage", "TargetCheck": 3, "AddCon": "", "PasPr": 1000, @@ -375,7 +375,7 @@ }, { "Id": 424002211, - "When": "AtkStart", + "When": "Damage", "TargetCheck": 3, "AddCon": "Target=9,EffID=390001211", "PasPr": 1000, @@ -387,7 +387,7 @@ }, { "Id": 424002212, - "When": "SufEnd", + "When": "BeDamage", "TargetCheck": 3, "AddCon": "Target=8,EffID=390001211", "PasPr": 1000, @@ -400,7 +400,7 @@ }, { "Id": 414007211, - "When": "SufEnd", + "When": "BeDamage", "TargetCheck": 3, "AddCon": "", "PasPr": 1000, @@ -413,7 +413,7 @@ }, { "Id": 414003311, - "When": "AtkEnd", + "When": "Damage", "TargetCheck": 3, "AddCon": "", "PasPr": 1000, @@ -425,7 +425,7 @@ }, { "Id": 445003211, - "When": "SufEnd", + "When": "BeDamage", "TargetCheck": 3, "AddCon": "", "PasPr": 1000, @@ -437,7 +437,7 @@ }, { "Id": 435003211, - "When": "SufEff", + "When": "AddBuff", "TargetCheck": 3, "AddCon": "EffType=0,Result=1", "PasPr": 1000, @@ -449,7 +449,7 @@ }, { "Id": 435003212, - "When": "SufEff", + "When": "AddBuff", "TargetCheck": 3, "AddCon": "EffType=0,Result=0", "PasPr": 1000, @@ -461,7 +461,7 @@ }, { "Id": 435003213, - "When": "SufEnd", + "When": "BeDamage", "TargetCheck": 3, "AddCon": "", "PasPr": 1000, diff --git a/bin/json/game_stroy.json b/bin/json/game_stroy.json index a8b3790f6..60892cc0c 100644 --- a/bin/json/game_stroy.json +++ b/bin/json/game_stroy.json @@ -7,7 +7,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "好兴奋呀，刚才在森林里唱歌时看到了一个和我一模一样的魔法精灵，可惜没跟她说上话，她就跑了，谁能帮忙找呢？", "modelstatetarget": "", @@ -119,7 +119,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "邦尼兔，邦尼兔，我在森林里可能遇到了我的'双胞胎'妹妹，你能帮我找找吗", "modelstatetarget": "", @@ -231,7 +231,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "邦尼兔，邦尼兔，你有在听我讲话吗？邦尼兔，邦尼兔，邦尼兔……", "modelstatetarget": "", @@ -343,7 +343,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "邦尼兔就在地球仪旁，直接过去找他吧！", "modelstatetarget": "", @@ -399,7 +399,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "看来邦尼兔有些忙，我先去找小伊看看吧。", "modelstatetarget": "", @@ -455,7 +455,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "小伊，小伊，我在森林里可能遇到了我的'双胞胎'妹妹，你能帮我找找吗", "modelstatetarget": "", @@ -567,7 +567,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "太好了！她之前就在这片森林之内，你能帮我找找看吗？", "modelstatetarget": "", @@ -679,7 +679,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "......", "modelstatetarget": "", @@ -791,7 +791,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "有了？", "modelstatetarget": "", @@ -903,7 +903,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "哎？等等我！", "modelstatetarget": "", @@ -959,7 +959,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "糟了，小伊跑太快，我跟不上了.......", "modelstatetarget": "", @@ -1015,7 +1015,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "事到如今，只有发挥我的特殊力量了！", "modelstatetarget": "", @@ -1463,7 +1463,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 1, - "speak": "25004", + "speak": "14007", "listen": "", "des": "维京人......对啊，我还可以去找维京人！", "modelstatetarget": "", @@ -1575,7 +1575,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 1, - "speak": "25004", + "speak": "14007", "listen": "", "des": "我不确定亚丝翠现在在不在基地，等后续再说吧。", "modelstatetarget": "", @@ -1631,7 +1631,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "嗨，卡嗝，我希望你能帮我找一下我的姐妹......", "modelstatetarget": "", @@ -1743,7 +1743,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "额，也不算是丢了，只是不知道......", "modelstatetarget": "", @@ -1855,7 +1855,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "额，谢谢你这么有动力，如果可以的话，我希望能够让无牙仔......", "modelstatetarget": "", @@ -1967,7 +1967,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "谢.....啥？", "modelstatetarget": "", @@ -2079,7 +2079,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "额，哈哈.....", "modelstatetarget": "", @@ -2191,7 +2191,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "等.....等等！", "modelstatetarget": "", @@ -2303,7 +2303,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "不不不，你先让我思考一会。", "modelstatetarget": "", @@ -2471,7 +2471,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "(我感觉，跟他一起寻找是一件失误......)", "modelstatetarget": "", @@ -2527,7 +2527,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "所以，我们应该从哪里开始寻找呢？", "modelstatetarget": "", @@ -2695,7 +2695,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": ".......", "modelstatetarget": "", @@ -2863,7 +2863,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "哎.......好吧。", "modelstatetarget": "", @@ -3031,7 +3031,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "无牙仔会出没在竹林，山谷，草原之类的地方，我需要先战胜关卡内的敌人，才有可能引出无牙仔。", "modelstatetarget": "", @@ -3759,7 +3759,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 1, - "speak": "25004", + "speak": "14007", "listen": "", "des": "今天我们就是为了这件事而来，那个黑影，和我产生了一丝联系，他就在图书馆的附近，我们应该主动去寻找他们。", "modelstatetarget": "", @@ -4487,7 +4487,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 1, - "speak": "25004", + "speak": "14007", "listen": "", "des": "啊哈！", "modelstatetarget": "", @@ -4599,7 +4599,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "啊哈！哈哈哈哈！", "modelstatetarget": "", @@ -4711,7 +4711,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "啊哈！", "modelstatetarget": "", @@ -5497,7 +5497,7 @@ "place": 0, "speak": "44005", "listen": "", - "des": "终于是回来了.....", + "des": "来了，来了。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -5607,7 +5607,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "点我可以让屏幕变亮", "modelstatetarget": "", @@ -6225,7 +6225,7 @@ "place": 0, "speak": "45003", "listen": "", - "des": "嗨，我是盖,我来自原始社会，原始人当然和火把最配啰。", + "des": "嗨，我是盖，我来自原始社会。我喜欢举着火把，因为那是希望。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -6281,7 +6281,7 @@ "place": 0, "speak": "45003", "listen": "", - "des": "不过，中心城通常都是灯火通明，今天怎么这么黑？", + "des": "今天中心城怎么这么黑？通常都是灯火通明的。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -6561,7 +6561,7 @@ "place": 1, "speak": "44006", "listen": "", - "des": "盖，我说过很多次，在都市举火不仅没用还非常不安全……等等，怎么这么黑，[color=#ffcb32]微缩地球[/color]呢？！", + "des": "盖，我说过很多次，在都市举火非常危险……等等，怎么这么黑，[color=#ffcb32]微缩地球[/color]呢？！", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -6617,7 +6617,7 @@ "place": 0, "speak": "45003", "listen": "", - "des": "如你所见，现在一片漆黑，[color=#ffcb32]微缩地球[/color]也不翼而飞......", + "des": "如你所见，它不见了，所以我暂时还不能灭掉火把。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -6785,7 +6785,7 @@ "place": 1, "speak": "44006", "listen": "", - "des": "丛林区还有备用能量石，得去取回来暂时代替[color=#ffcb32]微缩地球[/color]。", + "des": "丛林区还有[color=#6dba00]备用能量石[/color]，得去取回来暂时代替[color=#ffcb32]微缩地球[/color]。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -6841,7 +6841,7 @@ "place": 0, "speak": "45003", "listen": "", - "des": "好，这个我擅长！", + "des": "好，交给我吧！", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -6897,7 +6897,7 @@ "place": 1, "speak": "25001", "listen": "", - "des": "盖，我说过很多次，在都市举火不仅没用还非常不安全……等等，怎么这么黑，[color=#ffcb32]微缩地球[/color]呢？！", + "des": "哥们，或许你可以发明一个火把灯，明亮又环保，就像这里灯一样……咦，怎么这么黑？[color=#ffcb32]微缩地球[/color]不见了？", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -6915,8 +6915,8 @@ "z": 0 }, "positionL": { - "x": -0.1, - "y": -1.6, + "x": -0.2, + "y": -1.3, "z": 0 }, "revolveR": { @@ -6935,9 +6935,9 @@ "z": 0.7 }, "sizeL": { - "x": 0.8, - "y": 0.8, - "z": 0.8 + "x": 0.7, + "y": 0.7, + "z": 0.7 }, "perf": "", "cg": "", @@ -6953,7 +6953,7 @@ "place": 0, "speak": "45003", "listen": "", - "des": "如你所见，它不见了，所以我暂时还不能灭掉火把。", + "des": "没错，我一来就发现它不见了。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -6971,8 +6971,8 @@ "z": 0 }, "positionL": { - "x": -0.1, - "y": -1.6, + "x": -0.2, + "y": -1.3, "z": 0 }, "revolveR": { @@ -6991,9 +6991,9 @@ "z": 0.7 }, "sizeL": { - "x": 0.8, - "y": 0.8, - "z": 0.8 + "x": 0.7, + "y": 0.7, + "z": 0.7 }, "perf": "", "cg": "", @@ -7009,7 +7009,7 @@ "place": 1, "speak": "25001", "listen": "", - "des": "[color=#ffcb32]微缩地球[/color]非常重要，它关乎着整个中心城的安全！", + "des": "怎么办怎么办，它可是关乎着整个中心城的安全！", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -7027,8 +7027,8 @@ "z": 0 }, "positionL": { - "x": -0.1, - "y": -1.6, + "x": -0.2, + "y": -1.3, "z": 0 }, "revolveR": { @@ -7047,9 +7047,9 @@ "z": 0.7 }, "sizeL": { - "x": 0.8, - "y": 0.8, - "z": 0.8 + "x": 0.7, + "y": 0.7, + "z": 0.7 }, "perf": "", "cg": "", @@ -7065,7 +7065,7 @@ "place": 0, "speak": "45003", "listen": "", - "des": "那现在怎么办？你的脑子一定比我这个原始人的好用。", + "des": "你看着我也没用，你的脑子一定比原始人的好用吧。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -7083,8 +7083,8 @@ "z": 0 }, "positionL": { - "x": -0.1, - "y": -1.6, + "x": -0.2, + "y": -1.3, "z": 0 }, "revolveR": { @@ -7103,9 +7103,9 @@ "z": 0.7 }, "sizeL": { - "x": 0.8, - "y": 0.8, - "z": 0.8 + "x": 0.7, + "y": 0.7, + "z": 0.7 }, "perf": "", "cg": "", @@ -7121,7 +7121,7 @@ "place": 1, "speak": "25001", "listen": "", - "des": "丛林区还有[color=#6dba00]备用能源[/color]，得去取回来暂时代替[color=#ffcb32]微缩地球[/color]。", + "des": "哦，对了，我记得丛林区还有[color=#6dba00]备用能量石[/color]，它可以暂时代替[color=#ffcb32]微缩地球[/color]。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -7139,8 +7139,8 @@ "z": 0 }, "positionL": { - "x": -0.1, - "y": -1.6, + "x": -0.2, + "y": -1.3, "z": 0 }, "revolveR": { @@ -7159,9 +7159,9 @@ "z": 0.7 }, "sizeL": { - "x": 0.8, - "y": 0.8, - "z": 0.8 + "x": 0.7, + "y": 0.7, + "z": 0.7 }, "perf": "", "cg": "", @@ -7177,7 +7177,7 @@ "place": 0, "speak": "45003", "listen": "", - "des": "好，这个我擅长！", + "des": "好，交给我吧！", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -7195,8 +7195,8 @@ "z": 0 }, "positionL": { - "x": -0.1, - "y": -1.6, + "x": -0.2, + "y": -1.3, "z": 0 }, "revolveR": { @@ -7215,9 +7215,9 @@ "z": 0.7 }, "sizeL": { - "x": 0.8, - "y": 0.8, - "z": 0.8 + "x": 0.7, + "y": 0.7, + "z": 0.7 }, "perf": "", "cg": "", @@ -7231,9 +7231,9 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "45003", + "speak": "44005", "listen": "", - "des": "小.....小伊？你怎么在这里？", + "des": "盖，你怎么来了？基地里出什么事了吗？", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -7287,9 +7287,9 @@ "type": 2, "bg": "jqdh_bg01", "place": 1, - "speak": "44005", + "speak": "45003", "listen": "", - "des": "我发现备用能源缺失，正准备来丛林里取[color=#6dba00]备用能源[/color]，你也是为了这个而来的吗？", + "des": "微缩地球不见了，我来拿备用能量石……", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -7339,69 +7339,13 @@ "id": 306003, "groupid": 306, "before": 306002, - "next": 306004, - "type": 2, - "bg": "jqdh_bg01", - "place": 0, - "speak": "45003", - "listen": "", - "des": "我也.......等等，有反派势力包围了过来！", - "modelstatetarget": "", - "modelstate": 0, - "modelaction": "", - "speakstate": "", - "listenstate": "", - "chose": [], - "turn": 0, - "show": 0, - "move": "", - "action": "", - "sound": "", - "positionR": { - "x": 0.2, - "y": -1.5, - "z": 0 - }, - "positionL": { - "x": -0.1, - "y": -1.6, - "z": 0 - }, - "revolveR": { - "x": 0, - "y": -150, - "z": 0 - }, - "revolveL": { - "x": 0, - "y": -210, - "z": 0 - }, - "sizeR": { - "x": 0.7, - "y": 0.7, - "z": 0.7 - }, - "sizeL": { - "x": 0.8, - "y": 0.8, - "z": 0.8 - }, - "perf": "", - "cg": "", - "skip": true - }, - { - "id": 306004, - "groupid": 306, - "before": 306003, "next": -1, "type": 2, "bg": "jqdh_bg01", - "place": 1, + "place": 0, "speak": "44005", "listen": "", - "des": "该死，我们先干掉他们，他们想抢走[color=#6dba00]备用能源[/color]！", + "des": "嘘——有什么东西冲过来了！来吧，让你们瞧瞧原始人的厉害！", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -7959,7 +7903,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 1, - "speak": "25004", + "speak": "14007", "listen": "", "des": "哇，这里就是传说中的梦工厂吗？", "modelstatetarget": "", @@ -8127,7 +8071,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "我总觉得，感应到了些什么.....", "modelstatetarget": "", @@ -8239,9 +8183,9 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "44005", + "speak": "45003", "listen": "", - "des": "哇，它可真漂亮~", + "des": "完成，暂时不用担心能源供应问题了。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -8295,9 +8239,9 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "45003", + "speak": "44005", "listen": "", - "des": "这样就不用担心能源供应问题了吧。", + "des": "它看起来可真漂亮~", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -8351,9 +8295,9 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "44005", + "speak": "45003", "listen": "", - "des": "但是，微缩地球还有监控反派异动的作用，必须快点把它找回来。", + "des": "不过，微缩地球还有监控反派势力的作用，还是要赶紧把它找回来。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -8407,9 +8351,9 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "45003", + "speak": "44005", "listen": "", - "des": "那它去哪儿了呢？", + "des": "那我们要去哪里找呢？", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -8463,9 +8407,9 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "44005", + "speak": "45003", "listen": "", - "des": "一定是被反派偷走了，反派核心势力都在心魔塔。看来我们必须去一趟了。", + "des": "也许我们该去趟心魔塔了，那里是反派的聚集地，微缩地球一定是被他们偷走了。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -8519,9 +8463,9 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "45003", + "speak": "44005", "listen": "", - "des": "保险起见，我们还是叫上更多伙伴吧。", + "des": "hey，盖~我们还是叫上更多伙伴吧。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -8577,7 +8521,7 @@ "place": 0, "speak": "45003", "listen": "", - "des": "那么！就来一次激动人心的伙伴招募吧！", + "des": "好主意，那么就来一次的伙伴招募吧！", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -8633,7 +8577,7 @@ "place": 0, "speak": "45003", "listen": "", - "des": "点击左边的招募系统来进入伙伴募集界面，或者我可以直接带你前往招募，让我们来找到一个新的伙伴吧。", + "des": "点击左边的招募来寻找伙伴吧，或者我可以直接带你前往招募，找到一个新的伙伴。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -8689,7 +8633,7 @@ "place": 0, "speak": "44005", "listen": "", - "des": "这里可.....真是漂亮。", + "des": "还有不少地方埋藏着能量石，可以试着找找哦~", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -8743,7 +8687,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "保持乐观的心态，就能迎来胜利呦~！", "modelstatetarget": "", @@ -8801,7 +8745,7 @@ "place": 1, "speak": "44005", "listen": "", - "des": "波比，有你的帮助太好了。我们这就出发去心魔塔吧。", + "des": "哇，是格里森！有你的帮助太好了。我们这就出发去心魔塔吧。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -8855,9 +8799,9 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", - "des": "等一下，心魔塔充满了大量的黑暗能量，大家先提升一下自己的技能和武器装备。", + "des": "等一下，心魔塔充满了大量的黑暗能量，先让我把英雄等级升到10级吧。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -8911,9 +8855,9 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", - "des": "可以点击右下角的cards按钮进入，也可以让我带你一起去哟。", + "des": "可以点击右下角的卡牌按钮进入，也可以让我带你一起去哟。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -8969,7 +8913,7 @@ "place": 0, "speak": "45003", "listen": "", - "des": "哈哈，看看是谁来了！", + "des": "伙伴招募的方法记住了吗？需要帮助可以随时招募伙伴。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -9025,7 +8969,7 @@ "place": 0, "speak": "44005", "listen": "", - "des": "新的家人，欢迎你，波比。", + "des": "格里森是一个特别喜欢轮滑的王子呢。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -9193,7 +9137,7 @@ "place": 0, "speak": "44005", "listen": "", - "des": "我已经手痒难耐了！", + "des": "我感觉身上的毛发全部都竖起来了！", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -9247,9 +9191,9 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", - "des": "没问题！", + "des": "GoGoGo，赶紧出发！", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -9303,9 +9247,9 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", - "des": "事不宜迟，我们赶紧出发吧。", + "des": "对于战斗这件事，我已经很有经验了~", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -9361,7 +9305,7 @@ "place": 0, "speak": "44005", "listen": "", - "des": "在危险到来之前，我们就应该主动出击。", + "des": "原始人对危险时刻保持警惕。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -9685,7 +9629,7 @@ }, "perf": "", "cg": "", - "skip": false + "skip": true }, { "id": 323001, @@ -9753,7 +9697,7 @@ "place": 0, "speak": "45003", "listen": "", - "des": "完全没问题，而且微缩地球也拿了回来，我们一起回去吧！", + "des": "完全没问题，微缩地球已经拿到，赶紧送回基地吧！", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -9803,13 +9747,13 @@ "id": 324001, "groupid": 324, "before": -1, - "next": -1, + "next": 324002, "type": 2, "bg": "jqdh_bg01", "place": 0, "speak": "45003", "listen": "", - "des": "快点让微缩地球回归吧，我可不想再次陷入黑暗了", + "des": "快点让微缩地球回归吧。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -9855,6 +9799,118 @@ "cg": "", "skip": true }, + { + "id": 324002, + "groupid": 324, + "before": 324001, + "next": 324003, + "type": 2, + "bg": "jqdh_bg01", + "place": 0, + "speak": "14007", + "listen": "", + "des": "我可不想再次陷入黑暗了", + "modelstatetarget": "", + "modelstate": 0, + "modelaction": "", + "speakstate": "", + "listenstate": "", + "chose": [], + "turn": 0, + "show": 0, + "move": "", + "action": "", + "sound": "", + "positionR": { + "x": 0, + "y": 0, + "z": 0 + }, + "positionL": { + "x": -0.1, + "y": -0.8, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": -150, + "z": 0 + }, + "revolveL": { + "x": 0, + "y": -210, + "z": 0 + }, + "sizeR": { + "x": 0.8, + "y": 0.8, + "z": 0.8 + }, + "sizeL": { + "x": 0.8, + "y": 0.8, + "z": 0.8 + }, + "perf": "", + "cg": "", + "skip": true + }, + { + "id": 324003, + "groupid": 324, + "before": 324002, + "next": -1, + "type": 2, + "bg": "jqdh_bg01", + "place": 0, + "speak": "44005", + "listen": "", + "des": "不要犹豫了，快放进去吧！", + "modelstatetarget": "", + "modelstate": 0, + "modelaction": "", + "speakstate": "", + "listenstate": "", + "chose": [], + "turn": 0, + "show": 0, + "move": "", + "action": "", + "sound": "", + "positionR": { + "x": 0, + "y": 0, + "z": 0 + }, + "positionL": { + "x": -0.1, + "y": -1.4, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": -150, + "z": 0 + }, + "revolveL": { + "x": 0, + "y": -210, + "z": 0 + }, + "sizeR": { + "x": 0.8, + "y": 0.8, + "z": 0.8 + }, + "sizeL": { + "x": 0.8, + "y": 0.8, + "z": 0.8 + }, + "perf": "", + "cg": "", + "skip": true + }, { "id": 325001, "groupid": 325, @@ -9863,7 +9919,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "终于是将微缩地球拿回来了....", "modelstatetarget": "", @@ -10033,7 +10089,7 @@ "place": 0, "speak": "44005", "listen": "", - "des": "没错！不过，你需要帮助时中心城的伙伴们就会立刻出现，试着召唤一下吧。", + "des": "是的！不过，你需要帮助时中心城的伙伴们就会立刻出现。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -10089,7 +10145,7 @@ "place": 0, "speak": "44005", "listen": "", - "des": "点击左边的SUMMO来进入招募，或者我可以直接带你前往招募，你来决定吧。", + "des": "点击左边的招募寻找伙伴，或者我可以直接带你前往招募，你来决定吧。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -10143,9 +10199,9 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", - "des": "作为守护者我也希望能守护别人，有什么办法能提升自己的能力吗？", + "des": "刚刚召唤出了波比，她是个非常强力的辅助英雄，我们需要让她变强。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -10201,7 +10257,7 @@ "place": 0, "speak": "44005", "listen": "", - "des": "这个简单，首先，你需要将自己的等级提升至满级(30级)", + "des": "这个简单，首先你需要将波比的等级提升至满级。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -10257,7 +10313,7 @@ "place": 0, "speak": "44005", "listen": "", - "des": "然后提升自己的星级，即可获得大幅度的的战斗提升，点击右下角的卡牌按钮即可进入，或者让我陪你一起过去。", + "des": "然后即可在同界面进行升星操作，点击右下角的卡牌按钮即可进入，或者让我陪你一起过去。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -10479,7 +10535,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "那我们快赶过去吧，我想给和平谷带来安宁。", "modelstatetarget": "", @@ -10759,7 +10815,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "我能感觉到，我会遇见熟悉的人.....", "modelstatetarget": "", @@ -10815,7 +10871,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "我已经迫不及待了！", "modelstatetarget": "", @@ -10871,7 +10927,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "让我们开始吧！", "modelstatetarget": "", @@ -10929,7 +10985,7 @@ "place": 0, "speak": "45003", "listen": "", - "des": "小伊呢，我记得她先回来了........", + "des": "小伊呢，她又跑哪里去了？", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -10983,7 +11039,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "点我跳过随机任务", "modelstatetarget": "", @@ -11039,7 +11095,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "25004", + "speak": "14007", "listen": "", "des": "内在力量固然重要，但是装备也是必不可少的提升，现在来给格里森王子穿戴一套装备吧！", "modelstatetarget": "", @@ -11227,7 +11283,7 @@ "z": 0 }, "positionL": { - "x": 0.2, + "x": -0.1, "y": -1.4, "z": 0 }, @@ -11263,7 +11319,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "45003", + "speak": "44005", "listen": "", "des": "你没事吧，我们赶紧回去吧！", "modelstatetarget": "", @@ -11283,7 +11339,7 @@ "z": 0 }, "positionL": { - "x": 0.2, + "x": -0.1, "y": -1.5, "z": 0 }, @@ -11339,7 +11395,7 @@ "z": 0 }, "positionL": { - "x": 0.2, + "x": -0.1, "y": -1.4, "z": 0 }, @@ -11395,7 +11451,7 @@ "z": 0 }, "positionL": { - "x": 0.2, + "x": -0.1, "y": -1.3, "z": 0 }, @@ -11451,7 +11507,7 @@ "z": 0 }, "positionL": { - "x": 0.2, + "x": -0.1, "y": -1.5, "z": 0 }, @@ -11507,7 +11563,7 @@ "z": 0 }, "positionL": { - "x": 0.2, + "x": -0.4, "y": -1.3, "z": 0 }, @@ -11522,14 +11578,14 @@ "z": 0 }, "sizeR": { - "x": 0.8, - "y": 0.8, - "z": 0.8 + "x": 0.7, + "y": 0.7, + "z": 0.7 }, "sizeL": { - "x": 0.8, - "y": 0.8, - "z": 0.8 + "x": 0.7, + "y": 0.7, + "z": 0.7 }, "perf": "", "cg": "", @@ -11563,7 +11619,7 @@ "z": 0 }, "positionL": { - "x": 0.2, + "x": -0.1, "y": -1.3, "z": 0 }, @@ -11619,7 +11675,7 @@ "z": 0 }, "positionL": { - "x": 0.2, + "x": -0.4, "y": -1.3, "z": 0 }, @@ -11634,14 +11690,14 @@ "z": 0 }, "sizeR": { - "x": 0.8, - "y": 0.8, - "z": 0.8 + "x": 0.7, + "y": 0.7, + "z": 0.7 }, "sizeL": { - "x": 0.8, - "y": 0.8, - "z": 0.8 + "x": 0.7, + "y": 0.7, + "z": 0.7 }, "perf": "", "cg": "", @@ -11675,7 +11731,7 @@ "z": 0 }, "positionL": { - "x": 0.2, + "x": -0.1, "y": -1.5, "z": 0 }, @@ -11731,7 +11787,7 @@ "z": 0 }, "positionL": { - "x": 0.2, + "x": -0.1, "y": -1.4, "z": 0 }, @@ -11769,7 +11825,7 @@ "place": 0, "speak": "35001", "listen": "", - "des": "呀！！备用能源石我的！", + "des": "呀！！备用能量石我的！", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -11787,7 +11843,7 @@ "z": 0 }, "positionL": { - "x": 0.2, + "x": -0.1, "y": -0.8, "z": 0 }, @@ -11843,7 +11899,7 @@ "z": 0 }, "positionL": { - "x": 0.2, + "x": -0.1, "y": -0.8, "z": 0 }, From 79f1ecbed7bae2389aebe75b00ee826a4122dc20 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 28 Sep 2022 17:21:59 +0800 Subject: [PATCH 17/19] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_heroconvertdata.json | 18 + bin/json/game_model.json | 2 +- bin/json/game_rdtaskside.json | 120 +++--- bin/json/game_stroy.json | 354 +++++++++++++----- sys/configure/structs/Game.HeroConvertdata.go | 42 +++ .../structs/Game.HeroConvertdataData.go | 37 ++ sys/configure/structs/Tables.go | 7 + 7 files changed, 425 insertions(+), 155 deletions(-) create mode 100644 bin/json/game_heroconvertdata.json create mode 100644 sys/configure/structs/Game.HeroConvertdata.go create mode 100644 sys/configure/structs/Game.HeroConvertdataData.go diff --git a/bin/json/game_heroconvertdata.json b/bin/json/game_heroconvertdata.json new file mode 100644 index 000000000..ae4beeba2 --- /dev/null +++ b/bin/json/game_heroconvertdata.json @@ -0,0 +1,18 @@ +[ + { + "race": 1, + "id": "50001" + }, + { + "race": 2, + "id": "50002" + }, + { + "race": 3, + "id": "50003" + }, + { + "race": 4, + "id": "50004" + } +] \ No newline at end of file diff --git a/bin/json/game_model.json b/bin/json/game_model.json index 90ca1220a..15f15bad7 100644 --- a/bin/json/game_model.json +++ b/bin/json/game_model.json @@ -2053,7 +2053,7 @@ "id": "51004", "preson": "51004", "presonshow": "51004_exhibition", - "presonstory": "51004", + "presonstory": "51004_story", "presondraw": "", "height": 1, "weight": 1, diff --git a/bin/json/game_rdtaskside.json b/bin/json/game_rdtaskside.json index 354db0eb1..4a5466f80 100644 --- a/bin/json/game_rdtaskside.json +++ b/bin/json/game_rdtaskside.json @@ -460,7 +460,7 @@ "objType": 1, "location": "right", "point": "model_06", - "storyBegin": 307, + "storyBegin": 9999, "Entity": [], "EntityChange": [], "EntityStateChange": [], @@ -477,55 +477,6 @@ "enableAi": false, "boxreplace": "", "timeline": "", - "chooseId": [ - 20007 - ], - "endTid": [ - -1 - ], - "storyEnd": 0, - "reward": [ - { - "ChooseId": 20007, - "Reward": [ - { - "a": "item", - "t": "30001", - "n": 1 - }, - { - "a": "hero", - "t": "44005", - "n": 1 - } - ] - } - ], - "nextTid": 100209, - "CD": 0 - }, - { - "id": 2007, - "objType": 1, - "location": "middle", - "point": "model_03", - "storyBegin": 217, - "Entity": [], - "EntityChange": [], - "EntityStateChange": [], - "EntityInteractive": [], - "modelaction": "Enter", - "rotation": { - "x": 0, - "y": 90, - "z": 0 - }, - "modelstate": 0, - "popup": "", - "special": "", - "enableAi": false, - "boxreplace": "", - "timeline": "", "chooseId": [], "endTid": [ -1 @@ -536,7 +487,7 @@ "CD": 0 }, { - "id": 2008, + "id": 2007, "objType": 1, "location": "middle", "point": "model_02", @@ -564,8 +515,7 @@ "boxreplace": "", "timeline": "", "chooseId": [ - 20008, - 20009 + 20008 ], "endTid": [ -1 @@ -575,6 +525,37 @@ "nextTid": 100211, "CD": 0 }, + { + "id": 2008, + "objType": 1, + "location": "middle", + "point": "model_03", + "storyBegin": 217, + "Entity": [], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [], + "modelaction": "Enter", + "rotation": { + "x": 0, + "y": 90, + "z": 0 + }, + "modelstate": 0, + "popup": "", + "special": "", + "enableAi": false, + "boxreplace": "", + "timeline": "", + "chooseId": [], + "endTid": [ + -1 + ], + "storyEnd": 0, + "reward": [], + "nextTid": -1, + "CD": 0 + }, { "id": 2009, "objType": 1, @@ -660,8 +641,7 @@ "boxreplace": "", "timeline": "", "chooseId": [ - 200012, - 200015 + 200012 ], "endTid": [ 118 @@ -1465,7 +1445,7 @@ "id": 2034, "objType": 1, "location": "middle", - "point": "model_02", + "point": "model_03", "storyBegin": 337, "Entity": [], "EntityChange": [], @@ -1474,7 +1454,7 @@ "modelaction": "", "rotation": { "x": 0, - "y": -90, + "y": 90, "z": 0 }, "modelstate": 0, @@ -1656,7 +1636,7 @@ "objType": 1, "location": "right", "point": "model_08", - "storyBegin": 342, + "storyBegin": 307, "Entity": [], "EntityChange": [], "EntityStateChange": [], @@ -1673,13 +1653,31 @@ "enableAi": false, "boxreplace": "", "timeline": "", - "chooseId": [], + "chooseId": [ + 20007 + ], "endTid": [ -1 ], "storyEnd": 0, - "reward": [], - "nextTid": -1, + "reward": [ + { + "ChooseId": 20007, + "Reward": [ + { + "a": "item", + "t": "30001", + "n": 1 + }, + { + "a": "hero", + "t": "44005", + "n": 1 + } + ] + } + ], + "nextTid": 100209, "CD": 0 }, { diff --git a/bin/json/game_stroy.json b/bin/json/game_stroy.json index 60892cc0c..f7835a511 100644 --- a/bin/json/game_stroy.json +++ b/bin/json/game_stroy.json @@ -5495,9 +5495,9 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "44005", + "speak": "45003", "listen": "", - "des": "来了，来了。", + "des": "你刚刚跑哪里去了......", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -6524,7 +6524,7 @@ }, "positionL": { "x": -0.1, - "y": -1.2, + "y": -1.1, "z": 0 }, "revolveR": { @@ -6543,9 +6543,9 @@ "z": 0.8 }, "sizeL": { - "x": 0.8, - "y": 0.8, - "z": 0.8 + "x": 0.6, + "y": 0.6, + "z": 0.6 }, "perf": "", "cg": "", @@ -6558,6 +6558,62 @@ "next": 304002, "type": 2, "bg": "jqdh_bg01", + "place": 0, + "speak": "45003", + "listen": "", + "des": "哇，居然是功夫大师悍娇虎来了。", + "modelstatetarget": "", + "modelstate": 0, + "modelaction": "", + "speakstate": "", + "listenstate": "", + "chose": [], + "turn": 0, + "show": 0, + "move": "", + "action": "", + "sound": "", + "positionR": { + "x": 0.2, + "y": -1.4, + "z": 0 + }, + "positionL": { + "x": -0.1, + "y": -1.5, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": -150, + "z": 0 + }, + "revolveL": { + "x": 0, + "y": -210, + "z": 0 + }, + "sizeR": { + "x": 0.8, + "y": 0.8, + "z": 0.8 + }, + "sizeL": { + "x": 0.6, + "y": 0.6, + "z": 0.6 + }, + "perf": "", + "cg": "", + "skip": true + }, + { + "id": 304002, + "groupid": 304, + "before": 304001, + "next": 304003, + "type": 2, + "bg": "jqdh_bg01", "place": 1, "speak": "44006", "listen": "", @@ -6608,10 +6664,10 @@ "skip": true }, { - "id": 304002, + "id": 304003, "groupid": 304, - "before": 304001, - "next": 304003, + "before": 304002, + "next": 304004, "type": 2, "bg": "jqdh_bg01", "place": 0, @@ -6664,10 +6720,10 @@ "skip": true }, { - "id": 304003, + "id": 304004, "groupid": 304, - "before": 304002, - "next": 304004, + "before": 304003, + "next": 304005, "type": 2, "bg": "jqdh_bg01", "place": 1, @@ -6720,10 +6776,10 @@ "skip": true }, { - "id": 304004, + "id": 304005, "groupid": 304, - "before": 304003, - "next": 304005, + "before": 304004, + "next": 304006, "type": 2, "bg": "jqdh_bg01", "place": 0, @@ -6776,10 +6832,10 @@ "skip": true }, { - "id": 304005, + "id": 304006, "groupid": 304, - "before": 304004, - "next": 304006, + "before": 304005, + "next": 304007, "type": 2, "bg": "jqdh_bg01", "place": 1, @@ -6832,9 +6888,9 @@ "skip": true }, { - "id": 304006, + "id": 304007, "groupid": 304, - "before": 304005, + "before": 304006, "next": -1, "type": 2, "bg": "jqdh_bg01", @@ -6894,6 +6950,62 @@ "next": 305002, "type": 2, "bg": "jqdh_bg01", + "place": 0, + "speak": "45003", + "listen": "", + "des": "哇，居然是神龙大侠亲自来了。", + "modelstatetarget": "", + "modelstate": 0, + "modelaction": "", + "speakstate": "", + "listenstate": "", + "chose": [], + "turn": 0, + "show": 0, + "move": "", + "action": "", + "sound": "", + "positionR": { + "x": 0.2, + "y": -1.4, + "z": 0 + }, + "positionL": { + "x": -0.1, + "y": -1.5, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": -150, + "z": 0 + }, + "revolveL": { + "x": 0, + "y": -210, + "z": 0 + }, + "sizeR": { + "x": 0.7, + "y": 0.7, + "z": 0.7 + }, + "sizeL": { + "x": 0.8, + "y": 0.8, + "z": 0.8 + }, + "perf": "", + "cg": "", + "skip": true + }, + { + "id": 305002, + "groupid": 305, + "before": 305001, + "next": 305003, + "type": 2, + "bg": "jqdh_bg01", "place": 1, "speak": "25001", "listen": "", @@ -6915,8 +7027,8 @@ "z": 0 }, "positionL": { - "x": -0.2, - "y": -1.3, + "x": -0.1, + "y": -1.1, "z": 0 }, "revolveR": { @@ -6930,24 +7042,24 @@ "z": 0 }, "sizeR": { - "x": 0.7, - "y": 0.7, - "z": 0.7 + "x": 0.6, + "y": 0.6, + "z": 0.6 }, "sizeL": { - "x": 0.7, - "y": 0.7, - "z": 0.7 + "x": 0.8, + "y": 0.8, + "z": 0.8 }, "perf": "", "cg": "", "skip": true }, { - "id": 305002, + "id": 305003, "groupid": 305, - "before": 305001, - "next": 305003, + "before": 305002, + "next": 305004, "type": 2, "bg": "jqdh_bg01", "place": 0, @@ -7000,10 +7112,10 @@ "skip": true }, { - "id": 305003, + "id": 305004, "groupid": 305, - "before": 305002, - "next": 305004, + "before": 305003, + "next": 305005, "type": 2, "bg": "jqdh_bg01", "place": 1, @@ -7027,8 +7139,8 @@ "z": 0 }, "positionL": { - "x": -0.2, - "y": -1.3, + "x": -0.1, + "y": -1.1, "z": 0 }, "revolveR": { @@ -7042,24 +7154,24 @@ "z": 0 }, "sizeR": { - "x": 0.7, - "y": 0.7, - "z": 0.7 + "x": 0.6, + "y": 0.6, + "z": 0.6 }, "sizeL": { - "x": 0.7, - "y": 0.7, - "z": 0.7 + "x": 0.8, + "y": 0.8, + "z": 0.8 }, "perf": "", "cg": "", "skip": true }, { - "id": 305004, + "id": 305005, "groupid": 305, - "before": 305003, - "next": 305005, + "before": 305004, + "next": 305006, "type": 2, "bg": "jqdh_bg01", "place": 0, @@ -7112,10 +7224,10 @@ "skip": true }, { - "id": 305005, + "id": 305006, "groupid": 305, - "before": 305004, - "next": 305006, + "before": 305005, + "next": 305007, "type": 2, "bg": "jqdh_bg01", "place": 1, @@ -7139,8 +7251,8 @@ "z": 0 }, "positionL": { - "x": -0.2, - "y": -1.3, + "x": -0.1, + "y": -1.1, "z": 0 }, "revolveR": { @@ -7154,23 +7266,23 @@ "z": 0 }, "sizeR": { - "x": 0.7, - "y": 0.7, - "z": 0.7 + "x": 0.6, + "y": 0.6, + "z": 0.6 }, "sizeL": { - "x": 0.7, - "y": 0.7, - "z": 0.7 + "x": 0.8, + "y": 0.8, + "z": 0.8 }, "perf": "", "cg": "", "skip": true }, { - "id": 305006, + "id": 305007, "groupid": 305, - "before": 305005, + "before": 305006, "next": -1, "type": 2, "bg": "jqdh_bg01", @@ -7391,6 +7503,62 @@ "cg": "", "skip": true }, + { + "id": 9999001, + "groupid": 9999, + "before": -1, + "next": -1, + "type": 2, + "bg": "jqdh_bg01", + "place": 0, + "speak": "44005", + "listen": "", + "des": "郊外的怪物们活动也越来越频繁了", + "modelstatetarget": "", + "modelstate": 0, + "modelaction": "", + "speakstate": "", + "listenstate": "", + "chose": [], + "turn": 0, + "show": 0, + "move": "", + "action": "", + "sound": "", + "positionR": { + "x": 0.2, + "y": -1.5, + "z": 0 + }, + "positionL": { + "x": -0.1, + "y": -1.6, + "z": 0 + }, + "revolveR": { + "x": 0, + "y": -150, + "z": 0 + }, + "revolveL": { + "x": 0, + "y": -210, + "z": 0 + }, + "sizeR": { + "x": 0.7, + "y": 0.7, + "z": 0.7 + }, + "sizeL": { + "x": 0.8, + "y": 0.8, + "z": 0.8 + }, + "perf": "", + "cg": "", + "skip": true + }, { "id": 307001, "groupid": 307, @@ -7401,7 +7569,7 @@ "place": 0, "speak": "45003", "listen": "", - "des": "[color=#6dba00]备用能源[/color]已经拿到，我们赶紧返回基地吧。", + "des": "[color=#6dba00]备用能量石[/color]已经拿到，我们赶紧返回基地吧。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -7790,10 +7958,10 @@ "next": 308007, "type": 2, "bg": "jqdh_bg01", - "place": 1, - "speak": "44005", + "place": 0, + "speak": "45003", "listen": "", - "des": "所以你现在可以挪挪你的小手，来激活备用备用[color=#6dba00]备用能源[/color]了吗？", + "des": "嗯……不过小伊，我想我们现在应该先把备用能量石安装好。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -7846,10 +8014,10 @@ "next": -1, "type": 2, "bg": "jqdh_bg01", - "place": 0, - "speak": "45003", + "place": 1, + "speak": "44005", "listen": "", - "des": "哦对对，不过这个东西劲力很大，你要是准备要了就随时找我开启。", + "des": "哦哦，没错~这个东西看起来很重，我已经准备好了可以随时找我帮忙。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -8801,7 +8969,7 @@ "place": 0, "speak": "14007", "listen": "", - "des": "等一下，心魔塔充满了大量的黑暗能量，先让我把英雄等级升到10级吧。", + "des": "等一下，心魔塔充满了大量的黑暗能量，先把我的英雄等级升到10级吧。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -9023,7 +9191,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "45003", + "speak": "14007", "listen": "", "des": "很好，这样我们就有去闯心魔塔的底气了！", "modelstatetarget": "", @@ -11097,7 +11265,7 @@ "place": 0, "speak": "14007", "listen": "", - "des": "内在力量固然重要，但是装备也是必不可少的提升，现在来给格里森王子穿戴一套装备吧！", + "des": "内在力量固然重要，但是装备也是必不可少的提升，现在来给我穿戴一套装备吧！", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -11209,7 +11377,7 @@ "place": 0, "speak": "44005", "listen": "", - "des": "变强是每个英雄的都必须要经历的事情。", + "des": "变强是每个英雄都必须要经历的事情。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -11265,7 +11433,7 @@ "place": 0, "speak": "45003", "listen": "", - "des": "小伊...我真没想到在这里遇到你......", + "des": "小伊...我真没想到在这里遇到你。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -11545,7 +11713,7 @@ "place": 0, "speak": "25001", "listen": "", - "des": "盖，是你正在呼唤我来吗？", + "des": "盖，是你正在呼唤我来吗？11", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -11559,12 +11727,12 @@ "sound": "", "positionR": { "x": 0.2, - "y": -0.8, + "y": -1.4, "z": 0 }, "positionL": { - "x": -0.4, - "y": -1.3, + "x": -0.1, + "y": -1.1, "z": 0 }, "revolveR": { @@ -11578,14 +11746,14 @@ "z": 0 }, "sizeR": { - "x": 0.7, - "y": 0.7, - "z": 0.7 + "x": 0.8, + "y": 0.8, + "z": 0.8 }, "sizeL": { - "x": 0.7, - "y": 0.7, - "z": 0.7 + "x": 0.6, + "y": 0.6, + "z": 0.6 }, "perf": "", "cg": "", @@ -11675,8 +11843,8 @@ "z": 0 }, "positionL": { - "x": -0.4, - "y": -1.3, + "x": -0.1, + "y": -1.1, "z": 0 }, "revolveR": { @@ -11690,14 +11858,14 @@ "z": 0 }, "sizeR": { - "x": 0.7, - "y": 0.7, - "z": 0.7 + "x": 0.8, + "y": 0.8, + "z": 0.8 }, "sizeL": { - "x": 0.7, - "y": 0.7, - "z": 0.7 + "x": 0.6, + "y": 0.6, + "z": 0.6 }, "perf": "", "cg": "", @@ -11727,12 +11895,12 @@ "sound": "", "positionR": { "x": 0.2, - "y": -1.5, + "y": -1.4, "z": 0 }, "positionL": { "x": -0.1, - "y": -1.5, + "y": -1.2, "z": 0 }, "revolveR": { @@ -11751,9 +11919,9 @@ "z": 0.8 }, "sizeL": { - "x": 0.8, - "y": 0.8, - "z": 0.8 + "x": 0.7, + "y": 0.7, + "z": 0.7 }, "perf": "", "cg": "", diff --git a/sys/configure/structs/Game.HeroConvertdata.go b/sys/configure/structs/Game.HeroConvertdata.go new file mode 100644 index 000000000..0b442abc8 --- /dev/null +++ b/sys/configure/structs/Game.HeroConvertdata.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameHeroConvertdata struct { + _dataMap map[int32]*GameHeroConvertdataData + _dataList []*GameHeroConvertdataData +} + +func NewGameHeroConvertdata(_buf []map[string]interface{}) (*GameHeroConvertdata, error) { + _dataList := make([]*GameHeroConvertdataData, 0, len(_buf)) + dataMap := make(map[int32]*GameHeroConvertdataData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameHeroConvertdataData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Race] = _v + } + } + return &GameHeroConvertdata{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameHeroConvertdata) GetDataMap() map[int32]*GameHeroConvertdataData { + return table._dataMap +} + +func (table *GameHeroConvertdata) GetDataList() []*GameHeroConvertdataData { + return table._dataList +} + +func (table *GameHeroConvertdata) Get(key int32) *GameHeroConvertdataData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.HeroConvertdataData.go b/sys/configure/structs/Game.HeroConvertdataData.go new file mode 100644 index 000000000..29e70db81 --- /dev/null +++ b/sys/configure/structs/Game.HeroConvertdataData.go @@ -0,0 +1,37 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameHeroConvertdataData struct { + Race int32 + Id string +} + +const TypeId_GameHeroConvertdataData = -1689768495 + +func (*GameHeroConvertdataData) GetTypeId() int32 { + return -1689768495 +} + +func (_v *GameHeroConvertdataData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["race"].(float64); !_ok_ { err = errors.New("race error"); return }; _v.Race = int32(_tempNum_) } + { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } } + return +} + +func DeserializeGameHeroConvertdataData(_buf map[string]interface{}) (*GameHeroConvertdataData, error) { + v := &GameHeroConvertdataData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 63dab99e0..0b715bf6c 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -100,6 +100,7 @@ type Tables struct { Ip *GameIp GameColor *GameGameColor NameLibrary *GameNameLibrary + HeroConvertdata *GameHeroConvertdata } func NewTables(loader JsonLoader) (*Tables, error) { @@ -641,5 +642,11 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.NameLibrary, err = NewGameNameLibrary(buf) ; err != nil { return nil, err } + if buf, err = loader("game_heroconvertdata") ; err != nil { + return nil, err + } + if tables.HeroConvertdata, err = NewGameHeroConvertdata(buf) ; err != nil { + return nil, err + } return tables, nil } From 168b44d1b952d6f30b2af0d598e30aad2642b82f Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 28 Sep 2022 19:55:57 +0800 Subject: [PATCH 18/19] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_drop.json | 104 ++++++++++++++++ bin/json/game_model.json | 2 +- bin/json/game_monsterformat.json | 72 +++++------ bin/json/game_rdtaskside.json | 48 ++++---- bin/json/game_skillpassive.json | 2 +- bin/json/game_stroy.json | 18 +-- bin/json/game_taskround.json | 202 ++++++++++++++++++++++++------- 7 files changed, 336 insertions(+), 112 deletions(-) diff --git a/bin/json/game_drop.json b/bin/json/game_drop.json index bdff8ab6d..0d5b64089 100644 --- a/bin/json/game_drop.json +++ b/bin/json/game_drop.json @@ -1038,5 +1038,109 @@ ], "star": 1, "p": 1000 + }, + { + "id": 81, + "dropid": 50005, + "prize": [ + { + "a": "item", + "t": "50005", + "n": 1 + } + ], + "star": 0, + "p": 1000 + }, + { + "id": 82, + "dropid": 50006, + "prize": [ + { + "a": "item", + "t": "50006", + "n": 1 + } + ], + "star": 0, + "p": 1000 + }, + { + "id": 83, + "dropid": 50007, + "prize": [ + { + "a": "item", + "t": "50007", + "n": 1 + } + ], + "star": 0, + "p": 1000 + }, + { + "id": 84, + "dropid": 50008, + "prize": [ + { + "a": "item", + "t": "50008", + "n": 1 + } + ], + "star": 0, + "p": 1000 + }, + { + "id": 85, + "dropid": 50009, + "prize": [ + { + "a": "item", + "t": "50009", + "n": 1 + } + ], + "star": 0, + "p": 1000 + }, + { + "id": 86, + "dropid": 50010, + "prize": [ + { + "a": "item", + "t": "50010", + "n": 1 + } + ], + "star": 0, + "p": 1000 + }, + { + "id": 87, + "dropid": 50011, + "prize": [ + { + "a": "item", + "t": "50011", + "n": 1 + } + ], + "star": 0, + "p": 1000 + }, + { + "id": 88, + "dropid": 50012, + "prize": [ + { + "a": "item", + "t": "50012", + "n": 1 + } + ], + "star": 0, + "p": 1000 } ] \ No newline at end of file diff --git a/bin/json/game_model.json b/bin/json/game_model.json index 15f15bad7..f8c09e25a 100644 --- a/bin/json/game_model.json +++ b/bin/json/game_model.json @@ -1153,7 +1153,7 @@ "id": "34006", "preson": "34006", "presonshow": "34006_exhibition", - "presonstory": "34006", + "presonstory": "34006_story", "presondraw": "", "height": 1, "weight": 1, diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index d507bfc41..f71ace443 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -6610,7 +6610,7 @@ -1 ], "lv": 4, - "hppro": 1, + "hppro": 0.5, "atkpro": 0.3, "defpro": 1 }, @@ -6625,7 +6625,7 @@ 510043 ], "lv": 5, - "hppro": 1, + "hppro": 0.5, "atkpro": 0.3, "defpro": 1 }, @@ -6640,7 +6640,7 @@ 510043 ], "lv": 5, - "hppro": 1, + "hppro": 0.5, "atkpro": 0.3, "defpro": 1 }, @@ -6655,7 +6655,7 @@ 440053 ], "lv": 7, - "hppro": 1, + "hppro": 0.5, "atkpro": 0.5, "defpro": 1 }, @@ -6670,7 +6670,7 @@ 250014 ], "lv": 7, - "hppro": 1, + "hppro": 0.5, "atkpro": 0.5, "defpro": 1 }, @@ -6685,7 +6685,7 @@ 340065 ], "lv": 9, - "hppro": 1, + "hppro": 0.5, "atkpro": 0.5, "defpro": 1 }, @@ -6700,7 +6700,7 @@ 440053 ], "lv": 9, - "hppro": 1, + "hppro": 0.6, "atkpro": 0.6, "defpro": 1 }, @@ -6715,7 +6715,7 @@ 340064 ], "lv": 11, - "hppro": 1, + "hppro": 0.6, "atkpro": 0.6, "defpro": 1 }, @@ -6730,7 +6730,7 @@ 250014 ], "lv": 11, - "hppro": 1, + "hppro": 0.6, "atkpro": 0.6, "defpro": 1 }, @@ -6745,7 +6745,7 @@ 250014 ], "lv": 13, - "hppro": 1, + "hppro": 0.6, "atkpro": 0.6, "defpro": 1 }, @@ -6760,7 +6760,7 @@ 440053 ], "lv": 13, - "hppro": 1, + "hppro": 0.6, "atkpro": 0.6, "defpro": 1 }, @@ -6775,7 +6775,7 @@ 250014 ], "lv": 15, - "hppro": 1, + "hppro": 0.6, "atkpro": 0.6, "defpro": 1 }, @@ -6790,7 +6790,7 @@ 340065 ], "lv": 15, - "hppro": 1, + "hppro": 0.7, "atkpro": 0.7, "defpro": 1 }, @@ -6805,7 +6805,7 @@ 440053 ], "lv": 17, - "hppro": 1, + "hppro": 0.7, "atkpro": 0.7, "defpro": 1 }, @@ -6820,7 +6820,7 @@ 340064 ], "lv": 17, - "hppro": 1, + "hppro": 0.7, "atkpro": 0.7, "defpro": 1 }, @@ -6835,7 +6835,7 @@ 250014 ], "lv": 19, - "hppro": 1, + "hppro": 0.7, "atkpro": 0.7, "defpro": 1 }, @@ -6850,7 +6850,7 @@ 250014 ], "lv": 19, - "hppro": 1, + "hppro": 0.7, "atkpro": 0.7, "defpro": 1 }, @@ -6865,7 +6865,7 @@ 440053 ], "lv": 21, - "hppro": 1, + "hppro": 0.7, "atkpro": 0.7, "defpro": 1 }, @@ -6880,7 +6880,7 @@ 250014 ], "lv": 21, - "hppro": 1, + "hppro": 0.8, "atkpro": 0.6, "defpro": 1 }, @@ -6895,7 +6895,7 @@ 340065 ], "lv": 23, - "hppro": 1, + "hppro": 0.8, "atkpro": 0.6, "defpro": 1 }, @@ -6910,7 +6910,7 @@ 440053 ], "lv": 23, - "hppro": 1, + "hppro": 0.8, "atkpro": 0.6, "defpro": 1 }, @@ -6925,7 +6925,7 @@ 340064 ], "lv": 25, - "hppro": 1, + "hppro": 0.8, "atkpro": 0.6, "defpro": 1 }, @@ -6940,7 +6940,7 @@ 250014 ], "lv": 25, - "hppro": 1, + "hppro": 0.8, "atkpro": 0.6, "defpro": 1 }, @@ -6955,7 +6955,7 @@ 250014 ], "lv": 27, - "hppro": 1, + "hppro": 0.8, "atkpro": 0.6, "defpro": 1 }, @@ -6970,7 +6970,7 @@ 440053 ], "lv": 27, - "hppro": 1, + "hppro": 0.9, "atkpro": 0.7, "defpro": 1 }, @@ -6985,7 +6985,7 @@ 250014 ], "lv": 29, - "hppro": 1, + "hppro": 0.9, "atkpro": 0.7, "defpro": 1 }, @@ -7000,7 +7000,7 @@ 340065 ], "lv": 29, - "hppro": 1, + "hppro": 0.9, "atkpro": 0.7, "defpro": 1 }, @@ -7015,7 +7015,7 @@ 440053 ], "lv": 31, - "hppro": 1, + "hppro": 0.9, "atkpro": 0.7, "defpro": 1 }, @@ -7030,7 +7030,7 @@ 340064 ], "lv": 31, - "hppro": 1, + "hppro": 0.9, "atkpro": 0.7, "defpro": 1 }, @@ -7045,7 +7045,7 @@ 250014 ], "lv": 33, - "hppro": 1, + "hppro": 0.9, "atkpro": 0.7, "defpro": 1 }, @@ -7060,7 +7060,7 @@ 250014 ], "lv": 33, - "hppro": 1, + "hppro": 0.9, "atkpro": 0.7, "defpro": 1 }, @@ -7075,7 +7075,7 @@ 440053 ], "lv": 35, - "hppro": 1, + "hppro": 0.9, "atkpro": 0.7, "defpro": 1 }, @@ -7090,7 +7090,7 @@ 250014 ], "lv": 35, - "hppro": 1, + "hppro": 0.9, "atkpro": 0.7, "defpro": 1 }, @@ -7105,7 +7105,7 @@ 340065 ], "lv": 37, - "hppro": 1, + "hppro": 0.9, "atkpro": 0.7, "defpro": 1 }, @@ -7120,7 +7120,7 @@ 440053 ], "lv": 37, - "hppro": 1, + "hppro": 0.9, "atkpro": 0.7, "defpro": 1 }, @@ -7135,7 +7135,7 @@ 340064 ], "lv": 39, - "hppro": 1, + "hppro": 0.9, "atkpro": 0.7, "defpro": 1 }, diff --git a/bin/json/game_rdtaskside.json b/bin/json/game_rdtaskside.json index 4a5466f80..e9c70d1cd 100644 --- a/bin/json/game_rdtaskside.json +++ b/bin/json/game_rdtaskside.json @@ -437,7 +437,7 @@ "modelaction": "", "rotation": { "x": 0, - "y": 90, + "y": 181, "z": 0 }, "modelstate": 0, @@ -622,7 +622,7 @@ "id": 2011, "objType": 1, "location": "middle", - "point": "model_02", + "point": "model_03", "storyBegin": 312, "Entity": [], "EntityChange": [], @@ -631,7 +631,7 @@ "modelaction": "", "rotation": { "x": 0, - "y": -90, + "y": 90, "z": 0 }, "modelstate": 0, @@ -671,7 +671,7 @@ "id": 2012, "objType": 1, "location": "middle", - "point": "model_03", + "point": "model_02", "storyBegin": 313, "Entity": [], "EntityChange": [], @@ -680,7 +680,7 @@ "modelaction": "", "rotation": { "x": 0, - "y": 90, + "y": -90, "z": 0 }, "modelstate": 0, @@ -762,7 +762,7 @@ "id": 2014, "objType": 1, "location": "middle", - "point": "model_02", + "point": "model_03", "storyBegin": 315, "Entity": [], "EntityChange": [], @@ -771,7 +771,7 @@ "modelaction": "", "rotation": { "x": 0, - "y": -90, + "y": 90, "z": 0 }, "modelstate": 0, @@ -793,7 +793,7 @@ "id": 2015, "objType": 1, "location": "middle", - "point": "model_03", + "point": "model_02", "storyBegin": 316, "Entity": [], "EntityChange": [], @@ -802,7 +802,7 @@ "modelaction": "", "rotation": { "x": 0, - "y": 90, + "y": -90, "z": 0 }, "modelstate": 0, @@ -851,12 +851,12 @@ "storyEnd": 0, "reward": [ { - "ChooseId": 0, + "ChooseId": 200010, "Reward": [ { "a": "hero", "t": "43901", - "n": 5 + "n": 15 } ] } @@ -928,7 +928,7 @@ }, { "id": 2019, - "objType": 2, + "objType": 1, "location": "left", "point": "icon_01", "storyBegin": 321, @@ -939,7 +939,7 @@ "modelaction": "", "rotation": { "x": 0, - "y": 0, + "y": -180, "z": 0 }, "modelstate": 0, @@ -972,7 +972,7 @@ }, { "id": 2020, - "objType": 2, + "objType": 1, "location": "left", "point": "icon_01", "storyBegin": 323, @@ -983,7 +983,7 @@ "modelaction": "", "rotation": { "x": 0, - "y": 0, + "y": -180, "z": 0 }, "modelstate": 0, @@ -1129,7 +1129,7 @@ 200020 ], "endTid": [ - 117 + 118 ], "storyEnd": 0, "reward": [ @@ -1291,7 +1291,7 @@ "EntityChange": [], "EntityStateChange": [], "EntityInteractive": [], - "modelaction": "", + "modelaction": "Enter", "rotation": { "x": 0, "y": -180, @@ -1542,7 +1542,7 @@ "id": 2037, "objType": 1, "location": "middle", - "point": "model_02", + "point": "model_03", "storyBegin": 339, "Entity": [], "EntityChange": [], @@ -1551,7 +1551,7 @@ "modelaction": "", "rotation": { "x": 0, - "y": -90, + "y": 90, "z": 0 }, "modelstate": 0, @@ -1573,7 +1573,7 @@ "id": 2038, "objType": 1, "location": "middle", - "point": "model_03", + "point": "model_02", "storyBegin": 340, "Entity": [], "EntityChange": [], @@ -1582,7 +1582,7 @@ "modelaction": "", "rotation": { "x": 0, - "y": 90, + "y": -90, "z": 0 }, "modelstate": 0, @@ -1613,7 +1613,7 @@ "modelaction": "Run", "rotation": { "x": 0, - "y": -90, + "y": 2.657, "z": 0 }, "modelstate": 0, @@ -1843,7 +1843,7 @@ "modelaction": "", "rotation": { "x": 0, - "y": -90, + "y": 2.657, "z": 0 }, "modelstate": 0, @@ -1874,7 +1874,7 @@ "modelaction": "", "rotation": { "x": 0, - "y": 90, + "y": -75, "z": 0 }, "modelstate": 0, diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 0aefd27e9..2ac7d1ce6 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -420,7 +420,7 @@ "Type": "CallSkillPas", "MaxEmitTimes": 1, "Callback": [ - 924004212 + 214003212 ] }, { diff --git a/bin/json/game_stroy.json b/bin/json/game_stroy.json index f7835a511..39855752c 100644 --- a/bin/json/game_stroy.json +++ b/bin/json/game_stroy.json @@ -9599,7 +9599,7 @@ "sound": "", "positionR": { "x": -0.1, - "y": -1.4, + "y": -1.6, "z": 0 }, "positionL": { @@ -9823,7 +9823,7 @@ "sound": "", "positionR": { "x": -0.1, - "y": -1.4, + "y": -1.6, "z": 0 }, "positionL": { @@ -10367,9 +10367,9 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "14007", + "speak": "25004", "listen": "", - "des": "刚刚召唤出了波比，她是个非常强力的辅助英雄，我们需要让她变强。", + "des": "我是个非常强力的辅助英雄，但我需要变强来跟上团队，应该怎么做呢？", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -10425,7 +10425,7 @@ "place": 0, "speak": "44005", "listen": "", - "des": "这个简单，首先你需要将波比的等级提升至满级。", + "des": "这个简单，首先你需要将自己的等级提升至满级。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", @@ -11991,7 +11991,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "35001", + "speak": "51004", "listen": "", "des": "呀！！备用能量石我的！", "modelstatetarget": "", @@ -12012,7 +12012,7 @@ }, "positionL": { "x": -0.1, - "y": -0.8, + "y": -1.2, "z": 0 }, "revolveR": { @@ -12047,7 +12047,7 @@ "type": 2, "bg": "jqdh_bg01", "place": 0, - "speak": "35001", + "speak": "51004", "listen": "", "des": "接招！", "modelstatetarget": "", @@ -12068,7 +12068,7 @@ }, "positionL": { "x": -0.1, - "y": -0.8, + "y": -1.2, "z": 0 }, "revolveR": { diff --git a/bin/json/game_taskround.json b/bin/json/game_taskround.json index 18128823a..7a6a94f80 100644 --- a/bin/json/game_taskround.json +++ b/bin/json/game_taskround.json @@ -8,7 +8,7 @@ "text": "提升任意英雄1级" }, "type_id": 10001, - "active": 40, + "active": 10, "id_after": 0, "jump_interface": 103, "icon": "wp_icon_0001", @@ -20,12 +20,12 @@ "id_tag": 1, "task_display": { "key": "task_10002", - "text": "登录游戏" + "text": "提升任意英雄5级" }, - "type_id": 10101, - "active": 40, + "type_id": 10001, + "active": 15, "id_after": 0, - "jump_interface": 0, + "jump_interface": 103, "icon": "wp_icon_0001", "reword": [] }, @@ -35,10 +35,70 @@ "id_tag": 1, "task_display": { "key": "task_10003", + "text": "提升任意英雄10级" + }, + "type_id": 10001, + "active": 25, + "id_after": 0, + "jump_interface": 103, + "icon": "wp_icon_0001", + "reword": [] + }, + { + "key": 10004, + "id_list": 4, + "id_tag": 1, + "task_display": { + "key": "task_10004", + "text": "登录游戏" + }, + "type_id": 10101, + "active": 10, + "id_after": 0, + "jump_interface": 0, + "icon": "wp_icon_0001", + "reword": [] + }, + { + "key": 10005, + "id_list": 5, + "id_tag": 1, + "task_display": { + "key": "task_10005", "text": "进行1次普通招募" }, "type_id": 10201, - "active": 40, + "active": 10, + "id_after": 0, + "jump_interface": 107, + "icon": "wp_icon_0001", + "reword": [] + }, + { + "key": 10006, + "id_list": 6, + "id_tag": 1, + "task_display": { + "key": "task_10006", + "text": "进行5次普通招募" + }, + "type_id": 10202, + "active": 15, + "id_after": 0, + "jump_interface": 107, + "icon": "wp_icon_0001", + "reword": [] + }, + { + "key": 10007, + "id_list": 7, + "id_tag": 1, + "task_display": { + "key": "task_10007", + "text": "进行10次普通招募" + }, + "type_id": 10203, + "active": 25, "id_after": 0, "jump_interface": 107, "icon": "wp_icon_0001", @@ -46,14 +106,29 @@ }, { "key": 20001, - "id_list": 9, + "id_list": 8, "id_tag": 2, "task_display": { "key": "task_20001", "text": "提升任意英雄5级" }, "type_id": 10002, - "active": 100, + "active": 25, + "id_after": 0, + "jump_interface": 103, + "icon": "wp_icon_0001", + "reword": [] + }, + { + "key": 20002, + "id_list": 10, + "id_tag": 3, + "task_display": { + "key": "task_20002", + "text": "提升任意英雄10级" + }, + "type_id": 10003, + "active": 35, "id_after": 0, "jump_interface": 103, "icon": "wp_icon_0001", @@ -61,14 +136,59 @@ }, { "key": 20003, - "id_list": 10, - "id_tag": 2, + "id_list": 11, + "id_tag": 3, "task_display": { "key": "task_20003", + "text": "提升任意英雄20级" + }, + "type_id": 10004, + "active": 60, + "id_after": 0, + "jump_interface": 103, + "icon": "wp_icon_0001", + "reword": [] + }, + { + "key": 20004, + "id_list": 9, + "id_tag": 2, + "task_display": { + "key": "task_20004", "text": "进行5次普通招募" }, "type_id": 10202, - "active": 100, + "active": 25, + "id_after": 0, + "jump_interface": 107, + "icon": "wp_icon_0001", + "reword": [] + }, + { + "key": 20005, + "id_list": 18, + "id_tag": 3, + "task_display": { + "key": "task_20005", + "text": "进行10次普通招募" + }, + "type_id": 10203, + "active": 35, + "id_after": 0, + "jump_interface": 107, + "icon": "wp_icon_0001", + "reword": [] + }, + { + "key": 20006, + "id_list": 19, + "id_tag": 3, + "task_display": { + "key": "task_20006", + "text": "进行20次普通招募" + }, + "type_id": 10204, + "active": 60, "id_after": 0, "jump_interface": 107, "icon": "wp_icon_0001", @@ -76,7 +196,7 @@ }, { "key": 30001, - "id_list": 16, + "id_list": 10, "id_tag": 3, "task_display": { "key": "task_30001", @@ -84,7 +204,7 @@ }, "type_id": 10003, "active": 0, - "id_after": 30002, + "id_after": 0, "jump_interface": 103, "icon": "rw_cj_icon10", "reword": [ @@ -97,7 +217,7 @@ }, { "key": 30002, - "id_list": 17, + "id_list": 11, "id_tag": 3, "task_display": { "key": "task_30002", @@ -105,7 +225,7 @@ }, "type_id": 10004, "active": 0, - "id_after": 30003, + "id_after": 0, "jump_interface": 103, "icon": "rw_cj_icon10", "reword": [ @@ -118,7 +238,7 @@ }, { "key": 30003, - "id_list": 18, + "id_list": 12, "id_tag": 3, "task_display": { "key": "task_30003", @@ -126,7 +246,7 @@ }, "type_id": 10005, "active": 0, - "id_after": 30004, + "id_after": 0, "jump_interface": 103, "icon": "rw_cj_icon10", "reword": [ @@ -139,7 +259,7 @@ }, { "key": 30004, - "id_list": 19, + "id_list": 13, "id_tag": 3, "task_display": { "key": "task_30004", @@ -147,7 +267,7 @@ }, "type_id": 10006, "active": 0, - "id_after": 30005, + "id_after": 0, "jump_interface": 103, "icon": "rw_cj_icon10", "reword": [ @@ -160,7 +280,7 @@ }, { "key": 30005, - "id_list": 20, + "id_list": 14, "id_tag": 3, "task_display": { "key": "task_30005", @@ -168,7 +288,7 @@ }, "type_id": 10007, "active": 0, - "id_after": 30006, + "id_after": 0, "jump_interface": 103, "icon": "rw_cj_icon10", "reword": [ @@ -181,7 +301,7 @@ }, { "key": 30006, - "id_list": 21, + "id_list": 15, "id_tag": 3, "task_display": { "key": "task_30006", @@ -189,7 +309,7 @@ }, "type_id": 10008, "active": 0, - "id_after": 30007, + "id_after": 0, "jump_interface": 103, "icon": "rw_cj_icon10", "reword": [ @@ -202,7 +322,7 @@ }, { "key": 30007, - "id_list": 22, + "id_list": 16, "id_tag": 3, "task_display": { "key": "task_30007", @@ -210,7 +330,7 @@ }, "type_id": 10009, "active": 0, - "id_after": 30008, + "id_after": 0, "jump_interface": 103, "icon": "rw_cj_icon10", "reword": [ @@ -223,7 +343,7 @@ }, { "key": 30008, - "id_list": 23, + "id_list": 17, "id_tag": 3, "task_display": { "key": "task_30008", @@ -244,7 +364,7 @@ }, { "key": 30101, - "id_list": 24, + "id_list": 18, "id_tag": 3, "task_display": { "key": "task_30101", @@ -252,7 +372,7 @@ }, "type_id": 10203, "active": 0, - "id_after": 30102, + "id_after": 0, "jump_interface": 107, "icon": "rw_cj_icon15", "reword": [ @@ -265,7 +385,7 @@ }, { "key": 30102, - "id_list": 25, + "id_list": 19, "id_tag": 3, "task_display": { "key": "task_30102", @@ -273,7 +393,7 @@ }, "type_id": 10204, "active": 0, - "id_after": 30103, + "id_after": 0, "jump_interface": 107, "icon": "rw_cj_icon15", "reword": [ @@ -286,7 +406,7 @@ }, { "key": 30103, - "id_list": 26, + "id_list": 20, "id_tag": 3, "task_display": { "key": "task_30103", @@ -294,7 +414,7 @@ }, "type_id": 10205, "active": 0, - "id_after": 30104, + "id_after": 0, "jump_interface": 107, "icon": "rw_cj_icon15", "reword": [ @@ -307,7 +427,7 @@ }, { "key": 30104, - "id_list": 27, + "id_list": 21, "id_tag": 3, "task_display": { "key": "task_30104", @@ -315,7 +435,7 @@ }, "type_id": 10206, "active": 0, - "id_after": 30105, + "id_after": 0, "jump_interface": 107, "icon": "rw_cj_icon15", "reword": [ @@ -328,7 +448,7 @@ }, { "key": 30105, - "id_list": 28, + "id_list": 22, "id_tag": 3, "task_display": { "key": "task_30105", @@ -336,7 +456,7 @@ }, "type_id": 10207, "active": 0, - "id_after": 30106, + "id_after": 0, "jump_interface": 107, "icon": "rw_cj_icon15", "reword": [ @@ -349,7 +469,7 @@ }, { "key": 30106, - "id_list": 29, + "id_list": 23, "id_tag": 3, "task_display": { "key": "task_30106", @@ -357,7 +477,7 @@ }, "type_id": 10208, "active": 0, - "id_after": 30107, + "id_after": 0, "jump_interface": 107, "icon": "rw_cj_icon15", "reword": [ @@ -370,7 +490,7 @@ }, { "key": 30107, - "id_list": 30, + "id_list": 24, "id_tag": 3, "task_display": { "key": "task_30107", @@ -378,7 +498,7 @@ }, "type_id": 10209, "active": 0, - "id_after": 30108, + "id_after": 0, "jump_interface": 107, "icon": "rw_cj_icon15", "reword": [ @@ -391,7 +511,7 @@ }, { "key": 30108, - "id_list": 31, + "id_list": 25, "id_tag": 3, "task_display": { "key": "task_30108", From 0bff578ca985c829234ce71eb0fd27680657a51f Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 28 Sep 2022 20:06:25 +0800 Subject: [PATCH 19/19] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_skillafteratk.json | 24 +++++++++++---- bin/json/game_skillatk.json | 18 ++++-------- bin/json/game_taskround.json | 50 ++++++++++++++++---------------- 3 files changed, 49 insertions(+), 43 deletions(-) diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index adb843633..dcfa4f498 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -7561,7 +7561,9 @@ 4, 550 ], - "FollowSK": [], + "FollowSK": [ + 224002112 + ], "SucFollowSK": [ 224002113 ], @@ -7602,7 +7604,9 @@ 4, 600 ], - "FollowSK": [], + "FollowSK": [ + 224002122 + ], "SucFollowSK": [ 224002113 ], @@ -7644,7 +7648,9 @@ 4, 650 ], - "FollowSK": [], + "FollowSK": [ + 224002132 + ], "SucFollowSK": [ 224002113 ], @@ -7686,7 +7692,9 @@ 4, 700 ], - "FollowSK": [], + "FollowSK": [ + 224002142 + ], "SucFollowSK": [ 224002113 ], @@ -7728,7 +7736,9 @@ 4, 750 ], - "FollowSK": [], + "FollowSK": [ + 224002152 + ], "SucFollowSK": [ 224002113 ], @@ -7770,7 +7780,9 @@ 4, 800 ], - "FollowSK": [], + "FollowSK": [ + 224002162 + ], "SucFollowSK": [ 224002113 ], diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 9e24d0b0b..2aa90702e 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -5516,8 +5516,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 224002111, - 224002112 + 224002111 ] }, "Desc": { @@ -5542,8 +5541,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 224002121, - 224002122 + 224002121 ] }, "Desc": { @@ -5568,8 +5566,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 224002131, - 224002132 + 224002131 ] }, "Desc": { @@ -5594,8 +5591,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 224002141, - 224002142 + 224002141 ] }, "Desc": { @@ -5620,8 +5616,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 224002151, - 224002152 + 224002151 ] }, "Desc": { @@ -5646,8 +5641,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 224002161, - 224002162 + 224002161 ] }, "Desc": { diff --git a/bin/json/game_taskround.json b/bin/json/game_taskround.json index 7a6a94f80..419beb272 100644 --- a/bin/json/game_taskround.json +++ b/bin/json/game_taskround.json @@ -121,8 +121,8 @@ }, { "key": 20002, - "id_list": 10, - "id_tag": 3, + "id_list": 9, + "id_tag": 2, "task_display": { "key": "task_20002", "text": "提升任意英雄10级" @@ -136,8 +136,8 @@ }, { "key": 20003, - "id_list": 11, - "id_tag": 3, + "id_list": 10, + "id_tag": 2, "task_display": { "key": "task_20003", "text": "提升任意英雄20级" @@ -151,7 +151,7 @@ }, { "key": 20004, - "id_list": 9, + "id_list": 11, "id_tag": 2, "task_display": { "key": "task_20004", @@ -166,8 +166,8 @@ }, { "key": 20005, - "id_list": 18, - "id_tag": 3, + "id_list": 12, + "id_tag": 2, "task_display": { "key": "task_20005", "text": "进行10次普通招募" @@ -181,8 +181,8 @@ }, { "key": 20006, - "id_list": 19, - "id_tag": 3, + "id_list": 13, + "id_tag": 2, "task_display": { "key": "task_20006", "text": "进行20次普通招募" @@ -196,7 +196,7 @@ }, { "key": 30001, - "id_list": 10, + "id_list": 14, "id_tag": 3, "task_display": { "key": "task_30001", @@ -217,7 +217,7 @@ }, { "key": 30002, - "id_list": 11, + "id_list": 15, "id_tag": 3, "task_display": { "key": "task_30002", @@ -238,7 +238,7 @@ }, { "key": 30003, - "id_list": 12, + "id_list": 16, "id_tag": 3, "task_display": { "key": "task_30003", @@ -259,7 +259,7 @@ }, { "key": 30004, - "id_list": 13, + "id_list": 17, "id_tag": 3, "task_display": { "key": "task_30004", @@ -280,7 +280,7 @@ }, { "key": 30005, - "id_list": 14, + "id_list": 18, "id_tag": 3, "task_display": { "key": "task_30005", @@ -301,7 +301,7 @@ }, { "key": 30006, - "id_list": 15, + "id_list": 19, "id_tag": 3, "task_display": { "key": "task_30006", @@ -322,7 +322,7 @@ }, { "key": 30007, - "id_list": 16, + "id_list": 20, "id_tag": 3, "task_display": { "key": "task_30007", @@ -343,7 +343,7 @@ }, { "key": 30008, - "id_list": 17, + "id_list": 21, "id_tag": 3, "task_display": { "key": "task_30008", @@ -364,7 +364,7 @@ }, { "key": 30101, - "id_list": 18, + "id_list": 22, "id_tag": 3, "task_display": { "key": "task_30101", @@ -385,7 +385,7 @@ }, { "key": 30102, - "id_list": 19, + "id_list": 23, "id_tag": 3, "task_display": { "key": "task_30102", @@ -406,7 +406,7 @@ }, { "key": 30103, - "id_list": 20, + "id_list": 24, "id_tag": 3, "task_display": { "key": "task_30103", @@ -427,7 +427,7 @@ }, { "key": 30104, - "id_list": 21, + "id_list": 25, "id_tag": 3, "task_display": { "key": "task_30104", @@ -448,7 +448,7 @@ }, { "key": 30105, - "id_list": 22, + "id_list": 26, "id_tag": 3, "task_display": { "key": "task_30105", @@ -469,7 +469,7 @@ }, { "key": 30106, - "id_list": 23, + "id_list": 27, "id_tag": 3, "task_display": { "key": "task_30106", @@ -490,7 +490,7 @@ }, { "key": 30107, - "id_list": 24, + "id_list": 28, "id_tag": 3, "task_display": { "key": "task_30107", @@ -511,7 +511,7 @@ }, { "key": 30108, - "id_list": 25, + "id_list": 29, "id_tag": 3, "task_display": { "key": "task_30108",