From 45633d0c6adf01dd2d242bd824c10ce6543042fe Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Thu, 29 Jun 2023 18:24:50 +0800 Subject: [PATCH 1/3] update --- modules/battle/module.go | 47 +++++++++++++++++++++++---------------- modules/user/api_login.go | 8 ++++--- modules/user/module.go | 6 +++-- 3 files changed, 37 insertions(+), 24 deletions(-) diff --git a/modules/battle/module.go b/modules/battle/module.go index d94f3a3cc..b13b196df 100644 --- a/modules/battle/module.go +++ b/modules/battle/module.go @@ -35,7 +35,7 @@ type Battle struct { clientmgr *battleClientMgrComp //c#战斗客户端端管理 } -//模块名 +// 模块名 func (this *Battle) GetType() core.M_Modules { return comm.ModuleBattle } @@ -44,7 +44,7 @@ func (this *Battle) NewOptions() (options core.IModuleOptions) { return new(Options) } -//模块初始化接口 注册用户创建角色事件 +// 模块初始化接口 注册用户创建角色事件 func (this *Battle) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { err = this.ModuleBase.Init(service, module, options) this.service = service.(base.IRPCXService) @@ -71,7 +71,7 @@ func (this *Battle) Start() (err error) { return } -//装备组件 +// 装备组件 func (this *Battle) OnInstallComp() { this.ModuleBase.OnInstallComp() this.api_comp = this.RegisterComp(new(apiComp)).(*apiComp) @@ -80,7 +80,7 @@ func (this *Battle) OnInstallComp() { this.clientmgr = this.RegisterComp(new(battleClientMgrComp)).(*battleClientMgrComp) } -//查询战斗记录 +// 查询战斗记录 func (this *Battle) QueryBattleRecord(oid string) (errdata *pb.ErrorData, record *pb.DBBattleRecord) { var err error if record, err = this.modelBattle.queryrecord(oid); err != nil { @@ -93,7 +93,7 @@ func (this *Battle) QueryBattleRecord(oid string) (errdata *pb.ErrorData, record return } -//创建pve战斗 +// 创建pve战斗 func (this *Battle) CreateEveBattle(session comm.IUserSession, req *pb.BattleEVEReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) { var ( conn *db.DBConn @@ -120,7 +120,7 @@ func (this *Battle) CreateEveBattle(session comm.IUserSession, req *pb.BattleEVE return } -//创建pve战斗 +// 创建pve战斗 func (this *Battle) CreatePveBattle(session comm.IUserSession, req *pb.BattlePVEReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) { var ( conn *db.DBConn @@ -153,8 +153,10 @@ func (this *Battle) CreatePveBattle(session comm.IUserSession, req *pb.BattlePVE Title: pb.ErrorCode_ReqParameterError.ToString(), } } + var flag bool for _, v := range req.Format.Friendformat { if v != "" { + flag = true // this.ModuleBuried.SendToRtask(session, comm.Rtype108, 1) go this.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype108, 1)) break @@ -164,13 +166,13 @@ func (this *Battle) CreatePveBattle(session comm.IUserSession, req *pb.BattlePVE if record, errdata = this.modelBattle.createpve(session, conn, pb.BattleType_pve, req); errdata != nil { return } - if req.Format.Friendformat != nil { + if flag { go this.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype12, 1)) } return } -//创建pve战斗 +// 创建pve战斗 func (this *Battle) CreatePvbBattle(session comm.IUserSession, req *pb.BattlePVBReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) { var ( conn *db.DBConn @@ -203,7 +205,7 @@ func (this *Battle) CreatePvbBattle(session comm.IUserSession, req *pb.BattlePVB return } -//创建pve战斗 +// 创建pve战斗 func (this *Battle) CreatePvpBattle(session comm.IUserSession, req *pb.BattlePVPReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) { var ( conn *db.DBConn @@ -229,7 +231,7 @@ func (this *Battle) CreatePvpBattle(session comm.IUserSession, req *pb.BattlePVP return } -//只有跨服环境下才可使用 +// 只有跨服环境下才可使用 func (this *Battle) CreateRtPvpBattle(req *pb.BattleRTPVPReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) { var ( redmodel *db.DBModel @@ -265,7 +267,7 @@ func (this *Battle) CreateRtPvpBattle(req *pb.BattleRTPVPReq) (errdata *pb.Error return } -//创建连续战斗 +// 创建连续战斗 func (this *Battle) CreateLPVEBattle(session comm.IUserSession, req *pb.BattleLPVEReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) { var ( conn *db.DBConn @@ -298,8 +300,10 @@ func (this *Battle) CreateLPVEBattle(session comm.IUserSession, req *pb.BattleLP Title: pb.ErrorCode_ReqParameterError.ToString(), } } + var flag bool for _, v := range req.Format.Friendformat { if v != "" { + flag = true // this.ModuleBuried.SendToRtask(session, comm.Rtype108, 1) go this.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype108, 1)) break @@ -309,19 +313,19 @@ func (this *Battle) CreateLPVEBattle(session comm.IUserSession, req *pb.BattleLP if record, errdata = this.modelBattle.createlpve(session, conn, pb.BattleType_lpev, req); errdata != nil { return } - if req.Format.Friendformat != nil { + if flag { go this.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype12, 1)) } return } -///创建角色列表 更具Format表格 +// /创建角色列表 更具Format表格 func (this *Battle) CreateRolesByFormat(fid int32) (captain int32, roles []*pb.BattleRole, errdata *pb.ErrorData) { captain, roles, errdata = this.modelBattle.createMasterRoles(2, 0, fid) return } -///创建角色列表 更具英雄列表 +// /创建角色列表 更具英雄列表 func (this *Battle) CreateRolesByHeros(heros []*pb.DBHero) (roles []*pb.BattleRole, errdata *pb.ErrorData) { roles = make([]*pb.BattleRole, len(heros)) for i, v := range heros { @@ -334,7 +338,7 @@ func (this *Battle) CreateRolesByHeros(heros []*pb.DBHero) (roles []*pb.BattleRo return } -///获取战斗详情 +// /获取战斗详情 func (this *Battle) GetBattleInfo(req *pb.BattleGetInfoReq) (errdata *pb.ErrorData, resp *pb.BattleGetInfoResp) { this.Debug("GetBattleInfo", log.Field{Key: "req", Value: req}) var ( @@ -352,7 +356,7 @@ func (this *Battle) GetBattleInfo(req *pb.BattleGetInfoReq) (errdata *pb.ErrorDa return } -//创建战斗服务 +// 创建战斗服务 func (this *Battle) CreateBattleServer(req *pb.BattleInfo) (errdata *pb.ErrorData) { this.Debug("CreateBattleServer", log.Field{Key: "req", Value: req}) var ( @@ -400,7 +404,7 @@ func (this *Battle) InCmdBattle(req *pb.BattleInCmdReq) (errdata *pb.ErrorData) return } -//pvp认输 +// pvp认输 func (this *Battle) ConcedeBattle(req *pb.BattleConcedeReq) (errdata *pb.ErrorData) { var ( resp *pb.BattleConcedeResp @@ -422,7 +426,7 @@ func (this *Battle) ConcedeBattle(req *pb.BattleConcedeReq) (errdata *pb.ErrorDa return } -//校验战报是否成功 +// 校验战报是否成功 func (this *Battle) CheckBattleReport(session comm.IUserSession, report *pb.BattleReport) (errdata *pb.ErrorData, iswin bool) { var ( reply *pb.BattleCheckResults @@ -459,5 +463,10 @@ func (this *Battle) CheckBattleReport(session comm.IUserSession, report *pb.Batt // this.ModuleBuried.SendToRtask(session, comm.Rtype157, int32(report.Info.Ptype), v) go this.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype157, int32(report.Info.Ptype), v)) } - return nil, true + + if (report.WinSide == 1 && report.Info.RedCompId == session.GetUserId()) || (report.WinSide == 2 && report.Info.BlueCompId == session.GetUserId()) { + return nil, true + } else { + return nil, false + } } diff --git a/modules/user/api_login.go b/modules/user/api_login.go index cd9bf0d6e..2e3966188 100644 --- a/modules/user/api_login.go +++ b/modules/user/api_login.go @@ -10,7 +10,7 @@ import ( "go.mongodb.org/mongo-driver/mongo" ) -//参数校验 +// 参数校验 func (this *apiComp) LoginCheck(session comm.IUserSession, req *pb.UserLoginReq) (errdata *pb.ErrorData) { if req.Account == "" { errdata = &pb.ErrorData{ @@ -21,7 +21,7 @@ func (this *apiComp) LoginCheck(session comm.IUserSession, req *pb.UserLoginReq) return } -//登录 +// 登录 func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (errdata *pb.ErrorData) { if errdata = this.LoginCheck(session, req); errdata != nil { return @@ -135,6 +135,8 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err this.module.modelSign.UserSign(session) } + // 判断昨日是否登录 + rsp.Data = user // 查询玩家扩展数据 @@ -150,7 +152,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err } else { rsp.Ex = expand } - } else { //新号 + } else { //新号 rsp.Ex = &pb.DBUserExpand{} this.module.modelSign.UserSign(session) go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype8, 1)) diff --git a/modules/user/module.go b/modules/user/module.go index 59582ebe1..4c22a7451 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -536,10 +536,12 @@ func (this *User) change(session comm.IUserSession, attr string, add int32) (cha } return } - } else { change.Ps += add - if change.Ps > ggd.PsUl { + } else { + if change.Ps+add > ggd.PsUl { change.Ps = ggd.PsUl + } else { + change.Ps += add } } From cee377b7ccef4663156844b5d8a650d70c1c921a Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Thu, 29 Jun 2023 18:28:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A3=85=E5=A4=87bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/model_hero.go | 41 ++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index 1cae6e27c..ad900d9f9 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -36,7 +36,7 @@ func (this *ModelHero) Init(service core.IService, module core.IModule, comp cor return } -//初始化英雄 +// 初始化英雄 func (this *ModelHero) InitHero(uid string, heroCfgId string) *pb.DBHero { heroCfg, _ := this.module.configure.GetHeroConfig(heroCfgId) @@ -67,7 +67,7 @@ func (this *ModelHero) InitHero(uid string, heroCfgId string) *pb.DBHero { return newHero } -//初始化英雄技能 +// 初始化英雄技能 func (this *ModelHero) initHeroSkill(hero *pb.DBHero) []*pb.SkillData { heroCfg, _ := this.module.configure.GetHeroConfig(hero.HeroID) @@ -92,7 +92,7 @@ func (this *ModelHero) initHeroSkill(hero *pb.DBHero) []*pb.SkillData { return nil } -//创建一个指定的英雄 +// 创建一个指定的英雄 func (this *ModelHero) createSpecialHero(uid string, heroCfgId string) (hero *pb.DBHero, err error) { list := this.getHeroList(uid) for _, v := range list { @@ -132,7 +132,7 @@ func (this *ModelHero) CloneNewHero(uid string, hero *pb.DBHero) (newHero *pb.DB return } -//初始化可叠加的英雄 +// 初始化可叠加的英雄 func (this *ModelHero) initHeroOverlying(uid string, heroCfgId string, count int32) (hero *pb.DBHero, err error) { var ( model *db.DBModel @@ -158,7 +158,7 @@ func (this *ModelHero) initHeroOverlying(uid string, heroCfgId string, count int return } -//获取一个英雄(参数唯一objID) +// 获取一个英雄(参数唯一objID) func (this *ModelHero) getOneHero(uid, heroId string) *pb.DBHero { hero := &pb.DBHero{} err := this.GetListObj(uid, heroId, hero) @@ -168,7 +168,7 @@ func (this *ModelHero) getOneHero(uid, heroId string) *pb.DBHero { return hero } -//消耗英雄卡 +// 消耗英雄卡 func (this *ModelHero) consumeHeroCard(uid string, hero *pb.DBHero) (err error) { if hero == nil { @@ -183,7 +183,7 @@ func (this *ModelHero) consumeHeroCard(uid string, hero *pb.DBHero) (err error) return } -//获取玩家的英雄列表 +// 获取玩家的英雄列表 func (this *ModelHero) getHeroList(uid string) []*pb.DBHero { heroes := make([]*pb.DBHero, 0) err := this.GetList(uid, &heroes) @@ -276,13 +276,16 @@ func (this *ModelHero) setEquipProperty(hero *pb.DBHero, equip []*pb.DB_Equipmen } for _, v := range hero.Suits { - if configure, err := this.module.configure.GetEquipsuit(v.Suitid); err != nil { - this.module.Errorln(err) - } else { - for k, v := range configure.SetBonuses { - addProperty[k] += v + if v.Effect { + if configure, err := this.module.configure.GetEquipsuit(v.Suitid); err != nil { + this.module.Errorln(err) + } else { + for k, v := range configure.SetBonuses { + addProperty[k] += v + } } } + } for k, v := range addProperty { @@ -300,7 +303,7 @@ func (this *ModelHero) setEquipProperty(hero *pb.DBHero, equip []*pb.DB_Equipmen this.mergeAddProperty(hero.Uid, hero, addProperty, equipSkill) } -//设置装备 +// 设置装备 func (this *ModelHero) setEquipment(uid string, hero *pb.DBHero) (newHero *pb.DBHero, err error) { if len(hero.EquipID) == 0 { return @@ -316,7 +319,7 @@ func (this *ModelHero) setEquipment(uid string, hero *pb.DBHero) (newHero *pb.DB return } -//合并属性即属性值累加 (data 额外加的属性) +// 合并属性即属性值累加 (data 额外加的属性) func (this *ModelHero) mergeMainProperty(uid string, hero *pb.DBHero, data map[string]int32) (err error) { for k, v := range hero.Property { if v1, ok := data[k]; ok { @@ -332,7 +335,7 @@ func (this *ModelHero) mergeMainProperty(uid string, hero *pb.DBHero, data map[s return } -//合并附加属性 +// 合并附加属性 func (this *ModelHero) mergeAddProperty(uid string, hero *pb.DBHero, data map[string]int32, skills []*pb.SkillData) { hero.AddProperty = data @@ -373,8 +376,8 @@ func (this *ModelHero) StarHpAddition(star int32) (addValue float32) { return addValue } -//属性计算 基础属性 -//英雄基础属性 + 英雄等级基础属性 * 英雄成长系数 + 英雄星级对应等级属性 * 英雄品质系数 +// 属性计算 基础属性 +// 英雄基础属性 + 英雄等级基础属性 * 英雄成长系数 + 英雄星级对应等级属性 * 英雄品质系数 func (this *ModelHero) PropertyCompute(hero *pb.DBHero) { growCfg := this.module.configure.GetHeroLvgrow(hero.HeroID) heroCfg, _ := this.module.configure.GetHeroConfig(hero.HeroID) @@ -416,7 +419,7 @@ func (this *ModelHero) PropertyCompute(hero *pb.DBHero) { this.resetJuexingProperty(hero) } -//重新计算英雄属性 +// 重新计算英雄属性 func (this *ModelHero) ChangeHeroProperty(session comm.IUserSession, hero *pb.DBHero) (err error) { this.PropertyCompute(hero) //重新计算 property 的值 update := map[string]interface{}{ @@ -639,7 +642,7 @@ func (this *ModelHero) InitMonsterHero(heroCfgId string, star, lv int32) *pb.DBH return newHero } -//设置天赋属性 +// 设置天赋属性 func (this *ModelHero) setTalentProperty(hero *pb.DBHero, conf *cfg.GameHeroTalentData) { if conf == nil || hero == nil { return From d7277d03439d583b9f0c1cc6606ed3277413c985 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Thu, 29 Jun 2023 18:31:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=89=88=E7=BD=B2?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_buriedcondi.json | 10 +- bin/json/game_hero.json | 2 +- bin/json/game_mainstage.json | 8 +- bin/json/game_monsterformat.json | 108 +++---- bin/json/game_pagoda.json | 20 +- bin/json/game_rdtasknpc.json | 2 +- bin/json/game_recharge.json | 220 ++------------ bin/json/game_shopitem.json | 40 +-- bin/json/game_skillafteratk.json | 474 +++++++++++++++---------------- bin/json/game_skillatk.json | 2 +- bin/json/game_skillbuff.json | 2 +- bin/json/game_smithytask.json | 21 -- bin/json/game_worldtask.json | 14 +- 13 files changed, 370 insertions(+), 553 deletions(-) diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 138ace48a..31ac65711 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -17756,15 +17756,15 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_759", - "text": "装备副本boss2难度2" + "text": "火焰泰坦难度3" }, "type": 73, "valid": 0, "NPC": 10344, "value": 1, "filter": [ - 2, - 2 + 1, + 3 ], "filter2": [ "boss类型", @@ -17923,7 +17923,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_766", - "text": "维京远征火焰泰坦难度3" + "text": "火焰泰坦难度4" }, "type": 73, "valid": 0, @@ -17931,7 +17931,7 @@ "value": 1, "filter": [ 1, - 3 + 4 ], "filter2": [ "boss类型", diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index 766641813..35f2d85de 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -1472,7 +1472,7 @@ "type": 1, "ip": 6, "sd": 1, - "handbook": 1, + "handbook": -1, "prefab": "24001", "rotation": "0|0|0", "revolve": 0, diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index da760cfd1..7c5996746 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -1767,7 +1767,7 @@ "FormatList": [ 103041 ], - "captainId": 240015, + "captainId": 130015, "star": [ 1, 1, @@ -10311,7 +10311,7 @@ "FormatList": [ 123041 ], - "captainId": 240015, + "captainId": 130015, "star": [ 1, 1, @@ -18855,7 +18855,7 @@ "FormatList": [ 143041 ], - "captainId": 240015, + "captainId": 130015, "star": [ 1, 1, @@ -27399,7 +27399,7 @@ "FormatList": [ 163041 ], - "captainId": 240015, + "captainId": 130015, "star": [ 1, 1, diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 77e7a353c..9db6ca338 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -115670,9 +115670,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 1, + "hppro": 1.5, "atkpro": 0.35, - "defpro": 0.1, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -115970,9 +115970,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 3.5, - "atkpro": 1, - "defpro": 0.1, + "hppro": 2.5, + "atkpro": 0.5, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -116270,9 +116270,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 4, - "atkpro": 1.2, - "defpro": 0.1, + "hppro": 3.5, + "atkpro": 0.65, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -116570,9 +116570,9 @@ "equip": [], "newskill": [], "lv": 25, - "hppro": 5, - "atkpro": 1.3, - "defpro": 0.1, + "hppro": 4.5, + "atkpro": 0.8, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -116870,9 +116870,9 @@ "equip": [], "newskill": [], "lv": 30, - "hppro": 6, - "atkpro": 1.3, - "defpro": 0.1, + "hppro": 5.5, + "atkpro": 0.95, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -117170,9 +117170,9 @@ "equip": [], "newskill": [], "lv": 35, - "hppro": 8, - "atkpro": 1.4, - "defpro": 0.1, + "hppro": 6.5, + "atkpro": 1.1, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -117470,9 +117470,9 @@ "equip": [], "newskill": [], "lv": 40, - "hppro": 10, - "atkpro": 1.4, - "defpro": 0.1, + "hppro": 7.5, + "atkpro": 1.25, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -117770,9 +117770,9 @@ "equip": [], "newskill": [], "lv": 45, - "hppro": 12, - "atkpro": 1.5, - "defpro": 0.1, + "hppro": 8.5, + "atkpro": 1.4, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -118070,9 +118070,9 @@ "equip": [], "newskill": [], "lv": 50, - "hppro": 14, - "atkpro": 1.5, - "defpro": 0.1, + "hppro": 9.5, + "atkpro": 1.55, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -118370,9 +118370,9 @@ "equip": [], "newskill": [], "lv": 55, - "hppro": 16, - "atkpro": 2, - "defpro": 0.1, + "hppro": 11, + "atkpro": 1.7, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -118671,7 +118671,7 @@ "newskill": [], "lv": 10, "hppro": 2, - "atkpro": 1, + "atkpro": 0.8, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -118970,8 +118970,8 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 3, - "atkpro": 1, + "hppro": 2.5, + "atkpro": 0.8, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -119270,8 +119270,8 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 4, - "atkpro": 1, + "hppro": 3, + "atkpro": 0.8, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -119570,8 +119570,8 @@ "equip": [], "newskill": [], "lv": 25, - "hppro": 5, - "atkpro": 1, + "hppro": 3.5, + "atkpro": 0.8, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -119870,8 +119870,8 @@ "equip": [], "newskill": [], "lv": 30, - "hppro": 6, - "atkpro": 1, + "hppro": 4, + "atkpro": 0.8, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -120170,8 +120170,8 @@ "equip": [], "newskill": [], "lv": 35, - "hppro": 7, - "atkpro": 1, + "hppro": 6, + "atkpro": 0.8, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -120471,7 +120471,7 @@ "newskill": [], "lv": 40, "hppro": 8, - "atkpro": 1, + "atkpro": 0.8, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -120771,7 +120771,7 @@ "newskill": [], "lv": 45, "hppro": 10, - "atkpro": 1, + "atkpro": 0.8, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -121071,7 +121071,7 @@ "newskill": [], "lv": 50, "hppro": 12, - "atkpro": 1, + "atkpro": 0.8, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -121371,7 +121371,7 @@ "newskill": [], "lv": 55, "hppro": 14, - "atkpro": 1, + "atkpro": 0.8, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -121671,7 +121671,7 @@ "newskill": [], "lv": 10, "hppro": 2, - "atkpro": 1.5, + "atkpro": 1.2, "defpro": 0.4, "skill1": 1, "skill2": 1, @@ -121971,7 +121971,7 @@ "newskill": [], "lv": 15, "hppro": 3, - "atkpro": 1.5, + "atkpro": 1.2, "defpro": 0.4, "skill1": 1, "skill2": 1, @@ -122271,7 +122271,7 @@ "newskill": [], "lv": 20, "hppro": 4, - "atkpro": 1.5, + "atkpro": 1.2, "defpro": 0.4, "skill1": 1, "skill2": 1, @@ -122571,7 +122571,7 @@ "newskill": [], "lv": 25, "hppro": 5, - "atkpro": 1.5, + "atkpro": 1.2, "defpro": 0.4, "skill1": 1, "skill2": 1, @@ -122871,7 +122871,7 @@ "newskill": [], "lv": 30, "hppro": 6, - "atkpro": 1.5, + "atkpro": 1.2, "defpro": 0.4, "skill1": 1, "skill2": 1, @@ -123171,7 +123171,7 @@ "newskill": [], "lv": 35, "hppro": 7, - "atkpro": 1.5, + "atkpro": 1.2, "defpro": 0.4, "skill1": 1, "skill2": 1, @@ -123471,7 +123471,7 @@ "newskill": [], "lv": 40, "hppro": 8, - "atkpro": 1.5, + "atkpro": 1.2, "defpro": 0.4, "skill1": 1, "skill2": 1, @@ -123771,7 +123771,7 @@ "newskill": [], "lv": 45, "hppro": 10, - "atkpro": 1.5, + "atkpro": 1.2, "defpro": 0.4, "skill1": 1, "skill2": 1, @@ -124071,7 +124071,7 @@ "newskill": [], "lv": 50, "hppro": 11, - "atkpro": 1.5, + "atkpro": 1.2, "defpro": 0.4, "skill1": 1, "skill2": 1, @@ -124371,7 +124371,7 @@ "newskill": [], "lv": 55, "hppro": 12, - "atkpro": 1.5, + "atkpro": 1.2, "defpro": 0.4, "skill1": 1, "skill2": 1, diff --git a/bin/json/game_pagoda.json b/bin/json/game_pagoda.json index 0901cfe39..836106dec 100644 --- a/bin/json/game_pagoda.json +++ b/bin/json/game_pagoda.json @@ -3007,7 +3007,7 @@ "Level_type": 1, "layer_num": 1, "tab": 10, - "tabIcon": "xmwg_fb_rk3", + "tabIcon": "xmwg_fb_rk4", "tabTitle": { "key": "pagoda10", "text": "功夫宗师" @@ -3038,7 +3038,7 @@ "Level_type": 1, "layer_num": 2, "tab": 10, - "tabIcon": "xmwg_fb_rk3", + "tabIcon": "xmwg_fb_rk4", "tabTitle": { "key": "pagoda10", "text": "功夫宗师" @@ -3069,7 +3069,7 @@ "Level_type": 1, "layer_num": 3, "tab": 10, - "tabIcon": "xmwg_fb_rk3", + "tabIcon": "xmwg_fb_rk4", "tabTitle": { "key": "pagoda10", "text": "功夫宗师" @@ -3100,7 +3100,7 @@ "Level_type": 1, "layer_num": 4, "tab": 10, - "tabIcon": "xmwg_fb_rk3", + "tabIcon": "xmwg_fb_rk4", "tabTitle": { "key": "pagoda10", "text": "功夫宗师" @@ -3131,7 +3131,7 @@ "Level_type": 1, "layer_num": 5, "tab": 10, - "tabIcon": "xmwg_fb_rk3", + "tabIcon": "xmwg_fb_rk4", "tabTitle": { "key": "pagoda10", "text": "功夫宗师" @@ -3173,7 +3173,7 @@ "Level_type": 1, "layer_num": 6, "tab": 10, - "tabIcon": "xmwg_fb_rk3", + "tabIcon": "xmwg_fb_rk4", "tabTitle": { "key": "pagoda10", "text": "功夫宗师" @@ -3204,7 +3204,7 @@ "Level_type": 1, "layer_num": 7, "tab": 10, - "tabIcon": "xmwg_fb_rk3", + "tabIcon": "xmwg_fb_rk4", "tabTitle": { "key": "pagoda10", "text": "功夫宗师" @@ -3235,7 +3235,7 @@ "Level_type": 1, "layer_num": 8, "tab": 10, - "tabIcon": "xmwg_fb_rk3", + "tabIcon": "xmwg_fb_rk4", "tabTitle": { "key": "pagoda10", "text": "功夫宗师" @@ -3266,7 +3266,7 @@ "Level_type": 1, "layer_num": 9, "tab": 10, - "tabIcon": "xmwg_fb_rk3", + "tabIcon": "xmwg_fb_rk4", "tabTitle": { "key": "pagoda10", "text": "功夫宗师" @@ -3297,7 +3297,7 @@ "Level_type": 1, "layer_num": 10, "tab": 10, - "tabIcon": "xmwg_fb_rk3", + "tabIcon": "xmwg_fb_rk4", "tabTitle": { "key": "pagoda10", "text": "功夫宗师" diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 8f078da4a..bd8bfdf62 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -1608,7 +1608,7 @@ "heroid": 25001, "datas": [ "GameMain", - "20030_熊猫2", + "功能入口-维京远征", "901" ], "event": [ diff --git a/bin/json/game_recharge.json b/bin/json/game_recharge.json index 7593c8cc5..7bf4bf1f5 100644 --- a/bin/json/game_recharge.json +++ b/bin/json/game_recharge.json @@ -6,11 +6,6 @@ "monetaryunit": "￥", "amount": 600, "vipexp": [ - { - "a": "attr", - "t": "vipexp", - "n": 60 - }, { "a": "attr", "t": "diamond", @@ -18,15 +13,10 @@ } ], "diamond_num_double": [ - { - "a": "attr", - "t": "vipexp", - "n": 60 - }, { "a": "attr", "t": "diamond", - "n": 120 + "n": 30 } ], "channel": "0", @@ -41,11 +31,6 @@ "monetaryunit": "￥", "amount": 3000, "vipexp": [ - { - "a": "attr", - "t": "vipexp", - "n": 300 - }, { "a": "attr", "t": "diamond", @@ -53,15 +38,10 @@ } ], "diamond_num_double": [ - { - "a": "attr", - "t": "vipexp", - "n": 300 - }, { "a": "attr", "t": "diamond", - "n": 600 + "n": 150 } ], "channel": "0", @@ -76,11 +56,6 @@ "monetaryunit": "￥", "amount": 6800, "vipexp": [ - { - "a": "attr", - "t": "vipexp", - "n": 680 - }, { "a": "attr", "t": "diamond", @@ -88,15 +63,10 @@ } ], "diamond_num_double": [ - { - "a": "attr", - "t": "vipexp", - "n": 680 - }, { "a": "attr", "t": "diamond", - "n": 1360 + "n": 340 } ], "channel": "0", @@ -111,11 +81,6 @@ "monetaryunit": "￥", "amount": 9800, "vipexp": [ - { - "a": "attr", - "t": "vipexp", - "n": 980 - }, { "a": "attr", "t": "diamond", @@ -123,15 +88,10 @@ } ], "diamond_num_double": [ - { - "a": "attr", - "t": "vipexp", - "n": 980 - }, { "a": "attr", "t": "diamond", - "n": 1960 + "n": 490 } ], "channel": "0", @@ -146,11 +106,6 @@ "monetaryunit": "￥", "amount": 12800, "vipexp": [ - { - "a": "attr", - "t": "vipexp", - "n": 1280 - }, { "a": "attr", "t": "diamond", @@ -158,15 +113,10 @@ } ], "diamond_num_double": [ - { - "a": "attr", - "t": "vipexp", - "n": 1280 - }, { "a": "attr", "t": "diamond", - "n": 2560 + "n": 640 } ], "channel": "0", @@ -181,11 +131,6 @@ "monetaryunit": "￥", "amount": 19800, "vipexp": [ - { - "a": "attr", - "t": "vipexp", - "n": 1980 - }, { "a": "attr", "t": "diamond", @@ -193,15 +138,10 @@ } ], "diamond_num_double": [ - { - "a": "attr", - "t": "vipexp", - "n": 1980 - }, { "a": "attr", "t": "diamond", - "n": 3960 + "n": 990 } ], "channel": "0", @@ -216,11 +156,6 @@ "monetaryunit": "￥", "amount": 32800, "vipexp": [ - { - "a": "attr", - "t": "vipexp", - "n": 3280 - }, { "a": "attr", "t": "diamond", @@ -228,15 +163,10 @@ } ], "diamond_num_double": [ - { - "a": "attr", - "t": "vipexp", - "n": 3280 - }, { "a": "attr", "t": "diamond", - "n": 6560 + "n": 1640 } ], "channel": "0", @@ -251,11 +181,6 @@ "monetaryunit": "￥", "amount": 64800, "vipexp": [ - { - "a": "attr", - "t": "vipexp", - "n": 6480 - }, { "a": "attr", "t": "diamond", @@ -263,15 +188,10 @@ } ], "diamond_num_double": [ - { - "a": "attr", - "t": "vipexp", - "n": 6480 - }, { "a": "attr", "t": "diamond", - "n": 12960 + "n": 3240 } ], "channel": "0", @@ -288,11 +208,17 @@ "vipexp": [ { "a": "attr", - "t": "vipexp", + "t": "diamond", "n": 60 } ], - "diamond_num_double": [], + "diamond_num_double": [ + { + "a": "attr", + "t": "diamond", + "n": 30 + } + ], "channel": "0", "text": "0", "show": "6元", @@ -304,13 +230,7 @@ "recharge_type": 2, "monetaryunit": "￥", "amount": 600, - "vipexp": [ - { - "a": "attr", - "t": "vipexp", - "n": 60 - } - ], + "vipexp": [], "diamond_num_double": [], "channel": "0", "text": "0", @@ -323,13 +243,7 @@ "recharge_type": 2, "monetaryunit": "￥", "amount": 3000, - "vipexp": [ - { - "a": "attr", - "t": "vipexp", - "n": 300 - } - ], + "vipexp": [], "diamond_num_double": [], "channel": "0", "text": "0", @@ -342,13 +256,7 @@ "recharge_type": 2, "monetaryunit": "￥", "amount": 6800, - "vipexp": [ - { - "a": "attr", - "t": "vipexp", - "n": 680 - } - ], + "vipexp": [], "diamond_num_double": [], "channel": "0", "text": "0", @@ -361,13 +269,7 @@ "recharge_type": 2, "monetaryunit": "￥", "amount": 12800, - "vipexp": [ - { - "a": "attr", - "t": "vipexp", - "n": 1280 - } - ], + "vipexp": [], "diamond_num_double": [], "channel": "0", "text": "0", @@ -380,13 +282,7 @@ "recharge_type": 2, "monetaryunit": "￥", "amount": 3000, - "vipexp": [ - { - "a": "attr", - "t": "vipexp", - "n": 300 - } - ], + "vipexp": [], "diamond_num_double": [], "channel": "0", "text": "0", @@ -399,13 +295,7 @@ "recharge_type": 2, "monetaryunit": "￥", "amount": 9800, - "vipexp": [ - { - "a": "attr", - "t": "vipexp", - "n": 980 - } - ], + "vipexp": [], "diamond_num_double": [], "channel": "0", "text": "0", @@ -418,13 +308,7 @@ "recharge_type": 2, "monetaryunit": "￥", "amount": 19800, - "vipexp": [ - { - "a": "attr", - "t": "vipexp", - "n": 1980 - } - ], + "vipexp": [], "diamond_num_double": [], "channel": "0", "text": "0", @@ -437,13 +321,7 @@ "recharge_type": 2, "monetaryunit": "￥", "amount": 32800, - "vipexp": [ - { - "a": "attr", - "t": "vipexp", - "n": 3280 - } - ], + "vipexp": [], "diamond_num_double": [], "channel": "0", "text": "0", @@ -456,13 +334,7 @@ "recharge_type": 2, "monetaryunit": "￥", "amount": 44800, - "vipexp": [ - { - "a": "attr", - "t": "vipexp", - "n": 4480 - } - ], + "vipexp": [], "diamond_num_double": [], "channel": "0", "text": "0", @@ -475,13 +347,7 @@ "recharge_type": 2, "monetaryunit": "￥", "amount": 64800, - "vipexp": [ - { - "a": "attr", - "t": "vipexp", - "n": 6480 - } - ], + "vipexp": [], "diamond_num_double": [], "channel": "0", "text": "0", @@ -494,13 +360,7 @@ "recharge_type": 2, "monetaryunit": "￥", "amount": 12800, - "vipexp": [ - { - "a": "attr", - "t": "vipexp", - "n": 1280 - } - ], + "vipexp": [], "diamond_num_double": [], "channel": "0", "text": "0", @@ -513,13 +373,7 @@ "recharge_type": 2, "monetaryunit": "￥", "amount": 19800, - "vipexp": [ - { - "a": "attr", - "t": "vipexp", - "n": 1980 - } - ], + "vipexp": [], "diamond_num_double": [], "channel": "0", "text": "0", @@ -532,13 +386,7 @@ "recharge_type": 2, "monetaryunit": "￥", "amount": 32800, - "vipexp": [ - { - "a": "attr", - "t": "vipexp", - "n": 3280 - } - ], + "vipexp": [], "diamond_num_double": [], "channel": "0", "text": "0", @@ -552,11 +400,6 @@ "monetaryunit": "￥", "amount": 3000, "vipexp": [ - { - "a": "attr", - "t": "vipexp", - "n": 300 - }, { "a": "attr", "t": "diamond", @@ -576,11 +419,6 @@ "monetaryunit": "￥", "amount": 9800, "vipexp": [ - { - "a": "attr", - "t": "vipexp", - "n": 980 - }, { "a": "attr", "t": "diamond", diff --git a/bin/json/game_shopitem.json b/bin/json/game_shopitem.json index f18132992..3b369a45a 100644 --- a/bin/json/game_shopitem.json +++ b/bin/json/game_shopitem.json @@ -23981,7 +23981,7 @@ "iteminfo": [ { "a": "item", - "t": "10000008", + "t": "10000004", "n": 1 } ], @@ -24017,7 +24017,7 @@ "iteminfo": [ { "a": "item", - "t": "10000009", + "t": "10000005", "n": 1 } ], @@ -24053,7 +24053,7 @@ "iteminfo": [ { "a": "item", - "t": "10000010", + "t": "10000006", "n": 1 } ], @@ -25385,7 +25385,7 @@ "iteminfo": [ { "a": "item", - "t": "10000004", + "t": "10000008", "n": 1 } ], @@ -25395,17 +25395,17 @@ { "a": "attr", "t": "arenacoin", - "n": 150 + "n": 6000 } ], "sale": 200, "salelist": [ - 500, - 500, - 500, - 500, - 500, - 500 + 200, + 200, + 200, + 200, + 200, + 200 ], "buyminnum": 1, "buymaxnum": 1, @@ -25421,7 +25421,7 @@ "iteminfo": [ { "a": "item", - "t": "10000005", + "t": "10000009", "n": 1 } ], @@ -25457,7 +25457,7 @@ "iteminfo": [ { "a": "item", - "t": "10000006", + "t": "10000010", "n": 1 } ], @@ -25467,17 +25467,17 @@ { "a": "attr", "t": "arenacoin", - "n": 6000 + "n": 150 } ], "sale": 500, "salelist": [ - 200, - 200, - 200, - 200, - 200, - 200 + 500, + 500, + 500, + 500, + 500, + 500 ], "buyminnum": 5, "buymaxnum": 5, diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index b4520ba0b..b1a46a20b 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -1597,7 +1597,7 @@ "Argu": [ 1, 4, - 2300 + 3000 ], "FollowSK": [], "SucFollowSK": [ @@ -1646,7 +1646,7 @@ "Argu": [ 1, 4, - 2400 + 3100 ], "FollowSK": [], "SucFollowSK": [ @@ -1695,7 +1695,7 @@ "Argu": [ 1, 4, - 2500 + 3200 ], "FollowSK": [], "SucFollowSK": [ @@ -1744,7 +1744,7 @@ "Argu": [ 1, 4, - 2600 + 3300 ], "FollowSK": [], "SucFollowSK": [ @@ -1793,7 +1793,7 @@ "Argu": [ 1, 4, - 2700 + 3400 ], "FollowSK": [], "SucFollowSK": [ @@ -2352,7 +2352,7 @@ "Argu": [ 1, 4, - 1500 + 2000 ], "FollowSK": [], "SucFollowSK": [ @@ -2401,7 +2401,7 @@ "Argu": [ 1, 4, - 1600 + 2100 ], "FollowSK": [], "SucFollowSK": [ @@ -2450,7 +2450,7 @@ "Argu": [ 1, 4, - 1700 + 2200 ], "FollowSK": [], "SucFollowSK": [ @@ -2499,7 +2499,7 @@ "Argu": [ 1, 4, - 1800 + 2300 ], "FollowSK": [], "SucFollowSK": [ @@ -2548,7 +2548,7 @@ "Argu": [ 1, 4, - 1900 + 2400 ], "FollowSK": [], "SucFollowSK": [ @@ -2597,7 +2597,7 @@ "Argu": [ 1, 4, - 1170 + 1200 ], "FollowSK": [], "SucFollowSK": [ @@ -2643,7 +2643,7 @@ "Argu": [ 1, 4, - 1170 + 1300 ], "FollowSK": [], "SucFollowSK": [ @@ -2689,7 +2689,7 @@ "Argu": [ 1, 4, - 1270 + 1400 ], "FollowSK": [], "SucFollowSK": [ @@ -2735,7 +2735,7 @@ "Argu": [ 1, 4, - 1370 + 1500 ], "FollowSK": [], "SucFollowSK": [ @@ -2781,7 +2781,7 @@ "Argu": [ 1, 4, - 4000 + 6000 ], "FollowSK": [], "SucFollowSK": [ @@ -2855,7 +2855,7 @@ "Argu": [ 1, 4, - 4100 + 6100 ], "FollowSK": [], "SucFollowSK": [ @@ -2929,7 +2929,7 @@ "Argu": [ 1, 4, - 4200 + 6200 ], "FollowSK": [], "SucFollowSK": [ @@ -3003,7 +3003,7 @@ "Argu": [ 1, 4, - 4300 + 6300 ], "FollowSK": [], "SucFollowSK": [ @@ -3077,7 +3077,7 @@ "Argu": [ 1, 4, - 4400 + 6400 ], "FollowSK": [], "SucFollowSK": [ @@ -3333,7 +3333,7 @@ "Argu": [ 1, 4, - 800, + 700, 1, 5, 1200 @@ -3385,7 +3385,7 @@ "Argu": [ 1, 4, - 800, + 700, 1, 5, 1300 @@ -3437,7 +3437,7 @@ "Argu": [ 1, 4, - 800, + 700, 1, 5, 1400 @@ -3489,7 +3489,7 @@ "Argu": [ 1, 4, - 800, + 700, 1, 5, 1500 @@ -3541,7 +3541,7 @@ "Argu": [ 1, 4, - 800, + 700, 1, 5, 1600 @@ -3710,7 +3710,7 @@ "Argu": [ 1, 5, - 1500 + 2000 ], "FollowSK": [], "SucFollowSK": [], @@ -3850,7 +3850,7 @@ "Argu": [ 1, 5, - 1550 + 2050 ], "FollowSK": [], "SucFollowSK": [], @@ -3990,7 +3990,7 @@ "Argu": [ 1, 5, - 1600 + 2100 ], "FollowSK": [], "SucFollowSK": [], @@ -4130,7 +4130,7 @@ "Argu": [ 1, 5, - 1650 + 2150 ], "FollowSK": [], "SucFollowSK": [], @@ -4270,7 +4270,7 @@ "Argu": [ 1, 5, - 1700 + 2200 ], "FollowSK": [], "SucFollowSK": [], @@ -4341,7 +4341,7 @@ "Argu": [ 1, 4, - 800, + 1000, 1, 5, 2500 @@ -4367,7 +4367,7 @@ "Argu": [ 1, 4, - 800, + 1000, 1, 5, 2550 @@ -4393,7 +4393,7 @@ "Argu": [ 1, 4, - 800, + 1000, 1, 5, 2600 @@ -4419,7 +4419,7 @@ "Argu": [ 1, 4, - 800, + 1000, 1, 5, 2650 @@ -4469,7 +4469,7 @@ "Argu": [ 1, 4, - 1500 + 2000 ], "FollowSK": [], "SucFollowSK": [ @@ -4515,7 +4515,7 @@ "Argu": [ 1, 4, - 1600 + 2100 ], "FollowSK": [], "SucFollowSK": [ @@ -4561,7 +4561,7 @@ "Argu": [ 1, 4, - 1700 + 2200 ], "FollowSK": [], "SucFollowSK": [ @@ -4607,7 +4607,7 @@ "Argu": [ 1, 4, - 1800 + 2300 ], "FollowSK": [], "SucFollowSK": [ @@ -4653,7 +4653,7 @@ "Argu": [ 1, 4, - 1900 + 2400 ], "FollowSK": [], "SucFollowSK": [ @@ -4699,7 +4699,7 @@ "Argu": [ 1, 4, - 1000 + 1225 ], "FollowSK": [], "SucFollowSK": [ @@ -4748,7 +4748,7 @@ "Argu": [ 1, 4, - 1050 + 1235 ], "FollowSK": [], "SucFollowSK": [ @@ -4797,7 +4797,7 @@ "Argu": [ 1, 4, - 1100 + 1245 ], "FollowSK": [], "SucFollowSK": [ @@ -4846,7 +4846,7 @@ "Argu": [ 1, 4, - 1150 + 1255 ], "FollowSK": [], "SucFollowSK": [ @@ -4895,7 +4895,7 @@ "Argu": [ 1, 4, - 1200 + 1265 ], "FollowSK": [], "SucFollowSK": [ @@ -4944,7 +4944,7 @@ "Argu": [ 1, 4, - 5500 + 6000 ], "FollowSK": [], "SucFollowSK": [], @@ -5034,7 +5034,7 @@ "Argu": [ 1, 4, - 5600 + 6100 ], "FollowSK": [], "SucFollowSK": [], @@ -5080,7 +5080,7 @@ "Argu": [ 1, 4, - 5700 + 6200 ], "FollowSK": [], "SucFollowSK": [], @@ -5126,7 +5126,7 @@ "Argu": [ 1, 4, - 5800 + 6300 ], "FollowSK": [], "SucFollowSK": [], @@ -5250,7 +5250,7 @@ "Argu": [ 1, 4, - 700 + 1000 ], "FollowSK": [], "SucFollowSK": [ @@ -5384,7 +5384,7 @@ "Argu": [ 1, 4, - 800 + 1100 ], "FollowSK": [], "SucFollowSK": [], @@ -5430,7 +5430,7 @@ "Argu": [ 1, 4, - 900 + 1200 ], "FollowSK": [], "SucFollowSK": [], @@ -5476,7 +5476,7 @@ "Argu": [ 1, 4, - 1000 + 1300 ], "FollowSK": [], "SucFollowSK": [], @@ -5522,7 +5522,7 @@ "Argu": [ 1, 4, - 1100 + 1400 ], "FollowSK": [], "SucFollowSK": [], @@ -5568,7 +5568,7 @@ "Argu": [ 1, 4, - 1200 + 1500 ], "FollowSK": [], "SucFollowSK": [], @@ -5614,7 +5614,7 @@ "Argu": [ 1, 4, - 2000 + 3000 ], "FollowSK": [], "SucFollowSK": [], @@ -5661,7 +5661,7 @@ "Argu": [ 1, 4, - 2100 + 3100 ], "FollowSK": [], "SucFollowSK": [], @@ -5684,7 +5684,7 @@ "Argu": [ 1, 4, - 2200 + 3200 ], "FollowSK": [], "SucFollowSK": [], @@ -5707,7 +5707,7 @@ "Argu": [ 1, 4, - 2300 + 3300 ], "FollowSK": [], "SucFollowSK": [], @@ -5802,7 +5802,7 @@ "Argu": [ 1, 4, - 1750 + 2000 ], "FollowSK": [], "SucFollowSK": [], @@ -5825,7 +5825,7 @@ "Argu": [ 1, 4, - 1850 + 2050 ], "FollowSK": [], "SucFollowSK": [], @@ -5848,7 +5848,7 @@ "Argu": [ 1, 4, - 1950 + 2100 ], "FollowSK": [], "SucFollowSK": [], @@ -6012,7 +6012,7 @@ "Argu": [ 1, 4, - 2000 + 3500 ], "FollowSK": [], "SucFollowSK": [ @@ -6061,7 +6061,7 @@ "Argu": [ 1, 4, - 2100 + 3600 ], "FollowSK": [], "SucFollowSK": [ @@ -6110,7 +6110,7 @@ "Argu": [ 1, 4, - 2200 + 3700 ], "FollowSK": [], "SucFollowSK": [ @@ -6159,7 +6159,7 @@ "Argu": [ 1, 4, - 2300 + 3800 ], "FollowSK": [], "SucFollowSK": [ @@ -6208,7 +6208,7 @@ "Argu": [ 1, 4, - 2400 + 3900 ], "FollowSK": [], "SucFollowSK": [ @@ -6325,7 +6325,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 390001003, + 390001008, 1000, 1, 2 @@ -6375,7 +6375,7 @@ "Argu": [ 1, 4, - 1750 + 5100 ], "FollowSK": [], "SucFollowSK": [], @@ -6398,7 +6398,7 @@ "Argu": [ 1, 4, - 1800 + 5200 ], "FollowSK": [], "SucFollowSK": [], @@ -6421,7 +6421,7 @@ "Argu": [ 1, 4, - 1850 + 5300 ], "FollowSK": [], "SucFollowSK": [], @@ -6444,7 +6444,7 @@ "Argu": [ 1, 4, - 1900 + 5400 ], "FollowSK": [], "SucFollowSK": [], @@ -6467,7 +6467,7 @@ "Argu": [ 1, 4, - 1950 + 5500 ], "FollowSK": [], "SucFollowSK": [], @@ -9077,7 +9077,7 @@ "Argu": [ 1, 4, - 1100 + 1400 ], "FollowSK": [ 224002112 @@ -9104,7 +9104,7 @@ "Argu": [ 1, 4, - 900 + 1200 ], "FollowSK": [], "SucFollowSK": [ @@ -9153,7 +9153,7 @@ "Argu": [ 1, 4, - 1200 + 1500 ], "FollowSK": [ 224002122 @@ -9180,7 +9180,7 @@ "Argu": [ 1, 4, - 900 + 1200 ], "FollowSK": [], "SucFollowSK": [ @@ -9205,7 +9205,7 @@ "Argu": [ 1, 4, - 1200 + 1600 ], "FollowSK": [ 224002132 @@ -9232,7 +9232,7 @@ "Argu": [ 1, 4, - 1000 + 1200 ], "FollowSK": [], "SucFollowSK": [ @@ -9257,7 +9257,7 @@ "Argu": [ 1, 4, - 1300 + 1700 ], "FollowSK": [ 224002142 @@ -9284,7 +9284,7 @@ "Argu": [ 1, 4, - 1000 + 1200 ], "FollowSK": [], "SucFollowSK": [ @@ -9309,7 +9309,7 @@ "Argu": [ 1, 4, - 1300 + 1800 ], "FollowSK": [ 224002152 @@ -9336,7 +9336,7 @@ "Argu": [ 1, 4, - 1100 + 1200 ], "FollowSK": [], "SucFollowSK": [ @@ -9361,7 +9361,7 @@ "Argu": [ 1, 4, - 1400 + 1900 ], "FollowSK": [ 224002162 @@ -9388,7 +9388,7 @@ "Argu": [ 1, 4, - 1100 + 1200 ], "FollowSK": [], "SucFollowSK": [ @@ -9532,7 +9532,7 @@ "Argu": [ 1, 4, - 1000 + 1250 ], "FollowSK": [], "SucFollowSK": [], @@ -10652,7 +10652,7 @@ "Argu": [ 1, 4, - 1500 + 1600 ], "FollowSK": [], "SucFollowSK": [ @@ -10722,7 +10722,7 @@ "Argu": [ 1, 4, - 1650 + 1700 ], "FollowSK": [], "SucFollowSK": [ @@ -10814,7 +10814,7 @@ "Argu": [ 1, 4, - 1950 + 1900 ], "FollowSK": [], "SucFollowSK": [ @@ -10860,7 +10860,7 @@ "Argu": [ 1, 4, - 2100 + 2000 ], "FollowSK": [], "SucFollowSK": [ @@ -10953,7 +10953,7 @@ "Argu": [ 1, 4, - 2000 + 2250 ], "FollowSK": [], "SucFollowSK": [ @@ -11002,7 +11002,7 @@ "Argu": [ 1, 4, - 2050 + 2300 ], "FollowSK": [], "SucFollowSK": [ @@ -11051,7 +11051,7 @@ "Argu": [ 1, 4, - 2100 + 2350 ], "FollowSK": [], "SucFollowSK": [ @@ -11100,7 +11100,7 @@ "Argu": [ 1, 4, - 2150 + 2400 ], "FollowSK": [], "SucFollowSK": [ @@ -11417,7 +11417,7 @@ "Argu": [ 1, 4, - 3000, + 1500, 1, 2, 55 @@ -11466,7 +11466,7 @@ "Argu": [ 1, 4, - 3100, + 1600, 1, 2, 55 @@ -11494,7 +11494,7 @@ "Argu": [ 1, 4, - 3200, + 1700, 1, 2, 55 @@ -11522,7 +11522,7 @@ "Argu": [ 1, 4, - 3300, + 1800, 1, 2, 55 @@ -11550,7 +11550,7 @@ "Argu": [ 1, 4, - 3400, + 1900, 1, 2, 55 @@ -13305,7 +13305,7 @@ "Argu": [ 1, 4, - 3000, + 4000, 1, 6, 45 @@ -13331,7 +13331,7 @@ "Argu": [ 1, 4, - 3050, + 4050, 1, 6, 45 @@ -13357,7 +13357,7 @@ "Argu": [ 1, 4, - 3100, + 4100, 1, 6, 45 @@ -13383,7 +13383,7 @@ "Argu": [ 1, 4, - 3150, + 4150, 1, 6, 45 @@ -13409,7 +13409,7 @@ "Argu": [ 1, 4, - 3200, + 4200, 1, 6, 45 @@ -13435,7 +13435,7 @@ "Argu": [ 1, 4, - 2500 + 3500 ], "FollowSK": [], "SucFollowSK": [ @@ -13484,7 +13484,7 @@ "Argu": [ 1, 4, - 2550 + 3550 ], "FollowSK": [], "SucFollowSK": [ @@ -13509,7 +13509,7 @@ "Argu": [ 1, 4, - 2600 + 3600 ], "FollowSK": [], "SucFollowSK": [ @@ -13534,7 +13534,7 @@ "Argu": [ 1, 4, - 2650 + 3650 ], "FollowSK": [], "SucFollowSK": [ @@ -13559,7 +13559,7 @@ "Argu": [ 1, 4, - 2700 + 3700 ], "FollowSK": [], "SucFollowSK": [ @@ -14110,7 +14110,7 @@ "Argu": [ 1, 4, - 1500 + 2000 ], "FollowSK": [], "SucFollowSK": [ @@ -14183,7 +14183,7 @@ "Argu": [ 1, 4, - 1600 + 2100 ], "FollowSK": [], "SucFollowSK": [ @@ -14209,7 +14209,7 @@ "Argu": [ 1, 4, - 1700 + 2200 ], "FollowSK": [], "SucFollowSK": [ @@ -14235,7 +14235,7 @@ "Argu": [ 1, 4, - 1800 + 2300 ], "FollowSK": [], "SucFollowSK": [ @@ -14261,7 +14261,7 @@ "Argu": [ 1, 4, - 1900 + 2400 ], "FollowSK": [], "SucFollowSK": [ @@ -14287,7 +14287,7 @@ "Argu": [ 1, 4, - 900 + 1000 ], "FollowSK": [], "SucFollowSK": [ @@ -14312,7 +14312,7 @@ "Argu": [ 1, 4, - 1100 + 2000 ], "FollowSK": [], "SucFollowSK": [ @@ -14532,7 +14532,7 @@ "Argu": [ 1, 4, - 4000 + 4200 ], "FollowSK": [], "SucFollowSK": [ @@ -15241,7 +15241,7 @@ "Argu": [ 1, 4, - 1000 + 1500 ], "FollowSK": [], "SucFollowSK": [ @@ -15339,7 +15339,7 @@ "Argu": [ 1, 4, - 1050 + 1550 ], "FollowSK": [], "SucFollowSK": [ @@ -15364,7 +15364,7 @@ "Argu": [ 1, 4, - 1100 + 1600 ], "FollowSK": [], "SucFollowSK": [ @@ -15389,7 +15389,7 @@ "Argu": [ 1, 4, - 1150 + 1650 ], "FollowSK": [], "SucFollowSK": [ @@ -15414,7 +15414,7 @@ "Argu": [ 1, 4, - 1200 + 1700 ], "FollowSK": [], "SucFollowSK": [ @@ -15439,7 +15439,7 @@ "Argu": [ 1, 4, - 1800 + 2000 ], "FollowSK": [], "SucFollowSK": [ @@ -15560,7 +15560,7 @@ "Argu": [ 1, 4, - 1900 + 2100 ], "FollowSK": [], "SucFollowSK": [ @@ -15585,7 +15585,7 @@ "Argu": [ 1, 4, - 2000 + 2200 ], "FollowSK": [], "SucFollowSK": [ @@ -15610,7 +15610,7 @@ "Argu": [ 1, 4, - 2100 + 2300 ], "FollowSK": [], "SucFollowSK": [ @@ -15635,7 +15635,7 @@ "Argu": [ 1, 4, - 2200 + 2400 ], "FollowSK": [], "SucFollowSK": [ @@ -15684,7 +15684,7 @@ "Argu": [ 1, 4, - 1000 + 1400 ], "FollowSK": [], "SucFollowSK": [], @@ -15731,7 +15731,7 @@ "Argu": [ 1, 4, - 1100 + 1450 ], "FollowSK": [], "SucFollowSK": [], @@ -15754,7 +15754,7 @@ "Argu": [ 1, 4, - 1200 + 1500 ], "FollowSK": [], "SucFollowSK": [], @@ -15777,7 +15777,7 @@ "Argu": [ 1, 4, - 1300 + 1550 ], "FollowSK": [], "SucFollowSK": [], @@ -15800,7 +15800,7 @@ "Argu": [ 1, 4, - 1400 + 1600 ], "FollowSK": [], "SucFollowSK": [], @@ -16453,7 +16453,7 @@ "Argu": [ 1, 4, - 1500 + 2000 ], "FollowSK": [], "SucFollowSK": [], @@ -16523,7 +16523,7 @@ "Argu": [ 1, 4, - 1600 + 2100 ], "FollowSK": [], "SucFollowSK": [], @@ -16546,7 +16546,7 @@ "Argu": [ 1, 4, - 1700 + 2200 ], "FollowSK": [], "SucFollowSK": [], @@ -16569,7 +16569,7 @@ "Argu": [ 1, 4, - 1800 + 2300 ], "FollowSK": [], "SucFollowSK": [], @@ -16592,7 +16592,7 @@ "Argu": [ 1, 4, - 1900 + 2400 ], "FollowSK": [], "SucFollowSK": [], @@ -16615,7 +16615,7 @@ "Argu": [ 1, 4, - 2000 + 3000 ], "FollowSK": [], "SucFollowSK": [ @@ -16664,7 +16664,7 @@ "Argu": [ 1, 4, - 2100 + 3100 ], "FollowSK": [], "SucFollowSK": [ @@ -16689,7 +16689,7 @@ "Argu": [ 1, 4, - 2200 + 3200 ], "FollowSK": [], "SucFollowSK": [ @@ -16714,7 +16714,7 @@ "Argu": [ 1, 4, - 2300 + 3300 ], "FollowSK": [], "SucFollowSK": [ @@ -16739,7 +16739,7 @@ "Argu": [ 1, 4, - 2400 + 3400 ], "FollowSK": [], "SucFollowSK": [ @@ -16810,7 +16810,7 @@ "Argu": [ 1, 4, - 3000 + 4000 ], "FollowSK": [], "SucFollowSK": [], @@ -16833,7 +16833,7 @@ "Argu": [ 1, 4, - 3100 + 4100 ], "FollowSK": [], "SucFollowSK": [], @@ -16856,7 +16856,7 @@ "Argu": [ 1, 4, - 3200 + 4200 ], "FollowSK": [], "SucFollowSK": [], @@ -16879,7 +16879,7 @@ "Argu": [ 1, 4, - 3300 + 4300 ], "FollowSK": [], "SucFollowSK": [], @@ -16902,7 +16902,7 @@ "Argu": [ 1, 4, - 3400 + 4400 ], "FollowSK": [], "SucFollowSK": [], @@ -16925,7 +16925,7 @@ "Argu": [ 1, 4, - 2000 + 2500 ], "FollowSK": [], "SucFollowSK": [], @@ -16948,7 +16948,7 @@ "Argu": [ 1, 4, - 1600 + 2600 ], "FollowSK": [], "SucFollowSK": [], @@ -16971,7 +16971,7 @@ "Argu": [ 1, 4, - 1700 + 2700 ], "FollowSK": [], "SucFollowSK": [], @@ -16994,7 +16994,7 @@ "Argu": [ 1, 4, - 1800 + 2800 ], "FollowSK": [], "SucFollowSK": [], @@ -17017,7 +17017,7 @@ "Argu": [ 1, 4, - 1900 + 2900 ], "FollowSK": [], "SucFollowSK": [], @@ -18646,7 +18646,7 @@ "Argu": [ 1, 4, - 3000 + 3500 ], "FollowSK": [], "SucFollowSK": [ @@ -18695,7 +18695,7 @@ "Argu": [ 1, 4, - 3100 + 3600 ], "FollowSK": [], "SucFollowSK": [ @@ -18720,7 +18720,7 @@ "Argu": [ 1, 4, - 3200 + 3700 ], "FollowSK": [], "SucFollowSK": [ @@ -18745,7 +18745,7 @@ "Argu": [ 1, 4, - 3300 + 3800 ], "FollowSK": [], "SucFollowSK": [ @@ -18770,7 +18770,7 @@ "Argu": [ 1, 4, - 3400 + 3900 ], "FollowSK": [], "SucFollowSK": [ @@ -18942,7 +18942,7 @@ "Argu": [ 1, 4, - 4000 + 4500 ], "FollowSK": [], "SucFollowSK": [ @@ -19036,7 +19036,7 @@ "Argu": [ 1, 4, - 4100 + 4600 ], "FollowSK": [], "SucFollowSK": [ @@ -19063,7 +19063,7 @@ "Argu": [ 1, 4, - 4200 + 4700 ], "FollowSK": [], "SucFollowSK": [ @@ -19090,7 +19090,7 @@ "Argu": [ 1, 4, - 4300 + 4800 ], "FollowSK": [], "SucFollowSK": [ @@ -19117,7 +19117,7 @@ "Argu": [ 1, 4, - 4400 + 4900 ], "FollowSK": [], "SucFollowSK": [ @@ -19356,7 +19356,7 @@ "Argu": [ 1, 4, - 1000 + 2000 ], "FollowSK": [], "SucFollowSK": [], @@ -19426,7 +19426,7 @@ "Argu": [ 1, 4, - 1100 + 2100 ], "FollowSK": [], "SucFollowSK": [], @@ -19449,7 +19449,7 @@ "Argu": [ 1, 4, - 1200 + 2200 ], "FollowSK": [], "SucFollowSK": [], @@ -19472,7 +19472,7 @@ "Argu": [ 1, 4, - 1300 + 2300 ], "FollowSK": [], "SucFollowSK": [], @@ -19495,7 +19495,7 @@ "Argu": [ 1, 4, - 1400 + 2400 ], "FollowSK": [], "SucFollowSK": [], @@ -19566,7 +19566,7 @@ "Argu": [ 1, 4, - 2000 + 3000 ], "FollowSK": [], "SucFollowSK": [], @@ -19589,7 +19589,7 @@ "Argu": [ 1, 4, - 2100 + 3100 ], "FollowSK": [], "SucFollowSK": [], @@ -19612,7 +19612,7 @@ "Argu": [ 1, 4, - 2200 + 3200 ], "FollowSK": [], "SucFollowSK": [], @@ -19635,7 +19635,7 @@ "Argu": [ 1, 4, - 2300 + 3300 ], "FollowSK": [], "SucFollowSK": [], @@ -19658,7 +19658,7 @@ "Argu": [ 1, 4, - 2400 + 3400 ], "FollowSK": [], "SucFollowSK": [], @@ -19868,7 +19868,7 @@ "Argu": [ 1, 4, - 1500 + 3000 ], "FollowSK": [], "SucFollowSK": [ @@ -19942,7 +19942,7 @@ "Argu": [ 1, 4, - 1600 + 3100 ], "FollowSK": [], "SucFollowSK": [ @@ -19968,7 +19968,7 @@ "Argu": [ 1, 4, - 1700 + 3200 ], "FollowSK": [], "SucFollowSK": [ @@ -19994,7 +19994,7 @@ "Argu": [ 1, 4, - 1800 + 3300 ], "FollowSK": [], "SucFollowSK": [ @@ -20020,7 +20020,7 @@ "Argu": [ 1, 4, - 1900 + 3400 ], "FollowSK": [], "SucFollowSK": [ @@ -20069,7 +20069,7 @@ "Argu": [ 1, 4, - 1250 + 2000 ], "FollowSK": [], "SucFollowSK": [ @@ -20143,7 +20143,7 @@ "Argu": [ 1, 4, - 1350 + 2050 ], "FollowSK": [], "SucFollowSK": [ @@ -20169,7 +20169,7 @@ "Argu": [ 1, 4, - 1450 + 2100 ], "FollowSK": [], "SucFollowSK": [ @@ -20195,7 +20195,7 @@ "Argu": [ 1, 4, - 1550 + 2150 ], "FollowSK": [], "SucFollowSK": [ @@ -20221,7 +20221,7 @@ "Argu": [ 1, 4, - 1650 + 2200 ], "FollowSK": [], "SucFollowSK": [ @@ -20743,7 +20743,7 @@ "Argu": [ 1, 4, - 2000 + 2500 ], "FollowSK": [], "SucFollowSK": [ @@ -20792,7 +20792,7 @@ "Argu": [ 1, 4, - 2100 + 2600 ], "FollowSK": [], "SucFollowSK": [ @@ -20817,7 +20817,7 @@ "Argu": [ 1, 4, - 2200 + 2700 ], "FollowSK": [], "SucFollowSK": [ @@ -20842,7 +20842,7 @@ "Argu": [ 1, 4, - 2300 + 2800 ], "FollowSK": [], "SucFollowSK": [ @@ -20867,7 +20867,7 @@ "Argu": [ 1, 4, - 2400 + 2900 ], "FollowSK": [], "SucFollowSK": [ @@ -20892,7 +20892,7 @@ "Argu": [ 1, 4, - 1500 + 2000 ], "FollowSK": [], "SucFollowSK": [ @@ -20963,7 +20963,7 @@ "Argu": [ 1, 4, - 1600 + 2100 ], "FollowSK": [], "SucFollowSK": [ @@ -20989,7 +20989,7 @@ "Argu": [ 1, 4, - 1700 + 2200 ], "FollowSK": [], "SucFollowSK": [ @@ -21015,7 +21015,7 @@ "Argu": [ 1, 4, - 1800 + 2300 ], "FollowSK": [], "SucFollowSK": [ @@ -21041,7 +21041,7 @@ "Argu": [ 1, 4, - 1900 + 2400 ], "FollowSK": [], "SucFollowSK": [ @@ -21067,7 +21067,7 @@ "Argu": [ 1, 4, - 3000 + 4000 ], "FollowSK": [], "SucFollowSK": [ @@ -21138,7 +21138,7 @@ "Argu": [ 1, 4, - 3100 + 4100 ], "FollowSK": [], "SucFollowSK": [ @@ -21163,7 +21163,7 @@ "Argu": [ 1, 4, - 3200 + 4200 ], "FollowSK": [], "SucFollowSK": [ @@ -21188,7 +21188,7 @@ "Argu": [ 1, 4, - 3300 + 4300 ], "FollowSK": [], "SucFollowSK": [ @@ -21213,7 +21213,7 @@ "Argu": [ 1, 4, - 3400 + 4400 ], "FollowSK": [], "SucFollowSK": [ @@ -23744,7 +23744,7 @@ "Argu": [ 1, 4, - 1500 + 2000 ], "FollowSK": [ 214005112 @@ -23792,7 +23792,7 @@ "Argu": [ 1, 4, - 1550 + 2100 ], "FollowSK": [ 214005112 @@ -23817,7 +23817,7 @@ "Argu": [ 1, 4, - 1600 + 2200 ], "FollowSK": [ 214005112 @@ -23842,7 +23842,7 @@ "Argu": [ 1, 4, - 1650 + 2300 ], "FollowSK": [ 214005112 @@ -23867,7 +23867,7 @@ "Argu": [ 1, 4, - 1700 + 2400 ], "FollowSK": [ 214005112 @@ -23892,7 +23892,7 @@ "Argu": [ 1, 4, - 667 + 1000 ], "FollowSK": [], "SucFollowSK": [], @@ -23985,7 +23985,7 @@ "Argu": [ 1, 4, - 677 + 1050 ], "FollowSK": [], "SucFollowSK": [], @@ -24008,7 +24008,7 @@ "Argu": [ 1, 4, - 687 + 1100 ], "FollowSK": [], "SucFollowSK": [], @@ -24031,7 +24031,7 @@ "Argu": [ 1, 4, - 697 + 1150 ], "FollowSK": [], "SucFollowSK": [], @@ -24054,7 +24054,7 @@ "Argu": [ 1, 4, - 707 + 1200 ], "FollowSK": [], "SucFollowSK": [], @@ -25709,7 +25709,7 @@ "Argu": [ 1, 4, - 3000 + 3500 ], "FollowSK": [], "SucFollowSK": [], @@ -25753,7 +25753,7 @@ "Argu": [ 1, 4, - 3100 + 3600 ], "FollowSK": [], "SucFollowSK": [], @@ -25776,7 +25776,7 @@ "Argu": [ 1, 4, - 3200 + 3700 ], "FollowSK": [], "SucFollowSK": [], @@ -25799,7 +25799,7 @@ "Argu": [ 1, 4, - 3300 + 3800 ], "FollowSK": [], "SucFollowSK": [], @@ -25822,7 +25822,7 @@ "Argu": [ 1, 4, - 3400 + 3900 ], "FollowSK": [], "SucFollowSK": [], @@ -27402,7 +27402,7 @@ "Argu": [ 1, 4, - 600 + 1000 ], "FollowSK": [], "SucFollowSK": [ @@ -27451,7 +27451,7 @@ "Argu": [ 1, 4, - 700 + 1100 ], "FollowSK": [], "SucFollowSK": [ @@ -27476,7 +27476,7 @@ "Argu": [ 1, 4, - 800 + 1200 ], "FollowSK": [], "SucFollowSK": [ @@ -27501,7 +27501,7 @@ "Argu": [ 1, 4, - 900 + 1300 ], "FollowSK": [], "SucFollowSK": [ @@ -27526,7 +27526,7 @@ "Argu": [ 1, 4, - 1000 + 1400 ], "FollowSK": [], "SucFollowSK": [ @@ -27551,7 +27551,7 @@ "Argu": [ 1, 4, - 667 + 1200 ], "FollowSK": [], "SucFollowSK": [ @@ -27645,7 +27645,7 @@ "Argu": [ 1, 4, - 677 + 1250 ], "FollowSK": [], "SucFollowSK": [ @@ -27670,7 +27670,7 @@ "Argu": [ 1, 4, - 687 + 1300 ], "FollowSK": [], "SucFollowSK": [ @@ -27695,7 +27695,7 @@ "Argu": [ 1, 4, - 697 + 1350 ], "FollowSK": [], "SucFollowSK": [ @@ -27720,7 +27720,7 @@ "Argu": [ 1, 4, - 707 + 1400 ], "FollowSK": [], "SucFollowSK": [ @@ -27745,7 +27745,7 @@ "Argu": [ 1, 4, - 2500 + 4000 ], "FollowSK": [], "SucFollowSK": [], @@ -27771,7 +27771,7 @@ "Argu": [ 1, 4, - 2600 + 4100 ], "FollowSK": [], "SucFollowSK": [], @@ -27797,7 +27797,7 @@ "Argu": [ 1, 4, - 2700 + 4200 ], "FollowSK": [], "SucFollowSK": [], @@ -27823,7 +27823,7 @@ "Argu": [ 1, 4, - 2800 + 4300 ], "FollowSK": [], "SucFollowSK": [], @@ -27849,7 +27849,7 @@ "Argu": [ 1, 4, - 2900 + 4400 ], "FollowSK": [], "SucFollowSK": [], @@ -28627,7 +28627,7 @@ "Argu": [ 1, 4, - 2500 + 5000 ], "FollowSK": [ 255005112 @@ -28789,7 +28789,7 @@ "Argu": [ 1, 4, - 300 + 600 ], "FollowSK": [], "SucFollowSK": [], @@ -28812,7 +28812,7 @@ "Argu": [ 1, 4, - 5500 + 11000 ], "FollowSK": [ 255005313 @@ -29230,7 +29230,7 @@ "Argu": [ 1, 4, - 1000 + 800 ], "FollowSK": [], "SucFollowSK": [], @@ -29371,7 +29371,7 @@ "Argu": [ 390001415, 1000, - 10, + 5, -1 ], "FollowSK": [], @@ -33012,7 +33012,7 @@ "Argu": [ 1, 4, - 1500 + 2000 ], "FollowSK": [ 215003112 @@ -33058,7 +33058,7 @@ "Argu": [ 1, 4, - 1600 + 2100 ], "FollowSK": [ 215003112 @@ -33083,7 +33083,7 @@ "Argu": [ 1, 4, - 1700 + 2200 ], "FollowSK": [ 215003112 @@ -33108,7 +33108,7 @@ "Argu": [ 1, 4, - 1800 + 2300 ], "FollowSK": [ 215003112 @@ -33133,7 +33133,7 @@ "Argu": [ 1, 4, - 1900 + 2400 ], "FollowSK": [ 215003112 @@ -33158,7 +33158,7 @@ "Argu": [ 1, 4, - 625 + 700 ], "FollowSK": [ 215003212, @@ -33335,7 +33335,7 @@ "Argu": [ 1, 4, - 600 + 1000 ], "FollowSK": [ 215003312 diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 4101a09cd..8068e20b4 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -12196,7 +12196,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_113002311_1", - "text": "食人鱼先生对敌方1个目标造成攻击力500%的伤害；若目标死亡，则附加1次攻击，对随机1个目标造成攻击力300%的伤害，本次攻击无视防御。" + "text": "食人鱼先生对敌方目标造成攻击力500%的伤害；若目标死亡，则附加1次攻击，对随机1个目标造成攻击力300%的伤害，本次攻击无视防御。" }, "buffid": [], "map": "" diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 354efe9e2..9869c2fb8 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -2908,7 +2908,7 @@ "AddEffect": false, "RemoveType": true, "NotOverlay": 0, - "OverlayTimes": 3, + "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_shts15", diff --git a/bin/json/game_smithytask.json b/bin/json/game_smithytask.json index ab7bdef89..61c43b29d 100644 --- a/bin/json/game_smithytask.json +++ b/bin/json/game_smithytask.json @@ -166,26 +166,5 @@ "n": 11 } ] - }, - { - "key": 10009, - "id_list": 9, - "task_display": { - "key": "newsmithy_task_task_display_9", - "text": "进行10次阵营招募" - }, - "type_id": 115, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 18 - }, - { - "a": "attr", - "t": "diamond", - "n": 12 - } - ] } ] \ No newline at end of file diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 521ebd61e..500c76b92 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -411,7 +411,7 @@ }, { "a": "item", - "t": "10000008", + "t": "10000004", "n": 3 } ], @@ -980,7 +980,7 @@ }, { "a": "item", - "t": "10000008", + "t": "10000004", "n": 3 } ], @@ -1269,7 +1269,7 @@ }, { "a": "item", - "t": "10000008", + "t": "10000004", "n": 3 } ], @@ -1542,7 +1542,7 @@ }, { "a": "item", - "t": "10000008", + "t": "10000004", "n": 3 } ], @@ -2133,7 +2133,7 @@ }, { "a": "item", - "t": "10000009", + "t": "10000005", "n": 2 } ], @@ -2647,7 +2647,7 @@ }, { "a": "item", - "t": "10000009", + "t": "10000005", "n": 4 } ], @@ -3279,7 +3279,7 @@ }, { "a": "item", - "t": "10000010", + "t": "10000006", "n": 2 } ],