From b536a756ae1ba219023abb8bc244442a391c2980 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 20 Feb 2023 15:40:05 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=86=94=E5=B2=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/smithy/api_forgeequip.go | 50 +++++++++++++++++++++++++-------
pb/errorcode.pb.go | 11 +++++--
2 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go
index 806df5114..15bae92a6 100644
--- a/modules/smithy/api_forgeequip.go
+++ b/modules/smithy/api_forgeequip.go
@@ -5,13 +5,14 @@ import (
"go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs"
+ "strconv"
"google.golang.org/protobuf/proto"
)
//参数校验
func (this *apiComp) ForgeEquipCheck(session comm.IUserSession, req *pb.SmithyForgeEquipReq) (code pb.ErrorCode) {
- if req.ReelId == 0 {
+ if req.ReelId == 0 || req.Lava < 0 || req.Quality < 0 {
code = pb.ErrorCode_ReqParameterError
return
}
@@ -59,19 +60,48 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
if req.Quality > 0 {
costRes = append(costRes, reelcfg.RefineCos)
}
+
+ // 是否是熔岩打造
+ if req.Lava > 0 {
+ // 预计消耗温度
+ exemption := this.module.configure.GetGlobalConf().ExemptionTemperatureCos
+ if len(exemption) != 2 {
+ code = pb.ErrorCode_ConfigNoFound
+ return
+ }
+ if reelcfg.TemperatureCos > req.Lava*exemption[1] {
+ code = pb.ErrorCode_SmithyLackLava // 缺少熔岩
+ return
+ }
+ // 检查消耗
+ lavaCost := &cfg.Gameatn{
+ A: "item",
+ T: strconv.Itoa(int(exemption[0])),
+ N: req.Lava,
+ }
+ if code = this.module.CheckRes(session, []*cfg.Gameatn{lavaCost}); code != pb.ErrorCode_Success {
+ return
+ }
+ costRes = append(costRes, lavaCost)
+
+ } else {
+ // 熟练度减少的温度
+ t := this.module.modelStove.CheckTemperature(req.ReelId, stove.Data[req.ReelId].Lv)
+ // 检查炉温 是否够
+ if stove.Temperature < reelcfg.TemperatureCos-t {
+ code = pb.ErrorCode_SmithyNoTemperature // 炉温不够 直接返回
+ return
+ }
+ stove.Temperature -= (reelcfg.TemperatureCos - t) // 消耗温度
+ update["temperature"] = stove.Temperature
+ }
+
costRes = append(costRes, reelcfg.BasicCos...)
subAtn := this.module.modelStove.CheckForgeConsume(req.ReelId, stove.Data[req.ReelId].Lv)
costRes = append(costRes, subAtn...)
if code = this.module.CheckRes(session, costRes); code != pb.ErrorCode_Success {
return
}
- // 熟练度减少的温度
- t := this.module.modelStove.CheckTemperature(req.ReelId, stove.Data[req.ReelId].Lv)
- // 检查炉温 是否够
- if stove.Temperature < reelcfg.TemperatureCos-t {
- code = pb.ErrorCode_SmithyNoTemperature // 炉温不够 直接返回
- return
- }
// 检查是否提升了熟练度等级
nextProficiency := this.module.configure.GetSmithyProficileData(req.ReelId, stove.Data[req.ReelId].Lv+1)
@@ -98,11 +128,11 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
if code = this.module.ConsumeRes(session, costRes, true); code != pb.ErrorCode_Success {
return
}
- stove.Temperature -= (reelcfg.TemperatureCos - t) // 消耗温度
+
stove.RecoveTime = configure.Now().Unix()
update["data"] = stove.Data
update["recoveTime"] = stove.RecoveTime
- update["temperature"] = stove.Temperature
+
this.module.modelStove.updateSmithyStove(session.GetUserId(), update)
session.SendMsg(string(this.module.GetType()), "forgeequip", &pb.SmithyForgeEquipResp{Data: stove})
return
diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index aeb40d5b7..b959252d0 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -321,6 +321,7 @@ const (
ErrorCode_SmithyStoveMaxLv ErrorCode = 4103 // 炉子达到最大等级
ErrorCode_SmithyCustomerLimit ErrorCode = 4104 //顾客上限
ErrorCode_SmithyMaxTemperature ErrorCode = 4105 //炉温达上限
+ ErrorCode_SmithyLackLava ErrorCode = 4106 //缺少熔岩
)
// Enum value maps for ErrorCode.
@@ -592,6 +593,7 @@ var (
4103: "SmithyStoveMaxLv",
4104: "SmithyCustomerLimit",
4105: "SmithyMaxTemperature",
+ 4106: "SmithyLackLava",
}
ErrorCode_value = map[string]int32{
"Success": 0,
@@ -860,6 +862,7 @@ var (
"SmithyStoveMaxLv": 4103,
"SmithyCustomerLimit": 4104,
"SmithyMaxTemperature": 4105,
+ "SmithyLackLava": 4106,
}
)
@@ -894,7 +897,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, 0x8b, 0x30, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+ 0x6f, 0x2a, 0xa0, 0x30, 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,
@@ -1278,8 +1281,10 @@ var file_errorcode_proto_rawDesc = []byte{
0x76, 0x65, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0x87, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d,
0x69, 0x74, 0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69,
0x74, 0x10, 0x88, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4d, 0x61,
- 0x78, 0x54, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x10, 0x89, 0x20, 0x42,
- 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x78, 0x54, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x10, 0x89, 0x20, 0x12,
+ 0x13, 0x0a, 0x0e, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x61, 0x63, 0x6b, 0x4c, 0x61, 0x76,
+ 0x61, 0x10, 0x8a, 0x20, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+ 0x6f, 0x74, 0x6f, 0x33,
}
var (
From 01b3499a3dddb42f5259dbd150117658625753b7 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 20 Feb 2023 18:34:04 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=93=81=E5=8C=A0=E9=93=BA=E5=9B=BE?=
=?UTF-8?q?=E9=89=B4=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bin/json/game_battleready.json | 47 +-
bin/json/game_equip.json | 396 ++++++++
bin/json/game_smithyatlas.json | 258 +++++
bin/json/game_smithyatlaslv.json | 178 ++++
bin/json/game_smithyatlasscore.json | 452 +++++++++
bin/json/game_smithytool.json | 50 +-
bin/json/game_vikingboss.json | 949 ++++++++++++++++++
bin/json/game_vikingbossskill.json | 17 +
comm/const.go | 2 +
modules/smithy/api_forgeequip.go | 6 +-
modules/smithy/api_getatlas.go | 30 +
modules/smithy/comp_configure.go | 69 +-
modules/smithy/model_atlas.go | 39 +
modules/smithy/model_smithy.go | 2 +-
modules/smithy/module.go | 3 +-
pb/errorcode.pb.go | 37 +-
pb/smithy_db.pb.go | 177 ++--
pb/smithy_msg.pb.go | 362 ++++---
sys/configure/structs/Game.BattleReadyData.go | 2 +
sys/configure/structs/Game.SmithyAtlas.go | 42 +
sys/configure/structs/Game.SmithyAtlasData.go | 49 +
sys/configure/structs/Game.SmithyAtlasLv.go | 42 +
.../structs/Game.SmithyAtlasLvData.go | 52 +
.../structs/Game.SmithyAtlasScore.go | 42 +
.../structs/Game.SmithyAtlasScoreData.go | 41 +
sys/configure/structs/Tables.go | 28 +-
sys/configure/structs/game.equipData.go | 2 +
27 files changed, 3103 insertions(+), 271 deletions(-)
create mode 100644 bin/json/game_smithyatlas.json
create mode 100644 bin/json/game_smithyatlaslv.json
create mode 100644 bin/json/game_smithyatlasscore.json
create mode 100644 modules/smithy/api_getatlas.go
create mode 100644 modules/smithy/model_atlas.go
create mode 100644 sys/configure/structs/Game.SmithyAtlas.go
create mode 100644 sys/configure/structs/Game.SmithyAtlasData.go
create mode 100644 sys/configure/structs/Game.SmithyAtlasLv.go
create mode 100644 sys/configure/structs/Game.SmithyAtlasLvData.go
create mode 100644 sys/configure/structs/Game.SmithyAtlasScore.go
create mode 100644 sys/configure/structs/Game.SmithyAtlasScoreData.go
diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json
index 442a33030..a74bf8aee 100644
--- a/bin/json/game_battleready.json
+++ b/bin/json/game_battleready.json
@@ -7,7 +7,8 @@
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
- "CanFriendHelp": 1
+ "CanFriendHelp": 1,
+ "Numrounds": 0
},
{
"id": 101,
@@ -17,7 +18,8 @@
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
- "CanFriendHelp": 0
+ "CanFriendHelp": 0,
+ "Numrounds": 0
},
{
"id": 102,
@@ -27,7 +29,8 @@
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
- "CanFriendHelp": 0
+ "CanFriendHelp": 0,
+ "Numrounds": 0
},
{
"id": 103,
@@ -37,7 +40,8 @@
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
- "CanFriendHelp": 0
+ "CanFriendHelp": 0,
+ "Numrounds": 0
},
{
"id": 104,
@@ -47,7 +51,8 @@
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
- "CanFriendHelp": 0
+ "CanFriendHelp": 0,
+ "Numrounds": 0
},
{
"id": 105,
@@ -57,7 +62,8 @@
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
- "CanFriendHelp": 0
+ "CanFriendHelp": 0,
+ "Numrounds": 0
},
{
"id": 106,
@@ -67,7 +73,8 @@
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
- "CanFriendHelp": 0
+ "CanFriendHelp": 0,
+ "Numrounds": 0
},
{
"id": 107,
@@ -77,7 +84,8 @@
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
- "CanFriendHelp": 0
+ "CanFriendHelp": 0,
+ "Numrounds": 0
},
{
"id": 108,
@@ -87,7 +95,8 @@
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
- "CanFriendHelp": 0
+ "CanFriendHelp": 0,
+ "Numrounds": 0
},
{
"id": 109,
@@ -97,7 +106,8 @@
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
- "CanFriendHelp": 0
+ "CanFriendHelp": 0,
+ "Numrounds": 0
},
{
"id": 110,
@@ -107,7 +117,8 @@
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
- "CanFriendHelp": 0
+ "CanFriendHelp": 0,
+ "Numrounds": 0
},
{
"id": 111,
@@ -117,6 +128,18 @@
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
- "CanFriendHelp": 0
+ "CanFriendHelp": 0,
+ "Numrounds": 0
+ },
+ {
+ "id": 112,
+ "PlayType": "panda",
+ "HeroCount": 5,
+ "DefaultHero": 0,
+ "DisableHero": [],
+ "LockSlots": [],
+ "AssistTeam": 0,
+ "CanFriendHelp": 0,
+ "Numrounds": 10
}
]
\ No newline at end of file
diff --git a/bin/json/game_equip.json b/bin/json/game_equip.json
index 0582107f8..bb0db1a68 100644
--- a/bin/json/game_equip.json
+++ b/bin/json/game_equip.json
@@ -6,6 +6,7 @@
"key": "equip_13001",
"text": "神龙大侠"
},
+ "atlas_id": "10",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -54,6 +55,7 @@
"key": "equip_13002",
"text": "神龙大侠"
},
+ "atlas_id": "11",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -102,6 +104,7 @@
"key": "equip_13003",
"text": "神龙大侠"
},
+ "atlas_id": "12",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -150,6 +153,7 @@
"key": "equip_13004",
"text": "神龙大侠"
},
+ "atlas_id": "13",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -198,6 +202,7 @@
"key": "equip_13001",
"text": "神龙大侠"
},
+ "atlas_id": "10",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -246,6 +251,7 @@
"key": "equip_13002",
"text": "神龙大侠"
},
+ "atlas_id": "11",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -294,6 +300,7 @@
"key": "equip_13003",
"text": "神龙大侠"
},
+ "atlas_id": "12",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -342,6 +349,7 @@
"key": "equip_13004",
"text": "神龙大侠"
},
+ "atlas_id": "13",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -390,6 +398,7 @@
"key": "equip_13001",
"text": "神龙大侠"
},
+ "atlas_id": "10",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -438,6 +447,7 @@
"key": "equip_13002",
"text": "神龙大侠"
},
+ "atlas_id": "11",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -486,6 +496,7 @@
"key": "equip_13003",
"text": "神龙大侠"
},
+ "atlas_id": "12",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -534,6 +545,7 @@
"key": "equip_13004",
"text": "神龙大侠"
},
+ "atlas_id": "13",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -582,6 +594,7 @@
"key": "equip_13001",
"text": "神龙大侠"
},
+ "atlas_id": "10",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -630,6 +643,7 @@
"key": "equip_13002",
"text": "神龙大侠"
},
+ "atlas_id": "11",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -678,6 +692,7 @@
"key": "equip_13003",
"text": "神龙大侠"
},
+ "atlas_id": "12",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -726,6 +741,7 @@
"key": "equip_13004",
"text": "神龙大侠"
},
+ "atlas_id": "13",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -774,6 +790,7 @@
"key": "equip_13001",
"text": "神龙大侠"
},
+ "atlas_id": "10",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -822,6 +839,7 @@
"key": "equip_13002",
"text": "神龙大侠"
},
+ "atlas_id": "11",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -870,6 +888,7 @@
"key": "equip_13003",
"text": "神龙大侠"
},
+ "atlas_id": "12",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -918,6 +937,7 @@
"key": "equip_13004",
"text": "神龙大侠"
},
+ "atlas_id": "13",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -966,6 +986,7 @@
"key": "equip_13001",
"text": "神龙大侠"
},
+ "atlas_id": "10",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -1014,6 +1035,7 @@
"key": "equip_13002",
"text": "神龙大侠"
},
+ "atlas_id": "11",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -1062,6 +1084,7 @@
"key": "equip_13003",
"text": "神龙大侠"
},
+ "atlas_id": "12",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -1110,6 +1133,7 @@
"key": "equip_13004",
"text": "神龙大侠"
},
+ "atlas_id": "13",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -1158,6 +1182,7 @@
"key": "equip_13001",
"text": "无牙仔"
},
+ "atlas_id": "20",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10001",
@@ -1206,6 +1231,7 @@
"key": "equip_13002",
"text": "无牙仔"
},
+ "atlas_id": "21",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10001",
@@ -1254,6 +1280,7 @@
"key": "equip_13003",
"text": "无牙仔"
},
+ "atlas_id": "22",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10001",
@@ -1302,6 +1329,7 @@
"key": "equip_13004",
"text": "无牙仔"
},
+ "atlas_id": "23",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10001",
@@ -1350,6 +1378,7 @@
"key": "equip_13001",
"text": "无牙仔"
},
+ "atlas_id": "20",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10001",
@@ -1398,6 +1427,7 @@
"key": "equip_13002",
"text": "无牙仔"
},
+ "atlas_id": "21",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10001",
@@ -1446,6 +1476,7 @@
"key": "equip_13003",
"text": "无牙仔"
},
+ "atlas_id": "22",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10001",
@@ -1494,6 +1525,7 @@
"key": "equip_13004",
"text": "无牙仔"
},
+ "atlas_id": "23",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10001",
@@ -1542,6 +1574,7 @@
"key": "equip_13001",
"text": "无牙仔"
},
+ "atlas_id": "20",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10001",
@@ -1590,6 +1623,7 @@
"key": "equip_13002",
"text": "无牙仔"
},
+ "atlas_id": "21",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10001",
@@ -1638,6 +1672,7 @@
"key": "equip_13003",
"text": "无牙仔"
},
+ "atlas_id": "22",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10001",
@@ -1686,6 +1721,7 @@
"key": "equip_13004",
"text": "无牙仔"
},
+ "atlas_id": "23",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10001",
@@ -1734,6 +1770,7 @@
"key": "equip_13001",
"text": "无牙仔"
},
+ "atlas_id": "20",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10002",
@@ -1782,6 +1819,7 @@
"key": "equip_13002",
"text": "无牙仔"
},
+ "atlas_id": "21",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10002",
@@ -1830,6 +1868,7 @@
"key": "equip_13003",
"text": "无牙仔"
},
+ "atlas_id": "22",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10002",
@@ -1878,6 +1917,7 @@
"key": "equip_13004",
"text": "无牙仔"
},
+ "atlas_id": "23",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10002",
@@ -1926,6 +1966,7 @@
"key": "equip_13001",
"text": "无牙仔"
},
+ "atlas_id": "20",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10002",
@@ -1974,6 +2015,7 @@
"key": "equip_13002",
"text": "无牙仔"
},
+ "atlas_id": "21",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10002",
@@ -2022,6 +2064,7 @@
"key": "equip_13003",
"text": "无牙仔"
},
+ "atlas_id": "22",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10002",
@@ -2070,6 +2113,7 @@
"key": "equip_13004",
"text": "无牙仔"
},
+ "atlas_id": "23",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10002",
@@ -2118,6 +2162,7 @@
"key": "equip_13001",
"text": "无牙仔"
},
+ "atlas_id": "20",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10002",
@@ -2166,6 +2211,7 @@
"key": "equip_13002",
"text": "无牙仔"
},
+ "atlas_id": "21",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10002",
@@ -2214,6 +2260,7 @@
"key": "equip_13003",
"text": "无牙仔"
},
+ "atlas_id": "22",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10002",
@@ -2262,6 +2309,7 @@
"key": "equip_13004",
"text": "无牙仔"
},
+ "atlas_id": "23",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10002",
@@ -2310,6 +2358,7 @@
"key": "equip_13001",
"text": "冰霜杰克"
},
+ "atlas_id": "30",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2358,6 +2407,7 @@
"key": "equip_13002",
"text": "冰霜杰克"
},
+ "atlas_id": "31",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2406,6 +2456,7 @@
"key": "equip_13003",
"text": "冰霜杰克"
},
+ "atlas_id": "32",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2454,6 +2505,7 @@
"key": "equip_13004",
"text": "冰霜杰克"
},
+ "atlas_id": "33",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2502,6 +2554,7 @@
"key": "equip_13001",
"text": "冰霜杰克"
},
+ "atlas_id": "30",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2550,6 +2603,7 @@
"key": "equip_13002",
"text": "冰霜杰克"
},
+ "atlas_id": "31",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2598,6 +2652,7 @@
"key": "equip_13003",
"text": "冰霜杰克"
},
+ "atlas_id": "32",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2646,6 +2701,7 @@
"key": "equip_13004",
"text": "冰霜杰克"
},
+ "atlas_id": "33",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2694,6 +2750,7 @@
"key": "equip_13001",
"text": "冰霜杰克"
},
+ "atlas_id": "30",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2742,6 +2799,7 @@
"key": "equip_13002",
"text": "冰霜杰克"
},
+ "atlas_id": "31",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2790,6 +2848,7 @@
"key": "equip_13003",
"text": "冰霜杰克"
},
+ "atlas_id": "32",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2838,6 +2897,7 @@
"key": "equip_13004",
"text": "冰霜杰克"
},
+ "atlas_id": "33",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2886,6 +2946,7 @@
"key": "equip_13001",
"text": "冰霜杰克"
},
+ "atlas_id": "30",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2934,6 +2995,7 @@
"key": "equip_13002",
"text": "冰霜杰克"
},
+ "atlas_id": "31",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2982,6 +3044,7 @@
"key": "equip_13003",
"text": "冰霜杰克"
},
+ "atlas_id": "32",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -3030,6 +3093,7 @@
"key": "equip_13004",
"text": "冰霜杰克"
},
+ "atlas_id": "33",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -3078,6 +3142,7 @@
"key": "equip_13001",
"text": "冰霜杰克"
},
+ "atlas_id": "30",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -3126,6 +3191,7 @@
"key": "equip_13002",
"text": "冰霜杰克"
},
+ "atlas_id": "31",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -3174,6 +3240,7 @@
"key": "equip_13003",
"text": "冰霜杰克"
},
+ "atlas_id": "32",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -3222,6 +3289,7 @@
"key": "equip_13004",
"text": "冰霜杰克"
},
+ "atlas_id": "33",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -3270,6 +3338,7 @@
"key": "equip_13001",
"text": "冰霜杰克"
},
+ "atlas_id": "30",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -3318,6 +3387,7 @@
"key": "equip_13002",
"text": "冰霜杰克"
},
+ "atlas_id": "31",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -3366,6 +3436,7 @@
"key": "equip_13003",
"text": "冰霜杰克"
},
+ "atlas_id": "32",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -3414,6 +3485,7 @@
"key": "equip_13004",
"text": "冰霜杰克"
},
+ "atlas_id": "33",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -3462,6 +3534,7 @@
"key": "equip_13001",
"text": "漆黑"
},
+ "atlas_id": "40",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -3510,6 +3583,7 @@
"key": "equip_13002",
"text": "漆黑"
},
+ "atlas_id": "41",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -3558,6 +3632,7 @@
"key": "equip_13003",
"text": "漆黑"
},
+ "atlas_id": "42",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -3606,6 +3681,7 @@
"key": "equip_13004",
"text": "漆黑"
},
+ "atlas_id": "43",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -3654,6 +3730,7 @@
"key": "equip_13001",
"text": "漆黑"
},
+ "atlas_id": "40",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -3702,6 +3779,7 @@
"key": "equip_13002",
"text": "漆黑"
},
+ "atlas_id": "41",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -3750,6 +3828,7 @@
"key": "equip_13003",
"text": "漆黑"
},
+ "atlas_id": "42",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -3798,6 +3877,7 @@
"key": "equip_13004",
"text": "漆黑"
},
+ "atlas_id": "43",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -3846,6 +3926,7 @@
"key": "equip_13001",
"text": "漆黑"
},
+ "atlas_id": "40",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -3894,6 +3975,7 @@
"key": "equip_13002",
"text": "漆黑"
},
+ "atlas_id": "41",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -3942,6 +4024,7 @@
"key": "equip_13003",
"text": "漆黑"
},
+ "atlas_id": "42",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -3990,6 +4073,7 @@
"key": "equip_13004",
"text": "漆黑"
},
+ "atlas_id": "43",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4038,6 +4122,7 @@
"key": "equip_13001",
"text": "漆黑"
},
+ "atlas_id": "40",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4086,6 +4171,7 @@
"key": "equip_13002",
"text": "漆黑"
},
+ "atlas_id": "41",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4134,6 +4220,7 @@
"key": "equip_13003",
"text": "漆黑"
},
+ "atlas_id": "42",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4182,6 +4269,7 @@
"key": "equip_13004",
"text": "漆黑"
},
+ "atlas_id": "43",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4230,6 +4318,7 @@
"key": "equip_13001",
"text": "漆黑"
},
+ "atlas_id": "40",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4278,6 +4367,7 @@
"key": "equip_13002",
"text": "漆黑"
},
+ "atlas_id": "41",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4326,6 +4416,7 @@
"key": "equip_13003",
"text": "漆黑"
},
+ "atlas_id": "42",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4374,6 +4465,7 @@
"key": "equip_13004",
"text": "漆黑"
},
+ "atlas_id": "43",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4422,6 +4514,7 @@
"key": "equip_13001",
"text": "漆黑"
},
+ "atlas_id": "40",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4470,6 +4563,7 @@
"key": "equip_13002",
"text": "漆黑"
},
+ "atlas_id": "41",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4518,6 +4612,7 @@
"key": "equip_13003",
"text": "漆黑"
},
+ "atlas_id": "42",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4566,6 +4661,7 @@
"key": "equip_13004",
"text": "漆黑"
},
+ "atlas_id": "43",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4614,6 +4710,7 @@
"key": "equip_13001",
"text": "醉乡民谣"
},
+ "atlas_id": "50",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -4662,6 +4759,7 @@
"key": "equip_13002",
"text": "醉乡民谣"
},
+ "atlas_id": "51",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -4710,6 +4808,7 @@
"key": "equip_13003",
"text": "醉乡民谣"
},
+ "atlas_id": "52",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -4758,6 +4857,7 @@
"key": "equip_13004",
"text": "醉乡民谣"
},
+ "atlas_id": "53",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -4806,6 +4906,7 @@
"key": "equip_13001",
"text": "醉乡民谣"
},
+ "atlas_id": "50",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -4854,6 +4955,7 @@
"key": "equip_13002",
"text": "醉乡民谣"
},
+ "atlas_id": "51",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -4902,6 +5004,7 @@
"key": "equip_13003",
"text": "醉乡民谣"
},
+ "atlas_id": "52",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -4950,6 +5053,7 @@
"key": "equip_13004",
"text": "醉乡民谣"
},
+ "atlas_id": "53",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -4998,6 +5102,7 @@
"key": "equip_13001",
"text": "醉乡民谣"
},
+ "atlas_id": "50",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5046,6 +5151,7 @@
"key": "equip_13002",
"text": "醉乡民谣"
},
+ "atlas_id": "51",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5094,6 +5200,7 @@
"key": "equip_13003",
"text": "醉乡民谣"
},
+ "atlas_id": "52",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5142,6 +5249,7 @@
"key": "equip_13004",
"text": "醉乡民谣"
},
+ "atlas_id": "53",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5190,6 +5298,7 @@
"key": "equip_13001",
"text": "醉乡民谣"
},
+ "atlas_id": "50",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5238,6 +5347,7 @@
"key": "equip_13002",
"text": "醉乡民谣"
},
+ "atlas_id": "51",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5286,6 +5396,7 @@
"key": "equip_13003",
"text": "醉乡民谣"
},
+ "atlas_id": "52",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5334,6 +5445,7 @@
"key": "equip_13004",
"text": "醉乡民谣"
},
+ "atlas_id": "53",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5382,6 +5494,7 @@
"key": "equip_13001",
"text": "醉乡民谣"
},
+ "atlas_id": "50",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5430,6 +5543,7 @@
"key": "equip_13002",
"text": "醉乡民谣"
},
+ "atlas_id": "51",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5478,6 +5592,7 @@
"key": "equip_13003",
"text": "醉乡民谣"
},
+ "atlas_id": "52",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5526,6 +5641,7 @@
"key": "equip_13004",
"text": "醉乡民谣"
},
+ "atlas_id": "53",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5574,6 +5690,7 @@
"key": "equip_13001",
"text": "醉乡民谣"
},
+ "atlas_id": "50",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5622,6 +5739,7 @@
"key": "equip_13002",
"text": "醉乡民谣"
},
+ "atlas_id": "51",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5670,6 +5788,7 @@
"key": "equip_13003",
"text": "醉乡民谣"
},
+ "atlas_id": "52",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5718,6 +5837,7 @@
"key": "equip_13004",
"text": "醉乡民谣"
},
+ "atlas_id": "53",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5766,6 +5886,7 @@
"key": "equip_13001",
"text": "果子酒"
},
+ "atlas_id": "60",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -5814,6 +5935,7 @@
"key": "equip_13002",
"text": "果子酒"
},
+ "atlas_id": "61",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -5862,6 +5984,7 @@
"key": "equip_13003",
"text": "果子酒"
},
+ "atlas_id": "62",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -5910,6 +6033,7 @@
"key": "equip_13004",
"text": "果子酒"
},
+ "atlas_id": "63",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -5958,6 +6082,7 @@
"key": "equip_13001",
"text": "果子酒"
},
+ "atlas_id": "60",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6006,6 +6131,7 @@
"key": "equip_13002",
"text": "果子酒"
},
+ "atlas_id": "61",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6054,6 +6180,7 @@
"key": "equip_13003",
"text": "果子酒"
},
+ "atlas_id": "62",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6102,6 +6229,7 @@
"key": "equip_13004",
"text": "果子酒"
},
+ "atlas_id": "63",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6150,6 +6278,7 @@
"key": "equip_13001",
"text": "果子酒"
},
+ "atlas_id": "60",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6198,6 +6327,7 @@
"key": "equip_13002",
"text": "果子酒"
},
+ "atlas_id": "61",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6246,6 +6376,7 @@
"key": "equip_13003",
"text": "果子酒"
},
+ "atlas_id": "62",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6294,6 +6425,7 @@
"key": "equip_13004",
"text": "果子酒"
},
+ "atlas_id": "63",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6342,6 +6474,7 @@
"key": "equip_13001",
"text": "果子酒"
},
+ "atlas_id": "60",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6390,6 +6523,7 @@
"key": "equip_13002",
"text": "果子酒"
},
+ "atlas_id": "61",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6438,6 +6572,7 @@
"key": "equip_13003",
"text": "果子酒"
},
+ "atlas_id": "62",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6486,6 +6621,7 @@
"key": "equip_13004",
"text": "果子酒"
},
+ "atlas_id": "63",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6534,6 +6670,7 @@
"key": "equip_13001",
"text": "果子酒"
},
+ "atlas_id": "60",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6582,6 +6719,7 @@
"key": "equip_13002",
"text": "果子酒"
},
+ "atlas_id": "61",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6630,6 +6768,7 @@
"key": "equip_13003",
"text": "果子酒"
},
+ "atlas_id": "62",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6678,6 +6817,7 @@
"key": "equip_13004",
"text": "果子酒"
},
+ "atlas_id": "63",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6726,6 +6866,7 @@
"key": "equip_13001",
"text": "果子酒"
},
+ "atlas_id": "60",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6774,6 +6915,7 @@
"key": "equip_13002",
"text": "果子酒"
},
+ "atlas_id": "61",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6822,6 +6964,7 @@
"key": "equip_13003",
"text": "果子酒"
},
+ "atlas_id": "62",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6870,6 +7013,7 @@
"key": "equip_13004",
"text": "果子酒"
},
+ "atlas_id": "63",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6918,6 +7062,7 @@
"key": "equip_13001",
"text": "月中人"
},
+ "atlas_id": "70",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -6966,6 +7111,7 @@
"key": "equip_13002",
"text": "月中人"
},
+ "atlas_id": "71",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7014,6 +7160,7 @@
"key": "equip_13003",
"text": "月中人"
},
+ "atlas_id": "72",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7062,6 +7209,7 @@
"key": "equip_13004",
"text": "月中人"
},
+ "atlas_id": "73",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7110,6 +7258,7 @@
"key": "equip_13001",
"text": "月中人"
},
+ "atlas_id": "70",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7158,6 +7307,7 @@
"key": "equip_13002",
"text": "月中人"
},
+ "atlas_id": "71",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7206,6 +7356,7 @@
"key": "equip_13003",
"text": "月中人"
},
+ "atlas_id": "72",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7254,6 +7405,7 @@
"key": "equip_13004",
"text": "月中人"
},
+ "atlas_id": "73",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7302,6 +7454,7 @@
"key": "equip_13001",
"text": "月中人"
},
+ "atlas_id": "70",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7350,6 +7503,7 @@
"key": "equip_13002",
"text": "月中人"
},
+ "atlas_id": "71",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7398,6 +7552,7 @@
"key": "equip_13003",
"text": "月中人"
},
+ "atlas_id": "72",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7446,6 +7601,7 @@
"key": "equip_13004",
"text": "月中人"
},
+ "atlas_id": "73",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7494,6 +7650,7 @@
"key": "equip_13001",
"text": "月中人"
},
+ "atlas_id": "70",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7542,6 +7699,7 @@
"key": "equip_13002",
"text": "月中人"
},
+ "atlas_id": "71",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7590,6 +7748,7 @@
"key": "equip_13003",
"text": "月中人"
},
+ "atlas_id": "72",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7638,6 +7797,7 @@
"key": "equip_13004",
"text": "月中人"
},
+ "atlas_id": "73",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7686,6 +7846,7 @@
"key": "equip_13001",
"text": "月中人"
},
+ "atlas_id": "70",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7734,6 +7895,7 @@
"key": "equip_13002",
"text": "月中人"
},
+ "atlas_id": "71",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7782,6 +7944,7 @@
"key": "equip_13003",
"text": "月中人"
},
+ "atlas_id": "72",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7830,6 +7993,7 @@
"key": "equip_13004",
"text": "月中人"
},
+ "atlas_id": "73",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7878,6 +8042,7 @@
"key": "equip_13001",
"text": "月中人"
},
+ "atlas_id": "70",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7926,6 +8091,7 @@
"key": "equip_13002",
"text": "月中人"
},
+ "atlas_id": "71",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7974,6 +8140,7 @@
"key": "equip_13003",
"text": "月中人"
},
+ "atlas_id": "72",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -8022,6 +8189,7 @@
"key": "equip_13004",
"text": "月中人"
},
+ "atlas_id": "73",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -8070,6 +8238,7 @@
"key": "equip_13001",
"text": "功夫五侠"
},
+ "atlas_id": "80",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8118,6 +8287,7 @@
"key": "equip_13002",
"text": "功夫五侠"
},
+ "atlas_id": "81",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8166,6 +8336,7 @@
"key": "equip_13003",
"text": "功夫五侠"
},
+ "atlas_id": "82",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8214,6 +8385,7 @@
"key": "equip_13004",
"text": "功夫五侠"
},
+ "atlas_id": "83",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8262,6 +8434,7 @@
"key": "equip_13001",
"text": "功夫五侠"
},
+ "atlas_id": "80",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8310,6 +8483,7 @@
"key": "equip_13002",
"text": "功夫五侠"
},
+ "atlas_id": "81",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8358,6 +8532,7 @@
"key": "equip_13003",
"text": "功夫五侠"
},
+ "atlas_id": "82",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8406,6 +8581,7 @@
"key": "equip_13004",
"text": "功夫五侠"
},
+ "atlas_id": "83",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8454,6 +8630,7 @@
"key": "equip_13001",
"text": "功夫五侠"
},
+ "atlas_id": "80",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8502,6 +8679,7 @@
"key": "equip_13002",
"text": "功夫五侠"
},
+ "atlas_id": "81",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8550,6 +8728,7 @@
"key": "equip_13003",
"text": "功夫五侠"
},
+ "atlas_id": "82",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8598,6 +8777,7 @@
"key": "equip_13004",
"text": "功夫五侠"
},
+ "atlas_id": "83",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8646,6 +8826,7 @@
"key": "equip_13001",
"text": "功夫五侠"
},
+ "atlas_id": "80",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8694,6 +8875,7 @@
"key": "equip_13002",
"text": "功夫五侠"
},
+ "atlas_id": "81",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8742,6 +8924,7 @@
"key": "equip_13003",
"text": "功夫五侠"
},
+ "atlas_id": "82",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8790,6 +8973,7 @@
"key": "equip_13004",
"text": "功夫五侠"
},
+ "atlas_id": "83",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8838,6 +9022,7 @@
"key": "equip_13001",
"text": "功夫五侠"
},
+ "atlas_id": "80",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8886,6 +9071,7 @@
"key": "equip_13002",
"text": "功夫五侠"
},
+ "atlas_id": "81",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8934,6 +9120,7 @@
"key": "equip_13003",
"text": "功夫五侠"
},
+ "atlas_id": "82",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8982,6 +9169,7 @@
"key": "equip_13004",
"text": "功夫五侠"
},
+ "atlas_id": "83",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -9030,6 +9218,7 @@
"key": "equip_13001",
"text": "功夫五侠"
},
+ "atlas_id": "80",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -9078,6 +9267,7 @@
"key": "equip_13002",
"text": "功夫五侠"
},
+ "atlas_id": "81",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -9126,6 +9316,7 @@
"key": "equip_13003",
"text": "功夫五侠"
},
+ "atlas_id": "82",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -9174,6 +9365,7 @@
"key": "equip_13004",
"text": "功夫五侠"
},
+ "atlas_id": "83",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -9222,6 +9414,7 @@
"key": "equip_13001",
"text": "黄金包子"
},
+ "atlas_id": "90",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9270,6 +9463,7 @@
"key": "equip_13002",
"text": "黄金包子"
},
+ "atlas_id": "91",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9318,6 +9512,7 @@
"key": "equip_13003",
"text": "黄金包子"
},
+ "atlas_id": "92",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9366,6 +9561,7 @@
"key": "equip_13004",
"text": "黄金包子"
},
+ "atlas_id": "93",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9414,6 +9610,7 @@
"key": "equip_13001",
"text": "黄金包子"
},
+ "atlas_id": "90",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9462,6 +9659,7 @@
"key": "equip_13002",
"text": "黄金包子"
},
+ "atlas_id": "91",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9510,6 +9708,7 @@
"key": "equip_13003",
"text": "黄金包子"
},
+ "atlas_id": "92",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9558,6 +9757,7 @@
"key": "equip_13004",
"text": "黄金包子"
},
+ "atlas_id": "93",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9606,6 +9806,7 @@
"key": "equip_13001",
"text": "黄金包子"
},
+ "atlas_id": "90",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9654,6 +9855,7 @@
"key": "equip_13002",
"text": "黄金包子"
},
+ "atlas_id": "91",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9702,6 +9904,7 @@
"key": "equip_13003",
"text": "黄金包子"
},
+ "atlas_id": "92",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9750,6 +9953,7 @@
"key": "equip_13004",
"text": "黄金包子"
},
+ "atlas_id": "93",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9798,6 +10002,7 @@
"key": "equip_13001",
"text": "黄金包子"
},
+ "atlas_id": "90",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9846,6 +10051,7 @@
"key": "equip_13002",
"text": "黄金包子"
},
+ "atlas_id": "91",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9894,6 +10100,7 @@
"key": "equip_13003",
"text": "黄金包子"
},
+ "atlas_id": "92",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9942,6 +10149,7 @@
"key": "equip_13004",
"text": "黄金包子"
},
+ "atlas_id": "93",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9990,6 +10198,7 @@
"key": "equip_13001",
"text": "黄金包子"
},
+ "atlas_id": "90",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -10038,6 +10247,7 @@
"key": "equip_13002",
"text": "黄金包子"
},
+ "atlas_id": "91",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -10086,6 +10296,7 @@
"key": "equip_13003",
"text": "黄金包子"
},
+ "atlas_id": "92",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -10134,6 +10345,7 @@
"key": "equip_13004",
"text": "黄金包子"
},
+ "atlas_id": "93",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -10182,6 +10394,7 @@
"key": "equip_13001",
"text": "黄金包子"
},
+ "atlas_id": "90",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -10230,6 +10443,7 @@
"key": "equip_13002",
"text": "黄金包子"
},
+ "atlas_id": "91",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -10278,6 +10492,7 @@
"key": "equip_13003",
"text": "黄金包子"
},
+ "atlas_id": "92",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -10326,6 +10541,7 @@
"key": "equip_13004",
"text": "黄金包子"
},
+ "atlas_id": "93",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -10374,6 +10590,7 @@
"key": "equip_13001",
"text": "月台"
},
+ "atlas_id": "100",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10422,6 +10639,7 @@
"key": "equip_13002",
"text": "月台"
},
+ "atlas_id": "101",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10470,6 +10688,7 @@
"key": "equip_13003",
"text": "月台"
},
+ "atlas_id": "102",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10518,6 +10737,7 @@
"key": "equip_13004",
"text": "月台"
},
+ "atlas_id": "103",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10566,6 +10786,7 @@
"key": "equip_13001",
"text": "月台"
},
+ "atlas_id": "100",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10614,6 +10835,7 @@
"key": "equip_13002",
"text": "月台"
},
+ "atlas_id": "101",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10662,6 +10884,7 @@
"key": "equip_13003",
"text": "月台"
},
+ "atlas_id": "102",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10710,6 +10933,7 @@
"key": "equip_13004",
"text": "月台"
},
+ "atlas_id": "103",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10758,6 +10982,7 @@
"key": "equip_13001",
"text": "月台"
},
+ "atlas_id": "100",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10806,6 +11031,7 @@
"key": "equip_13002",
"text": "月台"
},
+ "atlas_id": "101",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10854,6 +11080,7 @@
"key": "equip_13003",
"text": "月台"
},
+ "atlas_id": "102",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10902,6 +11129,7 @@
"key": "equip_13004",
"text": "月台"
},
+ "atlas_id": "103",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10950,6 +11178,7 @@
"key": "equip_13001",
"text": "月台"
},
+ "atlas_id": "100",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10998,6 +11227,7 @@
"key": "equip_13002",
"text": "月台"
},
+ "atlas_id": "101",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -11046,6 +11276,7 @@
"key": "equip_13003",
"text": "月台"
},
+ "atlas_id": "102",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -11094,6 +11325,7 @@
"key": "equip_13004",
"text": "月台"
},
+ "atlas_id": "103",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -11142,6 +11374,7 @@
"key": "equip_13001",
"text": "月台"
},
+ "atlas_id": "100",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -11190,6 +11423,7 @@
"key": "equip_13002",
"text": "月台"
},
+ "atlas_id": "101",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -11238,6 +11472,7 @@
"key": "equip_13003",
"text": "月台"
},
+ "atlas_id": "102",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -11286,6 +11521,7 @@
"key": "equip_13004",
"text": "月台"
},
+ "atlas_id": "103",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -11334,6 +11570,7 @@
"key": "equip_13001",
"text": "月台"
},
+ "atlas_id": "100",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -11382,6 +11619,7 @@
"key": "equip_13002",
"text": "月台"
},
+ "atlas_id": "101",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -11430,6 +11668,7 @@
"key": "equip_13003",
"text": "月台"
},
+ "atlas_id": "102",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -11478,6 +11717,7 @@
"key": "equip_13004",
"text": "月台"
},
+ "atlas_id": "103",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -11526,6 +11766,7 @@
"key": "equip_13005",
"text": "老板"
},
+ "atlas_id": "114",
"suittype": 11,
"suitintr": {
"key": "suit_equip_10002",
@@ -11574,6 +11815,7 @@
"key": "equip_13006",
"text": "老板"
},
+ "atlas_id": "115",
"suittype": 11,
"suitintr": {
"key": "suit_equip_10002",
@@ -11622,6 +11864,7 @@
"key": "equip_13005",
"text": "老板"
},
+ "atlas_id": "114",
"suittype": 11,
"suitintr": {
"key": "suit_equip_10002",
@@ -11670,6 +11913,7 @@
"key": "equip_13006",
"text": "老板"
},
+ "atlas_id": "115",
"suittype": 11,
"suitintr": {
"key": "suit_equip_10002",
@@ -11718,6 +11962,7 @@
"key": "equip_13005",
"text": "老板"
},
+ "atlas_id": "114",
"suittype": 11,
"suitintr": {
"key": "suit_equip_10002",
@@ -11766,6 +12011,7 @@
"key": "equip_13006",
"text": "老板"
},
+ "atlas_id": "115",
"suittype": 11,
"suitintr": {
"key": "suit_equip_10002",
@@ -11814,6 +12060,7 @@
"key": "equip_13005",
"text": "老板"
},
+ "atlas_id": "114",
"suittype": 11,
"suitintr": {
"key": "suit_equip_10002",
@@ -11862,6 +12109,7 @@
"key": "equip_13006",
"text": "老板"
},
+ "atlas_id": "115",
"suittype": 11,
"suitintr": {
"key": "suit_equip_10002",
@@ -11910,6 +12158,7 @@
"key": "equip_13005",
"text": "老板"
},
+ "atlas_id": "114",
"suittype": 11,
"suitintr": {
"key": "suit_equip_10002",
@@ -11958,6 +12207,7 @@
"key": "equip_13006",
"text": "老板"
},
+ "atlas_id": "115",
"suittype": 11,
"suitintr": {
"key": "suit_equip_10002",
@@ -12006,6 +12256,7 @@
"key": "equip_13005",
"text": "老板"
},
+ "atlas_id": "114",
"suittype": 11,
"suitintr": {
"key": "suit_equip_10002",
@@ -12054,6 +12305,7 @@
"key": "equip_13006",
"text": "老板"
},
+ "atlas_id": "115",
"suittype": 11,
"suitintr": {
"key": "suit_equip_10002",
@@ -12102,6 +12354,7 @@
"key": "equip_13005",
"text": "野蛮人"
},
+ "atlas_id": "124",
"suittype": 12,
"suitintr": {
"key": "suit_equip_10002",
@@ -12150,6 +12403,7 @@
"key": "equip_13006",
"text": "野蛮人"
},
+ "atlas_id": "125",
"suittype": 12,
"suitintr": {
"key": "suit_equip_10002",
@@ -12198,6 +12452,7 @@
"key": "equip_13005",
"text": "野蛮人"
},
+ "atlas_id": "124",
"suittype": 12,
"suitintr": {
"key": "suit_equip_10002",
@@ -12246,6 +12501,7 @@
"key": "equip_13006",
"text": "野蛮人"
},
+ "atlas_id": "125",
"suittype": 12,
"suitintr": {
"key": "suit_equip_10002",
@@ -12294,6 +12550,7 @@
"key": "equip_13005",
"text": "野蛮人"
},
+ "atlas_id": "124",
"suittype": 12,
"suitintr": {
"key": "suit_equip_10002",
@@ -12342,6 +12599,7 @@
"key": "equip_13006",
"text": "野蛮人"
},
+ "atlas_id": "125",
"suittype": 12,
"suitintr": {
"key": "suit_equip_10002",
@@ -12390,6 +12648,7 @@
"key": "equip_13005",
"text": "野蛮人"
},
+ "atlas_id": "124",
"suittype": 12,
"suitintr": {
"key": "suit_equip_10002",
@@ -12438,6 +12697,7 @@
"key": "equip_13006",
"text": "野蛮人"
},
+ "atlas_id": "125",
"suittype": 12,
"suitintr": {
"key": "suit_equip_10002",
@@ -12486,6 +12746,7 @@
"key": "equip_13005",
"text": "野蛮人"
},
+ "atlas_id": "124",
"suittype": 12,
"suitintr": {
"key": "suit_equip_10002",
@@ -12534,6 +12795,7 @@
"key": "equip_13006",
"text": "野蛮人"
},
+ "atlas_id": "125",
"suittype": 12,
"suitintr": {
"key": "suit_equip_10002",
@@ -12582,6 +12844,7 @@
"key": "equip_13005",
"text": "野蛮人"
},
+ "atlas_id": "124",
"suittype": 12,
"suitintr": {
"key": "suit_equip_10002",
@@ -12630,6 +12893,7 @@
"key": "equip_13006",
"text": "野蛮人"
},
+ "atlas_id": "125",
"suittype": 12,
"suitintr": {
"key": "suit_equip_10002",
@@ -12678,6 +12942,7 @@
"key": "equip_13005",
"text": "文明人"
},
+ "atlas_id": "134",
"suittype": 13,
"suitintr": {
"key": "suit_equip_10002",
@@ -12726,6 +12991,7 @@
"key": "equip_13006",
"text": "文明人"
},
+ "atlas_id": "135",
"suittype": 13,
"suitintr": {
"key": "suit_equip_10002",
@@ -12774,6 +13040,7 @@
"key": "equip_13005",
"text": "文明人"
},
+ "atlas_id": "134",
"suittype": 13,
"suitintr": {
"key": "suit_equip_10002",
@@ -12822,6 +13089,7 @@
"key": "equip_13006",
"text": "文明人"
},
+ "atlas_id": "135",
"suittype": 13,
"suitintr": {
"key": "suit_equip_10002",
@@ -12870,6 +13138,7 @@
"key": "equip_13005",
"text": "文明人"
},
+ "atlas_id": "134",
"suittype": 13,
"suitintr": {
"key": "suit_equip_10002",
@@ -12918,6 +13187,7 @@
"key": "equip_13006",
"text": "文明人"
},
+ "atlas_id": "135",
"suittype": 13,
"suitintr": {
"key": "suit_equip_10002",
@@ -12966,6 +13236,7 @@
"key": "equip_13005",
"text": "文明人"
},
+ "atlas_id": "134",
"suittype": 13,
"suitintr": {
"key": "suit_equip_10002",
@@ -13014,6 +13285,7 @@
"key": "equip_13006",
"text": "文明人"
},
+ "atlas_id": "135",
"suittype": 13,
"suitintr": {
"key": "suit_equip_10002",
@@ -13062,6 +13334,7 @@
"key": "equip_13005",
"text": "文明人"
},
+ "atlas_id": "134",
"suittype": 13,
"suitintr": {
"key": "suit_equip_10002",
@@ -13110,6 +13383,7 @@
"key": "equip_13006",
"text": "文明人"
},
+ "atlas_id": "135",
"suittype": 13,
"suitintr": {
"key": "suit_equip_10002",
@@ -13158,6 +13432,7 @@
"key": "equip_13005",
"text": "文明人"
},
+ "atlas_id": "134",
"suittype": 13,
"suitintr": {
"key": "suit_equip_10002",
@@ -13206,6 +13481,7 @@
"key": "equip_13006",
"text": "文明人"
},
+ "atlas_id": "135",
"suittype": 13,
"suitintr": {
"key": "suit_equip_10002",
@@ -13254,6 +13530,7 @@
"key": "equip_13005",
"text": "玉如意"
},
+ "atlas_id": "144",
"suittype": 14,
"suitintr": {
"key": "suit_equip_10002",
@@ -13302,6 +13579,7 @@
"key": "equip_13006",
"text": "玉如意"
},
+ "atlas_id": "145",
"suittype": 14,
"suitintr": {
"key": "suit_equip_10002",
@@ -13350,6 +13628,7 @@
"key": "equip_13005",
"text": "玉如意"
},
+ "atlas_id": "144",
"suittype": 14,
"suitintr": {
"key": "suit_equip_10002",
@@ -13398,6 +13677,7 @@
"key": "equip_13006",
"text": "玉如意"
},
+ "atlas_id": "145",
"suittype": 14,
"suitintr": {
"key": "suit_equip_10002",
@@ -13446,6 +13726,7 @@
"key": "equip_13005",
"text": "玉如意"
},
+ "atlas_id": "144",
"suittype": 14,
"suitintr": {
"key": "suit_equip_10002",
@@ -13494,6 +13775,7 @@
"key": "equip_13006",
"text": "玉如意"
},
+ "atlas_id": "145",
"suittype": 14,
"suitintr": {
"key": "suit_equip_10002",
@@ -13542,6 +13824,7 @@
"key": "equip_13005",
"text": "玉如意"
},
+ "atlas_id": "144",
"suittype": 14,
"suitintr": {
"key": "suit_equip_10002",
@@ -13590,6 +13873,7 @@
"key": "equip_13006",
"text": "玉如意"
},
+ "atlas_id": "145",
"suittype": 14,
"suitintr": {
"key": "suit_equip_10002",
@@ -13638,6 +13922,7 @@
"key": "equip_13005",
"text": "玉如意"
},
+ "atlas_id": "144",
"suittype": 14,
"suitintr": {
"key": "suit_equip_10002",
@@ -13686,6 +13971,7 @@
"key": "equip_13006",
"text": "玉如意"
},
+ "atlas_id": "145",
"suittype": 14,
"suitintr": {
"key": "suit_equip_10002",
@@ -13734,6 +14020,7 @@
"key": "equip_13005",
"text": "玉如意"
},
+ "atlas_id": "144",
"suittype": 14,
"suitintr": {
"key": "suit_equip_10002",
@@ -13782,6 +14069,7 @@
"key": "equip_13006",
"text": "玉如意"
},
+ "atlas_id": "145",
"suittype": 14,
"suitintr": {
"key": "suit_equip_10002",
@@ -13830,6 +14118,7 @@
"key": "equip_13005",
"text": "牙仙"
},
+ "atlas_id": "154",
"suittype": 15,
"suitintr": {
"key": "suit_equip_10002",
@@ -13878,6 +14167,7 @@
"key": "equip_13006",
"text": "牙仙"
},
+ "atlas_id": "155",
"suittype": 15,
"suitintr": {
"key": "suit_equip_10002",
@@ -13926,6 +14216,7 @@
"key": "equip_13005",
"text": "牙仙"
},
+ "atlas_id": "154",
"suittype": 15,
"suitintr": {
"key": "suit_equip_10002",
@@ -13974,6 +14265,7 @@
"key": "equip_13006",
"text": "牙仙"
},
+ "atlas_id": "155",
"suittype": 15,
"suitintr": {
"key": "suit_equip_10002",
@@ -14022,6 +14314,7 @@
"key": "equip_13005",
"text": "牙仙"
},
+ "atlas_id": "154",
"suittype": 15,
"suitintr": {
"key": "suit_equip_10002",
@@ -14070,6 +14363,7 @@
"key": "equip_13006",
"text": "牙仙"
},
+ "atlas_id": "155",
"suittype": 15,
"suitintr": {
"key": "suit_equip_10002",
@@ -14118,6 +14412,7 @@
"key": "equip_13005",
"text": "牙仙"
},
+ "atlas_id": "154",
"suittype": 15,
"suitintr": {
"key": "suit_equip_10002",
@@ -14166,6 +14461,7 @@
"key": "equip_13006",
"text": "牙仙"
},
+ "atlas_id": "155",
"suittype": 15,
"suitintr": {
"key": "suit_equip_10002",
@@ -14214,6 +14510,7 @@
"key": "equip_13005",
"text": "牙仙"
},
+ "atlas_id": "154",
"suittype": 15,
"suitintr": {
"key": "suit_equip_10002",
@@ -14262,6 +14559,7 @@
"key": "equip_13006",
"text": "牙仙"
},
+ "atlas_id": "155",
"suittype": 15,
"suitintr": {
"key": "suit_equip_10002",
@@ -14310,6 +14608,7 @@
"key": "equip_13005",
"text": "牙仙"
},
+ "atlas_id": "154",
"suittype": 15,
"suitintr": {
"key": "suit_equip_10002",
@@ -14358,6 +14657,7 @@
"key": "equip_13006",
"text": "牙仙"
},
+ "atlas_id": "155",
"suittype": 15,
"suitintr": {
"key": "suit_equip_10002",
@@ -14406,6 +14706,7 @@
"key": "equip_13005",
"text": "圣诞老人"
},
+ "atlas_id": "164",
"suittype": 16,
"suitintr": {
"key": "suit_equip_10002",
@@ -14454,6 +14755,7 @@
"key": "equip_13006",
"text": "圣诞老人"
},
+ "atlas_id": "165",
"suittype": 16,
"suitintr": {
"key": "suit_equip_10002",
@@ -14502,6 +14804,7 @@
"key": "equip_13005",
"text": "圣诞老人"
},
+ "atlas_id": "164",
"suittype": 16,
"suitintr": {
"key": "suit_equip_10002",
@@ -14550,6 +14853,7 @@
"key": "equip_13006",
"text": "圣诞老人"
},
+ "atlas_id": "165",
"suittype": 16,
"suitintr": {
"key": "suit_equip_10002",
@@ -14598,6 +14902,7 @@
"key": "equip_13005",
"text": "圣诞老人"
},
+ "atlas_id": "164",
"suittype": 16,
"suitintr": {
"key": "suit_equip_10002",
@@ -14646,6 +14951,7 @@
"key": "equip_13006",
"text": "圣诞老人"
},
+ "atlas_id": "165",
"suittype": 16,
"suitintr": {
"key": "suit_equip_10002",
@@ -14694,6 +15000,7 @@
"key": "equip_13005",
"text": "圣诞老人"
},
+ "atlas_id": "164",
"suittype": 16,
"suitintr": {
"key": "suit_equip_10002",
@@ -14742,6 +15049,7 @@
"key": "equip_13006",
"text": "圣诞老人"
},
+ "atlas_id": "165",
"suittype": 16,
"suitintr": {
"key": "suit_equip_10002",
@@ -14790,6 +15098,7 @@
"key": "equip_13005",
"text": "圣诞老人"
},
+ "atlas_id": "164",
"suittype": 16,
"suitintr": {
"key": "suit_equip_10002",
@@ -14838,6 +15147,7 @@
"key": "equip_13006",
"text": "圣诞老人"
},
+ "atlas_id": "165",
"suittype": 16,
"suitintr": {
"key": "suit_equip_10002",
@@ -14886,6 +15196,7 @@
"key": "equip_13005",
"text": "圣诞老人"
},
+ "atlas_id": "164",
"suittype": 16,
"suitintr": {
"key": "suit_equip_10002",
@@ -14934,6 +15245,7 @@
"key": "equip_13006",
"text": "圣诞老人"
},
+ "atlas_id": "165",
"suittype": 16,
"suitintr": {
"key": "suit_equip_10002",
@@ -14982,6 +15294,7 @@
"key": "equip_13005",
"text": "睡神"
},
+ "atlas_id": "174",
"suittype": 17,
"suitintr": {
"key": "suit_equip_10002",
@@ -15030,6 +15343,7 @@
"key": "equip_13006",
"text": "睡神"
},
+ "atlas_id": "175",
"suittype": 17,
"suitintr": {
"key": "suit_equip_10002",
@@ -15078,6 +15392,7 @@
"key": "equip_13005",
"text": "睡神"
},
+ "atlas_id": "174",
"suittype": 17,
"suitintr": {
"key": "suit_equip_10002",
@@ -15126,6 +15441,7 @@
"key": "equip_13006",
"text": "睡神"
},
+ "atlas_id": "175",
"suittype": 17,
"suitintr": {
"key": "suit_equip_10002",
@@ -15174,6 +15490,7 @@
"key": "equip_13005",
"text": "睡神"
},
+ "atlas_id": "174",
"suittype": 17,
"suitintr": {
"key": "suit_equip_10002",
@@ -15222,6 +15539,7 @@
"key": "equip_13006",
"text": "睡神"
},
+ "atlas_id": "175",
"suittype": 17,
"suitintr": {
"key": "suit_equip_10002",
@@ -15270,6 +15588,7 @@
"key": "equip_13005",
"text": "睡神"
},
+ "atlas_id": "174",
"suittype": 17,
"suitintr": {
"key": "suit_equip_10002",
@@ -15318,6 +15637,7 @@
"key": "equip_13006",
"text": "睡神"
},
+ "atlas_id": "175",
"suittype": 17,
"suitintr": {
"key": "suit_equip_10002",
@@ -15366,6 +15686,7 @@
"key": "equip_13005",
"text": "睡神"
},
+ "atlas_id": "174",
"suittype": 17,
"suitintr": {
"key": "suit_equip_10002",
@@ -15414,6 +15735,7 @@
"key": "equip_13006",
"text": "睡神"
},
+ "atlas_id": "175",
"suittype": 17,
"suitintr": {
"key": "suit_equip_10002",
@@ -15462,6 +15784,7 @@
"key": "equip_13005",
"text": "睡神"
},
+ "atlas_id": "174",
"suittype": 17,
"suitintr": {
"key": "suit_equip_10002",
@@ -15510,6 +15833,7 @@
"key": "equip_13006",
"text": "睡神"
},
+ "atlas_id": "175",
"suittype": 17,
"suitintr": {
"key": "suit_equip_10002",
@@ -15558,6 +15882,7 @@
"key": "equip_13005",
"text": "维京"
},
+ "atlas_id": "184",
"suittype": 18,
"suitintr": {
"key": "suit_equip_10002",
@@ -15606,6 +15931,7 @@
"key": "equip_13006",
"text": "维京"
},
+ "atlas_id": "185",
"suittype": 18,
"suitintr": {
"key": "suit_equip_10002",
@@ -15654,6 +15980,7 @@
"key": "equip_13005",
"text": "维京"
},
+ "atlas_id": "184",
"suittype": 18,
"suitintr": {
"key": "suit_equip_10002",
@@ -15702,6 +16029,7 @@
"key": "equip_13006",
"text": "维京"
},
+ "atlas_id": "185",
"suittype": 18,
"suitintr": {
"key": "suit_equip_10002",
@@ -15750,6 +16078,7 @@
"key": "equip_13005",
"text": "维京"
},
+ "atlas_id": "184",
"suittype": 18,
"suitintr": {
"key": "suit_equip_10002",
@@ -15798,6 +16127,7 @@
"key": "equip_13006",
"text": "维京"
},
+ "atlas_id": "185",
"suittype": 18,
"suitintr": {
"key": "suit_equip_10002",
@@ -15846,6 +16176,7 @@
"key": "equip_13005",
"text": "维京"
},
+ "atlas_id": "184",
"suittype": 18,
"suitintr": {
"key": "suit_equip_10002",
@@ -15894,6 +16225,7 @@
"key": "equip_13006",
"text": "维京"
},
+ "atlas_id": "185",
"suittype": 18,
"suitintr": {
"key": "suit_equip_10002",
@@ -15942,6 +16274,7 @@
"key": "equip_13005",
"text": "维京"
},
+ "atlas_id": "184",
"suittype": 18,
"suitintr": {
"key": "suit_equip_10002",
@@ -15990,6 +16323,7 @@
"key": "equip_13006",
"text": "维京"
},
+ "atlas_id": "185",
"suittype": 18,
"suitintr": {
"key": "suit_equip_10002",
@@ -16038,6 +16372,7 @@
"key": "equip_13005",
"text": "维京"
},
+ "atlas_id": "184",
"suittype": 18,
"suitintr": {
"key": "suit_equip_10002",
@@ -16086,6 +16421,7 @@
"key": "equip_13006",
"text": "维京"
},
+ "atlas_id": "185",
"suittype": 18,
"suitintr": {
"key": "suit_equip_10002",
@@ -16134,6 +16470,7 @@
"key": "equip_13005",
"text": "史莱克"
},
+ "atlas_id": "194",
"suittype": 19,
"suitintr": {
"key": "suit_equip_10002",
@@ -16182,6 +16519,7 @@
"key": "equip_13006",
"text": "史莱克"
},
+ "atlas_id": "195",
"suittype": 19,
"suitintr": {
"key": "suit_equip_10002",
@@ -16230,6 +16568,7 @@
"key": "equip_13005",
"text": "史莱克"
},
+ "atlas_id": "194",
"suittype": 19,
"suitintr": {
"key": "suit_equip_10002",
@@ -16278,6 +16617,7 @@
"key": "equip_13006",
"text": "史莱克"
},
+ "atlas_id": "195",
"suittype": 19,
"suitintr": {
"key": "suit_equip_10002",
@@ -16326,6 +16666,7 @@
"key": "equip_13005",
"text": "史莱克"
},
+ "atlas_id": "194",
"suittype": 19,
"suitintr": {
"key": "suit_equip_10002",
@@ -16374,6 +16715,7 @@
"key": "equip_13006",
"text": "史莱克"
},
+ "atlas_id": "195",
"suittype": 19,
"suitintr": {
"key": "suit_equip_10002",
@@ -16422,6 +16764,7 @@
"key": "equip_13005",
"text": "史莱克"
},
+ "atlas_id": "194",
"suittype": 19,
"suitintr": {
"key": "suit_equip_10002",
@@ -16470,6 +16813,7 @@
"key": "equip_13006",
"text": "史莱克"
},
+ "atlas_id": "195",
"suittype": 19,
"suitintr": {
"key": "suit_equip_10002",
@@ -16518,6 +16862,7 @@
"key": "equip_13005",
"text": "史莱克"
},
+ "atlas_id": "194",
"suittype": 19,
"suitintr": {
"key": "suit_equip_10002",
@@ -16566,6 +16911,7 @@
"key": "equip_13006",
"text": "史莱克"
},
+ "atlas_id": "195",
"suittype": 19,
"suitintr": {
"key": "suit_equip_10002",
@@ -16614,6 +16960,7 @@
"key": "equip_13005",
"text": "史莱克"
},
+ "atlas_id": "194",
"suittype": 19,
"suitintr": {
"key": "suit_equip_10002",
@@ -16662,6 +17009,7 @@
"key": "equip_13006",
"text": "史莱克"
},
+ "atlas_id": "195",
"suittype": 19,
"suitintr": {
"key": "suit_equip_10002",
@@ -16710,6 +17058,7 @@
"key": "equip_20001",
"text": "输出武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -16758,6 +17107,7 @@
"key": "equip_20002",
"text": "防御武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -16806,6 +17156,7 @@
"key": "equip_20003",
"text": "辅助武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -16854,6 +17205,7 @@
"key": "equip_20004",
"text": "控制武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -16902,6 +17254,7 @@
"key": "equip_20001",
"text": "输出武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -16950,6 +17303,7 @@
"key": "equip_20002",
"text": "防御武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -16998,6 +17352,7 @@
"key": "equip_20003",
"text": "辅助武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17046,6 +17401,7 @@
"key": "equip_20004",
"text": "控制武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17094,6 +17450,7 @@
"key": "equip_20001",
"text": "输出武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17142,6 +17499,7 @@
"key": "equip_20002",
"text": "防御武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17190,6 +17548,7 @@
"key": "equip_20003",
"text": "辅助武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17238,6 +17597,7 @@
"key": "equip_20004",
"text": "控制武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17286,6 +17646,7 @@
"key": "equip_20001",
"text": "输出武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17334,6 +17695,7 @@
"key": "equip_20002",
"text": "防御武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17382,6 +17744,7 @@
"key": "equip_20003",
"text": "辅助武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17430,6 +17793,7 @@
"key": "equip_20004",
"text": "控制武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17478,6 +17842,7 @@
"key": "equip_20001",
"text": "输出武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17524,6 +17889,7 @@
"key": "equip_20002",
"text": "防御武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17570,6 +17936,7 @@
"key": "equip_20003",
"text": "辅助武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17616,6 +17983,7 @@
"key": "equip_20004",
"text": "控制武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17662,6 +18030,7 @@
"key": "equip_20001",
"text": "输出武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17708,6 +18077,7 @@
"key": "equip_20002",
"text": "防御武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17754,6 +18124,7 @@
"key": "equip_20003",
"text": "辅助武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17800,6 +18171,7 @@
"key": "equip_20004",
"text": "控制武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17846,6 +18218,7 @@
"key": "equip_30001",
"text": "直觉饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17894,6 +18267,7 @@
"key": "equip_30002",
"text": "真诚饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17942,6 +18316,7 @@
"key": "equip_30003",
"text": "共情饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17990,6 +18365,7 @@
"key": "equip_30004",
"text": "责任饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18038,6 +18414,7 @@
"key": "equip_30001",
"text": "直觉饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18086,6 +18463,7 @@
"key": "equip_30002",
"text": "真诚饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18134,6 +18512,7 @@
"key": "equip_30003",
"text": "共情饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18182,6 +18561,7 @@
"key": "equip_30004",
"text": "责任饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18230,6 +18610,7 @@
"key": "equip_30001",
"text": "直觉饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18278,6 +18659,7 @@
"key": "equip_30002",
"text": "真诚饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18326,6 +18708,7 @@
"key": "equip_30003",
"text": "共情饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18374,6 +18757,7 @@
"key": "equip_30004",
"text": "责任饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18422,6 +18806,7 @@
"key": "equip_30001",
"text": "直觉饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18470,6 +18855,7 @@
"key": "equip_30002",
"text": "真诚饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18518,6 +18904,7 @@
"key": "equip_30003",
"text": "共情饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18566,6 +18953,7 @@
"key": "equip_30004",
"text": "责任饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18614,6 +19002,7 @@
"key": "equip_30001",
"text": "直觉饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18660,6 +19049,7 @@
"key": "equip_30002",
"text": "真诚饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18706,6 +19096,7 @@
"key": "equip_30003",
"text": "共情饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18752,6 +19143,7 @@
"key": "equip_30004",
"text": "责任饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18798,6 +19190,7 @@
"key": "equip_30001",
"text": "直觉饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18844,6 +19237,7 @@
"key": "equip_30002",
"text": "真诚饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18890,6 +19284,7 @@
"key": "equip_30003",
"text": "共情饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18936,6 +19331,7 @@
"key": "equip_30004",
"text": "责任饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
diff --git a/bin/json/game_smithyatlas.json b/bin/json/game_smithyatlas.json
new file mode 100644
index 000000000..e8ad79f1e
--- /dev/null
+++ b/bin/json/game_smithyatlas.json
@@ -0,0 +1,258 @@
+[
+ {
+ "id": "10",
+ "tab_id": 1,
+ "type_id": 1,
+ "name_text": {
+ "key": "1",
+ "text": "神龙卷轴残卷一"
+ },
+ "content_text": {
+ "key": "1",
+ "text": "神龙卷轴来历描述"
+ },
+ "atlas_score": 0,
+ "atlas_giver": 0,
+ "quality": 0
+ },
+ {
+ "id": "11",
+ "tab_id": 1,
+ "type_id": 1,
+ "name_text": {
+ "key": "2",
+ "text": "神龙卷轴残卷二"
+ },
+ "content_text": {
+ "key": "2",
+ "text": "神龙卷轴来历描述"
+ },
+ "atlas_score": 0,
+ "atlas_giver": 0,
+ "quality": 0
+ },
+ {
+ "id": "12",
+ "tab_id": 1,
+ "type_id": 1,
+ "name_text": {
+ "key": "3",
+ "text": "神龙卷轴残卷三"
+ },
+ "content_text": {
+ "key": "3",
+ "text": "神龙卷轴来历描述"
+ },
+ "atlas_score": 0,
+ "atlas_giver": 0,
+ "quality": 0
+ },
+ {
+ "id": "13",
+ "tab_id": 1,
+ "type_id": 1,
+ "name_text": {
+ "key": "4",
+ "text": "神龙卷轴残卷四"
+ },
+ "content_text": {
+ "key": "4",
+ "text": "神龙卷轴来历描述"
+ },
+ "atlas_score": 0,
+ "atlas_giver": 0,
+ "quality": 0
+ },
+ {
+ "id": "14",
+ "tab_id": 2,
+ "type_id": 1,
+ "name_text": {
+ "key": "5",
+ "text": "魔法大师卷一"
+ },
+ "content_text": {
+ "key": "5",
+ "text": "魔法大师来历描述"
+ },
+ "atlas_score": 0,
+ "atlas_giver": 0,
+ "quality": 0
+ },
+ {
+ "id": "15",
+ "tab_id": 2,
+ "type_id": 1,
+ "name_text": {
+ "key": "6",
+ "text": "魔法大师卷二"
+ },
+ "content_text": {
+ "key": "6",
+ "text": "魔法大师来历描述"
+ },
+ "atlas_score": 0,
+ "atlas_giver": 0,
+ "quality": 0
+ },
+ {
+ "id": "16",
+ "tab_id": 2,
+ "type_id": 1,
+ "name_text": {
+ "key": "7",
+ "text": "魔法大师卷三"
+ },
+ "content_text": {
+ "key": "7",
+ "text": "魔法大师来历描述"
+ },
+ "atlas_score": 0,
+ "atlas_giver": 0,
+ "quality": 0
+ },
+ {
+ "id": "17",
+ "tab_id": 2,
+ "type_id": 1,
+ "name_text": {
+ "key": "8",
+ "text": "魔法大师卷四"
+ },
+ "content_text": {
+ "key": "8",
+ "text": "魔法大师来历描述"
+ },
+ "atlas_score": 0,
+ "atlas_giver": 0,
+ "quality": 0
+ },
+ {
+ "id": "18",
+ "tab_id": 3,
+ "type_id": 1,
+ "name_text": {
+ "key": "",
+ "text": ""
+ },
+ "content_text": {
+ "key": "",
+ "text": ""
+ },
+ "atlas_score": 0,
+ "atlas_giver": 0,
+ "quality": 0
+ },
+ {
+ "id": "19",
+ "tab_id": 3,
+ "type_id": 1,
+ "name_text": {
+ "key": "",
+ "text": ""
+ },
+ "content_text": {
+ "key": "",
+ "text": ""
+ },
+ "atlas_score": 0,
+ "atlas_giver": 0,
+ "quality": 0
+ },
+ {
+ "id": "20",
+ "tab_id": 3,
+ "type_id": 1,
+ "name_text": {
+ "key": "",
+ "text": ""
+ },
+ "content_text": {
+ "key": "",
+ "text": ""
+ },
+ "atlas_score": 0,
+ "atlas_giver": 0,
+ "quality": 0
+ },
+ {
+ "id": "21",
+ "tab_id": 3,
+ "type_id": 1,
+ "name_text": {
+ "key": "",
+ "text": ""
+ },
+ "content_text": {
+ "key": "",
+ "text": ""
+ },
+ "atlas_score": 0,
+ "atlas_giver": 0,
+ "quality": 0
+ },
+ {
+ "id": "10013",
+ "tab_id": 4,
+ "type_id": 2,
+ "name_text": {
+ "key": "",
+ "text": ""
+ },
+ "content_text": {
+ "key": "",
+ "text": ""
+ },
+ "atlas_score": 30,
+ "atlas_giver": 30,
+ "quality": 1
+ },
+ {
+ "id": "10014",
+ "tab_id": 4,
+ "type_id": 2,
+ "name_text": {
+ "key": "",
+ "text": ""
+ },
+ "content_text": {
+ "key": "",
+ "text": ""
+ },
+ "atlas_score": 60,
+ "atlas_giver": 60,
+ "quality": 2
+ },
+ {
+ "id": "10015",
+ "tab_id": 4,
+ "type_id": 2,
+ "name_text": {
+ "key": "",
+ "text": ""
+ },
+ "content_text": {
+ "key": "",
+ "text": ""
+ },
+ "atlas_score": 120,
+ "atlas_giver": 120,
+ "quality": 3
+ },
+ {
+ "id": "10016",
+ "tab_id": 4,
+ "type_id": 2,
+ "name_text": {
+ "key": "",
+ "text": ""
+ },
+ "content_text": {
+ "key": "",
+ "text": ""
+ },
+ "atlas_score": 240,
+ "atlas_giver": 240,
+ "quality": 4
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_smithyatlaslv.json b/bin/json/game_smithyatlaslv.json
new file mode 100644
index 000000000..1086e56b5
--- /dev/null
+++ b/bin/json/game_smithyatlaslv.json
@@ -0,0 +1,178 @@
+[
+ {
+ "atlas_lv": 1,
+ "atlas_score": 0,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 2,
+ "atlas_score": 1000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 3,
+ "atlas_score": 2000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 4,
+ "atlas_score": 3000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10004",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 5,
+ "atlas_score": 4000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10005",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 6,
+ "atlas_score": 5000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10006",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 7,
+ "atlas_score": 6000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10007",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 8,
+ "atlas_score": 7000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10008",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 9,
+ "atlas_score": 8000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10009",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 10,
+ "atlas_score": 9000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10010",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 11,
+ "atlas_score": 10000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10011",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 12,
+ "atlas_score": 11000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10012",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 13,
+ "atlas_score": 12000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10013",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 14,
+ "atlas_score": 13000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10014",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 15,
+ "atlas_score": 14000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10015",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 16,
+ "atlas_score": 15000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10016",
+ "n": 1
+ }
+ ]
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_smithyatlasscore.json b/bin/json/game_smithyatlasscore.json
new file mode 100644
index 000000000..eb3bdeb26
--- /dev/null
+++ b/bin/json/game_smithyatlasscore.json
@@ -0,0 +1,452 @@
+[
+ {
+ "id": 1,
+ "quality": 1,
+ "lv": 1,
+ "score": 1
+ },
+ {
+ "id": 2,
+ "quality": 1,
+ "lv": 5,
+ "score": 2
+ },
+ {
+ "id": 3,
+ "quality": 1,
+ "lv": 10,
+ "score": 3
+ },
+ {
+ "id": 4,
+ "quality": 1,
+ "lv": 15,
+ "score": 4
+ },
+ {
+ "id": 5,
+ "quality": 1,
+ "lv": 20,
+ "score": 5
+ },
+ {
+ "id": 6,
+ "quality": 1,
+ "lv": 25,
+ "score": 6
+ },
+ {
+ "id": 7,
+ "quality": 1,
+ "lv": 30,
+ "score": 7
+ },
+ {
+ "id": 8,
+ "quality": 1,
+ "lv": 25,
+ "score": 8
+ },
+ {
+ "id": 9,
+ "quality": 1,
+ "lv": 30,
+ "score": 9
+ },
+ {
+ "id": 10,
+ "quality": 1,
+ "lv": 35,
+ "score": 10
+ },
+ {
+ "id": 11,
+ "quality": 1,
+ "lv": 40,
+ "score": 11
+ },
+ {
+ "id": 12,
+ "quality": 1,
+ "lv": 45,
+ "score": 12
+ },
+ {
+ "id": 13,
+ "quality": 1,
+ "lv": 50,
+ "score": 13
+ },
+ {
+ "id": 14,
+ "quality": 1,
+ "lv": 55,
+ "score": 14
+ },
+ {
+ "id": 15,
+ "quality": 1,
+ "lv": 60,
+ "score": 15
+ },
+ {
+ "id": 16,
+ "quality": 2,
+ "lv": 1,
+ "score": 17
+ },
+ {
+ "id": 17,
+ "quality": 2,
+ "lv": 5,
+ "score": 19
+ },
+ {
+ "id": 18,
+ "quality": 2,
+ "lv": 10,
+ "score": 21
+ },
+ {
+ "id": 19,
+ "quality": 2,
+ "lv": 15,
+ "score": 23
+ },
+ {
+ "id": 20,
+ "quality": 2,
+ "lv": 20,
+ "score": 25
+ },
+ {
+ "id": 21,
+ "quality": 2,
+ "lv": 25,
+ "score": 27
+ },
+ {
+ "id": 22,
+ "quality": 2,
+ "lv": 30,
+ "score": 29
+ },
+ {
+ "id": 23,
+ "quality": 2,
+ "lv": 25,
+ "score": 31
+ },
+ {
+ "id": 24,
+ "quality": 2,
+ "lv": 30,
+ "score": 33
+ },
+ {
+ "id": 25,
+ "quality": 2,
+ "lv": 35,
+ "score": 35
+ },
+ {
+ "id": 26,
+ "quality": 2,
+ "lv": 40,
+ "score": 37
+ },
+ {
+ "id": 27,
+ "quality": 2,
+ "lv": 45,
+ "score": 39
+ },
+ {
+ "id": 28,
+ "quality": 2,
+ "lv": 50,
+ "score": 41
+ },
+ {
+ "id": 29,
+ "quality": 2,
+ "lv": 55,
+ "score": 43
+ },
+ {
+ "id": 30,
+ "quality": 2,
+ "lv": 60,
+ "score": 45
+ },
+ {
+ "id": 31,
+ "quality": 3,
+ "lv": 1,
+ "score": 48
+ },
+ {
+ "id": 32,
+ "quality": 3,
+ "lv": 5,
+ "score": 51
+ },
+ {
+ "id": 33,
+ "quality": 3,
+ "lv": 10,
+ "score": 54
+ },
+ {
+ "id": 34,
+ "quality": 3,
+ "lv": 15,
+ "score": 57
+ },
+ {
+ "id": 35,
+ "quality": 3,
+ "lv": 20,
+ "score": 60
+ },
+ {
+ "id": 36,
+ "quality": 3,
+ "lv": 25,
+ "score": 63
+ },
+ {
+ "id": 37,
+ "quality": 3,
+ "lv": 30,
+ "score": 66
+ },
+ {
+ "id": 38,
+ "quality": 3,
+ "lv": 25,
+ "score": 69
+ },
+ {
+ "id": 39,
+ "quality": 3,
+ "lv": 30,
+ "score": 72
+ },
+ {
+ "id": 40,
+ "quality": 3,
+ "lv": 35,
+ "score": 75
+ },
+ {
+ "id": 41,
+ "quality": 3,
+ "lv": 40,
+ "score": 78
+ },
+ {
+ "id": 42,
+ "quality": 3,
+ "lv": 45,
+ "score": 81
+ },
+ {
+ "id": 43,
+ "quality": 3,
+ "lv": 50,
+ "score": 84
+ },
+ {
+ "id": 44,
+ "quality": 3,
+ "lv": 55,
+ "score": 87
+ },
+ {
+ "id": 45,
+ "quality": 3,
+ "lv": 60,
+ "score": 90
+ },
+ {
+ "id": 46,
+ "quality": 4,
+ "lv": 1,
+ "score": 94
+ },
+ {
+ "id": 47,
+ "quality": 4,
+ "lv": 5,
+ "score": 98
+ },
+ {
+ "id": 48,
+ "quality": 4,
+ "lv": 10,
+ "score": 102
+ },
+ {
+ "id": 49,
+ "quality": 4,
+ "lv": 15,
+ "score": 106
+ },
+ {
+ "id": 50,
+ "quality": 4,
+ "lv": 20,
+ "score": 110
+ },
+ {
+ "id": 51,
+ "quality": 4,
+ "lv": 25,
+ "score": 114
+ },
+ {
+ "id": 52,
+ "quality": 4,
+ "lv": 30,
+ "score": 118
+ },
+ {
+ "id": 53,
+ "quality": 4,
+ "lv": 25,
+ "score": 122
+ },
+ {
+ "id": 54,
+ "quality": 4,
+ "lv": 30,
+ "score": 126
+ },
+ {
+ "id": 55,
+ "quality": 4,
+ "lv": 35,
+ "score": 130
+ },
+ {
+ "id": 56,
+ "quality": 4,
+ "lv": 40,
+ "score": 134
+ },
+ {
+ "id": 57,
+ "quality": 4,
+ "lv": 45,
+ "score": 138
+ },
+ {
+ "id": 58,
+ "quality": 4,
+ "lv": 50,
+ "score": 142
+ },
+ {
+ "id": 59,
+ "quality": 4,
+ "lv": 55,
+ "score": 146
+ },
+ {
+ "id": 60,
+ "quality": 4,
+ "lv": 60,
+ "score": 150
+ },
+ {
+ "id": 61,
+ "quality": 5,
+ "lv": 1,
+ "score": 155
+ },
+ {
+ "id": 62,
+ "quality": 5,
+ "lv": 5,
+ "score": 160
+ },
+ {
+ "id": 63,
+ "quality": 5,
+ "lv": 10,
+ "score": 165
+ },
+ {
+ "id": 64,
+ "quality": 5,
+ "lv": 15,
+ "score": 170
+ },
+ {
+ "id": 65,
+ "quality": 5,
+ "lv": 20,
+ "score": 175
+ },
+ {
+ "id": 66,
+ "quality": 5,
+ "lv": 25,
+ "score": 180
+ },
+ {
+ "id": 67,
+ "quality": 5,
+ "lv": 30,
+ "score": 185
+ },
+ {
+ "id": 68,
+ "quality": 5,
+ "lv": 25,
+ "score": 190
+ },
+ {
+ "id": 69,
+ "quality": 5,
+ "lv": 30,
+ "score": 195
+ },
+ {
+ "id": 70,
+ "quality": 5,
+ "lv": 35,
+ "score": 200
+ },
+ {
+ "id": 71,
+ "quality": 5,
+ "lv": 40,
+ "score": 205
+ },
+ {
+ "id": 72,
+ "quality": 5,
+ "lv": 45,
+ "score": 210
+ },
+ {
+ "id": 73,
+ "quality": 5,
+ "lv": 50,
+ "score": 215
+ },
+ {
+ "id": 74,
+ "quality": 5,
+ "lv": 55,
+ "score": 220
+ },
+ {
+ "id": 75,
+ "quality": 5,
+ "lv": 60,
+ "score": 225
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_smithytool.json b/bin/json/game_smithytool.json
index 50bea78d3..9bc66ddbc 100644
--- a/bin/json/game_smithytool.json
+++ b/bin/json/game_smithytool.json
@@ -323,7 +323,7 @@
"id": 11,
"skill_type": 2,
"skill_lv": 1,
- "preconditions": 10,
+ "preconditions": 15,
"up_material": [],
"name_text": {
"key": "",
@@ -339,7 +339,7 @@
"id": 12,
"skill_type": 2,
"skill_lv": 2,
- "preconditions": 10,
+ "preconditions": 15,
"up_material": [],
"name_text": {
"key": "",
@@ -355,7 +355,7 @@
"id": 13,
"skill_type": 2,
"skill_lv": 3,
- "preconditions": 10,
+ "preconditions": 15,
"up_material": [],
"name_text": {
"key": "",
@@ -371,7 +371,7 @@
"id": 14,
"skill_type": 2,
"skill_lv": 4,
- "preconditions": 10,
+ "preconditions": 15,
"up_material": [],
"name_text": {
"key": "",
@@ -387,7 +387,7 @@
"id": 15,
"skill_type": 2,
"skill_lv": 5,
- "preconditions": 10,
+ "preconditions": 15,
"up_material": [],
"name_text": {
"key": "",
@@ -403,7 +403,7 @@
"id": 16,
"skill_type": 2,
"skill_lv": 6,
- "preconditions": 10,
+ "preconditions": 15,
"up_material": [],
"name_text": {
"key": "",
@@ -419,7 +419,7 @@
"id": 17,
"skill_type": 2,
"skill_lv": 7,
- "preconditions": 10,
+ "preconditions": 15,
"up_material": [],
"name_text": {
"key": "",
@@ -435,7 +435,7 @@
"id": 18,
"skill_type": 2,
"skill_lv": 8,
- "preconditions": 10,
+ "preconditions": 15,
"up_material": [],
"name_text": {
"key": "",
@@ -451,7 +451,7 @@
"id": 19,
"skill_type": 2,
"skill_lv": 9,
- "preconditions": 10,
+ "preconditions": 15,
"up_material": [],
"name_text": {
"key": "",
@@ -467,7 +467,7 @@
"id": 20,
"skill_type": 2,
"skill_lv": 10,
- "preconditions": 10,
+ "preconditions": 15,
"up_material": [],
"name_text": {
"key": "",
@@ -483,7 +483,7 @@
"id": 21,
"skill_type": 3,
"skill_lv": 1,
- "preconditions": 20,
+ "preconditions": 25,
"up_material": [],
"name_text": {
"key": "",
@@ -499,7 +499,7 @@
"id": 22,
"skill_type": 3,
"skill_lv": 2,
- "preconditions": 21,
+ "preconditions": 25,
"up_material": [],
"name_text": {
"key": "",
@@ -515,7 +515,7 @@
"id": 23,
"skill_type": 3,
"skill_lv": 3,
- "preconditions": 22,
+ "preconditions": 25,
"up_material": [],
"name_text": {
"key": "",
@@ -531,7 +531,7 @@
"id": 24,
"skill_type": 3,
"skill_lv": 4,
- "preconditions": 23,
+ "preconditions": 25,
"up_material": [],
"name_text": {
"key": "",
@@ -547,7 +547,7 @@
"id": 25,
"skill_type": 3,
"skill_lv": 5,
- "preconditions": 24,
+ "preconditions": 25,
"up_material": [],
"name_text": {
"key": "",
@@ -813,7 +813,7 @@
"key": "41",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 6
+ "value": 5
},
{
"id": 42,
@@ -829,7 +829,7 @@
"key": "42",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 7
+ "value": 0
},
{
"id": 43,
@@ -845,7 +845,7 @@
"key": "43",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 8
+ "value": 0
},
{
"id": 44,
@@ -861,7 +861,7 @@
"key": "44",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 9
+ "value": 0
},
{
"id": 45,
@@ -877,7 +877,7 @@
"key": "45",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 10
+ "value": 0
},
{
"id": 46,
@@ -893,7 +893,7 @@
"key": "46",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 11
+ "value": 0
},
{
"id": 47,
@@ -909,7 +909,7 @@
"key": "47",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 12
+ "value": 0
},
{
"id": 48,
@@ -925,7 +925,7 @@
"key": "48",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 13
+ "value": 0
},
{
"id": 49,
@@ -941,7 +941,7 @@
"key": "49",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 14
+ "value": 0
},
{
"id": 50,
@@ -957,6 +957,6 @@
"key": "50",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 15
+ "value": 0
}
]
\ No newline at end of file
diff --git a/bin/json/game_vikingboss.json b/bin/json/game_vikingboss.json
index 017c32686..419601971 100644
--- a/bin/json/game_vikingboss.json
+++ b/bin/json/game_vikingboss.json
@@ -3698,5 +3698,954 @@
"n": 1
}
]
+ },
+ {
+ "id": 30010,
+ "copytype": 4,
+ "bossid": 31,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "火焰泰坦"
+ },
+ "difficulty": 1,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "10110",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10111",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10112",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10113",
+ "n": 1
+ }
+ ],
+ "drop": 1001,
+ "scene": "",
+ "bossmodel": 1001,
+ "boss_skill": 51004,
+ "boss": [
+ 11009
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 6
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 5
+ }
+ ]
+ },
+ {
+ "id": 30020,
+ "copytype": 4,
+ "bossid": 31,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "火焰泰坦"
+ },
+ "difficulty": 2,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "10120",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10121",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10122",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10113",
+ "n": 1
+ }
+ ],
+ "drop": 1002,
+ "scene": "",
+ "bossmodel": 1002,
+ "boss_skill": 51004,
+ "boss": [
+ 11009
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 7
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 6
+ }
+ ]
+ },
+ {
+ "id": 30030,
+ "copytype": 4,
+ "bossid": 31,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "火焰泰坦"
+ },
+ "difficulty": 3,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "10120",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10121",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10122",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10123",
+ "n": 1
+ }
+ ],
+ "drop": 1003,
+ "scene": "",
+ "bossmodel": 1003,
+ "boss_skill": 51004,
+ "boss": [
+ 11009
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 8
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 7
+ }
+ ]
+ },
+ {
+ "id": 30040,
+ "copytype": 4,
+ "bossid": 31,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "火焰泰坦"
+ },
+ "difficulty": 4,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "10130",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10131",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10132",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10123",
+ "n": 1
+ }
+ ],
+ "drop": 1004,
+ "scene": "",
+ "bossmodel": 1004,
+ "boss_skill": 51004,
+ "boss": [
+ 11009
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 9
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 8
+ }
+ ]
+ },
+ {
+ "id": 30050,
+ "copytype": 4,
+ "bossid": 32,
+ "name": {
+ "key": "viking_boss_1002",
+ "text": "冰之泰坦"
+ },
+ "difficulty": 1,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "10110",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10111",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10112",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10113",
+ "n": 1
+ }
+ ],
+ "drop": 1011,
+ "scene": "",
+ "bossmodel": 1011,
+ "boss_skill": 51004,
+ "boss": [
+ 11003
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 6
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 5
+ }
+ ]
+ },
+ {
+ "id": 30060,
+ "copytype": 4,
+ "bossid": 32,
+ "name": {
+ "key": "viking_boss_1002",
+ "text": "冰之泰坦"
+ },
+ "difficulty": 2,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "10120",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10121",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10122",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10113",
+ "n": 1
+ }
+ ],
+ "drop": 1012,
+ "scene": "",
+ "bossmodel": 1012,
+ "boss_skill": 51004,
+ "boss": [
+ 11003
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 7
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 6
+ }
+ ]
+ },
+ {
+ "id": 30070,
+ "copytype": 4,
+ "bossid": 32,
+ "name": {
+ "key": "viking_boss_1002",
+ "text": "冰之泰坦"
+ },
+ "difficulty": 3,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "10120",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10121",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10122",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10123",
+ "n": 1
+ }
+ ],
+ "drop": 1013,
+ "scene": "",
+ "bossmodel": 1013,
+ "boss_skill": 51004,
+ "boss": [
+ 11003
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 8
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 7
+ }
+ ]
+ },
+ {
+ "id": 30080,
+ "copytype": 4,
+ "bossid": 32,
+ "name": {
+ "key": "viking_boss_1002",
+ "text": "冰之泰坦"
+ },
+ "difficulty": 4,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "10130",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10131",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10132",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10123",
+ "n": 1
+ }
+ ],
+ "drop": 1014,
+ "scene": "",
+ "bossmodel": 1014,
+ "boss_skill": 51004,
+ "boss": [
+ 11003
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 9
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 8
+ }
+ ]
+ },
+ {
+ "id": 30090,
+ "copytype": 4,
+ "bossid": 33,
+ "name": {
+ "key": "viking_boss_1003",
+ "text": "森林泰坦"
+ },
+ "difficulty": 1,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "10110",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10111",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10112",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10113",
+ "n": 1
+ }
+ ],
+ "drop": 1021,
+ "scene": "",
+ "bossmodel": 1021,
+ "boss_skill": 51004,
+ "boss": [
+ 11018
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 6
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 5
+ }
+ ]
+ },
+ {
+ "id": 30100,
+ "copytype": 4,
+ "bossid": 33,
+ "name": {
+ "key": "viking_boss_1003",
+ "text": "森林泰坦"
+ },
+ "difficulty": 2,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "10120",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10121",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10122",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10113",
+ "n": 1
+ }
+ ],
+ "drop": 1022,
+ "scene": "",
+ "bossmodel": 1022,
+ "boss_skill": 51004,
+ "boss": [
+ 11018
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 7
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 6
+ }
+ ]
+ },
+ {
+ "id": 30110,
+ "copytype": 4,
+ "bossid": 33,
+ "name": {
+ "key": "viking_boss_1003",
+ "text": "森林泰坦"
+ },
+ "difficulty": 3,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "10120",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10121",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10122",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10123",
+ "n": 1
+ }
+ ],
+ "drop": 1023,
+ "scene": "",
+ "bossmodel": 1023,
+ "boss_skill": 51004,
+ "boss": [
+ 11018
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 8
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 7
+ }
+ ]
+ },
+ {
+ "id": 30120,
+ "copytype": 4,
+ "bossid": 33,
+ "name": {
+ "key": "viking_boss_1003",
+ "text": "森林泰坦"
+ },
+ "difficulty": 4,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "10130",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10131",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10132",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10123",
+ "n": 1
+ }
+ ],
+ "drop": 1024,
+ "scene": "",
+ "bossmodel": 1024,
+ "boss_skill": 51004,
+ "boss": [
+ 11018
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 9
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 8
+ }
+ ]
+ },
+ {
+ "id": 30130,
+ "copytype": 4,
+ "bossid": 34,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "武器BOSS"
+ },
+ "difficulty": 1,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "20010",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "20011",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "20012",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "20013",
+ "n": 1
+ }
+ ],
+ "drop": 1001,
+ "scene": "",
+ "bossmodel": 1001,
+ "boss_skill": 51004,
+ "boss": [
+ 11009
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 6
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 5
+ }
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_vikingbossskill.json b/bin/json/game_vikingbossskill.json
index 68eb33d29..a31a68cf3 100644
--- a/bin/json/game_vikingbossskill.json
+++ b/bin/json/game_vikingbossskill.json
@@ -83,5 +83,22 @@
124004111,
144005111
]
+ },
+ {
+ "bossid": 31,
+ "copytype": 4,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "火焰泰坦"
+ },
+ "introduce": {
+ "key": "viking_boss_20001",
+ "text": "熔岩泰坦巨人来自于遥远的火山，它的火焰属性使得所到之处，一片荒芜"
+ },
+ "icon": "wjyz_img013",
+ "guardskill": [
+ 124004111,
+ 144005111
+ ]
}
]
\ No newline at end of file
diff --git a/comm/const.go b/comm/const.go
index e6af34292..b352bf155 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -225,6 +225,8 @@ const (
// 铁匠铺铸造台
TableStove = "stove"
+ // 铁匠铺图鉴
+ TableAtlas = "atlas"
)
// RPC服务接口定义处
diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go
index 15bae92a6..462b43d2c 100644
--- a/modules/smithy/api_forgeequip.go
+++ b/modules/smithy/api_forgeequip.go
@@ -56,6 +56,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
//update["data"] = stove.Data
}
stove.Data[req.ReelId].Value += 1
+ stove.Forge[req.ReelId] += 1
// 是否是精益打造
if req.Quality > 0 {
costRes = append(costRes, reelcfg.RefineCos)
@@ -129,10 +130,13 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
return
}
+ // 装备资源分发
+ res := this.module.configure.GetDropReward(reelcfg.BasicDrop)
+ this.module.DispenseRes(session, res, true)
stove.RecoveTime = configure.Now().Unix()
update["data"] = stove.Data
update["recoveTime"] = stove.RecoveTime
-
+ update["forge"] = stove.Forge // 打造次数
this.module.modelStove.updateSmithyStove(session.GetUserId(), update)
session.SendMsg(string(this.module.GetType()), "forgeequip", &pb.SmithyForgeEquipResp{Data: stove})
return
diff --git a/modules/smithy/api_getatlas.go b/modules/smithy/api_getatlas.go
new file mode 100644
index 000000000..dbd7511af
--- /dev/null
+++ b/modules/smithy/api_getatlas.go
@@ -0,0 +1,30 @@
+package smithy
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+
+ "google.golang.org/protobuf/proto"
+)
+
+//参数校验
+func (this *apiComp) AtlasListCheck(session comm.IUserSession, req *pb.SmithyAtlasListReq) (code pb.ErrorCode) {
+
+ return
+}
+
+// 获取铁匠铺图鉴信息
+func (this *apiComp) AtlasList(session comm.IUserSession, req *pb.SmithyAtlasListReq) (code pb.ErrorCode, data proto.Message) {
+
+ code = this.AtlasListCheck(session, req)
+ if code != pb.ErrorCode_Success {
+ return // 参数校验失败直接返回
+ }
+ atlas, err := this.module.modelAtlas.getSmithyAtlasList(session.GetUserId())
+ if err != nil {
+ code = pb.ErrorCode_DBError
+ return
+ }
+ session.SendMsg(string(this.module.GetType()), "atlaslist", &pb.SmithyAtlasListResp{Data: atlas})
+ return
+}
diff --git a/modules/smithy/comp_configure.go b/modules/smithy/comp_configure.go
index 9aae9b2f6..21716c1c5 100644
--- a/modules/smithy/comp_configure.go
+++ b/modules/smithy/comp_configure.go
@@ -13,11 +13,14 @@ const (
game_smithy = "game_smithy.json"
game_smithystoveold = "game_smithystove.json"
- game_smithyreel = "game_newsmithy.json" // 新版铁匠铺卷轴
- game_smproficiency = "game_smithyproficiency.json" // 铁匠铺熟练度
- game_smithystove = "game_smithystovev1.json" // 铁匠铺台子 打造配置
- game_smithytools = "game_smithytool.json" // 铁匠铺工具台
- game_smithycustomer = "game_smithycustomer.json"
+ game_smithyreel = "game_newsmithy.json" // 新版铁匠铺卷轴
+ game_smproficiency = "game_smithyproficiency.json" // 铁匠铺熟练度
+ game_smithystove = "game_smithystovev1.json" // 铁匠铺台子 打造配置
+ game_smithytools = "game_smithytool.json" // 铁匠铺工具台
+ game_smithycustomer = "game_smithycustomer.json"
+ game_smithyatlas = "game_smithyatlas.json" // 收藏图鉴
+ game_smithyatlaslv = "game_smithyatlaslv.json" // 收藏等级积分
+ game_smithyatlasscore = "game_smithyatlasscore.json" // 图鉴积分
)
// /配置管理基础组件
@@ -27,8 +30,9 @@ type configureComp struct {
hlock sync.RWMutex
_smithyMap map[int64]*cfg.GameSmithyData
- _mapProficile map[int64]*cfg.GameSmithyProficiencyData // 熟练度 key 卷轴ID+ 等级
- _mapskill map[int64]*cfg.GameSmithyToolData // 熟练度 key 技能类型+ 技能等级等级
+ _mapProficile map[int64]*cfg.GameSmithyProficiencyData // 熟练度 key 卷轴ID+ 等级
+ _mapskill map[int64]*cfg.GameSmithyToolData // 熟练度 key 技能类型+ 技能等级等级
+ _mapAtlasScore map[int64]*cfg.GameSmithyAtlasScoreData // 图鉴积分
}
// 组件初始化接口
@@ -55,11 +59,17 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
configure.RegisterConfigure(game_smproficiency, cfg.NewGameSmithyProficiency, this.LoadProficileData)
this._mapskill = make(map[int64]*cfg.GameSmithyToolData, 0)
configure.RegisterConfigure(game_smithytools, cfg.NewGameSmithyTool, this.LoadSmithySkillData)
+
+ this._mapAtlasScore = make(map[int64]*cfg.GameSmithyAtlasScoreData, 0)
+ configure.RegisterConfigure(game_smithyatlasscore, cfg.NewGameSmithyAtlasScore, this.LoadSmithyAtlasScoreConf)
err = this.LoadConfigure(game_smithyreel, cfg.NewGameNewSmithy)
err = this.LoadConfigure(game_smithystove, cfg.NewGameSmithyStoveV1)
err = this.LoadConfigure(game_smithytools, cfg.NewGameSmithyTool)
err = this.LoadConfigure(game_smithystoveold, cfg.NewGameSmithyStove)
err = this.LoadConfigure(game_smithycustomer, cfg.NewGameSmithyCustomer)
+ err = this.LoadConfigure(game_smithyatlas, cfg.NewGameSmithyAtlas)
+ err = this.LoadConfigure(game_smithyatlaslv, cfg.NewGameSmithyAtlasLv)
+ err = this.LoadConfigure(game_smithyatlasscore, cfg.NewGameSmithyAtlasScore)
_d := this.GetSmithProficiencyConf(1)
this.module.Errorf("%v", _d)
@@ -225,6 +235,7 @@ func (this *configureComp) GetSmithyToolsData(id int32) (data *cfg.GameSmithyToo
}
}
+ this.module.Errorf("GetSmithyToolsData notfound id:%d", id)
return nil
}
@@ -235,5 +246,49 @@ func (this *configureComp) GetSmithyStoveConf(level int32) (data *cfg.GameSmithy
return
}
}
+ this.module.Errorf("GetSmithyStoveConf notfound level:%d", level)
return
}
+
+// 获取图鉴信息
+func (this *configureComp) GetSmithyAtlasConf(id string) (data *cfg.GameSmithyAtlasData) {
+ if v, err := this.GetConfigure(game_smithystove); err == nil {
+ if configure, ok := v.(*cfg.GameSmithyAtlas); ok {
+ data = configure.Get(id)
+ return
+ }
+ }
+ this.module.Errorf("GetSmithyAtlasConf notfound id:%d", id)
+ return
+}
+
+func (this *configureComp) GetSmithyAtlasLvConf(lv int32) (data *cfg.GameSmithyAtlasLvData) {
+ if v, err := this.GetConfigure(game_smithystove); err == nil {
+ if configure, ok := v.(*cfg.GameSmithyAtlasLv); ok {
+ data = configure.Get(lv)
+ return
+ }
+ }
+ this.module.Errorf("GetSmithyAtlasLvConf notfound lv:%d", lv)
+ return
+}
+
+func (this *configureComp) GetSmithyAtlasScoreConf(quality int32, lv int32) (data *cfg.GameSmithyAtlasScoreData) {
+ return this._mapAtlasScore[int64(quality<<16)+int64(lv)]
+}
+
+// 获取图鉴分数
+func (this *configureComp) LoadSmithyAtlasScoreConf() {
+ if v, err := this.GetConfigure(game_smithystove); err == nil {
+ if configure, ok := v.(*cfg.GameSmithyAtlasScore); ok {
+ this.hlock.Lock()
+ defer this.hlock.Unlock()
+ for _, value := range configure.GetDataList() {
+ this._mapAtlasScore[int64(value.Quality<<16)+int64(value.Lv)] = value
+ }
+ return
+ }
+ } else {
+ log.Errorf("get LoadSmithyAtlasScoreConf conf err:%v", err)
+ }
+}
diff --git a/modules/smithy/model_atlas.go b/modules/smithy/model_atlas.go
new file mode 100644
index 000000000..f9aa00f5d
--- /dev/null
+++ b/modules/smithy/model_atlas.go
@@ -0,0 +1,39 @@
+package smithy
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/lego/core"
+ "go_dreamfactory/modules"
+ "go_dreamfactory/pb"
+
+ "go.mongodb.org/mongo-driver/mongo"
+ "go.mongodb.org/mongo-driver/x/bsonx"
+)
+
+type modelAtlas struct {
+ modules.MCompModel
+ module *Smithy
+}
+
+func (this *modelAtlas) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
+ this.TableName = string(comm.TableAtlas)
+ err = this.MCompModel.Init(service, module, comp, options)
+ this.module = module.(*Smithy)
+ // uid 创建索引
+ this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
+ Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}},
+ })
+ return
+}
+
+func (this *modelAtlas) getSmithyAtlasList(uid string) (result *pb.DBAtlas, err error) {
+ result = &pb.DBAtlas{}
+ if err = this.Get(uid, result); err != nil {
+ return
+ }
+ return result, nil
+}
+
+func (this *modelAtlas) modifySmithyAtlasList(uid string, data map[string]interface{}) error {
+ return this.Change(uid, data)
+}
diff --git a/modules/smithy/model_smithy.go b/modules/smithy/model_smithy.go
index 728863f21..299cac5da 100644
--- a/modules/smithy/model_smithy.go
+++ b/modules/smithy/model_smithy.go
@@ -58,7 +58,7 @@ func (this *modelSmithy) getSmithyList(uid string) (result *pb.DBSmithy, err err
err = nil
return result, err
}
-func (this *modelSmithy) modifySmithyDataByObjId(uid string, data map[string]interface{}) error {
+func (this *modelSmithy) modifySmithyDataByUid(uid string, data map[string]interface{}) error {
return this.Change(uid, data)
}
func (this *modelSmithy) CalculationSmithy(uid string, smithy *pb.DBSmithy) {
diff --git a/modules/smithy/module.go b/modules/smithy/module.go
index a1b888948..485cd36aa 100644
--- a/modules/smithy/module.go
+++ b/modules/smithy/module.go
@@ -19,6 +19,7 @@ type Smithy struct {
api *apiComp
configure *configureComp
modelStove *modelStove
+ modelAtlas *modelAtlas
}
func NewModule() core.IModule {
@@ -46,7 +47,7 @@ func (this *Smithy) OnInstallComp() {
// 接口信息
func (this *Smithy) ModifySmithyData(uid string, data map[string]interface{}) (code pb.ErrorCode) {
- err := this.modelSmithy.modifySmithyDataByObjId(uid, data)
+ err := this.modelSmithy.modifySmithyDataByUid(uid, data)
if err != nil {
code = pb.ErrorCode_DBError
}
diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index b959252d0..22781d097 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -316,12 +316,13 @@ const (
ErrorCode_AutoBattleNoData ErrorCode = 4001 //没有正在自动战斗的数据
ErrorCode_AutoBattleStatesErr ErrorCode = 4002 // 自动战斗状态错误
// smithy
- ErrorCode_SmithyNoReel ErrorCode = 4101 // 没有激活图纸信息
- ErrorCode_SmithyNoTemperature ErrorCode = 4102 // 炉温不够不能打造
- ErrorCode_SmithyStoveMaxLv ErrorCode = 4103 // 炉子达到最大等级
- ErrorCode_SmithyCustomerLimit ErrorCode = 4104 //顾客上限
- ErrorCode_SmithyMaxTemperature ErrorCode = 4105 //炉温达上限
- ErrorCode_SmithyLackLava ErrorCode = 4106 //缺少熔岩
+ ErrorCode_SmithyNoReel ErrorCode = 4101 // 没有激活图纸信息
+ ErrorCode_SmithyNoTemperature ErrorCode = 4102 // 炉温不够不能打造
+ ErrorCode_SmithyStoveMaxLv ErrorCode = 4103 // 炉子达到最大等级
+ ErrorCode_SmithyCustomerLimit ErrorCode = 4104 //顾客上限
+ ErrorCode_SmithyCustomerEquipNoEnough ErrorCode = 4105 //装备回收数量不足
+ ErrorCode_SmithyMaxTemperature ErrorCode = 4106 // 炉温达上限
+ ErrorCode_SmithyLackLava ErrorCode = 4107 // 缺少熔岩
)
// Enum value maps for ErrorCode.
@@ -592,8 +593,9 @@ var (
4102: "SmithyNoTemperature",
4103: "SmithyStoveMaxLv",
4104: "SmithyCustomerLimit",
- 4105: "SmithyMaxTemperature",
- 4106: "SmithyLackLava",
+ 4105: "SmithyCustomerEquipNoEnough",
+ 4106: "SmithyMaxTemperature",
+ 4107: "SmithyLackLava",
}
ErrorCode_value = map[string]int32{
"Success": 0,
@@ -861,8 +863,9 @@ var (
"SmithyNoTemperature": 4102,
"SmithyStoveMaxLv": 4103,
"SmithyCustomerLimit": 4104,
- "SmithyMaxTemperature": 4105,
- "SmithyLackLava": 4106,
+ "SmithyCustomerEquipNoEnough": 4105,
+ "SmithyMaxTemperature": 4106,
+ "SmithyLackLava": 4107,
}
)
@@ -897,7 +900,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, 0xa0, 0x30, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+ 0x6f, 0x2a, 0xc2, 0x30, 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,
@@ -1280,11 +1283,13 @@ var file_errorcode_proto_rawDesc = []byte{
0x10, 0x86, 0x20, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f,
0x76, 0x65, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0x87, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d,
0x69, 0x74, 0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69,
- 0x74, 0x10, 0x88, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4d, 0x61,
- 0x78, 0x54, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x10, 0x89, 0x20, 0x12,
- 0x13, 0x0a, 0x0e, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x61, 0x63, 0x6b, 0x4c, 0x61, 0x76,
- 0x61, 0x10, 0x8a, 0x20, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
- 0x6f, 0x74, 0x6f, 0x33,
+ 0x74, 0x10, 0x88, 0x20, 0x12, 0x20, 0x0a, 0x1b, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x75,
+ 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x45, 0x71, 0x75, 0x69, 0x70, 0x4e, 0x6f, 0x45, 0x6e, 0x6f,
+ 0x75, 0x67, 0x68, 0x10, 0x89, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
+ 0x4d, 0x61, 0x78, 0x54, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x10, 0x8a,
+ 0x20, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x61, 0x63, 0x6b, 0x4c,
+ 0x61, 0x76, 0x61, 0x10, 0x8b, 0x20, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/pb/smithy_db.pb.go b/pb/smithy_db.pb.go
index cb2c41e8c..aede2903c 100644
--- a/pb/smithy_db.pb.go
+++ b/pb/smithy_db.pb.go
@@ -322,7 +322,7 @@ func (x *DBCustomer) GetLastRefreshTime() int64 {
}
// 装备图鉴
-type DBTujian struct {
+type DBAtlas struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
@@ -331,10 +331,11 @@ type DBTujian struct {
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID
Tujian map[int32]*ForgeData `protobuf:"bytes,3,rep,name=tujian,proto3" json:"tujian" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 图鉴信息
Slider int32 `protobuf:"varint,4,opt,name=slider,proto3" json:"slider"` // 进度
+ Reward int32 `protobuf:"varint,5,opt,name=reward,proto3" json:"reward"` // 奖励进度
}
-func (x *DBTujian) Reset() {
- *x = DBTujian{}
+func (x *DBAtlas) Reset() {
+ *x = DBAtlas{}
if protoimpl.UnsafeEnabled {
mi := &file_smithy_smithy_db_proto_msgTypes[4]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -342,13 +343,13 @@ func (x *DBTujian) Reset() {
}
}
-func (x *DBTujian) String() string {
+func (x *DBAtlas) String() string {
return protoimpl.X.MessageStringOf(x)
}
-func (*DBTujian) ProtoMessage() {}
+func (*DBAtlas) ProtoMessage() {}
-func (x *DBTujian) ProtoReflect() protoreflect.Message {
+func (x *DBAtlas) ProtoReflect() protoreflect.Message {
mi := &file_smithy_smithy_db_proto_msgTypes[4]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -360,39 +361,46 @@ func (x *DBTujian) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x)
}
-// Deprecated: Use DBTujian.ProtoReflect.Descriptor instead.
-func (*DBTujian) Descriptor() ([]byte, []int) {
+// Deprecated: Use DBAtlas.ProtoReflect.Descriptor instead.
+func (*DBAtlas) Descriptor() ([]byte, []int) {
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{4}
}
-func (x *DBTujian) GetId() string {
+func (x *DBAtlas) GetId() string {
if x != nil {
return x.Id
}
return ""
}
-func (x *DBTujian) GetUid() string {
+func (x *DBAtlas) GetUid() string {
if x != nil {
return x.Uid
}
return ""
}
-func (x *DBTujian) GetTujian() map[int32]*ForgeData {
+func (x *DBAtlas) GetTujian() map[int32]*ForgeData {
if x != nil {
return x.Tujian
}
return nil
}
-func (x *DBTujian) GetSlider() int32 {
+func (x *DBAtlas) GetSlider() int32 {
if x != nil {
return x.Slider
}
return 0
}
+func (x *DBAtlas) GetReward() int32 {
+ if x != nil {
+ return x.Reward
+ }
+ return 0
+}
+
type ForgeData struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@@ -401,6 +409,7 @@ type ForgeData struct {
ForgeCount int32 `protobuf:"varint,1,opt,name=forgeCount,proto3" json:"forgeCount"` // 打造次数
Lv int32 `protobuf:"varint,2,opt,name=lv,proto3" json:"lv"`
Quality int32 `protobuf:"varint,3,opt,name=quality,proto3" json:"quality"`
+ Score int32 `protobuf:"varint,4,opt,name=score,proto3" json:"score"`
}
func (x *ForgeData) Reset() {
@@ -456,6 +465,13 @@ func (x *ForgeData) GetQuality() int32 {
return 0
}
+func (x *ForgeData) GetScore() int32 {
+ if x != nil {
+ return x.Score
+ }
+ return 0
+}
+
////////
type Clang struct {
state protoimpl.MessageState
@@ -770,68 +786,71 @@ var file_smithy_smithy_db_proto_rawDesc = []byte{
0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x52, 0x65,
0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52,
0x0f, 0x6c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65,
- 0x22, 0xba, 0x01, 0x0a, 0x08, 0x44, 0x42, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 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,
- 0x2d, 0x0a, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
- 0x15, 0x2e, 0x44, 0x42, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x2e, 0x54, 0x75, 0x6a, 0x69, 0x61,
- 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x12, 0x16,
- 0x0a, 0x06, 0x73, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
- 0x73, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x1a, 0x45, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e,
- 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
- 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61,
- 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x55, 0x0a,
- 0x09, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1e, 0x0a, 0x0a, 0x66, 0x6f,
- 0x72, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
- 0x66, 0x6f, 0x72, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76,
- 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75,
- 0x61, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x71, 0x75, 0x61,
- 0x6c, 0x69, 0x74, 0x79, 0x22, 0x4f, 0x0a, 0x05, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a,
- 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
- 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69,
- 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12,
- 0x14, 0x0a, 0x05, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
- 0x73, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x5a, 0x0a, 0x0a, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c,
- 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18,
- 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12,
- 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
- 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d,
- 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d,
- 0x65, 0x22, 0x82, 0x04, 0x0a, 0x08, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 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, 0x1c, 0x0a, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
- 0x06, 0x2e, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x23,
- 0x0a, 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b,
- 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x06, 0x6f, 0x72, 0x64,
- 0x65, 0x72, 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, 0x2a, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18,
- 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
- 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69,
- 0x6c, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x18, 0x07, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x12, 0x24, 0x0a, 0x0d,
- 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69,
- 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28,
- 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x36, 0x0a, 0x09, 0x64, 0x65, 0x73, 0x6b,
- 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42,
- 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72,
- 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72,
- 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0b,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72,
- 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x38,
- 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
- 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 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, 0x1a, 0x3c, 0x0a, 0x0e, 0x44, 0x65, 0x73, 0x6b,
- 0x46, 0x6c, 0x6f, 0x6f, 0x72, 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,
+ 0x22, 0xd0, 0x01, 0x0a, 0x07, 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x12, 0x0e, 0x0a, 0x02,
+ 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03,
+ 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c,
+ 0x0a, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14,
+ 0x2e, 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x2e, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45,
+ 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x12, 0x16, 0x0a, 0x06,
+ 0x73, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x6c,
+ 0x69, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x05,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x45, 0x0a, 0x0b,
+ 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+ 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a,
+ 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x46,
+ 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
+ 0x02, 0x38, 0x01, 0x22, 0x6b, 0x0a, 0x09, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61,
+ 0x12, 0x1e, 0x0a, 0x0a, 0x66, 0x6f, 0x72, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x66, 0x6f, 0x72, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74,
+ 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76,
+ 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63,
+ 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65,
+ 0x22, 0x4f, 0x0a, 0x05, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73,
+ 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73,
+ 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73,
+ 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x54, 0x69, 0x6d,
+ 0x65, 0x22, 0x5a, 0x0a, 0x0a, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12,
+ 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63,
+ 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e,
+ 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20,
+ 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x82, 0x04,
+ 0x0a, 0x08, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 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, 0x1c, 0x0a, 0x05,
+ 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x43, 0x6c,
+ 0x61, 0x6e, 0x67, 0x52, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x23, 0x0a, 0x06, 0x6f, 0x72,
+ 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x4f, 0x72, 0x64,
+ 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 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, 0x2a, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x06, 0x20, 0x03, 0x28,
+ 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2e, 0x53, 0x6b, 0x69,
+ 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x18,
+ 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x12, 0x24, 0x0a, 0x0d, 0x6f, 0x72, 0x64, 0x65,
+ 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14,
+ 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63,
+ 0x74, 0x69, 0x6d, 0x65, 0x12, 0x36, 0x0a, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f,
+ 0x72, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74,
+ 0x68, 0x79, 0x2e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x45, 0x6e, 0x74, 0x72,
+ 0x79, 0x52, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1e, 0x0a, 0x0a,
+ 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1c, 0x0a, 0x09,
+ 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b,
+ 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 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, 0x1a, 0x3c, 0x0a, 0x0e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f,
+ 0x72, 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 (
@@ -852,7 +871,7 @@ var file_smithy_smithy_db_proto_goTypes = []interface{}{
(*DBStove)(nil), // 1: DBStove
(*CustomerInfo)(nil), // 2: CustomerInfo
(*DBCustomer)(nil), // 3: DBCustomer
- (*DBTujian)(nil), // 4: DBTujian
+ (*DBAtlas)(nil), // 4: DBAtlas
(*ForgeData)(nil), // 5: ForgeData
(*Clang)(nil), // 6: Clang
(*OrderClang)(nil), // 7: OrderClang
@@ -860,7 +879,7 @@ var file_smithy_smithy_db_proto_goTypes = []interface{}{
nil, // 9: DBStove.DataEntry
nil, // 10: DBStove.SkillEntry
nil, // 11: DBStove.ForgeEntry
- nil, // 12: DBTujian.TujianEntry
+ nil, // 12: DBAtlas.TujianEntry
nil, // 13: DBSmithy.SkillEntry
nil, // 14: DBSmithy.DeskFloorEntry
(*UserAssets)(nil), // 15: UserAssets
@@ -870,14 +889,14 @@ var file_smithy_smithy_db_proto_depIdxs = []int32{
10, // 1: DBStove.skill:type_name -> DBStove.SkillEntry
11, // 2: DBStove.forge:type_name -> DBStove.ForgeEntry
2, // 3: DBCustomer.customers:type_name -> CustomerInfo
- 12, // 4: DBTujian.tujian:type_name -> DBTujian.TujianEntry
+ 12, // 4: DBAtlas.tujian:type_name -> DBAtlas.TujianEntry
6, // 5: DBSmithy.clang:type_name -> Clang
7, // 6: DBSmithy.orders:type_name -> OrderClang
15, // 7: DBSmithy.items:type_name -> UserAssets
13, // 8: DBSmithy.skill:type_name -> DBSmithy.SkillEntry
14, // 9: DBSmithy.deskFloor:type_name -> DBSmithy.DeskFloorEntry
0, // 10: DBStove.DataEntry.value:type_name -> Mastery
- 5, // 11: DBTujian.TujianEntry.value:type_name -> ForgeData
+ 5, // 11: DBAtlas.TujianEntry.value:type_name -> ForgeData
12, // [12:12] is the sub-list for method output_type
12, // [12:12] is the sub-list for method input_type
12, // [12:12] is the sub-list for extension type_name
@@ -941,7 +960,7 @@ func file_smithy_smithy_db_proto_init() {
}
}
file_smithy_smithy_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*DBTujian); i {
+ switch v := v.(*DBAtlas); i {
case 0:
return &v.state
case 1:
diff --git a/pb/smithy_msg.pb.go b/pb/smithy_msg.pb.go
index 76fecf44c..c9e6deaca 100644
--- a/pb/smithy_msg.pb.go
+++ b/pb/smithy_msg.pb.go
@@ -833,6 +833,92 @@ func (x *SmithySellResp) GetEquipIds() []string {
return nil
}
+// 查看图鉴信息
+type SmithyAtlasListReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+}
+
+func (x *SmithyAtlasListReq) Reset() {
+ *x = SmithyAtlasListReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_smithy_smithy_msg_proto_msgTypes[16]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *SmithyAtlasListReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SmithyAtlasListReq) ProtoMessage() {}
+
+func (x *SmithyAtlasListReq) ProtoReflect() protoreflect.Message {
+ mi := &file_smithy_smithy_msg_proto_msgTypes[16]
+ 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 SmithyAtlasListReq.ProtoReflect.Descriptor instead.
+func (*SmithyAtlasListReq) Descriptor() ([]byte, []int) {
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{16}
+}
+
+type SmithyAtlasListResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Data *DBAtlas `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
+}
+
+func (x *SmithyAtlasListResp) Reset() {
+ *x = SmithyAtlasListResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_smithy_smithy_msg_proto_msgTypes[17]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *SmithyAtlasListResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SmithyAtlasListResp) ProtoMessage() {}
+
+func (x *SmithyAtlasListResp) ProtoReflect() protoreflect.Message {
+ mi := &file_smithy_smithy_msg_proto_msgTypes[17]
+ 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 SmithyAtlasListResp.ProtoReflect.Descriptor instead.
+func (*SmithyAtlasListResp) Descriptor() ([]byte, []int) {
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{17}
+}
+
+func (x *SmithyAtlasListResp) GetData() *DBAtlas {
+ if x != nil {
+ return x.Data
+ }
+ return nil
+}
+
//////////////////////////////////////////
// 创建订单
type SmithyCreateOrderReq struct {
@@ -846,7 +932,7 @@ type SmithyCreateOrderReq struct {
func (x *SmithyCreateOrderReq) Reset() {
*x = SmithyCreateOrderReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[16]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[18]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -859,7 +945,7 @@ func (x *SmithyCreateOrderReq) String() string {
func (*SmithyCreateOrderReq) ProtoMessage() {}
func (x *SmithyCreateOrderReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[16]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[18]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -872,7 +958,7 @@ func (x *SmithyCreateOrderReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyCreateOrderReq.ProtoReflect.Descriptor instead.
func (*SmithyCreateOrderReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{16}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{18}
}
func (x *SmithyCreateOrderReq) GetOrder() []*OrderClang {
@@ -893,7 +979,7 @@ type SmithyCreateOrderResp struct {
func (x *SmithyCreateOrderResp) Reset() {
*x = SmithyCreateOrderResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[17]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[19]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -906,7 +992,7 @@ func (x *SmithyCreateOrderResp) String() string {
func (*SmithyCreateOrderResp) ProtoMessage() {}
func (x *SmithyCreateOrderResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[17]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[19]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -919,7 +1005,7 @@ func (x *SmithyCreateOrderResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyCreateOrderResp.ProtoReflect.Descriptor instead.
func (*SmithyCreateOrderResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{17}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{19}
}
func (x *SmithyCreateOrderResp) GetData() *DBSmithy {
@@ -939,7 +1025,7 @@ type SmithyGetRewardReq struct {
func (x *SmithyGetRewardReq) Reset() {
*x = SmithyGetRewardReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[18]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[20]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -952,7 +1038,7 @@ func (x *SmithyGetRewardReq) String() string {
func (*SmithyGetRewardReq) ProtoMessage() {}
func (x *SmithyGetRewardReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[18]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[20]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -965,7 +1051,7 @@ func (x *SmithyGetRewardReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyGetRewardReq.ProtoReflect.Descriptor instead.
func (*SmithyGetRewardReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{18}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{20}
}
type SmithyGetRewardResp struct {
@@ -979,7 +1065,7 @@ type SmithyGetRewardResp struct {
func (x *SmithyGetRewardResp) Reset() {
*x = SmithyGetRewardResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[19]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[21]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -992,7 +1078,7 @@ func (x *SmithyGetRewardResp) String() string {
func (*SmithyGetRewardResp) ProtoMessage() {}
func (x *SmithyGetRewardResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[19]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[21]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1005,7 +1091,7 @@ func (x *SmithyGetRewardResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyGetRewardResp.ProtoReflect.Descriptor instead.
func (*SmithyGetRewardResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{19}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{21}
}
func (x *SmithyGetRewardResp) GetData() *DBSmithy {
@@ -1027,7 +1113,7 @@ type SmithyDeskSkillLvReq struct {
func (x *SmithyDeskSkillLvReq) Reset() {
*x = SmithyDeskSkillLvReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[20]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[22]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1040,7 +1126,7 @@ func (x *SmithyDeskSkillLvReq) String() string {
func (*SmithyDeskSkillLvReq) ProtoMessage() {}
func (x *SmithyDeskSkillLvReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[20]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[22]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1053,7 +1139,7 @@ func (x *SmithyDeskSkillLvReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyDeskSkillLvReq.ProtoReflect.Descriptor instead.
func (*SmithyDeskSkillLvReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{20}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{22}
}
func (x *SmithyDeskSkillLvReq) GetDeskType() int32 {
@@ -1074,7 +1160,7 @@ type SmithyDeskSkillLvResp struct {
func (x *SmithyDeskSkillLvResp) Reset() {
*x = SmithyDeskSkillLvResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[21]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[23]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1087,7 +1173,7 @@ func (x *SmithyDeskSkillLvResp) String() string {
func (*SmithyDeskSkillLvResp) ProtoMessage() {}
func (x *SmithyDeskSkillLvResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[21]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[23]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1100,7 +1186,7 @@ func (x *SmithyDeskSkillLvResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyDeskSkillLvResp.ProtoReflect.Descriptor instead.
func (*SmithyDeskSkillLvResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{21}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{23}
}
func (x *SmithyDeskSkillLvResp) GetData() *DBSmithy {
@@ -1120,7 +1206,7 @@ type SmithyStoveSkillLvReq struct {
func (x *SmithyStoveSkillLvReq) Reset() {
*x = SmithyStoveSkillLvReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[22]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[24]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1133,7 +1219,7 @@ func (x *SmithyStoveSkillLvReq) String() string {
func (*SmithyStoveSkillLvReq) ProtoMessage() {}
func (x *SmithyStoveSkillLvReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[22]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[24]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1146,7 +1232,7 @@ func (x *SmithyStoveSkillLvReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyStoveSkillLvReq.ProtoReflect.Descriptor instead.
func (*SmithyStoveSkillLvReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{22}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{24}
}
type SmithyStoveSkillLvResp struct {
@@ -1160,7 +1246,7 @@ type SmithyStoveSkillLvResp struct {
func (x *SmithyStoveSkillLvResp) Reset() {
*x = SmithyStoveSkillLvResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[23]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[25]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1173,7 +1259,7 @@ func (x *SmithyStoveSkillLvResp) String() string {
func (*SmithyStoveSkillLvResp) ProtoMessage() {}
func (x *SmithyStoveSkillLvResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[23]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[25]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1186,7 +1272,7 @@ func (x *SmithyStoveSkillLvResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyStoveSkillLvResp.ProtoReflect.Descriptor instead.
func (*SmithyStoveSkillLvResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{23}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{25}
}
func (x *SmithyStoveSkillLvResp) GetData() *DBSmithy {
@@ -1207,7 +1293,7 @@ type SmithyGetRandUserReq struct {
func (x *SmithyGetRandUserReq) Reset() {
*x = SmithyGetRandUserReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[24]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[26]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1220,7 +1306,7 @@ func (x *SmithyGetRandUserReq) String() string {
func (*SmithyGetRandUserReq) ProtoMessage() {}
func (x *SmithyGetRandUserReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[24]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[26]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1233,7 +1319,7 @@ func (x *SmithyGetRandUserReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyGetRandUserReq.ProtoReflect.Descriptor instead.
func (*SmithyGetRandUserReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{24}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{26}
}
func (x *SmithyGetRandUserReq) GetPeople() int32 {
@@ -1254,7 +1340,7 @@ type SmithyGetRandUserResp struct {
func (x *SmithyGetRandUserResp) Reset() {
*x = SmithyGetRandUserResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[25]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[27]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1267,7 +1353,7 @@ func (x *SmithyGetRandUserResp) String() string {
func (*SmithyGetRandUserResp) ProtoMessage() {}
func (x *SmithyGetRandUserResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[25]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[27]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1280,7 +1366,7 @@ func (x *SmithyGetRandUserResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyGetRandUserResp.ProtoReflect.Descriptor instead.
func (*SmithyGetRandUserResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{25}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{27}
}
func (x *SmithyGetRandUserResp) GetUser() []*DBUser {
@@ -1299,7 +1385,7 @@ type SmithyGetListReq struct {
func (x *SmithyGetListReq) Reset() {
*x = SmithyGetListReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[26]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[28]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1312,7 +1398,7 @@ func (x *SmithyGetListReq) String() string {
func (*SmithyGetListReq) ProtoMessage() {}
func (x *SmithyGetListReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[26]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[28]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1325,7 +1411,7 @@ func (x *SmithyGetListReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyGetListReq.ProtoReflect.Descriptor instead.
func (*SmithyGetListReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{26}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{28}
}
// 返回进度信息
@@ -1340,7 +1426,7 @@ type SmithyGetListResp struct {
func (x *SmithyGetListResp) Reset() {
*x = SmithyGetListResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[27]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[29]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1353,7 +1439,7 @@ func (x *SmithyGetListResp) String() string {
func (*SmithyGetListResp) ProtoMessage() {}
func (x *SmithyGetListResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[27]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[29]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1366,7 +1452,7 @@ func (x *SmithyGetListResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyGetListResp.ProtoReflect.Descriptor instead.
func (*SmithyGetListResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{27}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{29}
}
func (x *SmithyGetListResp) GetData() *DBSmithy {
@@ -1443,43 +1529,47 @@ var file_smithy_smithy_msg_proto_rawDesc = []byte{
0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x71,
0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x65, 0x71,
- 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x22, 0x39, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
- 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x21,
- 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
- 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65,
- 0x72, 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74,
- 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61,
- 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69,
- 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6d, 0x69,
- 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22,
- 0x34, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61,
- 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52,
- 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x32, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x44,
- 0x65, 0x73, 0x6b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a,
- 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
- 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, 0x69,
- 0x74, 0x68, 0x79, 0x44, 0x65, 0x73, 0x6b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65,
- 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74,
- 0x61, 0x22, 0x17, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65,
- 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, 0x16, 0x53, 0x6d,
- 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76,
- 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64,
- 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74,
- 0x52, 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x70,
- 0x65, 0x6f, 0x70, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x65, 0x6f,
- 0x70, 0x6c, 0x65, 0x22, 0x34, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74,
- 0x52, 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04,
- 0x75, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55,
- 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x6d, 0x69,
- 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a,
- 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
- 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74,
- 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
- 0x33,
+ 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
+ 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x33, 0x0a, 0x13,
+ 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52,
+ 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74,
+ 0x61, 0x22, 0x39, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74,
+ 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x21, 0x0a, 0x05, 0x6f, 0x72, 0x64,
+ 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72,
+ 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x36, 0x0a, 0x15,
+ 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65,
+ 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04,
+ 0x64, 0x61, 0x74, 0x61, 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65,
+ 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x34, 0x0a, 0x13, 0x53, 0x6d,
+ 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73,
+ 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+ 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
+ 0x22, 0x32, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x44, 0x65, 0x73, 0x6b, 0x53, 0x6b,
+ 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b,
+ 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b,
+ 0x54, 0x79, 0x70, 0x65, 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x44, 0x65,
+ 0x73, 0x6b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a,
+ 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42,
+ 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x17, 0x0a, 0x15,
+ 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c,
+ 0x4c, 0x76, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, 0x16, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53,
+ 0x74, 0x6f, 0x76, 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12,
+ 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e,
+ 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e,
+ 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e, 0x64, 0x55,
+ 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x65, 0x6f, 0x70, 0x6c, 0x65,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x65, 0x6f, 0x70, 0x6c, 0x65, 0x22, 0x34,
+ 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e, 0x64, 0x55,
+ 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18,
+ 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04,
+ 0x75, 0x73, 0x65, 0x72, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65,
+ 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74,
+ 0x68, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a,
+ 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42,
+ 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04,
+ 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -1494,7 +1584,7 @@ func file_smithy_smithy_msg_proto_rawDescGZIP() []byte {
return file_smithy_smithy_msg_proto_rawDescData
}
-var file_smithy_smithy_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 28)
+var file_smithy_smithy_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 30)
var file_smithy_smithy_msg_proto_goTypes = []interface{}{
(*SmithyGetStoveInfoReq)(nil), // 0: SmithyGetStoveInfoReq
(*SmithyGetStoveInfoResp)(nil), // 1: SmithyGetStoveInfoResp
@@ -1512,44 +1602,48 @@ var file_smithy_smithy_msg_proto_goTypes = []interface{}{
(*SmithyCustomerResp)(nil), // 13: SmithyCustomerResp
(*SmithySellReq)(nil), // 14: SmithySellReq
(*SmithySellResp)(nil), // 15: SmithySellResp
- (*SmithyCreateOrderReq)(nil), // 16: SmithyCreateOrderReq
- (*SmithyCreateOrderResp)(nil), // 17: SmithyCreateOrderResp
- (*SmithyGetRewardReq)(nil), // 18: SmithyGetRewardReq
- (*SmithyGetRewardResp)(nil), // 19: SmithyGetRewardResp
- (*SmithyDeskSkillLvReq)(nil), // 20: SmithyDeskSkillLvReq
- (*SmithyDeskSkillLvResp)(nil), // 21: SmithyDeskSkillLvResp
- (*SmithyStoveSkillLvReq)(nil), // 22: SmithyStoveSkillLvReq
- (*SmithyStoveSkillLvResp)(nil), // 23: SmithyStoveSkillLvResp
- (*SmithyGetRandUserReq)(nil), // 24: SmithyGetRandUserReq
- (*SmithyGetRandUserResp)(nil), // 25: SmithyGetRandUserResp
- (*SmithyGetListReq)(nil), // 26: SmithyGetListReq
- (*SmithyGetListResp)(nil), // 27: SmithyGetListResp
- (*DBStove)(nil), // 28: DBStove
- (*CustomerInfo)(nil), // 29: CustomerInfo
- (*OrderClang)(nil), // 30: OrderClang
- (*DBSmithy)(nil), // 31: DBSmithy
- (*DBUser)(nil), // 32: DBUser
+ (*SmithyAtlasListReq)(nil), // 16: SmithyAtlasListReq
+ (*SmithyAtlasListResp)(nil), // 17: SmithyAtlasListResp
+ (*SmithyCreateOrderReq)(nil), // 18: SmithyCreateOrderReq
+ (*SmithyCreateOrderResp)(nil), // 19: SmithyCreateOrderResp
+ (*SmithyGetRewardReq)(nil), // 20: SmithyGetRewardReq
+ (*SmithyGetRewardResp)(nil), // 21: SmithyGetRewardResp
+ (*SmithyDeskSkillLvReq)(nil), // 22: SmithyDeskSkillLvReq
+ (*SmithyDeskSkillLvResp)(nil), // 23: SmithyDeskSkillLvResp
+ (*SmithyStoveSkillLvReq)(nil), // 24: SmithyStoveSkillLvReq
+ (*SmithyStoveSkillLvResp)(nil), // 25: SmithyStoveSkillLvResp
+ (*SmithyGetRandUserReq)(nil), // 26: SmithyGetRandUserReq
+ (*SmithyGetRandUserResp)(nil), // 27: SmithyGetRandUserResp
+ (*SmithyGetListReq)(nil), // 28: SmithyGetListReq
+ (*SmithyGetListResp)(nil), // 29: SmithyGetListResp
+ (*DBStove)(nil), // 30: DBStove
+ (*CustomerInfo)(nil), // 31: CustomerInfo
+ (*DBAtlas)(nil), // 32: DBAtlas
+ (*OrderClang)(nil), // 33: OrderClang
+ (*DBSmithy)(nil), // 34: DBSmithy
+ (*DBUser)(nil), // 35: DBUser
}
var file_smithy_smithy_msg_proto_depIdxs = []int32{
- 28, // 0: SmithyGetStoveInfoResp.data:type_name -> DBStove
- 28, // 1: SmithyForgeEquipResp.data:type_name -> DBStove
- 28, // 2: SmithyOrderEquipResp.data:type_name -> DBStove
- 28, // 3: SmithyStoveUpResp.data:type_name -> DBStove
- 28, // 4: SmithyRiseResp.data:type_name -> DBStove
- 28, // 5: SmithyToolsUpResp.data:type_name -> DBStove
- 29, // 6: SmithyCustomerResp.customers:type_name -> CustomerInfo
- 30, // 7: SmithyCreateOrderReq.order:type_name -> OrderClang
- 31, // 8: SmithyCreateOrderResp.data:type_name -> DBSmithy
- 31, // 9: SmithyGetRewardResp.data:type_name -> DBSmithy
- 31, // 10: SmithyDeskSkillLvResp.data:type_name -> DBSmithy
- 31, // 11: SmithyStoveSkillLvResp.data:type_name -> DBSmithy
- 32, // 12: SmithyGetRandUserResp.user:type_name -> DBUser
- 31, // 13: SmithyGetListResp.data:type_name -> DBSmithy
- 14, // [14:14] is the sub-list for method output_type
- 14, // [14:14] is the sub-list for method input_type
- 14, // [14:14] is the sub-list for extension type_name
- 14, // [14:14] is the sub-list for extension extendee
- 0, // [0:14] is the sub-list for field type_name
+ 30, // 0: SmithyGetStoveInfoResp.data:type_name -> DBStove
+ 30, // 1: SmithyForgeEquipResp.data:type_name -> DBStove
+ 30, // 2: SmithyOrderEquipResp.data:type_name -> DBStove
+ 30, // 3: SmithyStoveUpResp.data:type_name -> DBStove
+ 30, // 4: SmithyRiseResp.data:type_name -> DBStove
+ 30, // 5: SmithyToolsUpResp.data:type_name -> DBStove
+ 31, // 6: SmithyCustomerResp.customers:type_name -> CustomerInfo
+ 32, // 7: SmithyAtlasListResp.data:type_name -> DBAtlas
+ 33, // 8: SmithyCreateOrderReq.order:type_name -> OrderClang
+ 34, // 9: SmithyCreateOrderResp.data:type_name -> DBSmithy
+ 34, // 10: SmithyGetRewardResp.data:type_name -> DBSmithy
+ 34, // 11: SmithyDeskSkillLvResp.data:type_name -> DBSmithy
+ 34, // 12: SmithyStoveSkillLvResp.data:type_name -> DBSmithy
+ 35, // 13: SmithyGetRandUserResp.user:type_name -> DBUser
+ 34, // 14: SmithyGetListResp.data:type_name -> DBSmithy
+ 15, // [15:15] is the sub-list for method output_type
+ 15, // [15:15] is the sub-list for method input_type
+ 15, // [15:15] is the sub-list for extension type_name
+ 15, // [15:15] is the sub-list for extension extendee
+ 0, // [0:15] is the sub-list for field type_name
}
func init() { file_smithy_smithy_msg_proto_init() }
@@ -1753,7 +1847,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyCreateOrderReq); i {
+ switch v := v.(*SmithyAtlasListReq); i {
case 0:
return &v.state
case 1:
@@ -1765,7 +1859,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyCreateOrderResp); i {
+ switch v := v.(*SmithyAtlasListResp); i {
case 0:
return &v.state
case 1:
@@ -1777,7 +1871,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyGetRewardReq); i {
+ switch v := v.(*SmithyCreateOrderReq); i {
case 0:
return &v.state
case 1:
@@ -1789,7 +1883,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyGetRewardResp); i {
+ switch v := v.(*SmithyCreateOrderResp); i {
case 0:
return &v.state
case 1:
@@ -1801,7 +1895,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyDeskSkillLvReq); i {
+ switch v := v.(*SmithyGetRewardReq); i {
case 0:
return &v.state
case 1:
@@ -1813,7 +1907,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyDeskSkillLvResp); i {
+ switch v := v.(*SmithyGetRewardResp); i {
case 0:
return &v.state
case 1:
@@ -1825,7 +1919,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyStoveSkillLvReq); i {
+ switch v := v.(*SmithyDeskSkillLvReq); i {
case 0:
return &v.state
case 1:
@@ -1837,7 +1931,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyStoveSkillLvResp); i {
+ switch v := v.(*SmithyDeskSkillLvResp); i {
case 0:
return &v.state
case 1:
@@ -1849,7 +1943,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyGetRandUserReq); i {
+ switch v := v.(*SmithyStoveSkillLvReq); i {
case 0:
return &v.state
case 1:
@@ -1861,7 +1955,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyGetRandUserResp); i {
+ switch v := v.(*SmithyStoveSkillLvResp); i {
case 0:
return &v.state
case 1:
@@ -1873,7 +1967,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyGetListReq); i {
+ switch v := v.(*SmithyGetRandUserReq); i {
case 0:
return &v.state
case 1:
@@ -1885,6 +1979,30 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*SmithyGetRandUserResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_smithy_smithy_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*SmithyGetListReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_smithy_smithy_msg_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*SmithyGetListResp); i {
case 0:
return &v.state
@@ -1903,7 +2021,7 @@ func file_smithy_smithy_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_smithy_smithy_msg_proto_rawDesc,
NumEnums: 0,
- NumMessages: 28,
+ NumMessages: 30,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/sys/configure/structs/Game.BattleReadyData.go b/sys/configure/structs/Game.BattleReadyData.go
index 976524dd8..e3b84ff4e 100644
--- a/sys/configure/structs/Game.BattleReadyData.go
+++ b/sys/configure/structs/Game.BattleReadyData.go
@@ -19,6 +19,7 @@ type GameBattleReadyData struct {
LockSlots []int32
AssistTeam int32
CanFriendHelp int32
+ Numrounds int32
}
const TypeId_GameBattleReadyData = -266091495
@@ -62,6 +63,7 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["AssistTeam"].(float64); !_ok_ { err = errors.New("AssistTeam error"); return }; _v.AssistTeam = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["CanFriendHelp"].(float64); !_ok_ { err = errors.New("CanFriendHelp error"); return }; _v.CanFriendHelp = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Numrounds"].(float64); !_ok_ { err = errors.New("Numrounds error"); return }; _v.Numrounds = int32(_tempNum_) }
return
}
diff --git a/sys/configure/structs/Game.SmithyAtlas.go b/sys/configure/structs/Game.SmithyAtlas.go
new file mode 100644
index 000000000..fd4fc665f
--- /dev/null
+++ b/sys/configure/structs/Game.SmithyAtlas.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 GameSmithyAtlas struct {
+ _dataMap map[string]*GameSmithyAtlasData
+ _dataList []*GameSmithyAtlasData
+}
+
+func NewGameSmithyAtlas(_buf []map[string]interface{}) (*GameSmithyAtlas, error) {
+ _dataList := make([]*GameSmithyAtlasData, 0, len(_buf))
+ dataMap := make(map[string]*GameSmithyAtlasData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameSmithyAtlasData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameSmithyAtlas{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameSmithyAtlas) GetDataMap() map[string]*GameSmithyAtlasData {
+ return table._dataMap
+}
+
+func (table *GameSmithyAtlas) GetDataList() []*GameSmithyAtlasData {
+ return table._dataList
+}
+
+func (table *GameSmithyAtlas) Get(key string) *GameSmithyAtlasData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.SmithyAtlasData.go b/sys/configure/structs/Game.SmithyAtlasData.go
new file mode 100644
index 000000000..e6294f498
--- /dev/null
+++ b/sys/configure/structs/Game.SmithyAtlasData.go
@@ -0,0 +1,49 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameSmithyAtlasData struct {
+ Id string
+ TabId int32
+ TypeId int32
+ NameText string
+ ContentText string
+ AtlasScore int32
+ AtlasGiver int32
+ Quality int32
+}
+
+const TypeId_GameSmithyAtlasData = 2126233763
+
+func (*GameSmithyAtlasData) GetTypeId() int32 {
+ return 2126233763
+}
+
+func (_v *GameSmithyAtlasData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tab_id"].(float64); !_ok_ { err = errors.New("tab_id error"); return }; _v.TabId = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type_id"].(float64); !_ok_ { err = errors.New("type_id error"); return }; _v.TypeId = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.NameText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.NameText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["content_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ContentText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ContentText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atlas_score"].(float64); !_ok_ { err = errors.New("atlas_score error"); return }; _v.AtlasScore = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atlas_giver"].(float64); !_ok_ { err = errors.New("atlas_giver error"); return }; _v.AtlasGiver = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["quality"].(float64); !_ok_ { err = errors.New("quality error"); return }; _v.Quality = int32(_tempNum_) }
+ return
+}
+
+func DeserializeGameSmithyAtlasData(_buf map[string]interface{}) (*GameSmithyAtlasData, error) {
+ v := &GameSmithyAtlasData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.SmithyAtlasLv.go b/sys/configure/structs/Game.SmithyAtlasLv.go
new file mode 100644
index 000000000..d0224786c
--- /dev/null
+++ b/sys/configure/structs/Game.SmithyAtlasLv.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 GameSmithyAtlasLv struct {
+ _dataMap map[int32]*GameSmithyAtlasLvData
+ _dataList []*GameSmithyAtlasLvData
+}
+
+func NewGameSmithyAtlasLv(_buf []map[string]interface{}) (*GameSmithyAtlasLv, error) {
+ _dataList := make([]*GameSmithyAtlasLvData, 0, len(_buf))
+ dataMap := make(map[int32]*GameSmithyAtlasLvData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameSmithyAtlasLvData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.AtlasLv] = _v
+ }
+ }
+ return &GameSmithyAtlasLv{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameSmithyAtlasLv) GetDataMap() map[int32]*GameSmithyAtlasLvData {
+ return table._dataMap
+}
+
+func (table *GameSmithyAtlasLv) GetDataList() []*GameSmithyAtlasLvData {
+ return table._dataList
+}
+
+func (table *GameSmithyAtlasLv) Get(key int32) *GameSmithyAtlasLvData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.SmithyAtlasLvData.go b/sys/configure/structs/Game.SmithyAtlasLvData.go
new file mode 100644
index 000000000..94a3a29ed
--- /dev/null
+++ b/sys/configure/structs/Game.SmithyAtlasLvData.go
@@ -0,0 +1,52 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameSmithyAtlasLvData struct {
+ AtlasLv int32
+ AtlasScore int32
+ ItemId []*Gameatn
+}
+
+const TypeId_GameSmithyAtlasLvData = -846785779
+
+func (*GameSmithyAtlasLvData) GetTypeId() int32 {
+ return -846785779
+}
+
+func (_v *GameSmithyAtlasLvData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atlas_lv"].(float64); !_ok_ { err = errors.New("atlas_lv error"); return }; _v.AtlasLv = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atlas_score"].(float64); !_ok_ { err = errors.New("atlas_score error"); return }; _v.AtlasScore = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["item_id"].([]interface{}); !_ok_ { err = errors.New("item_id error"); return }
+
+ _v.ItemId = 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.ItemId = append(_v.ItemId, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameSmithyAtlasLvData(_buf map[string]interface{}) (*GameSmithyAtlasLvData, error) {
+ v := &GameSmithyAtlasLvData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.SmithyAtlasScore.go b/sys/configure/structs/Game.SmithyAtlasScore.go
new file mode 100644
index 000000000..fd9c7fe7f
--- /dev/null
+++ b/sys/configure/structs/Game.SmithyAtlasScore.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 GameSmithyAtlasScore struct {
+ _dataMap map[int32]*GameSmithyAtlasScoreData
+ _dataList []*GameSmithyAtlasScoreData
+}
+
+func NewGameSmithyAtlasScore(_buf []map[string]interface{}) (*GameSmithyAtlasScore, error) {
+ _dataList := make([]*GameSmithyAtlasScoreData, 0, len(_buf))
+ dataMap := make(map[int32]*GameSmithyAtlasScoreData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameSmithyAtlasScoreData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameSmithyAtlasScore{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameSmithyAtlasScore) GetDataMap() map[int32]*GameSmithyAtlasScoreData {
+ return table._dataMap
+}
+
+func (table *GameSmithyAtlasScore) GetDataList() []*GameSmithyAtlasScoreData {
+ return table._dataList
+}
+
+func (table *GameSmithyAtlasScore) Get(key int32) *GameSmithyAtlasScoreData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.SmithyAtlasScoreData.go b/sys/configure/structs/Game.SmithyAtlasScoreData.go
new file mode 100644
index 000000000..6aea6b827
--- /dev/null
+++ b/sys/configure/structs/Game.SmithyAtlasScoreData.go
@@ -0,0 +1,41 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameSmithyAtlasScoreData struct {
+ Id int32
+ Quality int32
+ Lv int32
+ Score int32
+}
+
+const TypeId_GameSmithyAtlasScoreData = -793121789
+
+func (*GameSmithyAtlasScoreData) GetTypeId() int32 {
+ return -793121789
+}
+
+func (_v *GameSmithyAtlasScoreData)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["quality"].(float64); !_ok_ { err = errors.New("quality error"); return }; _v.Quality = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lv"].(float64); !_ok_ { err = errors.New("lv error"); return }; _v.Lv = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["score"].(float64); !_ok_ { err = errors.New("score error"); return }; _v.Score = int32(_tempNum_) }
+ return
+}
+
+func DeserializeGameSmithyAtlasScoreData(_buf map[string]interface{}) (*GameSmithyAtlasScoreData, error) {
+ v := &GameSmithyAtlasScoreData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index d2557223b..bf1953aca 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -132,7 +132,6 @@ type Tables struct {
Recharge *GameRecharge
PrivilegeCard *GamePrivilegeCard
Privilege *GamePrivilege
- WorldTask *GameWorldTask
Teaching *GameTeaching
HeroStrategy *GameHeroStrategy
FightGlobalEvent *GameFightGlobalEvent
@@ -165,6 +164,9 @@ type Tables struct {
SmithyTool *GameSmithyTool
pandsmasexp *Gamepandsmasexp
SmithyCustomer *GameSmithyCustomer
+ SmithyAtlas *GameSmithyAtlas
+ SmithyAtlasLv *GameSmithyAtlasLv
+ SmithyAtlasScore *GameSmithyAtlasScore
}
func NewTables(loader JsonLoader) (*Tables, error) {
@@ -898,12 +900,6 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.Privilege, err = NewGamePrivilege(buf) ; err != nil {
return nil, err
}
- if buf, err = loader("game_worldtask") ; err != nil {
- return nil, err
- }
- if tables.WorldTask, err = NewGameWorldTask(buf) ; err != nil {
- return nil, err
- }
if buf, err = loader("game_teaching") ; err != nil {
return nil, err
}
@@ -1096,5 +1092,23 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.SmithyCustomer, err = NewGameSmithyCustomer(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_smithyatlas") ; err != nil {
+ return nil, err
+ }
+ if tables.SmithyAtlas, err = NewGameSmithyAtlas(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_smithyatlaslv") ; err != nil {
+ return nil, err
+ }
+ if tables.SmithyAtlasLv, err = NewGameSmithyAtlasLv(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_smithyatlasscore") ; err != nil {
+ return nil, err
+ }
+ if tables.SmithyAtlasScore, err = NewGameSmithyAtlasScore(buf) ; err != nil {
+ return nil, err
+ }
return tables, nil
}
diff --git a/sys/configure/structs/game.equipData.go b/sys/configure/structs/game.equipData.go
index efe9fdae8..3f34c8474 100644
--- a/sys/configure/structs/game.equipData.go
+++ b/sys/configure/structs/game.equipData.go
@@ -14,6 +14,7 @@ type GameEquipData struct {
Id string
EquipId int32
Name string
+ AtlasId string
Suittype int32
Suitintr string
Pos int32
@@ -41,6 +42,7 @@ func (_v *GameEquipData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["equip_id"].(float64); !_ok_ { err = errors.New("equip_id error"); return }; _v.EquipId = 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.AtlasId, _ok_ = _buf["atlas_id"].(string); !_ok_ { err = errors.New("atlas_id error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["suittype"].(float64); !_ok_ { err = errors.New("suittype error"); return }; _v.Suittype = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["suitintr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Suitintr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Suitintr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pos"].(float64); !_ok_ { err = errors.New("pos error"); return }; _v.Pos = int32(_tempNum_) }
From cabae828158e9af5d1a3b3e89ac4f9c9e463aa47 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 20 Feb 2023 19:10:21 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=9B=BE=E9=89=B4=E6=BF=80=E6=B4=BB?=
=?UTF-8?q?=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/smithy/model_atlas.go | 43 ++++++++++++++++++++++++++++++++++-
pb/smithy_db.pb.go | 14 ++++++------
2 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/modules/smithy/model_atlas.go b/modules/smithy/model_atlas.go
index f9aa00f5d..f549c8e2b 100644
--- a/modules/smithy/model_atlas.go
+++ b/modules/smithy/model_atlas.go
@@ -6,6 +6,7 @@ import (
"go_dreamfactory/modules"
"go_dreamfactory/pb"
+ "go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/x/bsonx"
)
@@ -29,11 +30,51 @@ func (this *modelAtlas) Init(service core.IService, module core.IModule, comp co
func (this *modelAtlas) getSmithyAtlasList(uid string) (result *pb.DBAtlas, err error) {
result = &pb.DBAtlas{}
if err = this.Get(uid, result); err != nil {
+ if mongo.ErrNoDocuments == err {
+ result.Id = primitive.NewObjectID().Hex()
+ result.Uid = uid
+ result.Tujian = make(map[string]*pb.ForgeData, 0)
+ this.Add(uid, result)
+ err = nil
+ }
return
}
- return result, nil
+ return
}
func (this *modelAtlas) modifySmithyAtlasList(uid string, data map[string]interface{}) error {
return this.Change(uid, data)
}
+
+// 检查是否激活图鉴
+
+func (this *modelAtlas) CheckActivateAtlas(uid string, id string, lv int32, quality int32, forgeCount int32) bool {
+ conf := this.module.configure.GetSmithyAtlasConf(id)
+ if conf != nil {
+ return false
+ }
+ list, err := this.module.modelAtlas.getSmithyAtlasList(uid)
+ if err != nil {
+ return false
+ }
+ for k, v := range list.Tujian {
+ if k == id { // 找到相同的 校验 对应的分数
+ // 获取分数
+ scoreConf := this.module.configure.GetSmithyAtlasScoreConf(quality, lv)
+ if scoreConf != nil {
+ if v.Score <= scoreConf.Score {
+ v.Lv = lv
+ v.Quality = quality
+ v.Score = scoreConf.Score
+ v.ForgeCount = forgeCount // 更新锻造次数
+ update := make(map[string]interface{}, 0)
+ update["tujian"] = list.Tujian
+ this.module.modelAtlas.modifySmithyAtlasList(uid, update) // 更新分数信息
+ }
+ return true
+ }
+ return false
+ }
+ }
+ return true
+}
diff --git a/pb/smithy_db.pb.go b/pb/smithy_db.pb.go
index aede2903c..94ab82f9c 100644
--- a/pb/smithy_db.pb.go
+++ b/pb/smithy_db.pb.go
@@ -327,11 +327,11 @@ type DBAtlas struct {
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
- Tujian map[int32]*ForgeData `protobuf:"bytes,3,rep,name=tujian,proto3" json:"tujian" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 图鉴信息
- Slider int32 `protobuf:"varint,4,opt,name=slider,proto3" json:"slider"` // 进度
- Reward int32 `protobuf:"varint,5,opt,name=reward,proto3" json:"reward"` // 奖励进度
+ 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
+ Tujian map[string]*ForgeData `protobuf:"bytes,3,rep,name=tujian,proto3" json:"tujian" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 图鉴信息
+ Slider int32 `protobuf:"varint,4,opt,name=slider,proto3" json:"slider"` // 进度
+ Reward int32 `protobuf:"varint,5,opt,name=reward,proto3" json:"reward"` // 奖励进度
}
func (x *DBAtlas) Reset() {
@@ -380,7 +380,7 @@ func (x *DBAtlas) GetUid() string {
return ""
}
-func (x *DBAtlas) GetTujian() map[int32]*ForgeData {
+func (x *DBAtlas) GetTujian() map[string]*ForgeData {
if x != nil {
return x.Tujian
}
@@ -796,7 +796,7 @@ var file_smithy_smithy_db_proto_rawDesc = []byte{
0x69, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x05,
0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x45, 0x0a, 0x0b,
0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
- 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a,
+ 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a,
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x46,
0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
0x02, 0x38, 0x01, 0x22, 0x6b, 0x0a, 0x09, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61,