From b102f917d61b9e75bdd22a0776f4aec060a258e4 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 14 Sep 2022 19:06:31 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E5=B0=8F=E5=B1=82=E6=8E=92=E8=A1=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 comm/const.go                        |   3 +-
 modules/hero/api_awaken.go           |  12 +-
 modules/hero/api_strengthenUpStar.go |  22 +-
 modules/pagoda/api_challenge.go      |  36 ++-
 modules/pagoda/api_challengeover.go  | 124 +++++-----
 modules/pagoda/api_getlist.go        |  46 ++--
 modules/pagoda/api_ranklist.go       |   2 +-
 modules/pagoda/model_rank.go         |  96 +++++++-
 modules/pagoda/model_seasonpagoda.go |  12 +-
 modules/pagoda/pagoda_test.go        |  93 +++++++
 modules/timer/pagodarank.go          |   4 +-
 modules/user/model_expand.go         |  12 +-
 pb/pagoda_db.pb.go                   |  77 +++---
 pb/pagoda_msg.pb.go                  |  20 +-
 pb/rtask_msg.pb.go                   | 355 ++++++++++++++++++---------
 pb/userexpand.pb.go                  |  33 ++-
 sys/db/core.go                       |   3 +-
 17 files changed, 633 insertions(+), 317 deletions(-)
 create mode 100644 modules/pagoda/pagoda_test.go

diff --git a/comm/const.go b/comm/const.go
index 573a6c115..51febc56e 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -116,7 +116,7 @@ const (
 	TableRtaskRecord = "rrecord"
 	///记录用户爬塔排行数据
 	TablePagodaRecord = "pagodarecord"
-	///有序的爬塔排行 (正正的排行榜 最多只有50条)
+	///有序的爬塔排行 (真正的排行榜 最多只有50条)
 	TablePagodaRankList = "pagodaranklist"
 	/// 美食馆
 	TableSmithy = "smithy"
@@ -323,4 +323,5 @@ const (
 
 const (
 	MaxMainlineIntensity = 3 // 最大难度
+	MaxRankNum           = 3
 )
diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go
index 4bec1ebc4..7aa097b6b 100644
--- a/modules/hero/api_awaken.go
+++ b/modules/hero/api_awaken.go
@@ -37,16 +37,16 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c
 		return
 	}
 
-	awakenData = this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv)
+	awakenData = this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv+1)
 	if awakenData == nil {
 		code = pb.ErrorCode_ConfigNoFound
 		return
 	}
-	nextAwaken := this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv+1)
-	if nextAwaken == nil {
-		code = pb.ErrorCode_HeroMaxAwaken // 达到最大觉醒等级
-		return
-	}
+	// nextAwaken := this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv+1)
+	// if nextAwaken == nil {
+	// 	code = pb.ErrorCode_HeroMaxAwaken // 达到最大觉醒等级
+	// 	return
+	// }
 
 	if len(awakenData.Phasebonus) < 2 { // 配置校验
 		code = pb.ErrorCode_ConfigNoFound
diff --git a/modules/hero/api_strengthenUpStar.go b/modules/hero/api_strengthenUpStar.go
index a3338e183..b5f37b042 100644
--- a/modules/hero/api_strengthenUpStar.go
+++ b/modules/hero/api_strengthenUpStar.go
@@ -21,7 +21,7 @@ func (this *apiComp) StrengthenUpStarCheck(session comm.IUserSession, req *pb.He
 /// 英雄升星
 func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStrengthenUpStarReq) (code pb.ErrorCode, data proto.Message) {
 	var (
-		target            *cfg.GameHeroStarupData // 配置表目标升星英雄信息
+		starConf          *cfg.GameHeroStarupData // 配置表目标升星英雄信息
 		costNeedHeroCount int32                   // 消耗指定英雄的数量
 		costRaceHeroCount int32                   // 消耗种族英雄的数量
 		_hero             *pb.DBHero              // 目标英雄
@@ -51,8 +51,8 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
 	}
 
 	// 校验指定英雄
-	tagHeroConfig := this.module.configure.GetHeroStarupConfig(_hero.HeroID, _hero.Star)
-	if tagHeroConfig == nil {
+	starConf = this.module.configure.GetHeroStarupConfig(_hero.HeroID, _hero.Star)
+	if starConf == nil {
 		code = pb.ErrorCode_ReqParameterError
 		return
 	}
@@ -63,7 +63,7 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
 	}
 
 	// 优先校验数量对不对
-	if target.Needheronum != costNeedHeroCount || target.Needracenum != costRaceHeroCount {
+	if starConf.Needheronum != costNeedHeroCount || starConf.Needracenum != costRaceHeroCount {
 		code = pb.ErrorCode_ReqParameterError
 		return
 	}
@@ -83,11 +83,11 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
 				return
 			}
 
-			if tagHero.HeroID == target.Needhero && tagHero.Star == target.Needherostar && tagHero.SameCount >= target.Needheronum {
+			if tagHero.HeroID == starConf.Needhero && tagHero.Star == starConf.Needherostar && tagHero.SameCount >= starConf.Needheronum {
 				costNeedHeroCount += v
 			}
 
-			for _, value := range target.Needrace { // 阵营校验
+			for _, value := range starConf.Needrace { // 阵营校验
 				// 获取配置表英雄阵营
 				cfg := this.module.configure.GetHero(tagHero.HeroID)
 				if cfg != nil {
@@ -100,22 +100,22 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
 		CostHeroObj[k] = tagHero
 	}
 
-	if target.Needheronum > costNeedHeroCount || target.Needracenum > costRaceHeroCount {
+	if starConf.Needheronum > costNeedHeroCount || starConf.Needracenum > costRaceHeroCount {
 		code = pb.ErrorCode_ReqParameterError
 		return
 	}
 
 	// 金币消耗判断
 	curGold := this.module.ModuleUser.QueryAttributeValue(session.GetUserId(), comm.ResGold)
-	if curGold < target.Gold { // 金币不足
+	if curGold < starConf.Gold { // 金币不足
 		code = pb.ErrorCode_GoldNoEnough
 		return
 	}
 
 	// 消耗道具
-	code = this.module.ModuleUser.AddAttributeValue(session, comm.ResGold, -target.Gold, true) // 减少金币
+	code = this.module.ModuleUser.AddAttributeValue(session, comm.ResGold, -starConf.Gold, true) // 减少金币
 	if code != pb.ErrorCode_Success {
-		this.module.Errorf("cost gold failed ,count = %d", target.Gold)
+		this.module.Errorf("cost gold failed ,count = %d", starConf.Gold)
 		code = pb.ErrorCode_GoldNoEnough
 		return
 	}
@@ -124,7 +124,7 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
 		if c != pb.ErrorCode_Success {
 			code = pb.ErrorCode_DBError
 			this.module.Errorf("del hero err card:%s,count = %d", k, v)
-			this.module.ModuleUser.AddAttributeValue(session, comm.ResGold, target.Gold, true) // 回退金币
+			this.module.ModuleUser.AddAttributeValue(session, comm.ResGold, starConf.Gold, true) // 回退金币
 			return
 		}
 
diff --git a/modules/pagoda/api_challenge.go b/modules/pagoda/api_challenge.go
index 48aefe134..78802046d 100644
--- a/modules/pagoda/api_challenge.go
+++ b/modules/pagoda/api_challenge.go
@@ -22,10 +22,10 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.PagodaChalleng
 	if code != pb.ErrorCode_Success {
 		return // 参数校验失败直接返回
 	}
-
-	pagoda, err := this.module.modelPagoda.getPagodaList(session.GetUserId())
+	// 校验是不是通关了普通塔
+	expand, err := this.module.ModuleUser.GetUserExpand(session.GetUserId())
 	if err != nil {
-		code = pb.ErrorCode_PagodaNotFound
+		code = pb.ErrorCode_DBError
 		return
 	}
 	conf := this.module.configure.GetPagodaConfigData(req.PagodaType, req.LevelID)
@@ -33,33 +33,27 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.PagodaChalleng
 		code = pb.ErrorCode_PagodaNotFound
 		return
 	}
-	if req.PagodaType == comm.PagodaType { // 普通塔
-
+	if !expand.CompletePagoda {
+		pagoda, err := this.module.modelPagoda.getPagodaList(session.GetUserId())
+		if err != nil {
+			code = pb.ErrorCode_PagodaNotFound
+			return
+		}
 		if pagoda.Type != conf.PagodaType || conf.PreLevel != pagoda.PagodaId {
 			code = pb.ErrorCode_PagodaLevlErr // 挑战关卡数据不匹配
 			return
 		}
 
 	} else {
-		// 普通塔通关了
-		Nomalcfg := this.module.configure.GetPagodaConfigData(comm.PagodaType, pagoda.PagodaId+1)
-		if Nomalcfg != nil {
+		// 塔数据校验
+		seasonPagoda, err := this.module.modelSeasonPagoda.getSeasonPagodaList(session.GetUserId())
+		if err != nil {
 			code = pb.ErrorCode_PagodaNotFound
 			return
 		}
-		// 塔数据校验
-		seasonPagoda, _ := this.module.modelSeasonPagoda.getSeasonPagodaList(session.GetUserId())
-
-		if seasonPagoda == nil {
-			if req.LevelID != 1 {
-				code = pb.ErrorCode_PagodaLevlErr // 挑战关卡数据不匹配
-				return
-			}
-		} else {
-			if seasonPagoda.Type != req.PagodaType || conf.PreLevel != seasonPagoda.PagodaId {
-				code = pb.ErrorCode_PagodaLevlErr // 挑战关卡数据不匹配
-				return
-			}
+		if seasonPagoda.Type != req.PagodaType || conf.PreLevel != seasonPagoda.PagodaId {
+			code = pb.ErrorCode_PagodaLevlErr // 挑战关卡数据不匹配
+			return
 		}
 	}
 	code, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
diff --git a/modules/pagoda/api_challengeover.go b/modules/pagoda/api_challengeover.go
index f8f22637b..0db96a359 100644
--- a/modules/pagoda/api_challengeover.go
+++ b/modules/pagoda/api_challengeover.go
@@ -20,7 +20,9 @@ func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.Pagod
 ///挑战主线关卡
 func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChallengeOverReq) (code pb.ErrorCode, data proto.Message) {
 	var (
-		mapData map[string]interface{}
+		mapData      map[string]interface{}
+		pagoda       *pb.DBPagoda
+		seasonPagoda *pb.DBSeasonPagoda
 	)
 	mapData = make(map[string]interface{}, 0)
 	code = this.ChallengeOverCheck(session, req)
@@ -28,78 +30,78 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChal
 		return // 参数校验失败直接返回
 	}
 
-	pagoda, err := this.module.modelPagoda.getPagodaList(session.GetUserId())
+	// 校验是不是通关了普通塔
+	expand, err := this.module.ModuleUser.GetUserExpand(session.GetUserId())
 	if err != nil {
+		code = pb.ErrorCode_DBError
+		return
+	}
+	conf := this.module.configure.GetPagodaConfigData(req.PagodaType, req.LevelID)
+	if conf == nil {
 		code = pb.ErrorCode_PagodaNotFound
 		return
 	}
-	cfg := this.module.configure.GetPagodaConfigData(req.PagodaType, req.LevelID)
-	if cfg == nil {
-		code = pb.ErrorCode_PagodaNotFound
-		return
-	}
-	if req.PagodaType == comm.PagodaType { // 普通塔
-
-		if pagoda.Type != cfg.PagodaType || cfg.PreLevel != pagoda.PagodaId {
+	if !expand.CompletePagoda {
+		pagoda, err = this.module.modelPagoda.getPagodaList(session.GetUserId())
+		if err != nil {
+			code = pb.ErrorCode_PagodaNotFound
+			return
+		}
+		if pagoda.Type != conf.PagodaType || conf.PreLevel != pagoda.PagodaId {
 			code = pb.ErrorCode_PagodaLevlErr // 挑战关卡数据不匹配
 			return
 		}
 
-		//// todo 战斗相关
-
-		pagoda.Type = req.PagodaType
-		mapData["pagodaId"] = cfg.LayerNum
-		mapData["type"] = pagoda.Type
-
-		this.module.modulerank.ChangeUserRank(session.GetUserId(), mapData)
-
-		// 通关奖励
-		code = this.module.DispenseRes(session, cfg.Reward, true)
-		if code != pb.ErrorCode_Success {
-			return
-		}
-		pagoda.PagodaId = cfg.LayerNum // 更新层数
-		mapData["pagodaId"] = cfg.LayerNum
-		code = this.module.ModifyPagodaData(session.GetUserId(), mapData)
-		session.SendMsg(string(this.module.GetType()), PagodaChallengeOverResp, &pb.PagodaChallengeOverResp{Data: pagoda})
-		return
 	} else {
-		// 普通塔通关了
-		Nomalcfg := this.module.configure.GetPagodaConfigData(comm.PagodaType, pagoda.PagodaId+1)
-		if Nomalcfg != nil {
+		// 塔数据校验
+		seasonPagoda, err = this.module.modelSeasonPagoda.getSeasonPagodaList(session.GetUserId())
+		if err != nil {
 			code = pb.ErrorCode_PagodaNotFound
 			return
 		}
-
-		// 塔数据校验
-		seasonPagoda, _ := this.module.modelSeasonPagoda.getSeasonPagodaList(session.GetUserId())
-
-		if seasonPagoda == nil {
-			if req.LevelID != 1 {
-				code = pb.ErrorCode_PagodaLevlErr // 挑战关卡数据不匹配
-				return
-			}
-		} else {
-			if seasonPagoda.Type != req.PagodaType || cfg.PreLevel != seasonPagoda.PagodaId {
-				code = pb.ErrorCode_PagodaLevlErr // 挑战关卡数据不匹配
-				return
-			}
+		if seasonPagoda.Type != req.PagodaType || conf.PreLevel != seasonPagoda.PagodaId {
+			code = pb.ErrorCode_PagodaLevlErr // 挑战关卡数据不匹配
+			return
 		}
-		// 挑战处理
-		if seasonPagoda == nil {
-			seasonPagoda = &pb.DBSeasonPagoda{}
+	}
+	// 校验通过
+
+	if !expand.CompletePagoda { // 普通塔
+		pagoda.Type = req.PagodaType
+		mapData["pagodaId"] = conf.LayerNum
+		mapData["type"] = pagoda.Type
+
+		// 通关奖励
+		code = this.module.DispenseRes(session, conf.Reward, true)
+		if code != pb.ErrorCode_Success {
+			return
+		}
+		pagoda.PagodaId = conf.LayerNum // 更新层数
+		mapData["pagodaId"] = conf.LayerNum
+		code = this.module.ModifyPagodaData(session.GetUserId(), mapData)
+		session.SendMsg(string(this.module.GetType()), PagodaChallengeOverResp, &pb.PagodaChallengeOverResp{Data: pagoda})
+
+		// 普通塔通关了
+		Nomalcfg := this.module.configure.GetPagodaConfigData(comm.PagodaType, pagoda.PagodaId+1)
+		if Nomalcfg == nil { // 创建赛季塔数据
+			// 修改expand 数据
+			update := map[string]interface{}{
+				"completePagoda": true,
+			}
+			this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), update)
+			seasonPagoda := &pb.DBSeasonPagoda{}
 			seasonPagoda.Id = primitive.NewObjectID().Hex()
 
 			seasonPagoda.Uid = session.GetUserId()
-			seasonPagoda.PagodaId = 1 // 初始数据1层
-			seasonPagoda.Type = req.PagodaType
+			seasonPagoda.PagodaId = 0 // 初始数据0层
+			seasonPagoda.Type = 201
 			this.module.modelSeasonPagoda.addNewSeasonPagoda(session.GetUserId(), seasonPagoda)
-
-		} else {
-			seasonPagoda.PagodaId = cfg.LayerNum
-			mapData["pagodaId"] = cfg.LayerNum
-			code = this.module.ModifySeasonPagodaData(session.GetUserId(), mapData)
+			// 推送新的
+			pagoda.PagodaId = seasonPagoda.PagodaId
+			pagoda.Type = seasonPagoda.Type
+			session.SendMsg(string(this.module.GetType()), PagodaGetListResp, &pb.PagodaGetListResp{Data: pagoda})
 		}
+	} else {
 		// 记录爬塔明细数据
 		if req.Report != nil && len(req.Report.Info.Redflist) > 0 {
 			sz := make([]*pb.LineUp, 5)
@@ -112,15 +114,15 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChal
 					}
 				}
 			}
-
-			this.module.modulerank.addPagodaRankList(session, seasonPagoda, req.Report.Info.Redflist[0].Leadpos, sz)
+			this.module.modulerank.addPagodaRankList(session, seasonPagoda, req.Report.Info.Redflist[0].Leadpos, sz, req.Report.Costtime)
 		}
-		pagoda.PagodaId = seasonPagoda.PagodaId
-		pagoda.Type = seasonPagoda.Type
-		pagoda.Reward = seasonPagoda.Reward
+		// 挑战处理
+		seasonPagoda.PagodaId = conf.LayerNum
+		mapData["pagodaId"] = conf.LayerNum
+		code = this.module.ModifySeasonPagodaData(session.GetUserId(), mapData)
 		session.SendMsg(string(this.module.GetType()), PagodaChallengeOverResp, &pb.PagodaChallengeOverResp{Data: pagoda})
 	}
-
+	// 任务相关
 	if req.PagodaType == comm.PagodaType {
 		this.module.ModuleRtask.SendToRtask(session, comm.Rtype58, 1)
 		this.module.ModuleRtask.SendToRtask(session, comm.Rtype59, pagoda.PagodaId)
diff --git a/modules/pagoda/api_getlist.go b/modules/pagoda/api_getlist.go
index bb3d77bca..442967850 100644
--- a/modules/pagoda/api_getlist.go
+++ b/modules/pagoda/api_getlist.go
@@ -19,31 +19,31 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.PagodaGetListReq
 	var (
 		list *pb.DBPagoda
 	)
-	code = this.GetListCheck(session, req)
-	if code != pb.ErrorCode_Success {
-		return // 参数校验失败直接返回
-	}
-
-	list, _ = this.module.modelPagoda.getPagodaList(session.GetUserId())
-
-	defer func() {
-		session.SendMsg(string(this.module.GetType()), PagodaGetListResp, &pb.PagodaGetListResp{Data: list})
-	}()
-	if list == nil { // redis没有数据
-		list = &pb.DBPagoda{}
-		list.Id = primitive.NewObjectID().Hex()
-
-		list.Uid = session.GetUserId()
-		list.PagodaId = 0 // 初始数据1层
-		list.Type = comm.PagodaType
-		this.module.modelPagoda.addNewPagoda(session.GetUserId(), list)
+	expand, err := this.module.ModuleUser.GetUserExpand(session.GetUserId())
+	if err != nil {
+		code = pb.ErrorCode_DBError
 		return
 	}
-	season, _ := this.module.modelSeasonPagoda.getSeasonPagodaList(session.GetUserId())
-	if season != nil {
-		list.PagodaId = season.PagodaId
-		list.Type = season.Type
-		list.Reward = season.Reward
+	if !expand.CompletePagoda { // 普通塔
+		list, _ = this.module.modelPagoda.getPagodaList(session.GetUserId())
+		if list == nil { // redis没有数据
+			list = &pb.DBPagoda{}
+			list.Id = primitive.NewObjectID().Hex()
+
+			list.Uid = session.GetUserId()
+			list.PagodaId = 0 // 初始数据0层
+			list.Type = comm.PagodaType
+			this.module.modelPagoda.addNewPagoda(session.GetUserId(), list)
+		}
+	} else {
+		season, _ := this.module.modelSeasonPagoda.getSeasonPagodaList(session.GetUserId())
+		if season != nil {
+			list.PagodaId = season.PagodaId
+			list.Type = season.Type
+			list.Reward = season.Reward
+		}
 	}
+
+	session.SendMsg(string(this.module.GetType()), PagodaGetListResp, &pb.PagodaGetListResp{Data: list})
 	return
 }
diff --git a/modules/pagoda/api_ranklist.go b/modules/pagoda/api_ranklist.go
index 56417c2e4..97bbd3bf4 100644
--- a/modules/pagoda/api_ranklist.go
+++ b/modules/pagoda/api_ranklist.go
@@ -15,7 +15,7 @@ func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.PagodaRank
 
 func (this *apiComp) RankList(session comm.IUserSession, req *pb.PagodaRankListReq) (code pb.ErrorCode, data proto.Message) {
 	var (
-		szRank []*pb.DBPagodaRank
+		szRank []*pb.DBPagodaRecord
 		err    error
 	)
 	code = this.RankListCheck(session, req)
diff --git a/modules/pagoda/model_rank.go b/modules/pagoda/model_rank.go
index fde2d3f6a..538cad61d 100644
--- a/modules/pagoda/model_rank.go
+++ b/modules/pagoda/model_rank.go
@@ -1,15 +1,21 @@
 package pagoda
 
 import (
+	"fmt"
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/core"
+	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/lego/sys/redis"
 	"go_dreamfactory/modules"
 	"go_dreamfactory/pb"
+	"sort"
+	"time"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
+var floorRankKey = "pagoda:floor"
+
 type ModelRank struct {
 	modules.MCompModel
 	modulePagoda *Pagoda
@@ -22,7 +28,7 @@ func (this *ModelRank) Init(service core.IService, module core.IModule, comp cor
 	return
 }
 
-func (this *ModelRank) AddRank(uId string, data *pb.DBPagodaRank) (err error) {
+func (this *ModelRank) AddRank(uId string, data *pb.DBPagodaRecord) (err error) {
 	if err = this.Add(uId, data); err != nil {
 		//this.Errorf("err:%v", err)
 		return
@@ -31,8 +37,8 @@ func (this *ModelRank) AddRank(uId string, data *pb.DBPagodaRank) (err error) {
 }
 
 //获取用户通过扩展表
-func (this *ModelRank) GetUserRandData(uid string) (result *pb.DBPagodaRank, err error) {
-	result = &pb.DBPagodaRank{}
+func (this *ModelRank) GetUserRandData(uid string) (result *pb.DBPagodaRecord, err error) {
+	result = &pb.DBPagodaRecord{}
 	if err = this.Get(uid, result); err != nil && redis.RedisNil != err {
 		return
 	}
@@ -47,14 +53,14 @@ func (this *ModelRank) ChangeUserRank(uid string, value map[string]interface{})
 	return this.Change(uid, value)
 }
 
-func (this *ModelRank) GetRankData() (data []*pb.DBPagodaRank, err error) {
-	data = make([]*pb.DBPagodaRank, 0)
+func (this *ModelRank) GetRankData() (data []*pb.DBPagodaRecord, err error) {
+	data = make([]*pb.DBPagodaRecord, 0)
 	err = this.Redis.LRange(comm.TablePagodaRankList, 0, -1, &data)
 
 	return
 }
-func (this *ModelRank) getPagodaRankList(uid string) []*pb.DBPagodaRank {
-	pagodaRank := make([]*pb.DBPagodaRank, 0)
+func (this *ModelRank) getPagodaRankList(uid string) []*pb.DBPagodaRecord {
+	pagodaRank := make([]*pb.DBPagodaRecord, 0)
 	err := this.GetList(uid, &pagodaRank)
 	if err != nil {
 		return nil
@@ -63,18 +69,84 @@ func (this *ModelRank) getPagodaRankList(uid string) []*pb.DBPagodaRank {
 }
 
 // 插入新的排行数据
-func (this *ModelRank) addPagodaRankList(session comm.IUserSession, data *pb.DBSeasonPagoda, Leadpos int32, line []*pb.LineUp) {
+func (this *ModelRank) addPagodaRankList(session comm.IUserSession, data *pb.DBSeasonPagoda, Leadpos int32, line []*pb.LineUp, costTime int32) {
 	userinfo := this.modulePagoda.ModuleUser.GetUser(session.GetUserId())
-	new := &pb.DBPagodaRank{
+	new := &pb.DBPagodaRecord{
 		Id:       primitive.NewObjectID().Hex(),
 		Uid:      session.GetUserId(),
 		PagodaId: data.PagodaId,
 		Type:     data.Type,
 		Nickname: userinfo.Name,
-		Icon:     "",
+		Icon:     "", // icon 暂无
 		Lv:       userinfo.Lv,
-		CostTime: 0,
+		CostTime: costTime,
+	}
+	this.AddList(session.GetUserId(), new.Id, new) //写爬塔记录
+	// 查询本层是否上榜
+	rankData, ilen, err1 := this.GetFloorLastRankData(data.PagodaId)
+	if err1 != nil {
+		if rankData.CostTime < costTime || ilen < comm.MaxRankNum {
+			this.ChangeFloorRankList(session, data.PagodaId, new)
+		}
+	}
+	return
+}
+
+// 读取某一层排行数据
+func (this *ModelRank) GetFloorRankList(floor int32) (result []*pb.DBPagodaRecord, err error) {
+	key := fmt.Sprintf("%s-%d-rank", floorRankKey, floor)
+	temp := make([]*pb.DBPagodaRecord, 0)
+	if err = this.Redis.LRange(key, 0, -1, &temp); err != nil {
+		this.modulePagoda.Errorf("err:%v", err)
+		return
+	}
+
+	result = make([]*pb.DBPagodaRecord, len(temp))
+	for n, v := range temp {
+		result[n] = v
+		n++
+	}
+	return
+}
+
+// 获取排行榜最后一个元素
+func (this *ModelRank) GetFloorLastRankData(floor int32) (curData *pb.DBPagodaRecord, len int, err error) {
+	key := fmt.Sprintf("%s-%d-rank", floorRankKey, floor)
+	len, err = this.Redis.Llen(key)
+	if this.Redis.Lindex(key, -1, curData); err != nil {
+		this.modulePagoda.Errorf("err:%v", err)
+		return
+	}
+	return
+}
+
+// 修改某一层排行数据
+func (this *ModelRank) ChangeFloorRankList(session comm.IUserSession, floor int32, curData *pb.DBPagodaRecord) (err error) {
+	key := fmt.Sprintf("%s-%d-rank", floorRankKey, floor)
+	lockkey := fmt.Sprintf("%s-%d-lock", floorRankKey, floor)
+
+	this.Redis.Lock(lockkey, time.Now().Second()*5)
+	defer this.Redis.UnLock(lockkey)
+	if this.Redis.RPush(key, curData); err != nil {
+		this.modulePagoda.Errorf("err:%v", err)
+		return
+	}
+	temp := make([]*pb.DBPagodaRecord, 0)
+	if err = this.Redis.LRange(key, 0, -1, &temp); err != nil {
+		this.modulePagoda.Errorf("err:%v", err)
+		return
+	}
+	sort.SliceStable(temp, func(i, j int) bool {
+		return temp[i].CostTime < temp[j].CostTime
+	})
+
+	if this.Redis.RPush(key, temp); err != nil {
+		this.modulePagoda.Errorf("err:%v", err)
+		return
+	}
+	err = this.Redis.Ltrim(key, -1*comm.MaxRankNum, -1) //对一个列表进行修剪
+	if err != nil {
+		log.Errorf("delete failed")
 	}
-	this.AddList(session.GetUserId(), new.Id, new)
 	return
 }
diff --git a/modules/pagoda/model_seasonpagoda.go b/modules/pagoda/model_seasonpagoda.go
index 59b5af336..d57d0095b 100644
--- a/modules/pagoda/model_seasonpagoda.go
+++ b/modules/pagoda/model_seasonpagoda.go
@@ -48,13 +48,13 @@ func (this *ModelSeasonPagoda) modifySeasonPagodaDataByObjId(uid string, data ma
 	return this.Change(uid, data)
 }
 
-// 创建一个新的塔数据
+// 创建一个新的赛季塔数据
 func (this *ModelSeasonPagoda) addNewSeasonPagoda(uId string, data *pb.DBSeasonPagoda) (err error) {
-	err = this.InsertModelLogs(this.TableName, uId, []interface{}{data}) // 不需要经过redis
-	// if err = this.Add(uId, data); err != nil {
-	// 	this.module.Errorf("err:%v", err)
-	// 	return
-	// }
+	//err = this.InsertModelLogs(this.TableName, uId, []interface{}{data}) // 不需要经过redis
+	if err = this.Add(uId, data); err != nil {
+		this.module.Errorf("err:%v", err)
+		return
+	}
 	return nil
 }
 
diff --git a/modules/pagoda/pagoda_test.go b/modules/pagoda/pagoda_test.go
new file mode 100644
index 000000000..9a8f6b8ef
--- /dev/null
+++ b/modules/pagoda/pagoda_test.go
@@ -0,0 +1,93 @@
+package pagoda_test
+
+import (
+	"context"
+	"fmt"
+	"go_dreamfactory/comm"
+	"go_dreamfactory/lego"
+	"go_dreamfactory/lego/base/rpcx"
+	"go_dreamfactory/lego/core"
+	"go_dreamfactory/lego/sys/log"
+	"go_dreamfactory/modules/equipment"
+	"go_dreamfactory/modules/hero"
+	"go_dreamfactory/modules/items"
+	"go_dreamfactory/modules/pagoda"
+	"go_dreamfactory/modules/task"
+	"go_dreamfactory/modules/user"
+	"go_dreamfactory/pb"
+	"go_dreamfactory/services"
+	"go_dreamfactory/sys/configure"
+	"go_dreamfactory/sys/db"
+	"testing"
+	"time"
+
+	"github.com/golang/protobuf/ptypes"
+)
+
+var service core.IService
+var s_gateComp comm.ISC_GateRouteComp = services.NewGateRouteComp()
+
+var module = new(hero.Hero)
+
+type TestService struct {
+	rpcx.RPCXService
+}
+
+func newService(ops ...rpcx.Option) core.IService {
+	s := new(TestService)
+	s.Configure(ops...)
+	return s
+}
+
+//初始化相关系统
+func (this *TestService) InitSys() {
+	this.RPCXService.InitSys()
+	if err := db.OnInit(this.GetSettings().Sys["db"]); err != nil {
+		panic(fmt.Sprintf("init sys.db err: %s", err.Error()))
+	} else {
+		log.Infof("init sys.db success!")
+	}
+	if err := configure.OnInit(this.GetSettings().Sys["configure"], configure.SetConfigPath("F:/work/go/go_dreamfactory/bin/json")); err != nil {
+		panic(fmt.Sprintf("init sys.configure err: %s", err.Error()))
+	} else {
+		log.Infof("init sys.configure success!")
+	}
+}
+
+func Test_Main(t *testing.T) {
+
+	service = newService(
+		rpcx.SetConfPath("../../bin/conf/worker_1.yaml"),
+	)
+	service.OnInstallComp( //装备组件
+		s_gateComp, //此服务需要接受用户的消息 需要装备网关组件
+	)
+	go func() {
+		lego.Run(service, //运行模块
+			module,
+			items.NewModule(),
+			user.NewModule(),
+			equipment.NewModule(),
+			task.NewModule(),
+			pagoda.NewModule(),
+		)
+	}()
+	time.Sleep(time.Second * 2)
+
+}
+
+func GetMap() map[int32]int32 {
+	return nil
+}
+
+func Test_Modules(t *testing.T) {
+
+	data, _ := ptypes.MarshalAny(&pb.HeroListReq{})
+	reply := &pb.RPCMessageReply{}
+	s_gateComp.ReceiveMsg(context.Background(), &pb.AgentMessage{UserId: "0_62c79d66acc7aa239b07c21e", MainType: "hero", SubType: "list", Message: data}, reply)
+	log.Debugf("reply:%v", reply)
+}
+
+func TestXxx(t *testing.T) {
+
+}
diff --git a/modules/timer/pagodarank.go b/modules/timer/pagodarank.go
index 09286c477..482a85963 100644
--- a/modules/timer/pagodarank.go
+++ b/modules/timer/pagodarank.go
@@ -37,9 +37,9 @@ func (this *PagodaRank) Start() (err error) {
 // 处理排行榜排序
 func (this *PagodaRank) Timer() {
 	data := make([]interface{}, 0) // options.Find().SetLimit(comm.MaxRankList)
-	if _data, err := this.DB.Find(comm.TablePagodaRecord, bson.M{}, options.Find().SetSort(bson.M{"pagodaId": -1}).SetLimit(comm.MaxRankList)); err == nil {
+	if _data, err := this.DB.Find(comm.TableSeasonPagoda, bson.M{}, options.Find().SetSort(bson.M{"pagodaId": -1}).SetLimit(comm.MaxRankList)); err == nil {
 		for _data.Next(context.TODO()) {
-			temp := &pb.DBPagodaRank{}
+			temp := &pb.DBPagodaRecord{}
 			if err = _data.Decode(temp); err == nil {
 				data = append(data, temp)
 			}
diff --git a/modules/user/model_expand.go b/modules/user/model_expand.go
index e21499ec3..946d9d39c 100644
--- a/modules/user/model_expand.go
+++ b/modules/user/model_expand.go
@@ -23,8 +23,6 @@ func (this *ModelExpand) Init(service core.IService, module core.IModule, comp c
 	return
 }
 
-
-
 //获取用户通过扩展表
 func (this *ModelExpand) GetUserExpand(uid string) (result *pb.DBUserExpand, err error) {
 	result = &pb.DBUserExpand{}
@@ -61,3 +59,13 @@ func (this *ModelExpand) updateLoginDay(uid string, timestamp int64) (err error)
 	}
 	return
 }
+
+// 通关了普通塔
+func (this *ModelExpand) CompleteNormalPagoda(uid string) (err error) {
+	update := map[string]interface{}{
+		"completePagoda": true,
+	}
+	err = this.ChangeUserExpand(uid, update)
+
+	return
+}
diff --git a/pb/pagoda_db.pb.go b/pb/pagoda_db.pb.go
index 17ab66e93..527473ceb 100644
--- a/pb/pagoda_db.pb.go
+++ b/pb/pagoda_db.pb.go
@@ -180,7 +180,8 @@ func (x *DBSeasonPagoda) GetType() int32 {
 	return 0
 }
 
-type DBPagodaRank struct {
+// 爬塔数据明细
+type DBPagodaRecord struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -197,8 +198,8 @@ type DBPagodaRank struct {
 	CostTime int32     `protobuf:"varint,10,opt,name=costTime,proto3" json:"costTime" bson:"costTime"` //闯关耗时 单位s
 }
 
-func (x *DBPagodaRank) Reset() {
-	*x = DBPagodaRank{}
+func (x *DBPagodaRecord) Reset() {
+	*x = DBPagodaRecord{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_pagoda_pagoda_db_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -206,13 +207,13 @@ func (x *DBPagodaRank) Reset() {
 	}
 }
 
-func (x *DBPagodaRank) String() string {
+func (x *DBPagodaRecord) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*DBPagodaRank) ProtoMessage() {}
+func (*DBPagodaRecord) ProtoMessage() {}
 
-func (x *DBPagodaRank) ProtoReflect() protoreflect.Message {
+func (x *DBPagodaRecord) ProtoReflect() protoreflect.Message {
 	mi := &file_pagoda_pagoda_db_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -224,75 +225,75 @@ func (x *DBPagodaRank) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use DBPagodaRank.ProtoReflect.Descriptor instead.
-func (*DBPagodaRank) Descriptor() ([]byte, []int) {
+// Deprecated: Use DBPagodaRecord.ProtoReflect.Descriptor instead.
+func (*DBPagodaRecord) Descriptor() ([]byte, []int) {
 	return file_pagoda_pagoda_db_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *DBPagodaRank) GetId() string {
+func (x *DBPagodaRecord) GetId() string {
 	if x != nil {
 		return x.Id
 	}
 	return ""
 }
 
-func (x *DBPagodaRank) GetUid() string {
+func (x *DBPagodaRecord) GetUid() string {
 	if x != nil {
 		return x.Uid
 	}
 	return ""
 }
 
-func (x *DBPagodaRank) GetPagodaId() int32 {
+func (x *DBPagodaRecord) GetPagodaId() int32 {
 	if x != nil {
 		return x.PagodaId
 	}
 	return 0
 }
 
-func (x *DBPagodaRank) GetType() int32 {
+func (x *DBPagodaRecord) GetType() int32 {
 	if x != nil {
 		return x.Type
 	}
 	return 0
 }
 
-func (x *DBPagodaRank) GetNickname() string {
+func (x *DBPagodaRecord) GetNickname() string {
 	if x != nil {
 		return x.Nickname
 	}
 	return ""
 }
 
-func (x *DBPagodaRank) GetIcon() string {
+func (x *DBPagodaRecord) GetIcon() string {
 	if x != nil {
 		return x.Icon
 	}
 	return ""
 }
 
-func (x *DBPagodaRank) GetLv() int32 {
+func (x *DBPagodaRecord) GetLv() int32 {
 	if x != nil {
 		return x.Lv
 	}
 	return 0
 }
 
-func (x *DBPagodaRank) GetLeadpos() int32 {
+func (x *DBPagodaRecord) GetLeadpos() int32 {
 	if x != nil {
 		return x.Leadpos
 	}
 	return 0
 }
 
-func (x *DBPagodaRank) GetLine() []*LineUp {
+func (x *DBPagodaRecord) GetLine() []*LineUp {
 	if x != nil {
 		return x.Line
 	}
 	return nil
 }
 
-func (x *DBPagodaRank) GetCostTime() int32 {
+func (x *DBPagodaRecord) GetCostTime() int32 {
 	if x != nil {
 		return x.CostTime
 	}
@@ -331,23 +332,23 @@ var file_pagoda_pagoda_db_proto_rawDesc = []byte{
 	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
 	0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
 	0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
-	0xf3, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x61, 0x6e, 0x6b,
-	0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64,
-	0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
-	0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x49, 0x64, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x49, 0x64, 0x12, 0x12,
-	0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x79,
-	0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12,
-	0x0a, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x63,
-	0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
-	0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x08, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1b, 0x0a, 0x04,
-	0x6c, 0x69, 0x6e, 0x65, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x4c, 0x69, 0x6e,
-	0x65, 0x55, 0x70, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x73,
-	0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x73,
-	0x74, 0x54, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0xf5, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f,
+	0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
+	0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x49, 0x64,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x49, 0x64,
+	0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04,
+	0x74, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65,
+	0x12, 0x12, 0x0a, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x69, 0x63, 0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x02, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18,
+	0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1b,
+	0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x4c,
+	0x69, 0x6e, 0x65, 0x55, 0x70, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63,
+	0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63,
+	0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -366,7 +367,7 @@ var file_pagoda_pagoda_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
 var file_pagoda_pagoda_db_proto_goTypes = []interface{}{
 	(*DBPagoda)(nil),       // 0: DBPagoda
 	(*DBSeasonPagoda)(nil), // 1: DBSeasonPagoda
-	(*DBPagodaRank)(nil),   // 2: DBPagodaRank
+	(*DBPagodaRecord)(nil), // 2: DBPagodaRecord
 	nil,                    // 3: DBPagoda.RewardEntry
 	nil,                    // 4: DBSeasonPagoda.RewardEntry
 	(*LineUp)(nil),         // 5: LineUp
@@ -374,7 +375,7 @@ var file_pagoda_pagoda_db_proto_goTypes = []interface{}{
 var file_pagoda_pagoda_db_proto_depIdxs = []int32{
 	3, // 0: DBPagoda.reward:type_name -> DBPagoda.RewardEntry
 	4, // 1: DBSeasonPagoda.reward:type_name -> DBSeasonPagoda.RewardEntry
-	5, // 2: DBPagodaRank.line:type_name -> LineUp
+	5, // 2: DBPagodaRecord.line:type_name -> LineUp
 	3, // [3:3] is the sub-list for method output_type
 	3, // [3:3] is the sub-list for method input_type
 	3, // [3:3] is the sub-list for extension type_name
@@ -414,7 +415,7 @@ func file_pagoda_pagoda_db_proto_init() {
 			}
 		}
 		file_pagoda_pagoda_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DBPagodaRank); i {
+			switch v := v.(*DBPagodaRecord); i {
 			case 0:
 				return &v.state
 			case 1:
diff --git a/pb/pagoda_msg.pb.go b/pb/pagoda_msg.pb.go
index c888204d0..2aeca7f32 100644
--- a/pb/pagoda_msg.pb.go
+++ b/pb/pagoda_msg.pb.go
@@ -492,7 +492,7 @@ type PagodaRankListResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Ranks []*DBPagodaRank `protobuf:"bytes,1,rep,name=ranks,proto3" json:"ranks"`
+	Ranks []*DBPagodaRecord `protobuf:"bytes,1,rep,name=ranks,proto3" json:"ranks"`
 }
 
 func (x *PagodaRankListResp) Reset() {
@@ -527,7 +527,7 @@ func (*PagodaRankListResp) Descriptor() ([]byte, []int) {
 	return file_pagoda_pagoda_msg_proto_rawDescGZIP(), []int{9}
 }
 
-func (x *PagodaRankListResp) GetRanks() []*DBPagodaRank {
+func (x *PagodaRankListResp) GetRanks() []*DBPagodaRecord {
 	if x != nil {
 		return x.Ranks
 	}
@@ -579,12 +579,12 @@ var file_pagoda_pagoda_msg_proto_rawDesc = []byte{
 	0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x49, 0x64,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x49, 0x64, 0x12,
 	0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x39, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64,
-	0x61, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a,
-	0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44,
-	0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e,
-	0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x3b, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64,
+	0x61, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a,
+	0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44,
+	0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x05, 0x72,
+	0x61, 0x6e, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -614,7 +614,7 @@ var file_pagoda_pagoda_msg_proto_goTypes = []interface{}{
 	(*DBPagoda)(nil),                // 10: DBPagoda
 	(*BattleInfo)(nil),              // 11: BattleInfo
 	(*BattleReport)(nil),            // 12: BattleReport
-	(*DBPagodaRank)(nil),            // 13: DBPagodaRank
+	(*DBPagodaRecord)(nil),          // 13: DBPagodaRecord
 }
 var file_pagoda_pagoda_msg_proto_depIdxs = []int32{
 	10, // 0: PagodaGetListResp.data:type_name -> DBPagoda
@@ -622,7 +622,7 @@ var file_pagoda_pagoda_msg_proto_depIdxs = []int32{
 	11, // 2: PagodaChallengeResp.info:type_name -> BattleInfo
 	12, // 3: PagodaChallengeOverReq.report:type_name -> BattleReport
 	10, // 4: PagodaChallengeOverResp.data:type_name -> DBPagoda
-	13, // 5: PagodaRankListResp.ranks:type_name -> DBPagodaRank
+	13, // 5: PagodaRankListResp.ranks:type_name -> DBPagodaRecord
 	6,  // [6:6] is the sub-list for method output_type
 	6,  // [6:6] is the sub-list for method input_type
 	6,  // [6:6] is the sub-list for extension type_name
diff --git a/pb/rtask_msg.pb.go b/pb/rtask_msg.pb.go
index 4950963d0..655171258 100644
--- a/pb/rtask_msg.pb.go
+++ b/pb/rtask_msg.pb.go
@@ -504,22 +504,131 @@ func (x *RtaskGetRewardResp) GetRtaskSubId() int32 {
 	return 0
 }
 
+// 开始战斗
+type RtaskBattleStartReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	BattleConfId int32    `protobuf:"varint,1,opt,name=battleConfId,proto3" json:"battleConfId"` //战斗配表ID
+	Leadpos      int32    `protobuf:"varint,3,opt,name=leadpos,proto3" json:"leadpos"`           //队长位置
+	Teamids      []string `protobuf:"bytes,4,rep,name=teamids,proto3" json:"teamids"`            //阵容信息
+}
+
+func (x *RtaskBattleStartReq) Reset() {
+	*x = RtaskBattleStartReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_rtask_rtask_msg_proto_msgTypes[9]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *RtaskBattleStartReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*RtaskBattleStartReq) ProtoMessage() {}
+
+func (x *RtaskBattleStartReq) ProtoReflect() protoreflect.Message {
+	mi := &file_rtask_rtask_msg_proto_msgTypes[9]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use RtaskBattleStartReq.ProtoReflect.Descriptor instead.
+func (*RtaskBattleStartReq) Descriptor() ([]byte, []int) {
+	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{9}
+}
+
+func (x *RtaskBattleStartReq) GetBattleConfId() int32 {
+	if x != nil {
+		return x.BattleConfId
+	}
+	return 0
+}
+
+func (x *RtaskBattleStartReq) GetLeadpos() int32 {
+	if x != nil {
+		return x.Leadpos
+	}
+	return 0
+}
+
+func (x *RtaskBattleStartReq) GetTeamids() []string {
+	if x != nil {
+		return x.Teamids
+	}
+	return nil
+}
+
+type RtaskBattleStartResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Info *BattleInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` //战斗信息
+}
+
+func (x *RtaskBattleStartResp) Reset() {
+	*x = RtaskBattleStartResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_rtask_rtask_msg_proto_msgTypes[10]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *RtaskBattleStartResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*RtaskBattleStartResp) ProtoMessage() {}
+
+func (x *RtaskBattleStartResp) ProtoReflect() protoreflect.Message {
+	mi := &file_rtask_rtask_msg_proto_msgTypes[10]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use RtaskBattleStartResp.ProtoReflect.Descriptor instead.
+func (*RtaskBattleStartResp) Descriptor() ([]byte, []int) {
+	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{10}
+}
+
+func (x *RtaskBattleStartResp) GetInfo() *BattleInfo {
+	if x != nil {
+		return x.Info
+	}
+	return nil
+}
+
 // 战斗完成
 type RtaskBattleFinishReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	RtaskId    int32 `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"`       //任务ID
-	ChooseId   int32 `protobuf:"varint,2,opt,name=chooseId,proto3" json:"chooseId"`     //选项配置ID
-	RtaskSubId int32 `protobuf:"varint,3,opt,name=rtaskSubId,proto3" json:"rtaskSubId"` //支线任务ID
-	Result     int32 `protobuf:"varint,4,opt,name=result,proto3" json:"result"`
+	RtaskId int32         `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"` //任务ID
+	Report  *BattleReport `protobuf:"bytes,4,opt,name=report,proto3" json:"report"`    //战报
 }
 
 func (x *RtaskBattleFinishReq) Reset() {
 	*x = RtaskBattleFinishReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_rtask_rtask_msg_proto_msgTypes[9]
+		mi := &file_rtask_rtask_msg_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -532,7 +641,7 @@ func (x *RtaskBattleFinishReq) String() string {
 func (*RtaskBattleFinishReq) ProtoMessage() {}
 
 func (x *RtaskBattleFinishReq) ProtoReflect() protoreflect.Message {
-	mi := &file_rtask_rtask_msg_proto_msgTypes[9]
+	mi := &file_rtask_rtask_msg_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -545,7 +654,7 @@ func (x *RtaskBattleFinishReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RtaskBattleFinishReq.ProtoReflect.Descriptor instead.
 func (*RtaskBattleFinishReq) Descriptor() ([]byte, []int) {
-	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{9}
+	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *RtaskBattleFinishReq) GetRtaskId() int32 {
@@ -555,25 +664,11 @@ func (x *RtaskBattleFinishReq) GetRtaskId() int32 {
 	return 0
 }
 
-func (x *RtaskBattleFinishReq) GetChooseId() int32 {
+func (x *RtaskBattleFinishReq) GetReport() *BattleReport {
 	if x != nil {
-		return x.ChooseId
+		return x.Report
 	}
-	return 0
-}
-
-func (x *RtaskBattleFinishReq) GetRtaskSubId() int32 {
-	if x != nil {
-		return x.RtaskSubId
-	}
-	return 0
-}
-
-func (x *RtaskBattleFinishReq) GetResult() int32 {
-	if x != nil {
-		return x.Result
-	}
-	return 0
+	return nil
 }
 
 type RtaskBattleFinishResp struct {
@@ -581,14 +676,14 @@ type RtaskBattleFinishResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Bid     int32 `protobuf:"varint,1,opt,name=bid,proto3" json:"bid"`         //战斗配置ID
-	RtaskId int32 `protobuf:"varint,2,opt,name=rtaskId,proto3" json:"rtaskId"` //任务ID
+	RtaskId int32 `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"` //任务ID
+	IsWin   bool  `protobuf:"varint,2,opt,name=isWin,proto3" json:"isWin"`     //战斗结果
 }
 
 func (x *RtaskBattleFinishResp) Reset() {
 	*x = RtaskBattleFinishResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_rtask_rtask_msg_proto_msgTypes[10]
+		mi := &file_rtask_rtask_msg_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -601,7 +696,7 @@ func (x *RtaskBattleFinishResp) String() string {
 func (*RtaskBattleFinishResp) ProtoMessage() {}
 
 func (x *RtaskBattleFinishResp) ProtoReflect() protoreflect.Message {
-	mi := &file_rtask_rtask_msg_proto_msgTypes[10]
+	mi := &file_rtask_rtask_msg_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -614,14 +709,7 @@ func (x *RtaskBattleFinishResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RtaskBattleFinishResp.ProtoReflect.Descriptor instead.
 func (*RtaskBattleFinishResp) Descriptor() ([]byte, []int) {
-	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{10}
-}
-
-func (x *RtaskBattleFinishResp) GetBid() int32 {
-	if x != nil {
-		return x.Bid
-	}
-	return 0
+	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *RtaskBattleFinishResp) GetRtaskId() int32 {
@@ -631,6 +719,13 @@ func (x *RtaskBattleFinishResp) GetRtaskId() int32 {
 	return 0
 }
 
+func (x *RtaskBattleFinishResp) GetIsWin() bool {
+	if x != nil {
+		return x.IsWin
+	}
+	return false
+}
+
 // 测试使用
 type RtaskTestReq struct {
 	state         protoimpl.MessageState
@@ -645,7 +740,7 @@ type RtaskTestReq struct {
 func (x *RtaskTestReq) Reset() {
 	*x = RtaskTestReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_rtask_rtask_msg_proto_msgTypes[11]
+		mi := &file_rtask_rtask_msg_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -658,7 +753,7 @@ func (x *RtaskTestReq) String() string {
 func (*RtaskTestReq) ProtoMessage() {}
 
 func (x *RtaskTestReq) ProtoReflect() protoreflect.Message {
-	mi := &file_rtask_rtask_msg_proto_msgTypes[11]
+	mi := &file_rtask_rtask_msg_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -671,7 +766,7 @@ func (x *RtaskTestReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RtaskTestReq.ProtoReflect.Descriptor instead.
 func (*RtaskTestReq) Descriptor() ([]byte, []int) {
-	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{11}
+	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *RtaskTestReq) GetRtaskType() int32 {
@@ -706,7 +801,7 @@ type RtaskTestResp struct {
 func (x *RtaskTestResp) Reset() {
 	*x = RtaskTestResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_rtask_rtask_msg_proto_msgTypes[12]
+		mi := &file_rtask_rtask_msg_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -719,7 +814,7 @@ func (x *RtaskTestResp) String() string {
 func (*RtaskTestResp) ProtoMessage() {}
 
 func (x *RtaskTestResp) ProtoReflect() protoreflect.Message {
-	mi := &file_rtask_rtask_msg_proto_msgTypes[12]
+	mi := &file_rtask_rtask_msg_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -732,7 +827,7 @@ func (x *RtaskTestResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RtaskTestResp.ProtoReflect.Descriptor instead.
 func (*RtaskTestResp) Descriptor() ([]byte, []int) {
-	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{12}
+	return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{14}
 }
 
 func (x *RtaskTestResp) GetFlag() bool {
@@ -746,68 +841,77 @@ var File_rtask_rtask_msg_proto protoreflect.FileDescriptor
 
 var file_rtask_rtask_msg_proto_rawDesc = []byte{
 	0x0a, 0x15, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x6d, 0x73,
-	0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x49, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b,
-	0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73,
-	0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b,
-	0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62,
-	0x49, 0x64, 0x22, 0x2a, 0x0a, 0x0e, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x70, 0x70, 0x6c, 0x79,
-	0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x28,
-	0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18,
-	0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x22, 0x2b, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73,
-	0x6b, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x74, 0x61,
-	0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x72, 0x74, 0x61,
-	0x73, 0x6b, 0x49, 0x64, 0x73, 0x22, 0x66, 0x0a, 0x0e, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68,
-	0x6f, 0x6f, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b,
-	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49,
-	0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a,
-	0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x67, 0x0a,
-	0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70,
+	0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f,
+	0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x22, 0x49, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65,
+	0x71, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72,
+	0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x2a, 0x0a, 0x0e, 0x52,
+	0x74, 0x61, 0x73, 0x6b, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a,
+	0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
+	0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x28, 0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b,
+	0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70,
+	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49,
+	0x64, 0x22, 0x2b, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65,
+	0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x22, 0x66,
+	0x0a, 0x0e, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x52, 0x65, 0x71,
 	0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68,
 	0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x68,
 	0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53,
 	0x75, 0x62, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73,
-	0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x2b, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x46,
-	0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61,
+	0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x67, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43,
+	0x68, 0x6f, 0x6f, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61,
 	0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73,
-	0x6b, 0x49, 0x64, 0x22, 0x4d, 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x65, 0x74, 0x52,
-	0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73,
-	0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b,
-	0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62,
-	0x49, 0x64, 0x22, 0x4e, 0x0a, 0x12, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x65, 0x74, 0x52, 0x65,
-	0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73,
-	0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b,
-	0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62,
-	0x49, 0x64, 0x22, 0x84, 0x01, 0x0a, 0x14, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74,
+	0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x12,
+	0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22,
+	0x2b, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75,
+	0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x4d, 0x0a, 0x11,
+	0x52, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65,
+	0x71, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72,
+	0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x4e, 0x0a, 0x12, 0x52,
+	0x74, 0x61, 0x73, 0x6b, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73,
+	0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72,
+	0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x6d, 0x0a, 0x13, 0x52,
+	0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52,
+	0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66,
+	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
+	0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f,
+	0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73,
+	0x12, 0x18, 0x0a, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28,
+	0x09, 0x52, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x69, 0x64, 0x73, 0x22, 0x37, 0x0a, 0x14, 0x52, 0x74,
+	0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65,
+	0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69,
+	0x6e, 0x66, 0x6f, 0x22, 0x57, 0x0a, 0x14, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74,
 	0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x72,
 	0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74,
-	0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49,
-	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49,
-	0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49,
-	0x64, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x43, 0x0a, 0x15, 0x52, 0x74, 0x61,
-	0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x03, 0x62, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x5e,
-	0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1c,
-	0x0a, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06,
-	0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61,
-	0x72, 0x61, 0x6d, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x22, 0x23,
-	0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x66,
-	0x6c, 0x61, 0x67, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65,
+	0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x47, 0x0a, 0x15,
+	0x52, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73,
+	0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12,
+	0x14, 0x0a, 0x05, 0x69, 0x73, 0x57, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05,
+	0x69, 0x73, 0x57, 0x69, 0x6e, 0x22, 0x5e, 0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65,
+	0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79,
+	0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54,
+	0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20,
+	0x03, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63,
+	0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f,
+	0x6e, 0x64, 0x69, 0x49, 0x64, 0x22, 0x23, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65,
+	0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
+	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -822,7 +926,7 @@ func file_rtask_rtask_msg_proto_rawDescGZIP() []byte {
 	return file_rtask_rtask_msg_proto_rawDescData
 }
 
-var file_rtask_rtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
+var file_rtask_rtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 15)
 var file_rtask_rtask_msg_proto_goTypes = []interface{}{
 	(*RtaskApplyReq)(nil),         // 0: RtaskApplyReq
 	(*RtaskApplyResp)(nil),        // 1: RtaskApplyResp
@@ -833,17 +937,23 @@ var file_rtask_rtask_msg_proto_goTypes = []interface{}{
 	(*RtaskFinishPush)(nil),       // 6: RtaskFinishPush
 	(*RtaskGetRewardReq)(nil),     // 7: RtaskGetRewardReq
 	(*RtaskGetRewardResp)(nil),    // 8: RtaskGetRewardResp
-	(*RtaskBattleFinishReq)(nil),  // 9: RtaskBattleFinishReq
-	(*RtaskBattleFinishResp)(nil), // 10: RtaskBattleFinishResp
-	(*RtaskTestReq)(nil),          // 11: RtaskTestReq
-	(*RtaskTestResp)(nil),         // 12: RtaskTestResp
+	(*RtaskBattleStartReq)(nil),   // 9: RtaskBattleStartReq
+	(*RtaskBattleStartResp)(nil),  // 10: RtaskBattleStartResp
+	(*RtaskBattleFinishReq)(nil),  // 11: RtaskBattleFinishReq
+	(*RtaskBattleFinishResp)(nil), // 12: RtaskBattleFinishResp
+	(*RtaskTestReq)(nil),          // 13: RtaskTestReq
+	(*RtaskTestResp)(nil),         // 14: RtaskTestResp
+	(*BattleInfo)(nil),            // 15: BattleInfo
+	(*BattleReport)(nil),          // 16: BattleReport
 }
 var file_rtask_rtask_msg_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
+	15, // 0: RtaskBattleStartResp.info:type_name -> BattleInfo
+	16, // 1: RtaskBattleFinishReq.report:type_name -> BattleReport
+	2,  // [2:2] is the sub-list for method output_type
+	2,  // [2:2] is the sub-list for method input_type
+	2,  // [2:2] is the sub-list for extension type_name
+	2,  // [2:2] is the sub-list for extension extendee
+	0,  // [0:2] is the sub-list for field type_name
 }
 
 func init() { file_rtask_rtask_msg_proto_init() }
@@ -851,6 +961,7 @@ func file_rtask_rtask_msg_proto_init() {
 	if File_rtask_rtask_msg_proto != nil {
 		return
 	}
+	file_battle_battle_msg_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_rtask_rtask_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RtaskApplyReq); i {
@@ -961,7 +1072,7 @@ func file_rtask_rtask_msg_proto_init() {
 			}
 		}
 		file_rtask_rtask_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RtaskBattleFinishReq); i {
+			switch v := v.(*RtaskBattleStartReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -973,7 +1084,7 @@ func file_rtask_rtask_msg_proto_init() {
 			}
 		}
 		file_rtask_rtask_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RtaskBattleFinishResp); i {
+			switch v := v.(*RtaskBattleStartResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -985,7 +1096,7 @@ func file_rtask_rtask_msg_proto_init() {
 			}
 		}
 		file_rtask_rtask_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RtaskTestReq); i {
+			switch v := v.(*RtaskBattleFinishReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -997,6 +1108,30 @@ func file_rtask_rtask_msg_proto_init() {
 			}
 		}
 		file_rtask_rtask_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*RtaskBattleFinishResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_rtask_rtask_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*RtaskTestReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_rtask_rtask_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RtaskTestResp); i {
 			case 0:
 				return &v.state
@@ -1015,7 +1150,7 @@ func file_rtask_rtask_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_rtask_rtask_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   13,
+			NumMessages:   15,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/userexpand.pb.go b/pb/userexpand.pb.go
index 038e1e645..4d8aaef5a 100644
--- a/pb/userexpand.pb.go
+++ b/pb/userexpand.pb.go
@@ -390,6 +390,7 @@ type DBUserExpand struct {
 	MoonfantasyLastTrigger int64             `protobuf:"varint,18,opt,name=moonfantasyLastTrigger,proto3" json:"moonfantasyLastTrigger" bson:"moonfantasyTriggerlast"`                                   // 月之秘境最后触发时间
 	LoginAddCount          int32             `protobuf:"varint,19,opt,name=loginAddCount,proto3" json:"loginAddCount"`                                                                                   //@go_tasgs(`bson:"loginAddCount"`) 累计登录天数
 	LoginContinueCount     int32             `protobuf:"varint,20,opt,name=loginContinueCount,proto3" json:"loginContinueCount"`                                                                         //@go_tasgs(`bson:"loginContinueCount"`)  连续登录天数
+	CompletePagoda         bool              `protobuf:"varint,21,opt,name=completePagoda,proto3" json:"completePagoda" bson:"completePagoda"`                                                           //通关普通塔
 }
 
 func (x *DBUserExpand) Reset() {
@@ -564,6 +565,13 @@ func (x *DBUserExpand) GetLoginContinueCount() int32 {
 	return 0
 }
 
+func (x *DBUserExpand) GetCompletePagoda() bool {
+	if x != nil {
+		return x.CompletePagoda
+	}
+	return false
+}
+
 var File_userexpand_proto protoreflect.FileDescriptor
 
 var file_userexpand_proto_rawDesc = []byte{
@@ -592,7 +600,7 @@ var file_userexpand_proto_rawDesc = []byte{
 	0x6f, 0x64, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x2b, 0x0a, 0x0a, 0x63, 0x6f, 0x6d,
 	0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
 	0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x63, 0x6f, 0x6d, 0x70,
-	0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x22, 0x93, 0x07, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65,
+	0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x22, 0xbb, 0x07, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65,
 	0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x11, 0x6c, 0x61, 0x73,
@@ -641,16 +649,19 @@ var file_userexpand_proto_rawDesc = []byte{
 	0x6e, 0x41, 0x64, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2e, 0x0a, 0x12, 0x6c, 0x6f, 0x67,
 	0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18,
 	0x14, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74,
-	0x69, 0x6e, 0x75, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x75, 0x6a,
-	0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x3a, 0x02, 0x38, 0x01, 0x1a, 0x46, 0x0a, 0x0f, 0x50, 0x72, 0x65, 0x69, 0x6e, 0x73, 0x74, 0x61,
-	0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1d, 0x0a, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72,
-	0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04,
-	0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x69, 0x6e, 0x75, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x6f, 0x6d,
+	0x70, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x18, 0x15, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x0e, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x61, 0x67, 0x6f, 0x64,
+	0x61, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
+	0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x46, 0x0a, 0x0f,
+	0x50, 0x72, 0x65, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
+	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65,
+	0x79, 0x12, 0x1d, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x07, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/sys/db/core.go b/sys/db/core.go
index f56be3eab..c15e8028a 100644
--- a/sys/db/core.go
+++ b/sys/db/core.go
@@ -1,7 +1,6 @@
 package db
 
 import (
-	"context"
 	"time"
 )
 
@@ -35,7 +34,7 @@ func OnInit(config map[string]interface{}, option ...Option) (err error) {
 	}
 	defsys, err = newSys(options)
 
-	defsys.Local().Redis.GetClient().FlushAll(context.TODO())
+	// defsys.Local().Redis.GetClient().FlushAll(context.TODO())
 	return
 }
 

From 7ed1a5ad6004f1005dc57760743df569696ebb60 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 14 Sep 2022 19:08:57 +0800
Subject: [PATCH 02/10] =?UTF-8?q?pb=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pb/equipment_db.pb.go | 60 ++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 35 deletions(-)

diff --git a/pb/equipment_db.pb.go b/pb/equipment_db.pb.go
index e6372b01a..6597d9fb2 100644
--- a/pb/equipment_db.pb.go
+++ b/pb/equipment_db.pb.go
@@ -31,7 +31,6 @@ type EquipmentAttributeEntry struct {
 	AttrName  string `protobuf:"bytes,3,opt,name=AttrName,proto3" json:"AttrName"`    //属性名
 	Lv        int32  `protobuf:"varint,4,opt,name=Lv,proto3" json:"Lv"`               //属性等级
 	Value     int32  `protobuf:"varint,5,opt,name=Value,proto3" json:"Value"`         //属性值
-	BaseValue int32  `protobuf:"varint,6,opt,name=BaseValue,proto3" json:"BaseValue"` //基础属性
 }
 
 func (x *EquipmentAttributeEntry) Reset() {
@@ -101,13 +100,6 @@ func (x *EquipmentAttributeEntry) GetValue() int32 {
 	return 0
 }
 
-func (x *EquipmentAttributeEntry) GetBaseValue() int32 {
-	if x != nil {
-		return x.BaseValue
-	}
-	return 0
-}
-
 //武器数据
 type DB_Equipment struct {
 	state         protoimpl.MessageState
@@ -240,7 +232,7 @@ var File_equipment_equipment_db_proto protoreflect.FileDescriptor
 
 var file_equipment_equipment_db_proto_rawDesc = []byte{
 	0x0a, 0x1c, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x65, 0x71, 0x75, 0x69,
-	0x70, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa7,
+	0x70, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x89,
 	0x01, 0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x74, 0x74, 0x72,
 	0x69, 0x62, 0x75, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x6c, 0x69,
@@ -249,32 +241,30 @@ var file_equipment_equipment_db_proto_rawDesc = []byte{
 	0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x41, 0x74, 0x74, 0x72,
 	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x4c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
 	0x52, 0x02, 0x4c, 0x76, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x42, 0x61,
-	0x73, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x42,
-	0x61, 0x73, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xe0, 0x02, 0x0a, 0x0c, 0x44, 0x42, 0x5f,
-	0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x49, 0x64,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75,
-	0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x49, 0x64, 0x12, 0x16, 0x0a,
-	0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68,
-	0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x20, 0x0a, 0x0b, 0x6b, 0x65, 0x65, 0x70, 0x46, 0x61, 0x69,
-	0x6c, 0x4e, 0x75, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x6b, 0x65, 0x65, 0x70,
-	0x46, 0x61, 0x69, 0x6c, 0x4e, 0x75, 0x6d, 0x12, 0x36, 0x0a, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x45, 0x71, 0x75,
-	0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
-	0x3a, 0x0a, 0x0b, 0x61, 0x64, 0x76, 0x65, 0x72, 0x62, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x08,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74,
-	0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b,
-	0x61, 0x64, 0x76, 0x65, 0x72, 0x62, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x6f,
-	0x76, 0x65, 0x72, 0x6c, 0x61, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0d, 0x52,
-	0x0a, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x61, 0x79, 0x4e, 0x75, 0x6d, 0x12, 0x26, 0x0a, 0x0e, 0x69,
-	0x73, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0a, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x0e, 0x69, 0x73, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x53, 0x74,
-	0x61, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x0b, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x6c, 0x6f, 0x63, 0x6b, 0x42, 0x06, 0x5a, 0x04, 0x2e,
-	0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x01, 0x28, 0x05, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xe0, 0x02, 0x0a, 0x0c, 0x44,
+	0x42, 0x5f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63,
+	0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x49, 0x64, 0x12, 0x10, 0x0a,
+	0x03, 0x75, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x49, 0x64, 0x12,
+	0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x20, 0x0a, 0x0b, 0x6b, 0x65, 0x65, 0x70, 0x46,
+	0x61, 0x69, 0x6c, 0x4e, 0x75, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x6b, 0x65,
+	0x65, 0x70, 0x46, 0x61, 0x69, 0x6c, 0x4e, 0x75, 0x6d, 0x12, 0x36, 0x0a, 0x09, 0x6d, 0x61, 0x69,
+	0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x45,
+	0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74,
+	0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x45, 0x6e, 0x74, 0x72,
+	0x79, 0x12, 0x3a, 0x0a, 0x0b, 0x61, 0x64, 0x76, 0x65, 0x72, 0x62, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65,
+	0x6e, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x52, 0x0b, 0x61, 0x64, 0x76, 0x65, 0x72, 0x62, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x1e, 0x0a,
+	0x0a, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x61, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x09, 0x20, 0x01, 0x28,
+	0x0d, 0x52, 0x0a, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x61, 0x79, 0x4e, 0x75, 0x6d, 0x12, 0x26, 0x0a,
+	0x0e, 0x69, 0x73, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18,
+	0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x69, 0x73, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c,
+	0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x6c, 0x6f, 0x63, 0x6b, 0x18,
+	0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x6c, 0x6f, 0x63, 0x6b, 0x42, 0x06, 0x5a,
+	0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

From 05fff27c2fa03a8b7fba14d2e0e70ff689121fc6 Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Wed, 14 Sep 2022 19:12:35 +0800
Subject: [PATCH 03/10] tool

---
 cmd/v2/ui/app_monitor.go  |  2 +-
 cmd/v2/ui/app_testcase.go |  2 +-
 cmd/v2/ui/mainwindow.go   |  6 ++---
 cmd/v2/ui/protocol.go     | 57 ++++++++++++++++++++++++++++-----------
 cmd/v2/ui/toy_datetime.go |  5 ++--
 cmd/v2/ui/toy_userinfo.go |  5 ++--
 6 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/cmd/v2/ui/app_monitor.go b/cmd/v2/ui/app_monitor.go
index 5a3d3a5b8..151d05c6d 100644
--- a/cmd/v2/ui/app_monitor.go
+++ b/cmd/v2/ui/app_monitor.go
@@ -30,7 +30,7 @@ type appMonitor struct {
 
 func (this *appMonitor) LazyInit(obs observer.Observer) error {
 	this.obs = obs
-	this.tabItem = container.NewTabItemWithIcon(common.TOOLBAR_MONITOR, theme.ComputerIcon(), nil)
+	this.tabItem = container.NewTabItemWithIcon(common.TOOLBAR_MONITOR, theme.MediaVideoIcon(), nil)
 
 	content := container.NewMax()
 	content.Objects = []fyne.CanvasObject{}
diff --git a/cmd/v2/ui/app_testcase.go b/cmd/v2/ui/app_testcase.go
index d8ea092e9..185e74331 100644
--- a/cmd/v2/ui/app_testcase.go
+++ b/cmd/v2/ui/app_testcase.go
@@ -29,7 +29,7 @@ func (a *appTester) disEnabled(t *model.TestCase) bool {
 }
 
 func (a *appTester) LazyInit(obs observer.Observer) error {
-	a.tabItem = container.NewTabItemWithIcon(common.TOOLBAR_TESTER, theme.AccountIcon(), nil)
+	a.tabItem = container.NewTabItemWithIcon(common.TOOLBAR_TESTER, theme.DocumentIcon(), nil)
 
 	content := container.NewMax()
 	title := widget.NewLabel(common.APP_TESTCASE_TITLE)
diff --git a/cmd/v2/ui/mainwindow.go b/cmd/v2/ui/mainwindow.go
index e94db2be9..64e86e593 100644
--- a/cmd/v2/ui/mainwindow.go
+++ b/cmd/v2/ui/mainwindow.go
@@ -85,14 +85,14 @@ func (ui *MainWindowImpl) createWindowContainer() {
 
 	// tool bar
 	toolbar := widget.NewToolbar(
-		widget.NewToolbarAction(theme.ComputerIcon(), func() {
+		widget.NewToolbarAction(theme.MediaVideoIcon(), func() {
 			openApp2(common.TOOLBAR_MONITOR)
 		}),
-		widget.NewToolbarAction(theme.AccountIcon(), func() {
+		widget.NewToolbarAction(theme.DocumentIcon(), func() {
 			openApp2(common.TOOLBAR_TESTER)
 		}),
 		widget.NewToolbarSeparator(),
-		widget.NewToolbarAction(theme.ContentClearIcon(), func() {
+		widget.NewToolbarAction(theme.FileIcon(), func() {
 			newLogViewer().Win.Show()
 		}),
 		widget.NewToolbarSpacer(),
diff --git a/cmd/v2/ui/protocol.go b/cmd/v2/ui/protocol.go
index 0b25f5f3d..4ac0a9013 100644
--- a/cmd/v2/ui/protocol.go
+++ b/cmd/v2/ui/protocol.go
@@ -58,6 +58,7 @@ var (
 		ff(comm.ModuleHero, hero.HeroSubTypeList):  &formview.HeroListView{},
 		ff(comm.ModuleHero, hero.StrengthenUplv):   &formview.HeroStrengthenUplvView{},
 		ff(comm.ModuleHero, hero.StrengthenUpStar): &formview.HeroStrengthenUpStarView{},
+		ff(comm.ModuleHero, hero.DrawCard):         &formview.HeroZhaomuView{},
 		//equip
 		ff(comm.ModuleEquipment, "getlist"): &formview.EquipListView{},
 		ff(comm.ModuleEquipment, "equip"):   &formview.EquipUpDownView{},
@@ -70,8 +71,8 @@ var (
 		ff(comm.ModuleFriend, friend.FriendSubTypeAddBlack):  &formview.FriendAddBlackView{},
 		ff(comm.ModuleFriend, friend.FriendSubTypeDelBlack):  &formview.FriendDelblackView{},
 		ff(comm.ModuleFriend, friend.FriendSubTypeSearch):    &formview.FriendSearchView{},
-		ff(comm.ModuleFriend, friend.FriendSubTypeZanList):   &formview.FriendZanView{},
-		ff(comm.ModuleFriend, friend.FriendSubTypeRandList):  &formview.FriendRandListView{},
+		// ff(comm.ModuleFriend, friend.FriendSubTypeZanList):   &formview.FriendZanView{},
+		ff(comm.ModuleFriend, friend.FriendSubTypeRandList): &formview.FriendRandListView{},
 		// shop
 		ff(comm.ModuleShop, "getlist"): &formview.ShopListView{},
 		ff(comm.ModuleShop, "buy"):     &formview.ShopBuyView{},
@@ -82,11 +83,13 @@ var (
 		// pagoda
 		ff(comm.ModulePagoda, "getlist"): &formview.PagodaListView{},
 		// rtask
-		ff(comm.ModuleRtask, rtask.RtaskSubTypeList):   &formview.RtaskListView{},
-		ff(comm.ModuleRtask, rtask.RtaskSubTypeApply):  &formview.RtaskDoitView{},
-		ff(comm.ModuleRtask, rtask.RtaskSubTypeChoose): &formview.RtaskChooseView{},
-		ff(comm.ModuleRtask, rtask.RtaskSubTypeReward): &formview.RtaskRewardView{},
-		ff(comm.ModuleRtask, "rtest"):                  &formview.RtaskTestView{},
+		ff(comm.ModuleRtask, rtask.RtaskSubTypeList):         &formview.RtaskListView{},
+		ff(comm.ModuleRtask, rtask.RtaskSubTypeApply):        &formview.RtaskDoitView{},
+		ff(comm.ModuleRtask, rtask.RtaskSubTypeChoose):       &formview.RtaskChooseView{},
+		ff(comm.ModuleRtask, rtask.RtaskSubTypeReward):       &formview.RtaskRewardView{},
+		ff(comm.ModuleRtask, "rtest"):                        &formview.RtaskTestView{},
+		ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleStart):  &formview.RtaskBattlestartView{},
+		ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleFinish): &formview.RtaskBattleFinishView{},
 		// linestory
 		ff(comm.ModuleLinestory, linestory.LinestorySubTypeDostart): &formview.LinestoryStartView{},
 		ff(comm.ModuleLinestory, linestory.LinestorySubTypeDotask):  &formview.LinestoryTaskView{},
@@ -136,6 +139,7 @@ var (
 			ff(comm.ModuleHero, hero.HeroSubTypeList),
 			ff(comm.ModuleHero, hero.StrengthenUplv),
 			ff(comm.ModuleHero, hero.StrengthenUpStar),
+			ff(comm.ModuleHero, hero.DrawCard),
 		},
 		"equipment": {
 			ff(comm.ModuleEquipment, "getlist"),
@@ -155,7 +159,7 @@ var (
 			ff(comm.ModuleFriend, friend.FriendSubTypeAddBlack),
 			ff(comm.ModuleFriend, friend.FriendSubTypeDelBlack),
 			ff(comm.ModuleFriend, friend.FriendSubTypeSearch),
-			ff(comm.ModuleFriend, friend.FriendSubTypeZanList),
+			// ff(comm.ModuleFriend, friend.FriendSubTypeZanList),
 			ff(comm.ModuleFriend, friend.FriendSubTypeRandList),
 		},
 		"shop": {
@@ -176,6 +180,8 @@ var (
 			ff(comm.ModuleRtask, rtask.RtaskSubTypeChoose),
 			ff(comm.ModuleRtask, rtask.RtaskSubTypeReward),
 			ff(comm.ModuleRtask, "rtest"),
+			ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleStart),
+			ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleFinish),
 		},
 		"linestory": {
 			ff(comm.ModuleLinestory, linestory.LinestorySubTypeDostart),
@@ -410,6 +416,13 @@ var (
 			Rsp:      &pb.HeroStrengthenUpStarResp{},
 			Enabled:  true,
 		},
+		ff(comm.ModuleHero, hero.DrawCard): {
+			NavLabel: "招募",
+			Desc:     "抽卡招募",
+			MainType: string(comm.ModuleHero),
+			SubType:  hero.DrawCard,
+			Enabled:  true,
+		},
 		//equipment
 		string(comm.ModuleEquipment): {
 			NavLabel: "装备",
@@ -513,13 +526,13 @@ var (
 			Rsp:      &pb.FriendSearchResp{},
 			Enabled:  true,
 		},
-		ff(comm.ModuleFriend, friend.FriendSubTypeZanList): {
-			NavLabel: "好友点赞",
-			Desc:     "点赞好友",
-			MainType: string(comm.ModuleFriend),
-			SubType:  friend.FriendSubTypeZanList,
-			Enabled:  true,
-		},
+		// ff(comm.ModuleFriend, friend.FriendSubTypeZanList): {
+		// 	NavLabel: "好友点赞",
+		// 	Desc:     "点赞好友",
+		// 	MainType: string(comm.ModuleFriend),
+		// 	SubType:  friend.FriendSubTypeZanList,
+		// 	Enabled:  true,
+		// },
 		//shop
 		string(comm.ModuleShop): {
 			NavLabel: "商店",
@@ -613,6 +626,20 @@ var (
 			SubType:  rtask.RtaskSubTypeReward,
 			Enabled:  true,
 		},
+		ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleStart): {
+			NavLabel: "战斗开始",
+			Desc:     "战斗开始",
+			MainType: string(comm.ModuleRtask),
+			SubType:  rtask.RtaskSubTypeBattleStart,
+			Enabled:  true,
+		},
+		ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleFinish): {
+			NavLabel: "战斗结束",
+			Desc:     "战斗结束",
+			MainType: string(comm.ModuleRtask),
+			SubType:  rtask.RtaskSubTypeBattleFinish,
+			Enabled:  true,
+		},
 		ff(comm.ModuleRtask, "rtest"): {
 			NavLabel: "测试",
 			Desc:     "测试任务触发",
diff --git a/cmd/v2/ui/toy_datetime.go b/cmd/v2/ui/toy_datetime.go
index e3e6ee615..bf02a25ce 100644
--- a/cmd/v2/ui/toy_datetime.go
+++ b/cmd/v2/ui/toy_datetime.go
@@ -1,7 +1,6 @@
 package ui
 
 import (
-	"go_dreamfactory/cmd/v2/lib/common"
 	"go_dreamfactory/cmd/v2/service/observer"
 	"time"
 
@@ -30,14 +29,14 @@ func (tdt *toyDateTime) Init(obs observer.Observer) error {
 	tdt.time = canvas.NewText("", nil)
 	tdt.time.TextSize = 42
 
-	tdt.widget = widget.NewCard("", common.DATETIME,
+	tdt.widget = widget.NewCard("", "",
 		container.NewVBox(
 			container.NewHBox(layout.NewSpacer(), tdt.date, tdt.week, layout.NewSpacer()),
 			container.NewCenter(tdt.time),
 		),
 	)
 
-	tdt.widget.Resize(fyne.NewSize(ToyWidth, 130))
+	tdt.widget.Resize(fyne.NewSize(ToyWidth, 100))
 
 	// for init
 	tdt.Run()
diff --git a/cmd/v2/ui/toy_userinfo.go b/cmd/v2/ui/toy_userinfo.go
index be5d414e7..72da76767 100644
--- a/cmd/v2/ui/toy_userinfo.go
+++ b/cmd/v2/ui/toy_userinfo.go
@@ -15,6 +15,7 @@ import (
 	"fyne.io/fyne/v2/container"
 	"fyne.io/fyne/v2/data/binding"
 	"fyne.io/fyne/v2/layout"
+	"fyne.io/fyne/v2/theme"
 	"fyne.io/fyne/v2/widget"
 	"github.com/atotto/clipboard"
 	"github.com/sirupsen/logrus"
@@ -41,7 +42,7 @@ func (this *toyUserInfo) Init(obs observer.Observer) error {
 	this.data = binding.BindStringList(&[]string{})
 
 	// 复制UID button
-	this.copyBtn = widget.NewButton(common.USERINFO_BTN_COPY, func() {
+	this.copyBtn = widget.NewButtonWithIcon("", theme.ContentCopyIcon(), func() {
 		if this.userInfo != nil && this.userInfo.DbUser != nil {
 			_ = clipboard.WriteAll(this.userInfo.DbUser.Uid)
 		}
@@ -49,7 +50,7 @@ func (this *toyUserInfo) Init(obs observer.Observer) error {
 	this.copyBtn.Disable()
 
 	// 刷新
-	this.refreshBtn = widget.NewButton(common.USERINFO_BTN_REFRESH, func() {
+	this.refreshBtn = widget.NewButtonWithIcon("", theme.ViewRefreshIcon(), func() {
 		if err := service.GetPttService().SendToClient(
 			string(comm.ModuleUser),
 			user.UserSubTypeInfo,

From 6c8c6fba73d076da4fb9a48f94b8c869aaa950c8 Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Wed, 14 Sep 2022 19:14:24 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=9A=8F=E6=9C=BA?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=88=98=E6=96=97=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/v2/ui/views/hero_zhaomu.go        | 44 ++++++++++++++
 cmd/v2/ui/views/rtask_battlefinish.go | 33 +++++++++++
 cmd/v2/ui/views/rtask_battlestart.go  | 43 ++++++++++++++
 comm/const.go                         |  1 +
 modules/hero/api_drawCard.go          |  8 +--
 modules/rtask/api.go                  | 10 ++--
 modules/rtask/api_battlefinish.go     | 85 +++++++++++++++++++++++++++
 modules/rtask/api_battlestart.go      | 71 ++++++++++++++++++++++
 modules/rtask/api_choose.go           | 32 ++++++----
 modules/rtask/api_dotask.go           |  3 +
 modules/rtask/api_finish.go           | 24 --------
 modules/rtask/api_reward.go           |  7 +--
 modules/rtask/condiFindHandle.go      |  1 -
 modules/rtask/module.go               | 18 ++++--
 modules/rtask/updateHandle.go         | 44 ++++++++------
 modules/user/model_session.go         | 17 ++++++
 sys/db/core.go                        |  3 +
 17 files changed, 369 insertions(+), 75 deletions(-)
 create mode 100644 cmd/v2/ui/views/hero_zhaomu.go
 create mode 100644 cmd/v2/ui/views/rtask_battlefinish.go
 create mode 100644 cmd/v2/ui/views/rtask_battlestart.go
 create mode 100644 modules/rtask/api_battlefinish.go
 create mode 100644 modules/rtask/api_battlestart.go
 delete mode 100644 modules/rtask/api_finish.go

diff --git a/cmd/v2/ui/views/hero_zhaomu.go b/cmd/v2/ui/views/hero_zhaomu.go
new file mode 100644
index 000000000..cb48b2e41
--- /dev/null
+++ b/cmd/v2/ui/views/hero_zhaomu.go
@@ -0,0 +1,44 @@
+package formview
+
+import (
+	"go_dreamfactory/cmd/v2/model"
+	"go_dreamfactory/cmd/v2/service"
+	"go_dreamfactory/pb"
+
+	"fyne.io/fyne/v2"
+	"fyne.io/fyne/v2/widget"
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/cast"
+)
+
+type HeroZhaomuView struct {
+	BaseformView
+}
+
+func (this *HeroZhaomuView) CreateView(t *model.TestCase) fyne.CanvasObject {
+
+	var ckType, ckCount string
+	// 抽卡类型  0 1 2 3 4
+	ckTypeSelect := widget.NewSelect([]string{"0", "1", "2", "3", "4"}, func(s string) {
+		ckType = s
+	})
+
+	//数量
+	ckCountSelect := widget.NewSelect([]string{"1", "10"}, func(s string) {
+		ckCount = s
+	})
+
+	this.form.AppendItem(widget.NewFormItem("抽卡类型", ckTypeSelect))
+	this.form.AppendItem(widget.NewFormItem("数量", ckCountSelect))
+
+	this.form.OnSubmit = func() {
+		if err := service.GetPttService().SendToClient(t.MainType, t.SubType,
+			&pb.HeroDrawCardReq{
+				DrawType:  cast.ToInt32(ckType),
+				DrawCount: cast.ToInt32(ckCount),
+			}); err != nil {
+			logrus.Error(err)
+		}
+	}
+	return this.form
+}
diff --git a/cmd/v2/ui/views/rtask_battlefinish.go b/cmd/v2/ui/views/rtask_battlefinish.go
new file mode 100644
index 000000000..581af854f
--- /dev/null
+++ b/cmd/v2/ui/views/rtask_battlefinish.go
@@ -0,0 +1,33 @@
+package formview
+
+import (
+	"go_dreamfactory/cmd/v2/model"
+	"go_dreamfactory/cmd/v2/service"
+	"go_dreamfactory/pb"
+
+	"fyne.io/fyne/v2"
+	"fyne.io/fyne/v2/widget"
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/cast"
+)
+
+type RtaskBattleFinishView struct {
+	BaseformView
+}
+
+func (this *RtaskBattleFinishView) CreateView(t *model.TestCase) fyne.CanvasObject {
+	taskId := widget.NewEntry()
+
+	this.form.AppendItem(widget.NewFormItem("任务ID", taskId))
+
+	this.form.OnSubmit = func() {
+		if err := service.GetPttService().SendToClient(t.MainType, t.SubType,
+			&pb.RtaskBattleFinishReq{
+				RtaskId: cast.ToInt32(taskId.Text),
+			}); err != nil {
+			logrus.Error(err)
+		}
+	}
+
+	return this.form
+}
diff --git a/cmd/v2/ui/views/rtask_battlestart.go b/cmd/v2/ui/views/rtask_battlestart.go
new file mode 100644
index 000000000..09715e014
--- /dev/null
+++ b/cmd/v2/ui/views/rtask_battlestart.go
@@ -0,0 +1,43 @@
+package formview
+
+import (
+	"go_dreamfactory/cmd/v2/model"
+	"go_dreamfactory/cmd/v2/service"
+	"go_dreamfactory/pb"
+	"strings"
+
+	"fyne.io/fyne/v2"
+	"fyne.io/fyne/v2/widget"
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/cast"
+)
+
+type RtaskBattlestartView struct {
+	BaseformView
+}
+
+func (this *RtaskBattlestartView) CreateView(t *model.TestCase) fyne.CanvasObject {
+	confId := widget.NewEntry()
+
+	leadpos := widget.NewEntry()
+
+	teamIds := widget.NewEntry()
+	teamIds.PlaceHolder = ",号分隔"
+
+	this.form.AppendItem(widget.NewFormItem("关卡ID", confId))
+	this.form.AppendItem(widget.NewFormItem("队长位置", leadpos))
+	this.form.AppendItem(widget.NewFormItem("阵容信息", teamIds))
+
+	this.form.OnSubmit = func() {
+		if err := service.GetPttService().SendToClient(t.MainType, t.SubType,
+
+			&pb.RtaskBattleStartReq{
+				BattleConfId: cast.ToInt32(confId.Text),
+				Leadpos:      cast.ToInt32(leadpos.Text),
+				Teamids:      strings.Split(teamIds.Text, ","),
+			}); err != nil {
+			logrus.Error(err)
+		}
+	}
+	return this.form
+}
diff --git a/comm/const.go b/comm/const.go
index 51febc56e..4c7b8a7cc 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -290,6 +290,7 @@ const (
 	Rtype67 TaskType = 67 //商店购物消耗xx货币xx个
 	Rtype68 TaskType = 68 //任意渠道消耗xx金币
 	Rtype69 TaskType = 69 //与其他玩家切磋xx次
+	Rtype70 TaskType = 70 //通关随机任务XX关卡
 )
 
 const (
diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go
index ded38923d..cb990abc9 100644
--- a/modules/hero/api_drawCard.go
+++ b/modules/hero/api_drawCard.go
@@ -202,11 +202,11 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
 				this.module.ModuleRtask.SendToRtask(session, comm.Rtype17, k, v)
 			}
 		}
-		this.module.ModuleRtask.SendToRtask(session, comm.Rtype14, drawCount)
-		this.module.ModuleRtask.SendToRtask(session, comm.Rtype18, drawCount)
+		this.module.ModuleRtask.SendToRtask(session, comm.Rtype14, req.DrawCount)
+		this.module.ModuleRtask.SendToRtask(session, comm.Rtype18, req.DrawCount)
 	} else { // 阵营招募
-		this.module.ModuleRtask.SendToRtask(session, comm.Rtype15, drawCount)
-		this.module.ModuleRtask.SendToRtask(session, comm.Rtype19, drawCount)
+		this.module.ModuleRtask.SendToRtask(session, comm.Rtype15, req.DrawCount)
+		this.module.ModuleRtask.SendToRtask(session, comm.Rtype19, req.DrawCount)
 	}
 	for _, star := range szStar {
 		this.module.ModuleRtask.SendToRtask(session, comm.Rtype16, star, 1)
diff --git a/modules/rtask/api.go b/modules/rtask/api.go
index a6f3f8741..ffac66557 100644
--- a/modules/rtask/api.go
+++ b/modules/rtask/api.go
@@ -6,10 +6,12 @@ import (
 )
 
 const (
-	RtaskSubTypeChoose = "choose"    //选择
-	RtaskSubTypeList   = "list"      //随机任务列表
-	RtaskSubTypeApply  = "apply"     //做任务
-	RtaskSubTypeReward = "getreward" //奖励
+	RtaskSubTypeChoose       = "choose"       //选择
+	RtaskSubTypeList         = "list"         //随机任务列表
+	RtaskSubTypeApply        = "apply"        //做任务
+	RtaskSubTypeReward       = "getreward"    //奖励
+	RtaskSubTypeBattleStart  = "battlestart"  //战斗开始
+	RtaskSubTypeBattleFinish = "battlefinish" //战斗完成
 )
 
 type apiComp struct {
diff --git a/modules/rtask/api_battlefinish.go b/modules/rtask/api_battlefinish.go
new file mode 100644
index 000000000..86c7d476f
--- /dev/null
+++ b/modules/rtask/api_battlefinish.go
@@ -0,0 +1,85 @@
+package rtask
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/sys/log"
+	"go_dreamfactory/pb"
+
+	"google.golang.org/protobuf/proto"
+)
+
+func (this *apiComp) BattleFinishCheck(session comm.IUserSession, req *pb.RtaskBattleFinishReq) (code pb.ErrorCode) {
+	if req.RtaskId == 0 {
+		code = pb.ErrorCode_ReqParameterError
+	}
+	return
+}
+
+func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.RtaskBattleFinishReq) (code pb.ErrorCode, data proto.Message) {
+	if code = this.BattleFinishCheck(session, req); code != pb.ErrorCode_Success {
+		return
+	}
+
+	//校验战斗结果
+	iBattle, err := this.moduleRtask.modelRtask.service.GetModule(comm.ModuleBattle)
+	if err != nil {
+		code = pb.ErrorCode_SystemError
+		return
+	}
+
+	var isWin bool
+	if b, y := iBattle.(comm.IBattle); y {
+		if code, isWin = b.CheckBattleReport(session, req.Report); code != pb.ErrorCode_Success {
+			return
+		}
+
+		if isWin {
+			// 获取玩家的任务
+			rtask := &pb.DBRtask{}
+			if err := this.moduleRtask.modelRtask.Get(session.GetUserId(), rtask); err != nil {
+				return
+			}
+
+			// 获取当前任务配置
+			conf := this.moduleRtask.configure.getRtaskById(req.RtaskId)
+			if conf == nil {
+				code = pb.ErrorCode_ConfigNoFound
+				log.Errorf("rdtask %v no found", req.RtaskId)
+				return
+			}
+
+			var (
+				frtaskArr *pb.FrtaskIds //完成的任务
+				ok        bool
+			)
+
+			if frtaskArr, ok = rtask.FrtaskIds[conf.Group]; !ok {
+				frtaskArr = &pb.FrtaskIds{}
+			}
+
+			// 更新完成的任务
+			frtaskArr.RtaskIds = append(frtaskArr.RtaskIds, req.RtaskId)
+			if rtask.FrtaskIds == nil {
+				rtask.FrtaskIds = make(map[int32]*pb.FrtaskIds)
+			}
+			rtask.FrtaskIds[conf.Group] = frtaskArr
+			update := map[string]interface{}{
+				"frtaskIds": rtask.FrtaskIds,
+			}
+			if err := this.moduleRtask.modelRtask.Change(session.GetUserId(), update); err != nil {
+				code = pb.ErrorCode_SystemError
+				return
+			}
+		}
+	}
+
+	if err := session.SendMsg(string(this.moduleRtask.GetType()), RtaskSubTypeBattleFinish,
+		&pb.RtaskBattleFinishResp{
+			RtaskId: req.RtaskId,
+			IsWin:   isWin,
+		}); err != nil {
+		code = pb.ErrorCode_SystemError
+	}
+
+	return
+}
diff --git a/modules/rtask/api_battlestart.go b/modules/rtask/api_battlestart.go
new file mode 100644
index 000000000..d629e0e71
--- /dev/null
+++ b/modules/rtask/api_battlestart.go
@@ -0,0 +1,71 @@
+package rtask
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/sys/log"
+	"go_dreamfactory/pb"
+
+	"google.golang.org/protobuf/proto"
+)
+
+func (this *apiComp) BattleStartCheck(session comm.IUserSession, req *pb.RtaskBattleStartReq) (code pb.ErrorCode) {
+	if req.BattleConfId == 0 {
+		code = pb.ErrorCode_ReqParameterError
+	}
+	return
+}
+
+func (this *apiComp) BattleStart(session comm.IUserSession, req *pb.RtaskBattleStartReq) (code pb.ErrorCode, data proto.Message) {
+	if code = this.BattleStartCheck(session, req); code != pb.ErrorCode_Success {
+		return
+	}
+
+	battleConf := this.moduleRtask.configure.getRtaskBattleById(req.BattleConfId)
+	if battleConf == nil {
+		code = pb.ErrorCode_ConfigNoFound
+		log.Errorf("rdtask_battle %v no found", req.BattleConfId)
+		return
+	}
+
+	iBattle, err := this.moduleRtask.modelRtask.service.GetModule(comm.ModuleBattle)
+	if err != nil {
+		code = pb.ErrorCode_SystemError
+		return
+	}
+
+	if b, y := iBattle.(comm.IBattle); y {
+		var (
+			record *pb.DBBattleRecord
+			resp   *pb.RtaskBattleStartResp
+		)
+		code, record = b.CreatePveBattle(session, &pb.BattlePVEReq{
+			Ptype:   pb.PlayType_mainline,
+			Leadpos: req.Leadpos,
+			Teamids: req.Teamids,
+			Mformat: battleConf.FormatList,
+		})
+
+		if code != pb.ErrorCode_Success {
+			return
+		}
+
+		if record != nil {
+			resp = &pb.RtaskBattleStartResp{
+				Info: &pb.BattleInfo{
+					Id:         record.Id,
+					Btype:      record.Btype,
+					Ptype:      record.Ptype,
+					RedCompId:  record.RedCompId,
+					Redflist:   record.Redflist,
+					BlueCompId: record.BlueCompId,
+					Buleflist:  record.Buleflist,
+				},
+			}
+		}
+
+		if err := session.SendMsg(string(this.moduleRtask.GetType()), RtaskSubTypeBattleStart, resp); err != nil {
+			code = pb.ErrorCode_SystemError
+		}
+	}
+	return
+}
diff --git a/modules/rtask/api_choose.go b/modules/rtask/api_choose.go
index 33807d0fc..5b34f06d0 100644
--- a/modules/rtask/api_choose.go
+++ b/modules/rtask/api_choose.go
@@ -2,6 +2,7 @@ package rtask
 
 import (
 	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/utils"
 
@@ -20,6 +21,7 @@ func (this *apiComp) Choose(session comm.IUserSession, req *pb.RtaskChooseReq) (
 		return
 	}
 
+	// 获取玩家的任务
 	rtask := &pb.DBRtask{}
 	if err := this.moduleRtask.modelRtask.Get(session.GetUserId(), rtask); err != nil {
 		return
@@ -29,6 +31,7 @@ func (this *apiComp) Choose(session comm.IUserSession, req *pb.RtaskChooseReq) (
 	conf := this.moduleRtask.configure.getRtaskById(req.RtaskId)
 	if conf == nil {
 		code = pb.ErrorCode_ConfigNoFound
+		log.Errorf("rdtask %v no found", req.RtaskId)
 		return
 	}
 
@@ -36,6 +39,7 @@ func (this *apiComp) Choose(session comm.IUserSession, req *pb.RtaskChooseReq) (
 	sideConf := this.moduleRtask.configure.getRtaskSidById(req.RtaskSubId)
 	if sideConf == nil {
 		code = pb.ErrorCode_ConfigNoFound
+		log.Errorf("rdtask_side %v no found", req.RtaskSubId)
 		return
 	}
 
@@ -43,6 +47,7 @@ func (this *apiComp) Choose(session comm.IUserSession, req *pb.RtaskChooseReq) (
 	chooseCnf := this.moduleRtask.configure.getRtaskChooseCfg(req.ChooseId)
 	if chooseCnf == nil {
 		code = pb.ErrorCode_ConfigNoFound
+		log.Errorf("rdtask_choose %v no found", req.ChooseId)
 		return
 	}
 
@@ -54,7 +59,7 @@ func (this *apiComp) Choose(session comm.IUserSession, req *pb.RtaskChooseReq) (
 	}
 
 	var (
-		frtaskArr *pb.FrtaskIds
+		frtaskArr *pb.FrtaskIds //完成的任务
 		ok        bool
 	)
 
@@ -68,17 +73,20 @@ func (this *apiComp) Choose(session comm.IUserSession, req *pb.RtaskChooseReq) (
 		return
 	}
 
-	// 更新完成的任务
-	frtaskArr.RtaskIds = append(frtaskArr.RtaskIds, req.RtaskId)
-	if rtask.FrtaskIds == nil {
-		rtask.FrtaskIds = make(map[int32]*pb.FrtaskIds)
-	}
-	rtask.FrtaskIds[conf.Group] = frtaskArr
-	update := map[string]interface{}{
-		"frtaskIds": rtask.FrtaskIds,
-	}
-	if err := this.moduleRtask.modelRtask.Change(session.GetUserId(), update); err != nil {
-		code = pb.ErrorCode_SystemError
+	if chooseCnf.GotoLevel == "" {
+		// 更新完成的任务
+		frtaskArr.RtaskIds = append(frtaskArr.RtaskIds, req.RtaskId)
+		if rtask.FrtaskIds == nil {
+			rtask.FrtaskIds = make(map[int32]*pb.FrtaskIds)
+		}
+		rtask.FrtaskIds[conf.Group] = frtaskArr
+		update := map[string]interface{}{
+			"frtaskIds": rtask.FrtaskIds,
+		}
+		if err := this.moduleRtask.modelRtask.Change(session.GetUserId(), update); err != nil {
+			code = pb.ErrorCode_SystemError
+			return
+		}
 	}
 
 	rsp := &pb.RtaskChooseResp{
diff --git a/modules/rtask/api_dotask.go b/modules/rtask/api_dotask.go
index fcc91fb9d..e4de46720 100644
--- a/modules/rtask/api_dotask.go
+++ b/modules/rtask/api_dotask.go
@@ -2,6 +2,7 @@ package rtask
 
 import (
 	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/utils"
 
@@ -30,6 +31,7 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.RtaskApplyReq) (co
 	conf := this.moduleRtask.configure.getRtaskById(req.RtaskId)
 	if conf == nil {
 		code = pb.ErrorCode_ConfigNoFound
+		log.Errorf("rdtask %v no found", req.RtaskId)
 		return
 	}
 
@@ -60,6 +62,7 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.RtaskApplyReq) (co
 		sideConf := this.moduleRtask.configure.getRtaskSidById(req.RtaskSubId)
 		if sideConf == nil {
 			code = pb.ErrorCode_ConfigNoFound
+			log.Errorf("rdtask_side %v no found", req.RtaskSubId)
 			return
 		}
 
diff --git a/modules/rtask/api_finish.go b/modules/rtask/api_finish.go
deleted file mode 100644
index 22291e156..000000000
--- a/modules/rtask/api_finish.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package rtask
-
-import (
-	"go_dreamfactory/comm"
-	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
-)
-
-func (this *apiComp) BattleFinishCheck(session comm.IUserSession, req *pb.RtaskBattleFinishReq) (code pb.ErrorCode) {
-	if req.Result == 0 {
-		code = pb.ErrorCode_ReqParameterError
-	}
-	return
-}
-
-func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.RtaskBattleFinishReq) (code pb.ErrorCode, data proto.Message) {
-	if code = this.BattleFinishCheck(session, req); code != pb.ErrorCode_Success {
-		return
-	}
-
-	
-	return
-}
diff --git a/modules/rtask/api_reward.go b/modules/rtask/api_reward.go
index 3de4a8311..83a2f7142 100644
--- a/modules/rtask/api_reward.go
+++ b/modules/rtask/api_reward.go
@@ -2,6 +2,7 @@ package rtask
 
 import (
 	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
 
 	"google.golang.org/protobuf/proto"
@@ -18,16 +19,12 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.RtaskGetReward
 	if code = this.GetRewardCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}
-	// conf := this.moduleRtask.configure.getRtaskById(req.RtaskId)
-	// if conf == nil {
-	// 	code = pb.ErrorCode_ConfigNoFound
-	// 	return
-	// }
 
 	// 获取支线任务配置
 	sideConf := this.moduleRtask.configure.getRtaskSidById(req.RtaskSubId)
 	if sideConf == nil {
 		code = pb.ErrorCode_ConfigNoFound
+		log.Errorf("rdtask_side %v no found", req.RtaskSubId)
 		return
 	}
 
diff --git a/modules/rtask/condiFindHandle.go b/modules/rtask/condiFindHandle.go
index 8238b26f8..1d7c290fa 100644
--- a/modules/rtask/condiFindHandle.go
+++ b/modules/rtask/condiFindHandle.go
@@ -124,5 +124,4 @@ func (this *ModelRtaskRecord) lessThanParams(cfg *cfg.GameRdtaskCondiData, vals
 
 	condiId = cfg.Id
 	return
-	return
 }
diff --git a/modules/rtask/module.go b/modules/rtask/module.go
index 7bb101b25..a47cae783 100644
--- a/modules/rtask/module.go
+++ b/modules/rtask/module.go
@@ -149,16 +149,16 @@ func (this *ModuleRtask) initRtaskVerifyHandle() {
 				case comm.Rtype14:
 					this.registerVerifyHandle(v.Id, &rtaskCondi{
 						cfg:    typeCfg,
-						find:   this.modelRtaskRecord.equalParams,
+						find:   this.modelRtaskRecord.lessThanParams,
 						verify: this.modelRtaskRecord.verifyFromDb,
-						update: this.modelRtaskRecord.overrideUpdate,
+						update: this.modelRtaskRecord.addUpdate,
 					})
 				case comm.Rtype15:
 					this.registerVerifyHandle(v.Id, &rtaskCondi{
 						cfg:    typeCfg,
-						find:   this.modelRtaskRecord.equalParams,
+						find:   this.modelRtaskRecord.lessThanParams,
 						verify: this.modelRtaskRecord.verifyFromDb,
-						update: this.modelRtaskRecord.overrideUpdate,
+						update: this.modelRtaskRecord.addUpdate,
 					})
 				case comm.Rtype16:
 					this.registerVerifyHandle(v.Id, &rtaskCondi{
@@ -177,7 +177,7 @@ func (this *ModuleRtask) initRtaskVerifyHandle() {
 				case comm.Rtype18:
 					this.registerVerifyHandle(v.Id, &rtaskCondi{
 						cfg:    typeCfg,
-						find:   this.modelRtaskRecord.equalParams,
+						find:   this.modelRtaskRecord.lessThanParams,
 						verify: this.modelRtaskRecord.verifyFromDb,
 						update: this.modelRtaskRecord.overrideUpdate,
 					})
@@ -534,7 +534,13 @@ func (this *ModuleRtask) initRtaskVerifyHandle() {
 						verify: this.modelRtaskRecord.verifyFromDb,
 						update: this.modelRtaskRecord.overrideUpdate,
 					})
-
+				case comm.Rtype70:
+					this.registerVerifyHandle(v.Id, &rtaskCondi{
+						cfg:    typeCfg,
+						find:   this.modelRtaskRecord.equalParams,
+						verify: this.modelRtaskRecord.verifyFromDb,
+						update: this.modelRtaskRecord.overrideUpdate,
+					})
 				default:
 					log.Warnf("rtaskType[%v] not register", typeCfg.Type)
 				}
diff --git a/modules/rtask/updateHandle.go b/modules/rtask/updateHandle.go
index 88b8a0536..e1e363854 100644
--- a/modules/rtask/updateHandle.go
+++ b/modules/rtask/updateHandle.go
@@ -84,7 +84,9 @@ func (this *ModelRtaskRecord) addUpdate(uid string, cfg *cfg.GameRdtaskCondiData
 
 	if record.Vals == nil {
 		data := &pb.RtaskData{
-			Data: toMap(vals...),
+			Data:      toMap(vals...),
+			Rtype:     cfg.Type,
+			Timestamp: time.Now().Unix(),
 		}
 
 		record.Vals = map[int32]*pb.RtaskData{
@@ -94,30 +96,34 @@ func (this *ModelRtaskRecord) addUpdate(uid string, cfg *cfg.GameRdtaskCondiData
 			return errors.Wrapf(err, "添加玩家任务记录 err: %v rtype[%v]", uid, cfg.Id)
 		}
 	} else {
-		data := make(map[int32]int32)
+
 		//查找任务数据
 		if v, ok := record.Vals[cfg.Id]; ok {
+			// 只有第一个参数为累加数值
 			if paramLen == 1 {
-				data[0] += v.Data[0]
-			} else if paramLen == 2 {
-				//第一个参数为累加，后续参数为判断条件
-				if data[1] == cfg.Data2 {
-					data[1] += v.Data[1]
-				}
-			} else if paramLen == 3 {
-				if data[1] == cfg.Data2 && data[2] == cfg.Data3 {
-					data[2] += v.Data[2]
-				}
-			}
-			if len(data) > 0 {
-				update := map[string]interface{}{
-					"vals": data,
-				}
-				err = this.Change(uid, update)
+				v.Data[0] += vals[0]
+				v.Timestamp = time.Now().Unix()
 			}
 
+			update := map[string]interface{}{
+				"vals": record.Vals,
+			}
+			err = this.Change(uid, update)
+
+		} else {
+			data := map[int32]int32{
+				0: vals[0],
+			}			
+			record.Vals[cfg.Id] = &pb.RtaskData{
+				Data:      data,
+				Rtype:     cfg.Type,
+				Timestamp: time.Now().Unix(),
+			}
+			update := map[string]interface{}{
+				"vals": record.Vals,
+			}
+			err = this.Change(uid, update)
 		}
-
 	}
 	return
 }
diff --git a/modules/user/model_session.go b/modules/user/model_session.go
index 99c623c70..fc505f6e5 100644
--- a/modules/user/model_session.go
+++ b/modules/user/model_session.go
@@ -3,6 +3,7 @@ package user
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/core"
+	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/modules"
 	"go_dreamfactory/pb"
 )
@@ -17,6 +18,7 @@ func (this *ModelSession) Init(service core.IService, module core.IModule, comp
 	this.module = module.(*User)
 	this.TableName = comm.TableSession
 	this.Expired = 0 //不自动过期
+	this.clean()
 	return
 }
 
@@ -29,3 +31,18 @@ func (this *ModelSession) getUserSession(uid string) (user *pb.CacheUser) {
 	}
 	return user
 }
+
+// 启动时清理session
+func (this *ModelSession) clean() {
+	keys, err := this.Redis.Keys("session:*")
+	if err != nil {
+		log.Errorf("redis keys err:%v", err)
+		return
+	}
+
+	for _, k := range keys {
+		if err := this.Redis.Delete(k); err != nil {
+			log.Errorf("redis delete key err:%v", err)
+		}
+	}
+}
diff --git a/sys/db/core.go b/sys/db/core.go
index c15e8028a..65d3be764 100644
--- a/sys/db/core.go
+++ b/sys/db/core.go
@@ -33,8 +33,11 @@ func OnInit(config map[string]interface{}, option ...Option) (err error) {
 		return
 	}
 	defsys, err = newSys(options)
+<<<<<<< HEAD
 
 	// defsys.Local().Redis.GetClient().FlushAll(context.TODO())
+=======
+>>>>>>> 5774dd3b (更新随机任务战斗任务)
 	return
 }
 

From 2788cc321e9519e40a8f24178752317a9936c6df Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Wed, 14 Sep 2022 19:33:35 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sys/db/core.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sys/db/core.go b/sys/db/core.go
index 65d3be764..c15e8028a 100644
--- a/sys/db/core.go
+++ b/sys/db/core.go
@@ -33,11 +33,8 @@ func OnInit(config map[string]interface{}, option ...Option) (err error) {
 		return
 	}
 	defsys, err = newSys(options)
-<<<<<<< HEAD
 
 	// defsys.Local().Redis.GetClient().FlushAll(context.TODO())
-=======
->>>>>>> 5774dd3b (更新随机任务战斗任务)
 	return
 }
 

From c665e6e0ae89cca3f8dfee497f4d865acc28a089 Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Wed, 14 Sep 2022 19:36:10 +0800
Subject: [PATCH 06/10] update pb

---
 pb/equipment_db.pb.go | 60 +++++++++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/pb/equipment_db.pb.go b/pb/equipment_db.pb.go
index 6597d9fb2..e6372b01a 100644
--- a/pb/equipment_db.pb.go
+++ b/pb/equipment_db.pb.go
@@ -31,6 +31,7 @@ type EquipmentAttributeEntry struct {
 	AttrName  string `protobuf:"bytes,3,opt,name=AttrName,proto3" json:"AttrName"`    //属性名
 	Lv        int32  `protobuf:"varint,4,opt,name=Lv,proto3" json:"Lv"`               //属性等级
 	Value     int32  `protobuf:"varint,5,opt,name=Value,proto3" json:"Value"`         //属性值
+	BaseValue int32  `protobuf:"varint,6,opt,name=BaseValue,proto3" json:"BaseValue"` //基础属性
 }
 
 func (x *EquipmentAttributeEntry) Reset() {
@@ -100,6 +101,13 @@ func (x *EquipmentAttributeEntry) GetValue() int32 {
 	return 0
 }
 
+func (x *EquipmentAttributeEntry) GetBaseValue() int32 {
+	if x != nil {
+		return x.BaseValue
+	}
+	return 0
+}
+
 //武器数据
 type DB_Equipment struct {
 	state         protoimpl.MessageState
@@ -232,7 +240,7 @@ var File_equipment_equipment_db_proto protoreflect.FileDescriptor
 
 var file_equipment_equipment_db_proto_rawDesc = []byte{
 	0x0a, 0x1c, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x65, 0x71, 0x75, 0x69,
-	0x70, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x89,
+	0x70, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa7,
 	0x01, 0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x74, 0x74, 0x72,
 	0x69, 0x62, 0x75, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x6c, 0x69,
@@ -241,30 +249,32 @@ var file_equipment_equipment_db_proto_rawDesc = []byte{
 	0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x41, 0x74, 0x74, 0x72,
 	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x4c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
 	0x52, 0x02, 0x4c, 0x76, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xe0, 0x02, 0x0a, 0x0c, 0x44,
-	0x42, 0x5f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63,
-	0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x49, 0x64, 0x12, 0x10, 0x0a,
-	0x03, 0x75, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x49, 0x64, 0x12,
-	0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x20, 0x0a, 0x0b, 0x6b, 0x65, 0x65, 0x70, 0x46,
-	0x61, 0x69, 0x6c, 0x4e, 0x75, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x6b, 0x65,
-	0x65, 0x70, 0x46, 0x61, 0x69, 0x6c, 0x4e, 0x75, 0x6d, 0x12, 0x36, 0x0a, 0x09, 0x6d, 0x61, 0x69,
-	0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x45,
-	0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74,
-	0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x12, 0x3a, 0x0a, 0x0b, 0x61, 0x64, 0x76, 0x65, 0x72, 0x62, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65,
-	0x6e, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x52, 0x0b, 0x61, 0x64, 0x76, 0x65, 0x72, 0x62, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x1e, 0x0a,
-	0x0a, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x61, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x09, 0x20, 0x01, 0x28,
-	0x0d, 0x52, 0x0a, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x61, 0x79, 0x4e, 0x75, 0x6d, 0x12, 0x26, 0x0a,
-	0x0e, 0x69, 0x73, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18,
-	0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x69, 0x73, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c,
-	0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x6c, 0x6f, 0x63, 0x6b, 0x18,
-	0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x6c, 0x6f, 0x63, 0x6b, 0x42, 0x06, 0x5a,
-	0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x01, 0x28, 0x05, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x42, 0x61,
+	0x73, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x42,
+	0x61, 0x73, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xe0, 0x02, 0x0a, 0x0c, 0x44, 0x42, 0x5f,
+	0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x49, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75,
+	0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x49, 0x64, 0x12, 0x16, 0x0a,
+	0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68,
+	0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x20, 0x0a, 0x0b, 0x6b, 0x65, 0x65, 0x70, 0x46, 0x61, 0x69,
+	0x6c, 0x4e, 0x75, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x6b, 0x65, 0x65, 0x70,
+	0x46, 0x61, 0x69, 0x6c, 0x4e, 0x75, 0x6d, 0x12, 0x36, 0x0a, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x45,
+	0x6e, 0x74, 0x72, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x45, 0x71, 0x75,
+	0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x45,
+	0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
+	0x3a, 0x0a, 0x0b, 0x61, 0x64, 0x76, 0x65, 0x72, 0x62, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x08,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74,
+	0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b,
+	0x61, 0x64, 0x76, 0x65, 0x72, 0x62, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x6f,
+	0x76, 0x65, 0x72, 0x6c, 0x61, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0d, 0x52,
+	0x0a, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x61, 0x79, 0x4e, 0x75, 0x6d, 0x12, 0x26, 0x0a, 0x0e, 0x69,
+	0x73, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0a, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x0e, 0x69, 0x73, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x53, 0x74,
+	0x61, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x0b, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x6c, 0x6f, 0x63, 0x6b, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+	0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

From 690ec7a5d48322b2c6637c589fb520386e4a8c71 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 14 Sep 2022 20:18:26 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E6=8A=80=E8=83=BD=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E6=9D=83=E9=87=8D=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/hero/api_strengthenUpSkill.go | 52 +++++++++------------------
 1 file changed, 16 insertions(+), 36 deletions(-)

diff --git a/modules/hero/api_strengthenUpSkill.go b/modules/hero/api_strengthenUpSkill.go
index f786019e1..7f4761da1 100644
--- a/modules/hero/api_strengthenUpSkill.go
+++ b/modules/hero/api_strengthenUpSkill.go
@@ -1,11 +1,9 @@
 package hero
 
 import (
-	"crypto/rand"
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/utils"
-	"math/big"
 
 	"google.golang.org/protobuf/proto"
 )
@@ -23,10 +21,7 @@ func (this *apiComp) StrengthenUpSkillCheck(session comm.IUserSession, req *pb.H
 /// 英雄技能升级
 func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroStrengthenUpSkillReq) (code pb.ErrorCode, data proto.Message) {
 	var (
-		probability      map[int32]int32 // 即将升级技能的权重
-		upSkillPos       int32           // 升级的技能位置
-		totalprobability int32           // 所有技能总权重
-
+		upSkillPos  int32                 // 升级的技能位置
 		_hero       *pb.DBHero            // 操作的英雄
 		ChangeList  []*pb.DBHero          // 推送 改变的英雄
 		mapCostHero map[string]int32      // 消耗的技能卡
@@ -96,50 +91,35 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt
 		return
 	}
 
-	tmpUpSkillID := make(map[int32]bool, 0)
 	for i := 0; i < int(lvUpCount); i++ { // 升级技能
-		probability = make(map[int32]int32, 0)
-		for index, skill := range _hero.NormalSkill {
+
+		sz := make([]int32, 0)
+		for _, skill := range _hero.NormalSkill {
 			skillMaxLv := this.module.configure.GetHeroSkillMaxLvConfig(uint32(skill.SkillID))
 			if skill.SkillLv < skillMaxLv { // 找到没有满级的技能id
-				tmpUpSkillID[int32(index)] = true
+
 				skillData := this.module.configure.GetHeroSkillUpConfig(skill.SkillID)
 				if skillData == nil {
 					code = pb.ErrorCode_ConfigNoFound
 					return
 				}
-
-				probability[skill.SkillID] = skillData.Probability[skill.SkillLv] // 获取权重
+				sz = append(sz, skillData.Probability[skill.SkillLv])
 			}
 		}
-		if len(tmpUpSkillID) == 0 {
+		if len(sz) == 0 {
 			code = pb.ErrorCode_HeroMaxSkillLv
 			return
 		}
-
-		totalprobability = 0
-		// 根据权重升级对应的技能
-		for _, v := range probability {
-			totalprobability += v
-		}
-		if totalprobability == 0 {
-			code = pb.ErrorCode_HeroMaxLv // 升满了
-			return
-		}
-		n, _ := rand.Int(rand.Reader, big.NewInt(int64(totalprobability)))
-		tmp := 0
-		for k, v := range probability {
-			tmp += int(v)
-			if int32(n.Int64()) < v { // 找到了
-				upSkillPos = k
-				break
-			}
-		}
-		for index, skill := range _hero.NormalSkill {
-			if int32(index) == upSkillPos { // 找到指定位置技能并升级
-				skill.SkillLv += 1
-				break
+		upSkillPos = comm.GetRandW(sz)
+		if upSkillPos > 0 {
+			for index, skill := range _hero.NormalSkill {
+				if int32(index) == upSkillPos { // 找到指定位置技能并升级
+					skill.SkillLv += 1
+					break
+				}
 			}
+		} else {
+			this.module.Errorf("技能升级失败:uid:%s,oid:%s", session.GetUserId(), _hero.Id)
 		}
 	}
 

From fcdda133c6846caaf851b43ba7ef81c3798f68b9 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 15 Sep 2022 10:00:43 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=A1=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_heroskilllevel.json            |  120 +-
 bin/json/game_huntingboss.json               |   80 +-
 bin/json/game_item.json                      |  427 ++-
 bin/json/game_mainline.json                  |  411 +-
 bin/json/game_model.json                     |  274 +-
 bin/json/game_opencond.json                  |  252 +-
 bin/json/game_pagoda.json                    | 1500 ++++++--
 bin/json/game_rdmainline.json                | 3607 +-----------------
 bin/json/game_rdtask.json                    |   20 +-
 bin/json/game_rdtaskchoose.json              |   12 +-
 bin/json/game_rdtaskcondi.json               |   12 +-
 bin/json/game_rdtaskside.json                |  265 +-
 bin/json/game_shop.json                      |   50 +-
 bin/json/game_skillafteratk.json             |   18 +-
 bin/json/game_skillatk.json                  |   36 +-
 bin/json/game_stroy.json                     | 2654 +++++++------
 bin/json/game_taskround.json                 |  218 +-
 bin/json/game_vikingboss.json                |   60 +-
 sys/configure/structs/Game.MainlineData.go   |    2 -
 sys/configure/structs/Game.RDMainlineData.go |   53 -
 sys/configure/structs/game.itemData.go       |   23 +-
 sys/configure/structs/game.pagodaData.go     |    2 +-
 sys/configure/structs/game.shopData.go       |    4 +-
 sys/configure/structs/game.taskRoundData.go  |    2 +-
 24 files changed, 3908 insertions(+), 6194 deletions(-)

diff --git a/bin/json/game_heroskilllevel.json b/bin/json/game_heroskilllevel.json
index b684b6281..d786c0f10 100644
--- a/bin/json/game_heroskilllevel.json
+++ b/bin/json/game_heroskilllevel.json
@@ -6,9 +6,9 @@
       255,
       200,
       100,
-      0,
-      0,
-      0
+      100,
+      100,
+      100
     ]
   },
   {
@@ -18,9 +18,9 @@
       255,
       200,
       100,
-      0,
-      0,
-      0
+      100,
+      100,
+      100
     ]
   },
   {
@@ -30,9 +30,9 @@
       255,
       200,
       100,
-      0,
-      0,
-      0
+      100,
+      100,
+      100
     ]
   },
   {
@@ -42,9 +42,9 @@
       255,
       200,
       100,
-      0,
-      0,
-      0
+      100,
+      100,
+      100
     ]
   },
   {
@@ -54,9 +54,9 @@
       255,
       200,
       100,
-      0,
-      0,
-      0
+      100,
+      100,
+      100
     ]
   },
   {
@@ -66,9 +66,9 @@
       255,
       200,
       100,
-      0,
-      0,
-      0
+      100,
+      100,
+      100
     ]
   },
   {
@@ -78,9 +78,9 @@
       255,
       200,
       100,
-      0,
-      0,
-      0
+      100,
+      100,
+      100
     ]
   },
   {
@@ -90,9 +90,9 @@
       255,
       200,
       100,
-      0,
-      0,
-      0
+      100,
+      100,
+      100
     ]
   },
   {
@@ -102,9 +102,9 @@
       255,
       200,
       100,
-      0,
-      0,
-      0
+      100,
+      100,
+      100
     ]
   },
   {
@@ -114,9 +114,9 @@
       255,
       200,
       100,
-      0,
-      0,
-      0
+      100,
+      100,
+      100
     ]
   },
   {
@@ -126,9 +126,9 @@
       255,
       200,
       100,
-      0,
-      0,
-      0
+      100,
+      100,
+      100
     ]
   },
   {
@@ -138,9 +138,9 @@
       255,
       200,
       100,
-      0,
-      0,
-      0
+      100,
+      100,
+      100
     ]
   },
   {
@@ -150,9 +150,9 @@
       255,
       200,
       100,
-      0,
-      0,
-      0
+      100,
+      100,
+      100
     ]
   },
   {
@@ -162,9 +162,9 @@
       255,
       200,
       100,
-      0,
-      0,
-      0
+      100,
+      100,
+      100
     ]
   },
   {
@@ -174,9 +174,9 @@
       255,
       200,
       100,
-      0,
-      0,
-      0
+      100,
+      100,
+      100
     ]
   },
   {
@@ -186,9 +186,9 @@
       255,
       200,
       100,
-      0,
-      0,
-      0
+      100,
+      100,
+      100
     ]
   },
   {
@@ -198,9 +198,9 @@
       255,
       200,
       100,
-      0,
-      0,
-      0
+      100,
+      100,
+      100
     ]
   },
   {
@@ -210,9 +210,9 @@
       255,
       200,
       100,
-      0,
-      0,
-      0
+      100,
+      100,
+      100
     ]
   },
   {
@@ -222,9 +222,9 @@
       255,
       200,
       100,
-      0,
-      0,
-      0
+      100,
+      100,
+      100
     ]
   },
   {
@@ -234,9 +234,9 @@
       255,
       200,
       100,
-      0,
-      0,
-      0
+      100,
+      100,
+      100
     ]
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_huntingboss.json b/bin/json/game_huntingboss.json
index 49ebc1708..a4068b93c 100644
--- a/bin/json/game_huntingboss.json
+++ b/bin/json/game_huntingboss.json
@@ -27,7 +27,7 @@
       }
     ],
     "drop": 1001,
-    "bossmodel": 25001,
+    "bossmodel": 11009,
     "boss": [
       401001,
       401002,
@@ -67,7 +67,7 @@
       }
     ],
     "drop": 1002,
-    "bossmodel": 25001,
+    "bossmodel": 11009,
     "boss": [
       401004,
       401005,
@@ -112,7 +112,7 @@
       }
     ],
     "drop": 1003,
-    "bossmodel": 25001,
+    "bossmodel": 11009,
     "boss": [
       401007,
       401008,
@@ -157,7 +157,7 @@
       }
     ],
     "drop": 1004,
-    "bossmodel": 25001,
+    "bossmodel": 11009,
     "boss": [
       401010,
       401011,
@@ -202,7 +202,7 @@
       }
     ],
     "drop": 1005,
-    "bossmodel": 25001,
+    "bossmodel": 11009,
     "boss": [
       401013,
       401014,
@@ -247,7 +247,7 @@
       }
     ],
     "drop": 1006,
-    "bossmodel": 25001,
+    "bossmodel": 11009,
     "boss": [
       401016,
       401017,
@@ -292,7 +292,7 @@
       }
     ],
     "drop": 1007,
-    "bossmodel": 25001,
+    "bossmodel": 11009,
     "boss": [
       401019,
       401020,
@@ -337,7 +337,7 @@
       }
     ],
     "drop": 1008,
-    "bossmodel": 25001,
+    "bossmodel": 11009,
     "boss": [
       401022,
       401023,
@@ -382,7 +382,7 @@
       }
     ],
     "drop": 1009,
-    "bossmodel": 25001,
+    "bossmodel": 11009,
     "boss": [
       401025,
       401026,
@@ -427,7 +427,7 @@
       }
     ],
     "drop": 1010,
-    "bossmodel": 25001,
+    "bossmodel": 11009,
     "boss": [
       401028,
       401029,
@@ -462,7 +462,7 @@
       }
     ],
     "drop": 1011,
-    "bossmodel": 25004,
+    "bossmodel": 11003,
     "boss": [
       402001,
       402002,
@@ -502,7 +502,7 @@
       }
     ],
     "drop": 1012,
-    "bossmodel": 25004,
+    "bossmodel": 11003,
     "boss": [
       402004,
       402005,
@@ -547,7 +547,7 @@
       }
     ],
     "drop": 1013,
-    "bossmodel": 25004,
+    "bossmodel": 11003,
     "boss": [
       402007,
       402008,
@@ -592,7 +592,7 @@
       }
     ],
     "drop": 1014,
-    "bossmodel": 25004,
+    "bossmodel": 11003,
     "boss": [
       402010,
       402011,
@@ -637,7 +637,7 @@
       }
     ],
     "drop": 1015,
-    "bossmodel": 25004,
+    "bossmodel": 11003,
     "boss": [
       402013,
       402014,
@@ -682,7 +682,7 @@
       }
     ],
     "drop": 1016,
-    "bossmodel": 25004,
+    "bossmodel": 11003,
     "boss": [
       402016,
       402017,
@@ -727,7 +727,7 @@
       }
     ],
     "drop": 1017,
-    "bossmodel": 25004,
+    "bossmodel": 11003,
     "boss": [
       402019,
       402020,
@@ -772,7 +772,7 @@
       }
     ],
     "drop": 1018,
-    "bossmodel": 25004,
+    "bossmodel": 11003,
     "boss": [
       402022,
       402023,
@@ -817,7 +817,7 @@
       }
     ],
     "drop": 1019,
-    "bossmodel": 25004,
+    "bossmodel": 11003,
     "boss": [
       402025,
       402026,
@@ -862,7 +862,7 @@
       }
     ],
     "drop": 1020,
-    "bossmodel": 25004,
+    "bossmodel": 11003,
     "boss": [
       402028,
       402029,
@@ -897,7 +897,7 @@
       }
     ],
     "drop": 1021,
-    "bossmodel": 34006,
+    "bossmodel": 11018,
     "boss": [
       403001,
       403002,
@@ -937,7 +937,7 @@
       }
     ],
     "drop": 1022,
-    "bossmodel": 34006,
+    "bossmodel": 11018,
     "boss": [
       403004,
       403005,
@@ -982,7 +982,7 @@
       }
     ],
     "drop": 1023,
-    "bossmodel": 34006,
+    "bossmodel": 11018,
     "boss": [
       403007,
       403008,
@@ -1027,7 +1027,7 @@
       }
     ],
     "drop": 1024,
-    "bossmodel": 34006,
+    "bossmodel": 11018,
     "boss": [
       403010,
       403011,
@@ -1072,7 +1072,7 @@
       }
     ],
     "drop": 1025,
-    "bossmodel": 34006,
+    "bossmodel": 11018,
     "boss": [
       403013,
       403014,
@@ -1117,7 +1117,7 @@
       }
     ],
     "drop": 1026,
-    "bossmodel": 34006,
+    "bossmodel": 11018,
     "boss": [
       403016,
       403017,
@@ -1162,7 +1162,7 @@
       }
     ],
     "drop": 1027,
-    "bossmodel": 34006,
+    "bossmodel": 11018,
     "boss": [
       403019,
       403020,
@@ -1207,7 +1207,7 @@
       }
     ],
     "drop": 1028,
-    "bossmodel": 34006,
+    "bossmodel": 11018,
     "boss": [
       403022,
       403023,
@@ -1252,7 +1252,7 @@
       }
     ],
     "drop": 1029,
-    "bossmodel": 34006,
+    "bossmodel": 11018,
     "boss": [
       403025,
       403026,
@@ -1297,7 +1297,7 @@
       }
     ],
     "drop": 1030,
-    "bossmodel": 34006,
+    "bossmodel": 11018,
     "boss": [
       403028,
       403029,
@@ -1332,7 +1332,7 @@
       }
     ],
     "drop": 1021,
-    "bossmodel": 35001,
+    "bossmodel": 11018,
     "boss": [
       404001,
       404002,
@@ -1372,7 +1372,7 @@
       }
     ],
     "drop": 1022,
-    "bossmodel": 35001,
+    "bossmodel": 11018,
     "boss": [
       404004,
       404005,
@@ -1417,7 +1417,7 @@
       }
     ],
     "drop": 1023,
-    "bossmodel": 35001,
+    "bossmodel": 11018,
     "boss": [
       404007,
       404008,
@@ -1462,7 +1462,7 @@
       }
     ],
     "drop": 1024,
-    "bossmodel": 35001,
+    "bossmodel": 11018,
     "boss": [
       404010,
       404011,
@@ -1507,7 +1507,7 @@
       }
     ],
     "drop": 1025,
-    "bossmodel": 35001,
+    "bossmodel": 11018,
     "boss": [
       404013,
       404014,
@@ -1552,7 +1552,7 @@
       }
     ],
     "drop": 1026,
-    "bossmodel": 35001,
+    "bossmodel": 11018,
     "boss": [
       404016,
       404017,
@@ -1597,7 +1597,7 @@
       }
     ],
     "drop": 1027,
-    "bossmodel": 35001,
+    "bossmodel": 11018,
     "boss": [
       404019,
       404020,
@@ -1642,7 +1642,7 @@
       }
     ],
     "drop": 1028,
-    "bossmodel": 35001,
+    "bossmodel": 11018,
     "boss": [
       404022,
       404023,
@@ -1687,7 +1687,7 @@
       }
     ],
     "drop": 1029,
-    "bossmodel": 35001,
+    "bossmodel": 11018,
     "boss": [
       404025,
       404026,
@@ -1732,7 +1732,7 @@
       }
     ],
     "drop": 1030,
-    "bossmodel": 35001,
+    "bossmodel": 11018,
     "boss": [
       404028,
       404029,
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index 971876a60..d6172c8bb 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -14,8 +14,10 @@
     "effects": "effects1",
     "box_id": 0,
     "synthetize_num": 0,
-    "access": "",
-    "use_skip": "",
+    "access": [
+      114
+    ],
+    "use_skip": 114,
     "upper_limit": -1,
     "uselv": 0,
     "isani": 1,
@@ -35,7 +37,10 @@
       }
     ],
     "synthetize_deplete": [],
-    "tipstxt": "初级经验精灵不足"
+    "tipstxt": {
+      "key": "itemtipstxt_10001",
+      "text": "初级经验精灵不足"
+    }
   },
   {
     "id": "10002",
@@ -52,8 +57,8 @@
     "effects": "",
     "box_id": 0,
     "synthetize_num": 0,
-    "access": "",
-    "use_skip": "",
+    "access": [],
+    "use_skip": 0,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -73,7 +78,10 @@
       }
     ],
     "synthetize_deplete": [],
-    "tipstxt": "石头不足"
+    "tipstxt": {
+      "key": "itemtipstxt_10002",
+      "text": "石头不足"
+    }
   },
   {
     "id": "10003",
@@ -90,8 +98,8 @@
     "effects": "",
     "box_id": 10002,
     "synthetize_num": 50,
-    "access": "",
-    "use_skip": "",
+    "access": [],
+    "use_skip": 0,
     "upper_limit": -1,
     "uselv": 0,
     "isani": 0,
@@ -111,7 +119,10 @@
       }
     ],
     "synthetize_deplete": [],
-    "tipstxt": "5星阿宝碎片不足"
+    "tipstxt": {
+      "key": "itemtipstxt_10003",
+      "text": "5星阿宝碎片不足"
+    }
   },
   {
     "id": "10004",
@@ -128,8 +139,8 @@
     "effects": "",
     "box_id": 20001,
     "synthetize_num": 0,
-    "access": "",
-    "use_skip": "",
+    "access": [],
+    "use_skip": 0,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -149,7 +160,10 @@
       }
     ],
     "synthetize_deplete": [],
-    "tipstxt": "金币自选箱子不足"
+    "tipstxt": {
+      "key": "itemtipstxt_10004",
+      "text": "金币自选箱子不足"
+    }
   },
   {
     "id": "10005",
@@ -166,8 +180,8 @@
     "effects": "",
     "box_id": 20002,
     "synthetize_num": 0,
-    "access": "",
-    "use_skip": "",
+    "access": [],
+    "use_skip": 0,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -187,7 +201,10 @@
       }
     ],
     "synthetize_deplete": [],
-    "tipstxt": "随机金币箱子不足"
+    "tipstxt": {
+      "key": "itemtipstxt_10005",
+      "text": "随机金币箱子不足"
+    }
   },
   {
     "id": "10006",
@@ -204,8 +221,8 @@
     "effects": "",
     "box_id": 20003,
     "synthetize_num": 0,
-    "access": "",
-    "use_skip": "",
+    "access": [],
+    "use_skip": 0,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -225,7 +242,10 @@
       }
     ],
     "synthetize_deplete": [],
-    "tipstxt": "金币箱子不足"
+    "tipstxt": {
+      "key": "itemtipstxt_10006",
+      "text": "金币箱子不足"
+    }
   },
   {
     "id": "10007",
@@ -242,8 +262,8 @@
     "effects": "",
     "box_id": 0,
     "synthetize_num": 0,
-    "access": "",
-    "use_skip": "",
+    "access": [],
+    "use_skip": 0,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -263,7 +283,10 @@
       }
     ],
     "synthetize_deplete": [],
-    "tipstxt": "2小时金币不足"
+    "tipstxt": {
+      "key": "itemtipstxt_10007",
+      "text": "2小时金币不足"
+    }
   },
   {
     "id": "10008",
@@ -280,8 +303,8 @@
     "effects": "",
     "box_id": 0,
     "synthetize_num": 0,
-    "access": "",
-    "use_skip": "",
+    "access": [],
+    "use_skip": 0,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -301,7 +324,10 @@
       }
     ],
     "synthetize_deplete": [],
-    "tipstxt": "特殊2小时金币不足"
+    "tipstxt": {
+      "key": "itemtipstxt_10008",
+      "text": "特殊2小时金币不足"
+    }
   },
   {
     "id": "10009",
@@ -318,8 +344,8 @@
     "effects": "",
     "box_id": 0,
     "synthetize_num": 0,
-    "access": "",
-    "use_skip": "",
+    "access": [],
+    "use_skip": 0,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -339,7 +365,10 @@
       }
     ],
     "synthetize_deplete": [],
-    "tipstxt": "被封印的魔法书不足"
+    "tipstxt": {
+      "key": "itemtipstxt_10009",
+      "text": "被封印的魔法书不足"
+    }
   },
   {
     "id": "10010",
@@ -356,8 +385,8 @@
     "effects": "",
     "box_id": 0,
     "synthetize_num": 0,
-    "access": "",
-    "use_skip": "",
+    "access": [],
+    "use_skip": 0,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -377,7 +406,10 @@
       }
     ],
     "synthetize_deplete": [],
-    "tipstxt": "古代硬币不足"
+    "tipstxt": {
+      "key": "itemtipstxt_10010",
+      "text": "古代硬币不足"
+    }
   },
   {
     "id": "10011",
@@ -394,8 +426,8 @@
     "effects": "",
     "box_id": 0,
     "synthetize_num": 0,
-    "access": "",
-    "use_skip": "",
+    "access": [],
+    "use_skip": 0,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -415,7 +447,10 @@
       }
     ],
     "synthetize_deplete": [],
-    "tipstxt": "坏掉的钟表不足"
+    "tipstxt": {
+      "key": "itemtipstxt_10011",
+      "text": "坏掉的钟表不足"
+    }
   },
   {
     "id": "10012",
@@ -432,8 +467,8 @@
     "effects": "",
     "box_id": 0,
     "synthetize_num": 0,
-    "access": "",
-    "use_skip": "",
+    "access": [],
+    "use_skip": 0,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -453,7 +488,10 @@
       }
     ],
     "synthetize_deplete": [],
-    "tipstxt": "木材不足"
+    "tipstxt": {
+      "key": "itemtipstxt_10012",
+      "text": "木材不足"
+    }
   },
   {
     "id": "10013",
@@ -470,8 +508,8 @@
     "effects": "",
     "box_id": 0,
     "synthetize_num": 0,
-    "access": "",
-    "use_skip": "",
+    "access": [],
+    "use_skip": 0,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -491,7 +529,10 @@
       }
     ],
     "synthetize_deplete": [],
-    "tipstxt": "四叶草不足"
+    "tipstxt": {
+      "key": "itemtipstxt_10013",
+      "text": "四叶草不足"
+    }
   },
   {
     "id": "10014",
@@ -508,8 +549,8 @@
     "effects": "",
     "box_id": 0,
     "synthetize_num": 0,
-    "access": "",
-    "use_skip": "",
+    "access": [],
+    "use_skip": 0,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -529,7 +570,10 @@
       }
     ],
     "synthetize_deplete": [],
-    "tipstxt": "冒险家勋章不足"
+    "tipstxt": {
+      "key": "itemtipstxt_10014",
+      "text": "冒险家勋章不足"
+    }
   },
   {
     "id": "10015",
@@ -546,8 +590,8 @@
     "effects": "",
     "box_id": 0,
     "synthetize_num": 0,
-    "access": "",
-    "use_skip": "",
+    "access": [],
+    "use_skip": 0,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -567,7 +611,10 @@
       }
     ],
     "synthetize_deplete": [],
-    "tipstxt": "猫猫护身符不足"
+    "tipstxt": {
+      "key": "itemtipstxt_10015",
+      "text": "猫猫护身符不足"
+    }
   },
   {
     "id": "10016",
@@ -584,8 +631,8 @@
     "effects": "",
     "box_id": 0,
     "synthetize_num": 0,
-    "access": "",
-    "use_skip": "",
+    "access": [],
+    "use_skip": 0,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -605,7 +652,10 @@
       }
     ],
     "synthetize_deplete": [],
-    "tipstxt": "人造钻石不足"
+    "tipstxt": {
+      "key": "itemtipstxt_10016",
+      "text": "人造钻石不足"
+    }
   },
   {
     "id": "20001",
@@ -622,8 +672,8 @@
     "effects": "",
     "box_id": 10001,
     "synthetize_num": 50,
-    "access": "",
-    "use_skip": "",
+    "access": [],
+    "use_skip": 0,
     "upper_limit": -1,
     "uselv": 0,
     "isani": 0,
@@ -643,7 +693,10 @@
       }
     ],
     "synthetize_deplete": [],
-    "tipstxt": "随机英雄碎片不足"
+    "tipstxt": {
+      "key": "itemtipstxt_20001",
+      "text": "随机英雄碎片不足"
+    }
   },
   {
     "id": "20002",
@@ -660,8 +713,8 @@
     "effects": "",
     "box_id": 10002,
     "synthetize_num": 50,
-    "access": "",
-    "use_skip": "",
+    "access": [],
+    "use_skip": 0,
     "upper_limit": -1,
     "uselv": 0,
     "isani": 0,
@@ -681,7 +734,10 @@
       }
     ],
     "synthetize_deplete": [],
-    "tipstxt": "25001号碎片不足"
+    "tipstxt": {
+      "key": "itemtipstxt_20002",
+      "text": "25001号碎片不足"
+    }
   },
   {
     "id": "30001",
@@ -698,8 +754,10 @@
     "effects": "",
     "box_id": 0,
     "synthetize_num": 0,
-    "access": "store",
-    "use_skip": "recruit",
+    "access": [
+      107
+    ],
+    "use_skip": 107,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -713,7 +771,10 @@
     },
     "sale": [],
     "synthetize_deplete": [],
-    "tipstxt": "普通招募券不足"
+    "tipstxt": {
+      "key": "itemtipstxt_30001",
+      "text": "普通招募券不足"
+    }
   },
   {
     "id": "30002",
@@ -730,8 +791,10 @@
     "effects": "",
     "box_id": 0,
     "synthetize_num": 0,
-    "access": "store",
-    "use_skip": "recruit",
+    "access": [
+      108
+    ],
+    "use_skip": 108,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -745,7 +808,10 @@
     },
     "sale": [],
     "synthetize_deplete": [],
-    "tipstxt": "阵营1招募券不足"
+    "tipstxt": {
+      "key": "itemtipstxt_30002",
+      "text": "阵营1招募券不足"
+    }
   },
   {
     "id": "30003",
@@ -762,8 +828,10 @@
     "effects": "",
     "box_id": 0,
     "synthetize_num": 0,
-    "access": "store",
-    "use_skip": "recruit",
+    "access": [
+      108
+    ],
+    "use_skip": 108,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -777,7 +845,10 @@
     },
     "sale": [],
     "synthetize_deplete": [],
-    "tipstxt": "阵营2招募券不足"
+    "tipstxt": {
+      "key": "itemtipstxt_30003",
+      "text": "阵营2招募券不足"
+    }
   },
   {
     "id": "30004",
@@ -794,8 +865,10 @@
     "effects": "",
     "box_id": 0,
     "synthetize_num": 0,
-    "access": "store",
-    "use_skip": "recruit",
+    "access": [
+      108
+    ],
+    "use_skip": 108,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -809,7 +882,10 @@
     },
     "sale": [],
     "synthetize_deplete": [],
-    "tipstxt": "阵营3招募券不足"
+    "tipstxt": {
+      "key": "itemtipstxt_30004",
+      "text": "阵营3招募券不足"
+    }
   },
   {
     "id": "30005",
@@ -826,8 +902,10 @@
     "effects": "",
     "box_id": 0,
     "synthetize_num": 0,
-    "access": "store",
-    "use_skip": "recruit",
+    "access": [
+      108
+    ],
+    "use_skip": 108,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -841,7 +919,10 @@
     },
     "sale": [],
     "synthetize_deplete": [],
-    "tipstxt": "阵营4招募券不足"
+    "tipstxt": {
+      "key": "itemtipstxt_30005",
+      "text": "阵营4招募券不足"
+    }
   },
   {
     "id": "50001",
@@ -858,8 +939,10 @@
     "effects": "",
     "box_id": 50005,
     "synthetize_num": 5,
-    "access": "resonancepopup",
-    "use_skip": "resonancepopup",
+    "access": [
+      109
+    ],
+    "use_skip": 109,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -885,7 +968,10 @@
         "n": 1000
       }
     ],
-    "tipstxt": "闪耀声波-低级不足"
+    "tipstxt": {
+      "key": "itemtipstxt_50001",
+      "text": "闪耀声波-低级不足"
+    }
   },
   {
     "id": "50002",
@@ -902,8 +988,10 @@
     "effects": "",
     "box_id": 50006,
     "synthetize_num": 5,
-    "access": "resonancepopup",
-    "use_skip": "resonancepopup",
+    "access": [
+      109
+    ],
+    "use_skip": 109,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -929,7 +1017,10 @@
         "n": 1000
       }
     ],
-    "tipstxt": "灼热声波-低级不足"
+    "tipstxt": {
+      "key": "itemtipstxt_50002",
+      "text": "灼热声波-低级不足"
+    }
   },
   {
     "id": "50003",
@@ -946,8 +1037,10 @@
     "effects": "",
     "box_id": 50007,
     "synthetize_num": 5,
-    "access": "resonancepopup",
-    "use_skip": "resonancepopup",
+    "access": [
+      109
+    ],
+    "use_skip": 109,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -973,7 +1066,10 @@
         "n": 1000
       }
     ],
-    "tipstxt": "呼啸声波-低级不足"
+    "tipstxt": {
+      "key": "itemtipstxt_50003",
+      "text": "呼啸声波-低级不足"
+    }
   },
   {
     "id": "50004",
@@ -990,8 +1086,10 @@
     "effects": "",
     "box_id": 50008,
     "synthetize_num": 5,
-    "access": "resonancepopup",
-    "use_skip": "resonancepopup",
+    "access": [
+      109
+    ],
+    "use_skip": 109,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -1017,7 +1115,10 @@
         "n": 1000
       }
     ],
-    "tipstxt": "涌动声波-低级不足"
+    "tipstxt": {
+      "key": "itemtipstxt_50004",
+      "text": "涌动声波-低级不足"
+    }
   },
   {
     "id": "50005",
@@ -1034,8 +1135,10 @@
     "effects": "",
     "box_id": 50009,
     "synthetize_num": 5,
-    "access": "resonancepopup",
-    "use_skip": "resonancepopup",
+    "access": [
+      109
+    ],
+    "use_skip": 109,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -1061,7 +1164,10 @@
         "n": 1000
       }
     ],
-    "tipstxt": "闪耀声波-中级不足"
+    "tipstxt": {
+      "key": "itemtipstxt_50005",
+      "text": "闪耀声波-中级不足"
+    }
   },
   {
     "id": "50006",
@@ -1078,8 +1184,10 @@
     "effects": "",
     "box_id": 50010,
     "synthetize_num": 5,
-    "access": "resonancepopup",
-    "use_skip": "resonancepopup",
+    "access": [
+      109
+    ],
+    "use_skip": 109,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -1105,7 +1213,10 @@
         "n": 1000
       }
     ],
-    "tipstxt": "灼热声波-中级不足"
+    "tipstxt": {
+      "key": "itemtipstxt_50006",
+      "text": "灼热声波-中级不足"
+    }
   },
   {
     "id": "50007",
@@ -1122,8 +1233,10 @@
     "effects": "",
     "box_id": 50011,
     "synthetize_num": 5,
-    "access": "resonancepopup",
-    "use_skip": "resonancepopup",
+    "access": [
+      109
+    ],
+    "use_skip": 109,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -1149,7 +1262,10 @@
         "n": 1000
       }
     ],
-    "tipstxt": "呼啸声波-中级不足"
+    "tipstxt": {
+      "key": "itemtipstxt_50007",
+      "text": "呼啸声波-中级不足"
+    }
   },
   {
     "id": "50008",
@@ -1166,8 +1282,10 @@
     "effects": "",
     "box_id": 50012,
     "synthetize_num": 5,
-    "access": "resonancepopup",
-    "use_skip": "resonancepopup",
+    "access": [
+      109
+    ],
+    "use_skip": 109,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -1193,7 +1311,10 @@
         "n": 1000
       }
     ],
-    "tipstxt": "涌动声波-中级不足"
+    "tipstxt": {
+      "key": "itemtipstxt_50008",
+      "text": "涌动声波-中级不足"
+    }
   },
   {
     "id": "50009",
@@ -1210,8 +1331,10 @@
     "effects": "",
     "box_id": 0,
     "synthetize_num": 0,
-    "access": "resonancepopup",
-    "use_skip": "resonancepopup",
+    "access": [
+      109
+    ],
+    "use_skip": 109,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -1231,7 +1354,10 @@
       }
     ],
     "synthetize_deplete": [],
-    "tipstxt": "闪耀声波-高级不足"
+    "tipstxt": {
+      "key": "itemtipstxt_50009",
+      "text": "闪耀声波-高级不足"
+    }
   },
   {
     "id": "50010",
@@ -1248,8 +1374,10 @@
     "effects": "",
     "box_id": 0,
     "synthetize_num": 0,
-    "access": "resonancepopup",
-    "use_skip": "resonancepopup",
+    "access": [
+      109
+    ],
+    "use_skip": 109,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -1269,7 +1397,10 @@
       }
     ],
     "synthetize_deplete": [],
-    "tipstxt": "灼热声波-高级不足"
+    "tipstxt": {
+      "key": "itemtipstxt_50010",
+      "text": "灼热声波-高级不足"
+    }
   },
   {
     "id": "50011",
@@ -1286,8 +1417,10 @@
     "effects": "",
     "box_id": 0,
     "synthetize_num": 0,
-    "access": "resonancepopup",
-    "use_skip": "resonancepopup",
+    "access": [
+      109
+    ],
+    "use_skip": 109,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -1307,7 +1440,10 @@
       }
     ],
     "synthetize_deplete": [],
-    "tipstxt": "呼啸声波-高级不足"
+    "tipstxt": {
+      "key": "itemtipstxt_50011",
+      "text": "呼啸声波-高级不足"
+    }
   },
   {
     "id": "50012",
@@ -1324,8 +1460,10 @@
     "effects": "",
     "box_id": 0,
     "synthetize_num": 0,
-    "access": "resonancepopup",
-    "use_skip": "resonancepopup",
+    "access": [
+      109
+    ],
+    "use_skip": 109,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -1345,82 +1483,9 @@
       }
     ],
     "synthetize_deplete": [],
-    "tipstxt": "涌动声波-高级不足"
-  },
-  {
-    "id": "10017",
-    "name": {
-      "key": "itemname_10017",
-      "text": "阵营招募劵"
-    },
-    "usetype": 3,
-    "color": 5,
-    "bagtype": 1,
-    "index": 19,
-    "special_type": 0,
-    "time": 0,
-    "effects": "",
-    "box_id": 0,
-    "synthetize_num": 0,
-    "access": "",
-    "use_skip": "",
-    "upper_limit": 999,
-    "uselv": 0,
-    "isani": 0,
-    "star": 0,
-    "race": 0,
-    "img": "wp_icon_10017",
-    "ico": "wp_icon_10017",
-    "intr": {
-      "key": "itemdesc_10017",
-      "text": "作用于阵营招募界面"
-    },
-    "sale": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 1000
-      }
-    ],
-    "synthetize_deplete": [],
-    "tipstxt": "阵营招募劵不足"
-  },
-  {
-    "id": "10018",
-    "name": {
-      "key": "itemname_10018",
-      "text": "普通招募劵"
-    },
-    "usetype": 3,
-    "color": 5,
-    "bagtype": 1,
-    "index": 20,
-    "special_type": 0,
-    "time": 0,
-    "effects": "",
-    "box_id": 0,
-    "synthetize_num": 0,
-    "access": "",
-    "use_skip": "",
-    "upper_limit": 999,
-    "uselv": 0,
-    "isani": 0,
-    "star": 0,
-    "race": 0,
-    "img": "wp_icon_10018",
-    "ico": "wp_icon_10018",
-    "intr": {
-      "key": "itemdesc_10018",
-      "text": "作用于普通招募界面"
-    },
-    "sale": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 1000
-      }
-    ],
-    "synthetize_deplete": [],
-    "tipstxt": "普通招募劵不足"
+    "tipstxt": {
+      "key": "itemtipstxt_50012",
+      "text": "涌动声波-高级不足"
+    }
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_mainline.json b/bin/json/game_mainline.json
index a36bfbe1c..045779ba4 100644
--- a/bin/json/game_mainline.json
+++ b/bin/json/game_mainline.json
@@ -7,7 +7,6 @@
     "order": 0,
     "linearnum": 0,
     "chapter": 1,
-    "route": 1,
     "Episodetype": 0,
     "Episodelocation": {
       "x": 200,
@@ -56,7 +55,6 @@
     "order": 1,
     "linearnum": 1,
     "chapter": 1,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 474,
@@ -105,7 +103,6 @@
     "order": 2,
     "linearnum": 2,
     "chapter": 1,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 815,
@@ -154,7 +151,6 @@
     "order": 3,
     "linearnum": 3,
     "chapter": 1,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -200,11 +196,10 @@
     "id": 104,
     "intensity": 1,
     "endFlag": 0,
-    "previoustage": 103,
+    "previoustage": 102,
     "order": 4,
     "linearnum": 4,
     "chapter": 1,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -254,7 +249,6 @@
     "order": 5,
     "linearnum": 5,
     "chapter": 1,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -304,7 +298,6 @@
     "order": 6,
     "linearnum": 6,
     "chapter": 1,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -354,7 +347,6 @@
     "order": 7,
     "linearnum": 7,
     "chapter": 1,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -404,7 +396,6 @@
     "order": 8,
     "linearnum": 8,
     "chapter": 1,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -454,7 +445,6 @@
     "order": 9,
     "linearnum": 9,
     "chapter": 1,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -504,7 +494,6 @@
     "order": 10,
     "linearnum": 10,
     "chapter": 1,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -547,6 +536,54 @@
       -1
     ]
   },
+  {
+    "id": 200,
+    "intensity": 1,
+    "endFlag": 0,
+    "previoustage": 0,
+    "order": 0,
+    "linearnum": 0,
+    "chapter": 2,
+    "Episodetype": 1,
+    "Episodelocation": {
+      "x": 200,
+      "y": 601
+    },
+    "model": "",
+    "effect": "",
+    "FormatList": [
+      101011
+    ],
+    "captainId": "250011",
+    "battlescene": "bg_zhandoulmboss",
+    "sceneeffect": "",
+    "award": [
+      {
+        "a": "item",
+        "t": "1",
+        "n": 1
+      },
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 40000
+      }
+    ],
+    "title": {
+      "key": "mainline_title_10001",
+      "text": "第1关：功夫世界"
+    },
+    "desc": {
+      "key": "mainline_name_10071",
+      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
+  },
   {
     "id": 201,
     "intensity": 1,
@@ -555,7 +592,6 @@
     "order": 11,
     "linearnum": 1,
     "chapter": 2,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 474,
@@ -604,7 +640,6 @@
     "order": 12,
     "linearnum": 2,
     "chapter": 2,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 815,
@@ -653,7 +688,6 @@
     "order": 13,
     "linearnum": 3,
     "chapter": 2,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -703,7 +737,6 @@
     "order": 14,
     "linearnum": 4,
     "chapter": 2,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -753,7 +786,6 @@
     "order": 15,
     "linearnum": 5,
     "chapter": 2,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -803,7 +835,6 @@
     "order": 16,
     "linearnum": 6,
     "chapter": 2,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -853,7 +884,6 @@
     "order": 17,
     "linearnum": 7,
     "chapter": 2,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -903,7 +933,6 @@
     "order": 18,
     "linearnum": 8,
     "chapter": 2,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -953,7 +982,6 @@
     "order": 19,
     "linearnum": 9,
     "chapter": 2,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -1003,7 +1031,6 @@
     "order": 20,
     "linearnum": 10,
     "chapter": 2,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -1054,7 +1081,6 @@
     "order": 23,
     "linearnum": 1,
     "chapter": 3,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 474,
@@ -1103,7 +1129,6 @@
     "order": 24,
     "linearnum": 2,
     "chapter": 3,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 815,
@@ -1152,7 +1177,6 @@
     "order": 25,
     "linearnum": 3,
     "chapter": 3,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -1202,7 +1226,6 @@
     "order": 26,
     "linearnum": 4,
     "chapter": 3,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -1252,7 +1275,6 @@
     "order": 27,
     "linearnum": 5,
     "chapter": 3,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -1302,7 +1324,6 @@
     "order": 28,
     "linearnum": 6,
     "chapter": 3,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -1352,7 +1373,6 @@
     "order": 29,
     "linearnum": 7,
     "chapter": 3,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -1402,7 +1422,6 @@
     "order": 30,
     "linearnum": 8,
     "chapter": 3,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -1452,7 +1471,6 @@
     "order": 31,
     "linearnum": 9,
     "chapter": 3,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -1502,7 +1520,6 @@
     "order": 32,
     "linearnum": 10,
     "chapter": 3,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -1553,7 +1570,6 @@
     "order": 33,
     "linearnum": 11,
     "chapter": 4,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -1602,7 +1618,6 @@
     "order": 34,
     "linearnum": 12,
     "chapter": 4,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -1651,7 +1666,6 @@
     "order": 35,
     "linearnum": 1,
     "chapter": 4,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -1701,7 +1715,6 @@
     "order": 36,
     "linearnum": 2,
     "chapter": 4,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -1751,7 +1764,6 @@
     "order": 37,
     "linearnum": 3,
     "chapter": 4,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -1801,7 +1813,6 @@
     "order": 38,
     "linearnum": 4,
     "chapter": 4,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -1851,7 +1862,6 @@
     "order": 39,
     "linearnum": 5,
     "chapter": 4,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -1901,7 +1911,6 @@
     "order": 40,
     "linearnum": 6,
     "chapter": 4,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -1951,7 +1960,6 @@
     "order": 41,
     "linearnum": 7,
     "chapter": 4,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -2001,7 +2009,6 @@
     "order": 42,
     "linearnum": 8,
     "chapter": 4,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -2052,7 +2059,6 @@
     "order": 43,
     "linearnum": 9,
     "chapter": 5,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -2101,7 +2107,6 @@
     "order": 44,
     "linearnum": 10,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -2150,7 +2155,6 @@
     "order": 45,
     "linearnum": 11,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -2200,7 +2204,6 @@
     "order": 46,
     "linearnum": 12,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -2250,7 +2253,6 @@
     "order": 47,
     "linearnum": 1,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -2300,7 +2302,6 @@
     "order": 48,
     "linearnum": 2,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -2350,7 +2351,6 @@
     "order": 49,
     "linearnum": 3,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -2400,7 +2400,6 @@
     "order": 50,
     "linearnum": 4,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -2450,7 +2449,6 @@
     "order": 51,
     "linearnum": 5,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -2500,7 +2498,6 @@
     "order": 52,
     "linearnum": 6,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -2551,7 +2548,6 @@
     "order": 53,
     "linearnum": 7,
     "chapter": 6,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -2600,7 +2596,6 @@
     "order": 54,
     "linearnum": 8,
     "chapter": 6,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -2649,7 +2644,6 @@
     "order": 55,
     "linearnum": 9,
     "chapter": 6,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -2699,7 +2693,6 @@
     "order": 56,
     "linearnum": 10,
     "chapter": 6,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -2749,7 +2742,6 @@
     "order": 57,
     "linearnum": 11,
     "chapter": 6,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -2799,7 +2791,6 @@
     "order": 58,
     "linearnum": 12,
     "chapter": 6,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -2849,7 +2840,6 @@
     "order": 59,
     "linearnum": 1,
     "chapter": 6,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -2899,7 +2889,6 @@
     "order": 60,
     "linearnum": 2,
     "chapter": 6,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -2949,7 +2938,6 @@
     "order": 61,
     "linearnum": 3,
     "chapter": 6,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -2999,7 +2987,6 @@
     "order": 62,
     "linearnum": 4,
     "chapter": 6,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -3050,7 +3037,6 @@
     "order": 63,
     "linearnum": 5,
     "chapter": 7,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -3099,7 +3085,6 @@
     "order": 64,
     "linearnum": 6,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -3148,7 +3133,6 @@
     "order": 65,
     "linearnum": 7,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -3198,7 +3182,6 @@
     "order": 66,
     "linearnum": 8,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -3248,7 +3231,6 @@
     "order": 67,
     "linearnum": 9,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -3298,7 +3280,6 @@
     "order": 68,
     "linearnum": 10,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -3348,7 +3329,6 @@
     "order": 69,
     "linearnum": 11,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -3398,7 +3378,6 @@
     "order": 70,
     "linearnum": 12,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -3448,7 +3427,6 @@
     "order": 71,
     "linearnum": 1,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -3498,7 +3476,6 @@
     "order": 72,
     "linearnum": 2,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -3549,7 +3526,6 @@
     "order": 73,
     "linearnum": 3,
     "chapter": 8,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -3598,7 +3574,6 @@
     "order": 74,
     "linearnum": 4,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -3647,7 +3622,6 @@
     "order": 75,
     "linearnum": 5,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -3697,7 +3671,6 @@
     "order": 76,
     "linearnum": 6,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -3747,7 +3720,6 @@
     "order": 77,
     "linearnum": 7,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -3797,7 +3769,6 @@
     "order": 78,
     "linearnum": 8,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -3847,7 +3818,6 @@
     "order": 79,
     "linearnum": 9,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -3897,7 +3867,6 @@
     "order": 80,
     "linearnum": 10,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -3947,7 +3916,6 @@
     "order": 81,
     "linearnum": 11,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -3997,7 +3965,6 @@
     "order": 82,
     "linearnum": 12,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -4048,7 +4015,6 @@
     "order": 83,
     "linearnum": 1,
     "chapter": 9,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -4097,7 +4063,6 @@
     "order": 84,
     "linearnum": 2,
     "chapter": 9,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -4146,7 +4111,6 @@
     "order": 85,
     "linearnum": 3,
     "chapter": 9,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -4196,7 +4160,6 @@
     "order": 86,
     "linearnum": 4,
     "chapter": 9,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -4246,7 +4209,6 @@
     "order": 87,
     "linearnum": 5,
     "chapter": 9,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -4296,7 +4258,6 @@
     "order": 88,
     "linearnum": 6,
     "chapter": 9,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -4346,7 +4307,6 @@
     "order": 89,
     "linearnum": 7,
     "chapter": 9,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -4396,7 +4356,6 @@
     "order": 90,
     "linearnum": 8,
     "chapter": 9,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -4446,7 +4405,6 @@
     "order": 91,
     "linearnum": 9,
     "chapter": 9,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -4496,7 +4454,6 @@
     "order": 92,
     "linearnum": 10,
     "chapter": 9,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -4547,7 +4504,6 @@
     "order": 93,
     "linearnum": 11,
     "chapter": 10,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -4596,7 +4552,6 @@
     "order": 94,
     "linearnum": 12,
     "chapter": 10,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -4645,7 +4600,6 @@
     "order": 95,
     "linearnum": 1,
     "chapter": 10,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -4695,7 +4649,6 @@
     "order": 96,
     "linearnum": 2,
     "chapter": 10,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -4745,7 +4698,6 @@
     "order": 97,
     "linearnum": 3,
     "chapter": 10,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -4795,7 +4747,6 @@
     "order": 98,
     "linearnum": 4,
     "chapter": 10,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -4845,7 +4796,6 @@
     "order": 99,
     "linearnum": 5,
     "chapter": 10,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -4895,7 +4845,6 @@
     "order": 100,
     "linearnum": 6,
     "chapter": 10,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -4945,7 +4894,6 @@
     "order": 101,
     "linearnum": 7,
     "chapter": 10,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -4995,7 +4943,6 @@
     "order": 102,
     "linearnum": 8,
     "chapter": 10,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -5046,7 +4993,6 @@
     "order": 103,
     "linearnum": 9,
     "chapter": 11,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -5095,7 +5041,6 @@
     "order": 104,
     "linearnum": 10,
     "chapter": 11,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -5144,7 +5089,6 @@
     "order": 105,
     "linearnum": 11,
     "chapter": 11,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -5194,7 +5138,6 @@
     "order": 106,
     "linearnum": 12,
     "chapter": 11,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -5244,7 +5187,6 @@
     "order": 107,
     "linearnum": 1,
     "chapter": 11,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -5294,7 +5236,6 @@
     "order": 108,
     "linearnum": 2,
     "chapter": 11,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -5344,7 +5285,6 @@
     "order": 109,
     "linearnum": 3,
     "chapter": 11,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -5394,7 +5334,6 @@
     "order": 110,
     "linearnum": 4,
     "chapter": 11,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -5444,7 +5383,6 @@
     "order": 111,
     "linearnum": 5,
     "chapter": 11,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -5494,7 +5432,6 @@
     "order": 112,
     "linearnum": 6,
     "chapter": 11,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -5545,7 +5482,6 @@
     "order": 113,
     "linearnum": 7,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -5594,7 +5530,6 @@
     "order": 114,
     "linearnum": 8,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -5643,7 +5578,6 @@
     "order": 115,
     "linearnum": 9,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -5693,7 +5627,6 @@
     "order": 116,
     "linearnum": 10,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -5743,7 +5676,6 @@
     "order": 117,
     "linearnum": 11,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -5793,7 +5725,6 @@
     "order": 118,
     "linearnum": 12,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -5843,7 +5774,6 @@
     "order": 119,
     "linearnum": 8,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -5893,7 +5823,6 @@
     "order": 120,
     "linearnum": 9,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -5943,7 +5872,6 @@
     "order": 121,
     "linearnum": 10,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -5993,7 +5921,6 @@
     "order": 122,
     "linearnum": 11,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -6044,7 +5971,6 @@
     "order": 1,
     "linearnum": 1,
     "chapter": 1,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 474,
@@ -6100,7 +6026,6 @@
     "order": 2,
     "linearnum": 2,
     "chapter": 1,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 815,
@@ -6149,7 +6074,6 @@
     "order": 3,
     "linearnum": 3,
     "chapter": 1,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -6199,7 +6123,6 @@
     "order": 4,
     "linearnum": 4,
     "chapter": 1,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -6249,7 +6172,6 @@
     "order": 5,
     "linearnum": 5,
     "chapter": 1,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -6299,7 +6221,6 @@
     "order": 6,
     "linearnum": 6,
     "chapter": 1,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -6349,7 +6270,6 @@
     "order": 7,
     "linearnum": 7,
     "chapter": 1,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -6399,7 +6319,6 @@
     "order": 8,
     "linearnum": 8,
     "chapter": 1,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -6449,7 +6368,6 @@
     "order": 9,
     "linearnum": 9,
     "chapter": 1,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -6499,7 +6417,6 @@
     "order": 10,
     "linearnum": 10,
     "chapter": 1,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -6550,7 +6467,6 @@
     "order": 11,
     "linearnum": 1,
     "chapter": 2,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 474,
@@ -6599,7 +6515,6 @@
     "order": 12,
     "linearnum": 2,
     "chapter": 2,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 815,
@@ -6648,7 +6563,6 @@
     "order": 13,
     "linearnum": 3,
     "chapter": 2,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -6698,7 +6612,6 @@
     "order": 14,
     "linearnum": 4,
     "chapter": 2,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -6748,7 +6661,6 @@
     "order": 15,
     "linearnum": 5,
     "chapter": 2,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -6798,7 +6710,6 @@
     "order": 16,
     "linearnum": 6,
     "chapter": 2,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -6848,7 +6759,6 @@
     "order": 17,
     "linearnum": 7,
     "chapter": 2,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -6898,7 +6808,6 @@
     "order": 18,
     "linearnum": 8,
     "chapter": 2,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -6948,7 +6857,6 @@
     "order": 19,
     "linearnum": 9,
     "chapter": 2,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -6998,7 +6906,6 @@
     "order": 20,
     "linearnum": 10,
     "chapter": 2,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -7049,7 +6956,6 @@
     "order": 23,
     "linearnum": 1,
     "chapter": 3,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 474,
@@ -7098,7 +7004,6 @@
     "order": 24,
     "linearnum": 2,
     "chapter": 3,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 815,
@@ -7147,7 +7052,6 @@
     "order": 25,
     "linearnum": 3,
     "chapter": 3,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -7197,7 +7101,6 @@
     "order": 26,
     "linearnum": 4,
     "chapter": 3,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -7247,7 +7150,6 @@
     "order": 27,
     "linearnum": 5,
     "chapter": 3,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -7297,7 +7199,6 @@
     "order": 28,
     "linearnum": 6,
     "chapter": 3,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -7347,7 +7248,6 @@
     "order": 29,
     "linearnum": 7,
     "chapter": 3,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -7397,7 +7297,6 @@
     "order": 30,
     "linearnum": 8,
     "chapter": 3,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -7447,7 +7346,6 @@
     "order": 31,
     "linearnum": 9,
     "chapter": 3,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -7497,7 +7395,6 @@
     "order": 32,
     "linearnum": 10,
     "chapter": 3,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -7548,7 +7445,6 @@
     "order": 33,
     "linearnum": 11,
     "chapter": 4,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -7597,7 +7493,6 @@
     "order": 34,
     "linearnum": 12,
     "chapter": 4,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -7646,7 +7541,6 @@
     "order": 35,
     "linearnum": 1,
     "chapter": 4,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -7696,7 +7590,6 @@
     "order": 36,
     "linearnum": 2,
     "chapter": 4,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -7746,7 +7639,6 @@
     "order": 37,
     "linearnum": 3,
     "chapter": 4,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -7796,7 +7688,6 @@
     "order": 38,
     "linearnum": 4,
     "chapter": 4,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -7846,7 +7737,6 @@
     "order": 39,
     "linearnum": 5,
     "chapter": 4,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -7896,7 +7786,6 @@
     "order": 40,
     "linearnum": 6,
     "chapter": 4,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -7946,7 +7835,6 @@
     "order": 41,
     "linearnum": 7,
     "chapter": 4,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -7996,7 +7884,6 @@
     "order": 42,
     "linearnum": 8,
     "chapter": 4,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -8047,7 +7934,6 @@
     "order": 43,
     "linearnum": 9,
     "chapter": 5,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -8096,7 +7982,6 @@
     "order": 44,
     "linearnum": 10,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -8145,7 +8030,6 @@
     "order": 45,
     "linearnum": 11,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -8195,7 +8079,6 @@
     "order": 46,
     "linearnum": 12,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -8245,7 +8128,6 @@
     "order": 47,
     "linearnum": 1,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -8295,7 +8177,6 @@
     "order": 48,
     "linearnum": 2,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -8345,7 +8226,6 @@
     "order": 49,
     "linearnum": 3,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -8395,7 +8275,6 @@
     "order": 50,
     "linearnum": 4,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -8445,7 +8324,6 @@
     "order": 51,
     "linearnum": 5,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -8495,7 +8373,6 @@
     "order": 52,
     "linearnum": 6,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -8546,7 +8423,6 @@
     "order": 53,
     "linearnum": 7,
     "chapter": 6,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -8595,7 +8471,6 @@
     "order": 54,
     "linearnum": 8,
     "chapter": 6,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -8644,7 +8519,6 @@
     "order": 55,
     "linearnum": 9,
     "chapter": 6,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -8694,7 +8568,6 @@
     "order": 56,
     "linearnum": 10,
     "chapter": 6,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -8744,7 +8617,6 @@
     "order": 57,
     "linearnum": 11,
     "chapter": 6,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -8794,7 +8666,6 @@
     "order": 58,
     "linearnum": 12,
     "chapter": 6,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -8844,7 +8715,6 @@
     "order": 59,
     "linearnum": 1,
     "chapter": 6,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -8894,7 +8764,6 @@
     "order": 60,
     "linearnum": 2,
     "chapter": 6,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -8944,7 +8813,6 @@
     "order": 61,
     "linearnum": 3,
     "chapter": 6,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -8994,7 +8862,6 @@
     "order": 62,
     "linearnum": 4,
     "chapter": 6,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -9045,7 +8912,6 @@
     "order": 63,
     "linearnum": 5,
     "chapter": 7,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -9094,7 +8960,6 @@
     "order": 64,
     "linearnum": 6,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -9143,7 +9008,6 @@
     "order": 65,
     "linearnum": 7,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -9193,7 +9057,6 @@
     "order": 66,
     "linearnum": 8,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -9243,7 +9106,6 @@
     "order": 67,
     "linearnum": 9,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -9293,7 +9155,6 @@
     "order": 68,
     "linearnum": 10,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -9343,7 +9204,6 @@
     "order": 69,
     "linearnum": 11,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -9393,7 +9253,6 @@
     "order": 70,
     "linearnum": 12,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -9443,7 +9302,6 @@
     "order": 71,
     "linearnum": 1,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -9493,7 +9351,6 @@
     "order": 72,
     "linearnum": 2,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -9544,7 +9401,6 @@
     "order": 73,
     "linearnum": 3,
     "chapter": 8,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -9593,7 +9449,6 @@
     "order": 74,
     "linearnum": 4,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -9642,7 +9497,6 @@
     "order": 75,
     "linearnum": 5,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -9692,7 +9546,6 @@
     "order": 76,
     "linearnum": 6,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -9742,7 +9595,6 @@
     "order": 77,
     "linearnum": 7,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -9792,7 +9644,6 @@
     "order": 78,
     "linearnum": 8,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -9842,7 +9693,6 @@
     "order": 79,
     "linearnum": 9,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -9892,7 +9742,6 @@
     "order": 80,
     "linearnum": 10,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -9942,7 +9791,6 @@
     "order": 81,
     "linearnum": 11,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -9992,7 +9840,6 @@
     "order": 82,
     "linearnum": 12,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -10043,7 +9890,6 @@
     "order": 83,
     "linearnum": 1,
     "chapter": 9,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -10092,7 +9938,6 @@
     "order": 84,
     "linearnum": 2,
     "chapter": 9,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -10141,7 +9986,6 @@
     "order": 85,
     "linearnum": 3,
     "chapter": 9,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -10191,7 +10035,6 @@
     "order": 86,
     "linearnum": 4,
     "chapter": 9,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -10241,7 +10084,6 @@
     "order": 87,
     "linearnum": 5,
     "chapter": 9,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -10291,7 +10133,6 @@
     "order": 88,
     "linearnum": 6,
     "chapter": 9,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -10341,7 +10182,6 @@
     "order": 89,
     "linearnum": 7,
     "chapter": 9,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -10391,7 +10231,6 @@
     "order": 90,
     "linearnum": 8,
     "chapter": 9,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -10441,7 +10280,6 @@
     "order": 91,
     "linearnum": 9,
     "chapter": 9,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -10491,7 +10329,6 @@
     "order": 92,
     "linearnum": 10,
     "chapter": 9,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -10542,7 +10379,6 @@
     "order": 93,
     "linearnum": 11,
     "chapter": 10,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -10591,7 +10427,6 @@
     "order": 94,
     "linearnum": 12,
     "chapter": 10,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -10640,7 +10475,6 @@
     "order": 95,
     "linearnum": 1,
     "chapter": 10,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -10690,7 +10524,6 @@
     "order": 96,
     "linearnum": 2,
     "chapter": 10,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -10740,7 +10573,6 @@
     "order": 97,
     "linearnum": 3,
     "chapter": 10,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -10790,7 +10622,6 @@
     "order": 98,
     "linearnum": 4,
     "chapter": 10,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -10840,7 +10671,6 @@
     "order": 99,
     "linearnum": 5,
     "chapter": 10,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -10890,7 +10720,6 @@
     "order": 100,
     "linearnum": 6,
     "chapter": 10,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -10940,7 +10769,6 @@
     "order": 101,
     "linearnum": 7,
     "chapter": 10,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -10990,7 +10818,6 @@
     "order": 102,
     "linearnum": 8,
     "chapter": 10,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -11041,7 +10868,6 @@
     "order": 103,
     "linearnum": 9,
     "chapter": 11,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -11090,7 +10916,6 @@
     "order": 104,
     "linearnum": 10,
     "chapter": 11,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -11139,7 +10964,6 @@
     "order": 105,
     "linearnum": 11,
     "chapter": 11,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -11189,7 +11013,6 @@
     "order": 106,
     "linearnum": 12,
     "chapter": 11,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -11239,7 +11062,6 @@
     "order": 107,
     "linearnum": 1,
     "chapter": 11,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -11289,7 +11111,6 @@
     "order": 108,
     "linearnum": 2,
     "chapter": 11,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -11339,7 +11160,6 @@
     "order": 109,
     "linearnum": 3,
     "chapter": 11,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -11389,7 +11209,6 @@
     "order": 110,
     "linearnum": 4,
     "chapter": 11,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -11439,7 +11258,6 @@
     "order": 111,
     "linearnum": 5,
     "chapter": 11,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -11489,7 +11307,6 @@
     "order": 112,
     "linearnum": 6,
     "chapter": 11,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -11540,7 +11357,6 @@
     "order": 113,
     "linearnum": 7,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -11589,7 +11405,6 @@
     "order": 114,
     "linearnum": 8,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -11638,7 +11453,6 @@
     "order": 115,
     "linearnum": 9,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -11688,7 +11502,6 @@
     "order": 116,
     "linearnum": 10,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -11738,7 +11551,6 @@
     "order": 117,
     "linearnum": 11,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -11788,7 +11600,6 @@
     "order": 118,
     "linearnum": 12,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -11838,7 +11649,6 @@
     "order": 119,
     "linearnum": 8,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -11888,7 +11698,6 @@
     "order": 120,
     "linearnum": 9,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -11938,7 +11747,6 @@
     "order": 121,
     "linearnum": 10,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -11988,7 +11796,6 @@
     "order": 122,
     "linearnum": 11,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -12039,7 +11846,6 @@
     "order": 1,
     "linearnum": 1,
     "chapter": 1,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 474,
@@ -12095,7 +11901,6 @@
     "order": 2,
     "linearnum": 2,
     "chapter": 1,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 815,
@@ -12144,7 +11949,6 @@
     "order": 3,
     "linearnum": 3,
     "chapter": 1,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -12194,7 +11998,6 @@
     "order": 4,
     "linearnum": 4,
     "chapter": 1,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -12244,7 +12047,6 @@
     "order": 5,
     "linearnum": 5,
     "chapter": 1,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -12294,7 +12096,6 @@
     "order": 6,
     "linearnum": 6,
     "chapter": 1,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -12344,7 +12145,6 @@
     "order": 7,
     "linearnum": 7,
     "chapter": 1,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -12394,7 +12194,6 @@
     "order": 8,
     "linearnum": 8,
     "chapter": 1,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -12444,7 +12243,6 @@
     "order": 9,
     "linearnum": 9,
     "chapter": 1,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -12494,7 +12292,6 @@
     "order": 10,
     "linearnum": 10,
     "chapter": 1,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -12545,7 +12342,6 @@
     "order": 11,
     "linearnum": 1,
     "chapter": 2,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 474,
@@ -12594,7 +12390,6 @@
     "order": 12,
     "linearnum": 2,
     "chapter": 2,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 815,
@@ -12643,7 +12438,6 @@
     "order": 13,
     "linearnum": 3,
     "chapter": 2,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -12693,7 +12487,6 @@
     "order": 14,
     "linearnum": 4,
     "chapter": 2,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -12743,7 +12536,6 @@
     "order": 15,
     "linearnum": 5,
     "chapter": 2,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -12793,7 +12585,6 @@
     "order": 16,
     "linearnum": 6,
     "chapter": 2,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -12843,7 +12634,6 @@
     "order": 17,
     "linearnum": 7,
     "chapter": 2,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -12893,7 +12683,6 @@
     "order": 18,
     "linearnum": 8,
     "chapter": 2,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -12943,7 +12732,6 @@
     "order": 19,
     "linearnum": 9,
     "chapter": 2,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -12993,7 +12781,6 @@
     "order": 20,
     "linearnum": 10,
     "chapter": 2,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -13044,7 +12831,6 @@
     "order": 23,
     "linearnum": 1,
     "chapter": 3,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 474,
@@ -13093,7 +12879,6 @@
     "order": 24,
     "linearnum": 2,
     "chapter": 3,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 815,
@@ -13142,7 +12927,6 @@
     "order": 25,
     "linearnum": 3,
     "chapter": 3,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -13192,7 +12976,6 @@
     "order": 26,
     "linearnum": 4,
     "chapter": 3,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -13242,7 +13025,6 @@
     "order": 27,
     "linearnum": 5,
     "chapter": 3,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -13292,7 +13074,6 @@
     "order": 28,
     "linearnum": 6,
     "chapter": 3,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -13342,7 +13123,6 @@
     "order": 29,
     "linearnum": 7,
     "chapter": 3,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -13392,7 +13172,6 @@
     "order": 30,
     "linearnum": 8,
     "chapter": 3,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -13442,7 +13221,6 @@
     "order": 31,
     "linearnum": 9,
     "chapter": 3,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -13492,7 +13270,6 @@
     "order": 32,
     "linearnum": 10,
     "chapter": 3,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -13543,7 +13320,6 @@
     "order": 33,
     "linearnum": 11,
     "chapter": 4,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -13592,7 +13368,6 @@
     "order": 34,
     "linearnum": 12,
     "chapter": 4,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -13641,7 +13416,6 @@
     "order": 35,
     "linearnum": 1,
     "chapter": 4,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -13691,7 +13465,6 @@
     "order": 36,
     "linearnum": 2,
     "chapter": 4,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -13741,7 +13514,6 @@
     "order": 37,
     "linearnum": 3,
     "chapter": 4,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -13791,7 +13563,6 @@
     "order": 38,
     "linearnum": 4,
     "chapter": 4,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -13841,7 +13612,6 @@
     "order": 39,
     "linearnum": 5,
     "chapter": 4,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -13891,7 +13661,6 @@
     "order": 40,
     "linearnum": 6,
     "chapter": 4,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -13941,7 +13710,6 @@
     "order": 41,
     "linearnum": 7,
     "chapter": 4,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -13991,7 +13759,6 @@
     "order": 42,
     "linearnum": 8,
     "chapter": 4,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -14042,7 +13809,6 @@
     "order": 43,
     "linearnum": 9,
     "chapter": 5,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -14091,7 +13857,6 @@
     "order": 44,
     "linearnum": 10,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -14140,7 +13905,6 @@
     "order": 45,
     "linearnum": 11,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -14190,7 +13954,6 @@
     "order": 46,
     "linearnum": 12,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -14240,7 +14003,6 @@
     "order": 47,
     "linearnum": 1,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -14290,7 +14052,6 @@
     "order": 48,
     "linearnum": 2,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -14340,7 +14101,6 @@
     "order": 49,
     "linearnum": 3,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -14390,7 +14150,6 @@
     "order": 50,
     "linearnum": 4,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -14440,7 +14199,6 @@
     "order": 51,
     "linearnum": 5,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -14490,7 +14248,6 @@
     "order": 52,
     "linearnum": 6,
     "chapter": 5,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -14541,7 +14298,6 @@
     "order": 53,
     "linearnum": 7,
     "chapter": 6,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -14590,7 +14346,6 @@
     "order": 54,
     "linearnum": 8,
     "chapter": 6,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -14639,7 +14394,6 @@
     "order": 55,
     "linearnum": 9,
     "chapter": 6,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -14689,7 +14443,6 @@
     "order": 56,
     "linearnum": 10,
     "chapter": 6,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -14739,7 +14492,6 @@
     "order": 57,
     "linearnum": 11,
     "chapter": 6,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -14789,7 +14541,6 @@
     "order": 58,
     "linearnum": 12,
     "chapter": 6,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -14839,7 +14590,6 @@
     "order": 59,
     "linearnum": 1,
     "chapter": 6,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -14889,7 +14639,6 @@
     "order": 60,
     "linearnum": 2,
     "chapter": 6,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -14939,7 +14688,6 @@
     "order": 61,
     "linearnum": 3,
     "chapter": 6,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -14989,7 +14737,6 @@
     "order": 62,
     "linearnum": 4,
     "chapter": 6,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -15040,7 +14787,6 @@
     "order": 63,
     "linearnum": 5,
     "chapter": 7,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -15089,7 +14835,6 @@
     "order": 64,
     "linearnum": 6,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -15138,7 +14883,6 @@
     "order": 65,
     "linearnum": 7,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -15188,7 +14932,6 @@
     "order": 66,
     "linearnum": 8,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -15238,7 +14981,6 @@
     "order": 67,
     "linearnum": 9,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -15288,7 +15030,6 @@
     "order": 68,
     "linearnum": 10,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -15338,7 +15079,6 @@
     "order": 69,
     "linearnum": 11,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -15388,7 +15128,6 @@
     "order": 70,
     "linearnum": 12,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -15438,7 +15177,6 @@
     "order": 71,
     "linearnum": 1,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -15488,7 +15226,6 @@
     "order": 72,
     "linearnum": 2,
     "chapter": 7,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -15539,7 +15276,6 @@
     "order": 73,
     "linearnum": 3,
     "chapter": 8,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -15588,7 +15324,6 @@
     "order": 74,
     "linearnum": 4,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -15637,7 +15372,6 @@
     "order": 75,
     "linearnum": 5,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -15687,7 +15421,6 @@
     "order": 76,
     "linearnum": 6,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -15737,7 +15470,6 @@
     "order": 77,
     "linearnum": 7,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -15787,7 +15519,6 @@
     "order": 78,
     "linearnum": 8,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -15837,7 +15568,6 @@
     "order": 79,
     "linearnum": 9,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -15887,7 +15617,6 @@
     "order": 80,
     "linearnum": 10,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -15937,7 +15666,6 @@
     "order": 81,
     "linearnum": 11,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -15987,7 +15715,6 @@
     "order": 82,
     "linearnum": 12,
     "chapter": 8,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -16038,7 +15765,6 @@
     "order": 83,
     "linearnum": 1,
     "chapter": 9,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -16087,7 +15813,6 @@
     "order": 84,
     "linearnum": 2,
     "chapter": 9,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -16136,7 +15861,6 @@
     "order": 85,
     "linearnum": 3,
     "chapter": 9,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -16186,7 +15910,6 @@
     "order": 86,
     "linearnum": 4,
     "chapter": 9,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -16236,7 +15959,6 @@
     "order": 87,
     "linearnum": 5,
     "chapter": 9,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -16286,7 +16008,6 @@
     "order": 88,
     "linearnum": 6,
     "chapter": 9,
-    "route": 1,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -16336,7 +16057,6 @@
     "order": 89,
     "linearnum": 7,
     "chapter": 9,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -16386,7 +16106,6 @@
     "order": 90,
     "linearnum": 8,
     "chapter": 9,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -16436,7 +16155,6 @@
     "order": 91,
     "linearnum": 9,
     "chapter": 9,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -16486,7 +16204,6 @@
     "order": 92,
     "linearnum": 10,
     "chapter": 9,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -16537,7 +16254,6 @@
     "order": 93,
     "linearnum": 11,
     "chapter": 10,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -16586,7 +16302,6 @@
     "order": 94,
     "linearnum": 12,
     "chapter": 10,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -16635,7 +16350,6 @@
     "order": 95,
     "linearnum": 1,
     "chapter": 10,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -16685,7 +16399,6 @@
     "order": 96,
     "linearnum": 2,
     "chapter": 10,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -16735,7 +16448,6 @@
     "order": 97,
     "linearnum": 3,
     "chapter": 10,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -16785,7 +16497,6 @@
     "order": 98,
     "linearnum": 4,
     "chapter": 10,
-    "route": 2,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -16835,7 +16546,6 @@
     "order": 99,
     "linearnum": 5,
     "chapter": 10,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -16885,7 +16595,6 @@
     "order": 100,
     "linearnum": 6,
     "chapter": 10,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -16935,7 +16644,6 @@
     "order": 101,
     "linearnum": 7,
     "chapter": 10,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -16985,7 +16693,6 @@
     "order": 102,
     "linearnum": 8,
     "chapter": 10,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -17036,7 +16743,6 @@
     "order": 103,
     "linearnum": 9,
     "chapter": 11,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -17085,7 +16791,6 @@
     "order": 104,
     "linearnum": 10,
     "chapter": 11,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -17134,7 +16839,6 @@
     "order": 105,
     "linearnum": 11,
     "chapter": 11,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -17184,7 +16888,6 @@
     "order": 106,
     "linearnum": 12,
     "chapter": 11,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -17234,7 +16937,6 @@
     "order": 107,
     "linearnum": 1,
     "chapter": 11,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -17284,7 +16986,6 @@
     "order": 108,
     "linearnum": 2,
     "chapter": 11,
-    "route": 3,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -17334,7 +17035,6 @@
     "order": 109,
     "linearnum": 3,
     "chapter": 11,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -17384,7 +17084,6 @@
     "order": 110,
     "linearnum": 4,
     "chapter": 11,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -17434,7 +17133,6 @@
     "order": 111,
     "linearnum": 5,
     "chapter": 11,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -17484,7 +17182,6 @@
     "order": 112,
     "linearnum": 6,
     "chapter": 11,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
@@ -17535,7 +17232,6 @@
     "order": 113,
     "linearnum": 7,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -17584,7 +17280,6 @@
     "order": 114,
     "linearnum": 8,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 838,
@@ -17633,7 +17328,6 @@
     "order": 115,
     "linearnum": 9,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1570,
@@ -17683,7 +17377,6 @@
     "order": 116,
     "linearnum": 10,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2164,
@@ -17733,7 +17426,6 @@
     "order": 117,
     "linearnum": 11,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2687,
@@ -17783,7 +17475,6 @@
     "order": 118,
     "linearnum": 12,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2064,
@@ -17833,7 +17524,6 @@
     "order": 119,
     "linearnum": 8,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1369,
@@ -17883,7 +17573,6 @@
     "order": 120,
     "linearnum": 9,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 1424,
@@ -17933,7 +17622,6 @@
     "order": 121,
     "linearnum": 10,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 2000,
@@ -17983,7 +17671,6 @@
     "order": 122,
     "linearnum": 11,
     "chapter": 12,
-    "route": 4,
     "Episodetype": 1,
     "Episodelocation": {
       "x": 200,
diff --git a/bin/json/game_model.json b/bin/json/game_model.json
index 0c281717c..789e6236c 100644
--- a/bin/json/game_model.json
+++ b/bin/json/game_model.json
@@ -4,8 +4,8 @@
     "preson": "12003",
     "presonshow": "12003",
     "presonstory": "12003",
-    "height": 0.7829384,
-    "weight": 0.31803352,
+    "height": 1,
+    "weight": 0.1,
     "ico": "tx_js_25004",
     "fight": "ytx_js_25004",
     "img": "sbkp_js_12003",
@@ -28,7 +28,7 @@
     "preson": "13001",
     "presonshow": "13001",
     "presonstory": "13001",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_24003",
     "fight": "ytx_js_13001",
@@ -52,7 +52,7 @@
     "preson": "13002",
     "presonshow": "13002",
     "presonstory": "13002",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_24003",
     "fight": "ytx_js_13002",
@@ -76,7 +76,7 @@
     "preson": "13003",
     "presonshow": "13003",
     "presonstory": "13003",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_24003",
     "fight": "ytx_js_13003",
@@ -100,7 +100,7 @@
     "preson": "13004",
     "presonshow": "13004",
     "presonstory": "13004",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_24003",
     "fight": "ytx_js_13004",
@@ -124,7 +124,7 @@
     "preson": "13005",
     "presonshow": "13005",
     "presonstory": "13005",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_24003",
     "fight": "ytx_js_13005",
@@ -148,7 +148,7 @@
     "preson": "14001",
     "presonshow": "14001",
     "presonstory": "14001",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_24003",
     "fight": "ytx_js_14001",
@@ -172,7 +172,7 @@
     "preson": "14002",
     "presonshow": "14002",
     "presonstory": "14002",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_24003",
     "fight": "ytx_js_14002",
@@ -196,7 +196,7 @@
     "preson": "14003",
     "presonshow": "14003",
     "presonstory": "14003",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_24003",
     "fight": "ytx_js_14003",
@@ -220,7 +220,7 @@
     "preson": "14004",
     "presonshow": "14004",
     "presonstory": "14004",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_24003",
     "fight": "ytx_js_14004",
@@ -244,7 +244,7 @@
     "preson": "14005",
     "presonshow": "14005",
     "presonstory": "14005",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_24003",
     "fight": "ytx_js_14005",
@@ -268,7 +268,7 @@
     "preson": "14006",
     "presonshow": "14006",
     "presonstory": "14006",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_24003",
     "fight": "ytx_js_14006",
@@ -292,8 +292,8 @@
     "preson": "14007",
     "presonshow": "14007",
     "presonstory": "14007",
-    "height": 0.85105866,
-    "weight": 0.76853245,
+    "height": 1,
+    "weight": 1,
     "ico": "tx_hhjs_24003",
     "fight": "ytx_js_14007",
     "img": "sbkp_js_24003",
@@ -316,7 +316,7 @@
     "preson": "15001",
     "presonshow": "15001",
     "presonstory": "15001",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_24003",
     "fight": "ytx_js_15001",
@@ -340,7 +340,7 @@
     "preson": "15002",
     "presonshow": "15002",
     "presonstory": "15002",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_24003",
     "fight": "ytx_js_15002",
@@ -364,7 +364,7 @@
     "preson": "15003",
     "presonshow": "15003",
     "presonstory": "15003",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_24003",
     "fight": "ytx_js_15003",
@@ -388,8 +388,8 @@
     "preson": "15004",
     "presonshow": "15004",
     "presonstory": "15004",
-    "height": 1.4323738,
-    "weight": 0.85761625,
+    "height": 1,
+    "weight": 1,
     "ico": "tx_hhjs_24003",
     "fight": "ytx_js_15004",
     "img": "sbkp_js_24003",
@@ -412,8 +412,8 @@
     "preson": "15005",
     "presonshow": "15005",
     "presonstory": "15005",
-    "height": 2.411216,
-    "weight": 1.4189725,
+    "height": 1,
+    "weight": 1,
     "ico": "tx_hhjs_24003",
     "fight": "ytx_js_15005",
     "img": "sbkp_js_24003",
@@ -436,7 +436,7 @@
     "preson": "23001",
     "presonshow": "23001",
     "presonstory": "23001",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_24003",
     "fight": "ytx_js_23001",
@@ -460,7 +460,7 @@
     "preson": "23002",
     "presonshow": "23002",
     "presonstory": "23002",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_24003",
     "fight": "ytx_js_23002",
@@ -484,7 +484,7 @@
     "preson": "23003",
     "presonshow": "23003",
     "presonstory": "23003",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_24003",
     "fight": "ytx_js_23003",
@@ -508,7 +508,7 @@
     "preson": "23004",
     "presonshow": "23004",
     "presonstory": "23004",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_24003",
     "fight": "ytx_js_23004",
@@ -532,7 +532,7 @@
     "preson": "24001",
     "presonshow": "24001",
     "presonstory": "24001",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_24003",
     "fight": "ytx_js_24001",
@@ -556,8 +556,8 @@
     "preson": "24002",
     "presonshow": "24002",
     "presonstory": "24002",
-    "height": 1.8473234,
-    "weight": 0.9049654,
+    "height": 1,
+    "weight": 1,
     "ico": "tx_hhjs_24003",
     "fight": "ytx_js_24002",
     "img": "sbkp_js_24003",
@@ -580,8 +580,8 @@
     "preson": "24003",
     "presonshow": "24003",
     "presonstory": "24003",
-    "height": 1.881202,
-    "weight": 0.747842,
+    "height": 1,
+    "weight": 1,
     "ico": "tx_js_24003",
     "fight": "ytx_js_24003",
     "img": "sbkp_js_24003",
@@ -604,7 +604,7 @@
     "preson": "24004",
     "presonshow": "24004",
     "presonstory": "24004",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_js_25001",
     "fight": "ytx_js_24004",
@@ -628,7 +628,7 @@
     "preson": "24005",
     "presonshow": "24005",
     "presonstory": "24005",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_js_25001",
     "fight": "ytx_js_24005",
@@ -652,7 +652,7 @@
     "preson": "24006",
     "presonshow": "24006",
     "presonstory": "24006",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_js_25001",
     "fight": "ytx_js_24006",
@@ -676,7 +676,7 @@
     "preson": "24007",
     "presonshow": "24007",
     "presonstory": "24007",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_js_25001",
     "fight": "ytx_js_24007",
@@ -700,7 +700,7 @@
     "preson": "24008",
     "presonshow": "24008",
     "presonstory": "24008",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_js_25001",
     "fight": "ytx_js_24008",
@@ -724,7 +724,7 @@
     "preson": "24009",
     "presonshow": "24009",
     "presonstory": "24009",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_js_25001",
     "fight": "ytx_js_24009",
@@ -748,8 +748,8 @@
     "preson": "25001",
     "presonshow": "25001_exhibition",
     "presonstory": "25001_story",
-    "height": 2,
-    "weight": 1.6020712,
+    "height": 2.2,
+    "weight": 0.1,
     "ico": "tx_js_25001",
     "fight": "ytx_js_25001",
     "img": "sbkp_js_25001",
@@ -772,7 +772,7 @@
     "preson": "25002",
     "presonshow": "25002",
     "presonstory": "25002",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_js_25004",
     "fight": "ytx_js_25002",
@@ -796,7 +796,7 @@
     "preson": "25003",
     "presonshow": "25003",
     "presonstory": "25003",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_js_25004",
     "fight": "ytx_js_25003",
@@ -819,9 +819,9 @@
     "id": "25004",
     "preson": "25004",
     "presonshow": "25004_exhibition",
-    "presonstory": "25004",
-    "height": 0.7829384,
-    "weight": 0.31803352,
+    "presonstory": "25004_story",
+    "height": 0.8,
+    "weight": 0.1,
     "ico": "tx_js_25004",
     "fight": "ytx_js_25004",
     "img": "sbkp_js_25004",
@@ -844,7 +844,7 @@
     "preson": "33001",
     "presonshow": "33001",
     "presonstory": "33001",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_34006",
     "fight": "ytx_js_33001",
@@ -868,7 +868,7 @@
     "preson": "33002",
     "presonshow": "33002",
     "presonstory": "33002",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_34006",
     "fight": "ytx_js_33002",
@@ -892,7 +892,7 @@
     "preson": "33003",
     "presonshow": "33003",
     "presonstory": "33003",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_34006",
     "fight": "ytx_js_33003",
@@ -916,7 +916,7 @@
     "preson": "33004",
     "presonshow": "33004",
     "presonstory": "33004",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_34006",
     "fight": "ytx_js_33004",
@@ -940,7 +940,7 @@
     "preson": "33005",
     "presonshow": "33005",
     "presonstory": "33005",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_34006",
     "fight": "ytx_js_33005",
@@ -964,7 +964,7 @@
     "preson": "33006",
     "presonshow": "33006",
     "presonstory": "33006",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_34006",
     "fight": "ytx_js_33006",
@@ -988,7 +988,7 @@
     "preson": "34001",
     "presonshow": "34001",
     "presonstory": "34001",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_34006",
     "fight": "ytx_js_34001",
@@ -1012,7 +1012,7 @@
     "preson": "34002",
     "presonshow": "34002",
     "presonstory": "34002",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_34006",
     "fight": "ytx_js_34002",
@@ -1036,7 +1036,7 @@
     "preson": "34003",
     "presonshow": "34003",
     "presonstory": "34003",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_34006",
     "fight": "ytx_js_34003",
@@ -1060,8 +1060,8 @@
     "preson": "34004",
     "presonshow": "34004",
     "presonstory": "34004",
-    "height": 1.7591145,
-    "weight": 0.73550177,
+    "height": 1,
+    "weight": 1,
     "ico": "tx_hhjs_34006",
     "fight": "ytx_js_34004",
     "img": "sbkp_js_34006",
@@ -1084,7 +1084,7 @@
     "preson": "34005",
     "presonshow": "34005",
     "presonstory": "34005",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_34006",
     "fight": "ytx_js_34005",
@@ -1108,8 +1108,8 @@
     "preson": "34006",
     "presonshow": "34006",
     "presonstory": "34006",
-    "height": 0.34745464,
-    "weight": 0.5590392,
+    "height": 1,
+    "weight": 1,
     "ico": "tx_js_34006",
     "fight": "ytx_js_34006",
     "img": "sbkp_js_34006",
@@ -1132,7 +1132,7 @@
     "preson": "34007",
     "presonshow": "34007",
     "presonstory": "34007",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_34007",
@@ -1156,7 +1156,7 @@
     "preson": "34008",
     "presonshow": "34008",
     "presonstory": "34008",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_34008",
@@ -1179,9 +1179,9 @@
     "id": "35001",
     "preson": "35001",
     "presonshow": "35001",
-    "presonstory": "35001",
-    "height": 1.2926539,
-    "weight": 0.89468586,
+    "presonstory": "35001_story",
+    "height": 1,
+    "weight": 1,
     "ico": "tx_js_35001",
     "fight": "ytx_js_35001",
     "img": "sbkp_js_35001",
@@ -1203,9 +1203,9 @@
     "id": "35002",
     "preson": "35002",
     "presonshow": "35002",
-    "presonstory": "35002",
-    "height": 1.9970105,
-    "weight": 0.72512907,
+    "presonstory": "35002_story",
+    "height": 1,
+    "weight": 1,
     "ico": "tx_js_35002",
     "fight": "ytx_js_35002",
     "img": "sbkp_js_35002",
@@ -1228,7 +1228,7 @@
     "preson": "35003",
     "presonshow": "35003",
     "presonstory": "35003",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_35003",
@@ -1252,7 +1252,7 @@
     "preson": "35004",
     "presonshow": "35004",
     "presonstory": "35004",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_35004",
@@ -1276,7 +1276,7 @@
     "preson": "35005",
     "presonshow": "35005",
     "presonstory": "35005",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_35005",
@@ -1300,7 +1300,7 @@
     "preson": "35006",
     "presonshow": "35006",
     "presonstory": "35006",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_35006",
@@ -1324,7 +1324,7 @@
     "preson": "43001",
     "presonshow": "43001",
     "presonstory": "43001",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_43001",
@@ -1348,7 +1348,7 @@
     "preson": "43002",
     "presonshow": "43002",
     "presonstory": "43002",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_43002",
@@ -1372,7 +1372,7 @@
     "preson": "43003",
     "presonshow": "43003",
     "presonstory": "43003",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_43003",
@@ -1396,7 +1396,7 @@
     "preson": "43004",
     "presonshow": "43004",
     "presonstory": "43004",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_43004",
@@ -1420,7 +1420,7 @@
     "preson": "43005",
     "presonshow": "43005",
     "presonstory": "43005",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_43005",
@@ -1444,7 +1444,7 @@
     "preson": "43006",
     "presonshow": "43006",
     "presonstory": "43006",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_43006",
@@ -1468,7 +1468,7 @@
     "preson": "43007",
     "presonshow": "43007",
     "presonstory": "43007",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_43007",
@@ -1492,7 +1492,7 @@
     "preson": "44001",
     "presonshow": "44001",
     "presonstory": "44001",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_44001",
@@ -1516,7 +1516,7 @@
     "preson": "44002",
     "presonshow": "44002",
     "presonstory": "44002",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_44002",
@@ -1540,7 +1540,7 @@
     "preson": "44003",
     "presonshow": "44003",
     "presonstory": "44003",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_44003",
@@ -1564,7 +1564,7 @@
     "preson": "44004",
     "presonshow": "44004",
     "presonstory": "44004",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_44004",
@@ -1588,8 +1588,8 @@
     "preson": "44005",
     "presonshow": "44005",
     "presonstory": "44005_story",
-    "height": 2.0109868,
-    "weight": 1.0673661,
+    "height": 1.5,
+    "weight": 0.3,
     "ico": "tx_js_44005",
     "fight": "ytx_js_44005",
     "img": "sbkp_js_44005",
@@ -1612,8 +1612,8 @@
     "preson": "44006",
     "presonshow": "44006",
     "presonstory": "44006",
-    "height": 2.1711943,
-    "weight": 1.4083804,
+    "height": 1,
+    "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_44006",
     "img": "sbkp_js_35002",
@@ -1636,7 +1636,7 @@
     "preson": "45001",
     "presonshow": "45001",
     "presonstory": "45001",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_45001",
@@ -1660,7 +1660,7 @@
     "preson": "45002",
     "presonshow": "45002",
     "presonstory": "45002",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_45002",
@@ -1684,8 +1684,8 @@
     "preson": "45003",
     "presonshow": "45003",
     "presonstory": "45003",
-    "height": 2.0389562,
-    "weight": 0.6590784,
+    "height": 1,
+    "weight": 1,
     "ico": "tx_hhjs_45003",
     "fight": "ytx_js_45003",
     "img": "sbkp_js_45003",
@@ -1708,7 +1708,7 @@
     "preson": "45004",
     "presonshow": "45004",
     "presonstory": "45004",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_45004",
@@ -1732,7 +1732,7 @@
     "preson": "43901",
     "presonshow": "43901",
     "presonstory": "43901",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_43901",
@@ -1756,7 +1756,7 @@
     "preson": "42911",
     "presonshow": "42911",
     "presonstory": "42911",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_42911",
@@ -1780,7 +1780,7 @@
     "preson": "43911",
     "presonshow": "43911",
     "presonstory": "43911",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_43911",
@@ -1804,7 +1804,7 @@
     "preson": "44911",
     "presonshow": "44911",
     "presonstory": "44911",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_44911",
@@ -1828,7 +1828,7 @@
     "preson": "43921",
     "presonshow": "43921",
     "presonstory": "43921",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_35002",
@@ -1852,7 +1852,7 @@
     "preson": "44921",
     "presonshow": "44921",
     "presonstory": "44921",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_35002",
@@ -1876,7 +1876,7 @@
     "preson": "45921",
     "presonshow": "45921",
     "presonstory": "45921",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_35002",
@@ -1900,7 +1900,7 @@
     "preson": "51001",
     "presonshow": "51001",
     "presonstory": "51001",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_51001",
@@ -1924,7 +1924,7 @@
     "preson": "51002",
     "presonshow": "51002",
     "presonstory": "51002",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_51002",
@@ -1948,7 +1948,7 @@
     "preson": "51003",
     "presonshow": "51003",
     "presonstory": "51003",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_51003",
@@ -1972,7 +1972,7 @@
     "preson": "51004",
     "presonshow": "51004",
     "presonstory": "51004",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_51004",
@@ -1996,7 +1996,7 @@
     "preson": "51005",
     "presonshow": "51005",
     "presonstory": "51005",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_51005",
@@ -2020,7 +2020,7 @@
     "preson": "51006",
     "presonshow": "51006",
     "presonstory": "51006",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_51006",
@@ -2044,7 +2044,7 @@
     "preson": "51007",
     "presonshow": "51007",
     "presonstory": "51007",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_51007",
@@ -2068,7 +2068,7 @@
     "preson": "51008",
     "presonshow": "51008",
     "presonstory": "51008",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_51008",
@@ -2092,7 +2092,7 @@
     "preson": "51009",
     "presonshow": "51009",
     "presonstory": "51009",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_51009",
@@ -2116,7 +2116,7 @@
     "preson": "51010",
     "presonshow": "51010",
     "presonstory": "51010",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_51010",
@@ -2140,7 +2140,7 @@
     "preson": "51011",
     "presonshow": "51011",
     "presonstory": "51011",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_51011",
@@ -2164,7 +2164,7 @@
     "preson": "51012",
     "presonshow": "51012",
     "presonstory": "51012",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_51012",
@@ -2188,7 +2188,7 @@
     "preson": "51013",
     "presonshow": "51013",
     "presonstory": "51013",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_51013",
@@ -2212,7 +2212,7 @@
     "preson": "51014",
     "presonshow": "51014",
     "presonstory": "51014",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_51014",
@@ -2236,7 +2236,7 @@
     "preson": "53001",
     "presonshow": "53001",
     "presonstory": "53001",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_53001",
@@ -2260,7 +2260,7 @@
     "preson": "53002",
     "presonshow": "53002",
     "presonstory": "53002",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_53002",
@@ -2284,7 +2284,7 @@
     "preson": "53003",
     "presonshow": "53003",
     "presonstory": "53003",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_53003",
@@ -2308,7 +2308,7 @@
     "preson": "53004",
     "presonshow": "53004",
     "presonstory": "53004",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_53004",
@@ -2332,7 +2332,7 @@
     "preson": "53005",
     "presonshow": "53005",
     "presonstory": "53005",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_53005",
@@ -2356,7 +2356,7 @@
     "preson": "53006",
     "presonshow": "53006",
     "presonstory": "53006",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_53006",
@@ -2380,7 +2380,7 @@
     "preson": "55001",
     "presonshow": "55001",
     "presonstory": "55001",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_55001",
@@ -2404,7 +2404,7 @@
     "preson": "55002",
     "presonshow": "55002",
     "presonstory": "55002",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_55002",
@@ -2428,7 +2428,7 @@
     "preson": "55002",
     "presonshow": "55002",
     "presonstory": "55002",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_55003",
@@ -2452,7 +2452,7 @@
     "preson": "55004",
     "presonshow": "55004",
     "presonstory": "55004",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_55004",
@@ -2476,7 +2476,7 @@
     "preson": "55004",
     "presonshow": "55004",
     "presonstory": "55004",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_55005",
@@ -2500,7 +2500,7 @@
     "preson": "55006",
     "presonshow": "55006",
     "presonstory": "55006",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_55006",
@@ -2524,7 +2524,7 @@
     "preson": "55007",
     "presonshow": "55007",
     "presonstory": "55007",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_55007",
@@ -2548,7 +2548,7 @@
     "preson": "63002",
     "presonshow": "63002",
     "presonstory": "63002",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_63002",
@@ -2572,7 +2572,7 @@
     "preson": "63003",
     "presonshow": "63003",
     "presonstory": "63003",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_63003",
@@ -2596,7 +2596,7 @@
     "preson": "63004",
     "presonshow": "63004",
     "presonstory": "63004",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_63004",
@@ -2620,7 +2620,7 @@
     "preson": "64003",
     "presonshow": "64003",
     "presonstory": "64003",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_64003",
@@ -2644,7 +2644,7 @@
     "preson": "74002",
     "presonshow": "74002",
     "presonstory": "74002",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_74002",
@@ -2668,7 +2668,7 @@
     "preson": "74003",
     "presonshow": "74003",
     "presonstory": "74003",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_74003",
@@ -2692,7 +2692,7 @@
     "preson": "74004",
     "presonshow": "74004",
     "presonstory": "74004",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_74004",
@@ -2716,7 +2716,7 @@
     "preson": "83002",
     "presonshow": "83002",
     "presonstory": "83002",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_83002",
@@ -2740,7 +2740,7 @@
     "preson": "83006",
     "presonshow": "83006",
     "presonstory": "83006",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_83006",
@@ -2764,7 +2764,7 @@
     "preson": "84002",
     "presonshow": "84002",
     "presonstory": "84002",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_84002",
@@ -2788,7 +2788,7 @@
     "preson": "94002",
     "presonshow": "94002",
     "presonstory": "94002",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_94002",
@@ -2812,7 +2812,7 @@
     "preson": "94005",
     "presonshow": "94005",
     "presonstory": "94005",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_94005",
@@ -2836,7 +2836,7 @@
     "preson": "64007",
     "presonshow": "64007",
     "presonstory": "64007",
-    "height": 2,
+    "height": 1,
     "weight": 1,
     "ico": "tx_hhjs_35002",
     "fight": "ytx_js_64007",
diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json
index da554f417..aa1cd8b16 100644
--- a/bin/json/game_opencond.json
+++ b/bin/json/game_opencond.json
@@ -5,14 +5,14 @@
       "key": "opencond_name_10002",
       "text": "英雄"
     },
-    "main": 0,
+    "main": 1,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "",
-      "text": ""
+      "key": "opencond_prompt_hero",
+      "text": "玩家达到1级解锁"
     },
     "uiid": 0
   },
@@ -22,14 +22,14 @@
       "key": "opencond_name_10006",
       "text": "背包"
     },
-    "main": 0,
+    "main": 2,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "",
-      "text": ""
+      "key": "opencond_prompt_backpack",
+      "text": "玩家达到2级解锁"
     },
     "uiid": 0
   },
@@ -39,14 +39,14 @@
       "key": "opencond_name_10003",
       "text": "商店"
     },
-    "main": 999,
+    "main": 3,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_shop",
+      "text": "玩家达到3级解锁"
     },
     "uiid": 1
   },
@@ -56,14 +56,14 @@
       "key": "opencond_name_10004",
       "text": "好友"
     },
-    "main": 999,
+    "main": 4,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_friend",
+      "text": "玩家达到4级解锁"
     },
     "uiid": 0
   },
@@ -73,14 +73,14 @@
       "key": "opencond_name_10007",
       "text": "活动"
     },
-    "main": 999,
+    "main": 5,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_alliance",
+      "text": "玩家达到5级解锁"
     },
     "uiid": 0
   },
@@ -90,14 +90,14 @@
       "key": "opencond_name_10005",
       "text": "任务"
     },
-    "main": 999,
+    "main": 6,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "",
-      "text": ""
+      "key": "opencond_prompt_task",
+      "text": "玩家达到6级解锁"
     },
     "uiid": 0
   },
@@ -107,14 +107,14 @@
       "key": "num_1001",
       "text": "主线入口"
     },
-    "main": 0,
+    "main": 7,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "",
-      "text": ""
+      "key": "opencond_prompt_trials",
+      "text": "玩家达到7级解锁"
     },
     "uiid": 0
   },
@@ -124,14 +124,14 @@
       "key": "num_1002",
       "text": "招募"
     },
-    "main": 0,
+    "main": 8,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_moon",
+      "text": "玩家达到8级解锁"
     },
     "uiid": 0
   },
@@ -141,14 +141,14 @@
       "key": "num_1003",
       "text": "剧情副本"
     },
-    "main": 999,
+    "main": 9,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_story",
+      "text": "玩家达到9级解锁"
     },
     "uiid": 0
   },
@@ -158,14 +158,14 @@
       "key": "num_1004",
       "text": "武馆入口"
     },
-    "main": 0,
+    "main": 10,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_kungfu",
+      "text": "玩家达到10级解锁"
     },
     "uiid": 0
   },
@@ -175,14 +175,14 @@
       "key": "num_1005",
       "text": "主题活动入口"
     },
-    "main": 999,
+    "main": 11,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_event",
+      "text": "玩家达到11级解锁"
     },
     "uiid": 0
   },
@@ -192,14 +192,14 @@
       "key": "num_1006",
       "text": "迷雾岛屿"
     },
-    "main": 999,
+    "main": 12,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_mistyIsland",
+      "text": "玩家达到12级解锁"
     },
     "uiid": 0
   },
@@ -209,14 +209,14 @@
       "key": "num_1007",
       "text": "维京远征"
     },
-    "main": 0,
+    "main": 13,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_vikingexpedition",
+      "text": "玩家达到13级解锁"
     },
     "uiid": 0
   },
@@ -226,14 +226,14 @@
       "key": "num_1007",
       "text": "维京远征"
     },
-    "main": 0,
+    "main": 14,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_vikingexpedition2",
+      "text": "玩家达到14级解锁"
     },
     "uiid": 0
   },
@@ -243,14 +243,14 @@
       "key": "num_1007",
       "text": "维京远征"
     },
-    "main": 0,
+    "main": 15,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_vikingexpedition3",
+      "text": "玩家达到15级解锁"
     },
     "uiid": 0
   },
@@ -260,14 +260,14 @@
       "key": "num_1008",
       "text": "心魔塔"
     },
-    "main": 0,
+    "main": 16,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_hjeart demon tower",
+      "text": "玩家达到16级解锁"
     },
     "uiid": 0
   },
@@ -277,14 +277,14 @@
       "key": "num_1009",
       "text": "捕羊大赛"
     },
-    "main": 999,
+    "main": 17,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_catchsheep",
+      "text": "玩家达到17级解锁"
     },
     "uiid": 0
   },
@@ -294,14 +294,14 @@
       "key": "num_1010",
       "text": "黑暗料理大赛"
     },
-    "main": 999,
+    "main": 18,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_darkcuisine",
+      "text": "玩家达到18级解锁"
     },
     "uiid": 0
   },
@@ -311,14 +311,14 @@
       "key": "num_1011",
       "text": "地下角斗场"
     },
-    "main": 999,
+    "main": 19,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_underground Arena",
+      "text": "玩家达到19级解锁"
     },
     "uiid": 0
   },
@@ -328,14 +328,14 @@
       "key": "num_1012",
       "text": "疯狂竞技赛"
     },
-    "main": 999,
+    "main": 20,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_crazycompetition",
+      "text": "玩家达到20级解锁"
     },
     "uiid": 0
   },
@@ -345,14 +345,14 @@
       "key": "num_1013",
       "text": "五侠擂台"
     },
-    "main": 999,
+    "main": 21,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_fiveheroeschallenge",
+      "text": "玩家达到21级解锁"
     },
     "uiid": 0
   },
@@ -362,14 +362,14 @@
       "key": "num_1014",
       "text": "藏书馆"
     },
-    "main": 999,
+    "main": 22,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "",
-      "text": ""
+      "key": "opencond_prompt_library",
+      "text": "玩家达到22级解锁"
     },
     "uiid": 0
   },
@@ -379,14 +379,14 @@
       "key": "num_1015",
       "text": "篝火舞会"
     },
-    "main": 999,
+    "main": 23,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_bonfiredance",
+      "text": "玩家达到23级解锁"
     },
     "uiid": 0
   },
@@ -396,14 +396,14 @@
       "key": "num_1016",
       "text": "商队"
     },
-    "main": 999,
+    "main": 24,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_caravan",
+      "text": "玩家达到24级解锁"
     },
     "uiid": 0
   },
@@ -413,14 +413,14 @@
       "key": "num_1017",
       "text": "美食馆"
     },
-    "main": 0,
+    "main": 25,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_gourmetrestaurant",
+      "text": "玩家达到25级解锁"
     },
     "uiid": 0
   },
@@ -430,14 +430,14 @@
       "key": "num_1018",
       "text": "戈伯铁匠铺"
     },
-    "main": 0,
+    "main": 26,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_goberblacksmithshop",
+      "text": "玩家达到26级解锁"
     },
     "uiid": 0
   },
@@ -447,14 +447,14 @@
       "key": "num_1019",
       "text": "狩猎"
     },
-    "main": 0,
+    "main": 27,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_hunting",
+      "text": "玩家达到27级解锁"
     },
     "uiid": 0
   },
@@ -468,10 +468,10 @@
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_channel_lock_icon",
+      "text": "玩家达到10级解锁"
     },
     "uiid": 0
   },
@@ -485,10 +485,10 @@
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_channel_lock_world",
+      "text": "玩家达到10级解锁"
     },
     "uiid": 0
   },
@@ -502,10 +502,10 @@
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_channel_lock_guild",
+      "text": "玩家达到20级解锁"
     },
     "uiid": 0
   },
@@ -519,10 +519,10 @@
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_channel_lock_private",
+      "text": "玩家达到15级解锁"
     },
     "uiid": 0
   },
@@ -536,10 +536,10 @@
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_channel_lock_public",
+      "text": "玩家达到40级解锁"
     },
     "uiid": 0
   },
@@ -553,10 +553,10 @@
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
-    "img": "",
+    "img": "zc_icon_01",
     "prompt": {
-      "key": "opencond_prompt_10002",
-      "text": "暂不开启，敬请期待"
+      "key": "opencond_prompt_channel_lock_system",
+      "text": "玩家达到10级解锁"
     },
     "uiid": 0
   }
diff --git a/bin/json/game_pagoda.json b/bin/json/game_pagoda.json
index 3a111fb10..9535169b7 100644
--- a/bin/json/game_pagoda.json
+++ b/bin/json/game_pagoda.json
@@ -28,7 +28,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第1层",
+    "name_display": {
+      "key": "pagoda_layer1",
+      "text": "第1层"
+    },
     "model_display": 250015
   },
   {
@@ -60,7 +63,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第2层",
+    "name_display": {
+      "key": "pagoda_layer2",
+      "text": "第2层"
+    },
     "model_display": 340065
   },
   {
@@ -92,7 +98,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第3层",
+    "name_display": {
+      "key": "pagoda_layer3",
+      "text": "第3层"
+    },
     "model_display": 250015
   },
   {
@@ -124,7 +133,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第4层",
+    "name_display": {
+      "key": "pagoda_layer4",
+      "text": "第4层"
+    },
     "model_display": 340065
   },
   {
@@ -156,7 +168,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第5层",
+    "name_display": {
+      "key": "pagoda_layer5",
+      "text": "第5层"
+    },
     "model_display": 250015
   },
   {
@@ -188,7 +203,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第6层",
+    "name_display": {
+      "key": "pagoda_layer6",
+      "text": "第6层"
+    },
     "model_display": 340065
   },
   {
@@ -220,7 +238,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第7层",
+    "name_display": {
+      "key": "pagoda_layer7",
+      "text": "第7层"
+    },
     "model_display": 250015
   },
   {
@@ -252,7 +273,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第8层",
+    "name_display": {
+      "key": "pagoda_layer8",
+      "text": "第8层"
+    },
     "model_display": 340065
   },
   {
@@ -284,7 +308,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第9层",
+    "name_display": {
+      "key": "pagoda_layer9",
+      "text": "第9层"
+    },
     "model_display": 250015
   },
   {
@@ -316,7 +343,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第10层",
+    "name_display": {
+      "key": "pagoda_layer10",
+      "text": "第10层"
+    },
     "model_display": 340065
   },
   {
@@ -348,7 +378,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第11层",
+    "name_display": {
+      "key": "pagoda_layer11",
+      "text": "第11层"
+    },
     "model_display": 250015
   },
   {
@@ -380,7 +413,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第12层",
+    "name_display": {
+      "key": "pagoda_layer12",
+      "text": "第12层"
+    },
     "model_display": 340065
   },
   {
@@ -412,7 +448,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第13层",
+    "name_display": {
+      "key": "pagoda_layer13",
+      "text": "第13层"
+    },
     "model_display": 250015
   },
   {
@@ -444,7 +483,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第14层",
+    "name_display": {
+      "key": "pagoda_layer14",
+      "text": "第14层"
+    },
     "model_display": 340065
   },
   {
@@ -476,7 +518,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第15层",
+    "name_display": {
+      "key": "pagoda_layer15",
+      "text": "第15层"
+    },
     "model_display": 250015
   },
   {
@@ -508,7 +553,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第16层",
+    "name_display": {
+      "key": "pagoda_layer16",
+      "text": "第16层"
+    },
     "model_display": 340065
   },
   {
@@ -540,7 +588,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第17层",
+    "name_display": {
+      "key": "pagoda_layer17",
+      "text": "第17层"
+    },
     "model_display": 250015
   },
   {
@@ -572,7 +623,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第18层",
+    "name_display": {
+      "key": "pagoda_layer18",
+      "text": "第18层"
+    },
     "model_display": 340065
   },
   {
@@ -604,7 +658,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第19层",
+    "name_display": {
+      "key": "pagoda_layer19",
+      "text": "第19层"
+    },
     "model_display": 250015
   },
   {
@@ -636,7 +693,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第20层",
+    "name_display": {
+      "key": "pagoda_layer20",
+      "text": "第20层"
+    },
     "model_display": 340065
   },
   {
@@ -668,7 +728,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第21层",
+    "name_display": {
+      "key": "pagoda_layer21",
+      "text": "第21层"
+    },
     "model_display": 340065
   },
   {
@@ -700,7 +763,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第22层",
+    "name_display": {
+      "key": "pagoda_layer22",
+      "text": "第22层"
+    },
     "model_display": 340065
   },
   {
@@ -732,7 +798,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第23层",
+    "name_display": {
+      "key": "pagoda_layer23",
+      "text": "第23层"
+    },
     "model_display": 340065
   },
   {
@@ -764,7 +833,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第24层",
+    "name_display": {
+      "key": "pagoda_layer24",
+      "text": "第24层"
+    },
     "model_display": 340065
   },
   {
@@ -796,7 +868,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第25层",
+    "name_display": {
+      "key": "pagoda_layer25",
+      "text": "第25层"
+    },
     "model_display": 340065
   },
   {
@@ -828,7 +903,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第26层",
+    "name_display": {
+      "key": "pagoda_layer26",
+      "text": "第26层"
+    },
     "model_display": 340065
   },
   {
@@ -860,7 +938,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第27层",
+    "name_display": {
+      "key": "pagoda_layer27",
+      "text": "第27层"
+    },
     "model_display": 340065
   },
   {
@@ -892,7 +973,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第28层",
+    "name_display": {
+      "key": "pagoda_layer28",
+      "text": "第28层"
+    },
     "model_display": 340065
   },
   {
@@ -924,7 +1008,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第29层",
+    "name_display": {
+      "key": "pagoda_layer29",
+      "text": "第29层"
+    },
     "model_display": 340065
   },
   {
@@ -956,7 +1043,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第30层",
+    "name_display": {
+      "key": "pagoda_layer30",
+      "text": "第30层"
+    },
     "model_display": 340065
   },
   {
@@ -988,7 +1078,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第31层",
+    "name_display": {
+      "key": "pagoda_layer31",
+      "text": "第31层"
+    },
     "model_display": 340065
   },
   {
@@ -1020,7 +1113,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第32层",
+    "name_display": {
+      "key": "pagoda_layer32",
+      "text": "第32层"
+    },
     "model_display": 340065
   },
   {
@@ -1052,7 +1148,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第33层",
+    "name_display": {
+      "key": "pagoda_layer33",
+      "text": "第33层"
+    },
     "model_display": 340065
   },
   {
@@ -1084,7 +1183,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第34层",
+    "name_display": {
+      "key": "pagoda_layer34",
+      "text": "第34层"
+    },
     "model_display": 340065
   },
   {
@@ -1116,7 +1218,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第35层",
+    "name_display": {
+      "key": "pagoda_layer35",
+      "text": "第35层"
+    },
     "model_display": 340065
   },
   {
@@ -1148,7 +1253,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第36层",
+    "name_display": {
+      "key": "pagoda_layer36",
+      "text": "第36层"
+    },
     "model_display": 340065
   },
   {
@@ -1180,7 +1288,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第37层",
+    "name_display": {
+      "key": "pagoda_layer37",
+      "text": "第37层"
+    },
     "model_display": 340065
   },
   {
@@ -1212,7 +1323,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第38层",
+    "name_display": {
+      "key": "pagoda_layer38",
+      "text": "第38层"
+    },
     "model_display": 340065
   },
   {
@@ -1244,7 +1358,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第39层",
+    "name_display": {
+      "key": "pagoda_layer39",
+      "text": "第39层"
+    },
     "model_display": 340065
   },
   {
@@ -1276,7 +1393,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第40层",
+    "name_display": {
+      "key": "pagoda_layer40",
+      "text": "第40层"
+    },
     "model_display": 340065
   },
   {
@@ -1308,7 +1428,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第41层",
+    "name_display": {
+      "key": "pagoda_layer41",
+      "text": "第41层"
+    },
     "model_display": 340065
   },
   {
@@ -1340,7 +1463,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第42层",
+    "name_display": {
+      "key": "pagoda_layer42",
+      "text": "第42层"
+    },
     "model_display": 340065
   },
   {
@@ -1372,7 +1498,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第43层",
+    "name_display": {
+      "key": "pagoda_layer43",
+      "text": "第43层"
+    },
     "model_display": 340065
   },
   {
@@ -1404,7 +1533,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第44层",
+    "name_display": {
+      "key": "pagoda_layer44",
+      "text": "第44层"
+    },
     "model_display": 340065
   },
   {
@@ -1436,7 +1568,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第45层",
+    "name_display": {
+      "key": "pagoda_layer45",
+      "text": "第45层"
+    },
     "model_display": 340065
   },
   {
@@ -1468,7 +1603,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第46层",
+    "name_display": {
+      "key": "pagoda_layer46",
+      "text": "第46层"
+    },
     "model_display": 340065
   },
   {
@@ -1500,7 +1638,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第47层",
+    "name_display": {
+      "key": "pagoda_layer47",
+      "text": "第47层"
+    },
     "model_display": 340065
   },
   {
@@ -1532,7 +1673,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第48层",
+    "name_display": {
+      "key": "pagoda_layer48",
+      "text": "第48层"
+    },
     "model_display": 340065
   },
   {
@@ -1564,7 +1708,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第49层",
+    "name_display": {
+      "key": "pagoda_layer49",
+      "text": "第49层"
+    },
     "model_display": 340065
   },
   {
@@ -1596,7 +1743,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第50层",
+    "name_display": {
+      "key": "pagoda_layer50",
+      "text": "第50层"
+    },
     "model_display": 340065
   },
   {
@@ -1628,7 +1778,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第51层",
+    "name_display": {
+      "key": "pagoda_layer51",
+      "text": "第51层"
+    },
     "model_display": 340065
   },
   {
@@ -1660,7 +1813,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第52层",
+    "name_display": {
+      "key": "pagoda_layer52",
+      "text": "第52层"
+    },
     "model_display": 340065
   },
   {
@@ -1692,7 +1848,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第53层",
+    "name_display": {
+      "key": "pagoda_layer53",
+      "text": "第53层"
+    },
     "model_display": 340065
   },
   {
@@ -1724,7 +1883,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第54层",
+    "name_display": {
+      "key": "pagoda_layer54",
+      "text": "第54层"
+    },
     "model_display": 340065
   },
   {
@@ -1756,7 +1918,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第55层",
+    "name_display": {
+      "key": "pagoda_layer55",
+      "text": "第55层"
+    },
     "model_display": 340065
   },
   {
@@ -1788,7 +1953,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第56层",
+    "name_display": {
+      "key": "pagoda_layer56",
+      "text": "第56层"
+    },
     "model_display": 340065
   },
   {
@@ -1820,7 +1988,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第57层",
+    "name_display": {
+      "key": "pagoda_layer57",
+      "text": "第57层"
+    },
     "model_display": 340065
   },
   {
@@ -1852,7 +2023,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第58层",
+    "name_display": {
+      "key": "pagoda_layer58",
+      "text": "第58层"
+    },
     "model_display": 340065
   },
   {
@@ -1884,7 +2058,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第59层",
+    "name_display": {
+      "key": "pagoda_layer59",
+      "text": "第59层"
+    },
     "model_display": 340065
   },
   {
@@ -1916,7 +2093,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第60层",
+    "name_display": {
+      "key": "pagoda_layer60",
+      "text": "第60层"
+    },
     "model_display": 340065
   },
   {
@@ -1948,7 +2128,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第61层",
+    "name_display": {
+      "key": "pagoda_layer61",
+      "text": "第61层"
+    },
     "model_display": 340065
   },
   {
@@ -1980,7 +2163,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第62层",
+    "name_display": {
+      "key": "pagoda_layer62",
+      "text": "第62层"
+    },
     "model_display": 340065
   },
   {
@@ -2012,7 +2198,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第63层",
+    "name_display": {
+      "key": "pagoda_layer63",
+      "text": "第63层"
+    },
     "model_display": 340065
   },
   {
@@ -2044,7 +2233,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第64层",
+    "name_display": {
+      "key": "pagoda_layer64",
+      "text": "第64层"
+    },
     "model_display": 340065
   },
   {
@@ -2076,7 +2268,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第65层",
+    "name_display": {
+      "key": "pagoda_layer65",
+      "text": "第65层"
+    },
     "model_display": 340065
   },
   {
@@ -2108,7 +2303,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第66层",
+    "name_display": {
+      "key": "pagoda_layer66",
+      "text": "第66层"
+    },
     "model_display": 340065
   },
   {
@@ -2140,7 +2338,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第67层",
+    "name_display": {
+      "key": "pagoda_layer67",
+      "text": "第67层"
+    },
     "model_display": 340065
   },
   {
@@ -2172,7 +2373,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第68层",
+    "name_display": {
+      "key": "pagoda_layer68",
+      "text": "第68层"
+    },
     "model_display": 340065
   },
   {
@@ -2204,7 +2408,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第69层",
+    "name_display": {
+      "key": "pagoda_layer69",
+      "text": "第69层"
+    },
     "model_display": 340065
   },
   {
@@ -2236,7 +2443,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第70层",
+    "name_display": {
+      "key": "pagoda_layer70",
+      "text": "第70层"
+    },
     "model_display": 340065
   },
   {
@@ -2268,7 +2478,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第71层",
+    "name_display": {
+      "key": "pagoda_layer71",
+      "text": "第71层"
+    },
     "model_display": 340065
   },
   {
@@ -2300,7 +2513,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第72层",
+    "name_display": {
+      "key": "pagoda_layer72",
+      "text": "第72层"
+    },
     "model_display": 340065
   },
   {
@@ -2332,7 +2548,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第73层",
+    "name_display": {
+      "key": "pagoda_layer73",
+      "text": "第73层"
+    },
     "model_display": 340065
   },
   {
@@ -2364,7 +2583,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第74层",
+    "name_display": {
+      "key": "pagoda_layer74",
+      "text": "第74层"
+    },
     "model_display": 340065
   },
   {
@@ -2396,7 +2618,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第75层",
+    "name_display": {
+      "key": "pagoda_layer75",
+      "text": "第75层"
+    },
     "model_display": 340065
   },
   {
@@ -2428,7 +2653,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第76层",
+    "name_display": {
+      "key": "pagoda_layer76",
+      "text": "第76层"
+    },
     "model_display": 340065
   },
   {
@@ -2460,7 +2688,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第77层",
+    "name_display": {
+      "key": "pagoda_layer77",
+      "text": "第77层"
+    },
     "model_display": 340065
   },
   {
@@ -2492,7 +2723,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第78层",
+    "name_display": {
+      "key": "pagoda_layer78",
+      "text": "第78层"
+    },
     "model_display": 340065
   },
   {
@@ -2524,7 +2758,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第79层",
+    "name_display": {
+      "key": "pagoda_layer79",
+      "text": "第79层"
+    },
     "model_display": 340065
   },
   {
@@ -2556,7 +2793,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第80层",
+    "name_display": {
+      "key": "pagoda_layer80",
+      "text": "第80层"
+    },
     "model_display": 340065
   },
   {
@@ -2588,7 +2828,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第81层",
+    "name_display": {
+      "key": "pagoda_layer81",
+      "text": "第81层"
+    },
     "model_display": 340065
   },
   {
@@ -2620,7 +2863,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第82层",
+    "name_display": {
+      "key": "pagoda_layer82",
+      "text": "第82层"
+    },
     "model_display": 340065
   },
   {
@@ -2652,7 +2898,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第83层",
+    "name_display": {
+      "key": "pagoda_layer83",
+      "text": "第83层"
+    },
     "model_display": 340065
   },
   {
@@ -2684,7 +2933,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第84层",
+    "name_display": {
+      "key": "pagoda_layer84",
+      "text": "第84层"
+    },
     "model_display": 340065
   },
   {
@@ -2716,7 +2968,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第85层",
+    "name_display": {
+      "key": "pagoda_layer85",
+      "text": "第85层"
+    },
     "model_display": 340065
   },
   {
@@ -2748,7 +3003,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第86层",
+    "name_display": {
+      "key": "pagoda_layer86",
+      "text": "第86层"
+    },
     "model_display": 340065
   },
   {
@@ -2780,7 +3038,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第87层",
+    "name_display": {
+      "key": "pagoda_layer87",
+      "text": "第87层"
+    },
     "model_display": 340065
   },
   {
@@ -2812,7 +3073,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第88层",
+    "name_display": {
+      "key": "pagoda_layer88",
+      "text": "第88层"
+    },
     "model_display": 340065
   },
   {
@@ -2844,7 +3108,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第89层",
+    "name_display": {
+      "key": "pagoda_layer89",
+      "text": "第89层"
+    },
     "model_display": 340065
   },
   {
@@ -2876,7 +3143,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第90层",
+    "name_display": {
+      "key": "pagoda_layer90",
+      "text": "第90层"
+    },
     "model_display": 340065
   },
   {
@@ -2908,7 +3178,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第91层",
+    "name_display": {
+      "key": "pagoda_layer91",
+      "text": "第91层"
+    },
     "model_display": 340065
   },
   {
@@ -2940,7 +3213,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第92层",
+    "name_display": {
+      "key": "pagoda_layer92",
+      "text": "第92层"
+    },
     "model_display": 340065
   },
   {
@@ -2972,7 +3248,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第93层",
+    "name_display": {
+      "key": "pagoda_layer93",
+      "text": "第93层"
+    },
     "model_display": 340065
   },
   {
@@ -3004,7 +3283,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第94层",
+    "name_display": {
+      "key": "pagoda_layer94",
+      "text": "第94层"
+    },
     "model_display": 340065
   },
   {
@@ -3036,7 +3318,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第95层",
+    "name_display": {
+      "key": "pagoda_layer95",
+      "text": "第95层"
+    },
     "model_display": 340065
   },
   {
@@ -3068,7 +3353,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第96层",
+    "name_display": {
+      "key": "pagoda_layer96",
+      "text": "第96层"
+    },
     "model_display": 340065
   },
   {
@@ -3100,7 +3388,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第97层",
+    "name_display": {
+      "key": "pagoda_layer97",
+      "text": "第97层"
+    },
     "model_display": 340065
   },
   {
@@ -3132,7 +3423,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第98层",
+    "name_display": {
+      "key": "pagoda_layer98",
+      "text": "第98层"
+    },
     "model_display": 340065
   },
   {
@@ -3164,7 +3458,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第99层",
+    "name_display": {
+      "key": "pagoda_layer99",
+      "text": "第99层"
+    },
     "model_display": 340065
   },
   {
@@ -3196,7 +3493,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第100层",
+    "name_display": {
+      "key": "pagoda_layer100",
+      "text": "第100层"
+    },
     "model_display": 340065
   },
   {
@@ -3228,7 +3528,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第1层",
+    "name_display": {
+      "key": "pagoda_layer1",
+      "text": "第1层"
+    },
     "model_display": 250015
   },
   {
@@ -3260,7 +3563,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第2层",
+    "name_display": {
+      "key": "pagoda_layer2",
+      "text": "第2层"
+    },
     "model_display": 340065
   },
   {
@@ -3292,7 +3598,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第3层",
+    "name_display": {
+      "key": "pagoda_layer3",
+      "text": "第3层"
+    },
     "model_display": 250015
   },
   {
@@ -3324,7 +3633,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第4层",
+    "name_display": {
+      "key": "pagoda_layer4",
+      "text": "第4层"
+    },
     "model_display": 340065
   },
   {
@@ -3356,7 +3668,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第5层",
+    "name_display": {
+      "key": "pagoda_layer5",
+      "text": "第5层"
+    },
     "model_display": 250015
   },
   {
@@ -3388,7 +3703,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第6层",
+    "name_display": {
+      "key": "pagoda_layer6",
+      "text": "第6层"
+    },
     "model_display": 340065
   },
   {
@@ -3420,7 +3738,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第7层",
+    "name_display": {
+      "key": "pagoda_layer7",
+      "text": "第7层"
+    },
     "model_display": 250015
   },
   {
@@ -3452,7 +3773,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第8层",
+    "name_display": {
+      "key": "pagoda_layer8",
+      "text": "第8层"
+    },
     "model_display": 340065
   },
   {
@@ -3484,7 +3808,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第9层",
+    "name_display": {
+      "key": "pagoda_layer9",
+      "text": "第9层"
+    },
     "model_display": 250015
   },
   {
@@ -3516,7 +3843,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第10层",
+    "name_display": {
+      "key": "pagoda_layer10",
+      "text": "第10层"
+    },
     "model_display": 340065
   },
   {
@@ -3548,7 +3878,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第11层",
+    "name_display": {
+      "key": "pagoda_layer11",
+      "text": "第11层"
+    },
     "model_display": 250015
   },
   {
@@ -3580,7 +3913,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第12层",
+    "name_display": {
+      "key": "pagoda_layer12",
+      "text": "第12层"
+    },
     "model_display": 340065
   },
   {
@@ -3612,7 +3948,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第13层",
+    "name_display": {
+      "key": "pagoda_layer13",
+      "text": "第13层"
+    },
     "model_display": 250015
   },
   {
@@ -3644,7 +3983,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第14层",
+    "name_display": {
+      "key": "pagoda_layer14",
+      "text": "第14层"
+    },
     "model_display": 340065
   },
   {
@@ -3676,7 +4018,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第15层",
+    "name_display": {
+      "key": "pagoda_layer15",
+      "text": "第15层"
+    },
     "model_display": 250015
   },
   {
@@ -3708,7 +4053,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第16层",
+    "name_display": {
+      "key": "pagoda_layer16",
+      "text": "第16层"
+    },
     "model_display": 340065
   },
   {
@@ -3740,7 +4088,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第17层",
+    "name_display": {
+      "key": "pagoda_layer17",
+      "text": "第17层"
+    },
     "model_display": 250015
   },
   {
@@ -3772,7 +4123,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第18层",
+    "name_display": {
+      "key": "pagoda_layer18",
+      "text": "第18层"
+    },
     "model_display": 340065
   },
   {
@@ -3804,7 +4158,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第19层",
+    "name_display": {
+      "key": "pagoda_layer19",
+      "text": "第19层"
+    },
     "model_display": 250015
   },
   {
@@ -3836,7 +4193,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第20层",
+    "name_display": {
+      "key": "pagoda_layer20",
+      "text": "第20层"
+    },
     "model_display": 340065
   },
   {
@@ -3868,7 +4228,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第21层",
+    "name_display": {
+      "key": "pagoda_layer21",
+      "text": "第21层"
+    },
     "model_display": 340065
   },
   {
@@ -3900,7 +4263,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第22层",
+    "name_display": {
+      "key": "pagoda_layer22",
+      "text": "第22层"
+    },
     "model_display": 340065
   },
   {
@@ -3932,7 +4298,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第23层",
+    "name_display": {
+      "key": "pagoda_layer23",
+      "text": "第23层"
+    },
     "model_display": 340065
   },
   {
@@ -3964,7 +4333,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第24层",
+    "name_display": {
+      "key": "pagoda_layer24",
+      "text": "第24层"
+    },
     "model_display": 340065
   },
   {
@@ -3996,7 +4368,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第25层",
+    "name_display": {
+      "key": "pagoda_layer25",
+      "text": "第25层"
+    },
     "model_display": 340065
   },
   {
@@ -4028,7 +4403,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第26层",
+    "name_display": {
+      "key": "pagoda_layer26",
+      "text": "第26层"
+    },
     "model_display": 340065
   },
   {
@@ -4060,7 +4438,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第27层",
+    "name_display": {
+      "key": "pagoda_layer27",
+      "text": "第27层"
+    },
     "model_display": 340065
   },
   {
@@ -4092,7 +4473,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第28层",
+    "name_display": {
+      "key": "pagoda_layer28",
+      "text": "第28层"
+    },
     "model_display": 340065
   },
   {
@@ -4124,7 +4508,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第29层",
+    "name_display": {
+      "key": "pagoda_layer29",
+      "text": "第29层"
+    },
     "model_display": 340065
   },
   {
@@ -4156,7 +4543,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第30层",
+    "name_display": {
+      "key": "pagoda_layer30",
+      "text": "第30层"
+    },
     "model_display": 340065
   },
   {
@@ -4188,7 +4578,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第31层",
+    "name_display": {
+      "key": "pagoda_layer31",
+      "text": "第31层"
+    },
     "model_display": 340065
   },
   {
@@ -4220,7 +4613,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第32层",
+    "name_display": {
+      "key": "pagoda_layer32",
+      "text": "第32层"
+    },
     "model_display": 340065
   },
   {
@@ -4252,7 +4648,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第33层",
+    "name_display": {
+      "key": "pagoda_layer33",
+      "text": "第33层"
+    },
     "model_display": 340065
   },
   {
@@ -4284,7 +4683,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第34层",
+    "name_display": {
+      "key": "pagoda_layer34",
+      "text": "第34层"
+    },
     "model_display": 340065
   },
   {
@@ -4316,7 +4718,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第35层",
+    "name_display": {
+      "key": "pagoda_layer35",
+      "text": "第35层"
+    },
     "model_display": 340065
   },
   {
@@ -4348,7 +4753,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第36层",
+    "name_display": {
+      "key": "pagoda_layer36",
+      "text": "第36层"
+    },
     "model_display": 340065
   },
   {
@@ -4380,7 +4788,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第37层",
+    "name_display": {
+      "key": "pagoda_layer37",
+      "text": "第37层"
+    },
     "model_display": 340065
   },
   {
@@ -4412,7 +4823,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第38层",
+    "name_display": {
+      "key": "pagoda_layer38",
+      "text": "第38层"
+    },
     "model_display": 340065
   },
   {
@@ -4444,7 +4858,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第39层",
+    "name_display": {
+      "key": "pagoda_layer39",
+      "text": "第39层"
+    },
     "model_display": 340065
   },
   {
@@ -4476,7 +4893,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第40层",
+    "name_display": {
+      "key": "pagoda_layer40",
+      "text": "第40层"
+    },
     "model_display": 340065
   },
   {
@@ -4508,7 +4928,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第41层",
+    "name_display": {
+      "key": "pagoda_layer41",
+      "text": "第41层"
+    },
     "model_display": 340065
   },
   {
@@ -4540,7 +4963,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第42层",
+    "name_display": {
+      "key": "pagoda_layer42",
+      "text": "第42层"
+    },
     "model_display": 340065
   },
   {
@@ -4572,7 +4998,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第43层",
+    "name_display": {
+      "key": "pagoda_layer43",
+      "text": "第43层"
+    },
     "model_display": 340065
   },
   {
@@ -4604,7 +5033,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第44层",
+    "name_display": {
+      "key": "pagoda_layer44",
+      "text": "第44层"
+    },
     "model_display": 340065
   },
   {
@@ -4636,7 +5068,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第45层",
+    "name_display": {
+      "key": "pagoda_layer45",
+      "text": "第45层"
+    },
     "model_display": 340065
   },
   {
@@ -4668,7 +5103,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第46层",
+    "name_display": {
+      "key": "pagoda_layer46",
+      "text": "第46层"
+    },
     "model_display": 340065
   },
   {
@@ -4700,7 +5138,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第47层",
+    "name_display": {
+      "key": "pagoda_layer47",
+      "text": "第47层"
+    },
     "model_display": 340065
   },
   {
@@ -4732,7 +5173,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第48层",
+    "name_display": {
+      "key": "pagoda_layer48",
+      "text": "第48层"
+    },
     "model_display": 340065
   },
   {
@@ -4764,7 +5208,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第49层",
+    "name_display": {
+      "key": "pagoda_layer49",
+      "text": "第49层"
+    },
     "model_display": 340065
   },
   {
@@ -4796,7 +5243,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第50层",
+    "name_display": {
+      "key": "pagoda_layer50",
+      "text": "第50层"
+    },
     "model_display": 340065
   },
   {
@@ -4828,7 +5278,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第1层",
+    "name_display": {
+      "key": "pagoda_layer1",
+      "text": "第1层"
+    },
     "model_display": 250015
   },
   {
@@ -4860,7 +5313,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第2层",
+    "name_display": {
+      "key": "pagoda_layer2",
+      "text": "第2层"
+    },
     "model_display": 340065
   },
   {
@@ -4892,7 +5348,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第3层",
+    "name_display": {
+      "key": "pagoda_layer3",
+      "text": "第3层"
+    },
     "model_display": 250015
   },
   {
@@ -4924,7 +5383,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第4层",
+    "name_display": {
+      "key": "pagoda_layer4",
+      "text": "第4层"
+    },
     "model_display": 340065
   },
   {
@@ -4956,7 +5418,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第5层",
+    "name_display": {
+      "key": "pagoda_layer5",
+      "text": "第5层"
+    },
     "model_display": 250015
   },
   {
@@ -4988,7 +5453,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第6层",
+    "name_display": {
+      "key": "pagoda_layer6",
+      "text": "第6层"
+    },
     "model_display": 340065
   },
   {
@@ -5020,7 +5488,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第7层",
+    "name_display": {
+      "key": "pagoda_layer7",
+      "text": "第7层"
+    },
     "model_display": 250015
   },
   {
@@ -5052,7 +5523,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第8层",
+    "name_display": {
+      "key": "pagoda_layer8",
+      "text": "第8层"
+    },
     "model_display": 340065
   },
   {
@@ -5084,7 +5558,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第9层",
+    "name_display": {
+      "key": "pagoda_layer9",
+      "text": "第9层"
+    },
     "model_display": 250015
   },
   {
@@ -5116,7 +5593,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第10层",
+    "name_display": {
+      "key": "pagoda_layer10",
+      "text": "第10层"
+    },
     "model_display": 340065
   },
   {
@@ -5148,7 +5628,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第11层",
+    "name_display": {
+      "key": "pagoda_layer11",
+      "text": "第11层"
+    },
     "model_display": 250015
   },
   {
@@ -5180,7 +5663,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第12层",
+    "name_display": {
+      "key": "pagoda_layer12",
+      "text": "第12层"
+    },
     "model_display": 340065
   },
   {
@@ -5212,7 +5698,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第13层",
+    "name_display": {
+      "key": "pagoda_layer13",
+      "text": "第13层"
+    },
     "model_display": 250015
   },
   {
@@ -5244,7 +5733,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第14层",
+    "name_display": {
+      "key": "pagoda_layer14",
+      "text": "第14层"
+    },
     "model_display": 340065
   },
   {
@@ -5276,7 +5768,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第15层",
+    "name_display": {
+      "key": "pagoda_layer15",
+      "text": "第15层"
+    },
     "model_display": 250015
   },
   {
@@ -5308,7 +5803,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第16层",
+    "name_display": {
+      "key": "pagoda_layer16",
+      "text": "第16层"
+    },
     "model_display": 340065
   },
   {
@@ -5340,7 +5838,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第17层",
+    "name_display": {
+      "key": "pagoda_layer17",
+      "text": "第17层"
+    },
     "model_display": 250015
   },
   {
@@ -5372,7 +5873,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第18层",
+    "name_display": {
+      "key": "pagoda_layer18",
+      "text": "第18层"
+    },
     "model_display": 340065
   },
   {
@@ -5404,7 +5908,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第19层",
+    "name_display": {
+      "key": "pagoda_layer19",
+      "text": "第19层"
+    },
     "model_display": 250015
   },
   {
@@ -5436,7 +5943,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第20层",
+    "name_display": {
+      "key": "pagoda_layer20",
+      "text": "第20层"
+    },
     "model_display": 340065
   },
   {
@@ -5468,7 +5978,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第21层",
+    "name_display": {
+      "key": "pagoda_layer21",
+      "text": "第21层"
+    },
     "model_display": 340065
   },
   {
@@ -5500,7 +6013,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第22层",
+    "name_display": {
+      "key": "pagoda_layer22",
+      "text": "第22层"
+    },
     "model_display": 340065
   },
   {
@@ -5532,7 +6048,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第23层",
+    "name_display": {
+      "key": "pagoda_layer23",
+      "text": "第23层"
+    },
     "model_display": 340065
   },
   {
@@ -5564,7 +6083,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第24层",
+    "name_display": {
+      "key": "pagoda_layer24",
+      "text": "第24层"
+    },
     "model_display": 340065
   },
   {
@@ -5596,7 +6118,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第25层",
+    "name_display": {
+      "key": "pagoda_layer25",
+      "text": "第25层"
+    },
     "model_display": 340065
   },
   {
@@ -5628,7 +6153,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第26层",
+    "name_display": {
+      "key": "pagoda_layer26",
+      "text": "第26层"
+    },
     "model_display": 340065
   },
   {
@@ -5660,7 +6188,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第27层",
+    "name_display": {
+      "key": "pagoda_layer27",
+      "text": "第27层"
+    },
     "model_display": 340065
   },
   {
@@ -5692,7 +6223,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第28层",
+    "name_display": {
+      "key": "pagoda_layer28",
+      "text": "第28层"
+    },
     "model_display": 340065
   },
   {
@@ -5724,7 +6258,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第29层",
+    "name_display": {
+      "key": "pagoda_layer29",
+      "text": "第29层"
+    },
     "model_display": 340065
   },
   {
@@ -5756,7 +6293,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第30层",
+    "name_display": {
+      "key": "pagoda_layer30",
+      "text": "第30层"
+    },
     "model_display": 340065
   },
   {
@@ -5788,7 +6328,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第31层",
+    "name_display": {
+      "key": "pagoda_layer31",
+      "text": "第31层"
+    },
     "model_display": 340065
   },
   {
@@ -5820,7 +6363,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第32层",
+    "name_display": {
+      "key": "pagoda_layer32",
+      "text": "第32层"
+    },
     "model_display": 340065
   },
   {
@@ -5852,7 +6398,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第33层",
+    "name_display": {
+      "key": "pagoda_layer33",
+      "text": "第33层"
+    },
     "model_display": 340065
   },
   {
@@ -5884,7 +6433,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第34层",
+    "name_display": {
+      "key": "pagoda_layer34",
+      "text": "第34层"
+    },
     "model_display": 340065
   },
   {
@@ -5916,7 +6468,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第35层",
+    "name_display": {
+      "key": "pagoda_layer35",
+      "text": "第35层"
+    },
     "model_display": 340065
   },
   {
@@ -5948,7 +6503,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第36层",
+    "name_display": {
+      "key": "pagoda_layer36",
+      "text": "第36层"
+    },
     "model_display": 340065
   },
   {
@@ -5980,7 +6538,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第37层",
+    "name_display": {
+      "key": "pagoda_layer37",
+      "text": "第37层"
+    },
     "model_display": 340065
   },
   {
@@ -6012,7 +6573,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第38层",
+    "name_display": {
+      "key": "pagoda_layer38",
+      "text": "第38层"
+    },
     "model_display": 340065
   },
   {
@@ -6044,7 +6608,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第39层",
+    "name_display": {
+      "key": "pagoda_layer39",
+      "text": "第39层"
+    },
     "model_display": 340065
   },
   {
@@ -6076,7 +6643,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第40层",
+    "name_display": {
+      "key": "pagoda_layer40",
+      "text": "第40层"
+    },
     "model_display": 340065
   },
   {
@@ -6108,7 +6678,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第41层",
+    "name_display": {
+      "key": "pagoda_layer41",
+      "text": "第41层"
+    },
     "model_display": 340065
   },
   {
@@ -6140,7 +6713,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第42层",
+    "name_display": {
+      "key": "pagoda_layer42",
+      "text": "第42层"
+    },
     "model_display": 340065
   },
   {
@@ -6172,7 +6748,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第43层",
+    "name_display": {
+      "key": "pagoda_layer43",
+      "text": "第43层"
+    },
     "model_display": 340065
   },
   {
@@ -6204,7 +6783,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第44层",
+    "name_display": {
+      "key": "pagoda_layer44",
+      "text": "第44层"
+    },
     "model_display": 340065
   },
   {
@@ -6236,7 +6818,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第45层",
+    "name_display": {
+      "key": "pagoda_layer45",
+      "text": "第45层"
+    },
     "model_display": 340065
   },
   {
@@ -6268,7 +6853,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第46层",
+    "name_display": {
+      "key": "pagoda_layer46",
+      "text": "第46层"
+    },
     "model_display": 340065
   },
   {
@@ -6300,7 +6888,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第47层",
+    "name_display": {
+      "key": "pagoda_layer47",
+      "text": "第47层"
+    },
     "model_display": 340065
   },
   {
@@ -6332,7 +6923,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第48层",
+    "name_display": {
+      "key": "pagoda_layer48",
+      "text": "第48层"
+    },
     "model_display": 340065
   },
   {
@@ -6364,7 +6958,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第49层",
+    "name_display": {
+      "key": "pagoda_layer49",
+      "text": "第49层"
+    },
     "model_display": 340065
   },
   {
@@ -6396,7 +6993,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第50层",
+    "name_display": {
+      "key": "pagoda_layer50",
+      "text": "第50层"
+    },
     "model_display": 340065
   },
   {
@@ -6428,7 +7028,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第1层",
+    "name_display": {
+      "key": "pagoda_layer1",
+      "text": "第1层"
+    },
     "model_display": 250015
   },
   {
@@ -6460,7 +7063,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第2层",
+    "name_display": {
+      "key": "pagoda_layer2",
+      "text": "第2层"
+    },
     "model_display": 340065
   },
   {
@@ -6492,7 +7098,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第3层",
+    "name_display": {
+      "key": "pagoda_layer3",
+      "text": "第3层"
+    },
     "model_display": 250015
   },
   {
@@ -6524,7 +7133,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第4层",
+    "name_display": {
+      "key": "pagoda_layer4",
+      "text": "第4层"
+    },
     "model_display": 340065
   },
   {
@@ -6556,7 +7168,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第5层",
+    "name_display": {
+      "key": "pagoda_layer5",
+      "text": "第5层"
+    },
     "model_display": 250015
   },
   {
@@ -6588,7 +7203,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第6层",
+    "name_display": {
+      "key": "pagoda_layer6",
+      "text": "第6层"
+    },
     "model_display": 340065
   },
   {
@@ -6620,7 +7238,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第7层",
+    "name_display": {
+      "key": "pagoda_layer7",
+      "text": "第7层"
+    },
     "model_display": 250015
   },
   {
@@ -6652,7 +7273,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第8层",
+    "name_display": {
+      "key": "pagoda_layer8",
+      "text": "第8层"
+    },
     "model_display": 340065
   },
   {
@@ -6684,7 +7308,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第9层",
+    "name_display": {
+      "key": "pagoda_layer9",
+      "text": "第9层"
+    },
     "model_display": 250015
   },
   {
@@ -6716,7 +7343,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第10层",
+    "name_display": {
+      "key": "pagoda_layer10",
+      "text": "第10层"
+    },
     "model_display": 340065
   },
   {
@@ -6748,7 +7378,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第11层",
+    "name_display": {
+      "key": "pagoda_layer11",
+      "text": "第11层"
+    },
     "model_display": 250015
   },
   {
@@ -6780,7 +7413,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第12层",
+    "name_display": {
+      "key": "pagoda_layer12",
+      "text": "第12层"
+    },
     "model_display": 340065
   },
   {
@@ -6812,7 +7448,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第13层",
+    "name_display": {
+      "key": "pagoda_layer13",
+      "text": "第13层"
+    },
     "model_display": 250015
   },
   {
@@ -6844,7 +7483,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第14层",
+    "name_display": {
+      "key": "pagoda_layer14",
+      "text": "第14层"
+    },
     "model_display": 340065
   },
   {
@@ -6876,7 +7518,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第15层",
+    "name_display": {
+      "key": "pagoda_layer15",
+      "text": "第15层"
+    },
     "model_display": 250015
   },
   {
@@ -6908,7 +7553,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第16层",
+    "name_display": {
+      "key": "pagoda_layer16",
+      "text": "第16层"
+    },
     "model_display": 340065
   },
   {
@@ -6940,7 +7588,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第17层",
+    "name_display": {
+      "key": "pagoda_layer17",
+      "text": "第17层"
+    },
     "model_display": 250015
   },
   {
@@ -6972,7 +7623,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第18层",
+    "name_display": {
+      "key": "pagoda_layer18",
+      "text": "第18层"
+    },
     "model_display": 340065
   },
   {
@@ -7004,7 +7658,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第19层",
+    "name_display": {
+      "key": "pagoda_layer19",
+      "text": "第19层"
+    },
     "model_display": 250015
   },
   {
@@ -7036,7 +7693,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第20层",
+    "name_display": {
+      "key": "pagoda_layer20",
+      "text": "第20层"
+    },
     "model_display": 340065
   },
   {
@@ -7068,7 +7728,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第21层",
+    "name_display": {
+      "key": "pagoda_layer21",
+      "text": "第21层"
+    },
     "model_display": 340065
   },
   {
@@ -7100,7 +7763,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第22层",
+    "name_display": {
+      "key": "pagoda_layer22",
+      "text": "第22层"
+    },
     "model_display": 340065
   },
   {
@@ -7132,7 +7798,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第23层",
+    "name_display": {
+      "key": "pagoda_layer23",
+      "text": "第23层"
+    },
     "model_display": 340065
   },
   {
@@ -7164,7 +7833,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第24层",
+    "name_display": {
+      "key": "pagoda_layer24",
+      "text": "第24层"
+    },
     "model_display": 340065
   },
   {
@@ -7196,7 +7868,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第25层",
+    "name_display": {
+      "key": "pagoda_layer25",
+      "text": "第25层"
+    },
     "model_display": 340065
   },
   {
@@ -7228,7 +7903,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第26层",
+    "name_display": {
+      "key": "pagoda_layer26",
+      "text": "第26层"
+    },
     "model_display": 340065
   },
   {
@@ -7260,7 +7938,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第27层",
+    "name_display": {
+      "key": "pagoda_layer27",
+      "text": "第27层"
+    },
     "model_display": 340065
   },
   {
@@ -7292,7 +7973,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第28层",
+    "name_display": {
+      "key": "pagoda_layer28",
+      "text": "第28层"
+    },
     "model_display": 340065
   },
   {
@@ -7324,7 +8008,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第29层",
+    "name_display": {
+      "key": "pagoda_layer29",
+      "text": "第29层"
+    },
     "model_display": 340065
   },
   {
@@ -7356,7 +8043,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第30层",
+    "name_display": {
+      "key": "pagoda_layer30",
+      "text": "第30层"
+    },
     "model_display": 340065
   },
   {
@@ -7388,7 +8078,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第31层",
+    "name_display": {
+      "key": "pagoda_layer31",
+      "text": "第31层"
+    },
     "model_display": 340065
   },
   {
@@ -7420,7 +8113,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第32层",
+    "name_display": {
+      "key": "pagoda_layer32",
+      "text": "第32层"
+    },
     "model_display": 340065
   },
   {
@@ -7452,7 +8148,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第33层",
+    "name_display": {
+      "key": "pagoda_layer33",
+      "text": "第33层"
+    },
     "model_display": 340065
   },
   {
@@ -7484,7 +8183,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第34层",
+    "name_display": {
+      "key": "pagoda_layer34",
+      "text": "第34层"
+    },
     "model_display": 340065
   },
   {
@@ -7516,7 +8218,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第35层",
+    "name_display": {
+      "key": "pagoda_layer35",
+      "text": "第35层"
+    },
     "model_display": 340065
   },
   {
@@ -7548,7 +8253,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第36层",
+    "name_display": {
+      "key": "pagoda_layer36",
+      "text": "第36层"
+    },
     "model_display": 340065
   },
   {
@@ -7580,7 +8288,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第37层",
+    "name_display": {
+      "key": "pagoda_layer37",
+      "text": "第37层"
+    },
     "model_display": 340065
   },
   {
@@ -7612,7 +8323,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第38层",
+    "name_display": {
+      "key": "pagoda_layer38",
+      "text": "第38层"
+    },
     "model_display": 340065
   },
   {
@@ -7644,7 +8358,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第39层",
+    "name_display": {
+      "key": "pagoda_layer39",
+      "text": "第39层"
+    },
     "model_display": 340065
   },
   {
@@ -7676,7 +8393,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第40层",
+    "name_display": {
+      "key": "pagoda_layer40",
+      "text": "第40层"
+    },
     "model_display": 340065
   },
   {
@@ -7708,7 +8428,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第41层",
+    "name_display": {
+      "key": "pagoda_layer41",
+      "text": "第41层"
+    },
     "model_display": 340065
   },
   {
@@ -7740,7 +8463,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第42层",
+    "name_display": {
+      "key": "pagoda_layer42",
+      "text": "第42层"
+    },
     "model_display": 340065
   },
   {
@@ -7772,7 +8498,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第43层",
+    "name_display": {
+      "key": "pagoda_layer43",
+      "text": "第43层"
+    },
     "model_display": 340065
   },
   {
@@ -7804,7 +8533,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第44层",
+    "name_display": {
+      "key": "pagoda_layer44",
+      "text": "第44层"
+    },
     "model_display": 340065
   },
   {
@@ -7836,7 +8568,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第45层",
+    "name_display": {
+      "key": "pagoda_layer45",
+      "text": "第45层"
+    },
     "model_display": 340065
   },
   {
@@ -7868,7 +8603,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第46层",
+    "name_display": {
+      "key": "pagoda_layer46",
+      "text": "第46层"
+    },
     "model_display": 340065
   },
   {
@@ -7900,7 +8638,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第47层",
+    "name_display": {
+      "key": "pagoda_layer47",
+      "text": "第47层"
+    },
     "model_display": 340065
   },
   {
@@ -7932,7 +8673,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第48层",
+    "name_display": {
+      "key": "pagoda_layer48",
+      "text": "第48层"
+    },
     "model_display": 340065
   },
   {
@@ -7964,7 +8708,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第49层",
+    "name_display": {
+      "key": "pagoda_layer49",
+      "text": "第49层"
+    },
     "model_display": 340065
   },
   {
@@ -7996,7 +8743,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第50层",
+    "name_display": {
+      "key": "pagoda_layer50",
+      "text": "第50层"
+    },
     "model_display": 340065
   },
   {
@@ -8028,7 +8778,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第1层",
+    "name_display": {
+      "key": "pagoda_layer1",
+      "text": "第1层"
+    },
     "model_display": 250015
   },
   {
@@ -8060,7 +8813,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第2层",
+    "name_display": {
+      "key": "pagoda_layer2",
+      "text": "第2层"
+    },
     "model_display": 340065
   },
   {
@@ -8092,7 +8848,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第3层",
+    "name_display": {
+      "key": "pagoda_layer3",
+      "text": "第3层"
+    },
     "model_display": 250015
   },
   {
@@ -8124,7 +8883,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第4层",
+    "name_display": {
+      "key": "pagoda_layer4",
+      "text": "第4层"
+    },
     "model_display": 340065
   },
   {
@@ -8156,7 +8918,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第5层",
+    "name_display": {
+      "key": "pagoda_layer5",
+      "text": "第5层"
+    },
     "model_display": 250015
   },
   {
@@ -8188,7 +8953,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第6层",
+    "name_display": {
+      "key": "pagoda_layer6",
+      "text": "第6层"
+    },
     "model_display": 340065
   },
   {
@@ -8220,7 +8988,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第7层",
+    "name_display": {
+      "key": "pagoda_layer7",
+      "text": "第7层"
+    },
     "model_display": 250015
   },
   {
@@ -8252,7 +9023,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第8层",
+    "name_display": {
+      "key": "pagoda_layer8",
+      "text": "第8层"
+    },
     "model_display": 340065
   },
   {
@@ -8284,7 +9058,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第9层",
+    "name_display": {
+      "key": "pagoda_layer9",
+      "text": "第9层"
+    },
     "model_display": 250015
   },
   {
@@ -8316,7 +9093,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第10层",
+    "name_display": {
+      "key": "pagoda_layer10",
+      "text": "第10层"
+    },
     "model_display": 340065
   },
   {
@@ -8348,7 +9128,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第11层",
+    "name_display": {
+      "key": "pagoda_layer11",
+      "text": "第11层"
+    },
     "model_display": 250015
   },
   {
@@ -8380,7 +9163,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第12层",
+    "name_display": {
+      "key": "pagoda_layer12",
+      "text": "第12层"
+    },
     "model_display": 340065
   },
   {
@@ -8412,7 +9198,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第13层",
+    "name_display": {
+      "key": "pagoda_layer13",
+      "text": "第13层"
+    },
     "model_display": 250015
   },
   {
@@ -8444,7 +9233,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第14层",
+    "name_display": {
+      "key": "pagoda_layer14",
+      "text": "第14层"
+    },
     "model_display": 340065
   },
   {
@@ -8476,7 +9268,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第15层",
+    "name_display": {
+      "key": "pagoda_layer15",
+      "text": "第15层"
+    },
     "model_display": 250015
   },
   {
@@ -8508,7 +9303,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第16层",
+    "name_display": {
+      "key": "pagoda_layer16",
+      "text": "第16层"
+    },
     "model_display": 340065
   },
   {
@@ -8540,7 +9338,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第17层",
+    "name_display": {
+      "key": "pagoda_layer17",
+      "text": "第17层"
+    },
     "model_display": 250015
   },
   {
@@ -8572,7 +9373,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第18层",
+    "name_display": {
+      "key": "pagoda_layer18",
+      "text": "第18层"
+    },
     "model_display": 340065
   },
   {
@@ -8604,7 +9408,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第19层",
+    "name_display": {
+      "key": "pagoda_layer19",
+      "text": "第19层"
+    },
     "model_display": 250015
   },
   {
@@ -8636,7 +9443,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第20层",
+    "name_display": {
+      "key": "pagoda_layer20",
+      "text": "第20层"
+    },
     "model_display": 340065
   },
   {
@@ -8668,7 +9478,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第21层",
+    "name_display": {
+      "key": "pagoda_layer21",
+      "text": "第21层"
+    },
     "model_display": 340065
   },
   {
@@ -8700,7 +9513,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第22层",
+    "name_display": {
+      "key": "pagoda_layer22",
+      "text": "第22层"
+    },
     "model_display": 340065
   },
   {
@@ -8732,7 +9548,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第23层",
+    "name_display": {
+      "key": "pagoda_layer23",
+      "text": "第23层"
+    },
     "model_display": 340065
   },
   {
@@ -8764,7 +9583,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第24层",
+    "name_display": {
+      "key": "pagoda_layer24",
+      "text": "第24层"
+    },
     "model_display": 340065
   },
   {
@@ -8796,7 +9618,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第25层",
+    "name_display": {
+      "key": "pagoda_layer25",
+      "text": "第25层"
+    },
     "model_display": 340065
   },
   {
@@ -8828,7 +9653,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第26层",
+    "name_display": {
+      "key": "pagoda_layer26",
+      "text": "第26层"
+    },
     "model_display": 340065
   },
   {
@@ -8860,7 +9688,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第27层",
+    "name_display": {
+      "key": "pagoda_layer27",
+      "text": "第27层"
+    },
     "model_display": 340065
   },
   {
@@ -8892,7 +9723,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第28层",
+    "name_display": {
+      "key": "pagoda_layer28",
+      "text": "第28层"
+    },
     "model_display": 340065
   },
   {
@@ -8924,7 +9758,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第29层",
+    "name_display": {
+      "key": "pagoda_layer29",
+      "text": "第29层"
+    },
     "model_display": 340065
   },
   {
@@ -8956,7 +9793,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第30层",
+    "name_display": {
+      "key": "pagoda_layer30",
+      "text": "第30层"
+    },
     "model_display": 340065
   },
   {
@@ -8988,7 +9828,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第31层",
+    "name_display": {
+      "key": "pagoda_layer31",
+      "text": "第31层"
+    },
     "model_display": 340065
   },
   {
@@ -9020,7 +9863,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第32层",
+    "name_display": {
+      "key": "pagoda_layer32",
+      "text": "第32层"
+    },
     "model_display": 340065
   },
   {
@@ -9052,7 +9898,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第33层",
+    "name_display": {
+      "key": "pagoda_layer33",
+      "text": "第33层"
+    },
     "model_display": 340065
   },
   {
@@ -9084,7 +9933,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第34层",
+    "name_display": {
+      "key": "pagoda_layer34",
+      "text": "第34层"
+    },
     "model_display": 340065
   },
   {
@@ -9116,7 +9968,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第35层",
+    "name_display": {
+      "key": "pagoda_layer35",
+      "text": "第35层"
+    },
     "model_display": 340065
   },
   {
@@ -9148,7 +10003,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第36层",
+    "name_display": {
+      "key": "pagoda_layer36",
+      "text": "第36层"
+    },
     "model_display": 340065
   },
   {
@@ -9180,7 +10038,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第37层",
+    "name_display": {
+      "key": "pagoda_layer37",
+      "text": "第37层"
+    },
     "model_display": 340065
   },
   {
@@ -9212,7 +10073,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第38层",
+    "name_display": {
+      "key": "pagoda_layer38",
+      "text": "第38层"
+    },
     "model_display": 340065
   },
   {
@@ -9244,7 +10108,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第39层",
+    "name_display": {
+      "key": "pagoda_layer39",
+      "text": "第39层"
+    },
     "model_display": 340065
   },
   {
@@ -9276,7 +10143,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第40层",
+    "name_display": {
+      "key": "pagoda_layer40",
+      "text": "第40层"
+    },
     "model_display": 340065
   },
   {
@@ -9308,7 +10178,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第41层",
+    "name_display": {
+      "key": "pagoda_layer41",
+      "text": "第41层"
+    },
     "model_display": 340065
   },
   {
@@ -9340,7 +10213,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第42层",
+    "name_display": {
+      "key": "pagoda_layer42",
+      "text": "第42层"
+    },
     "model_display": 340065
   },
   {
@@ -9372,7 +10248,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第43层",
+    "name_display": {
+      "key": "pagoda_layer43",
+      "text": "第43层"
+    },
     "model_display": 340065
   },
   {
@@ -9404,7 +10283,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第44层",
+    "name_display": {
+      "key": "pagoda_layer44",
+      "text": "第44层"
+    },
     "model_display": 340065
   },
   {
@@ -9436,7 +10318,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第45层",
+    "name_display": {
+      "key": "pagoda_layer45",
+      "text": "第45层"
+    },
     "model_display": 340065
   },
   {
@@ -9468,7 +10353,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第46层",
+    "name_display": {
+      "key": "pagoda_layer46",
+      "text": "第46层"
+    },
     "model_display": 340065
   },
   {
@@ -9500,7 +10388,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第47层",
+    "name_display": {
+      "key": "pagoda_layer47",
+      "text": "第47层"
+    },
     "model_display": 340065
   },
   {
@@ -9532,7 +10423,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第48层",
+    "name_display": {
+      "key": "pagoda_layer48",
+      "text": "第48层"
+    },
     "model_display": 340065
   },
   {
@@ -9564,7 +10458,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第49层",
+    "name_display": {
+      "key": "pagoda_layer49",
+      "text": "第49层"
+    },
     "model_display": 340065
   },
   {
@@ -9596,7 +10493,10 @@
       }
     ],
     "fight_scene": "",
-    "name_display": "第50层",
+    "name_display": {
+      "key": "pagoda_layer50",
+      "text": "第50层"
+    },
     "model_display": 340065
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_rdmainline.json b/bin/json/game_rdmainline.json
index 97a8267a0..7fbf04f94 100644
--- a/bin/json/game_rdmainline.json
+++ b/bin/json/game_rdmainline.json
@@ -2,364 +2,103 @@
   {
     "id": 101,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       101011
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40000
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10001",
-      "text": "第1关：功夫世界"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      3,
-      3,
-      3,
-      -1,
-      3
-    ],
-    "condition": [
-      0,
-      1,
-      2,
-      4
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 102,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       101021
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40001
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10002",
-      "text": "第2关：练功房"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      3
-    ],
-    "condition": [
-      1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 103,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       101031,
       101032
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40002
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10003",
-      "text": "第3关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      3
-    ],
-    "condition": [
-      2
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 104,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       101041,
       101042
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40003
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10004",
-      "text": "第4关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      3
-    ],
-    "condition": [
-      3
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 105,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       101051,
       101052
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "zhandoulizi",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40004
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10005",
-      "text": "第4关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      3
-    ],
-    "condition": [
-      4
-    ]
+    "sceneeffect": "zhandoulizi"
   },
   {
     "id": 106,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       101061,
       101062
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40005
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10006",
-      "text": "第5关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      3
-    ],
-    "condition": [
-      5
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 107,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       101071,
       101072
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40006
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10007",
-      "text": "第5关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      3
-    ],
-    "condition": [
-      6
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 108,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       101081,
       101082
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40007
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10008",
-      "text": "第6关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      3
-    ],
-    "condition": [
-      7
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 109,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       101091,
       101092
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40008
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10009",
-      "text": "第6关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 110,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       101101,
       101102,
@@ -367,388 +106,108 @@
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "zhandoulizi",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40009
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10010",
-      "text": "第7关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": "zhandoulizi"
   },
   {
     "id": 201,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       102011
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40012
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10013",
-      "text": "第8关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 202,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       102021
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40013
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10014",
-      "text": "第9关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 203,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       102031,
       102032
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "zhandoulizi",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40014
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10015",
-      "text": "第9关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": "zhandoulizi"
   },
   {
     "id": 204,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       102041,
       102042
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40015
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10016",
-      "text": "第10关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 205,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       102051,
       102052
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40016
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10017",
-      "text": "第10关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 206,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       102061,
       102062
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40017
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10018",
-      "text": "第11关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 207,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       102071,
       102072
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40018
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10019",
-      "text": "第11关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 208,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       102081,
       102082
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "zhandoulizi",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40019
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10020",
-      "text": "第12关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": "zhandoulizi"
   },
   {
     "id": 209,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       102091,
       102092
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40020
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10021",
-      "text": "第12关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 210,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       102101,
       102102,
@@ -756,388 +215,108 @@
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40021
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10022",
-      "text": "第13关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 301,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       103011
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "zhandoulizi",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40024
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10025",
-      "text": "第14关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": "zhandoulizi"
   },
   {
     "id": 302,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       103021
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40025
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10026",
-      "text": "第15关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 303,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       103031,
       103032
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40026
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10027",
-      "text": "第15关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 304,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       103041,
       103042
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40027
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10028",
-      "text": "第16关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 305,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       103051,
       103052
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40028
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10029",
-      "text": "第16关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 306,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       103061,
       103062
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "zhandoulizi",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40029
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10030",
-      "text": "第17关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": "zhandoulizi"
   },
   {
     "id": 307,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       103071,
       103072
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40030
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10031",
-      "text": "第17关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 308,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       103081,
       103082
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40031
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10032",
-      "text": "第18关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 309,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       103091,
       103092
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40032
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10033",
-      "text": "第18关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 310,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       103101,
       103102,
@@ -1145,388 +324,108 @@
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40033
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10034",
-      "text": "第19关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 401,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       104011
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "zhandoulizi",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40034
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10035",
-      "text": "第19关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": "zhandoulizi"
   },
   {
     "id": 402,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       104021
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40035
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10036",
-      "text": "第20关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 403,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       104031,
       104032
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40036
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10037",
-      "text": "第20关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 404,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       104041,
       104042
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40037
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10038",
-      "text": "第21关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 405,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       104051,
       104052
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40038
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10039",
-      "text": "第21关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 406,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       104061,
       104062
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "zhandoulizi",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40039
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10040",
-      "text": "第22关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": "zhandoulizi"
   },
   {
     "id": 407,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       104071,
       104072
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40040
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10041",
-      "text": "第22关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 408,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       104081,
       104082
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40041
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10042",
-      "text": "第23关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 409,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       104091,
       104092
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40042
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10043",
-      "text": "第23关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 410,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       104101,
       104102,
@@ -1534,388 +433,108 @@
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40043
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10044",
-      "text": "第24关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 501,
     "Episodetype": 1,
-    "model": "",
-    "effect": "1",
     "FormatList": [
       105011
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "zhandoulizi",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40044
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10045",
-      "text": "第24关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": "zhandoulizi"
   },
   {
     "id": 502,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       105021
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40045
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10046",
-      "text": "第25关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 503,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       105031,
       105032
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40046
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10047",
-      "text": "第25关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 504,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       105041,
       105042
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40047
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10048",
-      "text": "第26关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 505,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       105051,
       105052
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40048
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10049",
-      "text": "第26关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 506,
     "Episodetype": 1,
-    "model": "",
-    "effect": "img_100lc",
     "FormatList": [
       105061,
       105062
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "zhandoulizi",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40049
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10050",
-      "text": "第27关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": "zhandoulizi"
   },
   {
     "id": 507,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       105071,
       105072
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40050
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10051",
-      "text": "第27关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 508,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       105081,
       105082
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40051
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10052",
-      "text": "第28关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 509,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       105091,
       105092
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40052
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10053",
-      "text": "第28关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 510,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       105101,
       105102,
@@ -1923,388 +542,108 @@
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40053
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10054",
-      "text": "第29关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 601,
     "Episodetype": 1,
-    "model": "",
-    "effect": "0",
     "FormatList": [
       106011
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "zhandoulizi",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40054
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10055",
-      "text": "第29关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": "zhandoulizi"
   },
   {
     "id": 602,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       106021
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40055
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10056",
-      "text": "第30关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 603,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       106031,
       106032
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40056
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10057",
-      "text": "第30关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 604,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       106041,
       106042
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40057
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10058",
-      "text": "第31关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 605,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       106051,
       106052
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40058
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10059",
-      "text": "第31关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 606,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       106061,
       106062
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "zhandoulizi",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40059
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10060",
-      "text": "第32关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": "zhandoulizi"
   },
   {
     "id": 607,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       106071,
       106072
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40060
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10061",
-      "text": "第32关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 608,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       106081,
       106082
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40061
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10062",
-      "text": "第33关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 609,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       106091,
       106092
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40062
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10063",
-      "text": "第33关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 610,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       106101,
       106102,
@@ -2312,388 +651,108 @@
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40063
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10064",
-      "text": "第34关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 701,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       107011
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "zhandoulizi",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40064
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10065",
-      "text": "第34关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": "zhandoulizi"
   },
   {
     "id": 702,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       107021
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40065
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10066",
-      "text": "第35关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 703,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       107031,
       107032
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40066
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10067",
-      "text": "第35关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 704,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       107041,
       107042
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40067
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10068",
-      "text": "第36关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 705,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       107051,
       107052
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40068
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10069",
-      "text": "第36关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 706,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       107061,
       107062
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "zhandoulizi",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40069
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10070",
-      "text": "第37关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": "zhandoulizi"
   },
   {
     "id": 707,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       107071,
       107072
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40070
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10071",
-      "text": "第37关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 708,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       107081,
       107082
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40071
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10072",
-      "text": "第37关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 709,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       107091,
       107092
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40072
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10073",
-      "text": "第38关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 710,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       107101,
       107102,
@@ -2701,388 +760,108 @@
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40073
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10074",
-      "text": "第38关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 801,
     "Episodetype": 1,
-    "model": "",
-    "effect": "btn_txjs_xczsl",
     "FormatList": [
       108011
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "zhandoulizi",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40074
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10075",
-      "text": "第38关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": "zhandoulizi"
   },
   {
     "id": 802,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       108021
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40075
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10076",
-      "text": "第39关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 803,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       108031,
       108032
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40076
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10077",
-      "text": "第39关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 804,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       108041,
       108042
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40077
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10078",
-      "text": "第39关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 805,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       108051,
       108052
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40078
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10079",
-      "text": "第40关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 806,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       108061,
       108062
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "zhandoulizi",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40079
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10080",
-      "text": "第40关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": "zhandoulizi"
   },
   {
     "id": 807,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       108071,
       108072
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40080
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10081",
-      "text": "第40关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 808,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       108081,
       108082
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40081
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10082",
-      "text": "第41关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 809,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       108091,
       108092
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40082
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10083",
-      "text": "第41关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 810,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       108101,
       108102,
@@ -3090,388 +869,108 @@
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40083
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10084",
-      "text": "第41关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 901,
     "Episodetype": 1,
-    "model": "",
-    "effect": "1",
     "FormatList": [
       109011
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "zhandoulizi",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40084
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10085",
-      "text": "第42关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": "zhandoulizi"
   },
   {
     "id": 902,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       109021
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40085
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10086",
-      "text": "第42关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 903,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       109031,
       109032
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40086
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10087",
-      "text": "第42关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 904,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       109041,
       109042
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40087
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10088",
-      "text": "第43关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 905,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       109051,
       109052
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40088
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10089",
-      "text": "第43关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 906,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       109061,
       109062
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "zhandoulizi",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40089
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10090",
-      "text": "第43关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": "zhandoulizi"
   },
   {
     "id": 907,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       109071,
       109072
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40090
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10091",
-      "text": "第44关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 908,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       109081,
       109082
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40091
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10092",
-      "text": "第44关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 909,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       109091,
       109092
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40092
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10093",
-      "text": "第44关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 910,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       109101,
       109102,
@@ -3479,388 +978,108 @@
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40093
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10094",
-      "text": "第45关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 1001,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       110011
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "zhandoulizi",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40094
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10095",
-      "text": "第45关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": "zhandoulizi"
   },
   {
     "id": 1002,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       110021
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40095
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10096",
-      "text": "第45关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 1003,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       110031,
       110032
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40096
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10097",
-      "text": "第46关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 1004,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       110041,
       110042
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40097
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10098",
-      "text": "第46关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 1005,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       110051,
       110052
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40098
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10099",
-      "text": "第46关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 1006,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       110061,
       110062
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "zhandoulizi",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40099
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10100",
-      "text": "第47关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": "zhandoulizi"
   },
   {
     "id": 1007,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       110071,
       110072
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40100
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10101",
-      "text": "第47关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 1008,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       110081,
       110082
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40101
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10102",
-      "text": "第47关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 1009,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       110091,
       110092
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40102
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10103",
-      "text": "第48关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 1010,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       110101,
       110102,
@@ -3868,388 +1087,108 @@
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40103
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10104",
-      "text": "第48关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 1101,
     "Episodetype": 1,
-    "model": "",
-    "effect": "1",
     "FormatList": [
       111011
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "zhandoulizi",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40104
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10105",
-      "text": "第48关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": "zhandoulizi"
   },
   {
     "id": 1102,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       111021
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40105
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10106",
-      "text": "第49关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 1103,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       111031,
       111032
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40106
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10107",
-      "text": "第49关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 1104,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       111041,
       111042
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40107
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10108",
-      "text": "第49关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 1105,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       111051,
       111052
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40108
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10109",
-      "text": "第50关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 1106,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       111061,
       111062
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "zhandoulizi",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40109
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10110",
-      "text": "第50关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": "zhandoulizi"
   },
   {
     "id": 1107,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       111071,
       111072
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40110
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10111",
-      "text": "第50关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 1108,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       111081,
       111082
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40111
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10112",
-      "text": "第51关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 1109,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       111091,
       111092
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40112
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10113",
-      "text": "第51关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 1110,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       111101,
       111102,
@@ -4257,388 +1196,108 @@
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40113
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10114",
-      "text": "第51关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 1201,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       112011
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "zhandoulizi",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40114
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10115",
-      "text": "第52关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": "zhandoulizi"
   },
   {
     "id": 1202,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       112021
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40115
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10116",
-      "text": "第52关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 1203,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       112031,
       112032
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40116
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10117",
-      "text": "第52关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 1204,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       112041,
       112042
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40117
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10118",
-      "text": "第53关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 1205,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       112051,
       112052
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40118
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10119",
-      "text": "第53关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 1206,
     "Episodetype": 1,
-    "model": "",
-    "effect": "0",
     "FormatList": [
       112061,
       112062
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "zhandoulizi",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40119
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10120",
-      "text": "第53关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": "zhandoulizi"
   },
   {
     "id": 1207,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       112071,
       112072
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40115
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10116",
-      "text": "第52关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 1208,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       112081,
       112082
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40116
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10117",
-      "text": "第52关：太狼来袭"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 1209,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       112091,
       112092
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40117
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10118",
-      "text": "第53关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   },
   {
     "id": 1210,
     "Episodetype": 1,
-    "model": "",
-    "effect": "",
     "FormatList": [
       112101,
       112102,
@@ -4646,32 +1305,6 @@
     ],
     "captainId": "250011",
     "battlescene": "bg_zhandoulmboss",
-    "sceneeffect": "",
-    "award": [
-      {
-        "a": "item",
-        "t": "1",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 40118
-      }
-    ],
-    "title": {
-      "key": "mainline_title_10119",
-      "text": "第53关：乌龟大师"
-    },
-    "desc": {
-      "key": "mainline_name_10071",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    },
-    "stroyid": [
-      -1
-    ],
-    "condition": [
-      -1
-    ]
+    "sceneeffect": ""
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_rdtask.json b/bin/json/game_rdtask.json
index 427e7ec42..425a5f9d1 100644
--- a/bin/json/game_rdtask.json
+++ b/bin/json/game_rdtask.json
@@ -8,7 +8,8 @@
       101
     ],
     "sidequest": [
-      1001
+      1001,
+      1002
     ]
   },
   {
@@ -20,20 +21,19 @@
       101
     ],
     "sidequest": [
-      1002,
-      1003,
-      1004
+      1003
     ]
   },
   {
     "id": 100102,
     "group": 1,
     "type": 2,
-    "preTid": 100101,
+    "preTid": 100100,
     "condition": [
       101
     ],
     "sidequest": [
+      1004,
       1005
     ]
   },
@@ -41,7 +41,7 @@
     "id": 100103,
     "group": 1,
     "type": 2,
-    "preTid": 100102,
+    "preTid": 100101,
     "condition": [
       101
     ],
@@ -58,11 +58,7 @@
       101
     ],
     "sidequest": [
-      1007,
-      1008,
-      1009,
-      1010,
-      1011
+      1007
     ]
   },
   {
@@ -74,7 +70,7 @@
       101
     ],
     "sidequest": [
-      1012
+      1008
     ]
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_rdtaskchoose.json b/bin/json/game_rdtaskchoose.json
index fef60de84..68aa6b430 100644
--- a/bin/json/game_rdtaskchoose.json
+++ b/bin/json/game_rdtaskchoose.json
@@ -21,7 +21,7 @@
     "id": 10003,
     "num": 1,
     "preTid": 0,
-    "gotoLevel": "101",
+    "gotoLevel": "",
     "needItem": [
       0
     ]
@@ -38,7 +38,7 @@
   {
     "id": 10005,
     "num": 2,
-    "preTid": 0,
+    "preTid": 105,
     "gotoLevel": "",
     "needItem": [
       0
@@ -47,7 +47,7 @@
   {
     "id": 10006,
     "num": 1,
-    "preTid": 0,
+    "preTid": 105,
     "gotoLevel": "",
     "needItem": [
       0
@@ -65,7 +65,7 @@
   {
     "id": 10008,
     "num": 3,
-    "preTid": 170,
+    "preTid": 0,
     "gotoLevel": "",
     "needItem": [
       0
@@ -83,7 +83,7 @@
   {
     "id": 100010,
     "num": 2,
-    "preTid": 0,
+    "preTid": 105,
     "gotoLevel": "",
     "needItem": [
       0
@@ -93,7 +93,7 @@
     "id": 100011,
     "num": 1,
     "preTid": 0,
-    "gotoLevel": "101",
+    "gotoLevel": "",
     "needItem": [
       0
     ]
diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json
index 6fe623b89..b76240207 100644
--- a/bin/json/game_rdtaskcondi.json
+++ b/bin/json/game_rdtaskcondi.json
@@ -693,7 +693,17 @@
     "id": 170,
     "datatype": 2,
     "type": 1,
-    "data1": 35001,
+    "data1": 12003,
+    "data2": 0,
+    "data3": 0,
+    "data4": 0,
+    "data5": 0
+  },
+  {
+    "id": 171,
+    "datatype": 2,
+    "type": 70,
+    "data1": 101,
     "data2": 0,
     "data3": 0,
     "data4": 0,
diff --git a/bin/json/game_rdtaskside.json b/bin/json/game_rdtaskside.json
index 0eb8315ae..6d440fb3c 100644
--- a/bin/json/game_rdtaskside.json
+++ b/bin/json/game_rdtaskside.json
@@ -3,20 +3,20 @@
     "id": 1001,
     "objType": 1,
     "location": "middle",
-    "modelaction": "",
+    "modelaction": "Enter",
     "modelstate": 0,
     "rotation": {
       "x": 0,
-      "y": -180,
+      "y": 90,
       "z": 0
     },
-    "point": "model_01",
+    "point": "model_07",
     "storyBegin": 1,
     "chooseId": [
       10001,
       10002
     ],
-    "storyEnd": 2,
+    "storyEnd": 0,
     "nextTid": 100101,
     "reward": [],
     "CD": 0,
@@ -26,51 +26,41 @@
     "id": 1002,
     "objType": 1,
     "location": "middle",
-    "modelaction": "Enter",
-    "modelstate": 1,
+    "modelaction": "",
+    "modelstate": 0,
     "rotation": {
       "x": 0,
-      "y": -180,
+      "y": -150,
       "z": 0
     },
-    "point": "model_02",
-    "storyBegin": 4,
-    "chooseId": [
-      10003
-    ],
-    "storyEnd": 6,
-    "nextTid": 100102,
-    "reward": [
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 10
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 1000
-      }
-    ],
+    "point": "model_04",
+    "storyBegin": 2,
+    "chooseId": [],
+    "storyEnd": 0,
+    "nextTid": -1,
+    "reward": [],
     "CD": 0,
     "endTid": -1
   },
   {
     "id": 1003,
-    "objType": 1,
+    "objType": 2,
     "location": "middle",
-    "modelaction": "Run",
-    "modelstate": 2,
+    "modelaction": "",
+    "modelstate": 0,
     "rotation": {
       "x": 0,
       "y": -180,
       "z": 0
     },
-    "point": "model_03",
-    "storyBegin": 3,
-    "chooseId": [],
+    "point": "icon_03",
+    "storyBegin": 6,
+    "chooseId": [
+      10003,
+      10004
+    ],
     "storyEnd": 0,
-    "nextTid": -1,
+    "nextTid": 100103,
     "reward": [],
     "CD": 0,
     "endTid": -1
@@ -83,11 +73,35 @@
     "modelstate": 0,
     "rotation": {
       "x": 0,
-      "y": -180,
+      "y": -150,
+      "z": 0
+    },
+    "point": "model_04",
+    "storyBegin": 3,
+    "chooseId": [
+      10005,
+      10006,
+      10007
+    ],
+    "storyEnd": 0,
+    "nextTid": 100101,
+    "reward": [],
+    "CD": 0,
+    "endTid": -1
+  },
+  {
+    "id": 1005,
+    "objType": 1,
+    "location": "middle",
+    "modelaction": "",
+    "modelstate": 0,
+    "rotation": {
+      "x": 0,
+      "y": 90,
       "z": 0
     },
     "point": "model_07",
-    "storyBegin": 16,
+    "storyBegin": 4,
     "chooseId": [],
     "storyEnd": 0,
     "nextTid": -1,
@@ -96,9 +110,32 @@
     "endTid": -1
   },
   {
-    "id": 1005,
+    "id": 1006,
     "objType": 2,
-    "location": "left",
+    "location": "middle",
+    "modelaction": "",
+    "modelstate": 0,
+    "rotation": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "point": "icon_03",
+    "storyBegin": 8,
+    "chooseId": [
+      10008,
+      10009
+    ],
+    "storyEnd": 0,
+    "nextTid": 100104,
+    "reward": [],
+    "CD": 0,
+    "endTid": -1
+  },
+  {
+    "id": 1007,
+    "objType": 2,
+    "location": "middle",
     "modelaction": "",
     "modelstate": 0,
     "rotation": {
@@ -107,109 +144,41 @@
       "z": 0
     },
     "point": "icon_01",
-    "storyBegin": 7,
+    "storyBegin": 10,
     "chooseId": [
-      10004,
-      10005
+      100010,
+      100011,
+      100012
     ],
     "storyEnd": 0,
-    "nextTid": 100103,
-    "reward": [],
-    "CD": 0,
-    "endTid": -1
-  },
-  {
-    "id": 1006,
-    "objType": 2,
-    "location": "top",
-    "modelaction": "",
-    "modelstate": 0,
-    "rotation": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "point": "icon_02",
-    "storyBegin": 9,
-    "chooseId": [
-      10006,
-      10007,
-      10008
-    ],
-    "storyEnd": 0,
-    "nextTid": 100104,
-    "reward": [
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 10
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 1000
-      }
-    ],
-    "CD": 0,
-    "endTid": -1
-  },
-  {
-    "id": 1007,
-    "objType": 1,
-    "location": "middle",
-    "modelaction": "",
-    "modelstate": 0,
-    "rotation": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "point": "model_01",
-    "storyBegin": 15,
-    "chooseId": [
-      10009,
-      100010
-    ],
-    "storyEnd": 0,
-    "nextTid": 100105,
-    "reward": [
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 10
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 1000
-      }
-    ],
-    "CD": 0,
-    "endTid": -1
-  },
-  {
-    "id": 1008,
-    "objType": 1,
-    "location": "middle",
-    "modelaction": "",
-    "modelstate": 0,
-    "rotation": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "point": "model_02",
-    "storyBegin": 11,
-    "chooseId": [],
-    "storyEnd": 0,
     "nextTid": -1,
     "reward": [],
     "CD": 0,
     "endTid": -1
   },
+  {
+    "id": 1008,
+    "objType": 2,
+    "location": "",
+    "modelaction": "",
+    "modelstate": 0,
+    "rotation": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "point": "icon_04",
+    "storyBegin": 12,
+    "chooseId": [],
+    "storyEnd": 13,
+    "nextTid": -1,
+    "reward": [],
+    "CD": 0,
+    "endTid": 160
+  },
   {
     "id": 1009,
-    "objType": 1,
+    "objType": 2,
     "location": "middle",
     "modelaction": "",
     "modelstate": 0,
@@ -229,7 +198,7 @@
   },
   {
     "id": 1010,
-    "objType": 1,
+    "objType": 2,
     "location": "middle",
     "modelaction": "",
     "modelstate": 0,
@@ -266,39 +235,5 @@
     "reward": [],
     "CD": 0,
     "endTid": -1
-  },
-  {
-    "id": 1012,
-    "objType": 2,
-    "location": "right",
-    "modelaction": "",
-    "modelstate": 0,
-    "rotation": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "point": "icon_03",
-    "storyBegin": 17,
-    "chooseId": [
-      100011,
-      100012
-    ],
-    "storyEnd": 0,
-    "nextTid": 0,
-    "reward": [
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 10
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 1000
-      }
-    ],
-    "CD": 0,
-    "endTid": -1
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_shop.json b/bin/json/game_shop.json
index 1391aed9f..7a215d5d7 100644
--- a/bin/json/game_shop.json
+++ b/bin/json/game_shop.json
@@ -2,8 +2,14 @@
   {
     "shopid": 1,
     "tab": 1,
-    "shopname": "金币商店",
-    "upper_shop": "",
+    "shopname": {
+      "key": "shop_1",
+      "text": "金币商店"
+    },
+    "upper_shop": {
+      "key": "",
+      "text": ""
+    },
     "needshow": [
       {
         "a": "attr",
@@ -35,8 +41,14 @@
   {
     "shopid": 2,
     "tab": 2,
-    "shopname": "钻石商店",
-    "upper_shop": "",
+    "shopname": {
+      "key": "shop_2",
+      "text": "钻石商店"
+    },
+    "upper_shop": {
+      "key": "",
+      "text": ""
+    },
     "needshow": [
       {
         "a": "attr",
@@ -60,8 +72,14 @@
   {
     "shopid": 3,
     "tab": 3,
-    "shopname": "PVP商店",
-    "upper_shop": "玩法商店",
+    "shopname": {
+      "key": "shop_3",
+      "text": "PVP商店"
+    },
+    "upper_shop": {
+      "key": "shop_title1",
+      "text": "玩法商店"
+    },
     "needshow": [
       {
         "a": "attr",
@@ -85,8 +103,14 @@
   {
     "shopid": 4,
     "tab": 4,
-    "shopname": "PVE商店",
-    "upper_shop": "玩法商店",
+    "shopname": {
+      "key": "shop_4",
+      "text": "PVE商店"
+    },
+    "upper_shop": {
+      "key": "shop_title1",
+      "text": "玩法商店"
+    },
     "needshow": [
       {
         "a": "attr",
@@ -110,8 +134,14 @@
   {
     "shopid": 5,
     "tab": 5,
-    "shopname": "联盟商店",
-    "upper_shop": "玩法商店",
+    "shopname": {
+      "key": "shop_5",
+      "text": "联盟商店"
+    },
+    "upper_shop": {
+      "key": "shop_title1",
+      "text": "玩法商店"
+    },
     "needshow": [
       {
         "a": "attr",
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index f217c9d19..6f239627b 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -5365,7 +5365,7 @@
       500
     ],
     "FollowSK": [
-      244006114
+      244006115
     ],
     "SucFollowSK": [],
     "FailFollowSK": [],
@@ -5386,7 +5386,7 @@
       500
     ],
     "FollowSK": [
-      244006115
+      244006114
     ],
     "SucFollowSK": [],
     "FailFollowSK": [],
@@ -5752,7 +5752,9 @@
       4,
       2300
     ],
-    "FollowSK": [],
+    "FollowSK": [
+      244006315
+    ],
     "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false
@@ -5772,9 +5774,7 @@
       1,
       0
     ],
-    "FollowSK": [
-      244006315
-    ],
+    "FollowSK": [],
     "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false
@@ -5789,7 +5789,6 @@
     "ExecuteCnt": 1,
     "Type": 17,
     "Argu": [
-      244006313,
       300
     ],
     "FollowSK": [],
@@ -5848,7 +5847,6 @@
     "ExecuteCnt": 1,
     "Type": 17,
     "Argu": [
-      244006323,
       300
     ],
     "FollowSK": [],
@@ -5887,7 +5885,6 @@
     "ExecuteCnt": 1,
     "Type": 17,
     "Argu": [
-      244006333,
       300
     ],
     "FollowSK": [],
@@ -5926,7 +5923,6 @@
     "ExecuteCnt": 1,
     "Type": 17,
     "Argu": [
-      244006343,
       300
     ],
     "FollowSK": [],
@@ -5965,7 +5961,6 @@
     "ExecuteCnt": 1,
     "Type": 17,
     "Argu": [
-      244006353,
       300
     ],
     "FollowSK": [],
@@ -6005,7 +6000,6 @@
     "ExecuteCnt": 1,
     "Type": 17,
     "Argu": [
-      944006313,
       300
     ],
     "FollowSK": [],
diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json
index f9e50eee2..d976d3bd9 100644
--- a/bin/json/game_skillatk.json
+++ b/bin/json/game_skillatk.json
@@ -4064,11 +4064,8 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        390001402,
         244006112,
-        244006113,
-        244006114,
-        244006115
+        244006113
       ]
     },
     "Desc": {
@@ -4093,11 +4090,8 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        390001402,
         244006122,
-        244006113,
-        244006114,
-        244006125
+        244006113
       ]
     },
     "Desc": {
@@ -4122,11 +4116,8 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        390001402,
         244006132,
-        244006113,
-        244006114,
-        244006135
+        244006113
       ]
     },
     "Desc": {
@@ -4151,11 +4142,8 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        390001402,
         244006142,
-        244006113,
-        244006114,
-        244006145
+        244006113
       ]
     },
     "Desc": {
@@ -4180,11 +4168,8 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        390001402,
         244006152,
-        244006113,
-        244006114,
-        244006155
+        244006113
       ]
     },
     "Desc": {
@@ -4209,11 +4194,8 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        390001402,
         244006162,
-        244006113,
-        244006114,
-        244006165
+        244006113
       ]
     },
     "Desc": {
@@ -4267,7 +4249,6 @@
         244006312,
         244006313,
         244006314,
-        244006315,
         244006316
       ]
     },
@@ -4297,7 +4278,6 @@
         244006312,
         244006323,
         244006314,
-        244006325,
         244006316
       ]
     },
@@ -4327,7 +4307,6 @@
         244006312,
         244006333,
         244006314,
-        244006335,
         244006316
       ]
     },
@@ -4357,7 +4336,6 @@
         244006312,
         244006343,
         244006314,
-        244006345,
         244006316
       ]
     },
@@ -4387,7 +4365,6 @@
         244006312,
         244006353,
         244006314,
-        244006355,
         244006316
       ]
     },
@@ -4417,7 +4394,6 @@
         244006312,
         244006353,
         244006314,
-        244006355,
         244006316
       ]
     },
diff --git a/bin/json/game_stroy.json b/bin/json/game_stroy.json
index a946cd59a..fd98ebde2 100644
--- a/bin/json/game_stroy.json
+++ b/bin/json/game_stroy.json
@@ -3,300 +3,13 @@
     "id": 10001,
     "groupid": 1,
     "before": -1,
-    "next": 10002,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 0,
-    "speak": "25001",
-    "listen": "",
-    "des": "这是什么...一朵花？",
-    "modelstatetarget": "",
-    "modelstate": 0,
-    "modelaction": "",
-    "speakstate": "",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 10002,
-    "groupid": 1,
-    "before": 10001,
-    "next": 10003,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 1,
-    "speak": "44005",
-    "listen": "25001",
-    "des": "你干什么？住手！",
-    "modelstatetarget": "25001",
-    "modelstate": 1,
-    "modelaction": "",
-    "speakstate": "Atk2",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 10003,
-    "groupid": 1,
-    "before": 10002,
-    "next": 10004,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 0,
-    "speak": "25001",
-    "listen": "44005",
-    "des": "谁？我？！",
-    "modelstatetarget": "25001",
-    "modelstate": 2,
-    "modelaction": "",
-    "speakstate": "25001_tiaoxin",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 10004,
-    "groupid": 1,
-    "before": 10003,
-    "next": 10005,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 1,
-    "speak": "44005",
-    "listen": "25001",
-    "des": "蹲了这么久算是知道是谁偷了我的花了。",
-    "modelstatetarget": "",
-    "modelstate": 0,
-    "modelaction": "",
-    "speakstate": "",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 10005,
-    "groupid": 1,
-    "before": 10004,
-    "next": 10006,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 0,
-    "speak": "25001",
-    "listen": "44005",
-    "des": "不不不，你误会了，我是看到这盆花放在这里，所以才来看看。",
-    "modelstatetarget": "",
-    "modelstate": 0,
-    "modelaction": "",
-    "speakstate": "",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 10006,
-    "groupid": 1,
-    "before": 10005,
-    "next": 10007,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 1,
-    "speak": "44005",
-    "listen": "25001",
-    "des": "少废话，老老实实(拿起骨棍).......",
-    "modelstatetarget": "",
-    "modelstate": 0,
-    "modelaction": "",
-    "speakstate": "",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 10007,
-    "groupid": 1,
-    "before": 10006,
-    "next": 10008,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 0,
-    "speak": "25001",
-    "listen": "44005",
-    "des": "等....等等，你看看你身后！",
-    "modelstatetarget": "",
-    "modelstate": 0,
-    "modelaction": "",
-    "speakstate": "",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 10008,
-    "groupid": 1,
-    "before": 10007,
     "next": -1,
     "type": 2,
     "bg": "jqdh_bg01",
-    "place": 1,
-    "speak": "44005",
-    "listen": "25001",
-    "des": "想糊弄我？你还差远了!(丢出骨棍！快闪！)",
+    "place": 0,
+    "speak": "25004",
+    "listen": "",
+    "des": "好兴奋呀，刚才在森林里唱歌时看到了一个和我一模一样的魔法精灵，可惜没跟她说上话，她就跑了，谁能帮忙找呢？",
     "modelstatetarget": "",
     "modelstate": 0,
     "modelaction": "",
@@ -331,54 +44,13 @@
     "id": 20001,
     "groupid": 2,
     "before": -1,
-    "next": 20002,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 0,
-    "speak": "25001",
-    "listen": "44005",
-    "des": "不是，你身后真有东西!",
-    "modelstatetarget": "",
-    "modelstate": 0,
-    "modelaction": "",
-    "speakstate": "25001_tiaoxin",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 20002,
-    "groupid": 2,
-    "before": 20001,
     "next": -1,
     "type": 2,
     "bg": "jqdh_bg01",
-    "place": 1,
-    "speak": "44005",
-    "listen": "25001",
-    "des": "啧啧啧（下意识回头）......",
+    "place": 0,
+    "speak": "35001",
+    "listen": "",
+    "des": "(自言自语）我感觉黑暗能量又开始异动……",
     "modelstatetarget": "",
     "modelstate": 0,
     "modelaction": "",
@@ -413,13 +85,136 @@
     "id": 30001,
     "groupid": 3,
     "before": -1,
-    "next": -1,
+    "next": 30002,
     "type": 2,
     "bg": "jqdh_bg01",
     "place": 0,
-    "speak": "44005",
-    "listen": "12003",
-    "des": "波.....波比？你这是怎么了？",
+    "speak": "25004",
+    "listen": "35001",
+    "des": " 邦尼兔，邦尼兔，我在森林里可能遇到了我的'双胞胎'妹妹，你能帮我找找吗",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 30002,
+    "groupid": 3,
+    "before": 30001,
+    "next": 30003,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 1,
+    "speak": "35001",
+    "listen": "25004",
+    "des": "（自言自语）到底是哪里出了问题……",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 30003,
+    "groupid": 3,
+    "before": 30002,
+    "next": 30004,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 0,
+    "speak": "25004",
+    "listen": "35001",
+    "des": "邦尼兔，邦尼兔，你有在听我讲话吗？邦尼兔，邦尼兔，邦尼兔……",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 30004,
+    "groupid": 3,
+    "before": 30003,
+    "next": -1,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 1,
+    "speak": "35001",
+    "listen": "25004",
+    "des": " 啊啊啊啊，我很忙，现在没时间！",
     "modelstatetarget": "",
     "modelstate": 0,
     "modelaction": "",
@@ -454,218 +249,13 @@
     "id": 40001,
     "groupid": 4,
     "before": -1,
-    "next": 40002,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 0,
-    "speak": "25001",
-    "listen": "12003",
-    "des": "你，你是波比？",
-    "modelstatetarget": "",
-    "modelstate": 0,
-    "modelaction": "",
-    "speakstate": "25001_tiaoxin",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 40002,
-    "groupid": 4,
-    "before": 40001,
-    "next": 40003,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 1,
-    "speak": "12003",
-    "listen": "25001",
-    "des": ".......",
-    "modelstatetarget": "",
-    "modelstate": 0,
-    "modelaction": "",
-    "speakstate": "",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 40003,
-    "groupid": 4,
-    "before": 40002,
-    "next": 40004,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 0,
-    "speak": "25001",
-    "listen": "12003",
-    "des": "怎么了，波比？",
-    "modelstatetarget": "",
-    "modelstate": 0,
-    "modelaction": "",
-    "speakstate": "",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 40004,
-    "groupid": 4,
-    "before": 40003,
-    "next": 40005,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 1,
-    "speak": "44005",
-    "listen": "25001",
-    "des": "我感觉有些不对劲......",
-    "modelstatetarget": "",
-    "modelstate": 0,
-    "modelaction": "",
-    "speakstate": "",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 40005,
-    "groupid": 4,
-    "before": 40004,
-    "next": 40006,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 1,
-    "speak": "12003",
-    "listen": "25001",
-    "des": "啊啊啊啊啊啊啊啊！！！",
-    "modelstatetarget": "",
-    "modelstate": 0,
-    "modelaction": "",
-    "speakstate": "",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 40006,
-    "groupid": 4,
-    "before": 40005,
     "next": -1,
     "type": 2,
     "bg": "jqdh_bg01",
     "place": 0,
-    "speak": "44005",
-    "listen": "12003",
-    "des": "快！快闪开！",
+    "speak": "25004",
+    "listen": "",
+    "des": "邦尼兔就在地球仪旁，直接过去找他吧！",
     "modelstatetarget": "",
     "modelstate": 0,
     "modelaction": "",
@@ -700,95 +290,13 @@
     "id": 50001,
     "groupid": 5,
     "before": -1,
-    "next": 50002,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 0,
-    "speak": "25001",
-    "listen": "",
-    "des": "谁能告诉我到底发生了什么？",
-    "modelstatetarget": "",
-    "modelstate": 0,
-    "modelaction": "",
-    "speakstate": "",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 50002,
-    "groupid": 5,
-    "before": 50001,
-    "next": 50003,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 1,
-    "speak": "44005",
-    "listen": "25001",
-    "des": "管他的，先打了再说",
-    "modelstatetarget": "",
-    "modelstate": 0,
-    "modelaction": "",
-    "speakstate": "",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 50003,
-    "groupid": 5,
-    "before": 50002,
     "next": -1,
     "type": 2,
     "bg": "jqdh_bg01",
     "place": 0,
-    "speak": "25001",
-    "listen": "44005",
-    "des": "该死！",
+    "speak": "25004",
+    "listen": "",
+    "des": "看来邦尼兔有些忙，我先去找小伊看看吧。",
     "modelstatetarget": "",
     "modelstate": 0,
     "modelaction": "",
@@ -827,9 +335,9 @@
     "type": 2,
     "bg": "jqdh_bg01",
     "place": 0,
-    "speak": "25001",
-    "listen": "",
-    "des": "那真的是波比吗.....",
+    "speak": "25004",
+    "listen": "44005",
+    "des": "小伊，小伊，我在森林里可能遇到了我的'双胞胎'妹妹，你能帮我找找吗",
     "modelstatetarget": "",
     "modelstate": 0,
     "modelaction": "",
@@ -869,8 +377,8 @@
     "bg": "jqdh_bg01",
     "place": 1,
     "speak": "44005",
-    "listen": "25001",
-    "des": "我不清楚，或许我们应该去找波比。",
+    "listen": "25004",
+    "des": "找人？这个我擅长，原始人对于气息的把控可不比那些什么高科技差。",
     "modelstatetarget": "",
     "modelstate": 0,
     "modelaction": "",
@@ -909,9 +417,9 @@
     "type": 2,
     "bg": "jqdh_bg01",
     "place": 0,
-    "speak": "25001",
+    "speak": "25004",
     "listen": "44005",
-    "des": "她现在在哪儿",
+    "des": "太好了！她之前就在这片森林之内，你能帮我找找看吗？",
     "modelstatetarget": "",
     "modelstate": 0,
     "modelaction": "",
@@ -951,8 +459,8 @@
     "bg": "jqdh_bg01",
     "place": 1,
     "speak": "44005",
-    "listen": "44005",
-    "des": "我看她好像往维京塔方向去了。",
+    "listen": "25004",
+    "des": "没问题！(嗅嗅~~)",
     "modelstatetarget": "",
     "modelstate": 0,
     "modelaction": "",
@@ -987,13 +495,218 @@
     "id": 60005,
     "groupid": 6,
     "before": 60004,
+    "next": 60006,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 0,
+    "speak": "25004",
+    "listen": "44005",
+    "des": "......",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 60006,
+    "groupid": 6,
+    "before": 60005,
+    "next": 60007,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 1,
+    "speak": "44005",
+    "listen": "25004",
+    "des": "有了！",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 60007,
+    "groupid": 6,
+    "before": 60006,
+    "next": 60008,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 0,
+    "speak": "25004",
+    "listen": "44005",
+    "des": "有了？",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 60008,
+    "groupid": 6,
+    "before": 60007,
+    "next": 60009,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 1,
+    "speak": "44005",
+    "listen": "25004",
+    "des": "一股很浓厚的味道，就在前方！(迫不及待)",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 60009,
+    "groupid": 6,
+    "before": 60008,
+    "next": 60010,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 0,
+    "speak": "25004",
+    "listen": "44005",
+    "des": "哎？等等我！",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 60010,
+    "groupid": 6,
+    "before": 60009,
     "next": -1,
     "type": 2,
     "bg": "jqdh_bg01",
     "place": 0,
-    "speak": "25001",
+    "speak": "25004",
     "listen": "44005",
-    "des": "我后面有时间去找她看看吧。",
+    "des": "糟了，小伊跑太快，我跟不上了.......",
     "modelstatetarget": "",
     "modelstate": 0,
     "modelaction": "",
@@ -1028,95 +741,13 @@
     "id": 70001,
     "groupid": 7,
     "before": -1,
-    "next": 70002,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 0,
-    "speak": "25001",
-    "listen": "25004",
-    "des": "波比！",
-    "modelstatetarget": "",
-    "modelstate": 0,
-    "modelaction": "",
-    "speakstate": "",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 70002,
-    "groupid": 7,
-    "before": 70001,
-    "next": 70003,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 1,
-    "speak": "25004",
-    "listen": "25001",
-    "des": "没时间了，我知道你要说什么，快跟我来！",
-    "modelstatetarget": "",
-    "modelstate": 0,
-    "modelaction": "",
-    "speakstate": "",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 70003,
-    "groupid": 7,
-    "before": 70002,
     "next": -1,
     "type": 2,
     "bg": "jqdh_bg01",
     "place": 0,
-    "speak": "25001",
-    "listen": "25004",
-    "des": "等....等等！我靠，她到底要做什么？",
+    "speak": "25004",
+    "listen": "",
+    "des": "事到如今，只有发挥我的特殊力量了！",
     "modelstatetarget": "",
     "modelstate": 0,
     "modelaction": "",
@@ -1151,13 +782,341 @@
     "id": 80001,
     "groupid": 8,
     "before": -1,
+    "next": 80002,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 0,
+    "speak": "44005",
+    "listen": "25001",
+    "des": "该死，味道到这里就断了，到处都是阿宝的包子味儿！",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 80002,
+    "groupid": 8,
+    "before": 80001,
+    "next": 80003,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 0,
+    "speak": "44005",
+    "listen": "25001",
+    "des": "都怪你的包子，味道到这里全都断了！",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 80003,
+    "groupid": 8,
+    "before": 80002,
+    "next": 80004,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 1,
+    "speak": "25001",
+    "listen": "44005",
+    "des": "包子？包子怎么了，我在室内吃被悍娇虎轰出来，现在在森林里吃个包子也不行了........",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 80004,
+    "groupid": 8,
+    "before": 80003,
+    "next": 80005,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 0,
+    "speak": "44005",
+    "listen": "25001",
+    "des": "（眼神不善）",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 80005,
+    "groupid": 8,
+    "before": 80004,
+    "next": 80006,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 1,
+    "speak": "25001",
+    "listen": "44005",
+    "des": "等....等等，先别举棍子，你先说我到底是妨碍你做什么了？",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 80006,
+    "groupid": 8,
+    "before": 80005,
+    "next": 80007,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 0,
+    "speak": "44005",
+    "listen": "25001",
+    "des": "我们在找波比的姐妹，味道刚刚到这里就被断掉了，现在我什么都闻不到。",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 80007,
+    "groupid": 8,
+    "before": 80006,
+    "next": 80008,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 1,
+    "speak": "25001",
+    "listen": "44005",
+    "des": "找人？这种事可以照维京那帮人啊，他们的龙最擅长这类事情了。",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 80008,
+    "groupid": 8,
+    "before": 80007,
+    "next": 80009,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 1,
+    "speak": "25004",
+    "listen": "44005",
+    "des": "维京人......对啊，我还可以去找维京人！",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 80009,
+    "groupid": 8,
+    "before": 80008,
     "next": -1,
     "type": 2,
     "bg": "jqdh_bg01",
     "place": 0,
-    "speak": "25001",
-    "listen": "",
-    "des": "波比？你在房屋顶上做什么？！",
+    "speak": "44005",
+    "listen": "25004",
+    "des": "对不住了波比，我现在的鼻子里全是包子味儿，一时半会是散不掉了，不过我可以带你去维京居住地。",
     "modelstatetarget": "",
     "modelstate": 0,
     "modelaction": "",
@@ -1192,341 +1151,13 @@
     "id": 90001,
     "groupid": 9,
     "before": -1,
-    "next": 90002,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 0,
-    "speak": "25001",
-    "listen": "25004",
-    "des": "你到这里来做什么？",
-    "modelstatetarget": "",
-    "modelstate": 0,
-    "modelaction": "",
-    "speakstate": "",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 90002,
-    "groupid": 9,
-    "before": 90001,
-    "next": 90003,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 1,
-    "speak": "25004",
-    "listen": "25001",
-    "des": "安静，看！",
-    "modelstatetarget": "",
-    "modelstate": 0,
-    "modelaction": "",
-    "speakstate": "",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 90003,
-    "groupid": 9,
-    "before": 90002,
-    "next": 90004,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 0,
-    "speak": "25001",
-    "listen": "25004",
-    "des": "什么鬼......",
-    "modelstatetarget": "",
-    "modelstate": 0,
-    "modelaction": "",
-    "speakstate": "",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 90004,
-    "groupid": 9,
-    "before": 90003,
-    "next": 90005,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 1,
-    "speak": "12001",
-    "listen": "25001",
-    "des": "......",
-    "modelstatetarget": "",
-    "modelstate": 0,
-    "modelaction": "",
-    "speakstate": "",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 90005,
-    "groupid": 9,
-    "before": 90004,
-    "next": 90006,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 1,
-    "speak": "12003",
-    "listen": "25001",
-    "des": ".......",
-    "modelstatetarget": "",
-    "modelstate": 0,
-    "modelaction": "",
-    "speakstate": "",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 90006,
-    "groupid": 9,
-    "before": 90005,
-    "next": 90007,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 1,
-    "speak": "12018",
-    "listen": "25001",
-    "des": "........",
-    "modelstatetarget": "",
-    "modelstate": 0,
-    "modelaction": "",
-    "speakstate": "",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 90007,
-    "groupid": 9,
-    "before": 90006,
-    "next": 90008,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 0,
-    "speak": "25001",
-    "listen": "12018",
-    "des": "我的....老天爷，这都是什么？",
-    "modelstatetarget": "",
-    "modelstate": 0,
-    "modelaction": "",
-    "speakstate": "",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 90008,
-    "groupid": 9,
-    "before": 90007,
-    "next": 90009,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 1,
-    "speak": "12018",
-    "listen": "25001",
-    "des": "啊啊啊啊啊 ！！！",
-    "modelstatetarget": "",
-    "modelstate": 0,
-    "modelaction": "",
-    "speakstate": "",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 90009,
-    "groupid": 9,
-    "before": 90008,
     "next": -1,
     "type": 2,
     "bg": "jqdh_bg01",
     "place": 1,
     "speak": "25004",
-    "listen": "25001",
-    "des": "不好！他们发现我们了，快跑！！",
+    "listen": "44005",
+    "des": "我不确定亚丝翠现在在不在基地，等后续再说吧。",
     "modelstatetarget": "",
     "modelstate": 0,
     "modelaction": "",
@@ -1565,9 +1196,9 @@
     "type": 2,
     "bg": "jqdh_bg01",
     "place": 0,
-    "speak": "25001",
-    "listen": "",
-    "des": "天哪，已经来了这么多人了吗？",
+    "speak": "25004",
+    "listen": "35002",
+    "des": "嗨，卡嗝，我希望你能帮我找一下我的姐妹......",
     "modelstatetarget": "",
     "modelstate": 0,
     "modelaction": "",
@@ -1606,9 +1237,9 @@
     "type": 2,
     "bg": "jqdh_bg01",
     "place": 1,
-    "speak": "25004",
-    "listen": "25001",
-    "des": "他们和我一样，早就在昨晚就知道了这些事情，今天就需要商量出对策",
+    "speak": "35002",
+    "listen": "25004",
+    "des": "丢了!",
     "modelstatetarget": "",
     "modelstate": 0,
     "modelaction": "",
@@ -1646,10 +1277,10 @@
     "next": 100004,
     "type": 2,
     "bg": "jqdh_bg01",
-    "place": 1,
-    "speak": "44005",
-    "listen": "25001",
-    "des": "知道？知道什么？",
+    "place": 0,
+    "speak": "25004",
+    "listen": "35002",
+    "des": "额，也不算是丢了，只是不知道......",
     "modelstatetarget": "",
     "modelstate": 0,
     "modelaction": "",
@@ -1684,13 +1315,382 @@
     "id": 100004,
     "groupid": 10,
     "before": 100003,
+    "next": 100005,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 1,
+    "speak": "35002",
+    "listen": "25004",
+    "des": "丢了！！！",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 100005,
+    "groupid": 10,
+    "before": 100004,
+    "next": 100006,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 0,
+    "speak": "25004",
+    "listen": "35002",
+    "des": "额，谢谢你这么有动力，如果可以的话，我希望能够让无牙仔......",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 100006,
+    "groupid": 10,
+    "before": 100005,
+    "next": 100007,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 1,
+    "speak": "35002",
+    "listen": "25004",
+    "des": "什么！你知道无牙仔在哪儿？",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 100007,
+    "groupid": 10,
+    "before": 100006,
+    "next": 100008,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 0,
+    "speak": "25004",
+    "listen": "35002",
+    "des": "谢.....啥？",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 100008,
+    "groupid": 10,
+    "before": 100007,
+    "next": 100009,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 1,
+    "speak": "35002",
+    "listen": "25004",
+    "des": "谢谢，请告诉我无牙仔在哪里，他从昨天开始就不见了。",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 100009,
+    "groupid": 10,
+    "before": 100008,
+    "next": 100010,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 0,
+    "speak": "25004",
+    "listen": "35002",
+    "des": "额，哈哈.....",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 100010,
+    "groupid": 10,
+    "before": 100009,
+    "next": 100011,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 1,
+    "speak": "35002",
+    "listen": "25004",
+    "des": "对了！我有个想法，按照以往无牙仔的消失事件来看，他很有可能去的地方就只有那么几个，感谢你前来陪我一起寻找。",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 100011,
+    "groupid": 10,
+    "before": 100010,
+    "next": 100012,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 0,
+    "speak": "25004",
+    "listen": "35002",
+    "des": "等.....等等！",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 100012,
+    "groupid": 10,
+    "before": 100011,
+    "next": 100013,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 1,
+    "speak": "35002",
+    "listen": "25004",
+    "des": "事不宜迟，我们赶紧出发吧。",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 100013,
+    "groupid": 10,
+    "before": 100012,
     "next": -1,
     "type": 2,
     "bg": "jqdh_bg01",
     "place": 0,
     "speak": "25004",
-    "listen": "25001",
-    "des": "不知道是因为什么原因，最近基地内出现了很多这种复制体，你准备好了就来找我，我们一起解决这件事情",
+    "listen": "35002",
+    "des": "不不不，你先让我思考一会。",
     "modelstatetarget": "",
     "modelstate": 0,
     "modelaction": "",
@@ -1725,13 +1725,464 @@
     "id": 110001,
     "groupid": 11,
     "before": -1,
-    "next": -1,
+    "next": 110002,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 1,
+    "speak": "35002",
+    "listen": "25004",
+    "des": "就是这儿！我以前和无牙仔最喜欢来这里兜风。",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 110002,
+    "groupid": 11,
+    "before": 110001,
+    "next": 110003,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 1,
+    "speak": "35002",
+    "listen": "25004",
+    "des": "不过一段时间不来，感觉这里的地貌变化有些大啊。",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 110003,
+    "groupid": 11,
+    "before": 110002,
+    "next": 110004,
     "type": 2,
     "bg": "jqdh_bg01",
     "place": 0,
-    "speak": "25001",
-    "listen": "",
-    "des": "我应该尽快去和波比谈话，这件事让我有不好的预感，或许我也可以去和其他人先交谈一番。",
+    "speak": "25004",
+    "listen": "35002",
+    "des": "(我感觉，跟他一起寻找是一件失误......)",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 110004,
+    "groupid": 11,
+    "before": 110003,
+    "next": 110005,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 0,
+    "speak": "25004",
+    "listen": "35002",
+    "des": "所以，我们应该从哪里开始寻找呢？",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 110005,
+    "groupid": 11,
+    "before": 110004,
+    "next": 110006,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 1,
+    "speak": "35002",
+    "listen": "25004",
+    "des": "我们之前最喜欢去竹林环绕的地方，无牙仔很喜欢那里的竹子。",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 110006,
+    "groupid": 11,
+    "before": 110005,
+    "next": 110007,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 1,
+    "speak": "35002",
+    "listen": "25004",
+    "des": "当然，山岩林立的峡谷也很吸引人，草原也很不错.....",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 110007,
+    "groupid": 11,
+    "before": 110006,
+    "next": 110008,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 0,
+    "speak": "25004",
+    "listen": "35002",
+    "des": ".......",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 110008,
+    "groupid": 11,
+    "before": 110007,
+    "next": 110009,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 1,
+    "speak": "35002",
+    "listen": "25004",
+    "des": "不过自从暗影入侵之后，世界发生了翻天覆地变化，曾经的草原，竹林和山谷我都已经不记得位置了。",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 110009,
+    "groupid": 11,
+    "before": 110008,
+    "next": 110010,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 1,
+    "speak": "35002",
+    "listen": "25004",
+    "des": "但我肯定，无牙仔一定在这里的某一处，我们这就出发吧，你熟悉地形，所以你来带路！",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 110010,
+    "groupid": 11,
+    "before": 110009,
+    "next": 110011,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 0,
+    "speak": "25004",
+    "listen": "35002",
+    "des": "哎.......好吧。",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 110011,
+    "groupid": 11,
+    "before": 110010,
+    "next": 110012,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 1,
+    "speak": "35002",
+    "listen": "25004",
+    "des": "(所以我现在需要去各个关卡里寻找无牙仔，这样他才会让他的龙帮助我寻找姐妹)",
+    "modelstatetarget": "",
+    "modelstate": 0,
+    "modelaction": "",
+    "speakstate": "",
+    "listenstate": "",
+    "chose": [],
+    "turn": 0,
+    "show": 0,
+    "move": "",
+    "action": "",
+    "sound": "",
+    "position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "revolve": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "size": {
+      "x": 0.8,
+      "y": 0.8,
+      "z": 0.8
+    },
+    "perf": "",
+    "cg": "",
+    "skip": true
+  },
+  {
+    "id": 110012,
+    "groupid": 11,
+    "before": 110011,
+    "next": -1,
+    "type": 2,
+    "bg": "jqdh_bg01",
+    "place": 1,
+    "speak": "35002",
+    "listen": "25004",
+    "des": "（竹林，山谷，草原，有这些特征的地方在哪里了......）",
     "modelstatetarget": "",
     "modelstate": 0,
     "modelaction": "",
@@ -1766,54 +2217,13 @@
     "id": 120001,
     "groupid": 12,
     "before": -1,
-    "next": 120002,
-    "type": 2,
-    "bg": "jqdh_bg01",
-    "place": 1,
-    "speak": "44005",
-    "listen": "25001",
-    "des": "我怎么感觉就我被蒙在鼓里，到底发生了啥事啊？",
-    "modelstatetarget": "",
-    "modelstate": 0,
-    "modelaction": "",
-    "speakstate": "",
-    "listenstate": "",
-    "chose": [],
-    "turn": 0,
-    "show": 0,
-    "move": "",
-    "action": "",
-    "sound": "",
-    "position": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "revolve": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "size": {
-      "x": 0.8,
-      "y": 0.8,
-      "z": 0.8
-    },
-    "perf": "",
-    "cg": "",
-    "skip": true
-  },
-  {
-    "id": 120002,
-    "groupid": 12,
-    "before": 120001,
     "next": -1,
     "type": 2,
     "bg": "jqdh_bg01",
     "place": 0,
-    "speak": "25001",
-    "listen": "44005",
-    "des": "没，你就现在这样，挺好.....",
+    "speak": "25004",
+    "listen": "",
+    "des": "无牙仔会出没在竹林，山谷，草原之类的地方，我需要先战胜关卡内的敌人，才有可能引出无牙仔。",
     "modelstatetarget": "",
     "modelstate": 0,
     "modelaction": "",
diff --git a/bin/json/game_taskround.json b/bin/json/game_taskround.json
index b75eb9748..79fc81a8f 100644
--- a/bin/json/game_taskround.json
+++ b/bin/json/game_taskround.json
@@ -3,7 +3,10 @@
     "key": 10001,
     "id_list": 1,
     "id_tag": 1,
-    "task_display": "提升英雄1级",
+    "task_display": {
+      "key": "task_10001",
+      "text": "提升英雄1级"
+    },
     "type_id": 103,
     "condition_second": 1,
     "restrictive_condition": 0,
@@ -17,7 +20,10 @@
     "key": 10002,
     "id_list": 2,
     "id_tag": 1,
-    "task_display": "提升英雄2级",
+    "task_display": {
+      "key": "task_10002",
+      "text": "提升英雄2级"
+    },
     "type_id": 103,
     "condition_second": 2,
     "restrictive_condition": 0,
@@ -31,7 +37,10 @@
     "key": 10003,
     "id_list": 3,
     "id_tag": 1,
-    "task_display": "提升英雄3级",
+    "task_display": {
+      "key": "task_10003",
+      "text": "提升英雄3级"
+    },
     "type_id": 103,
     "condition_second": 3,
     "restrictive_condition": 0,
@@ -45,7 +54,10 @@
     "key": 10004,
     "id_list": 4,
     "id_tag": 1,
-    "task_display": "提升英雄4级",
+    "task_display": {
+      "key": "task_10004",
+      "text": "提升英雄4级"
+    },
     "type_id": 103,
     "condition_second": 4,
     "restrictive_condition": 0,
@@ -59,7 +71,10 @@
     "key": 10005,
     "id_list": 5,
     "id_tag": 1,
-    "task_display": "提升英雄5级",
+    "task_display": {
+      "key": "task_10005",
+      "text": "提升英雄5级"
+    },
     "type_id": 103,
     "condition_second": 5,
     "restrictive_condition": 0,
@@ -73,7 +88,10 @@
     "key": 10006,
     "id_list": 6,
     "id_tag": 1,
-    "task_display": "提升英雄6级",
+    "task_display": {
+      "key": "task_10006",
+      "text": "提升英雄6级"
+    },
     "type_id": 103,
     "condition_second": 6,
     "restrictive_condition": 0,
@@ -87,7 +105,10 @@
     "key": 10007,
     "id_list": 7,
     "id_tag": 1,
-    "task_display": "提升英雄7级",
+    "task_display": {
+      "key": "task_10007",
+      "text": "提升英雄7级"
+    },
     "type_id": 103,
     "condition_second": 7,
     "restrictive_condition": 0,
@@ -101,7 +122,10 @@
     "key": 10008,
     "id_list": 8,
     "id_tag": 1,
-    "task_display": "提升英雄8级",
+    "task_display": {
+      "key": "task_10008",
+      "text": "提升英雄8级"
+    },
     "type_id": 103,
     "condition_second": 8,
     "restrictive_condition": 0,
@@ -115,7 +139,10 @@
     "key": 10009,
     "id_list": 9,
     "id_tag": 1,
-    "task_display": "提升英雄9级",
+    "task_display": {
+      "key": "task_10009",
+      "text": "提升英雄9级"
+    },
     "type_id": 103,
     "condition_second": 9,
     "restrictive_condition": 0,
@@ -129,7 +156,10 @@
     "key": 10010,
     "id_list": 10,
     "id_tag": 1,
-    "task_display": "提升英雄10级",
+    "task_display": {
+      "key": "task_10010",
+      "text": "提升英雄10级"
+    },
     "type_id": 103,
     "condition_second": 10,
     "restrictive_condition": 0,
@@ -143,7 +173,10 @@
     "key": 20001,
     "id_list": 11,
     "id_tag": 2,
-    "task_display": "提升英雄11级",
+    "task_display": {
+      "key": "task_20001",
+      "text": "提升英雄11级"
+    },
     "type_id": 103,
     "condition_second": 11,
     "restrictive_condition": 0,
@@ -157,11 +190,14 @@
     "key": 20002,
     "id_list": 12,
     "id_tag": 2,
-    "task_display": "提升英雄12级",
+    "task_display": {
+      "key": "task_20002",
+      "text": "提升英雄12级"
+    },
     "type_id": 103,
     "condition_second": 12,
     "restrictive_condition": 0,
-    "active": 10,
+    "active": 15,
     "id_after": 0,
     "jump_interface": "mainworld",
     "icon": "wp_icon_0001",
@@ -171,11 +207,14 @@
     "key": 20003,
     "id_list": 13,
     "id_tag": 2,
-    "task_display": "提升英雄13级",
+    "task_display": {
+      "key": "task_20003",
+      "text": "提升英雄13级"
+    },
     "type_id": 103,
     "condition_second": 13,
     "restrictive_condition": 0,
-    "active": 10,
+    "active": 20,
     "id_after": 0,
     "jump_interface": "mainworld",
     "icon": "wp_icon_0001",
@@ -185,11 +224,14 @@
     "key": 20004,
     "id_list": 14,
     "id_tag": 2,
-    "task_display": "提升英雄14级",
+    "task_display": {
+      "key": "task_20004",
+      "text": "提升英雄14级"
+    },
     "type_id": 103,
     "condition_second": 14,
     "restrictive_condition": 0,
-    "active": 10,
+    "active": 25,
     "id_after": 0,
     "jump_interface": "mainworld",
     "icon": "wp_icon_0001",
@@ -199,11 +241,14 @@
     "key": 20005,
     "id_list": 15,
     "id_tag": 2,
-    "task_display": "提升英雄15级",
+    "task_display": {
+      "key": "task_20005",
+      "text": "提升英雄15级"
+    },
     "type_id": 103,
     "condition_second": 15,
     "restrictive_condition": 0,
-    "active": 10,
+    "active": 25,
     "id_after": 0,
     "jump_interface": "mainworld",
     "icon": "wp_icon_0001",
@@ -213,11 +258,14 @@
     "key": 20006,
     "id_list": 16,
     "id_tag": 2,
-    "task_display": "提升英雄16级",
+    "task_display": {
+      "key": "task_20006",
+      "text": "提升英雄16级"
+    },
     "type_id": 103,
     "condition_second": 16,
     "restrictive_condition": 0,
-    "active": 10,
+    "active": 25,
     "id_after": 0,
     "jump_interface": "mainworld",
     "icon": "wp_icon_0001",
@@ -227,11 +275,14 @@
     "key": 20007,
     "id_list": 17,
     "id_tag": 2,
-    "task_display": "提升英雄17级",
+    "task_display": {
+      "key": "task_20007",
+      "text": "提升英雄17级"
+    },
     "type_id": 103,
     "condition_second": 17,
     "restrictive_condition": 0,
-    "active": 10,
+    "active": 25,
     "id_after": 0,
     "jump_interface": "mainworld",
     "icon": "wp_icon_0001",
@@ -241,11 +292,14 @@
     "key": 20008,
     "id_list": 18,
     "id_tag": 2,
-    "task_display": "提升英雄18级",
+    "task_display": {
+      "key": "task_20008",
+      "text": "提升英雄18级"
+    },
     "type_id": 103,
     "condition_second": 18,
     "restrictive_condition": 0,
-    "active": 10,
+    "active": 25,
     "id_after": 0,
     "jump_interface": "mainworld",
     "icon": "wp_icon_0001",
@@ -255,11 +309,14 @@
     "key": 20009,
     "id_list": 19,
     "id_tag": 2,
-    "task_display": "提升英雄19级",
+    "task_display": {
+      "key": "task_20009",
+      "text": "提升英雄19级"
+    },
     "type_id": 103,
     "condition_second": 19,
     "restrictive_condition": 0,
-    "active": 10,
+    "active": 25,
     "id_after": 0,
     "jump_interface": "mainworld",
     "icon": "wp_icon_0001",
@@ -269,11 +326,14 @@
     "key": 20010,
     "id_list": 20,
     "id_tag": 2,
-    "task_display": "提升英雄20级",
+    "task_display": {
+      "key": "task_20010",
+      "text": "提升英雄20级"
+    },
     "type_id": 103,
     "condition_second": 20,
     "restrictive_condition": 0,
-    "active": 10,
+    "active": 25,
     "id_after": 0,
     "jump_interface": "mainworld",
     "icon": "wp_icon_0001",
@@ -283,7 +343,10 @@
     "key": 30001,
     "id_list": 21,
     "id_tag": 3,
-    "task_display": "提升英雄21级",
+    "task_display": {
+      "key": "task_30001",
+      "text": "提升英雄21级"
+    },
     "type_id": 103,
     "condition_second": 21,
     "restrictive_condition": 0,
@@ -308,7 +371,10 @@
     "key": 30101,
     "id_list": 22,
     "id_tag": 3,
-    "task_display": "提升英雄22级",
+    "task_display": {
+      "key": "task_30101",
+      "text": "提升英雄22级"
+    },
     "type_id": 103,
     "condition_second": 22,
     "restrictive_condition": 0,
@@ -333,7 +399,10 @@
     "key": 30102,
     "id_list": 23,
     "id_tag": 3,
-    "task_display": "提升英雄23级",
+    "task_display": {
+      "key": "task_30102",
+      "text": "提升英雄23级"
+    },
     "type_id": 103,
     "condition_second": 23,
     "restrictive_condition": 0,
@@ -358,7 +427,10 @@
     "key": 30103,
     "id_list": 24,
     "id_tag": 3,
-    "task_display": "提升英雄24级",
+    "task_display": {
+      "key": "task_30103",
+      "text": "提升英雄24级"
+    },
     "type_id": 103,
     "condition_second": 24,
     "restrictive_condition": 0,
@@ -383,7 +455,10 @@
     "key": 30104,
     "id_list": 25,
     "id_tag": 3,
-    "task_display": "提升英雄25级",
+    "task_display": {
+      "key": "task_30104",
+      "text": "提升英雄25级"
+    },
     "type_id": 103,
     "condition_second": 25,
     "restrictive_condition": 0,
@@ -408,7 +483,10 @@
     "key": 30105,
     "id_list": 26,
     "id_tag": 3,
-    "task_display": "提升英雄26级",
+    "task_display": {
+      "key": "task_30105",
+      "text": "提升英雄26级"
+    },
     "type_id": 103,
     "condition_second": 26,
     "restrictive_condition": 0,
@@ -433,7 +511,10 @@
     "key": 30106,
     "id_list": 27,
     "id_tag": 3,
-    "task_display": "提升英雄27级",
+    "task_display": {
+      "key": "task_30106",
+      "text": "提升英雄27级"
+    },
     "type_id": 103,
     "condition_second": 27,
     "restrictive_condition": 0,
@@ -458,7 +539,10 @@
     "key": 30107,
     "id_list": 28,
     "id_tag": 3,
-    "task_display": "提升英雄28级",
+    "task_display": {
+      "key": "task_30107",
+      "text": "提升英雄28级"
+    },
     "type_id": 103,
     "condition_second": 28,
     "restrictive_condition": 0,
@@ -483,7 +567,10 @@
     "key": 30108,
     "id_list": 29,
     "id_tag": 3,
-    "task_display": "提升英雄29级",
+    "task_display": {
+      "key": "task_30108",
+      "text": "提升英雄29级"
+    },
     "type_id": 103,
     "condition_second": 29,
     "restrictive_condition": 0,
@@ -508,7 +595,10 @@
     "key": 30109,
     "id_list": 30,
     "id_tag": 3,
-    "task_display": "提升英雄30级",
+    "task_display": {
+      "key": "task_30109",
+      "text": "提升英雄30级"
+    },
     "type_id": 103,
     "condition_second": 30,
     "restrictive_condition": 0,
@@ -533,7 +623,10 @@
     "key": 30110,
     "id_list": 31,
     "id_tag": 3,
-    "task_display": "提升英雄31级",
+    "task_display": {
+      "key": "task_30110",
+      "text": "提升英雄31级"
+    },
     "type_id": 103,
     "condition_second": 31,
     "restrictive_condition": 0,
@@ -558,7 +651,10 @@
     "key": 30111,
     "id_list": 32,
     "id_tag": 3,
-    "task_display": "提升英雄32级",
+    "task_display": {
+      "key": "task_30111",
+      "text": "提升英雄32级"
+    },
     "type_id": 103,
     "condition_second": 32,
     "restrictive_condition": 0,
@@ -583,7 +679,10 @@
     "key": 30112,
     "id_list": 33,
     "id_tag": 3,
-    "task_display": "提升英雄33级",
+    "task_display": {
+      "key": "task_30112",
+      "text": "提升英雄33级"
+    },
     "type_id": 103,
     "condition_second": 33,
     "restrictive_condition": 0,
@@ -608,7 +707,10 @@
     "key": 30113,
     "id_list": 34,
     "id_tag": 3,
-    "task_display": "提升英雄34级",
+    "task_display": {
+      "key": "task_30113",
+      "text": "提升英雄34级"
+    },
     "type_id": 103,
     "condition_second": 34,
     "restrictive_condition": 0,
@@ -633,7 +735,10 @@
     "key": 30114,
     "id_list": 35,
     "id_tag": 3,
-    "task_display": "提升英雄35级",
+    "task_display": {
+      "key": "task_30114",
+      "text": "提升英雄35级"
+    },
     "type_id": 103,
     "condition_second": 35,
     "restrictive_condition": 0,
@@ -658,7 +763,10 @@
     "key": 30115,
     "id_list": 36,
     "id_tag": 3,
-    "task_display": "提升英雄36级",
+    "task_display": {
+      "key": "task_30115",
+      "text": "提升英雄36级"
+    },
     "type_id": 103,
     "condition_second": 36,
     "restrictive_condition": 0,
@@ -683,7 +791,10 @@
     "key": 30116,
     "id_list": 37,
     "id_tag": 3,
-    "task_display": "提升英雄37级",
+    "task_display": {
+      "key": "task_30116",
+      "text": "提升英雄37级"
+    },
     "type_id": 103,
     "condition_second": 37,
     "restrictive_condition": 0,
@@ -708,7 +819,10 @@
     "key": 30117,
     "id_list": 38,
     "id_tag": 3,
-    "task_display": "提升英雄38级",
+    "task_display": {
+      "key": "task_30117",
+      "text": "提升英雄38级"
+    },
     "type_id": 103,
     "condition_second": 38,
     "restrictive_condition": 0,
@@ -733,7 +847,10 @@
     "key": 30118,
     "id_list": 39,
     "id_tag": 3,
-    "task_display": "提升英雄39级",
+    "task_display": {
+      "key": "task_30118",
+      "text": "提升英雄39级"
+    },
     "type_id": 103,
     "condition_second": 39,
     "restrictive_condition": 0,
@@ -758,7 +875,10 @@
     "key": 30119,
     "id_list": 40,
     "id_tag": 3,
-    "task_display": "提升英雄40级",
+    "task_display": {
+      "key": "task_30119",
+      "text": "提升英雄40级"
+    },
     "type_id": 103,
     "condition_second": 40,
     "restrictive_condition": 0,
diff --git a/bin/json/game_vikingboss.json b/bin/json/game_vikingboss.json
index 506361976..233b9aa57 100644
--- a/bin/json/game_vikingboss.json
+++ b/bin/json/game_vikingboss.json
@@ -34,7 +34,7 @@
       }
     ],
     "drop": 1001,
-    "bossmodel": 25001,
+    "bossmodel": 11009,
     "boss": [
       301011,
       301012,
@@ -81,7 +81,7 @@
       }
     ],
     "drop": 1002,
-    "bossmodel": 25001,
+    "bossmodel": 11009,
     "boss": [
       301014,
       301015,
@@ -133,7 +133,7 @@
       }
     ],
     "drop": 1003,
-    "bossmodel": 25001,
+    "bossmodel": 11009,
     "boss": [
       301017,
       301018,
@@ -185,7 +185,7 @@
       }
     ],
     "drop": 1004,
-    "bossmodel": 25001,
+    "bossmodel": 11009,
     "boss": [
       301020,
       301021,
@@ -237,7 +237,7 @@
       }
     ],
     "drop": 1005,
-    "bossmodel": 25001,
+    "bossmodel": 11009,
     "boss": [
       301023,
       301024,
@@ -289,7 +289,7 @@
       }
     ],
     "drop": 1006,
-    "bossmodel": 25001,
+    "bossmodel": 11009,
     "boss": [
       301026,
       301027,
@@ -341,7 +341,7 @@
       }
     ],
     "drop": 1007,
-    "bossmodel": 25001,
+    "bossmodel": 11009,
     "boss": [
       301029,
       301030,
@@ -393,7 +393,7 @@
       }
     ],
     "drop": 1008,
-    "bossmodel": 25001,
+    "bossmodel": 11009,
     "boss": [
       301032,
       301033,
@@ -445,7 +445,7 @@
       }
     ],
     "drop": 1009,
-    "bossmodel": 25001,
+    "bossmodel": 11009,
     "boss": [
       301035,
       301036,
@@ -497,7 +497,7 @@
       }
     ],
     "drop": 1010,
-    "bossmodel": 25001,
+    "bossmodel": 11009,
     "boss": [
       301038,
       301039,
@@ -539,7 +539,7 @@
       }
     ],
     "drop": 1011,
-    "bossmodel": 25004,
+    "bossmodel": 11003,
     "boss": [
       302011,
       302012,
@@ -586,7 +586,7 @@
       }
     ],
     "drop": 1012,
-    "bossmodel": 25004,
+    "bossmodel": 11003,
     "boss": [
       302014,
       302015,
@@ -638,7 +638,7 @@
       }
     ],
     "drop": 1013,
-    "bossmodel": 25004,
+    "bossmodel": 11003,
     "boss": [
       302017,
       302018,
@@ -690,7 +690,7 @@
       }
     ],
     "drop": 1014,
-    "bossmodel": 25004,
+    "bossmodel": 11003,
     "boss": [
       302020,
       302021,
@@ -742,7 +742,7 @@
       }
     ],
     "drop": 1015,
-    "bossmodel": 25004,
+    "bossmodel": 11003,
     "boss": [
       302023,
       302024,
@@ -794,7 +794,7 @@
       }
     ],
     "drop": 1016,
-    "bossmodel": 25004,
+    "bossmodel": 11003,
     "boss": [
       302026,
       302027,
@@ -846,7 +846,7 @@
       }
     ],
     "drop": 1017,
-    "bossmodel": 25004,
+    "bossmodel": 11003,
     "boss": [
       302029,
       302030,
@@ -898,7 +898,7 @@
       }
     ],
     "drop": 1018,
-    "bossmodel": 25004,
+    "bossmodel": 11003,
     "boss": [
       302032,
       302033,
@@ -950,7 +950,7 @@
       }
     ],
     "drop": 1019,
-    "bossmodel": 25004,
+    "bossmodel": 11003,
     "boss": [
       302035,
       302036,
@@ -1002,7 +1002,7 @@
       }
     ],
     "drop": 1020,
-    "bossmodel": 25004,
+    "bossmodel": 11003,
     "boss": [
       302038,
       302039,
@@ -1044,7 +1044,7 @@
       }
     ],
     "drop": 1021,
-    "bossmodel": 34006,
+    "bossmodel": 11018,
     "boss": [
       303011,
       303012,
@@ -1091,7 +1091,7 @@
       }
     ],
     "drop": 1022,
-    "bossmodel": 34006,
+    "bossmodel": 11018,
     "boss": [
       303014,
       303015,
@@ -1143,7 +1143,7 @@
       }
     ],
     "drop": 1023,
-    "bossmodel": 34006,
+    "bossmodel": 11018,
     "boss": [
       303017,
       303018,
@@ -1195,7 +1195,7 @@
       }
     ],
     "drop": 1024,
-    "bossmodel": 34006,
+    "bossmodel": 11018,
     "boss": [
       303020,
       303021,
@@ -1247,7 +1247,7 @@
       }
     ],
     "drop": 1025,
-    "bossmodel": 34006,
+    "bossmodel": 11018,
     "boss": [
       303023,
       303024,
@@ -1299,7 +1299,7 @@
       }
     ],
     "drop": 1026,
-    "bossmodel": 34006,
+    "bossmodel": 11018,
     "boss": [
       303026,
       303027,
@@ -1351,7 +1351,7 @@
       }
     ],
     "drop": 1027,
-    "bossmodel": 34006,
+    "bossmodel": 11018,
     "boss": [
       303029,
       303030,
@@ -1403,7 +1403,7 @@
       }
     ],
     "drop": 1028,
-    "bossmodel": 34006,
+    "bossmodel": 11018,
     "boss": [
       303032,
       303033,
@@ -1455,7 +1455,7 @@
       }
     ],
     "drop": 1029,
-    "bossmodel": 34006,
+    "bossmodel": 11018,
     "boss": [
       303035,
       303036,
@@ -1507,7 +1507,7 @@
       }
     ],
     "drop": 1030,
-    "bossmodel": 34006,
+    "bossmodel": 11018,
     "boss": [
       303038,
       303039,
diff --git a/sys/configure/structs/Game.MainlineData.go b/sys/configure/structs/Game.MainlineData.go
index d1667789d..23c2d5f95 100644
--- a/sys/configure/structs/Game.MainlineData.go
+++ b/sys/configure/structs/Game.MainlineData.go
@@ -19,7 +19,6 @@ type GameMainlineData struct {
     Order int32
     Linearnum int32
     Chapter int32
-    Route int32
     Episodetype int32
     Episodelocation serialization.Vector2
     Model string
@@ -49,7 +48,6 @@ func (_v *GameMainlineData)Deserialize(_buf map[string]interface{}) (err error)
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["order"].(float64); !_ok_ { err = errors.New("order error"); return }; _v.Order = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["linearnum"].(float64); !_ok_ { err = errors.New("linearnum error"); return }; _v.Linearnum = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["chapter"].(float64); !_ok_ { err = errors.New("chapter error"); return }; _v.Chapter = int32(_tempNum_) }
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["route"].(float64); !_ok_ { err = errors.New("route error"); return }; _v.Route = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Episodetype"].(float64); !_ok_ { err = errors.New("Episodetype error"); return }; _v.Episodetype = int32(_tempNum_) }
     { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["Episodelocation"].(map[string]interface{}); !_ok_ { err = errors.New("Episodelocation error"); return }
             var _x_, _y_ float32;
diff --git a/sys/configure/structs/Game.RDMainlineData.go b/sys/configure/structs/Game.RDMainlineData.go
index c4d8e2fea..bb4035dee 100644
--- a/sys/configure/structs/Game.RDMainlineData.go
+++ b/sys/configure/structs/Game.RDMainlineData.go
@@ -13,17 +13,10 @@ import "errors"
 type GameRDMainlineData struct {
     Id int32
     Episodetype int32
-    Model string
-    Effect string
     FormatList []int32
     CaptainId string
     Battlescene string
     Sceneeffect string
-    Award []*Gameatn
-    Title string
-    Desc string
-    Stroyid []int32
-    Condition []int32
 }
 
 const TypeId_GameRDMainlineData = -1625502939
@@ -35,8 +28,6 @@ func (*GameRDMainlineData) GetTypeId() int32 {
 func (_v *GameRDMainlineData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Episodetype"].(float64); !_ok_ { err = errors.New("Episodetype error"); return }; _v.Episodetype = int32(_tempNum_) }
-    { var _ok_ bool; if _v.Model, _ok_ = _buf["model"].(string); !_ok_ { err = errors.New("model error"); return } }
-    { var _ok_ bool; if _v.Effect, _ok_ = _buf["effect"].(string); !_ok_ { err = errors.New("effect error"); return } }
      {
                 var _arr_ []interface{}
                 var _ok_ bool
@@ -54,50 +45,6 @@ func (_v *GameRDMainlineData)Deserialize(_buf map[string]interface{}) (err error
     { var _ok_ bool; if _v.CaptainId, _ok_ = _buf["captainId"].(string); !_ok_ { err = errors.New("captainId error"); return } }
     { var _ok_ bool; if _v.Battlescene, _ok_ = _buf["battlescene"].(string); !_ok_ { err = errors.New("battlescene error"); return } }
     { var _ok_ bool; if _v.Sceneeffect, _ok_ = _buf["sceneeffect"].(string); !_ok_ { err = errors.New("sceneeffect error"); return } }
-     {
-                var _arr_ []interface{}
-                var _ok_ bool
-                if _arr_, _ok_ = _buf["award"].([]interface{}); !_ok_ { err = errors.New("award error"); return }
-
-                _v.Award = make([]*Gameatn, 0, len(_arr_))
-                
-                for _, _e_ := range _arr_ {
-                    var _list_v_ *Gameatn
-                    { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
-                    _v.Award = append(_v.Award, _list_v_)
-                }
-            }
-
-    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["title"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Title error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Title, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
-    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["desc"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
-     {
-                var _arr_ []interface{}
-                var _ok_ bool
-                if _arr_, _ok_ = _buf["stroyid"].([]interface{}); !_ok_ { err = errors.New("stroyid error"); return }
-
-                _v.Stroyid = make([]int32, 0, len(_arr_))
-                
-                for _, _e_ := range _arr_ {
-                    var _list_v_ int32
-                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
-                    _v.Stroyid = append(_v.Stroyid, _list_v_)
-                }
-            }
-
-     {
-                var _arr_ []interface{}
-                var _ok_ bool
-                if _arr_, _ok_ = _buf["condition"].([]interface{}); !_ok_ { err = errors.New("condition error"); return }
-
-                _v.Condition = make([]int32, 0, len(_arr_))
-                
-                for _, _e_ := range _arr_ {
-                    var _list_v_ int32
-                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
-                    _v.Condition = append(_v.Condition, _list_v_)
-                }
-            }
-
     return
 }
 
diff --git a/sys/configure/structs/game.itemData.go b/sys/configure/structs/game.itemData.go
index 548e1a65a..5d004d9f2 100644
--- a/sys/configure/structs/game.itemData.go
+++ b/sys/configure/structs/game.itemData.go
@@ -22,8 +22,8 @@ type GameItemData struct {
     Effects string
     BoxId int32
     SynthetizeNum int32
-    Access string
-    UseSkip string
+    Access []int32
+    UseSkip int32
     UpperLimit int32
     Uselv int32
     Isani int32
@@ -55,8 +55,21 @@ func (_v *GameItemData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; if _v.Effects, _ok_ = _buf["effects"].(string); !_ok_ { err = errors.New("effects error"); return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["box_id"].(float64); !_ok_ { err = errors.New("box_id error"); return }; _v.BoxId = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["synthetize_num"].(float64); !_ok_ { err = errors.New("synthetize_num error"); return }; _v.SynthetizeNum = int32(_tempNum_) }
-    { var _ok_ bool; if _v.Access, _ok_ = _buf["access"].(string); !_ok_ { err = errors.New("access error"); return } }
-    { var _ok_ bool; if _v.UseSkip, _ok_ = _buf["use_skip"].(string); !_ok_ { err = errors.New("use_skip error"); return } }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["access"].([]interface{}); !_ok_ { err = errors.New("access error"); return }
+
+                _v.Access = make([]int32, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ int32
+                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+                    _v.Access = append(_v.Access, _list_v_)
+                }
+            }
+
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["use_skip"].(float64); !_ok_ { err = errors.New("use_skip error"); return }; _v.UseSkip = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["upper_limit"].(float64); !_ok_ { err = errors.New("upper_limit error"); return }; _v.UpperLimit = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["uselv"].(float64); !_ok_ { err = errors.New("uselv error"); return }; _v.Uselv = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["isani"].(float64); !_ok_ { err = errors.New("isani error"); return }; _v.Isani = int32(_tempNum_) }
@@ -93,7 +106,7 @@ func (_v *GameItemData)Deserialize(_buf map[string]interface{}) (err error) {
                 }
             }
 
-    { var _ok_ bool; if _v.Tipstxt, _ok_ = _buf["tipstxt"].(string); !_ok_ { err = errors.New("tipstxt error"); return } }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["tipstxt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Tipstxt error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Tipstxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     return
 }
 
diff --git a/sys/configure/structs/game.pagodaData.go b/sys/configure/structs/game.pagodaData.go
index fe46eee86..57b61b0e2 100644
--- a/sys/configure/structs/game.pagodaData.go
+++ b/sys/configure/structs/game.pagodaData.go
@@ -64,7 +64,7 @@ func (_v *GamePagodaData)Deserialize(_buf map[string]interface{}) (err error) {
             }
 
     { var _ok_ bool; if _v.FightScene, _ok_ = _buf["fight_scene"].(string); !_ok_ { err = errors.New("fight_scene error"); return } }
-    { var _ok_ bool; if _v.NameDisplay, _ok_ = _buf["name_display"].(string); !_ok_ { err = errors.New("name_display error"); return } }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name_display"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.NameDisplay error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.NameDisplay, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["model_display"].(float64); !_ok_ { err = errors.New("model_display error"); return }; _v.ModelDisplay = int32(_tempNum_) }
     return
 }
diff --git a/sys/configure/structs/game.shopData.go b/sys/configure/structs/game.shopData.go
index 6298ecf0f..162fa5011 100644
--- a/sys/configure/structs/game.shopData.go
+++ b/sys/configure/structs/game.shopData.go
@@ -32,8 +32,8 @@ func (*GameShopData) GetTypeId() int32 {
 func (_v *GameShopData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["shopid"].(float64); !_ok_ { err = errors.New("shopid error"); return }; _v.Shopid = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tab"].(float64); !_ok_ { err = errors.New("tab error"); return }; _v.Tab = int32(_tempNum_) }
-    { var _ok_ bool; if _v.Shopname, _ok_ = _buf["shopname"].(string); !_ok_ { err = errors.New("shopname error"); return } }
-    { var _ok_ bool; if _v.UpperShop, _ok_ = _buf["upper_shop"].(string); !_ok_ { err = errors.New("upper_shop error"); return } }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["shopname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Shopname error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Shopname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["upper_shop"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.UpperShop error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.UpperShop, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
      {
                 var _arr_ []interface{}
                 var _ok_ bool
diff --git a/sys/configure/structs/game.taskRoundData.go b/sys/configure/structs/game.taskRoundData.go
index 41e1843af..3177abc17 100644
--- a/sys/configure/structs/game.taskRoundData.go
+++ b/sys/configure/structs/game.taskRoundData.go
@@ -35,7 +35,7 @@ func (_v *GameTaskRoundData)Deserialize(_buf map[string]interface{}) (err error)
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id_list"].(float64); !_ok_ { err = errors.New("id_list error"); return }; _v.IdList = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id_tag"].(float64); !_ok_ { err = errors.New("id_tag error"); return }; _v.IdTag = int32(_tempNum_) }
-    { var _ok_ bool; if _v.TaskDisplay, _ok_ = _buf["task_display"].(string); !_ok_ { err = errors.New("task_display error"); return } }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["task_display"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskDisplay error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskDisplay, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type_id"].(float64); !_ok_ { err = errors.New("type_id error"); return }; _v.TypeId = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["condition_second"].(float64); !_ok_ { err = errors.New("condition_second error"); return }; _v.ConditionSecond = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["restrictive_condition"].(float64); !_ok_ { err = errors.New("restrictive_condition error"); return }; _v.RestrictiveCondition = int32(_tempNum_) }

From 2a7506ce34b554a20da4ea8b61a2fe5cec7655ab Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 15 Sep 2022 15:26:21 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E8=A3=85=E5=A4=87=E9=99=84=E5=8A=A0?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/hero/api_strengthenUpSkill.go | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/modules/hero/api_strengthenUpSkill.go b/modules/hero/api_strengthenUpSkill.go
index 7f4761da1..65be36d90 100644
--- a/modules/hero/api_strengthenUpSkill.go
+++ b/modules/hero/api_strengthenUpSkill.go
@@ -92,35 +92,27 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt
 	}
 
 	for i := 0; i < int(lvUpCount); i++ { // 升级技能
-
+		szIndex := make([]int32, 0)
 		sz := make([]int32, 0)
-		for _, skill := range _hero.NormalSkill {
+		for index, skill := range _hero.NormalSkill {
 			skillMaxLv := this.module.configure.GetHeroSkillMaxLvConfig(uint32(skill.SkillID))
 			if skill.SkillLv < skillMaxLv { // 找到没有满级的技能id
-
 				skillData := this.module.configure.GetHeroSkillUpConfig(skill.SkillID)
 				if skillData == nil {
 					code = pb.ErrorCode_ConfigNoFound
 					return
 				}
 				sz = append(sz, skillData.Probability[skill.SkillLv])
+				szIndex = append(szIndex, int32(index))
 			}
 		}
 		if len(sz) == 0 {
 			code = pb.ErrorCode_HeroMaxSkillLv
+			this.module.Errorf("技能升级失败:uid:%s,oid:%s", session.GetUserId(), _hero.Id)
 			return
 		}
 		upSkillPos = comm.GetRandW(sz)
-		if upSkillPos > 0 {
-			for index, skill := range _hero.NormalSkill {
-				if int32(index) == upSkillPos { // 找到指定位置技能并升级
-					skill.SkillLv += 1
-					break
-				}
-			}
-		} else {
-			this.module.Errorf("技能升级失败:uid:%s,oid:%s", session.GetUserId(), _hero.Id)
-		}
+		_hero.NormalSkill[szIndex[upSkillPos]].SkillLv += 1
 	}
 
 	code = this.module.ModuleUser.AddAttributeValue(session, comm.ResGold, -costGold, true)

From e1deb005d9376288f4ad0e8889db68235e205fed Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 15 Sep 2022 15:27:14 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E8=A3=85=E5=A4=87=E9=99=84=E5=8A=A0?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/hero/model_hero.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go
index eb8938fa1..dd915b201 100644
--- a/modules/hero/model_hero.go
+++ b/modules/hero/model_hero.go
@@ -293,6 +293,16 @@ func (this *ModelHero) setEquipProperty(hero *pb.DBHero, equip []*pb.DB_Equipmen
 		for _, v := range v.AdverbEntry {
 			addProperty[v.AttrName] += v.Value //附加属性
 		}
+		for k, v := range addProperty {
+			switch k {
+			case comm.AtkPro:
+				addProperty[comm.Atk] += int32(math.Floor((1.0 + float64(v)/1000) * float64(hero.Property[comm.Atk])))
+			case comm.DefPro:
+				addProperty[comm.Def] += int32(math.Floor((1.0 + float64(v)/1000) * float64(hero.Property[comm.Def])))
+			case comm.HpPro:
+				addProperty[comm.Hp] += int32(math.Floor((1.0 + float64(v)/1000) * float64(hero.Property[comm.Hp])))
+			}
+		}
 	}
 
 	//this.mergeMainProperty(hero.Uid, hero, property)