From ef74f429caff76aa0ca6833ffebcd65e9dc3f981 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 16 Feb 2023 15:37:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E9=80=A0=E8=A3=85=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bin/json/game_newsmithy.json | 841 ++++++++++++--
bin/json/game_pandsmasexp.json | 1006 +++++++++++++++++
bin/json/game_smithycustomer.json | 42 +
comm/const.go | 7 +
modules/smithy/api_forgeequip.go | 65 +-
modules/smithy/comp_configure.go | 108 +-
pb/errorcode.pb.go | 16 +-
pb/smithy_db.pb.go | 362 +++---
pb/smithy_msg.pb.go | 248 ++--
sys/configure/structs/Game.NewSmithyData.go | 23 +
sys/configure/structs/Game.SmithyCustomer.go | 42 +
.../structs/Game.SmithyCustomerData.go | 69 ++
sys/configure/structs/Game.pandsmasexp.go | 42 +
sys/configure/structs/Game.pandsmasexpData.go | 143 +++
sys/configure/structs/Tables.go | 14 +
15 files changed, 2600 insertions(+), 428 deletions(-)
create mode 100644 bin/json/game_pandsmasexp.json
create mode 100644 bin/json/game_smithycustomer.json
create mode 100644 sys/configure/structs/Game.SmithyCustomer.go
create mode 100644 sys/configure/structs/Game.SmithyCustomerData.go
create mode 100644 sys/configure/structs/Game.pandsmasexp.go
create mode 100644 sys/configure/structs/Game.pandsmasexpData.go
diff --git a/bin/json/game_newsmithy.json b/bin/json/game_newsmithy.json
index 110cd12df..8f8a6a1f5 100644
--- a/bin/json/game_newsmithy.json
+++ b/bin/json/game_newsmithy.json
@@ -2,376 +2,1067 @@
{
"id": 1,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [
+ {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10201",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10301",
+ "n": 3
+ }
+ ],
+ "temperature": 50,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 2
+ },
+ "nDrop": 10001,
+ "qDrop": 20001
},
{
"id": 2,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 3
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 3,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 4
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 4,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 5
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 5,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 6
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 6,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 7
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 7,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 8
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 8,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 9
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 9,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 10
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 10,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 11
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 11,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 12
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 12,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 13
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 13,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 14
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 14,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 15
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 15,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 16
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 16,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 17
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 17,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 18
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 18,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 19
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 19,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 20
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 20,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 21
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 21,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 22
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 22,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 23
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 23,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 24
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 24,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 25
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 25,
"item_id": 0,
- "type": 1
+ "type": 1,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 26
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 26,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 27
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 27,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 28
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 28,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 29
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 29,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 30
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 30,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 31
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 31,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 32
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 32,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 33
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 33,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 34
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 34,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 35
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 35,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 36
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 36,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 37
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 37,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 38
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 38,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 39
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 39,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 40
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 40,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 41
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 41,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 42
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 42,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 43
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 43,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 44
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 44,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 45
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 45,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 46
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 46,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 47
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 47,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 48
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 48,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 49
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 49,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 50
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 50,
"item_id": 0,
- "type": 2
+ "type": 2,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 51
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 51,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 52
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 52,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 53
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 53,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 54
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 54,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 55
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 55,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 56
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 56,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 57
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 57,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 58
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 58,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 59
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 59,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 60
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 60,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 61
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 61,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 62
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 62,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 63
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 63,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 64
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 64,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 65
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 65,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 66
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 66,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 67
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 67,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 68
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 68,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 69
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 69,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 70
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 70,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 71
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 71,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 72
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 72,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 73
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 73,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 74
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 74,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 75
+ },
+ "nDrop": 0,
+ "qDrop": 0
},
{
"id": 75,
"item_id": 0,
- "type": 3
+ "type": 3,
+ "consume": [],
+ "temperature": 0,
+ "quality": {
+ "a": "item",
+ "t": "20201",
+ "n": 76
+ },
+ "nDrop": 0,
+ "qDrop": 0
}
]
\ No newline at end of file
diff --git a/bin/json/game_pandsmasexp.json b/bin/json/game_pandsmasexp.json
new file mode 100644
index 000000000..6be4649f3
--- /dev/null
+++ b/bin/json/game_pandsmasexp.json
@@ -0,0 +1,1006 @@
+[
+ {
+ "id": 110,
+ "bossid": 1,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "火焰泰坦"
+ },
+ "ReadyID": 104,
+ "difficulty": 1,
+ "BattleReadyID": 104,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "equi",
+ "t": "10110",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10111",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10112",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10113",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "11114",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "11115",
+ "n": 1
+ }
+ ],
+ "drop": 1001,
+ "scene": "",
+ "bossmodel": 11009,
+ "boss_skill": 51004,
+ "boss": [
+ 301011
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 6
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 5
+ }
+ ]
+ },
+ {
+ "id": 120,
+ "bossid": 1,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "火焰泰坦"
+ },
+ "ReadyID": 104,
+ "difficulty": 2,
+ "BattleReadyID": 104,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "equi",
+ "t": "10120",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10121",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10122",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10113",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "11114",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "11115",
+ "n": 1
+ }
+ ],
+ "drop": 1002,
+ "scene": "",
+ "bossmodel": 11009,
+ "boss_skill": 51004,
+ "boss": [
+ 301014
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 7
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 6
+ }
+ ]
+ },
+ {
+ "id": 130,
+ "bossid": 1,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "火焰泰坦"
+ },
+ "ReadyID": 104,
+ "difficulty": 3,
+ "BattleReadyID": 104,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "equi",
+ "t": "10120",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10121",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10122",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10123",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "11124",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "11125",
+ "n": 1
+ }
+ ],
+ "drop": 1003,
+ "scene": "",
+ "bossmodel": 11009,
+ "boss_skill": 51004,
+ "boss": [
+ 301017
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 8
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 7
+ }
+ ]
+ },
+ {
+ "id": 140,
+ "bossid": 1,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "火焰泰坦"
+ },
+ "ReadyID": 104,
+ "difficulty": 4,
+ "BattleReadyID": 104,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "equi",
+ "t": "10130",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10131",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10132",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10123",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "11124",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "11125",
+ "n": 1
+ }
+ ],
+ "drop": 1004,
+ "scene": "",
+ "bossmodel": 11009,
+ "boss_skill": 51004,
+ "boss": [
+ 301020
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 9
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 8
+ }
+ ]
+ },
+ {
+ "id": 210,
+ "bossid": 2,
+ "name": {
+ "key": "viking_boss_1002",
+ "text": "冰之泰坦"
+ },
+ "ReadyID": 104,
+ "difficulty": 1,
+ "BattleReadyID": 104,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "equi",
+ "t": "10110",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10111",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10112",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10113",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "11114",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "11115",
+ "n": 1
+ }
+ ],
+ "drop": 1011,
+ "scene": "",
+ "bossmodel": 11003,
+ "boss_skill": 51004,
+ "boss": [
+ 302011
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 6
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 5
+ }
+ ]
+ },
+ {
+ "id": 220,
+ "bossid": 2,
+ "name": {
+ "key": "viking_boss_1002",
+ "text": "冰之泰坦"
+ },
+ "ReadyID": 104,
+ "difficulty": 2,
+ "BattleReadyID": 104,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "equi",
+ "t": "10120",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10121",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10122",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10113",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "11114",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "11115",
+ "n": 1
+ }
+ ],
+ "drop": 1012,
+ "scene": "",
+ "bossmodel": 11003,
+ "boss_skill": 51004,
+ "boss": [
+ 302014
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 7
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 6
+ }
+ ]
+ },
+ {
+ "id": 230,
+ "bossid": 2,
+ "name": {
+ "key": "viking_boss_1002",
+ "text": "冰之泰坦"
+ },
+ "ReadyID": 104,
+ "difficulty": 3,
+ "BattleReadyID": 104,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "equi",
+ "t": "10120",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10121",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10122",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10123",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "11124",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "11125",
+ "n": 1
+ }
+ ],
+ "drop": 1013,
+ "scene": "",
+ "bossmodel": 11003,
+ "boss_skill": 51004,
+ "boss": [
+ 302017
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 8
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 7
+ }
+ ]
+ },
+ {
+ "id": 240,
+ "bossid": 2,
+ "name": {
+ "key": "viking_boss_1002",
+ "text": "冰之泰坦"
+ },
+ "ReadyID": 104,
+ "difficulty": 4,
+ "BattleReadyID": 104,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "equi",
+ "t": "10130",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10131",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10132",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10123",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "11124",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "11125",
+ "n": 1
+ }
+ ],
+ "drop": 1014,
+ "scene": "",
+ "bossmodel": 11003,
+ "boss_skill": 51004,
+ "boss": [
+ 302020
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 9
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 8
+ }
+ ]
+ },
+ {
+ "id": 310,
+ "bossid": 3,
+ "name": {
+ "key": "viking_boss_1003",
+ "text": "森林泰坦"
+ },
+ "ReadyID": 104,
+ "difficulty": 1,
+ "BattleReadyID": 104,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "equi",
+ "t": "10110",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10111",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10112",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10113",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "11114",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "11115",
+ "n": 1
+ }
+ ],
+ "drop": 1021,
+ "scene": "",
+ "bossmodel": 11018,
+ "boss_skill": 51004,
+ "boss": [
+ 303011
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 6
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 5
+ }
+ ]
+ },
+ {
+ "id": 320,
+ "bossid": 3,
+ "name": {
+ "key": "viking_boss_1003",
+ "text": "森林泰坦"
+ },
+ "ReadyID": 104,
+ "difficulty": 2,
+ "BattleReadyID": 104,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "equi",
+ "t": "10120",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10121",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10122",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10113",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "11114",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "11115",
+ "n": 1
+ }
+ ],
+ "drop": 1022,
+ "scene": "",
+ "bossmodel": 11018,
+ "boss_skill": 51004,
+ "boss": [
+ 303014
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 7
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 6
+ }
+ ]
+ },
+ {
+ "id": 330,
+ "bossid": 3,
+ "name": {
+ "key": "viking_boss_1003",
+ "text": "森林泰坦"
+ },
+ "ReadyID": 104,
+ "difficulty": 3,
+ "BattleReadyID": 104,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "equi",
+ "t": "10120",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10121",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10122",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10123",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "11124",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "11125",
+ "n": 1
+ }
+ ],
+ "drop": 1023,
+ "scene": "",
+ "bossmodel": 11018,
+ "boss_skill": 51004,
+ "boss": [
+ 303017
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 8
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 7
+ }
+ ]
+ },
+ {
+ "id": 340,
+ "bossid": 3,
+ "name": {
+ "key": "viking_boss_1003",
+ "text": "森林泰坦"
+ },
+ "ReadyID": 104,
+ "difficulty": 4,
+ "BattleReadyID": 104,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "equi",
+ "t": "10130",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10131",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10132",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10123",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "11124",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "11125",
+ "n": 1
+ }
+ ],
+ "drop": 1024,
+ "scene": "",
+ "bossmodel": 11018,
+ "boss_skill": 51004,
+ "boss": [
+ 303020
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 9
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 8
+ }
+ ]
+ },
+ {
+ "id": 410,
+ "bossid": 11,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "武器BOSS"
+ },
+ "ReadyID": 104,
+ "difficulty": 1,
+ "BattleReadyID": 104,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "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": 11009,
+ "boss_skill": 51004,
+ "boss": [
+ 301011
+ ],
+ "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_smithycustomer.json b/bin/json/game_smithycustomer.json
new file mode 100644
index 000000000..aaad93b63
--- /dev/null
+++ b/bin/json/game_smithycustomer.json
@@ -0,0 +1,42 @@
+[
+ {
+ "customer_id": 1,
+ "customer_type": 1,
+ "customer_speak": {
+ "key": "我需要{0}件【{1}】，如果你暂时没有备货的话我可以在这等一段时间，但不会太久。",
+ "text": ""
+ },
+ "goods": [],
+ "reword": []
+ },
+ {
+ "customer_id": 2,
+ "customer_type": 2,
+ "customer_speak": {
+ "key": "我需要{0}件【{1}】，如果你暂时没有备货的话我可以在这等一段时间，但不会太久。",
+ "text": ""
+ },
+ "goods": [],
+ "reword": []
+ },
+ {
+ "customer_id": 3,
+ "customer_type": 3,
+ "customer_speak": {
+ "key": "",
+ "text": ""
+ },
+ "goods": [],
+ "reword": []
+ },
+ {
+ "customer_id": 4,
+ "customer_type": 4,
+ "customer_speak": {
+ "key": "我有个宝贝，你要是喜欢的话便宜你点卖你。",
+ "text": ""
+ },
+ "goods": [],
+ "reword": []
+ }
+]
\ No newline at end of file
diff --git a/comm/const.go b/comm/const.go
index 2dcd76464..3c1c9711c 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -726,3 +726,10 @@ const (
UseType1 int32 = 1 //英雄碎片
UseType8 int32 = 8 //觉醒材料合成
)
+
+const (
+ SmithyReelType1 = 1 //炉温消耗减少
+ SmithyReelType2 = 2 // 材料消耗减少
+ SmithyReelType3 = 3 // 解锁图纸【紫金雷神锤】
+ SmithyReelType4 = 4
+)
diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go
index 4ebe80892..653e9e9ac 100644
--- a/modules/smithy/api_forgeequip.go
+++ b/modules/smithy/api_forgeequip.go
@@ -3,13 +3,14 @@ package smithy
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
+ cfg "go_dreamfactory/sys/configure/structs"
"google.golang.org/protobuf/proto"
)
//参数校验
func (this *apiComp) ForgeEquipCheck(session comm.IUserSession, req *pb.SmithyForgeEquipReq) (code pb.ErrorCode) {
- if req.EquipType == 0 {
+ if req.ReelId == 0 {
code = pb.ErrorCode_ReqParameterError
return
}
@@ -18,18 +19,76 @@ func (this *apiComp) ForgeEquipCheck(session comm.IUserSession, req *pb.SmithyFo
// 打造装备
func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEquipReq) (code pb.ErrorCode, data proto.Message) {
- var ()
+ var (
+ stove *pb.DBStove
+ err error
+ update map[string]interface{}
+ costRes []*cfg.Gameatn
+ )
+ update = make(map[string]interface{})
code = this.ForgeEquipCheck(session, req)
if code != pb.ErrorCode_Success {
return // 参数校验失败直接返回
}
- stove, err := this.module.modelStove.getSmithyStoveList(session.GetUserId())
+ stove, err = this.module.modelStove.getSmithyStoveList(session.GetUserId())
if err != nil {
code = pb.ErrorCode_DBError
return
}
+ reelcfg := this.module.configure.GetSmithyReelConfigData(req.ReelId)
+ if reelcfg == nil {
+ code = pb.ErrorCode_ReqParameterError // 没有找到该类型的图纸信息
+ return
+ }
+ // 校验图纸是否激活
+ if _, ok := stove.Data[req.ReelId]; !ok { // 是不是首次打造
+ if !this.module.configure.CheckSmithyFirstReelConfigData(reelcfg.Type, req.ReelId) { // 没有激活图纸
+ code = pb.ErrorCode_SmithyNoReel
+ return
+ }
+ stove.Data[req.ReelId] = &pb.Mastery{
+ Lv: 1,
+ Value: 0,
+ }
+ //update["data"] = stove.Data
+ }
+ stove.Data[req.ReelId].Value += 1
+ // 是否是精益打造
+ if req.Quality > 0 {
+ costRes = append(costRes, reelcfg.Quality)
+ }
+ costRes = append(costRes, reelcfg.Consume...)
+ if code = this.module.CheckRes(session, costRes); code != pb.ErrorCode_Success {
+ return
+ }
+ // 检查炉温 是否够
+ if stove.Temperature < reelcfg.Temperature {
+ code = pb.ErrorCode_SmithyNoTemperature // 炉温不够 直接返回
+ return
+ }
+
+ // 检查是否提升了熟练度等级
+ nextProficiency := this.module.configure.GetSmithyProficileData(req.ReelId, stove.Data[req.ReelId].Lv+1)
+ if nextProficiency != nil && nextProficiency.Proficiency >= stove.Data[req.ReelId].Value { // 提升熟练度
+ stove.Data[req.ReelId].Lv += 1
+ stove.Data[req.ReelId].Value = 0
+ // 校验是否解锁了新的图纸
+ if nextProficiency.Type == comm.SmithyReelType3 {
+ stove.Data[nextProficiency.Value1] = &pb.Mastery{
+ Lv: 1,
+ Value: 0,
+ }
+ }
+ }
+ if code = this.module.ConsumeRes(session, costRes, true); code != pb.ErrorCode_Success {
+ return
+ }
+ stove.Temperature -= reelcfg.Temperature // 消耗温度
+ update["data"] = stove.Data
+ 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/modules/smithy/comp_configure.go b/modules/smithy/comp_configure.go
index 3487bcfb7..21089c1d1 100644
--- a/modules/smithy/comp_configure.go
+++ b/modules/smithy/comp_configure.go
@@ -10,8 +10,13 @@ import (
)
const (
- game_smithy = "game_smithy.json"
- game_smithystove = "game_smithystove.json"
+ 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" // 铁匠铺工具台
)
///配置管理基础组件
@@ -20,13 +25,15 @@ type configureComp struct {
module *Smithy
hlock sync.RWMutex
_smithyMap map[int64]*cfg.GameSmithyData
+
+ _mapProficile map[int64]*cfg.GameSmithyProficiencyData // 熟练度 key 卷轴ID+ 等级
}
//组件初始化接口
func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
err = this.MCompConfigure.Init(service, module, comp, options)
- this._smithyMap = make(map[int64]*cfg.GameSmithyData, 0)
this.module = module.(*Smithy)
+ this._smithyMap = make(map[int64]*cfg.GameSmithyData, 0)
configure.RegisterConfigure(game_smithy, cfg.NewGameSmithy, func() {
if v, err := this.GetConfigure(game_smithy); err == nil {
if configure, ok := v.(*cfg.GameSmithy); ok {
@@ -41,7 +48,14 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
log.Errorf("get game_pagoda conf err:%v", err)
return
})
- err = this.LoadConfigure(game_smithystove, cfg.NewGameSmithyStove)
+
+ this._mapProficile = make(map[int64]*cfg.GameSmithyProficiencyData, 0)
+ configure.RegisterConfigure(game_smproficiency, cfg.NewGameSmithyProficiency, this.LoadProficileData)
+ err = this.LoadConfigure(game_smithyreel, cfg.NewGameSmithyStove)
+ err = this.LoadConfigure(game_smithystove, cfg.NewGameSmithyStoveV1)
+ err = this.LoadConfigure(game_smithytools, cfg.NewGameSmithyTool)
+ err = this.LoadConfigure(game_smithystoveold, cfg.NewGameSmithyStove)
+
return
}
@@ -66,7 +80,7 @@ func (this *configureComp) GetSmithyTypeConfigData() (mapType map[int32]struct{}
// 获取炉子配置数据
func (this *configureComp) GetSmithyStoveConfigData(level int32) (data *cfg.GameSmithyStoveData) {
- if v, err := this.GetConfigure(game_smithystove); err == nil {
+ if v, err := this.GetConfigure(game_smithystoveold); err == nil {
if configure, ok := v.(*cfg.GameSmithyStove); ok {
data = configure.Get(int32(level))
return
@@ -91,3 +105,87 @@ func (this *configureComp) LoadMultiConfigure(confs map[string]interface{}) (err
func (this *configureComp) GetConfigure(name string) (v interface{}, err error) {
return configure.GetConfigure(name)
}
+
+// 获取图纸信息
+func (this *configureComp) GetSmithyReelConfigData(id int32) (data *cfg.GameNewSmithyData) {
+ if v, err := this.GetConfigure(game_smithyreel); err == nil {
+ if configure, ok := v.(*cfg.GameNewSmithy); ok {
+ data = configure.Get(int32(id))
+ return
+ }
+ }
+ return
+}
+
+func (this *configureComp) CheckSmithyFirstReelConfigData(etype int32, id int32) bool {
+ if v, err := this.GetConfigure(game_smithyreel); err == nil {
+ if configure, ok := v.(*cfg.GameNewSmithy); ok {
+ for _, v := range configure.GetDataList() {
+ if v.Type == etype {
+ if v.Id == id {
+ return true
+ } else {
+ return false
+ }
+ }
+ }
+ return true
+ }
+ }
+ return false
+}
+
+// 获取铁匠铺熟练度数据
+func (this *configureComp) GetSmithProficiencyConf(id int32) (data *cfg.GameSmithyProficiencyData) {
+ if v, err := this.GetConfigure(game_smproficiency); err == nil {
+ if configure, ok := v.(*cfg.GameSmithyProficiency); ok {
+ data = configure.Get(int32(id))
+ return
+ }
+ }
+ return
+}
+
+func (this *configureComp) LoadProficileData() {
+
+ if v, err := this.GetConfigure(game_smproficiency); err == nil {
+ if configure, ok := v.(*cfg.GameSmithyProficiency); ok {
+ this.hlock.Lock()
+ defer this.hlock.Unlock()
+ for _, value := range configure.GetDataList() {
+ this._mapProficile[int64(value.ReelId<<16)+int64(value.ProficiencyLv)] = value
+ }
+ return
+ }
+ } else {
+ log.Errorf("get game_pagoda conf err:%v", err)
+
+ }
+ return
+}
+
+func (this *configureComp) GetSmithyProficileData(reelid int32, proficile int32) *cfg.GameSmithyProficiencyData {
+ return this._mapProficile[int64(reelid<<16)+int64(proficile)]
+}
+
+// 获取铁匠铺工作台信息
+func (this *configureComp) GetSmithyStoveConf(star int32) (data *cfg.GameSmithyStoveV1Data) {
+ if v, err := this.GetConfigure(game_smithystove); err == nil {
+ if configure, ok := v.(*cfg.GameSmithyStoveV1); ok {
+ data = configure.Get(int32(star))
+ return
+ }
+ }
+ return
+}
+
+// 获取铁匠铺工作台信息
+func (this *configureComp) GetSmithyStoveConf1(id int32) (data *cfg.GameSmithyToolData) {
+ if v, err := this.GetConfigure(game_smithytools); err == nil {
+ if configure, ok := v.(*cfg.GameSmithyTool); ok {
+ data = configure.Get(int32(id))
+ return
+ }
+ }
+ return
+}
diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index 85d31b146..011b826e5 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -315,6 +315,9 @@ const (
// AutoBattle
ErrorCode_AutoBattleNoData ErrorCode = 4001 //没有正在自动战斗的数据
ErrorCode_AutoBattleStatesErr ErrorCode = 4002 // 自动战斗状态错误
+ // smithy
+ ErrorCode_SmithyNoReel ErrorCode = 4101 // 没有激活图纸信息
+ ErrorCode_SmithyNoTemperature ErrorCode = 4102 // 炉温不够不能打造
)
// Enum value maps for ErrorCode.
@@ -581,6 +584,8 @@ var (
3901: "AcademyTaskNoCompleteTask",
4001: "AutoBattleNoData",
4002: "AutoBattleStatesErr",
+ 4101: "SmithyNoReel",
+ 4102: "SmithyNoTemperature",
}
ErrorCode_value = map[string]int32{
"Success": 0,
@@ -844,6 +849,8 @@ var (
"AcademyTaskNoCompleteTask": 3901,
"AutoBattleNoData": 4001,
"AutoBattleStatesErr": 4002,
+ "SmithyNoReel": 4101,
+ "SmithyNoTemperature": 4102,
}
)
@@ -878,7 +885,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, 0x92, 0x2f, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+ 0x6f, 0x2a, 0xbf, 0x2f, 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,
@@ -1255,8 +1262,11 @@ var file_errorcode_proto_rawDesc = []byte{
0x73, 0x6b, 0x10, 0xbd, 0x1e, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74,
0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xa1, 0x1f, 0x12, 0x18, 0x0a, 0x13,
0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73,
- 0x45, 0x72, 0x72, 0x10, 0xa2, 0x1f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
- 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x45, 0x72, 0x72, 0x10, 0xa2, 0x1f, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
+ 0x4e, 0x6f, 0x52, 0x65, 0x65, 0x6c, 0x10, 0x85, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69,
+ 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x54, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65,
+ 0x10, 0x86, 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 8074c955c..1d360c4b2 100644
--- a/pb/smithy_db.pb.go
+++ b/pb/smithy_db.pb.go
@@ -179,17 +179,20 @@ func (x *DBStove) GetRecoveTime() int64 {
return 0
}
-// 商人信息
-type DBBusiness struct {
+type DBCustomer struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Shop map[int32]int32 `protobuf:"bytes,1,rep,name=shop,proto3" json:"shop" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+ 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"` //
+ CustomerIds []int32 `protobuf:"varint,3,rep,packed,name=customerIds,proto3" json:"customerIds" bson:"customerIds"` // 顾客Ids
+ Total int32 `protobuf:"varint,4,opt,name=total,proto3" json:"total" bson:"total"` //顾客累计数
+ LastRefreshTime int64 `protobuf:"varint,5,opt,name=lastRefreshTime,proto3" json:"lastRefreshTime" bson:"lastRefreshTime"` // 上次更新时间
}
-func (x *DBBusiness) Reset() {
- *x = DBBusiness{}
+func (x *DBCustomer) Reset() {
+ *x = DBCustomer{}
if protoimpl.UnsafeEnabled {
mi := &file_smithy_smithy_db_proto_msgTypes[2]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -197,13 +200,13 @@ func (x *DBBusiness) Reset() {
}
}
-func (x *DBBusiness) String() string {
+func (x *DBCustomer) String() string {
return protoimpl.X.MessageStringOf(x)
}
-func (*DBBusiness) ProtoMessage() {}
+func (*DBCustomer) ProtoMessage() {}
-func (x *DBBusiness) ProtoReflect() protoreflect.Message {
+func (x *DBCustomer) ProtoReflect() protoreflect.Message {
mi := &file_smithy_smithy_db_proto_msgTypes[2]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -215,93 +218,42 @@ func (x *DBBusiness) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x)
}
-// Deprecated: Use DBBusiness.ProtoReflect.Descriptor instead.
-func (*DBBusiness) Descriptor() ([]byte, []int) {
+// Deprecated: Use DBCustomer.ProtoReflect.Descriptor instead.
+func (*DBCustomer) Descriptor() ([]byte, []int) {
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{2}
}
-func (x *DBBusiness) GetShop() map[int32]int32 {
- if x != nil {
- return x.Shop
- }
- return nil
-}
-
-type DBBusinessData struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
- Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID
- Data []*DBBusiness `protobuf:"bytes,3,rep,name=data,proto3" json:"data"`
- Count int32 `protobuf:"varint,4,opt,name=count,proto3" json:"count"` // 刷新次数
- RefreshTime int64 `protobuf:"varint,5,opt,name=refreshTime,proto3" json:"refreshTime" bson:"refreshTime"` //刷新开始时间
-}
-
-func (x *DBBusinessData) Reset() {
- *x = DBBusinessData{}
- if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_db_proto_msgTypes[3]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *DBBusinessData) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DBBusinessData) ProtoMessage() {}
-
-func (x *DBBusinessData) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_db_proto_msgTypes[3]
- if protoimpl.UnsafeEnabled && x != nil {
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- if ms.LoadMessageInfo() == nil {
- ms.StoreMessageInfo(mi)
- }
- return ms
- }
- return mi.MessageOf(x)
-}
-
-// Deprecated: Use DBBusinessData.ProtoReflect.Descriptor instead.
-func (*DBBusinessData) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_db_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *DBBusinessData) GetId() string {
+func (x *DBCustomer) GetId() string {
if x != nil {
return x.Id
}
return ""
}
-func (x *DBBusinessData) GetUid() string {
+func (x *DBCustomer) GetUid() string {
if x != nil {
return x.Uid
}
return ""
}
-func (x *DBBusinessData) GetData() []*DBBusiness {
+func (x *DBCustomer) GetCustomerIds() []int32 {
if x != nil {
- return x.Data
+ return x.CustomerIds
}
return nil
}
-func (x *DBBusinessData) GetCount() int32 {
+func (x *DBCustomer) GetTotal() int32 {
if x != nil {
- return x.Count
+ return x.Total
}
return 0
}
-func (x *DBBusinessData) GetRefreshTime() int64 {
+func (x *DBCustomer) GetLastRefreshTime() int64 {
if x != nil {
- return x.RefreshTime
+ return x.LastRefreshTime
}
return 0
}
@@ -321,7 +273,7 @@ type DBTujian struct {
func (x *DBTujian) Reset() {
*x = DBTujian{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_db_proto_msgTypes[4]
+ mi := &file_smithy_smithy_db_proto_msgTypes[3]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -334,7 +286,7 @@ func (x *DBTujian) String() string {
func (*DBTujian) ProtoMessage() {}
func (x *DBTujian) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_db_proto_msgTypes[4]
+ mi := &file_smithy_smithy_db_proto_msgTypes[3]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -347,7 +299,7 @@ func (x *DBTujian) ProtoReflect() protoreflect.Message {
// Deprecated: Use DBTujian.ProtoReflect.Descriptor instead.
func (*DBTujian) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_db_proto_rawDescGZIP(), []int{4}
+ return file_smithy_smithy_db_proto_rawDescGZIP(), []int{3}
}
func (x *DBTujian) GetId() string {
@@ -391,7 +343,7 @@ type ForgeData struct {
func (x *ForgeData) Reset() {
*x = ForgeData{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_db_proto_msgTypes[5]
+ mi := &file_smithy_smithy_db_proto_msgTypes[4]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -404,7 +356,7 @@ func (x *ForgeData) String() string {
func (*ForgeData) ProtoMessage() {}
func (x *ForgeData) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_db_proto_msgTypes[5]
+ mi := &file_smithy_smithy_db_proto_msgTypes[4]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -417,7 +369,7 @@ func (x *ForgeData) ProtoReflect() protoreflect.Message {
// Deprecated: Use ForgeData.ProtoReflect.Descriptor instead.
func (*ForgeData) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_db_proto_rawDescGZIP(), []int{5}
+ return file_smithy_smithy_db_proto_rawDescGZIP(), []int{4}
}
func (x *ForgeData) GetForgeCount() int32 {
@@ -455,7 +407,7 @@ type Clang struct {
func (x *Clang) Reset() {
*x = Clang{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_db_proto_msgTypes[6]
+ mi := &file_smithy_smithy_db_proto_msgTypes[5]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -468,7 +420,7 @@ func (x *Clang) String() string {
func (*Clang) ProtoMessage() {}
func (x *Clang) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_db_proto_msgTypes[6]
+ mi := &file_smithy_smithy_db_proto_msgTypes[5]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -481,7 +433,7 @@ func (x *Clang) ProtoReflect() protoreflect.Message {
// Deprecated: Use Clang.ProtoReflect.Descriptor instead.
func (*Clang) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_db_proto_rawDescGZIP(), []int{6}
+ return file_smithy_smithy_db_proto_rawDescGZIP(), []int{5}
}
func (x *Clang) GetDeskType() int32 {
@@ -518,7 +470,7 @@ type OrderClang struct {
func (x *OrderClang) Reset() {
*x = OrderClang{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_db_proto_msgTypes[7]
+ mi := &file_smithy_smithy_db_proto_msgTypes[6]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -531,7 +483,7 @@ func (x *OrderClang) String() string {
func (*OrderClang) ProtoMessage() {}
func (x *OrderClang) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_db_proto_msgTypes[7]
+ mi := &file_smithy_smithy_db_proto_msgTypes[6]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -544,7 +496,7 @@ func (x *OrderClang) ProtoReflect() protoreflect.Message {
// Deprecated: Use OrderClang.ProtoReflect.Descriptor instead.
func (*OrderClang) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_db_proto_rawDescGZIP(), []int{7}
+ return file_smithy_smithy_db_proto_rawDescGZIP(), []int{6}
}
func (x *OrderClang) GetDeskType() int32 {
@@ -590,7 +542,7 @@ type DBSmithy struct {
func (x *DBSmithy) Reset() {
*x = DBSmithy{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_db_proto_msgTypes[8]
+ mi := &file_smithy_smithy_db_proto_msgTypes[7]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -603,7 +555,7 @@ func (x *DBSmithy) String() string {
func (*DBSmithy) ProtoMessage() {}
func (x *DBSmithy) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_db_proto_msgTypes[8]
+ mi := &file_smithy_smithy_db_proto_msgTypes[7]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -616,7 +568,7 @@ func (x *DBSmithy) ProtoReflect() protoreflect.Message {
// Deprecated: Use DBSmithy.ProtoReflect.Descriptor instead.
func (*DBSmithy) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_db_proto_rawDescGZIP(), []int{8}
+ return file_smithy_smithy_db_proto_rawDescGZIP(), []int{7}
}
func (x *DBSmithy) GetId() string {
@@ -738,84 +690,78 @@ var file_smithy_smithy_db_proto_rawDesc = []byte{
0x1a, 0x38, 0x0a, 0x0a, 0x46, 0x6f, 0x72, 0x67, 0x65, 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, 0x22, 0x70, 0x0a, 0x0a, 0x44, 0x42,
- 0x42, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x12, 0x29, 0x0a, 0x04, 0x73, 0x68, 0x6f, 0x70,
- 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, 0x42, 0x75, 0x73, 0x69, 0x6e,
- 0x65, 0x73, 0x73, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73,
- 0x68, 0x6f, 0x70, 0x1a, 0x37, 0x0a, 0x09, 0x53, 0x68, 0x6f, 0x70, 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, 0x22, 0x8b, 0x01, 0x0a,
- 0x0e, 0x44, 0x42, 0x42, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x44, 0x61, 0x74, 0x61, 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, 0x1f, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
- 0x0b, 0x2e, 0x44, 0x42, 0x42, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x52, 0x04, 0x64, 0x61,
- 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x66, 0x72,
- 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x72,
- 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,
+ 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x90, 0x01, 0x0a, 0x0a, 0x44,
+ 0x42, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 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, 0x20, 0x0a, 0x0b, 0x63,
+ 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05,
+ 0x52, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x73, 0x12, 0x14, 0x0a,
+ 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 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,
}
var (
@@ -830,45 +776,41 @@ func file_smithy_smithy_db_proto_rawDescGZIP() []byte {
return file_smithy_smithy_db_proto_rawDescData
}
-var file_smithy_smithy_db_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
+var file_smithy_smithy_db_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
var file_smithy_smithy_db_proto_goTypes = []interface{}{
- (*Mastery)(nil), // 0: Mastery
- (*DBStove)(nil), // 1: DBStove
- (*DBBusiness)(nil), // 2: DBBusiness
- (*DBBusinessData)(nil), // 3: DBBusinessData
- (*DBTujian)(nil), // 4: DBTujian
- (*ForgeData)(nil), // 5: ForgeData
- (*Clang)(nil), // 6: Clang
- (*OrderClang)(nil), // 7: OrderClang
- (*DBSmithy)(nil), // 8: DBSmithy
- nil, // 9: DBStove.DataEntry
- nil, // 10: DBStove.SkillEntry
- nil, // 11: DBStove.ForgeEntry
- nil, // 12: DBBusiness.ShopEntry
- nil, // 13: DBTujian.TujianEntry
- nil, // 14: DBSmithy.SkillEntry
- nil, // 15: DBSmithy.DeskFloorEntry
- (*UserAssets)(nil), // 16: UserAssets
+ (*Mastery)(nil), // 0: Mastery
+ (*DBStove)(nil), // 1: DBStove
+ (*DBCustomer)(nil), // 2: DBCustomer
+ (*DBTujian)(nil), // 3: DBTujian
+ (*ForgeData)(nil), // 4: ForgeData
+ (*Clang)(nil), // 5: Clang
+ (*OrderClang)(nil), // 6: OrderClang
+ (*DBSmithy)(nil), // 7: DBSmithy
+ nil, // 8: DBStove.DataEntry
+ nil, // 9: DBStove.SkillEntry
+ nil, // 10: DBStove.ForgeEntry
+ nil, // 11: DBTujian.TujianEntry
+ nil, // 12: DBSmithy.SkillEntry
+ nil, // 13: DBSmithy.DeskFloorEntry
+ (*UserAssets)(nil), // 14: UserAssets
}
var file_smithy_smithy_db_proto_depIdxs = []int32{
- 9, // 0: DBStove.data:type_name -> DBStove.DataEntry
- 10, // 1: DBStove.skill:type_name -> DBStove.SkillEntry
- 11, // 2: DBStove.forge:type_name -> DBStove.ForgeEntry
- 12, // 3: DBBusiness.shop:type_name -> DBBusiness.ShopEntry
- 2, // 4: DBBusinessData.data:type_name -> DBBusiness
- 13, // 5: DBTujian.tujian:type_name -> DBTujian.TujianEntry
- 6, // 6: DBSmithy.clang:type_name -> Clang
- 7, // 7: DBSmithy.orders:type_name -> OrderClang
- 16, // 8: DBSmithy.items:type_name -> UserAssets
- 14, // 9: DBSmithy.skill:type_name -> DBSmithy.SkillEntry
- 15, // 10: DBSmithy.deskFloor:type_name -> DBSmithy.DeskFloorEntry
- 0, // 11: DBStove.DataEntry.value:type_name -> Mastery
- 5, // 12: DBTujian.TujianEntry.value:type_name -> ForgeData
- 13, // [13:13] is the sub-list for method output_type
- 13, // [13:13] is the sub-list for method input_type
- 13, // [13:13] is the sub-list for extension type_name
- 13, // [13:13] is the sub-list for extension extendee
- 0, // [0:13] is the sub-list for field type_name
+ 8, // 0: DBStove.data:type_name -> DBStove.DataEntry
+ 9, // 1: DBStove.skill:type_name -> DBStove.SkillEntry
+ 10, // 2: DBStove.forge:type_name -> DBStove.ForgeEntry
+ 11, // 3: DBTujian.tujian:type_name -> DBTujian.TujianEntry
+ 5, // 4: DBSmithy.clang:type_name -> Clang
+ 6, // 5: DBSmithy.orders:type_name -> OrderClang
+ 14, // 6: DBSmithy.items:type_name -> UserAssets
+ 12, // 7: DBSmithy.skill:type_name -> DBSmithy.SkillEntry
+ 13, // 8: DBSmithy.deskFloor:type_name -> DBSmithy.DeskFloorEntry
+ 0, // 9: DBStove.DataEntry.value:type_name -> Mastery
+ 4, // 10: DBTujian.TujianEntry.value:type_name -> ForgeData
+ 11, // [11:11] is the sub-list for method output_type
+ 11, // [11:11] is the sub-list for method input_type
+ 11, // [11:11] is the sub-list for extension type_name
+ 11, // [11:11] is the sub-list for extension extendee
+ 0, // [0:11] is the sub-list for field type_name
}
func init() { file_smithy_smithy_db_proto_init() }
@@ -903,7 +845,7 @@ func file_smithy_smithy_db_proto_init() {
}
}
file_smithy_smithy_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*DBBusiness); i {
+ switch v := v.(*DBCustomer); i {
case 0:
return &v.state
case 1:
@@ -915,18 +857,6 @@ func file_smithy_smithy_db_proto_init() {
}
}
file_smithy_smithy_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*DBBusinessData); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_smithy_smithy_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBTujian); i {
case 0:
return &v.state
@@ -938,7 +868,7 @@ func file_smithy_smithy_db_proto_init() {
return nil
}
}
- file_smithy_smithy_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+ file_smithy_smithy_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*ForgeData); i {
case 0:
return &v.state
@@ -950,7 +880,7 @@ func file_smithy_smithy_db_proto_init() {
return nil
}
}
- file_smithy_smithy_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+ file_smithy_smithy_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Clang); i {
case 0:
return &v.state
@@ -962,7 +892,7 @@ func file_smithy_smithy_db_proto_init() {
return nil
}
}
- file_smithy_smithy_db_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+ file_smithy_smithy_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*OrderClang); i {
case 0:
return &v.state
@@ -974,7 +904,7 @@ func file_smithy_smithy_db_proto_init() {
return nil
}
}
- file_smithy_smithy_db_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+ file_smithy_smithy_db_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBSmithy); i {
case 0:
return &v.state
@@ -993,7 +923,7 @@ func file_smithy_smithy_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_smithy_smithy_db_proto_rawDesc,
NumEnums: 0,
- NumMessages: 16,
+ NumMessages: 14,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/pb/smithy_msg.pb.go b/pb/smithy_msg.pb.go
index 0fbe0ff3e..894916d5d 100644
--- a/pb/smithy_msg.pb.go
+++ b/pb/smithy_msg.pb.go
@@ -112,9 +112,9 @@ type SmithyForgeEquipReq struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- EquipType int32 `protobuf:"varint,1,opt,name=equipType,proto3" json:"equipType"` // 装备类型
- Lava int32 `protobuf:"varint,2,opt,name=lava,proto3" json:"lava"` // 添加熔岩
- Quality int32 `protobuf:"varint,3,opt,name=quality,proto3" json:"quality"` // 精益制造
+ ReelId int32 `protobuf:"varint,1,opt,name=reelId,proto3" json:"reelId"` // 卷轴ID
+ Lava int32 `protobuf:"varint,2,opt,name=lava,proto3" json:"lava"` // 添加熔岩
+ Quality int32 `protobuf:"varint,3,opt,name=quality,proto3" json:"quality"` // 精益制造
}
func (x *SmithyForgeEquipReq) Reset() {
@@ -149,9 +149,9 @@ func (*SmithyForgeEquipReq) Descriptor() ([]byte, []int) {
return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{2}
}
-func (x *SmithyForgeEquipReq) GetEquipType() int32 {
+func (x *SmithyForgeEquipReq) GetReelId() int32 {
if x != nil {
- return x.EquipType
+ return x.ReelId
}
return 0
}
@@ -680,7 +680,7 @@ type SmithyRefreshShopResp struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Data *DBBusiness `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
+ CustomerIds []int32 `protobuf:"varint,1,rep,packed,name=customerIds,proto3" json:"customerIds"` //顾客
}
func (x *SmithyRefreshShopResp) Reset() {
@@ -715,9 +715,9 @@ func (*SmithyRefreshShopResp) Descriptor() ([]byte, []int) {
return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{13}
}
-func (x *SmithyRefreshShopResp) GetData() *DBBusiness {
+func (x *SmithyRefreshShopResp) GetCustomerIds() []int32 {
if x != nil {
- return x.Data
+ return x.CustomerIds
}
return nil
}
@@ -728,8 +728,7 @@ type SmithySellItemReq struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` // 装备ID
- Count int32 `protobuf:"varint,2,opt,name=count,proto3" json:"count"` // 数量
+ Ids []int32 `protobuf:"varint,1,rep,packed,name=ids,proto3" json:"ids"` // 装备ID
}
func (x *SmithySellItemReq) Reset() {
@@ -764,18 +763,11 @@ func (*SmithySellItemReq) Descriptor() ([]byte, []int) {
return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{14}
}
-func (x *SmithySellItemReq) GetId() int32 {
+func (x *SmithySellItemReq) GetIds() []int32 {
if x != nil {
- return x.Id
+ return x.Ids
}
- return 0
-}
-
-func (x *SmithySellItemReq) GetCount() int32 {
- if x != nil {
- return x.Count
- }
- return 0
+ return nil
}
type SmithySellItemResp struct {
@@ -783,7 +775,8 @@ type SmithySellItemResp struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Data *DBBusiness `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
+ CustomerId int32 `protobuf:"varint,1,opt,name=customerId,proto3" json:"customerId"` //顾客ID
+ Ids []int32 `protobuf:"varint,2,rep,packed,name=ids,proto3" json:"ids"` //出售的装备
}
func (x *SmithySellItemResp) Reset() {
@@ -818,9 +811,16 @@ func (*SmithySellItemResp) Descriptor() ([]byte, []int) {
return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{15}
}
-func (x *SmithySellItemResp) GetData() *DBBusiness {
+func (x *SmithySellItemResp) GetCustomerId() int32 {
if x != nil {
- return x.Data
+ return x.CustomerId
+ }
+ return 0
+}
+
+func (x *SmithySellItemResp) GetIds() []int32 {
+ if x != nil {
+ return x.Ids
}
return nil
}
@@ -1380,95 +1380,94 @@ var file_smithy_smithy_msg_proto_rawDesc = []byte{
0x0a, 0x16, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, 0x76, 0x65,
0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65,
- 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x61, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
- 0x46, 0x6f, 0x72, 0x67, 0x65, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a,
- 0x09, 0x65, 0x71, 0x75, 0x69, 0x70, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x09, 0x65, 0x71, 0x75, 0x69, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6c,
- 0x61, 0x76, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x6c, 0x61, 0x76, 0x61, 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, 0x4a, 0x0a, 0x14, 0x53, 0x6d, 0x69,
- 0x74, 0x68, 0x79, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x73,
- 0x70, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18,
- 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52,
- 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x79, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4f,
- 0x72, 0x64, 0x65, 0x72, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07,
- 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73,
- 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69,
- 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69,
- 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x61, 0x76, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x04, 0x6c, 0x61, 0x76, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74,
- 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79,
- 0x22, 0x4a, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x45,
- 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x71, 0x75, 0x69,
- 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x12, 0x1c,
- 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44,
- 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x12, 0x0a, 0x10,
- 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x55, 0x70, 0x52, 0x65, 0x71,
- 0x22, 0x31, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x55,
+ 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x5b, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
+ 0x46, 0x6f, 0x72, 0x67, 0x65, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a,
+ 0x06, 0x72, 0x65, 0x65, 0x6c, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x72,
+ 0x65, 0x65, 0x6c, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x61, 0x76, 0x61, 0x18, 0x02, 0x20,
+ 0x01, 0x28, 0x05, 0x52, 0x04, 0x6c, 0x61, 0x76, 0x61, 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, 0x4a, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x46, 0x6f, 0x72,
+ 0x67, 0x65, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x65,
+ 0x71, 0x75, 0x69, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x65, 0x71, 0x75, 0x69,
+ 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+ 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22,
+ 0x79, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x45, 0x71,
+ 0x75, 0x69, 0x70, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49,
+ 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64,
+ 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04,
+ 0x6c, 0x61, 0x76, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x6c, 0x61, 0x76, 0x61,
+ 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x22, 0x4a, 0x0a, 0x14, 0x53, 0x6d,
+ 0x69, 0x74, 0x68, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65,
+ 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
+ 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65,
+ 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
+ 0x53, 0x74, 0x6f, 0x76, 0x65, 0x55, 0x70, 0x52, 0x65, 0x71, 0x22, 0x31, 0x0a, 0x11, 0x53, 0x6d,
+ 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x55, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12,
+ 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e,
+ 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x3d, 0x0a,
+ 0x0d, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x69, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16,
+ 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
+ 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2e, 0x0a, 0x0e,
+ 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x69, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c,
+ 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44,
+ 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x22, 0x0a, 0x10,
+ 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x55, 0x70, 0x52, 0x65, 0x71,
+ 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64,
+ 0x22, 0x31, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x55,
0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64,
- 0x61, 0x74, 0x61, 0x22, 0x3d, 0x0a, 0x0d, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x69, 0x73,
- 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05,
- 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75,
- 0x6e, 0x74, 0x22, 0x2e, 0x0a, 0x0e, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x69, 0x73, 0x65,
- 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64, 0x61,
- 0x74, 0x61, 0x22, 0x22, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x6f, 0x6f, 0x6c,
- 0x73, 0x55, 0x70, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x31, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
- 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x55, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64,
- 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74,
- 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x16, 0x0a, 0x14, 0x53, 0x6d, 0x69,
- 0x74, 0x68, 0x79, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x65,
- 0x71, 0x22, 0x38, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x65, 0x66, 0x72, 0x65,
- 0x73, 0x68, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x64, 0x61,
- 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x42, 0x75, 0x73,
- 0x69, 0x6e, 0x65, 0x73, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x39, 0x0a, 0x11, 0x53,
- 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71,
- 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64,
- 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
- 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x35, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
- 0x53, 0x65, 0x6c, 0x6c, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04,
- 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x42,
- 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 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,
+ 0x61, 0x74, 0x61, 0x22, 0x16, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x65, 0x66,
+ 0x72, 0x65, 0x73, 0x68, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x65, 0x71, 0x22, 0x39, 0x0a, 0x15, 0x53,
+ 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x53, 0x68, 0x6f, 0x70,
+ 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72,
+ 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f,
+ 0x6d, 0x65, 0x72, 0x49, 0x64, 0x73, 0x22, 0x25, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
+ 0x53, 0x65, 0x6c, 0x6c, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x69,
+ 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x03, 0x69, 0x64, 0x73, 0x22, 0x46, 0x0a,
+ 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x49, 0x74, 0x65, 0x6d, 0x52,
+ 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 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, 0x10, 0x0a, 0x03, 0x69, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05,
+ 0x52, 0x03, 0x69, 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, 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,
+ 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 (
@@ -1514,10 +1513,9 @@ var file_smithy_smithy_msg_proto_goTypes = []interface{}{
(*SmithyGetListReq)(nil), // 26: SmithyGetListReq
(*SmithyGetListResp)(nil), // 27: SmithyGetListResp
(*DBStove)(nil), // 28: DBStove
- (*DBBusiness)(nil), // 29: DBBusiness
- (*OrderClang)(nil), // 30: OrderClang
- (*DBSmithy)(nil), // 31: DBSmithy
- (*DBUser)(nil), // 32: DBUser
+ (*OrderClang)(nil), // 29: OrderClang
+ (*DBSmithy)(nil), // 30: DBSmithy
+ (*DBUser)(nil), // 31: DBUser
}
var file_smithy_smithy_msg_proto_depIdxs = []int32{
28, // 0: SmithyGetStoveInfoResp.data:type_name -> DBStove
@@ -1526,20 +1524,18 @@ var file_smithy_smithy_msg_proto_depIdxs = []int32{
28, // 3: SmithyStoveUpResp.data:type_name -> DBStove
28, // 4: SmithyRiseResp.data:type_name -> DBStove
28, // 5: SmithyToolsUpResp.data:type_name -> DBStove
- 29, // 6: SmithyRefreshShopResp.data:type_name -> DBBusiness
- 29, // 7: SmithySellItemResp.data:type_name -> DBBusiness
- 30, // 8: SmithyCreateOrderReq.order:type_name -> OrderClang
- 31, // 9: SmithyCreateOrderResp.data:type_name -> DBSmithy
- 31, // 10: SmithyGetRewardResp.data:type_name -> DBSmithy
- 31, // 11: SmithyDeskSkillLvResp.data:type_name -> DBSmithy
- 31, // 12: SmithyStoveSkillLvResp.data:type_name -> DBSmithy
- 32, // 13: SmithyGetRandUserResp.user:type_name -> DBUser
- 31, // 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
+ 29, // 6: SmithyCreateOrderReq.order:type_name -> OrderClang
+ 30, // 7: SmithyCreateOrderResp.data:type_name -> DBSmithy
+ 30, // 8: SmithyGetRewardResp.data:type_name -> DBSmithy
+ 30, // 9: SmithyDeskSkillLvResp.data:type_name -> DBSmithy
+ 30, // 10: SmithyStoveSkillLvResp.data:type_name -> DBSmithy
+ 31, // 11: SmithyGetRandUserResp.user:type_name -> DBUser
+ 30, // 12: SmithyGetListResp.data:type_name -> DBSmithy
+ 13, // [13:13] is the sub-list for method output_type
+ 13, // [13:13] is the sub-list for method input_type
+ 13, // [13:13] is the sub-list for extension type_name
+ 13, // [13:13] is the sub-list for extension extendee
+ 0, // [0:13] is the sub-list for field type_name
}
func init() { file_smithy_smithy_msg_proto_init() }
diff --git a/sys/configure/structs/Game.NewSmithyData.go b/sys/configure/structs/Game.NewSmithyData.go
index 8b64cbc45..8e683c059 100644
--- a/sys/configure/structs/Game.NewSmithyData.go
+++ b/sys/configure/structs/Game.NewSmithyData.go
@@ -14,6 +14,11 @@ type GameNewSmithyData struct {
Id int32
ItemId int32
Type int32
+ Consume []*Gameatn
+ Temperature int32
+ Quality *Gameatn
+ NDrop int32
+ QDrop int32
}
const TypeId_GameNewSmithyData = -1249020316
@@ -26,6 +31,24 @@ func (_v *GameNewSmithyData)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["item_id"].(float64); !_ok_ { err = errors.New("item_id error"); return }; _v.ItemId = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["consume"].([]interface{}); !_ok_ { err = errors.New("consume error"); return }
+
+ _v.Consume = make([]*Gameatn, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+ _v.Consume = append(_v.Consume, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["temperature"].(float64); !_ok_ { err = errors.New("temperature error"); return }; _v.Temperature = int32(_tempNum_) }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["quality"].(map[string]interface{}); !_ok_ { err = errors.New("quality error"); return }; if _v.Quality, err = DeserializeGameatn(_x_); err != nil { return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["nDrop"].(float64); !_ok_ { err = errors.New("nDrop error"); return }; _v.NDrop = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["qDrop"].(float64); !_ok_ { err = errors.New("qDrop error"); return }; _v.QDrop = int32(_tempNum_) }
return
}
diff --git a/sys/configure/structs/Game.SmithyCustomer.go b/sys/configure/structs/Game.SmithyCustomer.go
new file mode 100644
index 000000000..64362a62a
--- /dev/null
+++ b/sys/configure/structs/Game.SmithyCustomer.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 GameSmithyCustomer struct {
+ _dataMap map[int32]*GameSmithyCustomerData
+ _dataList []*GameSmithyCustomerData
+}
+
+func NewGameSmithyCustomer(_buf []map[string]interface{}) (*GameSmithyCustomer, error) {
+ _dataList := make([]*GameSmithyCustomerData, 0, len(_buf))
+ dataMap := make(map[int32]*GameSmithyCustomerData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameSmithyCustomerData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.CustomerId] = _v
+ }
+ }
+ return &GameSmithyCustomer{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameSmithyCustomer) GetDataMap() map[int32]*GameSmithyCustomerData {
+ return table._dataMap
+}
+
+func (table *GameSmithyCustomer) GetDataList() []*GameSmithyCustomerData {
+ return table._dataList
+}
+
+func (table *GameSmithyCustomer) Get(key int32) *GameSmithyCustomerData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.SmithyCustomerData.go b/sys/configure/structs/Game.SmithyCustomerData.go
new file mode 100644
index 000000000..5f13ad2b8
--- /dev/null
+++ b/sys/configure/structs/Game.SmithyCustomerData.go
@@ -0,0 +1,69 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameSmithyCustomerData struct {
+ CustomerId int32
+ CustomerType int32
+ CustomerSpeak string
+ Goods []*Gameatn
+ Reword []*Gameatn
+}
+
+const TypeId_GameSmithyCustomerData = 1314583578
+
+func (*GameSmithyCustomerData) GetTypeId() int32 {
+ return 1314583578
+}
+
+func (_v *GameSmithyCustomerData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["customer_id"].(float64); !_ok_ { err = errors.New("customer_id error"); return }; _v.CustomerId = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["customer_type"].(float64); !_ok_ { err = errors.New("customer_type error"); return }; _v.CustomerType = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["customer_speak"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.CustomerSpeak error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.CustomerSpeak, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["goods"].([]interface{}); !_ok_ { err = errors.New("goods error"); return }
+
+ _v.Goods = 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.Goods = append(_v.Goods, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["reword"].([]interface{}); !_ok_ { err = errors.New("reword error"); return }
+
+ _v.Reword = 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.Reword = append(_v.Reword, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameSmithyCustomerData(_buf map[string]interface{}) (*GameSmithyCustomerData, error) {
+ v := &GameSmithyCustomerData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.pandsmasexp.go b/sys/configure/structs/Game.pandsmasexp.go
new file mode 100644
index 000000000..669833432
--- /dev/null
+++ b/sys/configure/structs/Game.pandsmasexp.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 Gamepandsmasexp struct {
+ _dataMap map[int32]*GamepandsmasexpData
+ _dataList []*GamepandsmasexpData
+}
+
+func NewGamepandsmasexp(_buf []map[string]interface{}) (*Gamepandsmasexp, error) {
+ _dataList := make([]*GamepandsmasexpData, 0, len(_buf))
+ dataMap := make(map[int32]*GamepandsmasexpData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGamepandsmasexpData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &Gamepandsmasexp{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *Gamepandsmasexp) GetDataMap() map[int32]*GamepandsmasexpData {
+ return table._dataMap
+}
+
+func (table *Gamepandsmasexp) GetDataList() []*GamepandsmasexpData {
+ return table._dataList
+}
+
+func (table *Gamepandsmasexp) Get(key int32) *GamepandsmasexpData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.pandsmasexpData.go b/sys/configure/structs/Game.pandsmasexpData.go
new file mode 100644
index 000000000..5ad352ff6
--- /dev/null
+++ b/sys/configure/structs/Game.pandsmasexpData.go
@@ -0,0 +1,143 @@
+//------------------------------------------------------------------------------
+//
+// 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 GamepandsmasexpData struct {
+ Id int32
+ Bossid int32
+ Name string
+ ReadyID int32
+ Difficulty int32
+ BattleReadyID int32
+ Captionrecommend []int32
+ Firstprize []*Gameatn
+ Dropshow []*Gameatn
+ Drop int32
+ Scene string
+ Bossmodel int32
+ BossSkill int32
+ Boss []int32
+ PsConsume []*Gameatn
+ PsMg []*Gameatn
+}
+
+const TypeId_GamepandsmasexpData = 192857656
+
+func (*GamepandsmasexpData) GetTypeId() int32 {
+ return 192857656
+}
+
+func (_v *GamepandsmasexpData)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["bossid"].(float64); !_ok_ { err = errors.New("bossid error"); return }; _v.Bossid = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ReadyID"].(float64); !_ok_ { err = errors.New("ReadyID error"); return }; _v.ReadyID = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["difficulty"].(float64); !_ok_ { err = errors.New("difficulty error"); return }; _v.Difficulty = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["captionrecommend"].([]interface{}); !_ok_ { err = errors.New("captionrecommend error"); return }
+
+ _v.Captionrecommend = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Captionrecommend = append(_v.Captionrecommend, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["firstprize"].([]interface{}); !_ok_ { err = errors.New("firstprize error"); return }
+
+ _v.Firstprize = 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.Firstprize = append(_v.Firstprize, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["dropshow"].([]interface{}); !_ok_ { err = errors.New("dropshow error"); return }
+
+ _v.Dropshow = 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.Dropshow = append(_v.Dropshow, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["drop"].(float64); !_ok_ { err = errors.New("drop error"); return }; _v.Drop = int32(_tempNum_) }
+ { var _ok_ bool; if _v.Scene, _ok_ = _buf["scene"].(string); !_ok_ { err = errors.New("scene error"); return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bossmodel"].(float64); !_ok_ { err = errors.New("bossmodel error"); return }; _v.Bossmodel = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["boss_skill"].(float64); !_ok_ { err = errors.New("boss_skill error"); return }; _v.BossSkill = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["boss"].([]interface{}); !_ok_ { err = errors.New("boss error"); return }
+
+ _v.Boss = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Boss = append(_v.Boss, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["ps_consume"].([]interface{}); !_ok_ { err = errors.New("ps_consume error"); return }
+
+ _v.PsConsume = 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.PsConsume = append(_v.PsConsume, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["ps_mg"].([]interface{}); !_ok_ { err = errors.New("ps_mg error"); return }
+
+ _v.PsMg = 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.PsMg = append(_v.PsMg, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGamepandsmasexpData(_buf map[string]interface{}) (*GamepandsmasexpData, error) {
+ v := &GamepandsmasexpData{}
+ 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 f405a1c42..d2557223b 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -163,6 +163,8 @@ type Tables struct {
SmithyProficiency *GameSmithyProficiency
SmithyStoveV1 *GameSmithyStoveV1
SmithyTool *GameSmithyTool
+ pandsmasexp *Gamepandsmasexp
+ SmithyCustomer *GameSmithyCustomer
}
func NewTables(loader JsonLoader) (*Tables, error) {
@@ -1082,5 +1084,17 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.SmithyTool, err = NewGameSmithyTool(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_pandsmasexp") ; err != nil {
+ return nil, err
+ }
+ if tables.pandsmasexp, err = NewGamepandsmasexp(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_smithycustomer") ; err != nil {
+ return nil, err
+ }
+ if tables.SmithyCustomer, err = NewGameSmithyCustomer(buf) ; err != nil {
+ return nil, err
+ }
return tables, nil
}