From 42ee59ff2fde6c1fdf48277b4e86cce88851a69f Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 16 Aug 2022 10:30:03 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E7=88=AC=E5=A1=94db=20=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/pagoda/api_getlist.go | 17 +++++++----------
modules/pagoda/model_pagoda.go | 7 +++++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/modules/pagoda/api_getlist.go b/modules/pagoda/api_getlist.go
index e3e11b036..c97f50530 100644
--- a/modules/pagoda/api_getlist.go
+++ b/modules/pagoda/api_getlist.go
@@ -16,28 +16,25 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.PagodaGetLi
///获取主线关卡信息
func (this *apiComp) GetList(session comm.IUserSession, req *pb.PagodaGetListReq) (code pb.ErrorCode, data proto.Message) {
- _data := &pb.DBPagoda{}
+
code = this.GetListCheck(session, req)
if code != pb.ErrorCode_Success {
return // 参数校验失败直接返回
}
- list, err := this.module.modelPagoda.getPagodaList(session.GetUserId())
- if err != nil {
- code = pb.ErrorCode_DBError
- return
- }
+ list, _ := this.module.modelPagoda.getPagodaList(session.GetUserId())
+
if list == nil { // redis没有数据
- _data.Id = primitive.NewObjectID().Hex()
+ list.Id = primitive.NewObjectID().Hex()
_mData := make(map[string]interface{}, 0)
- _data.Uid = session.GetUserId()
- _mData[_data.Id] = _data
+ list.Uid = session.GetUserId()
+ _mData[list.Id] = list
this.module.modelPagoda.addNewPagoda(session.GetUserId(), _mData)
}
- session.SendMsg(string(this.module.GetType()), PagodaGetListResp, &pb.PagodaGetListResp{Data: _data})
+ session.SendMsg(string(this.module.GetType()), PagodaGetListResp, &pb.PagodaGetListResp{Data: list})
return
}
diff --git a/modules/pagoda/model_pagoda.go b/modules/pagoda/model_pagoda.go
index ef0516b96..db1355107 100644
--- a/modules/pagoda/model_pagoda.go
+++ b/modules/pagoda/model_pagoda.go
@@ -24,7 +24,10 @@ func (this *ModelPagoda) Init(service core.IService, module core.IModule, comp c
// 获取爬塔信息
func (this *ModelPagoda) getPagodaList(uid string) (result *pb.DBPagoda, err error) {
result = &pb.DBPagoda{}
- if err = this.Get(uid, result); err != nil && redis.RedisNil != err {
+ if err = this.Get(uid, result); err != nil {
+ if redis.RedisNil != err {
+ result = nil
+ }
return
}
err = nil
@@ -39,7 +42,7 @@ func (this *ModelPagoda) modifyPagodaDataByObjId(uid string, objid string, data
// 创建一个新的塔数据
func (this *ModelPagoda) addNewPagoda(uId string, data map[string]interface{}) (err error) {
- if err = this.AddLists(uId, data); err != nil {
+ if err = this.Add(uId, data); err != nil {
this.module.Errorf("err:%v", err)
return
}
From 6368eee720557756e2eea5c31cf76f1f022401b3 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 16 Aug 2022 10:48:58 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E6=96=AD=E7=BA=BF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/hero/api_drawCard.go | 2 +-
modules/pagoda/api_getlist.go | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go
index c98043ed2..9ef71b437 100644
--- a/modules/hero/api_drawCard.go
+++ b/modules/hero/api_drawCard.go
@@ -30,7 +30,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
pool string
//heroRecord *pb.DBHeroRecord // 英雄扩展属性
)
- req.DrawCount = 10 // test
+ // test
cfgDraw = this.module.configure.GetGlobalConf() // 读取抽卡配置文件
if cfgDraw == nil {
return
diff --git a/modules/pagoda/api_getlist.go b/modules/pagoda/api_getlist.go
index c97f50530..851795774 100644
--- a/modules/pagoda/api_getlist.go
+++ b/modules/pagoda/api_getlist.go
@@ -25,14 +25,15 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.PagodaGetListReq
list, _ := this.module.modelPagoda.getPagodaList(session.GetUserId())
if list == nil { // redis没有数据
-
- list.Id = primitive.NewObjectID().Hex()
+ result := &pb.DBPagoda{}
+ result.Id = primitive.NewObjectID().Hex()
_mData := make(map[string]interface{}, 0)
- list.Uid = session.GetUserId()
- _mData[list.Id] = list
+ result.Uid = session.GetUserId()
+ _mData[result.Id] = result
this.module.modelPagoda.addNewPagoda(session.GetUserId(), _mData)
-
+ session.SendMsg(string(this.module.GetType()), PagodaGetListResp, &pb.PagodaGetListResp{Data: result})
+ return
}
session.SendMsg(string(this.module.GetType()), PagodaGetListResp, &pb.PagodaGetListResp{Data: list})
From 3eb6773160d4a53f9977776a244ed67c46b787bd Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 16 Aug 2022 11:05:46 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E7=BE=8E=E9=A3=9F=E9=A6=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
comm/const.go | 2 +
modules/gourmet/api.go | 32 +++++++++++
modules/gourmet/api_getReward.go | 27 +++++++++
modules/gourmet/api_getlist.go | 20 +++++++
modules/gourmet/comp_configure.go | 95 +++++++++++++++++++++++++++++++
modules/gourmet/model_pagoda.go | 20 +++++++
modules/gourmet/module.go | 42 ++++++++++++++
7 files changed, 238 insertions(+)
create mode 100644 modules/gourmet/api.go
create mode 100644 modules/gourmet/api_getReward.go
create mode 100644 modules/gourmet/api_getlist.go
create mode 100644 modules/gourmet/comp_configure.go
create mode 100644 modules/gourmet/model_pagoda.go
create mode 100644 modules/gourmet/module.go
diff --git a/comm/const.go b/comm/const.go
index 0c61ef50c..bdee2e3bb 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -93,6 +93,8 @@ const (
TablePagoda = "pagoda"
///武馆数据表
TableMartialhall = "martialhall"
+ // 美食馆
+ TableGourmet = "gourmet"
)
//RPC服务接口定义处
diff --git a/modules/gourmet/api.go b/modules/gourmet/api.go
new file mode 100644
index 000000000..e85ebd6e5
--- /dev/null
+++ b/modules/gourmet/api.go
@@ -0,0 +1,32 @@
+package gourmet
+
+import (
+ "go_dreamfactory/lego/core"
+ "go_dreamfactory/modules"
+)
+
+const (
+ PagodaGetListResp = "getlist"
+ PagodaChallengeResp = "challenge"
+ PagodaGetRewardResp = "getreward"
+)
+
+type apiComp struct {
+ modules.MCompGate
+ service core.IService
+ module *Gourmet
+}
+
+//组件初始化接口
+func (this *apiComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
+ err = this.MCompGate.Init(service, module, comp, options)
+ this.module = module.(*Gourmet)
+ this.service = service
+ return
+}
+
+func (this *apiComp) Start() (err error) {
+ err = this.MCompGate.Start()
+
+ return
+}
diff --git a/modules/gourmet/api_getReward.go b/modules/gourmet/api_getReward.go
new file mode 100644
index 000000000..e8b9d36a7
--- /dev/null
+++ b/modules/gourmet/api_getReward.go
@@ -0,0 +1,27 @@
+package gourmet
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+
+ "google.golang.org/protobuf/proto"
+)
+
+//参数校验
+func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.PagodaGetRewardReq) (code pb.ErrorCode) {
+ if req.Id <= 0 {
+ code = pb.ErrorCode_ReqParameterError
+ }
+ return
+}
+
+///获取主线关卡信息
+func (this *apiComp) GetReward(session comm.IUserSession, req *pb.PagodaGetRewardReq) (code pb.ErrorCode, data proto.Message) {
+
+ code = this.GetRewardCheck(session, req)
+ if code != pb.ErrorCode_Success {
+ return // 参数校验失败直接返回
+ }
+
+ return
+}
diff --git a/modules/gourmet/api_getlist.go b/modules/gourmet/api_getlist.go
new file mode 100644
index 000000000..466147b62
--- /dev/null
+++ b/modules/gourmet/api_getlist.go
@@ -0,0 +1,20 @@
+package gourmet
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+
+ "google.golang.org/protobuf/proto"
+)
+
+//参数校验
+func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.PagodaGetListReq) (code pb.ErrorCode) {
+
+ return
+}
+
+///获取主线关卡信息
+func (this *apiComp) GetList(session comm.IUserSession, req *pb.PagodaGetListReq) (code pb.ErrorCode, data proto.Message) {
+
+ return
+}
diff --git a/modules/gourmet/comp_configure.go b/modules/gourmet/comp_configure.go
new file mode 100644
index 000000000..6f799573f
--- /dev/null
+++ b/modules/gourmet/comp_configure.go
@@ -0,0 +1,95 @@
+package gourmet
+
+import (
+ "go_dreamfactory/lego/core"
+ "go_dreamfactory/lego/core/cbase"
+ "go_dreamfactory/lego/sys/log"
+ "go_dreamfactory/sys/configure"
+ cfg "go_dreamfactory/sys/configure/structs"
+ "sync"
+)
+
+const (
+ game_pagoda = "game_pagoda.json"
+ game_pagodaseasonreward = "game_pagodaseasonreward.json"
+ game_pagodataskreward = "game_pagodataskreward.json"
+)
+
+///配置管理基础组件
+type configureComp struct {
+ cbase.ModuleCompBase
+ hlock sync.RWMutex
+ _pagodaMap map[int64]*cfg.GamepagodaData
+}
+
+//组件初始化接口
+func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
+ err = this.ModuleCompBase.Init(service, module, comp, options)
+ err = this.LoadMultiConfigure(map[string]interface{}{
+ //game_pagoda: cfg.NewGame_pagoda,
+ game_pagodaseasonreward: cfg.NewGamepagodaSeasonReward,
+ game_pagodataskreward: cfg.NewGamepagodaTaskReward,
+ })
+
+ this._pagodaMap = make(map[int64]*cfg.GamepagodaData, 0)
+ configure.RegisterConfigure(game_pagoda, cfg.NewGamepagoda, func() {
+ if v, err := this.GetConfigure(game_pagoda); err == nil {
+ if configure, ok := v.(*cfg.Gamepagoda); ok {
+ this.hlock.Lock()
+ defer this.hlock.Unlock()
+ for _, value := range configure.GetDataList() {
+ this._pagodaMap[int64(value.PagodaType<<16)+int64(value.LayerNum)] = value
+ }
+ return
+ }
+ }
+ log.Errorf("get game_pagoda conf err:%v", err)
+ return
+ })
+ return
+}
+
+// 获取爬塔信息 参数1 塔类型 参数2 层数
+func (this *configureComp) GetPagodaConfigData(PagodaType int32, floorId int32) (data *cfg.GamepagodaData) {
+
+ return this._pagodaMap[int64(PagodaType<<16)+int64(floorId)]
+}
+
+//加载多个配置文件
+func (this *configureComp) LoadMultiConfigure(confs map[string]interface{}) (err error) {
+ for k, v := range confs {
+ err = configure.RegisterConfigure(k, v, nil)
+ if err != nil {
+ log.Errorf("配置文件:%s解析失败!", k)
+ break
+ }
+ }
+ return
+}
+
+//读取配置数据
+func (this *configureComp) GetConfigure(name string) (v interface{}, err error) {
+ return configure.GetConfigure(name)
+}
+
+// 获取爬塔配置表数据
+func (this *configureComp) GetPagodaconfig(id int32) (data *cfg.GamepagodaData) {
+ if v, err := this.GetConfigure(game_pagoda); err != nil {
+ log.Errorf("get global conf err:%v", err)
+ return
+ } else {
+ var (
+ configure *cfg.Gamepagoda
+ ok bool
+ )
+ if configure, ok = v.(*cfg.Gamepagoda); !ok {
+ log.Errorf("%T no is *cfg.Game_pagodaData", v)
+ return
+ }
+
+ if data, ok = configure.GetDataMap()[id]; ok {
+ return
+ }
+ }
+ return
+}
diff --git a/modules/gourmet/model_pagoda.go b/modules/gourmet/model_pagoda.go
new file mode 100644
index 000000000..2c87d0d22
--- /dev/null
+++ b/modules/gourmet/model_pagoda.go
@@ -0,0 +1,20 @@
+package gourmet
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/lego/core"
+ "go_dreamfactory/modules"
+)
+
+type ModelPagoda struct {
+ modules.MCompModel
+ module *Gourmet
+}
+
+func (this *ModelPagoda) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
+ this.TableName = string(comm.TableGourmet)
+ err = this.MCompModel.Init(service, module, comp, options)
+ this.module = module.(*Gourmet)
+
+ return
+}
diff --git a/modules/gourmet/module.go b/modules/gourmet/module.go
new file mode 100644
index 000000000..621242f07
--- /dev/null
+++ b/modules/gourmet/module.go
@@ -0,0 +1,42 @@
+package gourmet
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/lego/core"
+ "go_dreamfactory/modules"
+ "go_dreamfactory/pb"
+)
+
+type Gourmet struct {
+ modules.ModuleBase
+ modelPagoda *ModelPagoda
+ api *apiComp
+ configure *configureComp
+}
+
+func NewModule() core.IModule {
+ return &Gourmet{}
+}
+
+func (this *Gourmet) GetType() core.M_Modules {
+ return comm.ModulePagoda
+}
+
+func (this *Gourmet) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
+ err = this.ModuleBase.Init(service, module, options)
+
+ return
+}
+
+func (this *Gourmet) OnInstallComp() {
+ this.ModuleBase.OnInstallComp()
+ this.api = this.RegisterComp(new(apiComp)).(*apiComp)
+ this.modelPagoda = this.RegisterComp(new(ModelPagoda)).(*ModelPagoda)
+ this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
+}
+
+// 接口信息
+func (this *Gourmet) ModifyGourmetData(uid string, objId string, data map[string]interface{}) (code pb.ErrorCode) {
+
+ return
+}
From 3fdd7fe11590f4e73c9e658c71ef5ddefcd66d16 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 16 Aug 2022 13:37:56 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bin/json/game_pagoda.json | 600 +++++++++++------------
modules/pagoda/api_challenge.go | 6 +-
modules/pagoda/api_getlist.go | 1 +
modules/pagoda/model_pagoda.go | 8 +-
sys/configure/structs/game.pagodaData.go | 4 +-
5 files changed, 313 insertions(+), 306 deletions(-)
diff --git a/bin/json/game_pagoda.json b/bin/json/game_pagoda.json
index ff526993e..7a1dc6b71 100644
--- a/bin/json/game_pagoda.json
+++ b/bin/json/game_pagoda.json
@@ -3,7 +3,7 @@
"key": 1,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 0,
+ "NextLevel": 2,
"layer_num": 1,
"monster_lv": [
10,
@@ -62,7 +62,7 @@
"key": 2,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 1,
+ "NextLevel": 3,
"layer_num": 2,
"monster_lv": [
11,
@@ -133,7 +133,7 @@
"key": 3,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 2,
+ "NextLevel": 4,
"layer_num": 3,
"monster_lv": [
12,
@@ -216,7 +216,7 @@
"key": 4,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 3,
+ "NextLevel": 5,
"layer_num": 4,
"monster_lv": [
13,
@@ -305,7 +305,7 @@
"key": 5,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 4,
+ "NextLevel": 6,
"layer_num": 5,
"monster_lv": [
14,
@@ -394,7 +394,7 @@
"key": 6,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 5,
+ "NextLevel": 7,
"layer_num": 6,
"monster_lv": [
15,
@@ -483,7 +483,7 @@
"key": 7,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 6,
+ "NextLevel": 8,
"layer_num": 7,
"monster_lv": [
16,
@@ -572,7 +572,7 @@
"key": 8,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 7,
+ "NextLevel": 9,
"layer_num": 8,
"monster_lv": [
17,
@@ -661,7 +661,7 @@
"key": 9,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 8,
+ "NextLevel": 10,
"layer_num": 9,
"monster_lv": [
18,
@@ -750,7 +750,7 @@
"key": 10,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 9,
+ "NextLevel": 11,
"layer_num": 10,
"monster_lv": [
19,
@@ -839,7 +839,7 @@
"key": 11,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 10,
+ "NextLevel": 12,
"layer_num": 11,
"monster_lv": [
20,
@@ -928,7 +928,7 @@
"key": 12,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 11,
+ "NextLevel": 13,
"layer_num": 12,
"monster_lv": [
21,
@@ -1017,7 +1017,7 @@
"key": 13,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 12,
+ "NextLevel": 14,
"layer_num": 13,
"monster_lv": [
22,
@@ -1106,7 +1106,7 @@
"key": 14,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 13,
+ "NextLevel": 15,
"layer_num": 14,
"monster_lv": [
23,
@@ -1195,7 +1195,7 @@
"key": 15,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 14,
+ "NextLevel": 16,
"layer_num": 15,
"monster_lv": [
24,
@@ -1284,7 +1284,7 @@
"key": 16,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 15,
+ "NextLevel": 17,
"layer_num": 16,
"monster_lv": [
25,
@@ -1373,7 +1373,7 @@
"key": 17,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 16,
+ "NextLevel": 18,
"layer_num": 17,
"monster_lv": [
26,
@@ -1462,7 +1462,7 @@
"key": 18,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 17,
+ "NextLevel": 19,
"layer_num": 18,
"monster_lv": [
27,
@@ -1551,7 +1551,7 @@
"key": 19,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 18,
+ "NextLevel": 20,
"layer_num": 19,
"monster_lv": [
28,
@@ -1640,7 +1640,7 @@
"key": 20,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 19,
+ "NextLevel": 21,
"layer_num": 20,
"monster_lv": [
29,
@@ -1729,7 +1729,7 @@
"key": 21,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 20,
+ "NextLevel": 22,
"layer_num": 21,
"monster_lv": [
30,
@@ -1818,7 +1818,7 @@
"key": 22,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 21,
+ "NextLevel": 23,
"layer_num": 22,
"monster_lv": [
31,
@@ -1907,7 +1907,7 @@
"key": 23,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 22,
+ "NextLevel": 24,
"layer_num": 23,
"monster_lv": [
32,
@@ -1996,7 +1996,7 @@
"key": 24,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 23,
+ "NextLevel": 25,
"layer_num": 24,
"monster_lv": [
33,
@@ -2085,7 +2085,7 @@
"key": 25,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 24,
+ "NextLevel": 26,
"layer_num": 25,
"monster_lv": [
34,
@@ -2174,7 +2174,7 @@
"key": 26,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 25,
+ "NextLevel": 27,
"layer_num": 26,
"monster_lv": [
35,
@@ -2263,7 +2263,7 @@
"key": 27,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 26,
+ "NextLevel": 28,
"layer_num": 27,
"monster_lv": [
36,
@@ -2352,7 +2352,7 @@
"key": 28,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 27,
+ "NextLevel": 29,
"layer_num": 28,
"monster_lv": [
37,
@@ -2441,7 +2441,7 @@
"key": 29,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 28,
+ "NextLevel": 30,
"layer_num": 29,
"monster_lv": [
38,
@@ -2530,7 +2530,7 @@
"key": 30,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 29,
+ "NextLevel": 31,
"layer_num": 30,
"monster_lv": [
39,
@@ -2619,7 +2619,7 @@
"key": 31,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 30,
+ "NextLevel": 32,
"layer_num": 31,
"monster_lv": [
40,
@@ -2708,7 +2708,7 @@
"key": 32,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 31,
+ "NextLevel": 33,
"layer_num": 32,
"monster_lv": [
41,
@@ -2797,7 +2797,7 @@
"key": 33,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 32,
+ "NextLevel": 34,
"layer_num": 33,
"monster_lv": [
42,
@@ -2886,7 +2886,7 @@
"key": 34,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 33,
+ "NextLevel": 35,
"layer_num": 34,
"monster_lv": [
43,
@@ -2975,7 +2975,7 @@
"key": 35,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 34,
+ "NextLevel": 36,
"layer_num": 35,
"monster_lv": [
44,
@@ -3064,7 +3064,7 @@
"key": 36,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 35,
+ "NextLevel": 37,
"layer_num": 36,
"monster_lv": [
45,
@@ -3153,7 +3153,7 @@
"key": 37,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 36,
+ "NextLevel": 38,
"layer_num": 37,
"monster_lv": [
46,
@@ -3242,7 +3242,7 @@
"key": 38,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 37,
+ "NextLevel": 39,
"layer_num": 38,
"monster_lv": [
47,
@@ -3331,7 +3331,7 @@
"key": 39,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 38,
+ "NextLevel": 40,
"layer_num": 39,
"monster_lv": [
48,
@@ -3420,7 +3420,7 @@
"key": 40,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 39,
+ "NextLevel": 41,
"layer_num": 40,
"monster_lv": [
49,
@@ -3509,7 +3509,7 @@
"key": 41,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 40,
+ "NextLevel": 42,
"layer_num": 41,
"monster_lv": [
50,
@@ -3598,7 +3598,7 @@
"key": 42,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 41,
+ "NextLevel": 43,
"layer_num": 42,
"monster_lv": [
51,
@@ -3687,7 +3687,7 @@
"key": 43,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 42,
+ "NextLevel": 44,
"layer_num": 43,
"monster_lv": [
52,
@@ -3776,7 +3776,7 @@
"key": 44,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 43,
+ "NextLevel": 45,
"layer_num": 44,
"monster_lv": [
53,
@@ -3865,7 +3865,7 @@
"key": 45,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 44,
+ "NextLevel": 46,
"layer_num": 45,
"monster_lv": [
54,
@@ -3954,7 +3954,7 @@
"key": 46,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 45,
+ "NextLevel": 47,
"layer_num": 46,
"monster_lv": [
55,
@@ -4043,7 +4043,7 @@
"key": 47,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 46,
+ "NextLevel": 48,
"layer_num": 47,
"monster_lv": [
56,
@@ -4132,7 +4132,7 @@
"key": 48,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 47,
+ "NextLevel": 49,
"layer_num": 48,
"monster_lv": [
57,
@@ -4221,7 +4221,7 @@
"key": 49,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 48,
+ "NextLevel": 50,
"layer_num": 49,
"monster_lv": [
58,
@@ -4310,7 +4310,7 @@
"key": 50,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 49,
+ "NextLevel": 51,
"layer_num": 50,
"monster_lv": [
59,
@@ -4399,7 +4399,7 @@
"key": 51,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 50,
+ "NextLevel": 52,
"layer_num": 51,
"monster_lv": [
60,
@@ -4488,7 +4488,7 @@
"key": 52,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 51,
+ "NextLevel": 53,
"layer_num": 52,
"monster_lv": [
61,
@@ -4577,7 +4577,7 @@
"key": 53,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 52,
+ "NextLevel": 54,
"layer_num": 53,
"monster_lv": [
62,
@@ -4666,7 +4666,7 @@
"key": 54,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 53,
+ "NextLevel": 55,
"layer_num": 54,
"monster_lv": [
63,
@@ -4755,7 +4755,7 @@
"key": 55,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 54,
+ "NextLevel": 56,
"layer_num": 55,
"monster_lv": [
64,
@@ -4844,7 +4844,7 @@
"key": 56,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 55,
+ "NextLevel": 57,
"layer_num": 56,
"monster_lv": [
65,
@@ -4933,7 +4933,7 @@
"key": 57,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 56,
+ "NextLevel": 58,
"layer_num": 57,
"monster_lv": [
66,
@@ -5022,7 +5022,7 @@
"key": 58,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 57,
+ "NextLevel": 59,
"layer_num": 58,
"monster_lv": [
67,
@@ -5111,7 +5111,7 @@
"key": 59,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 58,
+ "NextLevel": 60,
"layer_num": 59,
"monster_lv": [
68,
@@ -5200,7 +5200,7 @@
"key": 60,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 59,
+ "NextLevel": 61,
"layer_num": 60,
"monster_lv": [
69,
@@ -5289,7 +5289,7 @@
"key": 61,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 60,
+ "NextLevel": 62,
"layer_num": 61,
"monster_lv": [
70,
@@ -5378,7 +5378,7 @@
"key": 62,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 61,
+ "NextLevel": 63,
"layer_num": 62,
"monster_lv": [
71,
@@ -5467,7 +5467,7 @@
"key": 63,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 62,
+ "NextLevel": 64,
"layer_num": 63,
"monster_lv": [
72,
@@ -5556,7 +5556,7 @@
"key": 64,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 63,
+ "NextLevel": 65,
"layer_num": 64,
"monster_lv": [
73,
@@ -5645,7 +5645,7 @@
"key": 65,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 64,
+ "NextLevel": 66,
"layer_num": 65,
"monster_lv": [
74,
@@ -5734,7 +5734,7 @@
"key": 66,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 65,
+ "NextLevel": 67,
"layer_num": 66,
"monster_lv": [
75,
@@ -5823,7 +5823,7 @@
"key": 67,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 66,
+ "NextLevel": 68,
"layer_num": 67,
"monster_lv": [
76,
@@ -5912,7 +5912,7 @@
"key": 68,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 67,
+ "NextLevel": 69,
"layer_num": 68,
"monster_lv": [
77,
@@ -6001,7 +6001,7 @@
"key": 69,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 68,
+ "NextLevel": 70,
"layer_num": 69,
"monster_lv": [
78,
@@ -6090,7 +6090,7 @@
"key": 70,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 69,
+ "NextLevel": 71,
"layer_num": 70,
"monster_lv": [
79,
@@ -6179,7 +6179,7 @@
"key": 71,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 70,
+ "NextLevel": 72,
"layer_num": 71,
"monster_lv": [
80,
@@ -6268,7 +6268,7 @@
"key": 72,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 71,
+ "NextLevel": 73,
"layer_num": 72,
"monster_lv": [
81,
@@ -6357,7 +6357,7 @@
"key": 73,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 72,
+ "NextLevel": 74,
"layer_num": 73,
"monster_lv": [
82,
@@ -6446,7 +6446,7 @@
"key": 74,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 73,
+ "NextLevel": 75,
"layer_num": 74,
"monster_lv": [
83,
@@ -6535,7 +6535,7 @@
"key": 75,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 74,
+ "NextLevel": 76,
"layer_num": 75,
"monster_lv": [
84,
@@ -6624,7 +6624,7 @@
"key": 76,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 75,
+ "NextLevel": 77,
"layer_num": 76,
"monster_lv": [
85,
@@ -6713,7 +6713,7 @@
"key": 77,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 76,
+ "NextLevel": 78,
"layer_num": 77,
"monster_lv": [
86,
@@ -6802,7 +6802,7 @@
"key": 78,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 77,
+ "NextLevel": 79,
"layer_num": 78,
"monster_lv": [
87,
@@ -6891,7 +6891,7 @@
"key": 79,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 78,
+ "NextLevel": 80,
"layer_num": 79,
"monster_lv": [
88,
@@ -6980,7 +6980,7 @@
"key": 80,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 79,
+ "NextLevel": 81,
"layer_num": 80,
"monster_lv": [
89,
@@ -7069,7 +7069,7 @@
"key": 81,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 80,
+ "NextLevel": 82,
"layer_num": 81,
"monster_lv": [
90,
@@ -7158,7 +7158,7 @@
"key": 82,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 81,
+ "NextLevel": 83,
"layer_num": 82,
"monster_lv": [
91,
@@ -7247,7 +7247,7 @@
"key": 83,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 82,
+ "NextLevel": 84,
"layer_num": 83,
"monster_lv": [
92,
@@ -7336,7 +7336,7 @@
"key": 84,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 83,
+ "NextLevel": 85,
"layer_num": 84,
"monster_lv": [
93,
@@ -7425,7 +7425,7 @@
"key": 85,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 84,
+ "NextLevel": 86,
"layer_num": 85,
"monster_lv": [
94,
@@ -7514,7 +7514,7 @@
"key": 86,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 85,
+ "NextLevel": 87,
"layer_num": 86,
"monster_lv": [
95,
@@ -7603,7 +7603,7 @@
"key": 87,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 86,
+ "NextLevel": 88,
"layer_num": 87,
"monster_lv": [
96,
@@ -7692,7 +7692,7 @@
"key": 88,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 87,
+ "NextLevel": 89,
"layer_num": 88,
"monster_lv": [
97,
@@ -7781,7 +7781,7 @@
"key": 89,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 88,
+ "NextLevel": 90,
"layer_num": 89,
"monster_lv": [
98,
@@ -7870,7 +7870,7 @@
"key": 90,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 89,
+ "NextLevel": 91,
"layer_num": 90,
"monster_lv": [
99,
@@ -7959,7 +7959,7 @@
"key": 91,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 90,
+ "NextLevel": 92,
"layer_num": 91,
"monster_lv": [
100,
@@ -8048,7 +8048,7 @@
"key": 92,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 91,
+ "NextLevel": 93,
"layer_num": 92,
"monster_lv": [
101,
@@ -8137,7 +8137,7 @@
"key": 93,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 92,
+ "NextLevel": 94,
"layer_num": 93,
"monster_lv": [
102,
@@ -8226,7 +8226,7 @@
"key": 94,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 93,
+ "NextLevel": 95,
"layer_num": 94,
"monster_lv": [
103,
@@ -8315,7 +8315,7 @@
"key": 95,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 94,
+ "NextLevel": 96,
"layer_num": 95,
"monster_lv": [
104,
@@ -8404,7 +8404,7 @@
"key": 96,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 95,
+ "NextLevel": 97,
"layer_num": 96,
"monster_lv": [
105,
@@ -8493,7 +8493,7 @@
"key": 97,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 96,
+ "NextLevel": 98,
"layer_num": 97,
"monster_lv": [
106,
@@ -8582,7 +8582,7 @@
"key": 98,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 97,
+ "NextLevel": 99,
"layer_num": 98,
"monster_lv": [
107,
@@ -8671,7 +8671,7 @@
"key": 99,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 98,
+ "NextLevel": 100,
"layer_num": 99,
"monster_lv": [
108,
@@ -8760,7 +8760,7 @@
"key": 100,
"pagoda_type": 101,
"Level_type": 1,
- "PreLevel": 99,
+ "NextLevel": 101,
"layer_num": 100,
"monster_lv": [
109,
@@ -8849,7 +8849,7 @@
"key": 101,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 0,
+ "NextLevel": 2,
"layer_num": 1,
"monster_lv": [
10,
@@ -8908,7 +8908,7 @@
"key": 102,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 1,
+ "NextLevel": 3,
"layer_num": 2,
"monster_lv": [
11,
@@ -8979,7 +8979,7 @@
"key": 103,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 2,
+ "NextLevel": 4,
"layer_num": 3,
"monster_lv": [
12,
@@ -9062,7 +9062,7 @@
"key": 104,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 3,
+ "NextLevel": 5,
"layer_num": 4,
"monster_lv": [
13,
@@ -9151,7 +9151,7 @@
"key": 105,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 4,
+ "NextLevel": 6,
"layer_num": 5,
"monster_lv": [
14,
@@ -9240,7 +9240,7 @@
"key": 106,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 5,
+ "NextLevel": 7,
"layer_num": 6,
"monster_lv": [
15,
@@ -9329,7 +9329,7 @@
"key": 107,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 6,
+ "NextLevel": 8,
"layer_num": 7,
"monster_lv": [
16,
@@ -9418,7 +9418,7 @@
"key": 108,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 7,
+ "NextLevel": 9,
"layer_num": 8,
"monster_lv": [
17,
@@ -9507,7 +9507,7 @@
"key": 109,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 8,
+ "NextLevel": 10,
"layer_num": 9,
"monster_lv": [
18,
@@ -9596,7 +9596,7 @@
"key": 110,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 9,
+ "NextLevel": 11,
"layer_num": 10,
"monster_lv": [
19,
@@ -9685,7 +9685,7 @@
"key": 111,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 10,
+ "NextLevel": 12,
"layer_num": 11,
"monster_lv": [
20,
@@ -9774,7 +9774,7 @@
"key": 112,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 11,
+ "NextLevel": 13,
"layer_num": 12,
"monster_lv": [
21,
@@ -9863,7 +9863,7 @@
"key": 113,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 12,
+ "NextLevel": 14,
"layer_num": 13,
"monster_lv": [
22,
@@ -9952,7 +9952,7 @@
"key": 114,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 13,
+ "NextLevel": 15,
"layer_num": 14,
"monster_lv": [
23,
@@ -10041,7 +10041,7 @@
"key": 115,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 14,
+ "NextLevel": 16,
"layer_num": 15,
"monster_lv": [
24,
@@ -10130,7 +10130,7 @@
"key": 116,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 15,
+ "NextLevel": 17,
"layer_num": 16,
"monster_lv": [
25,
@@ -10219,7 +10219,7 @@
"key": 117,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 16,
+ "NextLevel": 18,
"layer_num": 17,
"monster_lv": [
26,
@@ -10308,7 +10308,7 @@
"key": 118,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 17,
+ "NextLevel": 19,
"layer_num": 18,
"monster_lv": [
27,
@@ -10397,7 +10397,7 @@
"key": 119,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 18,
+ "NextLevel": 20,
"layer_num": 19,
"monster_lv": [
28,
@@ -10486,7 +10486,7 @@
"key": 120,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 19,
+ "NextLevel": 21,
"layer_num": 20,
"monster_lv": [
29,
@@ -10575,7 +10575,7 @@
"key": 121,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 20,
+ "NextLevel": 22,
"layer_num": 21,
"monster_lv": [
30,
@@ -10664,7 +10664,7 @@
"key": 122,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 21,
+ "NextLevel": 23,
"layer_num": 22,
"monster_lv": [
31,
@@ -10753,7 +10753,7 @@
"key": 123,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 22,
+ "NextLevel": 24,
"layer_num": 23,
"monster_lv": [
32,
@@ -10842,7 +10842,7 @@
"key": 124,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 23,
+ "NextLevel": 25,
"layer_num": 24,
"monster_lv": [
33,
@@ -10931,7 +10931,7 @@
"key": 125,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 24,
+ "NextLevel": 26,
"layer_num": 25,
"monster_lv": [
34,
@@ -11020,7 +11020,7 @@
"key": 126,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 25,
+ "NextLevel": 27,
"layer_num": 26,
"monster_lv": [
35,
@@ -11109,7 +11109,7 @@
"key": 127,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 26,
+ "NextLevel": 28,
"layer_num": 27,
"monster_lv": [
36,
@@ -11198,7 +11198,7 @@
"key": 128,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 27,
+ "NextLevel": 29,
"layer_num": 28,
"monster_lv": [
37,
@@ -11287,7 +11287,7 @@
"key": 129,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 28,
+ "NextLevel": 30,
"layer_num": 29,
"monster_lv": [
38,
@@ -11376,7 +11376,7 @@
"key": 130,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 29,
+ "NextLevel": 31,
"layer_num": 30,
"monster_lv": [
39,
@@ -11465,7 +11465,7 @@
"key": 131,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 30,
+ "NextLevel": 32,
"layer_num": 31,
"monster_lv": [
40,
@@ -11554,7 +11554,7 @@
"key": 132,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 31,
+ "NextLevel": 33,
"layer_num": 32,
"monster_lv": [
41,
@@ -11643,7 +11643,7 @@
"key": 133,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 32,
+ "NextLevel": 34,
"layer_num": 33,
"monster_lv": [
42,
@@ -11732,7 +11732,7 @@
"key": 134,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 33,
+ "NextLevel": 35,
"layer_num": 34,
"monster_lv": [
43,
@@ -11821,7 +11821,7 @@
"key": 135,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 34,
+ "NextLevel": 36,
"layer_num": 35,
"monster_lv": [
44,
@@ -11910,7 +11910,7 @@
"key": 136,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 35,
+ "NextLevel": 37,
"layer_num": 36,
"monster_lv": [
45,
@@ -11999,7 +11999,7 @@
"key": 137,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 36,
+ "NextLevel": 38,
"layer_num": 37,
"monster_lv": [
46,
@@ -12088,7 +12088,7 @@
"key": 138,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 37,
+ "NextLevel": 39,
"layer_num": 38,
"monster_lv": [
47,
@@ -12177,7 +12177,7 @@
"key": 139,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 38,
+ "NextLevel": 40,
"layer_num": 39,
"monster_lv": [
48,
@@ -12266,7 +12266,7 @@
"key": 140,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 39,
+ "NextLevel": 41,
"layer_num": 40,
"monster_lv": [
49,
@@ -12355,7 +12355,7 @@
"key": 141,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 40,
+ "NextLevel": 42,
"layer_num": 41,
"monster_lv": [
50,
@@ -12444,7 +12444,7 @@
"key": 142,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 41,
+ "NextLevel": 43,
"layer_num": 42,
"monster_lv": [
51,
@@ -12533,7 +12533,7 @@
"key": 143,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 42,
+ "NextLevel": 44,
"layer_num": 43,
"monster_lv": [
52,
@@ -12622,7 +12622,7 @@
"key": 144,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 43,
+ "NextLevel": 45,
"layer_num": 44,
"monster_lv": [
53,
@@ -12711,7 +12711,7 @@
"key": 145,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 44,
+ "NextLevel": 46,
"layer_num": 45,
"monster_lv": [
54,
@@ -12800,7 +12800,7 @@
"key": 146,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 45,
+ "NextLevel": 47,
"layer_num": 46,
"monster_lv": [
55,
@@ -12889,7 +12889,7 @@
"key": 147,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 46,
+ "NextLevel": 48,
"layer_num": 47,
"monster_lv": [
56,
@@ -12978,7 +12978,7 @@
"key": 148,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 47,
+ "NextLevel": 49,
"layer_num": 48,
"monster_lv": [
57,
@@ -13067,7 +13067,7 @@
"key": 149,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 48,
+ "NextLevel": 50,
"layer_num": 49,
"monster_lv": [
58,
@@ -13156,7 +13156,7 @@
"key": 150,
"pagoda_type": 201,
"Level_type": 1,
- "PreLevel": 49,
+ "NextLevel": 51,
"layer_num": 50,
"monster_lv": [
59,
@@ -13245,7 +13245,7 @@
"key": 151,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 0,
+ "NextLevel": 2,
"layer_num": 1,
"monster_lv": [
10,
@@ -13304,7 +13304,7 @@
"key": 152,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 1,
+ "NextLevel": 3,
"layer_num": 2,
"monster_lv": [
11,
@@ -13375,7 +13375,7 @@
"key": 153,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 2,
+ "NextLevel": 4,
"layer_num": 3,
"monster_lv": [
12,
@@ -13458,7 +13458,7 @@
"key": 154,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 3,
+ "NextLevel": 5,
"layer_num": 4,
"monster_lv": [
13,
@@ -13547,7 +13547,7 @@
"key": 155,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 4,
+ "NextLevel": 6,
"layer_num": 5,
"monster_lv": [
14,
@@ -13636,7 +13636,7 @@
"key": 156,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 5,
+ "NextLevel": 7,
"layer_num": 6,
"monster_lv": [
15,
@@ -13725,7 +13725,7 @@
"key": 157,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 6,
+ "NextLevel": 8,
"layer_num": 7,
"monster_lv": [
16,
@@ -13814,7 +13814,7 @@
"key": 158,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 7,
+ "NextLevel": 9,
"layer_num": 8,
"monster_lv": [
17,
@@ -13903,7 +13903,7 @@
"key": 159,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 8,
+ "NextLevel": 10,
"layer_num": 9,
"monster_lv": [
18,
@@ -13992,7 +13992,7 @@
"key": 160,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 9,
+ "NextLevel": 11,
"layer_num": 10,
"monster_lv": [
19,
@@ -14081,7 +14081,7 @@
"key": 161,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 10,
+ "NextLevel": 12,
"layer_num": 11,
"monster_lv": [
20,
@@ -14170,7 +14170,7 @@
"key": 162,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 11,
+ "NextLevel": 13,
"layer_num": 12,
"monster_lv": [
21,
@@ -14259,7 +14259,7 @@
"key": 163,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 12,
+ "NextLevel": 14,
"layer_num": 13,
"monster_lv": [
22,
@@ -14348,7 +14348,7 @@
"key": 164,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 13,
+ "NextLevel": 15,
"layer_num": 14,
"monster_lv": [
23,
@@ -14437,7 +14437,7 @@
"key": 165,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 14,
+ "NextLevel": 16,
"layer_num": 15,
"monster_lv": [
24,
@@ -14526,7 +14526,7 @@
"key": 166,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 15,
+ "NextLevel": 17,
"layer_num": 16,
"monster_lv": [
25,
@@ -14615,7 +14615,7 @@
"key": 167,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 16,
+ "NextLevel": 18,
"layer_num": 17,
"monster_lv": [
26,
@@ -14704,7 +14704,7 @@
"key": 168,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 17,
+ "NextLevel": 19,
"layer_num": 18,
"monster_lv": [
27,
@@ -14793,7 +14793,7 @@
"key": 169,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 18,
+ "NextLevel": 20,
"layer_num": 19,
"monster_lv": [
28,
@@ -14882,7 +14882,7 @@
"key": 170,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 19,
+ "NextLevel": 21,
"layer_num": 20,
"monster_lv": [
29,
@@ -14971,7 +14971,7 @@
"key": 171,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 20,
+ "NextLevel": 22,
"layer_num": 21,
"monster_lv": [
30,
@@ -15060,7 +15060,7 @@
"key": 172,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 21,
+ "NextLevel": 23,
"layer_num": 22,
"monster_lv": [
31,
@@ -15149,7 +15149,7 @@
"key": 173,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 22,
+ "NextLevel": 24,
"layer_num": 23,
"monster_lv": [
32,
@@ -15238,7 +15238,7 @@
"key": 174,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 23,
+ "NextLevel": 25,
"layer_num": 24,
"monster_lv": [
33,
@@ -15327,7 +15327,7 @@
"key": 175,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 24,
+ "NextLevel": 26,
"layer_num": 25,
"monster_lv": [
34,
@@ -15416,7 +15416,7 @@
"key": 176,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 25,
+ "NextLevel": 27,
"layer_num": 26,
"monster_lv": [
35,
@@ -15505,7 +15505,7 @@
"key": 177,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 26,
+ "NextLevel": 28,
"layer_num": 27,
"monster_lv": [
36,
@@ -15594,7 +15594,7 @@
"key": 178,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 27,
+ "NextLevel": 29,
"layer_num": 28,
"monster_lv": [
37,
@@ -15683,7 +15683,7 @@
"key": 179,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 28,
+ "NextLevel": 30,
"layer_num": 29,
"monster_lv": [
38,
@@ -15772,7 +15772,7 @@
"key": 180,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 29,
+ "NextLevel": 31,
"layer_num": 30,
"monster_lv": [
39,
@@ -15861,7 +15861,7 @@
"key": 181,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 30,
+ "NextLevel": 32,
"layer_num": 31,
"monster_lv": [
40,
@@ -15950,7 +15950,7 @@
"key": 182,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 31,
+ "NextLevel": 33,
"layer_num": 32,
"monster_lv": [
41,
@@ -16039,7 +16039,7 @@
"key": 183,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 32,
+ "NextLevel": 34,
"layer_num": 33,
"monster_lv": [
42,
@@ -16128,7 +16128,7 @@
"key": 184,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 33,
+ "NextLevel": 35,
"layer_num": 34,
"monster_lv": [
43,
@@ -16217,7 +16217,7 @@
"key": 185,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 34,
+ "NextLevel": 36,
"layer_num": 35,
"monster_lv": [
44,
@@ -16306,7 +16306,7 @@
"key": 186,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 35,
+ "NextLevel": 37,
"layer_num": 36,
"monster_lv": [
45,
@@ -16395,7 +16395,7 @@
"key": 187,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 36,
+ "NextLevel": 38,
"layer_num": 37,
"monster_lv": [
46,
@@ -16484,7 +16484,7 @@
"key": 188,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 37,
+ "NextLevel": 39,
"layer_num": 38,
"monster_lv": [
47,
@@ -16573,7 +16573,7 @@
"key": 189,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 38,
+ "NextLevel": 40,
"layer_num": 39,
"monster_lv": [
48,
@@ -16662,7 +16662,7 @@
"key": 190,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 39,
+ "NextLevel": 41,
"layer_num": 40,
"monster_lv": [
49,
@@ -16751,7 +16751,7 @@
"key": 191,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 40,
+ "NextLevel": 42,
"layer_num": 41,
"monster_lv": [
50,
@@ -16840,7 +16840,7 @@
"key": 192,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 41,
+ "NextLevel": 43,
"layer_num": 42,
"monster_lv": [
51,
@@ -16929,7 +16929,7 @@
"key": 193,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 42,
+ "NextLevel": 44,
"layer_num": 43,
"monster_lv": [
52,
@@ -17018,7 +17018,7 @@
"key": 194,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 43,
+ "NextLevel": 45,
"layer_num": 44,
"monster_lv": [
53,
@@ -17107,7 +17107,7 @@
"key": 195,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 44,
+ "NextLevel": 46,
"layer_num": 45,
"monster_lv": [
54,
@@ -17196,7 +17196,7 @@
"key": 196,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 45,
+ "NextLevel": 47,
"layer_num": 46,
"monster_lv": [
55,
@@ -17285,7 +17285,7 @@
"key": 197,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 46,
+ "NextLevel": 48,
"layer_num": 47,
"monster_lv": [
56,
@@ -17374,7 +17374,7 @@
"key": 198,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 47,
+ "NextLevel": 49,
"layer_num": 48,
"monster_lv": [
57,
@@ -17463,7 +17463,7 @@
"key": 199,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 48,
+ "NextLevel": 50,
"layer_num": 49,
"monster_lv": [
58,
@@ -17552,7 +17552,7 @@
"key": 200,
"pagoda_type": 202,
"Level_type": 1,
- "PreLevel": 49,
+ "NextLevel": 51,
"layer_num": 50,
"monster_lv": [
59,
@@ -17641,7 +17641,7 @@
"key": 201,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 0,
+ "NextLevel": 2,
"layer_num": 1,
"monster_lv": [
10,
@@ -17700,7 +17700,7 @@
"key": 202,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 1,
+ "NextLevel": 3,
"layer_num": 2,
"monster_lv": [
11,
@@ -17771,7 +17771,7 @@
"key": 203,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 2,
+ "NextLevel": 4,
"layer_num": 3,
"monster_lv": [
12,
@@ -17854,7 +17854,7 @@
"key": 204,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 3,
+ "NextLevel": 5,
"layer_num": 4,
"monster_lv": [
13,
@@ -17943,7 +17943,7 @@
"key": 205,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 4,
+ "NextLevel": 6,
"layer_num": 5,
"monster_lv": [
14,
@@ -18032,7 +18032,7 @@
"key": 206,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 5,
+ "NextLevel": 7,
"layer_num": 6,
"monster_lv": [
15,
@@ -18121,7 +18121,7 @@
"key": 207,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 6,
+ "NextLevel": 8,
"layer_num": 7,
"monster_lv": [
16,
@@ -18210,7 +18210,7 @@
"key": 208,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 7,
+ "NextLevel": 9,
"layer_num": 8,
"monster_lv": [
17,
@@ -18299,7 +18299,7 @@
"key": 209,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 8,
+ "NextLevel": 10,
"layer_num": 9,
"monster_lv": [
18,
@@ -18388,7 +18388,7 @@
"key": 210,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 9,
+ "NextLevel": 11,
"layer_num": 10,
"monster_lv": [
19,
@@ -18477,7 +18477,7 @@
"key": 211,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 10,
+ "NextLevel": 12,
"layer_num": 11,
"monster_lv": [
20,
@@ -18566,7 +18566,7 @@
"key": 212,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 11,
+ "NextLevel": 13,
"layer_num": 12,
"monster_lv": [
21,
@@ -18655,7 +18655,7 @@
"key": 213,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 12,
+ "NextLevel": 14,
"layer_num": 13,
"monster_lv": [
22,
@@ -18744,7 +18744,7 @@
"key": 214,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 13,
+ "NextLevel": 15,
"layer_num": 14,
"monster_lv": [
23,
@@ -18833,7 +18833,7 @@
"key": 215,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 14,
+ "NextLevel": 16,
"layer_num": 15,
"monster_lv": [
24,
@@ -18922,7 +18922,7 @@
"key": 216,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 15,
+ "NextLevel": 17,
"layer_num": 16,
"monster_lv": [
25,
@@ -19011,7 +19011,7 @@
"key": 217,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 16,
+ "NextLevel": 18,
"layer_num": 17,
"monster_lv": [
26,
@@ -19100,7 +19100,7 @@
"key": 218,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 17,
+ "NextLevel": 19,
"layer_num": 18,
"monster_lv": [
27,
@@ -19189,7 +19189,7 @@
"key": 219,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 18,
+ "NextLevel": 20,
"layer_num": 19,
"monster_lv": [
28,
@@ -19278,7 +19278,7 @@
"key": 220,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 19,
+ "NextLevel": 21,
"layer_num": 20,
"monster_lv": [
29,
@@ -19367,7 +19367,7 @@
"key": 221,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 20,
+ "NextLevel": 22,
"layer_num": 21,
"monster_lv": [
30,
@@ -19456,7 +19456,7 @@
"key": 222,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 21,
+ "NextLevel": 23,
"layer_num": 22,
"monster_lv": [
31,
@@ -19545,7 +19545,7 @@
"key": 223,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 22,
+ "NextLevel": 24,
"layer_num": 23,
"monster_lv": [
32,
@@ -19634,7 +19634,7 @@
"key": 224,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 23,
+ "NextLevel": 25,
"layer_num": 24,
"monster_lv": [
33,
@@ -19723,7 +19723,7 @@
"key": 225,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 24,
+ "NextLevel": 26,
"layer_num": 25,
"monster_lv": [
34,
@@ -19812,7 +19812,7 @@
"key": 226,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 25,
+ "NextLevel": 27,
"layer_num": 26,
"monster_lv": [
35,
@@ -19901,7 +19901,7 @@
"key": 227,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 26,
+ "NextLevel": 28,
"layer_num": 27,
"monster_lv": [
36,
@@ -19990,7 +19990,7 @@
"key": 228,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 27,
+ "NextLevel": 29,
"layer_num": 28,
"monster_lv": [
37,
@@ -20079,7 +20079,7 @@
"key": 229,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 28,
+ "NextLevel": 30,
"layer_num": 29,
"monster_lv": [
38,
@@ -20168,7 +20168,7 @@
"key": 230,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 29,
+ "NextLevel": 31,
"layer_num": 30,
"monster_lv": [
39,
@@ -20257,7 +20257,7 @@
"key": 231,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 30,
+ "NextLevel": 32,
"layer_num": 31,
"monster_lv": [
40,
@@ -20346,7 +20346,7 @@
"key": 232,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 31,
+ "NextLevel": 33,
"layer_num": 32,
"monster_lv": [
41,
@@ -20435,7 +20435,7 @@
"key": 233,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 32,
+ "NextLevel": 34,
"layer_num": 33,
"monster_lv": [
42,
@@ -20524,7 +20524,7 @@
"key": 234,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 33,
+ "NextLevel": 35,
"layer_num": 34,
"monster_lv": [
43,
@@ -20613,7 +20613,7 @@
"key": 235,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 34,
+ "NextLevel": 36,
"layer_num": 35,
"monster_lv": [
44,
@@ -20702,7 +20702,7 @@
"key": 236,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 35,
+ "NextLevel": 37,
"layer_num": 36,
"monster_lv": [
45,
@@ -20791,7 +20791,7 @@
"key": 237,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 36,
+ "NextLevel": 38,
"layer_num": 37,
"monster_lv": [
46,
@@ -20880,7 +20880,7 @@
"key": 238,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 37,
+ "NextLevel": 39,
"layer_num": 38,
"monster_lv": [
47,
@@ -20969,7 +20969,7 @@
"key": 239,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 38,
+ "NextLevel": 40,
"layer_num": 39,
"monster_lv": [
48,
@@ -21058,7 +21058,7 @@
"key": 240,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 39,
+ "NextLevel": 41,
"layer_num": 40,
"monster_lv": [
49,
@@ -21147,7 +21147,7 @@
"key": 241,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 40,
+ "NextLevel": 42,
"layer_num": 41,
"monster_lv": [
50,
@@ -21236,7 +21236,7 @@
"key": 242,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 41,
+ "NextLevel": 43,
"layer_num": 42,
"monster_lv": [
51,
@@ -21325,7 +21325,7 @@
"key": 243,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 42,
+ "NextLevel": 44,
"layer_num": 43,
"monster_lv": [
52,
@@ -21414,7 +21414,7 @@
"key": 244,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 43,
+ "NextLevel": 45,
"layer_num": 44,
"monster_lv": [
53,
@@ -21503,7 +21503,7 @@
"key": 245,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 44,
+ "NextLevel": 46,
"layer_num": 45,
"monster_lv": [
54,
@@ -21592,7 +21592,7 @@
"key": 246,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 45,
+ "NextLevel": 47,
"layer_num": 46,
"monster_lv": [
55,
@@ -21681,7 +21681,7 @@
"key": 247,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 46,
+ "NextLevel": 48,
"layer_num": 47,
"monster_lv": [
56,
@@ -21770,7 +21770,7 @@
"key": 248,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 47,
+ "NextLevel": 49,
"layer_num": 48,
"monster_lv": [
57,
@@ -21859,7 +21859,7 @@
"key": 249,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 48,
+ "NextLevel": 50,
"layer_num": 49,
"monster_lv": [
58,
@@ -21948,7 +21948,7 @@
"key": 250,
"pagoda_type": 203,
"Level_type": 1,
- "PreLevel": 49,
+ "NextLevel": 51,
"layer_num": 50,
"monster_lv": [
59,
@@ -22037,7 +22037,7 @@
"key": 251,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 0,
+ "NextLevel": 2,
"layer_num": 1,
"monster_lv": [
10,
@@ -22096,7 +22096,7 @@
"key": 252,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 1,
+ "NextLevel": 3,
"layer_num": 2,
"monster_lv": [
11,
@@ -22167,7 +22167,7 @@
"key": 253,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 2,
+ "NextLevel": 4,
"layer_num": 3,
"monster_lv": [
12,
@@ -22250,7 +22250,7 @@
"key": 254,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 3,
+ "NextLevel": 5,
"layer_num": 4,
"monster_lv": [
13,
@@ -22339,7 +22339,7 @@
"key": 255,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 4,
+ "NextLevel": 6,
"layer_num": 5,
"monster_lv": [
14,
@@ -22428,7 +22428,7 @@
"key": 256,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 5,
+ "NextLevel": 7,
"layer_num": 6,
"monster_lv": [
15,
@@ -22517,7 +22517,7 @@
"key": 257,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 6,
+ "NextLevel": 8,
"layer_num": 7,
"monster_lv": [
16,
@@ -22606,7 +22606,7 @@
"key": 258,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 7,
+ "NextLevel": 9,
"layer_num": 8,
"monster_lv": [
17,
@@ -22695,7 +22695,7 @@
"key": 259,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 8,
+ "NextLevel": 10,
"layer_num": 9,
"monster_lv": [
18,
@@ -22784,7 +22784,7 @@
"key": 260,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 9,
+ "NextLevel": 11,
"layer_num": 10,
"monster_lv": [
19,
@@ -22873,7 +22873,7 @@
"key": 261,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 10,
+ "NextLevel": 12,
"layer_num": 11,
"monster_lv": [
20,
@@ -22962,7 +22962,7 @@
"key": 262,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 11,
+ "NextLevel": 13,
"layer_num": 12,
"monster_lv": [
21,
@@ -23051,7 +23051,7 @@
"key": 263,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 12,
+ "NextLevel": 14,
"layer_num": 13,
"monster_lv": [
22,
@@ -23140,7 +23140,7 @@
"key": 264,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 13,
+ "NextLevel": 15,
"layer_num": 14,
"monster_lv": [
23,
@@ -23229,7 +23229,7 @@
"key": 265,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 14,
+ "NextLevel": 16,
"layer_num": 15,
"monster_lv": [
24,
@@ -23318,7 +23318,7 @@
"key": 266,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 15,
+ "NextLevel": 17,
"layer_num": 16,
"monster_lv": [
25,
@@ -23407,7 +23407,7 @@
"key": 267,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 16,
+ "NextLevel": 18,
"layer_num": 17,
"monster_lv": [
26,
@@ -23496,7 +23496,7 @@
"key": 268,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 17,
+ "NextLevel": 19,
"layer_num": 18,
"monster_lv": [
27,
@@ -23585,7 +23585,7 @@
"key": 269,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 18,
+ "NextLevel": 20,
"layer_num": 19,
"monster_lv": [
28,
@@ -23674,7 +23674,7 @@
"key": 270,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 19,
+ "NextLevel": 21,
"layer_num": 20,
"monster_lv": [
29,
@@ -23763,7 +23763,7 @@
"key": 271,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 20,
+ "NextLevel": 22,
"layer_num": 21,
"monster_lv": [
30,
@@ -23852,7 +23852,7 @@
"key": 272,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 21,
+ "NextLevel": 23,
"layer_num": 22,
"monster_lv": [
31,
@@ -23941,7 +23941,7 @@
"key": 273,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 22,
+ "NextLevel": 24,
"layer_num": 23,
"monster_lv": [
32,
@@ -24030,7 +24030,7 @@
"key": 274,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 23,
+ "NextLevel": 25,
"layer_num": 24,
"monster_lv": [
33,
@@ -24119,7 +24119,7 @@
"key": 275,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 24,
+ "NextLevel": 26,
"layer_num": 25,
"monster_lv": [
34,
@@ -24208,7 +24208,7 @@
"key": 276,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 25,
+ "NextLevel": 27,
"layer_num": 26,
"monster_lv": [
35,
@@ -24297,7 +24297,7 @@
"key": 277,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 26,
+ "NextLevel": 28,
"layer_num": 27,
"monster_lv": [
36,
@@ -24386,7 +24386,7 @@
"key": 278,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 27,
+ "NextLevel": 29,
"layer_num": 28,
"monster_lv": [
37,
@@ -24475,7 +24475,7 @@
"key": 279,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 28,
+ "NextLevel": 30,
"layer_num": 29,
"monster_lv": [
38,
@@ -24564,7 +24564,7 @@
"key": 280,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 29,
+ "NextLevel": 31,
"layer_num": 30,
"monster_lv": [
39,
@@ -24653,7 +24653,7 @@
"key": 281,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 30,
+ "NextLevel": 32,
"layer_num": 31,
"monster_lv": [
40,
@@ -24742,7 +24742,7 @@
"key": 282,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 31,
+ "NextLevel": 33,
"layer_num": 32,
"monster_lv": [
41,
@@ -24831,7 +24831,7 @@
"key": 283,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 32,
+ "NextLevel": 34,
"layer_num": 33,
"monster_lv": [
42,
@@ -24920,7 +24920,7 @@
"key": 284,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 33,
+ "NextLevel": 35,
"layer_num": 34,
"monster_lv": [
43,
@@ -25009,7 +25009,7 @@
"key": 285,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 34,
+ "NextLevel": 36,
"layer_num": 35,
"monster_lv": [
44,
@@ -25098,7 +25098,7 @@
"key": 286,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 35,
+ "NextLevel": 37,
"layer_num": 36,
"monster_lv": [
45,
@@ -25187,7 +25187,7 @@
"key": 287,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 36,
+ "NextLevel": 38,
"layer_num": 37,
"monster_lv": [
46,
@@ -25276,7 +25276,7 @@
"key": 288,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 37,
+ "NextLevel": 39,
"layer_num": 38,
"monster_lv": [
47,
@@ -25365,7 +25365,7 @@
"key": 289,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 38,
+ "NextLevel": 40,
"layer_num": 39,
"monster_lv": [
48,
@@ -25454,7 +25454,7 @@
"key": 290,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 39,
+ "NextLevel": 41,
"layer_num": 40,
"monster_lv": [
49,
@@ -25543,7 +25543,7 @@
"key": 291,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 40,
+ "NextLevel": 42,
"layer_num": 41,
"monster_lv": [
50,
@@ -25632,7 +25632,7 @@
"key": 292,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 41,
+ "NextLevel": 43,
"layer_num": 42,
"monster_lv": [
51,
@@ -25721,7 +25721,7 @@
"key": 293,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 42,
+ "NextLevel": 44,
"layer_num": 43,
"monster_lv": [
52,
@@ -25810,7 +25810,7 @@
"key": 294,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 43,
+ "NextLevel": 45,
"layer_num": 44,
"monster_lv": [
53,
@@ -25899,7 +25899,7 @@
"key": 295,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 44,
+ "NextLevel": 46,
"layer_num": 45,
"monster_lv": [
54,
@@ -25988,7 +25988,7 @@
"key": 296,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 45,
+ "NextLevel": 47,
"layer_num": 46,
"monster_lv": [
55,
@@ -26077,7 +26077,7 @@
"key": 297,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 46,
+ "NextLevel": 48,
"layer_num": 47,
"monster_lv": [
56,
@@ -26166,7 +26166,7 @@
"key": 298,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 47,
+ "NextLevel": 49,
"layer_num": 48,
"monster_lv": [
57,
@@ -26255,7 +26255,7 @@
"key": 299,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 48,
+ "NextLevel": 50,
"layer_num": 49,
"monster_lv": [
58,
@@ -26344,7 +26344,7 @@
"key": 300,
"pagoda_type": 204,
"Level_type": 1,
- "PreLevel": 49,
+ "NextLevel": 51,
"layer_num": 50,
"monster_lv": [
59,
diff --git a/modules/pagoda/api_challenge.go b/modules/pagoda/api_challenge.go
index 31b2c3ffd..69db58ec3 100644
--- a/modules/pagoda/api_challenge.go
+++ b/modules/pagoda/api_challenge.go
@@ -33,14 +33,14 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.PagodaChalleng
code = pb.ErrorCode_PagodaNotFound
return
}
- if cfg.PreLevel != pagoda.PagodaId {
+ if cfg.LayerNum != pagoda.PagodaId {
code = pb.ErrorCode_PagodaLevlErr // 挑战关卡数据不匹配
return
}
//// todo 战斗相关
- pagoda.PagodaId = cfg.LayerNum // 更新层数
+ pagoda.PagodaId = cfg.NextLevel // 更新层数
// 通关奖励
code = this.module.DispenseRes(session, cfg.Reward, true)
@@ -48,7 +48,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.PagodaChalleng
return
}
mapData := make(map[string]interface{}, 0)
- mapData["pagodaId"] = cfg.LayerNum
+ mapData["pagodaId"] = cfg.NextLevel
code = this.module.ModifyPagodaData(session.GetUserId(), pagoda.Id, mapData)
session.SendMsg(string(this.module.GetType()), PagodaChallengeResp, &pb.PagodaChallengeResp{Data: pagoda})
return
diff --git a/modules/pagoda/api_getlist.go b/modules/pagoda/api_getlist.go
index 851795774..e4af60927 100644
--- a/modules/pagoda/api_getlist.go
+++ b/modules/pagoda/api_getlist.go
@@ -30,6 +30,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.PagodaGetListReq
_mData := make(map[string]interface{}, 0)
result.Uid = session.GetUserId()
+ result.PagodaId = 1 // 初始数据1层
_mData[result.Id] = result
this.module.modelPagoda.addNewPagoda(session.GetUserId(), _mData)
session.SendMsg(string(this.module.GetType()), PagodaGetListResp, &pb.PagodaGetListResp{Data: result})
diff --git a/modules/pagoda/model_pagoda.go b/modules/pagoda/model_pagoda.go
index db1355107..1d21252c3 100644
--- a/modules/pagoda/model_pagoda.go
+++ b/modules/pagoda/model_pagoda.go
@@ -6,6 +6,9 @@ import (
"go_dreamfactory/lego/sys/redis"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
+
+ "go.mongodb.org/mongo-driver/mongo"
+ "go.mongodb.org/mongo-driver/x/bsonx"
)
type ModelPagoda struct {
@@ -17,7 +20,10 @@ func (this *ModelPagoda) Init(service core.IService, module core.IModule, comp c
this.TableName = string(comm.TablePagoda)
err = this.MCompModel.Init(service, module, comp, options)
this.module = module.(*Pagoda)
-
+ //创建uid索引
+ this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
+ Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}},
+ })
return
}
diff --git a/sys/configure/structs/game.pagodaData.go b/sys/configure/structs/game.pagodaData.go
index f16123a68..5f3dd4fd0 100644
--- a/sys/configure/structs/game.pagodaData.go
+++ b/sys/configure/structs/game.pagodaData.go
@@ -14,7 +14,7 @@ type GamepagodaData struct {
Key int32
PagodaType int32
LevelType int32
- PreLevel int32
+ NextLevel int32
LayerNum int32
MonsterLv []int32
MonsterHp []float32
@@ -42,7 +42,7 @@ func (_v *GamepagodaData)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["pagoda_type"].(float64); !_ok_ { err = errors.New("pagoda_type error"); return }; _v.PagodaType = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Level_type"].(float64); !_ok_ { err = errors.New("Level_type error"); return }; _v.LevelType = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["PreLevel"].(float64); !_ok_ { err = errors.New("PreLevel error"); return }; _v.PreLevel = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["NextLevel"].(float64); !_ok_ { err = errors.New("NextLevel error"); return }; _v.NextLevel = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["layer_num"].(float64); !_ok_ { err = errors.New("layer_num error"); return }; _v.LayerNum = int32(_tempNum_) }
{
var _arr_ []interface{}
From 6619b878398bf5487e037b3a6ecf3468c77f3ad3 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 16 Aug 2022 13:46:48 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E6=8A=BD=E5=8D=A1json=20=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_drawcard.json | 980 ++++++++++++++++++++++--------------
1 file changed, 616 insertions(+), 364 deletions(-)
diff --git a/bin/json/game_drawcard.json b/bin/json/game_drawcard.json
index f7d221931..02d5cdb83 100644
--- a/bin/json/game_drawcard.json
+++ b/bin/json/game_drawcard.json
@@ -5,7 +5,7 @@
"card_pool_type": "base_pool1",
"star": 3,
"race": 1,
- "id": "10001",
+ "id": "13001",
"weight": 1000
},
{
@@ -14,7 +14,7 @@
"card_pool_type": "base_pool1",
"star": 3,
"race": 1,
- "id": "10002",
+ "id": "13002",
"weight": 1000
},
{
@@ -23,7 +23,7 @@
"card_pool_type": "base_pool1",
"star": 3,
"race": 1,
- "id": "10003",
+ "id": "13003",
"weight": 1000
},
{
@@ -31,8 +31,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 3,
- "race": 2,
- "id": "10004",
+ "race": 1,
+ "id": "13004",
"weight": 1000
},
{
@@ -40,8 +40,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 3,
- "race": 2,
- "id": "10005",
+ "race": 1,
+ "id": "13005",
"weight": 1000
},
{
@@ -50,7 +50,7 @@
"card_pool_type": "base_pool1",
"star": 3,
"race": 2,
- "id": "10006",
+ "id": "23001",
"weight": 1000
},
{
@@ -58,8 +58,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 3,
- "race": 3,
- "id": "10007",
+ "race": 2,
+ "id": "23002",
"weight": 1000
},
{
@@ -67,8 +67,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 3,
- "race": 3,
- "id": "10008",
+ "race": 2,
+ "id": "23003",
"weight": 1000
},
{
@@ -76,18 +76,18 @@
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 3,
- "race": 3,
- "id": "10009",
+ "race": 2,
+ "id": "23004",
"weight": 1000
},
{
"key": 10,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
- "star": 3,
- "race": 4,
- "id": "10010",
- "weight": 200
+ "star": 4,
+ "race": 1,
+ "id": "14001",
+ "weight": 1000
},
{
"key": 11,
@@ -95,7 +95,7 @@
"card_pool_type": "base_pool1",
"star": 4,
"race": 1,
- "id": "10011",
+ "id": "14002",
"weight": 1000
},
{
@@ -104,7 +104,7 @@
"card_pool_type": "base_pool1",
"star": 4,
"race": 1,
- "id": "10012",
+ "id": "14003",
"weight": 1000
},
{
@@ -113,7 +113,7 @@
"card_pool_type": "base_pool1",
"star": 4,
"race": 1,
- "id": "10013",
+ "id": "14004",
"weight": 1000
},
{
@@ -121,8 +121,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 4,
- "race": 2,
- "id": "10014",
+ "race": 1,
+ "id": "14005",
"weight": 1000
},
{
@@ -130,8 +130,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 4,
- "race": 2,
- "id": "10015",
+ "race": 1,
+ "id": "14006",
"weight": 1000
},
{
@@ -139,8 +139,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 4,
- "race": 2,
- "id": "10016",
+ "race": 1,
+ "id": "14007",
"weight": 1000
},
{
@@ -148,8 +148,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 4,
- "race": 3,
- "id": "10017",
+ "race": 2,
+ "id": "24001",
"weight": 1000
},
{
@@ -157,8 +157,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 4,
- "race": 3,
- "id": "10018",
+ "race": 2,
+ "id": "24002",
"weight": 1000
},
{
@@ -166,8 +166,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 4,
- "race": 3,
- "id": "10019",
+ "race": 2,
+ "id": "24003",
"weight": 1000
},
{
@@ -175,53 +175,53 @@
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 4,
- "race": 4,
- "id": "10020",
- "weight": 200
+ "race": 2,
+ "id": "24004",
+ "weight": 1000
},
{
"key": 21,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
- "star": 5,
- "race": 1,
- "id": "10021",
+ "star": 4,
+ "race": 2,
+ "id": "24005",
"weight": 1000
},
{
"key": 22,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
- "star": 5,
- "race": 1,
- "id": "10022",
+ "star": 4,
+ "race": 2,
+ "id": "24006",
"weight": 1000
},
{
"key": 23,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
- "star": 5,
- "race": 1,
- "id": "10023",
+ "star": 4,
+ "race": 2,
+ "id": "24007",
"weight": 1000
},
{
"key": 24,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
- "star": 5,
+ "star": 4,
"race": 2,
- "id": "10024",
+ "id": "24008",
"weight": 1000
},
{
"key": 25,
"recruitment_type": 1,
"card_pool_type": "base_pool1",
- "star": 5,
+ "star": 4,
"race": 2,
- "id": "10025",
+ "id": "24009",
"weight": 1000
},
{
@@ -229,8 +229,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 5,
- "race": 2,
- "id": "10026",
+ "race": 1,
+ "id": "15001",
"weight": 1000
},
{
@@ -238,8 +238,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 5,
- "race": 3,
- "id": "10027",
+ "race": 1,
+ "id": "15002",
"weight": 1000
},
{
@@ -247,8 +247,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 5,
- "race": 3,
- "id": "10028",
+ "race": 1,
+ "id": "15003",
"weight": 1000
},
{
@@ -256,8 +256,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 5,
- "race": 3,
- "id": "10029",
+ "race": 1,
+ "id": "15004",
"weight": 1000
},
{
@@ -265,8 +265,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool1",
"star": 5,
- "race": 4,
- "id": "10030",
+ "race": 2,
+ "id": "25001",
"weight": 200
},
{
@@ -275,7 +275,7 @@
"card_pool_type": "base_pool2",
"star": 3,
"race": 1,
- "id": "10001",
+ "id": "13001",
"weight": 1000
},
{
@@ -284,7 +284,7 @@
"card_pool_type": "base_pool2",
"star": 3,
"race": 1,
- "id": "10002",
+ "id": "13002",
"weight": 1000
},
{
@@ -293,7 +293,7 @@
"card_pool_type": "base_pool2",
"star": 3,
"race": 1,
- "id": "10003",
+ "id": "13003",
"weight": 1000
},
{
@@ -301,8 +301,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool2",
"star": 3,
- "race": 2,
- "id": "10004",
+ "race": 1,
+ "id": "13004",
"weight": 1000
},
{
@@ -310,8 +310,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool2",
"star": 3,
- "race": 2,
- "id": "10005",
+ "race": 1,
+ "id": "13005",
"weight": 1000
},
{
@@ -320,7 +320,7 @@
"card_pool_type": "base_pool2",
"star": 3,
"race": 2,
- "id": "10006",
+ "id": "23001",
"weight": 1000
},
{
@@ -328,8 +328,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool2",
"star": 3,
- "race": 3,
- "id": "10007",
+ "race": 2,
+ "id": "23002",
"weight": 1000
},
{
@@ -337,8 +337,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool2",
"star": 3,
- "race": 3,
- "id": "10008",
+ "race": 2,
+ "id": "23003",
"weight": 1000
},
{
@@ -346,17 +346,17 @@
"recruitment_type": 1,
"card_pool_type": "base_pool2",
"star": 3,
- "race": 3,
- "id": "10009",
+ "race": 2,
+ "id": "23004",
"weight": 1000
},
{
"key": 40,
"recruitment_type": 1,
"card_pool_type": "base_pool2",
- "star": 3,
- "race": 4,
- "id": "10010",
+ "star": 4,
+ "race": 1,
+ "id": "14001",
"weight": 200
},
{
@@ -365,7 +365,7 @@
"card_pool_type": "base_pool2",
"star": 4,
"race": 1,
- "id": "10011",
+ "id": "14002",
"weight": 1000
},
{
@@ -374,7 +374,7 @@
"card_pool_type": "base_pool2",
"star": 4,
"race": 1,
- "id": "10012",
+ "id": "14003",
"weight": 1000
},
{
@@ -383,7 +383,7 @@
"card_pool_type": "base_pool2",
"star": 4,
"race": 1,
- "id": "10013",
+ "id": "14004",
"weight": 1000
},
{
@@ -391,8 +391,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool2",
"star": 4,
- "race": 2,
- "id": "10014",
+ "race": 1,
+ "id": "14005",
"weight": 1000
},
{
@@ -400,8 +400,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool2",
"star": 4,
- "race": 2,
- "id": "10015",
+ "race": 1,
+ "id": "14006",
"weight": 1000
},
{
@@ -409,8 +409,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool2",
"star": 4,
- "race": 2,
- "id": "10016",
+ "race": 1,
+ "id": "14007",
"weight": 1000
},
{
@@ -418,8 +418,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool2",
"star": 4,
- "race": 3,
- "id": "10017",
+ "race": 2,
+ "id": "24001",
"weight": 1000
},
{
@@ -427,8 +427,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool2",
"star": 4,
- "race": 3,
- "id": "10018",
+ "race": 2,
+ "id": "24002",
"weight": 1000
},
{
@@ -436,8 +436,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool2",
"star": 4,
- "race": 3,
- "id": "10019",
+ "race": 2,
+ "id": "24003",
"weight": 1000
},
{
@@ -445,53 +445,53 @@
"recruitment_type": 1,
"card_pool_type": "base_pool2",
"star": 4,
- "race": 4,
- "id": "10020",
+ "race": 2,
+ "id": "24004",
"weight": 200
},
{
"key": 51,
"recruitment_type": 1,
"card_pool_type": "base_pool2",
- "star": 5,
- "race": 1,
- "id": "10021",
+ "star": 4,
+ "race": 2,
+ "id": "24005",
"weight": 1000
},
{
"key": 52,
"recruitment_type": 1,
"card_pool_type": "base_pool2",
- "star": 5,
- "race": 1,
- "id": "10022",
+ "star": 4,
+ "race": 2,
+ "id": "24006",
"weight": 1000
},
{
"key": 53,
"recruitment_type": 1,
"card_pool_type": "base_pool2",
- "star": 5,
- "race": 1,
- "id": "10023",
+ "star": 4,
+ "race": 2,
+ "id": "24007",
"weight": 1000
},
{
"key": 54,
"recruitment_type": 1,
"card_pool_type": "base_pool2",
- "star": 5,
+ "star": 4,
"race": 2,
- "id": "10024",
+ "id": "24008",
"weight": 1000
},
{
"key": 55,
"recruitment_type": 1,
"card_pool_type": "base_pool2",
- "star": 5,
+ "star": 4,
"race": 2,
- "id": "10025",
+ "id": "24009",
"weight": 1000
},
{
@@ -499,8 +499,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool2",
"star": 5,
- "race": 2,
- "id": "10026",
+ "race": 1,
+ "id": "15001",
"weight": 1000
},
{
@@ -508,8 +508,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool2",
"star": 5,
- "race": 3,
- "id": "10027",
+ "race": 1,
+ "id": "15002",
"weight": 1000
},
{
@@ -517,8 +517,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool2",
"star": 5,
- "race": 3,
- "id": "10028",
+ "race": 1,
+ "id": "15003",
"weight": 1000
},
{
@@ -526,8 +526,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool2",
"star": 5,
- "race": 3,
- "id": "10029",
+ "race": 1,
+ "id": "15004",
"weight": 1000
},
{
@@ -535,8 +535,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool2",
"star": 5,
- "race": 4,
- "id": "10030",
+ "race": 2,
+ "id": "25001",
"weight": 200
},
{
@@ -545,7 +545,7 @@
"card_pool_type": "base_pool3",
"star": 3,
"race": 1,
- "id": "10001",
+ "id": "13001",
"weight": 1000
},
{
@@ -554,7 +554,7 @@
"card_pool_type": "base_pool3",
"star": 3,
"race": 1,
- "id": "10002",
+ "id": "13002",
"weight": 1000
},
{
@@ -563,7 +563,7 @@
"card_pool_type": "base_pool3",
"star": 3,
"race": 1,
- "id": "10003",
+ "id": "13003",
"weight": 1000
},
{
@@ -571,8 +571,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool3",
"star": 3,
- "race": 2,
- "id": "10004",
+ "race": 1,
+ "id": "13004",
"weight": 1000
},
{
@@ -580,8 +580,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool3",
"star": 3,
- "race": 2,
- "id": "10005",
+ "race": 1,
+ "id": "13005",
"weight": 1000
},
{
@@ -590,7 +590,7 @@
"card_pool_type": "base_pool3",
"star": 3,
"race": 2,
- "id": "10006",
+ "id": "23001",
"weight": 1000
},
{
@@ -598,8 +598,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool3",
"star": 3,
- "race": 3,
- "id": "10007",
+ "race": 2,
+ "id": "23002",
"weight": 1000
},
{
@@ -607,8 +607,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool3",
"star": 3,
- "race": 3,
- "id": "10008",
+ "race": 2,
+ "id": "23003",
"weight": 1000
},
{
@@ -616,17 +616,17 @@
"recruitment_type": 1,
"card_pool_type": "base_pool3",
"star": 3,
- "race": 3,
- "id": "10009",
+ "race": 2,
+ "id": "23004",
"weight": 1000
},
{
"key": 70,
"recruitment_type": 1,
"card_pool_type": "base_pool3",
- "star": 3,
- "race": 4,
- "id": "10010",
+ "star": 4,
+ "race": 1,
+ "id": "14001",
"weight": 200
},
{
@@ -635,7 +635,7 @@
"card_pool_type": "base_pool3",
"star": 4,
"race": 1,
- "id": "10011",
+ "id": "14002",
"weight": 1000
},
{
@@ -644,7 +644,7 @@
"card_pool_type": "base_pool3",
"star": 4,
"race": 1,
- "id": "10012",
+ "id": "14003",
"weight": 1000
},
{
@@ -653,7 +653,7 @@
"card_pool_type": "base_pool3",
"star": 4,
"race": 1,
- "id": "10013",
+ "id": "14004",
"weight": 1000
},
{
@@ -661,8 +661,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool3",
"star": 4,
- "race": 2,
- "id": "10014",
+ "race": 1,
+ "id": "14005",
"weight": 1000
},
{
@@ -670,8 +670,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool3",
"star": 4,
- "race": 2,
- "id": "10015",
+ "race": 1,
+ "id": "14006",
"weight": 1000
},
{
@@ -679,8 +679,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool3",
"star": 4,
- "race": 2,
- "id": "10016",
+ "race": 1,
+ "id": "14007",
"weight": 1000
},
{
@@ -688,8 +688,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool3",
"star": 4,
- "race": 3,
- "id": "10017",
+ "race": 2,
+ "id": "24001",
"weight": 1000
},
{
@@ -697,8 +697,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool3",
"star": 4,
- "race": 3,
- "id": "10018",
+ "race": 2,
+ "id": "24002",
"weight": 1000
},
{
@@ -706,8 +706,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool3",
"star": 4,
- "race": 3,
- "id": "10019",
+ "race": 2,
+ "id": "24003",
"weight": 1000
},
{
@@ -715,53 +715,53 @@
"recruitment_type": 1,
"card_pool_type": "base_pool3",
"star": 4,
- "race": 4,
- "id": "10020",
+ "race": 2,
+ "id": "24004",
"weight": 200
},
{
"key": 81,
"recruitment_type": 1,
"card_pool_type": "base_pool3",
- "star": 5,
- "race": 1,
- "id": "10021",
+ "star": 4,
+ "race": 2,
+ "id": "24005",
"weight": 1000
},
{
"key": 82,
"recruitment_type": 1,
"card_pool_type": "base_pool3",
- "star": 5,
- "race": 1,
- "id": "10022",
+ "star": 4,
+ "race": 2,
+ "id": "24006",
"weight": 1000
},
{
"key": 83,
"recruitment_type": 1,
"card_pool_type": "base_pool3",
- "star": 5,
- "race": 1,
- "id": "10023",
+ "star": 4,
+ "race": 2,
+ "id": "24007",
"weight": 1000
},
{
"key": 84,
"recruitment_type": 1,
"card_pool_type": "base_pool3",
- "star": 5,
+ "star": 4,
"race": 2,
- "id": "10024",
+ "id": "24008",
"weight": 1000
},
{
"key": 85,
"recruitment_type": 1,
"card_pool_type": "base_pool3",
- "star": 5,
+ "star": 4,
"race": 2,
- "id": "10025",
+ "id": "24009",
"weight": 1000
},
{
@@ -769,8 +769,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool3",
"star": 5,
- "race": 2,
- "id": "10026",
+ "race": 1,
+ "id": "15001",
"weight": 1000
},
{
@@ -778,8 +778,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool3",
"star": 5,
- "race": 3,
- "id": "10027",
+ "race": 1,
+ "id": "15002",
"weight": 1000
},
{
@@ -787,8 +787,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool3",
"star": 5,
- "race": 3,
- "id": "10028",
+ "race": 1,
+ "id": "15003",
"weight": 1000
},
{
@@ -796,8 +796,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool3",
"star": 5,
- "race": 3,
- "id": "10029",
+ "race": 1,
+ "id": "15004",
"weight": 1000
},
{
@@ -805,8 +805,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool3",
"star": 5,
- "race": 4,
- "id": "10030",
+ "race": 2,
+ "id": "25001",
"weight": 200
},
{
@@ -815,7 +815,7 @@
"card_pool_type": "base_pool4",
"star": 3,
"race": 1,
- "id": "10001",
+ "id": "13001",
"weight": 1000
},
{
@@ -824,7 +824,7 @@
"card_pool_type": "base_pool4",
"star": 3,
"race": 1,
- "id": "10002",
+ "id": "13002",
"weight": 1000
},
{
@@ -833,7 +833,7 @@
"card_pool_type": "base_pool4",
"star": 3,
"race": 1,
- "id": "10003",
+ "id": "13003",
"weight": 1000
},
{
@@ -841,8 +841,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool4",
"star": 3,
- "race": 2,
- "id": "10004",
+ "race": 1,
+ "id": "13004",
"weight": 1000
},
{
@@ -850,8 +850,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool4",
"star": 3,
- "race": 2,
- "id": "10005",
+ "race": 1,
+ "id": "13005",
"weight": 1000
},
{
@@ -860,7 +860,7 @@
"card_pool_type": "base_pool4",
"star": 3,
"race": 2,
- "id": "10006",
+ "id": "23001",
"weight": 1000
},
{
@@ -868,8 +868,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool4",
"star": 3,
- "race": 3,
- "id": "10007",
+ "race": 2,
+ "id": "23002",
"weight": 1000
},
{
@@ -877,8 +877,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool4",
"star": 3,
- "race": 3,
- "id": "10008",
+ "race": 2,
+ "id": "23003",
"weight": 1000
},
{
@@ -886,17 +886,17 @@
"recruitment_type": 1,
"card_pool_type": "base_pool4",
"star": 3,
- "race": 3,
- "id": "10009",
+ "race": 2,
+ "id": "23004",
"weight": 1000
},
{
"key": 100,
"recruitment_type": 1,
"card_pool_type": "base_pool4",
- "star": 3,
- "race": 4,
- "id": "10010",
+ "star": 4,
+ "race": 1,
+ "id": "14001",
"weight": 200
},
{
@@ -905,7 +905,7 @@
"card_pool_type": "base_pool4",
"star": 4,
"race": 1,
- "id": "10011",
+ "id": "14002",
"weight": 1000
},
{
@@ -914,7 +914,7 @@
"card_pool_type": "base_pool4",
"star": 4,
"race": 1,
- "id": "10012",
+ "id": "14003",
"weight": 1000
},
{
@@ -923,7 +923,7 @@
"card_pool_type": "base_pool4",
"star": 4,
"race": 1,
- "id": "10013",
+ "id": "14004",
"weight": 1000
},
{
@@ -931,8 +931,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool4",
"star": 4,
- "race": 2,
- "id": "10014",
+ "race": 1,
+ "id": "14005",
"weight": 1000
},
{
@@ -940,8 +940,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool4",
"star": 4,
- "race": 2,
- "id": "10015",
+ "race": 1,
+ "id": "14006",
"weight": 1000
},
{
@@ -949,8 +949,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool4",
"star": 4,
- "race": 2,
- "id": "10016",
+ "race": 1,
+ "id": "14007",
"weight": 1000
},
{
@@ -958,8 +958,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool4",
"star": 4,
- "race": 3,
- "id": "10017",
+ "race": 2,
+ "id": "24001",
"weight": 1000
},
{
@@ -967,8 +967,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool4",
"star": 4,
- "race": 3,
- "id": "10018",
+ "race": 2,
+ "id": "24002",
"weight": 1000
},
{
@@ -976,8 +976,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool4",
"star": 4,
- "race": 3,
- "id": "10019",
+ "race": 2,
+ "id": "24003",
"weight": 1000
},
{
@@ -985,53 +985,53 @@
"recruitment_type": 1,
"card_pool_type": "base_pool4",
"star": 4,
- "race": 4,
- "id": "10020",
+ "race": 2,
+ "id": "24004",
"weight": 200
},
{
"key": 111,
"recruitment_type": 1,
"card_pool_type": "base_pool4",
- "star": 5,
- "race": 1,
- "id": "10021",
+ "star": 4,
+ "race": 2,
+ "id": "24005",
"weight": 1000
},
{
"key": 112,
"recruitment_type": 1,
"card_pool_type": "base_pool4",
- "star": 5,
- "race": 1,
- "id": "10022",
+ "star": 4,
+ "race": 2,
+ "id": "24006",
"weight": 1000
},
{
"key": 113,
"recruitment_type": 1,
"card_pool_type": "base_pool4",
- "star": 5,
- "race": 1,
- "id": "10023",
+ "star": 4,
+ "race": 2,
+ "id": "24007",
"weight": 1000
},
{
"key": 114,
"recruitment_type": 1,
"card_pool_type": "base_pool4",
- "star": 5,
+ "star": 4,
"race": 2,
- "id": "10024",
+ "id": "24008",
"weight": 1000
},
{
"key": 115,
"recruitment_type": 1,
"card_pool_type": "base_pool4",
- "star": 5,
+ "star": 4,
"race": 2,
- "id": "10025",
+ "id": "24009",
"weight": 1000
},
{
@@ -1039,8 +1039,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool4",
"star": 5,
- "race": 2,
- "id": "10026",
+ "race": 1,
+ "id": "15001",
"weight": 1000
},
{
@@ -1048,8 +1048,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool4",
"star": 5,
- "race": 3,
- "id": "10027",
+ "race": 1,
+ "id": "15002",
"weight": 1000
},
{
@@ -1057,8 +1057,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool4",
"star": 5,
- "race": 3,
- "id": "10028",
+ "race": 1,
+ "id": "15003",
"weight": 1000
},
{
@@ -1066,8 +1066,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool4",
"star": 5,
- "race": 3,
- "id": "10029",
+ "race": 1,
+ "id": "15004",
"weight": 1000
},
{
@@ -1075,8 +1075,8 @@
"recruitment_type": 1,
"card_pool_type": "base_pool4",
"star": 5,
- "race": 4,
- "id": "10030",
+ "race": 2,
+ "id": "25001",
"weight": 200
},
{
@@ -1085,7 +1085,7 @@
"card_pool_type": "camp1_pool",
"star": 3,
"race": 1,
- "id": "10001",
+ "id": "13001",
"weight": 1000
},
{
@@ -1094,7 +1094,7 @@
"card_pool_type": "camp1_pool",
"star": 3,
"race": 1,
- "id": "10002",
+ "id": "13002",
"weight": 1000
},
{
@@ -1103,25 +1103,25 @@
"card_pool_type": "camp1_pool",
"star": 3,
"race": 1,
- "id": "10003",
+ "id": "13003",
"weight": 1000
},
{
"key": 124,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
- "star": 4,
+ "star": 3,
"race": 1,
- "id": "10004",
+ "id": "13004",
"weight": 1000
},
{
"key": 125,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
- "star": 4,
+ "star": 3,
"race": 1,
- "id": "10005",
+ "id": "13005",
"weight": 1000
},
{
@@ -1130,313 +1130,565 @@
"card_pool_type": "camp1_pool",
"star": 4,
"race": 1,
- "id": "10006",
+ "id": "14001",
"weight": 1000
},
{
"key": 127,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
- "star": 5,
+ "star": 4,
"race": 1,
- "id": "10007",
+ "id": "14002",
"weight": 1000
},
{
"key": 128,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
- "star": 5,
+ "star": 4,
"race": 1,
- "id": "10008",
+ "id": "14003",
"weight": 1000
},
{
"key": 129,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
- "star": 5,
+ "star": 4,
"race": 1,
- "id": "10009",
+ "id": "14004",
"weight": 1000
},
{
"key": 130,
"recruitment_type": 2,
"card_pool_type": "camp1_pool",
- "star": 5,
+ "star": 4,
"race": 1,
- "id": "10010",
- "weight": 200
+ "id": "14005",
+ "weight": 1000
},
{
"key": 131,
"recruitment_type": 2,
- "card_pool_type": "camp2_pool",
- "star": 3,
- "race": 2,
- "id": "10011",
+ "card_pool_type": "camp1_pool",
+ "star": 4,
+ "race": 1,
+ "id": "14006",
"weight": 1000
},
{
"key": 132,
"recruitment_type": 2,
- "card_pool_type": "camp2_pool",
- "star": 3,
- "race": 2,
- "id": "10012",
+ "card_pool_type": "camp1_pool",
+ "star": 4,
+ "race": 1,
+ "id": "14007",
"weight": 1000
},
{
"key": 133,
"recruitment_type": 2,
- "card_pool_type": "camp2_pool",
- "star": 3,
- "race": 2,
- "id": "10013",
+ "card_pool_type": "camp1_pool",
+ "star": 5,
+ "race": 1,
+ "id": "15001",
"weight": 1000
},
{
"key": 134,
"recruitment_type": 2,
- "card_pool_type": "camp2_pool",
- "star": 4,
- "race": 2,
- "id": "10014",
+ "card_pool_type": "camp1_pool",
+ "star": 5,
+ "race": 1,
+ "id": "15002",
"weight": 1000
},
{
"key": 135,
"recruitment_type": 2,
- "card_pool_type": "camp2_pool",
- "star": 4,
- "race": 2,
- "id": "10015",
+ "card_pool_type": "camp1_pool",
+ "star": 5,
+ "race": 1,
+ "id": "15003",
"weight": 1000
},
{
"key": 136,
"recruitment_type": 2,
- "card_pool_type": "camp2_pool",
- "star": 4,
- "race": 2,
- "id": "10016",
+ "card_pool_type": "camp1_pool",
+ "star": 5,
+ "race": 1,
+ "id": "15004",
"weight": 1000
},
{
"key": 137,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
- "star": 5,
+ "star": 3,
"race": 2,
- "id": "10017",
+ "id": "23001",
"weight": 1000
},
{
"key": 138,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
- "star": 5,
+ "star": 3,
"race": 2,
- "id": "10018",
+ "id": "23002",
"weight": 1000
},
{
"key": 139,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
- "star": 5,
+ "star": 3,
"race": 2,
- "id": "10019",
+ "id": "23003",
"weight": 1000
},
{
"key": 140,
"recruitment_type": 2,
"card_pool_type": "camp2_pool",
- "star": 5,
+ "star": 3,
"race": 2,
- "id": "10020",
- "weight": 200
+ "id": "23004",
+ "weight": 1000
},
{
"key": 141,
"recruitment_type": 2,
- "card_pool_type": "camp3_pool",
- "star": 3,
- "race": 3,
- "id": "10021",
+ "card_pool_type": "camp2_pool",
+ "star": 4,
+ "race": 2,
+ "id": "24001",
"weight": 1000
},
{
"key": 142,
"recruitment_type": 2,
- "card_pool_type": "camp3_pool",
- "star": 3,
- "race": 3,
- "id": "10022",
+ "card_pool_type": "camp2_pool",
+ "star": 4,
+ "race": 2,
+ "id": "24002",
"weight": 1000
},
{
"key": 143,
"recruitment_type": 2,
- "card_pool_type": "camp3_pool",
- "star": 3,
- "race": 3,
- "id": "10023",
+ "card_pool_type": "camp2_pool",
+ "star": 4,
+ "race": 2,
+ "id": "24003",
"weight": 1000
},
{
"key": 144,
"recruitment_type": 2,
- "card_pool_type": "camp3_pool",
+ "card_pool_type": "camp2_pool",
"star": 4,
- "race": 3,
- "id": "10024",
+ "race": 2,
+ "id": "24004",
"weight": 1000
},
{
"key": 145,
"recruitment_type": 2,
- "card_pool_type": "camp3_pool",
+ "card_pool_type": "camp2_pool",
"star": 4,
- "race": 3,
- "id": "10025",
+ "race": 2,
+ "id": "24005",
"weight": 1000
},
{
"key": 146,
"recruitment_type": 2,
- "card_pool_type": "camp3_pool",
+ "card_pool_type": "camp2_pool",
"star": 4,
- "race": 3,
- "id": "10026",
+ "race": 2,
+ "id": "24006",
"weight": 1000
},
{
"key": 147,
"recruitment_type": 2,
- "card_pool_type": "camp3_pool",
- "star": 5,
- "race": 3,
- "id": "10027",
+ "card_pool_type": "camp2_pool",
+ "star": 4,
+ "race": 2,
+ "id": "24007",
"weight": 1000
},
{
"key": 148,
"recruitment_type": 2,
- "card_pool_type": "camp3_pool",
- "star": 5,
- "race": 3,
- "id": "10028",
+ "card_pool_type": "camp2_pool",
+ "star": 4,
+ "race": 2,
+ "id": "24008",
"weight": 1000
},
{
"key": 149,
"recruitment_type": 2,
- "card_pool_type": "camp3_pool",
- "star": 5,
- "race": 3,
- "id": "10029",
+ "card_pool_type": "camp2_pool",
+ "star": 4,
+ "race": 2,
+ "id": "24009",
"weight": 1000
},
{
"key": 150,
"recruitment_type": 2,
- "card_pool_type": "camp3_pool",
+ "card_pool_type": "camp2_pool",
"star": 5,
- "race": 3,
- "id": "10030",
- "weight": 200
+ "race": 2,
+ "id": "25001",
+ "weight": 1000
},
{
"key": 151,
"recruitment_type": 2,
- "card_pool_type": "camp4_pool",
- "star": 3,
- "race": 4,
- "id": "10031",
- "weight": 200
+ "card_pool_type": "camp2_pool",
+ "star": 5,
+ "race": 2,
+ "id": "25002",
+ "weight": 1000
},
{
"key": 152,
"recruitment_type": 2,
- "card_pool_type": "camp4_pool",
- "star": 3,
- "race": 4,
- "id": "10032",
- "weight": 200
+ "card_pool_type": "camp2_pool",
+ "star": 5,
+ "race": 2,
+ "id": "25003",
+ "weight": 1000
},
{
"key": 153,
"recruitment_type": 2,
- "card_pool_type": "camp4_pool",
- "star": 3,
- "race": 4,
- "id": "10033",
- "weight": 200
+ "card_pool_type": "camp2_pool",
+ "star": 5,
+ "race": 2,
+ "id": "25004",
+ "weight": 1000
},
{
"key": 154,
"recruitment_type": 2,
- "card_pool_type": "camp4_pool",
- "star": 4,
- "race": 4,
- "id": "10034",
- "weight": 200
+ "card_pool_type": "camp3_pool",
+ "star": 3,
+ "race": 3,
+ "id": "33001",
+ "weight": 1000
},
{
"key": 155,
"recruitment_type": 2,
- "card_pool_type": "camp4_pool",
- "star": 4,
- "race": 4,
- "id": "10035",
- "weight": 200
+ "card_pool_type": "camp3_pool",
+ "star": 3,
+ "race": 3,
+ "id": "33002",
+ "weight": 1000
},
{
"key": 156,
"recruitment_type": 2,
- "card_pool_type": "camp4_pool",
- "star": 4,
- "race": 4,
- "id": "10036",
- "weight": 200
+ "card_pool_type": "camp3_pool",
+ "star": 3,
+ "race": 3,
+ "id": "33003",
+ "weight": 1000
},
{
"key": 157,
"recruitment_type": 2,
- "card_pool_type": "camp4_pool",
- "star": 5,
- "race": 4,
- "id": "10037",
- "weight": 200
+ "card_pool_type": "camp3_pool",
+ "star": 3,
+ "race": 3,
+ "id": "33004",
+ "weight": 1000
},
{
"key": 158,
"recruitment_type": 2,
- "card_pool_type": "camp4_pool",
- "star": 5,
- "race": 4,
- "id": "10038",
- "weight": 200
+ "card_pool_type": "camp3_pool",
+ "star": 3,
+ "race": 3,
+ "id": "33005",
+ "weight": 1000
},
{
"key": 159,
"recruitment_type": 2,
- "card_pool_type": "camp4_pool",
- "star": 5,
- "race": 4,
- "id": "10039",
- "weight": 200
+ "card_pool_type": "camp3_pool",
+ "star": 3,
+ "race": 3,
+ "id": "33006",
+ "weight": 1000
},
{
"key": 160,
"recruitment_type": 2,
+ "card_pool_type": "camp3_pool",
+ "star": 4,
+ "race": 3,
+ "id": "34001",
+ "weight": 1000
+ },
+ {
+ "key": 161,
+ "recruitment_type": 2,
+ "card_pool_type": "camp3_pool",
+ "star": 4,
+ "race": 3,
+ "id": "34002",
+ "weight": 1000
+ },
+ {
+ "key": 162,
+ "recruitment_type": 2,
+ "card_pool_type": "camp3_pool",
+ "star": 4,
+ "race": 3,
+ "id": "34003",
+ "weight": 1000
+ },
+ {
+ "key": 163,
+ "recruitment_type": 2,
+ "card_pool_type": "camp3_pool",
+ "star": 4,
+ "race": 3,
+ "id": "34004",
+ "weight": 1000
+ },
+ {
+ "key": 164,
+ "recruitment_type": 2,
+ "card_pool_type": "camp3_pool",
+ "star": 4,
+ "race": 3,
+ "id": "34005",
+ "weight": 1000
+ },
+ {
+ "key": 165,
+ "recruitment_type": 2,
+ "card_pool_type": "camp3_pool",
+ "star": 4,
+ "race": 3,
+ "id": "34006",
+ "weight": 1000
+ },
+ {
+ "key": 166,
+ "recruitment_type": 2,
+ "card_pool_type": "camp3_pool",
+ "star": 4,
+ "race": 3,
+ "id": "34007",
+ "weight": 1000
+ },
+ {
+ "key": 167,
+ "recruitment_type": 2,
+ "card_pool_type": "camp3_pool",
+ "star": 4,
+ "race": 3,
+ "id": "34008",
+ "weight": 1000
+ },
+ {
+ "key": 168,
+ "recruitment_type": 2,
+ "card_pool_type": "camp3_pool",
+ "star": 5,
+ "race": 3,
+ "id": "35002",
+ "weight": 1000
+ },
+ {
+ "key": 169,
+ "recruitment_type": 2,
+ "card_pool_type": "camp3_pool",
+ "star": 5,
+ "race": 3,
+ "id": "35003",
+ "weight": 1000
+ },
+ {
+ "key": 170,
+ "recruitment_type": 2,
+ "card_pool_type": "camp3_pool",
+ "star": 5,
+ "race": 3,
+ "id": "35004",
+ "weight": 1000
+ },
+ {
+ "key": 171,
+ "recruitment_type": 2,
+ "card_pool_type": "camp3_pool",
+ "star": 5,
+ "race": 3,
+ "id": "35005",
+ "weight": 1000
+ },
+ {
+ "key": 172,
+ "recruitment_type": 2,
+ "card_pool_type": "camp3_pool",
+ "star": 5,
+ "race": 3,
+ "id": "35006",
+ "weight": 1000
+ },
+ {
+ "key": 173,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 3,
+ "race": 4,
+ "id": "43001",
+ "weight": 1000
+ },
+ {
+ "key": 174,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 3,
+ "race": 4,
+ "id": "43002",
+ "weight": 1000
+ },
+ {
+ "key": 175,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 3,
+ "race": 4,
+ "id": "43003",
+ "weight": 1000
+ },
+ {
+ "key": 176,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 3,
+ "race": 4,
+ "id": "43004",
+ "weight": 1000
+ },
+ {
+ "key": 177,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 3,
+ "race": 4,
+ "id": "43005",
+ "weight": 1000
+ },
+ {
+ "key": 178,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 3,
+ "race": 4,
+ "id": "43006",
+ "weight": 1000
+ },
+ {
+ "key": 179,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 3,
+ "race": 4,
+ "id": "43007",
+ "weight": 1000
+ },
+ {
+ "key": 180,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 4,
+ "race": 4,
+ "id": "44001",
+ "weight": 1000
+ },
+ {
+ "key": 181,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 4,
+ "race": 4,
+ "id": "44002",
+ "weight": 1000
+ },
+ {
+ "key": 182,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 4,
+ "race": 4,
+ "id": "44003",
+ "weight": 1000
+ },
+ {
+ "key": 183,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 4,
+ "race": 4,
+ "id": "44004",
+ "weight": 1000
+ },
+ {
+ "key": 184,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 4,
+ "race": 4,
+ "id": "44006",
+ "weight": 1000
+ },
+ {
+ "key": 185,
+ "recruitment_type": 2,
"card_pool_type": "camp4_pool",
"star": 5,
"race": 4,
- "id": "10040",
- "weight": 200
+ "id": "45001",
+ "weight": 1000
+ },
+ {
+ "key": 186,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 5,
+ "race": 4,
+ "id": "45002",
+ "weight": 1000
+ },
+ {
+ "key": 187,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 5,
+ "race": 4,
+ "id": "45003",
+ "weight": 1000
+ },
+ {
+ "key": 188,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 5,
+ "race": 4,
+ "id": "45004",
+ "weight": 1000
}
]
\ No newline at end of file
From 302e85dc599a4c4d3281954e5e6a4a04a0a1661f Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 16 Aug 2022 14:15:43 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E7=88=AC=E5=A1=94=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E4=BF=9D=E5=AD=98bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/pagoda/api_challenge.go | 2 +-
modules/pagoda/api_getlist.go | 6 +++---
modules/pagoda/model_pagoda.go | 6 +++---
modules/pagoda/module.go | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/modules/pagoda/api_challenge.go b/modules/pagoda/api_challenge.go
index 69db58ec3..00bf7c239 100644
--- a/modules/pagoda/api_challenge.go
+++ b/modules/pagoda/api_challenge.go
@@ -49,7 +49,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.PagodaChalleng
}
mapData := make(map[string]interface{}, 0)
mapData["pagodaId"] = cfg.NextLevel
- code = this.module.ModifyPagodaData(session.GetUserId(), pagoda.Id, mapData)
+ code = this.module.ModifyPagodaData(session.GetUserId(), mapData)
session.SendMsg(string(this.module.GetType()), PagodaChallengeResp, &pb.PagodaChallengeResp{Data: pagoda})
return
}
diff --git a/modules/pagoda/api_getlist.go b/modules/pagoda/api_getlist.go
index e4af60927..ff58f3f64 100644
--- a/modules/pagoda/api_getlist.go
+++ b/modules/pagoda/api_getlist.go
@@ -28,11 +28,11 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.PagodaGetListReq
result := &pb.DBPagoda{}
result.Id = primitive.NewObjectID().Hex()
- _mData := make(map[string]interface{}, 0)
+ //_mData := make(map[string]interface{}, 0)
result.Uid = session.GetUserId()
result.PagodaId = 1 // 初始数据1层
- _mData[result.Id] = result
- this.module.modelPagoda.addNewPagoda(session.GetUserId(), _mData)
+ //_mData[result.Id] = result
+ this.module.modelPagoda.addNewPagoda(session.GetUserId(), result)
session.SendMsg(string(this.module.GetType()), PagodaGetListResp, &pb.PagodaGetListResp{Data: result})
return
}
diff --git a/modules/pagoda/model_pagoda.go b/modules/pagoda/model_pagoda.go
index 1d21252c3..8075704da 100644
--- a/modules/pagoda/model_pagoda.go
+++ b/modules/pagoda/model_pagoda.go
@@ -41,12 +41,12 @@ func (this *ModelPagoda) getPagodaList(uid string) (result *pb.DBPagoda, err err
}
// 修改爬塔数据信息
-func (this *ModelPagoda) modifyPagodaDataByObjId(uid string, objid string, data map[string]interface{}) error {
- return this.ChangeList(uid, objid, data)
+func (this *ModelPagoda) modifyPagodaDataByObjId(uid string, data map[string]interface{}) error {
+ return this.Change(uid, data)
}
// 创建一个新的塔数据
-func (this *ModelPagoda) addNewPagoda(uId string, data map[string]interface{}) (err error) {
+func (this *ModelPagoda) addNewPagoda(uId string, data *pb.DBPagoda) (err error) {
if err = this.Add(uId, data); err != nil {
this.module.Errorf("err:%v", err)
diff --git a/modules/pagoda/module.go b/modules/pagoda/module.go
index d6e2dacc7..fc7b02d82 100644
--- a/modules/pagoda/module.go
+++ b/modules/pagoda/module.go
@@ -36,8 +36,8 @@ func (this *Pagoda) OnInstallComp() {
}
// 接口信息
-func (this *Pagoda) ModifyPagodaData(uid string, objId string, data map[string]interface{}) (code pb.ErrorCode) {
- err := this.modelPagoda.modifyPagodaDataByObjId(uid, objId, data)
+func (this *Pagoda) ModifyPagodaData(uid string, data map[string]interface{}) (code pb.ErrorCode) {
+ err := this.modelPagoda.modifyPagodaDataByObjId(uid, data)
if err != nil {
code = pb.ErrorCode_DBError
}
From 96c421265d421c97ed8e725d17c158f38b848250 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 16 Aug 2022 14:44:05 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E9=A2=86=E5=8F=96=E5=A5=96=E5=8A=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/pagoda/api_getReward.go | 29 ++++
modules/pagoda/comp_configure.go | 22 +++
pb/errorcode.pb.go | 237 ++++++++++++++++---------------
3 files changed, 174 insertions(+), 114 deletions(-)
diff --git a/modules/pagoda/api_getReward.go b/modules/pagoda/api_getReward.go
index e2b3ffa55..0bf68c9c8 100644
--- a/modules/pagoda/api_getReward.go
+++ b/modules/pagoda/api_getReward.go
@@ -22,6 +22,35 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.PagodaGetRewar
if code != pb.ErrorCode_Success {
return // 参数校验失败直接返回
}
+ // 获取 奖励信息
+ list, err := this.module.modelPagoda.getPagodaList(session.GetUserId())
+ if err != nil || list == nil {
+ code = pb.ErrorCode_DBError
+ return
+ }
+ _cfg := this.module.configure.GetPagodaRewardconfig(req.Id)
+ if _cfg == nil {
+ code = pb.ErrorCode_ConfigNoFound
+ return
+ }
+ // 校验是否能领取
+ if _cfg.LayerNum >= list.PagodaId {
+ code = pb.ErrorCode_PagodaConditionErr
+ return
+ }
+ if _, ok := list.Reward[req.GetId()]; ok { // 校验是否重复领取
+ code = pb.ErrorCode_PagodaGetRewardErr
+ return
+ }
+ if list.Reward == nil {
+ list.Reward = make(map[int32]bool, 0)
+ }
+
+ list.Reward[req.Id] = true
+ mapData := make(map[string]interface{}, 0)
+ mapData["reward"] = list.Reward
+ code = this.module.ModifyPagodaData(session.GetUserId(), mapData)
+ session.SendMsg(string(this.module.GetType()), PagodaGetRewardResp, &pb.PagodaGetRewardResp{Data: list})
return
}
diff --git a/modules/pagoda/comp_configure.go b/modules/pagoda/comp_configure.go
index dc26b19f5..a045e06cc 100644
--- a/modules/pagoda/comp_configure.go
+++ b/modules/pagoda/comp_configure.go
@@ -93,3 +93,25 @@ func (this *configureComp) GetPagodaconfig(id int32) (data *cfg.GamepagodaData)
}
return
}
+
+// 爬塔奖励
+func (this *configureComp) GetPagodaRewardconfig(id int32) (data *cfg.GamepagodaTaskRewardData) {
+ if v, err := this.GetConfigure(game_pagodataskreward); err == nil {
+ var (
+ configure *cfg.GamepagodaTaskReward
+ ok bool
+ )
+ if configure, ok = v.(*cfg.GamepagodaTaskReward); !ok {
+ log.Errorf("%T no is *cfg.Game_pagodaData", v)
+ return
+ }
+
+ if data, ok = configure.GetDataMap()[id]; ok {
+ return
+ }
+ } else {
+ log.Errorf("get game_pagodataskreward conf err:%v", err)
+ return
+ }
+ return
+}
diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index 3854e5c90..f9d270180 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -138,120 +138,124 @@ const (
// mail
ErrorCode_MailErr ErrorCode = 1800 // 邮件不存在
// pagoda
- ErrorCode_PagodaNotFound ErrorCode = 1900 // 找不到塔数据
- ErrorCode_PagodaLevlErr ErrorCode = 19001 // 挑战关卡数据不匹配
+ ErrorCode_PagodaNotFound ErrorCode = 1900 // 找不到塔数据
+ ErrorCode_PagodaLevlErr ErrorCode = 1901 // 挑战关卡数据不匹配
+ ErrorCode_PagodaGetRewardErr ErrorCode = 1902 // 重复领取
+ ErrorCode_PagodaConditionErr ErrorCode = 1903 // 条件不足
)
// Enum value maps for ErrorCode.
var (
ErrorCode_name = map[int32]string{
- 0: "Success",
- 10: "NoFindService",
- 11: "NoFindServiceHandleFunc",
- 12: "RpcFuncExecutionError",
- 13: "CacheReadError",
- 14: "SqlExecutionError",
- 15: "ReqParameterError",
- 16: "SignError",
- 17: "InsufficientPermissions",
- 18: "NoLogin",
- 19: "UserSessionNobeing",
- 20: "StateInvalid",
- 21: "DBError",
- 22: "SystemError",
- 23: "DecodeError",
- 24: "TimestampTimeout",
- 25: "PbError",
- 26: "AgentUidEmpty",
- 100: "Exception",
- 101: "Unknown",
- 102: "ResNoEnough",
- 103: "ConfigurationException",
- 104: "ConfigNoFound",
- 1000: "SecKeyInvalid",
- 1001: "SecKey",
- 1002: "BindUser",
- 1003: "GoldNoEnough",
- 1004: "DiamondNoEnough",
- 1005: "RoleCreated",
- 1006: "UserNickNameExist",
- 1007: "VeriCodeNoValid",
- 1008: "VeriCodeExpired",
- 1009: "UserResetData",
- 1010: "UserModiNameCount",
- 1011: "UserNickNameEmpty",
- 1012: "UserExpandNull",
- 1100: "FriendNotSelf",
- 1101: "FriendSelfMax",
- 1102: "FriendTargetMax",
- 1103: "FriendSelfNoData",
- 1104: "FriendTargetNoData",
- 1105: "FriendYet",
- 1106: "FriendApplyYet",
- 1107: "FriendSelfBlackYet",
- 1108: "FriendTargetBlackYet",
- 1109: "FriendApplyError",
- 1110: "FriendBlackMax",
- 1111: "FriendSearchNameEmpty",
- 1112: "FriendZaned",
- 1113: "FriendZanreceived",
- 1114: "FriendZanSelf",
- 1115: "FriendPointLimit",
- 1200: "ItemsNoEnough",
- 1201: "ItemsNoFoundGird",
- 1202: "ItemsGridNumUpper",
- 1203: "ItemsGirdAmountUpper",
- 1204: "ItemsUseNotSupported",
- 1300: "HeroNoExist",
- 1301: "HeroNoEnough",
- 1302: "HeroMaxLv",
- 1303: "HeroInitCreat",
- 1304: "HeroColorErr",
- 1305: "HeroSkillUpErr",
- 1306: "HeroMaxResonate",
- 1307: "HeroNoResonate",
- 1308: "HeroNotNeedResonate",
- 1309: "HeroNoEnergy",
- 1310: "HeroCreate",
- 1311: "HeroEquipUpdate",
- 1312: "HeroMaxAwaken",
- 1313: "HeroIsLock",
- 1314: "HeroMaxCount",
- 1315: "HeroCostTypeErr",
- 1316: "HeroStarErr",
- 1317: "HeroTypeErr",
- 1318: "HeroExpTypeErr",
- 1319: "HeroAddMaxExp",
- 1320: "HeroStarLvErr",
- 1321: "HeroMaxStarLv",
- 1322: "DrawCardTypeNotFound",
- 1323: "HeroMaxSkillLv",
- 1400: "EquipmentOnFoundEquipment",
- 1401: "EquipmentLvlimitReached",
- 1402: "EquipmentIsWorn",
- 1500: "MainlineNotFindChapter",
- 1501: "MainlineIDFailed",
- 1502: "MainlineNotFound",
- 1503: "MainlinePreNotFound",
- 1504: "MainlineRepeatReward",
- 1505: "MainlineCompleteReward",
- 1600: "TaskInit",
- 1601: "TaskReset",
- 1602: "TaskHandle",
- 1603: "TaskReceived",
- 1604: "TaskActiveInit",
- 1605: "TaskActiveNofound",
- 1606: "TaskActiveNoenough",
- 1607: "TaskNoFinished",
- 1608: "TaskFinished",
- 1609: "TaskTagEmpty",
- 1610: "TaskIdEmpty",
- 1611: "TaskNotFound",
- 1700: "ShopGoodsIsSoldOut",
- 1701: "ShopNoSurplusRefreshNum",
- 1800: "MailErr",
- 1900: "PagodaNotFound",
- 19001: "PagodaLevlErr",
+ 0: "Success",
+ 10: "NoFindService",
+ 11: "NoFindServiceHandleFunc",
+ 12: "RpcFuncExecutionError",
+ 13: "CacheReadError",
+ 14: "SqlExecutionError",
+ 15: "ReqParameterError",
+ 16: "SignError",
+ 17: "InsufficientPermissions",
+ 18: "NoLogin",
+ 19: "UserSessionNobeing",
+ 20: "StateInvalid",
+ 21: "DBError",
+ 22: "SystemError",
+ 23: "DecodeError",
+ 24: "TimestampTimeout",
+ 25: "PbError",
+ 26: "AgentUidEmpty",
+ 100: "Exception",
+ 101: "Unknown",
+ 102: "ResNoEnough",
+ 103: "ConfigurationException",
+ 104: "ConfigNoFound",
+ 1000: "SecKeyInvalid",
+ 1001: "SecKey",
+ 1002: "BindUser",
+ 1003: "GoldNoEnough",
+ 1004: "DiamondNoEnough",
+ 1005: "RoleCreated",
+ 1006: "UserNickNameExist",
+ 1007: "VeriCodeNoValid",
+ 1008: "VeriCodeExpired",
+ 1009: "UserResetData",
+ 1010: "UserModiNameCount",
+ 1011: "UserNickNameEmpty",
+ 1012: "UserExpandNull",
+ 1100: "FriendNotSelf",
+ 1101: "FriendSelfMax",
+ 1102: "FriendTargetMax",
+ 1103: "FriendSelfNoData",
+ 1104: "FriendTargetNoData",
+ 1105: "FriendYet",
+ 1106: "FriendApplyYet",
+ 1107: "FriendSelfBlackYet",
+ 1108: "FriendTargetBlackYet",
+ 1109: "FriendApplyError",
+ 1110: "FriendBlackMax",
+ 1111: "FriendSearchNameEmpty",
+ 1112: "FriendZaned",
+ 1113: "FriendZanreceived",
+ 1114: "FriendZanSelf",
+ 1115: "FriendPointLimit",
+ 1200: "ItemsNoEnough",
+ 1201: "ItemsNoFoundGird",
+ 1202: "ItemsGridNumUpper",
+ 1203: "ItemsGirdAmountUpper",
+ 1204: "ItemsUseNotSupported",
+ 1300: "HeroNoExist",
+ 1301: "HeroNoEnough",
+ 1302: "HeroMaxLv",
+ 1303: "HeroInitCreat",
+ 1304: "HeroColorErr",
+ 1305: "HeroSkillUpErr",
+ 1306: "HeroMaxResonate",
+ 1307: "HeroNoResonate",
+ 1308: "HeroNotNeedResonate",
+ 1309: "HeroNoEnergy",
+ 1310: "HeroCreate",
+ 1311: "HeroEquipUpdate",
+ 1312: "HeroMaxAwaken",
+ 1313: "HeroIsLock",
+ 1314: "HeroMaxCount",
+ 1315: "HeroCostTypeErr",
+ 1316: "HeroStarErr",
+ 1317: "HeroTypeErr",
+ 1318: "HeroExpTypeErr",
+ 1319: "HeroAddMaxExp",
+ 1320: "HeroStarLvErr",
+ 1321: "HeroMaxStarLv",
+ 1322: "DrawCardTypeNotFound",
+ 1323: "HeroMaxSkillLv",
+ 1400: "EquipmentOnFoundEquipment",
+ 1401: "EquipmentLvlimitReached",
+ 1402: "EquipmentIsWorn",
+ 1500: "MainlineNotFindChapter",
+ 1501: "MainlineIDFailed",
+ 1502: "MainlineNotFound",
+ 1503: "MainlinePreNotFound",
+ 1504: "MainlineRepeatReward",
+ 1505: "MainlineCompleteReward",
+ 1600: "TaskInit",
+ 1601: "TaskReset",
+ 1602: "TaskHandle",
+ 1603: "TaskReceived",
+ 1604: "TaskActiveInit",
+ 1605: "TaskActiveNofound",
+ 1606: "TaskActiveNoenough",
+ 1607: "TaskNoFinished",
+ 1608: "TaskFinished",
+ 1609: "TaskTagEmpty",
+ 1610: "TaskIdEmpty",
+ 1611: "TaskNotFound",
+ 1700: "ShopGoodsIsSoldOut",
+ 1701: "ShopNoSurplusRefreshNum",
+ 1800: "MailErr",
+ 1900: "PagodaNotFound",
+ 1901: "PagodaLevlErr",
+ 1902: "PagodaGetRewardErr",
+ 1903: "PagodaConditionErr",
}
ErrorCode_value = map[string]int32{
"Success": 0,
@@ -360,7 +364,9 @@ var (
"ShopNoSurplusRefreshNum": 1701,
"MailErr": 1800,
"PagodaNotFound": 1900,
- "PagodaLevlErr": 19001,
+ "PagodaLevlErr": 1901,
+ "PagodaGetRewardErr": 1902,
+ "PagodaConditionErr": 1903,
}
)
@@ -395,7 +401,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
var file_errorcode_proto_rawDesc = []byte{
0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
- 0x6f, 0x2a, 0xda, 0x11, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+ 0x6f, 0x2a, 0x8b, 0x12, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d,
0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12,
0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
@@ -535,9 +541,12 @@ var file_errorcode_proto_rawDesc = []byte{
0x4e, 0x6f, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68,
0x4e, 0x75, 0x6d, 0x10, 0xa5, 0x0d, 0x12, 0x0c, 0x0a, 0x07, 0x4d, 0x61, 0x69, 0x6c, 0x45, 0x72,
0x72, 0x10, 0x88, 0x0e, 0x12, 0x13, 0x0a, 0x0e, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x4e, 0x6f,
- 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xec, 0x0e, 0x12, 0x13, 0x0a, 0x0d, 0x50, 0x61, 0x67,
- 0x6f, 0x64, 0x61, 0x4c, 0x65, 0x76, 0x6c, 0x45, 0x72, 0x72, 0x10, 0xb9, 0x94, 0x01, 0x42, 0x06,
- 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xec, 0x0e, 0x12, 0x12, 0x0a, 0x0d, 0x50, 0x61, 0x67,
+ 0x6f, 0x64, 0x61, 0x4c, 0x65, 0x76, 0x6c, 0x45, 0x72, 0x72, 0x10, 0xed, 0x0e, 0x12, 0x17, 0x0a,
+ 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64,
+ 0x45, 0x72, 0x72, 0x10, 0xee, 0x0e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61,
+ 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x72, 0x72, 0x10, 0xef, 0x0e, 0x42,
+ 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
From 6dc481f07dcbfc666d0c575f2c70f710b705aece Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 16 Aug 2022 15:02:44 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E7=BB=99=E8=8B=B1=E9=9B=84=E5=8A=A0?=
=?UTF-8?q?=E7=BB=8F=E9=AA=8C=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
comm/imodule.go | 2 ++
modules/hero/module.go | 22 ++++++++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/comm/imodule.go b/comm/imodule.go
index 8d1022f86..cc11cc821 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -52,6 +52,8 @@ type (
CleanData(uid string)
// 获取指定星级等级的英雄
GetSpecifiedHero(session IUserSession, heroConfId string, star, lv, amount int32) (code pb.ErrorCode)
+ // 英雄加经验
+ AddHeroExp(session IUserSession, heroObjID string, exp int32) (code pb.ErrorCode)
}
//玩家
diff --git a/modules/hero/module.go b/modules/hero/module.go
index 1c01452a5..e9a91c3cd 100644
--- a/modules/hero/module.go
+++ b/modules/hero/module.go
@@ -224,3 +224,25 @@ func (this *Hero) CreateRepeatHeros(session comm.IUserSession, heros map[string]
return
}
+func (this *ModelHero) AddHeroExp(session comm.IUserSession, heroObjID string, exp int32) (code pb.ErrorCode) {
+ var (
+ _hero *pb.DBHero
+ newhero *pb.DBHero
+ _changeHero []*pb.DBHero // 变化的英雄
+ )
+ _hero, code = this.moduleHero.GetHeroByObjID(session.GetUserId(), heroObjID)
+ if code != pb.ErrorCode_Success {
+ return
+ }
+ newhero, code = this.AddCardExp(session.GetUserId(), _hero, exp)
+ if code != pb.ErrorCode_Success {
+ return
+ }
+ _changeHero = append(_changeHero, _hero) // 升级后的英雄 hero id 不变
+ if newhero != nil {
+ _changeHero = append(_changeHero, newhero) // 原来的英雄 只是数量变化了
+ }
+ _changeHero = append(_changeHero, _hero)
+ session.SendMsg(string(this.moduleHero.GetType()), "change", &pb.HeroChangePush{List: _changeHero})
+ return
+}
From 4434f27e4cb7802e90bc0e9256c38b913f86a1e9 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 16 Aug 2022 15:05:12 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=90=8D=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/hero/module.go | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/hero/module.go b/modules/hero/module.go
index e9a91c3cd..47c0bd99a 100644
--- a/modules/hero/module.go
+++ b/modules/hero/module.go
@@ -224,17 +224,17 @@ func (this *Hero) CreateRepeatHeros(session comm.IUserSession, heros map[string]
return
}
-func (this *ModelHero) AddHeroExp(session comm.IUserSession, heroObjID string, exp int32) (code pb.ErrorCode) {
+func (this *Hero) AddHeroExp(session comm.IUserSession, heroObjID string, exp int32) (code pb.ErrorCode) {
var (
_hero *pb.DBHero
newhero *pb.DBHero
_changeHero []*pb.DBHero // 变化的英雄
)
- _hero, code = this.moduleHero.GetHeroByObjID(session.GetUserId(), heroObjID)
+ _hero, code = this.GetHeroByObjID(session.GetUserId(), heroObjID)
if code != pb.ErrorCode_Success {
return
}
- newhero, code = this.AddCardExp(session.GetUserId(), _hero, exp)
+ newhero, code = this.modelHero.AddCardExp(session.GetUserId(), _hero, exp)
if code != pb.ErrorCode_Success {
return
}
@@ -243,6 +243,6 @@ func (this *ModelHero) AddHeroExp(session comm.IUserSession, heroObjID string, e
_changeHero = append(_changeHero, newhero) // 原来的英雄 只是数量变化了
}
_changeHero = append(_changeHero, _hero)
- session.SendMsg(string(this.moduleHero.GetType()), "change", &pb.HeroChangePush{List: _changeHero})
+ session.SendMsg(string(this.GetType()), "change", &pb.HeroChangePush{List: _changeHero})
return
}
From 61c9f00eaabc31e2b46edf73f3a6d6811ec0f683 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 16 Aug 2022 16:22:35 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E6=8A=BD=E5=8D=A1=E6=8E=A8=E9=80=81?=
=?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8D=A1=E4=BF=A1=E6=81=AF=20=E7=BE=8E?=
=?UTF-8?q?=E9=A3=9F=E5=AE=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/gourmet/comp_configure.go | 68 +++++++++++++------------------
1 file changed, 28 insertions(+), 40 deletions(-)
diff --git a/modules/gourmet/comp_configure.go b/modules/gourmet/comp_configure.go
index 6f799573f..fcb2ff04d 100644
--- a/modules/gourmet/comp_configure.go
+++ b/modules/gourmet/comp_configure.go
@@ -10,35 +10,45 @@ import (
)
const (
- game_pagoda = "game_pagoda.json"
- game_pagodaseasonreward = "game_pagodaseasonreward.json"
- game_pagodataskreward = "game_pagodataskreward.json"
+ game_gourmet = "game_gourmet.json"
+ game_gourmetskill = "game_gourmetskill.json"
)
///配置管理基础组件
type configureComp struct {
cbase.ModuleCompBase
- hlock sync.RWMutex
- _pagodaMap map[int64]*cfg.GamepagodaData
+ hlock sync.RWMutex
+ _gourmetMap map[int64]*cfg.GameGourmetData
+ _gourmetSkillMap map[int64]*cfg.GameGourmetSkillData
}
//组件初始化接口
func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
err = this.ModuleCompBase.Init(service, module, comp, options)
- err = this.LoadMultiConfigure(map[string]interface{}{
- //game_pagoda: cfg.NewGame_pagoda,
- game_pagodaseasonreward: cfg.NewGamepagodaSeasonReward,
- game_pagodataskreward: cfg.NewGamepagodaTaskReward,
- })
- this._pagodaMap = make(map[int64]*cfg.GamepagodaData, 0)
- configure.RegisterConfigure(game_pagoda, cfg.NewGamepagoda, func() {
- if v, err := this.GetConfigure(game_pagoda); err == nil {
- if configure, ok := v.(*cfg.Gamepagoda); ok {
+ this._gourmetMap = make(map[int64]*cfg.GameGourmetData, 0)
+ configure.RegisterConfigure(game_gourmet, cfg.NewGameGourmet, func() {
+ if v, err := this.GetConfigure(game_gourmet); err == nil {
+ if configure, ok := v.(*cfg.GameGourmet); ok {
this.hlock.Lock()
defer this.hlock.Unlock()
for _, value := range configure.GetDataList() {
- this._pagodaMap[int64(value.PagodaType<<16)+int64(value.LayerNum)] = value
+ this._gourmetMap[int64(value.Type<<16)+int64(value.Level)] = value
+ }
+ return
+ }
+ }
+ log.Errorf("get game_pagoda conf err:%v", err)
+ return
+ })
+ this._gourmetSkillMap = make(map[int64]*cfg.GameGourmetSkillData, 0)
+ configure.RegisterConfigure(game_gourmetskill, cfg.NewGameGourmetSkill, func() {
+ if v, err := this.GetConfigure(game_gourmetskill); err == nil {
+ if configure, ok := v.(*cfg.GameGourmetSkill); ok {
+ this.hlock.Lock()
+ defer this.hlock.Unlock()
+ for _, value := range configure.GetDataList() {
+ this._gourmetSkillMap[int64(value.Type<<16)+int64(value.Level)] = value
}
return
}
@@ -49,10 +59,10 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
return
}
-// 获取爬塔信息 参数1 塔类型 参数2 层数
-func (this *configureComp) GetPagodaConfigData(PagodaType int32, floorId int32) (data *cfg.GamepagodaData) {
+// 获取美食馆配置数据
+func (this *configureComp) GetGourmetConfigData(gourmetType int32, level int32) (data *cfg.GameGourmetData) {
- return this._pagodaMap[int64(PagodaType<<16)+int64(floorId)]
+ return this._gourmetMap[int64(gourmetType<<16)+int64(level)]
}
//加载多个配置文件
@@ -71,25 +81,3 @@ func (this *configureComp) LoadMultiConfigure(confs map[string]interface{}) (err
func (this *configureComp) GetConfigure(name string) (v interface{}, err error) {
return configure.GetConfigure(name)
}
-
-// 获取爬塔配置表数据
-func (this *configureComp) GetPagodaconfig(id int32) (data *cfg.GamepagodaData) {
- if v, err := this.GetConfigure(game_pagoda); err != nil {
- log.Errorf("get global conf err:%v", err)
- return
- } else {
- var (
- configure *cfg.Gamepagoda
- ok bool
- )
- if configure, ok = v.(*cfg.Gamepagoda); !ok {
- log.Errorf("%T no is *cfg.Game_pagodaData", v)
- return
- }
-
- if data, ok = configure.GetDataMap()[id]; ok {
- return
- }
- }
- return
-}
From 8b7822b836d4203ad51e0c3965683de66181d0fb Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 16 Aug 2022 16:24:04 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E6=8A=BD=E5=8D=A1=E6=8E=A8=E9=80=81?=
=?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=8B=B1=E9=9B=84=E6=95=B0=E6=8D=AE=20?=
=?UTF-8?q?=E7=BE=8E=E9=A3=9F=E5=AE=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bin/json/game_gourmet.json | 386 +++++++++
bin/json/game_gourmetskill.json | 738 ++++++++++++++++++
modules/gourmet/api_createorder.go | 25 +
modules/gourmet/api_getReward.go | 12 +-
modules/gourmet/api_getlist.go | 6 +-
modules/hero/api_drawCard.go | 30 +-
pb/gourmet_db.pb.go | 307 ++++++++
pb/gourmet_msg.pb.go | 451 +++++++++++
sys/configure/structs/game.Gourmet.go | 42 +
sys/configure/structs/game.GourmetData.go | 66 ++
sys/configure/structs/game.GourmetSkill.go | 42 +
.../structs/game.GourmetSkillData.go | 89 +++
12 files changed, 2169 insertions(+), 25 deletions(-)
create mode 100644 bin/json/game_gourmet.json
create mode 100644 bin/json/game_gourmetskill.json
create mode 100644 modules/gourmet/api_createorder.go
create mode 100644 pb/gourmet_db.pb.go
create mode 100644 pb/gourmet_msg.pb.go
create mode 100644 sys/configure/structs/game.Gourmet.go
create mode 100644 sys/configure/structs/game.GourmetData.go
create mode 100644 sys/configure/structs/game.GourmetSkill.go
create mode 100644 sys/configure/structs/game.GourmetSkillData.go
diff --git a/bin/json/game_gourmet.json b/bin/json/game_gourmet.json
new file mode 100644
index 000000000..822bc5720
--- /dev/null
+++ b/bin/json/game_gourmet.json
@@ -0,0 +1,386 @@
+[
+ {
+ "id": 1,
+ "type": 1001,
+ "level": 1,
+ "levelname": {
+ "key": "gourmet_ln1",
+ "text": "马马虎虎"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_1001",
+ "text": "魔法料理"
+ },
+ "picture": "ty_wz_k1",
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "using": 1,
+ "propsgroup": 10001
+ },
+ {
+ "id": 2,
+ "type": 1001,
+ "level": 2,
+ "levelname": {
+ "key": "gourmet_ln2",
+ "text": "匠心独运"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_1001",
+ "text": "魔法料理"
+ },
+ "picture": "ty_wz_k1",
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "using": 1,
+ "propsgroup": 10001
+ },
+ {
+ "id": 3,
+ "type": 1001,
+ "level": 3,
+ "levelname": {
+ "key": "gourmet_ln3",
+ "text": "孰能生巧"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_1001",
+ "text": "魔法料理"
+ },
+ "picture": "ty_wz_k1",
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "using": 1,
+ "propsgroup": 10001
+ },
+ {
+ "id": 4,
+ "type": 1001,
+ "level": 4,
+ "levelname": {
+ "key": "gourmet_ln4",
+ "text": "可圈可点"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_1001",
+ "text": "魔法料理"
+ },
+ "picture": "ty_wz_k1",
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "using": 1,
+ "propsgroup": 10001
+ },
+ {
+ "id": 5,
+ "type": 1002,
+ "level": 1,
+ "levelname": {
+ "key": "gourmet_ln1",
+ "text": "马马虎虎"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_1002",
+ "text": "功夫料理"
+ },
+ "picture": "ty_wz_k2",
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "using": 1,
+ "propsgroup": 10001
+ },
+ {
+ "id": 6,
+ "type": 1002,
+ "level": 2,
+ "levelname": {
+ "key": "gourmet_ln2",
+ "text": "匠心独运"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_1002",
+ "text": "功夫料理"
+ },
+ "picture": "ty_wz_k2",
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "using": 1,
+ "propsgroup": 10001
+ },
+ {
+ "id": 7,
+ "type": 1002,
+ "level": 3,
+ "levelname": {
+ "key": "gourmet_ln3",
+ "text": "孰能生巧"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_1002",
+ "text": "功夫料理"
+ },
+ "picture": "ty_wz_k2",
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "using": 1,
+ "propsgroup": 10001
+ },
+ {
+ "id": 8,
+ "type": 1002,
+ "level": 4,
+ "levelname": {
+ "key": "gourmet_ln4",
+ "text": "可圈可点"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_1002",
+ "text": "功夫料理"
+ },
+ "picture": "ty_wz_k2",
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "using": 1,
+ "propsgroup": 10001
+ },
+ {
+ "id": 9,
+ "type": 1003,
+ "level": 1,
+ "levelname": {
+ "key": "gourmet_ln1",
+ "text": "马马虎虎"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_1003",
+ "text": "科技料理"
+ },
+ "picture": "ty_wz_k3",
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "using": 1,
+ "propsgroup": 10001
+ },
+ {
+ "id": 10,
+ "type": 1003,
+ "level": 2,
+ "levelname": {
+ "key": "gourmet_ln2",
+ "text": "匠心独运"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_1003",
+ "text": "科技料理"
+ },
+ "picture": "ty_wz_k3",
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "using": 1,
+ "propsgroup": 10001
+ },
+ {
+ "id": 11,
+ "type": 1003,
+ "level": 3,
+ "levelname": {
+ "key": "gourmet_ln3",
+ "text": "孰能生巧"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_1003",
+ "text": "科技料理"
+ },
+ "picture": "ty_wz_k3",
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "using": 1,
+ "propsgroup": 10001
+ },
+ {
+ "id": 12,
+ "type": 1003,
+ "level": 4,
+ "levelname": {
+ "key": "gourmet_ln4",
+ "text": "可圈可点"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_1003",
+ "text": "科技料理"
+ },
+ "picture": "ty_wz_k3",
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "using": 1,
+ "propsgroup": 10001
+ },
+ {
+ "id": 13,
+ "type": 1004,
+ "level": 1,
+ "levelname": {
+ "key": "gourmet_ln1",
+ "text": "马马虎虎"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_1004",
+ "text": "月能料理"
+ },
+ "picture": "ty_wz_k4",
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "using": 1,
+ "propsgroup": 10001
+ },
+ {
+ "id": 14,
+ "type": 1004,
+ "level": 2,
+ "levelname": {
+ "key": "gourmet_ln2",
+ "text": "匠心独运"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_1004",
+ "text": "月能料理"
+ },
+ "picture": "ty_wz_k4",
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "using": 1,
+ "propsgroup": 10001
+ },
+ {
+ "id": 15,
+ "type": 1004,
+ "level": 3,
+ "levelname": {
+ "key": "gourmet_ln3",
+ "text": "孰能生巧"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_1004",
+ "text": "月能料理"
+ },
+ "picture": "ty_wz_k4",
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "using": 1,
+ "propsgroup": 10001
+ },
+ {
+ "id": 16,
+ "type": 1004,
+ "level": 4,
+ "levelname": {
+ "key": "gourmet_ln4",
+ "text": "可圈可点"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_1004",
+ "text": "月能料理"
+ },
+ "picture": "ty_wz_k4",
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "using": 1,
+ "propsgroup": 10001
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_gourmetskill.json b/bin/json/game_gourmetskill.json
new file mode 100644
index 000000000..efd243c55
--- /dev/null
+++ b/bin/json/game_gourmetskill.json
@@ -0,0 +1,738 @@
+[
+ {
+ "id": 10011,
+ "type": 1001,
+ "initial": 1,
+ "level": 1,
+ "levelname": {
+ "key": "gourmet_ln1",
+ "text": "马马虎虎"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_ln1",
+ "text": "魔法厨艺"
+ },
+ "needtime": 60,
+ "display": 1000,
+ "probability": 1000,
+ "icon": "ty_wz_k1",
+ "item": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "affix": {
+ "key": "gourmet_ln1",
+ "text": "无"
+ },
+ "affix_colour": 0,
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 10012,
+ "type": 1001,
+ "initial": 0,
+ "level": 2,
+ "levelname": {
+ "key": "gourmet_ln2",
+ "text": "匠心独运"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_ln2",
+ "text": "魔法厨艺"
+ },
+ "needtime": 120,
+ "display": 1000,
+ "probability": 500,
+ "icon": "ty_wz_k1",
+ "item": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "affix": {
+ "key": "gourmet_ln2",
+ "text": "极低"
+ },
+ "affix_colour": 0,
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 10013,
+ "type": 1001,
+ "initial": 0,
+ "level": 3,
+ "levelname": {
+ "key": "gourmet_ln3",
+ "text": "孰能生巧"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_ln3",
+ "text": "魔法厨艺"
+ },
+ "needtime": 240,
+ "display": 1000,
+ "probability": 20,
+ "icon": "ty_wz_k1",
+ "item": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "affix": {
+ "key": "gourmet_ln3",
+ "text": "中等"
+ },
+ "affix_colour": 0,
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 10014,
+ "type": 1001,
+ "initial": 0,
+ "level": 4,
+ "levelname": {
+ "key": "gourmet_ln4",
+ "text": "可圈可点"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_ln4",
+ "text": "魔法厨艺"
+ },
+ "needtime": 480,
+ "display": 1000,
+ "probability": 10,
+ "icon": "ty_wz_k1",
+ "item": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "affix": {
+ "key": "gourmet_ln4",
+ "text": "较高"
+ },
+ "affix_colour": 0,
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 10021,
+ "type": 1002,
+ "initial": 1,
+ "level": 1,
+ "levelname": {
+ "key": "gourmet_ln1",
+ "text": "马马虎虎"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_ln1",
+ "text": "功夫厨艺"
+ },
+ "needtime": 60,
+ "display": 1000,
+ "probability": 1000,
+ "icon": "ty_wz_k1",
+ "item": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "affix": {
+ "key": "gourmet_ln1",
+ "text": "无"
+ },
+ "affix_colour": 0,
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 10022,
+ "type": 1002,
+ "initial": 0,
+ "level": 2,
+ "levelname": {
+ "key": "gourmet_ln2",
+ "text": "匠心独运"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_ln2",
+ "text": "功夫厨艺"
+ },
+ "needtime": 120,
+ "display": 1000,
+ "probability": 500,
+ "icon": "ty_wz_k1",
+ "item": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "affix": {
+ "key": "gourmet_ln2",
+ "text": "极低"
+ },
+ "affix_colour": 0,
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 10023,
+ "type": 1002,
+ "initial": 0,
+ "level": 3,
+ "levelname": {
+ "key": "gourmet_ln3",
+ "text": "孰能生巧"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_ln3",
+ "text": "功夫厨艺"
+ },
+ "needtime": 240,
+ "display": 1000,
+ "probability": 20,
+ "icon": "ty_wz_k1",
+ "item": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "affix": {
+ "key": "gourmet_ln3",
+ "text": "中等"
+ },
+ "affix_colour": 0,
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 10024,
+ "type": 1002,
+ "initial": 0,
+ "level": 4,
+ "levelname": {
+ "key": "gourmet_ln4",
+ "text": "可圈可点"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_ln4",
+ "text": "功夫厨艺"
+ },
+ "needtime": 480,
+ "display": 1000,
+ "probability": 10,
+ "icon": "ty_wz_k1",
+ "item": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "affix": {
+ "key": "gourmet_ln4",
+ "text": "较高"
+ },
+ "affix_colour": 0,
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 10031,
+ "type": 1003,
+ "initial": 1,
+ "level": 1,
+ "levelname": {
+ "key": "gourmet_ln1",
+ "text": "马马虎虎"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_ln1",
+ "text": "科技厨艺"
+ },
+ "needtime": 60,
+ "display": 1000,
+ "probability": 1000,
+ "icon": "ty_wz_k1",
+ "item": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "affix": {
+ "key": "gourmet_ln1",
+ "text": "无"
+ },
+ "affix_colour": 0,
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 10032,
+ "type": 1003,
+ "initial": 0,
+ "level": 2,
+ "levelname": {
+ "key": "gourmet_ln2",
+ "text": "匠心独运"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_ln2",
+ "text": "科技厨艺"
+ },
+ "needtime": 120,
+ "display": 1000,
+ "probability": 500,
+ "icon": "ty_wz_k1",
+ "item": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "affix": {
+ "key": "gourmet_ln2",
+ "text": "极低"
+ },
+ "affix_colour": 0,
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 10033,
+ "type": 1003,
+ "initial": 0,
+ "level": 3,
+ "levelname": {
+ "key": "gourmet_ln3",
+ "text": "孰能生巧"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_ln3",
+ "text": "科技厨艺"
+ },
+ "needtime": 240,
+ "display": 1000,
+ "probability": 20,
+ "icon": "ty_wz_k1",
+ "item": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "affix": {
+ "key": "gourmet_ln3",
+ "text": "中等"
+ },
+ "affix_colour": 0,
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 10034,
+ "type": 1003,
+ "initial": 0,
+ "level": 4,
+ "levelname": {
+ "key": "gourmet_ln4",
+ "text": "可圈可点"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_ln4",
+ "text": "科技厨艺"
+ },
+ "needtime": 480,
+ "display": 1000,
+ "probability": 10,
+ "icon": "ty_wz_k1",
+ "item": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "affix": {
+ "key": "gourmet_ln4",
+ "text": "较高"
+ },
+ "affix_colour": 0,
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 10041,
+ "type": 1004,
+ "initial": 1,
+ "level": 1,
+ "levelname": {
+ "key": "gourmet_ln1",
+ "text": "马马虎虎"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_ln1",
+ "text": "月能厨艺"
+ },
+ "needtime": 60,
+ "display": 1000,
+ "probability": 1000,
+ "icon": "ty_wz_k1",
+ "item": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "affix": {
+ "key": "gourmet_ln1",
+ "text": "无"
+ },
+ "affix_colour": 0,
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 10042,
+ "type": 1004,
+ "initial": 0,
+ "level": 2,
+ "levelname": {
+ "key": "gourmet_ln2",
+ "text": "匠心独运"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_ln2",
+ "text": "月能厨艺"
+ },
+ "needtime": 120,
+ "display": 1000,
+ "probability": 500,
+ "icon": "ty_wz_k1",
+ "item": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "affix": {
+ "key": "gourmet_ln2",
+ "text": "极低"
+ },
+ "affix_colour": 0,
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 10043,
+ "type": 1004,
+ "initial": 0,
+ "level": 3,
+ "levelname": {
+ "key": "gourmet_ln3",
+ "text": "孰能生巧"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_ln3",
+ "text": "月能厨艺"
+ },
+ "needtime": 240,
+ "display": 1000,
+ "probability": 20,
+ "icon": "ty_wz_k1",
+ "item": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "affix": {
+ "key": "gourmet_ln3",
+ "text": "中等"
+ },
+ "affix_colour": 0,
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 10044,
+ "type": 1004,
+ "initial": 0,
+ "level": 4,
+ "levelname": {
+ "key": "gourmet_ln4",
+ "text": "可圈可点"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_ln4",
+ "text": "月能厨艺"
+ },
+ "needtime": 480,
+ "display": 1000,
+ "probability": 10,
+ "icon": "ty_wz_k1",
+ "item": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "affix": {
+ "key": "gourmet_ln4",
+ "text": "较高"
+ },
+ "affix_colour": 0,
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 10051,
+ "type": 1005,
+ "initial": 0,
+ "level": 1,
+ "levelname": {
+ "key": "gourmet_ln1",
+ "text": "马马虎虎"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_ln1",
+ "text": "高效制作"
+ },
+ "needtime": -5,
+ "display": 1000,
+ "probability": 1000,
+ "icon": "ty_wz_k1",
+ "item": [],
+ "affix": {
+ "key": "gourmet_ln1",
+ "text": "出餐时间-5分钟"
+ },
+ "affix_colour": 0,
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 10052,
+ "type": 1005,
+ "initial": 0,
+ "level": 2,
+ "levelname": {
+ "key": "gourmet_ln2",
+ "text": "匠心独运"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_ln2",
+ "text": "高效制作"
+ },
+ "needtime": -10,
+ "display": 1000,
+ "probability": 500,
+ "icon": "ty_wz_k1",
+ "item": [],
+ "affix": {
+ "key": "gourmet_ln2",
+ "text": "出餐时间-10分钟"
+ },
+ "affix_colour": 0,
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 10053,
+ "type": 1005,
+ "initial": 0,
+ "level": 3,
+ "levelname": {
+ "key": "gourmet_ln3",
+ "text": "孰能生巧"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_ln3",
+ "text": "高效制作"
+ },
+ "needtime": -15,
+ "display": 1000,
+ "probability": 20,
+ "icon": "ty_wz_k1",
+ "item": [],
+ "affix": {
+ "key": "gourmet_ln3",
+ "text": "出餐时间-15分钟"
+ },
+ "affix_colour": 0,
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 10054,
+ "type": 1005,
+ "initial": 0,
+ "level": 4,
+ "levelname": {
+ "key": "gourmet_ln4",
+ "text": "可圈可点"
+ },
+ "colour": 0,
+ "name": {
+ "key": "gourmet_ln4",
+ "text": "高效制作"
+ },
+ "needtime": -20,
+ "display": 1000,
+ "probability": 10,
+ "icon": "ty_wz_k1",
+ "item": [],
+ "affix": {
+ "key": "gourmet_ln4",
+ "text": "出餐时间-20分钟"
+ },
+ "affix_colour": 0,
+ "consume": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ]
+ }
+]
\ No newline at end of file
diff --git a/modules/gourmet/api_createorder.go b/modules/gourmet/api_createorder.go
new file mode 100644
index 000000000..a23326c0a
--- /dev/null
+++ b/modules/gourmet/api_createorder.go
@@ -0,0 +1,25 @@
+package gourmet
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+
+ "google.golang.org/protobuf/proto"
+)
+
+//参数校验
+func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.GourmetGetRewardReq) (code pb.ErrorCode) {
+
+ return
+}
+
+///美食城领取奖励
+func (this *apiComp) GetReward(session comm.IUserSession, req *pb.GourmetGetRewardReq) (code pb.ErrorCode, data proto.Message) {
+
+ code = this.GetRewardCheck(session, req)
+ if code != pb.ErrorCode_Success {
+ return // 参数校验失败直接返回
+ }
+
+ return
+}
diff --git a/modules/gourmet/api_getReward.go b/modules/gourmet/api_getReward.go
index e8b9d36a7..1772b1857 100644
--- a/modules/gourmet/api_getReward.go
+++ b/modules/gourmet/api_getReward.go
@@ -8,17 +8,15 @@ import (
)
//参数校验
-func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.PagodaGetRewardReq) (code pb.ErrorCode) {
- if req.Id <= 0 {
- code = pb.ErrorCode_ReqParameterError
- }
+func (this *apiComp) CreateOrderCheck(session comm.IUserSession, req *pb.GourmetCreateOrderReq) (code pb.ErrorCode) {
+
return
}
-///获取主线关卡信息
-func (this *apiComp) GetReward(session comm.IUserSession, req *pb.PagodaGetRewardReq) (code pb.ErrorCode, data proto.Message) {
+///美食城创建订单
+func (this *apiComp) CreateOrder(session comm.IUserSession, req *pb.GourmetCreateOrderReq) (code pb.ErrorCode, data proto.Message) {
- code = this.GetRewardCheck(session, req)
+ code = this.CreateOrderCheck(session, req)
if code != pb.ErrorCode_Success {
return // 参数校验失败直接返回
}
diff --git a/modules/gourmet/api_getlist.go b/modules/gourmet/api_getlist.go
index 466147b62..11270ec92 100644
--- a/modules/gourmet/api_getlist.go
+++ b/modules/gourmet/api_getlist.go
@@ -8,13 +8,13 @@ import (
)
//参数校验
-func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.PagodaGetListReq) (code pb.ErrorCode) {
+func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.GourmetGetListReq) (code pb.ErrorCode) {
return
}
-///获取主线关卡信息
-func (this *apiComp) GetList(session comm.IUserSession, req *pb.PagodaGetListReq) (code pb.ErrorCode, data proto.Message) {
+///获取美食城基本信息
+func (this *apiComp) GetList(session comm.IUserSession, req *pb.GourmetGetListReq) (code pb.ErrorCode, data proto.Message) {
return
}
diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go
index 9ef71b437..7106ed0fe 100644
--- a/modules/hero/api_drawCard.go
+++ b/modules/hero/api_drawCard.go
@@ -18,19 +18,19 @@ func (this *apiComp) DrawCardCheck(session comm.IUserSession, req *pb.HeroDrawCa
//抽卡
func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq) (code pb.ErrorCode, data proto.Message) {
var (
- szCards []string // 最终抽到的卡牌
- drawCount int32 // 抽卡次数
- szStar []int32 //星级
- costRes []*cfg.Gameatn
- star4Max int32 // 10连抽最大4星数量
- star5Max int32 // 10连抽最大5星数量
- cfgDraw *cfg.GameglobalData
- costAtn *cfg.Gameatn
- heroRecord *pb.DBHeroRecord
- pool string
- //heroRecord *pb.DBHeroRecord // 英雄扩展属性
+ szCards []string // 最终抽到的卡牌
+ drawCount int32 // 抽卡次数
+ szStar []int32 //星级
+ costRes []*cfg.Gameatn
+ star4Max int32 // 10连抽最大4星数量
+ star5Max int32 // 10连抽最大5星数量
+ cfgDraw *cfg.GameglobalData
+ costAtn *cfg.Gameatn
+ heroRecord *pb.DBHeroRecord
+ pool string
+ _mapAddHero map[string]int32
)
- // test
+ _mapAddHero = make(map[string]int32, 0)
cfgDraw = this.module.configure.GetGlobalConf() // 读取抽卡配置文件
if cfgDraw == nil {
return
@@ -184,10 +184,10 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
if code != pb.ErrorCode_Success {
return
}
- if err := this.module.modelHero.createMultiHero(session.GetUserId(), szCards...); err != nil {
- code = pb.ErrorCode_HeroCreate
- return
+ for _, heroId := range szCards {
+ _mapAddHero[heroId]++
}
+ code = this.module.CreateRepeatHeros(session, _mapAddHero, true)
rsp.Heroes = szCards
session.SendMsg(string(this.module.GetType()), DrawCard, rsp)
diff --git a/pb/gourmet_db.pb.go b/pb/gourmet_db.pb.go
new file mode 100644
index 000000000..d07deecf4
--- /dev/null
+++ b/pb/gourmet_db.pb.go
@@ -0,0 +1,307 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// protoc-gen-go v1.28.0
+// protoc v3.20.0
+// source: gourmet/gourmet_db.proto
+
+package pb
+
+import (
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+ reflect "reflect"
+ sync "sync"
+)
+
+const (
+ // Verify that this generated code is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+ // Verify that runtime/protoimpl is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+// 烹饪
+type Cooking struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ FoodType int32 `protobuf:"varint,1,opt,name=foodType,proto3" json:"foodType"` // 料理类型
+ FoodCount int32 `protobuf:"varint,2,opt,name=foodCount,proto3" json:"foodCount"` // 料理数量
+ CookTime int32 `protobuf:"varint,3,opt,name=cookTime,proto3" json:"cookTime"` // 烹饪时间
+}
+
+func (x *Cooking) Reset() {
+ *x = Cooking{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_gourmet_gourmet_db_proto_msgTypes[0]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *Cooking) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Cooking) ProtoMessage() {}
+
+func (x *Cooking) ProtoReflect() protoreflect.Message {
+ mi := &file_gourmet_gourmet_db_proto_msgTypes[0]
+ 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 Cooking.ProtoReflect.Descriptor instead.
+func (*Cooking) Descriptor() ([]byte, []int) {
+ return file_gourmet_gourmet_db_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *Cooking) GetFoodType() int32 {
+ if x != nil {
+ return x.FoodType
+ }
+ return 0
+}
+
+func (x *Cooking) GetFoodCount() int32 {
+ if x != nil {
+ return x.FoodCount
+ }
+ return 0
+}
+
+func (x *Cooking) GetCookTime() int32 {
+ if x != nil {
+ return x.CookTime
+ }
+ return 0
+}
+
+type DBGourmet struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
+ Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID
+ CookingFood *Cooking `protobuf:"bytes,3,opt,name=cookingFood,proto3" json:"cookingFood"` // 正在烹饪的食品
+ Foods []*Cooking `protobuf:"bytes,4,rep,name=foods,proto3" json:"foods"` // 等待烹饪的食品
+ Items []*UserAssets `protobuf:"bytes,5,rep,name=items,proto3" json:"items"` // 已经做好的食品
+ Skilllv map[int32]int32 `protobuf:"bytes,6,rep,name=skilllv,proto3" json:"skilllv" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 技能等级
+ Ordercosttime int32 `protobuf:"varint,7,opt,name=ordercosttime,proto3" json:"ordercosttime"` // 订单消耗的时常
+ Ctime int64 `protobuf:"varint,8,opt,name=ctime,proto3" json:"ctime"` // 订单创建时间
+}
+
+func (x *DBGourmet) Reset() {
+ *x = DBGourmet{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_gourmet_gourmet_db_proto_msgTypes[1]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *DBGourmet) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBGourmet) ProtoMessage() {}
+
+func (x *DBGourmet) ProtoReflect() protoreflect.Message {
+ mi := &file_gourmet_gourmet_db_proto_msgTypes[1]
+ 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 DBGourmet.ProtoReflect.Descriptor instead.
+func (*DBGourmet) Descriptor() ([]byte, []int) {
+ return file_gourmet_gourmet_db_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *DBGourmet) GetId() string {
+ if x != nil {
+ return x.Id
+ }
+ return ""
+}
+
+func (x *DBGourmet) GetUid() string {
+ if x != nil {
+ return x.Uid
+ }
+ return ""
+}
+
+func (x *DBGourmet) GetCookingFood() *Cooking {
+ if x != nil {
+ return x.CookingFood
+ }
+ return nil
+}
+
+func (x *DBGourmet) GetFoods() []*Cooking {
+ if x != nil {
+ return x.Foods
+ }
+ return nil
+}
+
+func (x *DBGourmet) GetItems() []*UserAssets {
+ if x != nil {
+ return x.Items
+ }
+ return nil
+}
+
+func (x *DBGourmet) GetSkilllv() map[int32]int32 {
+ if x != nil {
+ return x.Skilllv
+ }
+ return nil
+}
+
+func (x *DBGourmet) GetOrdercosttime() int32 {
+ if x != nil {
+ return x.Ordercosttime
+ }
+ return 0
+}
+
+func (x *DBGourmet) GetCtime() int64 {
+ if x != nil {
+ return x.Ctime
+ }
+ return 0
+}
+
+var File_gourmet_gourmet_db_proto protoreflect.FileDescriptor
+
+var file_gourmet_gourmet_db_proto_rawDesc = []byte{
+ 0x0a, 0x18, 0x67, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x2f, 0x67, 0x6f, 0x75, 0x72, 0x6d, 0x65,
+ 0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d,
+ 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x5f, 0x0a, 0x07, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x6e,
+ 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x6f, 0x6f, 0x64, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x6f, 0x6f, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a,
+ 0x09, 0x66, 0x6f, 0x6f, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x09, 0x66, 0x6f, 0x6f, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x63,
+ 0x6f, 0x6f, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63,
+ 0x6f, 0x6f, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x22, 0xc7, 0x02, 0x0a, 0x09, 0x44, 0x42, 0x47, 0x6f,
+ 0x75, 0x72, 0x6d, 0x65, 0x74, 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, 0x2a, 0x0a, 0x0b, 0x63, 0x6f, 0x6f, 0x6b, 0x69,
+ 0x6e, 0x67, 0x46, 0x6f, 0x6f, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x43,
+ 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x0b, 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x46,
+ 0x6f, 0x6f, 0x64, 0x12, 0x1e, 0x0a, 0x05, 0x66, 0x6f, 0x6f, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03,
+ 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x05, 0x66, 0x6f,
+ 0x6f, 0x64, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03,
+ 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52,
+ 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x31, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x6c,
+ 0x76, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x47, 0x6f, 0x75, 0x72,
+ 0x6d, 0x65, 0x74, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x6c, 0x76, 0x45, 0x6e, 0x74, 0x72, 0x79,
+ 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x6c, 0x76, 0x12, 0x24, 0x0a, 0x0d, 0x6f, 0x72, 0x64,
+ 0x65, 0x72, 0x63, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x63, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12,
+ 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
+ 0x63, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x3a, 0x0a, 0x0c, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x6c, 0x76,
+ 0x45, 0x6e, 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, 0x05, 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 (
+ file_gourmet_gourmet_db_proto_rawDescOnce sync.Once
+ file_gourmet_gourmet_db_proto_rawDescData = file_gourmet_gourmet_db_proto_rawDesc
+)
+
+func file_gourmet_gourmet_db_proto_rawDescGZIP() []byte {
+ file_gourmet_gourmet_db_proto_rawDescOnce.Do(func() {
+ file_gourmet_gourmet_db_proto_rawDescData = protoimpl.X.CompressGZIP(file_gourmet_gourmet_db_proto_rawDescData)
+ })
+ return file_gourmet_gourmet_db_proto_rawDescData
+}
+
+var file_gourmet_gourmet_db_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_gourmet_gourmet_db_proto_goTypes = []interface{}{
+ (*Cooking)(nil), // 0: Cooking
+ (*DBGourmet)(nil), // 1: DBGourmet
+ nil, // 2: DBGourmet.SkilllvEntry
+ (*UserAssets)(nil), // 3: UserAssets
+}
+var file_gourmet_gourmet_db_proto_depIdxs = []int32{
+ 0, // 0: DBGourmet.cookingFood:type_name -> Cooking
+ 0, // 1: DBGourmet.foods:type_name -> Cooking
+ 3, // 2: DBGourmet.items:type_name -> UserAssets
+ 2, // 3: DBGourmet.skilllv:type_name -> DBGourmet.SkilllvEntry
+ 4, // [4:4] is the sub-list for method output_type
+ 4, // [4:4] is the sub-list for method input_type
+ 4, // [4:4] is the sub-list for extension type_name
+ 4, // [4:4] is the sub-list for extension extendee
+ 0, // [0:4] is the sub-list for field type_name
+}
+
+func init() { file_gourmet_gourmet_db_proto_init() }
+func file_gourmet_gourmet_db_proto_init() {
+ if File_gourmet_gourmet_db_proto != nil {
+ return
+ }
+ file_comm_proto_init()
+ if !protoimpl.UnsafeEnabled {
+ file_gourmet_gourmet_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*Cooking); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_gourmet_gourmet_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*DBGourmet); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ }
+ type x struct{}
+ out := protoimpl.TypeBuilder{
+ File: protoimpl.DescBuilder{
+ GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+ RawDescriptor: file_gourmet_gourmet_db_proto_rawDesc,
+ NumEnums: 0,
+ NumMessages: 3,
+ NumExtensions: 0,
+ NumServices: 0,
+ },
+ GoTypes: file_gourmet_gourmet_db_proto_goTypes,
+ DependencyIndexes: file_gourmet_gourmet_db_proto_depIdxs,
+ MessageInfos: file_gourmet_gourmet_db_proto_msgTypes,
+ }.Build()
+ File_gourmet_gourmet_db_proto = out.File
+ file_gourmet_gourmet_db_proto_rawDesc = nil
+ file_gourmet_gourmet_db_proto_goTypes = nil
+ file_gourmet_gourmet_db_proto_depIdxs = nil
+}
diff --git a/pb/gourmet_msg.pb.go b/pb/gourmet_msg.pb.go
new file mode 100644
index 000000000..de860132c
--- /dev/null
+++ b/pb/gourmet_msg.pb.go
@@ -0,0 +1,451 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// protoc-gen-go v1.28.0
+// protoc v3.20.0
+// source: gourmet/gourmet_msg.proto
+
+package pb
+
+import (
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+ reflect "reflect"
+ sync "sync"
+)
+
+const (
+ // Verify that this generated code is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+ // Verify that runtime/protoimpl is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+// 查询塔进度
+type GourmetGetListReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+}
+
+func (x *GourmetGetListReq) Reset() {
+ *x = GourmetGetListReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[0]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GourmetGetListReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GourmetGetListReq) ProtoMessage() {}
+
+func (x *GourmetGetListReq) ProtoReflect() protoreflect.Message {
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[0]
+ 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 GourmetGetListReq.ProtoReflect.Descriptor instead.
+func (*GourmetGetListReq) Descriptor() ([]byte, []int) {
+ return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{0}
+}
+
+// 返回进度信息
+type GourmetGetListResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Data *DBGourmet `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
+}
+
+func (x *GourmetGetListResp) Reset() {
+ *x = GourmetGetListResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[1]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GourmetGetListResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GourmetGetListResp) ProtoMessage() {}
+
+func (x *GourmetGetListResp) ProtoReflect() protoreflect.Message {
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[1]
+ 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 GourmetGetListResp.ProtoReflect.Descriptor instead.
+func (*GourmetGetListResp) Descriptor() ([]byte, []int) {
+ return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *GourmetGetListResp) GetData() *DBGourmet {
+ if x != nil {
+ return x.Data
+ }
+ return nil
+}
+
+// 创建订单
+type GourmetCreateOrderReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Order []*Cooking `protobuf:"bytes,1,rep,name=order,proto3" json:"order"` // 烹饪时间不用传 后端会重新计算
+}
+
+func (x *GourmetCreateOrderReq) Reset() {
+ *x = GourmetCreateOrderReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[2]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GourmetCreateOrderReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GourmetCreateOrderReq) ProtoMessage() {}
+
+func (x *GourmetCreateOrderReq) ProtoReflect() protoreflect.Message {
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[2]
+ 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 GourmetCreateOrderReq.ProtoReflect.Descriptor instead.
+func (*GourmetCreateOrderReq) Descriptor() ([]byte, []int) {
+ return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *GourmetCreateOrderReq) GetOrder() []*Cooking {
+ if x != nil {
+ return x.Order
+ }
+ return nil
+}
+
+type GourmetCreateOrderResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Data *DBGourmet `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
+}
+
+func (x *GourmetCreateOrderResp) Reset() {
+ *x = GourmetCreateOrderResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[3]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GourmetCreateOrderResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GourmetCreateOrderResp) ProtoMessage() {}
+
+func (x *GourmetCreateOrderResp) ProtoReflect() protoreflect.Message {
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[3]
+ 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 GourmetCreateOrderResp.ProtoReflect.Descriptor instead.
+func (*GourmetCreateOrderResp) Descriptor() ([]byte, []int) {
+ return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *GourmetCreateOrderResp) GetData() *DBGourmet {
+ if x != nil {
+ return x.Data
+ }
+ return nil
+}
+
+// 领取奖励
+type GourmetGetRewardReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+}
+
+func (x *GourmetGetRewardReq) Reset() {
+ *x = GourmetGetRewardReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[4]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GourmetGetRewardReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GourmetGetRewardReq) ProtoMessage() {}
+
+func (x *GourmetGetRewardReq) ProtoReflect() protoreflect.Message {
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[4]
+ 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 GourmetGetRewardReq.ProtoReflect.Descriptor instead.
+func (*GourmetGetRewardReq) Descriptor() ([]byte, []int) {
+ return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{4}
+}
+
+type GourmetGetRewardResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Data *DBGourmet `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
+}
+
+func (x *GourmetGetRewardResp) Reset() {
+ *x = GourmetGetRewardResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[5]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GourmetGetRewardResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GourmetGetRewardResp) ProtoMessage() {}
+
+func (x *GourmetGetRewardResp) ProtoReflect() protoreflect.Message {
+ mi := &file_gourmet_gourmet_msg_proto_msgTypes[5]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use GourmetGetRewardResp.ProtoReflect.Descriptor instead.
+func (*GourmetGetRewardResp) Descriptor() ([]byte, []int) {
+ return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *GourmetGetRewardResp) GetData() *DBGourmet {
+ if x != nil {
+ return x.Data
+ }
+ return nil
+}
+
+var File_gourmet_gourmet_msg_proto protoreflect.FileDescriptor
+
+var file_gourmet_gourmet_msg_proto_rawDesc = []byte{
+ 0x0a, 0x19, 0x67, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x2f, 0x67, 0x6f, 0x75, 0x72, 0x6d, 0x65,
+ 0x74, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x18, 0x67, 0x6f, 0x75,
+ 0x72, 0x6d, 0x65, 0x74, 0x2f, 0x67, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x5f, 0x64, 0x62, 0x2e,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x13, 0x0a, 0x11, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74,
+ 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x34, 0x0a, 0x12, 0x47, 0x6f,
+ 0x75, 0x72, 0x6d, 0x65, 0x74, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70,
+ 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a,
+ 0x2e, 0x44, 0x42, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
+ 0x22, 0x37, 0x0a, 0x15, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74,
+ 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x05, 0x6f, 0x72, 0x64,
+ 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x43, 0x6f, 0x6f, 0x6b, 0x69,
+ 0x6e, 0x67, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x38, 0x0a, 0x16, 0x47, 0x6f, 0x75,
+ 0x72, 0x6d, 0x65, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52,
+ 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x52, 0x04, 0x64,
+ 0x61, 0x74, 0x61, 0x22, 0x15, 0x0a, 0x13, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x47, 0x65,
+ 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x36, 0x0a, 0x14, 0x47, 0x6f,
+ 0x75, 0x72, 0x6d, 0x65, 0x74, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65,
+ 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+ 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x52, 0x04, 0x64, 0x61,
+ 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0x33,
+}
+
+var (
+ file_gourmet_gourmet_msg_proto_rawDescOnce sync.Once
+ file_gourmet_gourmet_msg_proto_rawDescData = file_gourmet_gourmet_msg_proto_rawDesc
+)
+
+func file_gourmet_gourmet_msg_proto_rawDescGZIP() []byte {
+ file_gourmet_gourmet_msg_proto_rawDescOnce.Do(func() {
+ file_gourmet_gourmet_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_gourmet_gourmet_msg_proto_rawDescData)
+ })
+ return file_gourmet_gourmet_msg_proto_rawDescData
+}
+
+var file_gourmet_gourmet_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+var file_gourmet_gourmet_msg_proto_goTypes = []interface{}{
+ (*GourmetGetListReq)(nil), // 0: GourmetGetListReq
+ (*GourmetGetListResp)(nil), // 1: GourmetGetListResp
+ (*GourmetCreateOrderReq)(nil), // 2: GourmetCreateOrderReq
+ (*GourmetCreateOrderResp)(nil), // 3: GourmetCreateOrderResp
+ (*GourmetGetRewardReq)(nil), // 4: GourmetGetRewardReq
+ (*GourmetGetRewardResp)(nil), // 5: GourmetGetRewardResp
+ (*DBGourmet)(nil), // 6: DBGourmet
+ (*Cooking)(nil), // 7: Cooking
+}
+var file_gourmet_gourmet_msg_proto_depIdxs = []int32{
+ 6, // 0: GourmetGetListResp.data:type_name -> DBGourmet
+ 7, // 1: GourmetCreateOrderReq.order:type_name -> Cooking
+ 6, // 2: GourmetCreateOrderResp.data:type_name -> DBGourmet
+ 6, // 3: GourmetGetRewardResp.data:type_name -> DBGourmet
+ 4, // [4:4] is the sub-list for method output_type
+ 4, // [4:4] is the sub-list for method input_type
+ 4, // [4:4] is the sub-list for extension type_name
+ 4, // [4:4] is the sub-list for extension extendee
+ 0, // [0:4] is the sub-list for field type_name
+}
+
+func init() { file_gourmet_gourmet_msg_proto_init() }
+func file_gourmet_gourmet_msg_proto_init() {
+ if File_gourmet_gourmet_msg_proto != nil {
+ return
+ }
+ file_gourmet_gourmet_db_proto_init()
+ if !protoimpl.UnsafeEnabled {
+ file_gourmet_gourmet_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GourmetGetListReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_gourmet_gourmet_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GourmetGetListResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_gourmet_gourmet_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GourmetCreateOrderReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_gourmet_gourmet_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GourmetCreateOrderResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_gourmet_gourmet_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GourmetGetRewardReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_gourmet_gourmet_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GourmetGetRewardResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ }
+ type x struct{}
+ out := protoimpl.TypeBuilder{
+ File: protoimpl.DescBuilder{
+ GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+ RawDescriptor: file_gourmet_gourmet_msg_proto_rawDesc,
+ NumEnums: 0,
+ NumMessages: 6,
+ NumExtensions: 0,
+ NumServices: 0,
+ },
+ GoTypes: file_gourmet_gourmet_msg_proto_goTypes,
+ DependencyIndexes: file_gourmet_gourmet_msg_proto_depIdxs,
+ MessageInfos: file_gourmet_gourmet_msg_proto_msgTypes,
+ }.Build()
+ File_gourmet_gourmet_msg_proto = out.File
+ file_gourmet_gourmet_msg_proto_rawDesc = nil
+ file_gourmet_gourmet_msg_proto_goTypes = nil
+ file_gourmet_gourmet_msg_proto_depIdxs = nil
+}
diff --git a/sys/configure/structs/game.Gourmet.go b/sys/configure/structs/game.Gourmet.go
new file mode 100644
index 000000000..8a0f33fd6
--- /dev/null
+++ b/sys/configure/structs/game.Gourmet.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameGourmet struct {
+ _dataMap map[int32]*GameGourmetData
+ _dataList []*GameGourmetData
+}
+
+func NewGameGourmet(_buf []map[string]interface{}) (*GameGourmet, error) {
+ _dataList := make([]*GameGourmetData, 0, len(_buf))
+ dataMap := make(map[int32]*GameGourmetData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameGourmetData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameGourmet{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameGourmet) GetDataMap() map[int32]*GameGourmetData {
+ return table._dataMap
+}
+
+func (table *GameGourmet) GetDataList() []*GameGourmetData {
+ return table._dataList
+}
+
+func (table *GameGourmet) Get(key int32) *GameGourmetData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/game.GourmetData.go b/sys/configure/structs/game.GourmetData.go
new file mode 100644
index 000000000..d80a51008
--- /dev/null
+++ b/sys/configure/structs/game.GourmetData.go
@@ -0,0 +1,66 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameGourmetData struct {
+ Id int32
+ Type int32
+ Level int32
+ Levelname string
+ Colour int32
+ Name string
+ Picture string
+ Consume []*Gameatn
+ Using int32
+ Propsgroup int32
+}
+
+const TypeId_GameGourmetData = -359286171
+
+func (*GameGourmetData) GetTypeId() int32 {
+ return -359286171
+}
+
+func (_v *GameGourmetData)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["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["level"].(float64); !_ok_ { err = errors.New("level error"); return }; _v.Level = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["levelname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Levelname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Levelname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["colour"].(float64); !_ok_ { err = errors.New("colour error"); return }; _v.Colour = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; if _v.Picture, _ok_ = _buf["picture"].(string); !_ok_ { err = errors.New("picture error"); return } }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["consume"].([]interface{}); !_ok_ { err = errors.New("consume error"); return }
+
+ _v.Consume = 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.Consume = append(_v.Consume, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["using"].(float64); !_ok_ { err = errors.New("using error"); return }; _v.Using = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["propsgroup"].(float64); !_ok_ { err = errors.New("propsgroup error"); return }; _v.Propsgroup = int32(_tempNum_) }
+ return
+}
+
+func DeserializeGameGourmetData(_buf map[string]interface{}) (*GameGourmetData, error) {
+ v := &GameGourmetData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.GourmetSkill.go b/sys/configure/structs/game.GourmetSkill.go
new file mode 100644
index 000000000..36104b464
--- /dev/null
+++ b/sys/configure/structs/game.GourmetSkill.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameGourmetSkill struct {
+ _dataMap map[int32]*GameGourmetSkillData
+ _dataList []*GameGourmetSkillData
+}
+
+func NewGameGourmetSkill(_buf []map[string]interface{}) (*GameGourmetSkill, error) {
+ _dataList := make([]*GameGourmetSkillData, 0, len(_buf))
+ dataMap := make(map[int32]*GameGourmetSkillData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameGourmetSkillData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameGourmetSkill{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameGourmetSkill) GetDataMap() map[int32]*GameGourmetSkillData {
+ return table._dataMap
+}
+
+func (table *GameGourmetSkill) GetDataList() []*GameGourmetSkillData {
+ return table._dataList
+}
+
+func (table *GameGourmetSkill) Get(key int32) *GameGourmetSkillData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/game.GourmetSkillData.go b/sys/configure/structs/game.GourmetSkillData.go
new file mode 100644
index 000000000..17f49eec8
--- /dev/null
+++ b/sys/configure/structs/game.GourmetSkillData.go
@@ -0,0 +1,89 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameGourmetSkillData struct {
+ Id int32
+ Type int32
+ Initial int32
+ Level int32
+ Levelname string
+ Colour int32
+ Name string
+ Needtime int32
+ Display int32
+ Probability int32
+ Icon string
+ Item []*Gameatn
+ Affix string
+ AffixColour int32
+ Consume []*Gameatn
+}
+
+const TypeId_GameGourmetSkillData = 235491264
+
+func (*GameGourmetSkillData) GetTypeId() int32 {
+ return 235491264
+}
+
+func (_v *GameGourmetSkillData)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["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["initial"].(float64); !_ok_ { err = errors.New("initial error"); return }; _v.Initial = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["level"].(float64); !_ok_ { err = errors.New("level error"); return }; _v.Level = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["levelname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Levelname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Levelname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["colour"].(float64); !_ok_ { err = errors.New("colour error"); return }; _v.Colour = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needtime"].(float64); !_ok_ { err = errors.New("needtime error"); return }; _v.Needtime = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["display"].(float64); !_ok_ { err = errors.New("display error"); return }; _v.Display = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["probability"].(float64); !_ok_ { err = errors.New("probability error"); return }; _v.Probability = int32(_tempNum_) }
+ { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["item"].([]interface{}); !_ok_ { err = errors.New("item error"); return }
+
+ _v.Item = 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.Item = append(_v.Item, _list_v_)
+ }
+ }
+
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["affix"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Affix error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Affix, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["affix_colour"].(float64); !_ok_ { err = errors.New("affix_colour error"); return }; _v.AffixColour = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["consume"].([]interface{}); !_ok_ { err = errors.New("consume error"); return }
+
+ _v.Consume = 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.Consume = append(_v.Consume, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameGourmetSkillData(_buf map[string]interface{}) (*GameGourmetSkillData, error) {
+ v := &GameGourmetSkillData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
From fc788396dce7ca185179dd75bfe951ce5a2f321e Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 16 Aug 2022 18:53:15 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E7=BE=8E=E9=A3=9F=E5=AE=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
comm/const.go | 1 +
modules/gourmet/api.go | 2 +-
modules/gourmet/api_createorder.go | 13 ++++++----
modules/gourmet/api_getReward.go | 8 +++---
modules/gourmet/api_getlist.go | 11 +++++++++
modules/gourmet/comp_configure.go | 10 ++++++++
modules/gourmet/model_gourmet.go | 39 ++++++++++++++++++++++++++++++
modules/gourmet/model_pagoda.go | 20 ---------------
modules/gourmet/module.go | 10 ++++----
services/worker/main.go | 2 ++
10 files changed, 81 insertions(+), 35 deletions(-)
create mode 100644 modules/gourmet/model_gourmet.go
delete mode 100644 modules/gourmet/model_pagoda.go
diff --git a/comm/const.go b/comm/const.go
index bdee2e3bb..626ec5f70 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -47,6 +47,7 @@ const (
ModuleGM core.M_Modules = "gm" //gm模块
ModulePagoda core.M_Modules = "pagoda" //魔塔模块
ModuleMartialhall core.M_Modules = "martialhall" //武馆模块
+ ModuleGourmet core.M_Modules = "gourmet" //美食馆
)
//数据表名定义处
diff --git a/modules/gourmet/api.go b/modules/gourmet/api.go
index e85ebd6e5..e585916b0 100644
--- a/modules/gourmet/api.go
+++ b/modules/gourmet/api.go
@@ -6,7 +6,7 @@ import (
)
const (
- PagodaGetListResp = "getlist"
+ GourmetGetListResp = "getlist"
PagodaChallengeResp = "challenge"
PagodaGetRewardResp = "getreward"
)
diff --git a/modules/gourmet/api_createorder.go b/modules/gourmet/api_createorder.go
index a23326c0a..b587a1eab 100644
--- a/modules/gourmet/api_createorder.go
+++ b/modules/gourmet/api_createorder.go
@@ -8,15 +8,18 @@ import (
)
//参数校验
-func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.GourmetGetRewardReq) (code pb.ErrorCode) {
-
+func (this *apiComp) CreateOrderCheck(session comm.IUserSession, req *pb.GourmetCreateOrderReq) (code pb.ErrorCode) {
+ if len(req.Order) == 0 {
+ code = pb.ErrorCode_ReqParameterError
+ return
+ }
return
}
-///美食城领取奖励
-func (this *apiComp) GetReward(session comm.IUserSession, req *pb.GourmetGetRewardReq) (code pb.ErrorCode, data proto.Message) {
+///美食城创建订单
+func (this *apiComp) CreateOrder(session comm.IUserSession, req *pb.GourmetCreateOrderReq) (code pb.ErrorCode, data proto.Message) {
- code = this.GetRewardCheck(session, req)
+ code = this.CreateOrderCheck(session, req)
if code != pb.ErrorCode_Success {
return // 参数校验失败直接返回
}
diff --git a/modules/gourmet/api_getReward.go b/modules/gourmet/api_getReward.go
index 1772b1857..a23326c0a 100644
--- a/modules/gourmet/api_getReward.go
+++ b/modules/gourmet/api_getReward.go
@@ -8,15 +8,15 @@ import (
)
//参数校验
-func (this *apiComp) CreateOrderCheck(session comm.IUserSession, req *pb.GourmetCreateOrderReq) (code pb.ErrorCode) {
+func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.GourmetGetRewardReq) (code pb.ErrorCode) {
return
}
-///美食城创建订单
-func (this *apiComp) CreateOrder(session comm.IUserSession, req *pb.GourmetCreateOrderReq) (code pb.ErrorCode, data proto.Message) {
+///美食城领取奖励
+func (this *apiComp) GetReward(session comm.IUserSession, req *pb.GourmetGetRewardReq) (code pb.ErrorCode, data proto.Message) {
- code = this.CreateOrderCheck(session, req)
+ code = this.GetRewardCheck(session, req)
if code != pb.ErrorCode_Success {
return // 参数校验失败直接返回
}
diff --git a/modules/gourmet/api_getlist.go b/modules/gourmet/api_getlist.go
index 11270ec92..e3e10739d 100644
--- a/modules/gourmet/api_getlist.go
+++ b/modules/gourmet/api_getlist.go
@@ -16,5 +16,16 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.GourmetGetL
///获取美食城基本信息
func (this *apiComp) GetList(session comm.IUserSession, req *pb.GourmetGetListReq) (code pb.ErrorCode, data proto.Message) {
+ code = this.GetListCheck(session, req)
+ if code != pb.ErrorCode_Success {
+ return // 参数校验失败直接返回
+ }
+ _gourmet, err := this.module.modelGourmet.getGourmetList(session.GetUserId())
+ if err != nil {
+ code = pb.ErrorCode_DBError
+ return
+ }
+
+ session.SendMsg(string(this.module.GetType()), GourmetGetListResp, &pb.GourmetGetListResp{Data: _gourmet})
return
}
diff --git a/modules/gourmet/comp_configure.go b/modules/gourmet/comp_configure.go
index fcb2ff04d..7e21725dc 100644
--- a/modules/gourmet/comp_configure.go
+++ b/modules/gourmet/comp_configure.go
@@ -56,6 +56,10 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
log.Errorf("get game_pagoda conf err:%v", err)
return
})
+
+ // _data := this.GetGourmetConfigData(1002, 4) // 测试配置文件读取
+ // _dataskill := this.GetGourmetSkillConfigData(1001, 4)
+ // fmt.Printf("%v,%v", _data, _dataskill)
return
}
@@ -65,6 +69,12 @@ func (this *configureComp) GetGourmetConfigData(gourmetType int32, level int32)
return this._gourmetMap[int64(gourmetType<<16)+int64(level)]
}
+// 获取美食馆配置数据
+func (this *configureComp) GetGourmetSkillConfigData(gourmetType int32, level int32) (data *cfg.GameGourmetSkillData) {
+
+ return this._gourmetSkillMap[int64(gourmetType<<16)+int64(level)]
+}
+
//加载多个配置文件
func (this *configureComp) LoadMultiConfigure(confs map[string]interface{}) (err error) {
for k, v := range confs {
diff --git a/modules/gourmet/model_gourmet.go b/modules/gourmet/model_gourmet.go
new file mode 100644
index 000000000..ab07ac7c6
--- /dev/null
+++ b/modules/gourmet/model_gourmet.go
@@ -0,0 +1,39 @@
+package gourmet
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/lego/core"
+ "go_dreamfactory/lego/sys/redis"
+ "go_dreamfactory/modules"
+ "go_dreamfactory/pb"
+)
+
+type modelGourmet struct {
+ modules.MCompModel
+ module *Gourmet
+}
+
+func (this *modelGourmet) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
+ this.TableName = string(comm.TableGourmet)
+ err = this.MCompModel.Init(service, module, comp, options)
+ this.module = module.(*Gourmet)
+
+ return
+}
+
+func (this *modelGourmet) getGourmetList(uid string) (result *pb.DBGourmet, err error) {
+ result = &pb.DBGourmet{}
+ if err = this.Get(uid, result); err != nil {
+ if redis.RedisNil != err { // 没有数据直接创建新的数据
+ result.Uid = uid
+ if err = this.Add(uid, result); err != nil {
+ this.module.Errorf("err:%v", err)
+ err = nil
+ return
+ }
+ }
+ return
+ }
+ err = nil
+ return result, err
+}
diff --git a/modules/gourmet/model_pagoda.go b/modules/gourmet/model_pagoda.go
deleted file mode 100644
index 2c87d0d22..000000000
--- a/modules/gourmet/model_pagoda.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package gourmet
-
-import (
- "go_dreamfactory/comm"
- "go_dreamfactory/lego/core"
- "go_dreamfactory/modules"
-)
-
-type ModelPagoda struct {
- modules.MCompModel
- module *Gourmet
-}
-
-func (this *ModelPagoda) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
- this.TableName = string(comm.TableGourmet)
- err = this.MCompModel.Init(service, module, comp, options)
- this.module = module.(*Gourmet)
-
- return
-}
diff --git a/modules/gourmet/module.go b/modules/gourmet/module.go
index 621242f07..d18f2d650 100644
--- a/modules/gourmet/module.go
+++ b/modules/gourmet/module.go
@@ -9,9 +9,9 @@ import (
type Gourmet struct {
modules.ModuleBase
- modelPagoda *ModelPagoda
- api *apiComp
- configure *configureComp
+ modelGourmet *modelGourmet
+ api *apiComp
+ configure *configureComp
}
func NewModule() core.IModule {
@@ -19,7 +19,7 @@ func NewModule() core.IModule {
}
func (this *Gourmet) GetType() core.M_Modules {
- return comm.ModulePagoda
+ return comm.ModuleGourmet
}
func (this *Gourmet) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
@@ -31,7 +31,7 @@ func (this *Gourmet) Init(service core.IService, module core.IModule, options co
func (this *Gourmet) OnInstallComp() {
this.ModuleBase.OnInstallComp()
this.api = this.RegisterComp(new(apiComp)).(*apiComp)
- this.modelPagoda = this.RegisterComp(new(ModelPagoda)).(*ModelPagoda)
+ this.modelGourmet = this.RegisterComp(new(modelGourmet)).(*modelGourmet)
this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
}
diff --git a/services/worker/main.go b/services/worker/main.go
index 515f86d0f..132283c2b 100644
--- a/services/worker/main.go
+++ b/services/worker/main.go
@@ -8,6 +8,7 @@ import (
"go_dreamfactory/modules/forum"
"go_dreamfactory/modules/friend"
"go_dreamfactory/modules/gm"
+ "go_dreamfactory/modules/gourmet"
"go_dreamfactory/modules/hero"
"go_dreamfactory/modules/items"
"go_dreamfactory/modules/mail"
@@ -59,6 +60,7 @@ func main() {
gm.NewModule(),
forum.NewModule(),
pagoda.NewModule(),
+ gourmet.NewModule(),
)
}