diff --git a/bin/json/game_dispatch_all.json b/bin/json/game_dispatch_all.json
new file mode 100644
index 000000000..9ada55054
--- /dev/null
+++ b/bin/json/game_dispatch_all.json
@@ -0,0 +1,34 @@
+[
+ {
+ "id": 101,
+ "quantity": 1
+ },
+ {
+ "id": 102,
+ "quantity": 12
+ },
+ {
+ "id": 103,
+ "quantity": 1000
+ },
+ {
+ "id": 104,
+ "quantity": 6
+ },
+ {
+ "id": 105,
+ "quantity": 6
+ },
+ {
+ "id": 106,
+ "quantity": 10012
+ },
+ {
+ "id": 107,
+ "quantity": 20
+ },
+ {
+ "id": 108,
+ "quantity": 2
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_dispatch_battle.json b/bin/json/game_dispatch_battle.json
new file mode 100644
index 000000000..509051afb
--- /dev/null
+++ b/bin/json/game_dispatch_battle.json
@@ -0,0 +1,42 @@
+[
+ {
+ "id": 1,
+ "model": "34006",
+ "startstory": 3007,
+ "rejectstory": 3001,
+ "endstory": 3002,
+ "battlename": {
+ "key": "story_80",
+ "text": "踢馆1号"
+ },
+ "battletxt": {
+ "key": "story_80",
+ "text": "踢馆1号的文本"
+ },
+ "FormatList": [
+ 700011
+ ],
+ "BattleReadyID": 100,
+ "EventList": [],
+ "award": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 2640
+ },
+ {
+ "a": "item",
+ "t": "30001",
+ "n": 1
+ }
+ ],
+ "onlookers": [
+ "45003",
+ "25001"
+ ],
+ "onlookersstory": [
+ 30001,
+ 30001
+ ]
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_dispatch_lv.json b/bin/json/game_dispatch_lv.json
new file mode 100644
index 000000000..d59dbea84
--- /dev/null
+++ b/bin/json/game_dispatch_lv.json
@@ -0,0 +1,52 @@
+[
+ {
+ "lv": 1,
+ "probability": [
+ 100,
+ 0,
+ 0,
+ 0
+ ],
+ "Upgrade": 0
+ },
+ {
+ "lv": 2,
+ "probability": [
+ 80,
+ 20,
+ 0,
+ 0
+ ],
+ "Upgrade": 1
+ },
+ {
+ "lv": 3,
+ "probability": [
+ 70,
+ 20,
+ 10,
+ 0
+ ],
+ "Upgrade": 2
+ },
+ {
+ "lv": 4,
+ "probability": [
+ 50,
+ 30,
+ 15,
+ 5
+ ],
+ "Upgrade": 3
+ },
+ {
+ "lv": 5,
+ "probability": [
+ 45,
+ 25,
+ 20,
+ 10
+ ],
+ "Upgrade": 4
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_dispatch_reward.json b/bin/json/game_dispatch_reward.json
new file mode 100644
index 000000000..03865c91c
--- /dev/null
+++ b/bin/json/game_dispatch_reward.json
@@ -0,0 +1,28 @@
+[
+ {
+ "id": 1,
+ "num": [
+ 1,
+ 2,
+ 3
+ ],
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 999
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 9999
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 99999
+ }
+ ],
+ "day": 7
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_dispatch_task.json b/bin/json/game_dispatch_task.json
new file mode 100644
index 000000000..9aea54395
--- /dev/null
+++ b/bin/json/game_dispatch_task.json
@@ -0,0 +1,853 @@
+[
+ {
+ "id": 1,
+ "type": 0,
+ "taskname": {
+ "key": "story_80",
+ "text": "特殊任务1"
+ },
+ "taskcd": 168,
+ "tasktime": 2,
+ "tasktxt": {
+ "key": "story_80",
+ "text": "普通任务文本1"
+ },
+ "taskneed": 2,
+ "taskreq": [
+ "lv",
+ "1"
+ ],
+ "taskreqex": [
+ "star",
+ "5"
+ ],
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
+ }
+ ],
+ "rewardex": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 20000
+ }
+ ]
+ },
+ {
+ "id": 2,
+ "type": 1,
+ "taskname": {
+ "key": "story_80",
+ "text": "普通任务1"
+ },
+ "taskcd": 168,
+ "tasktime": 2,
+ "tasktxt": {
+ "key": "story_80",
+ "text": "普通任务文本1"
+ },
+ "taskneed": 2,
+ "taskreq": [
+ "lv",
+ "1"
+ ],
+ "taskreqex": [
+ "star",
+ "5"
+ ],
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
+ }
+ ],
+ "rewardex": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 20000
+ }
+ ]
+ },
+ {
+ "id": 3,
+ "type": 1,
+ "taskname": {
+ "key": "story_80",
+ "text": "普通任务2"
+ },
+ "taskcd": 168,
+ "tasktime": 2,
+ "tasktxt": {
+ "key": "story_80",
+ "text": "普通任务文本2"
+ },
+ "taskneed": 2,
+ "taskreq": [
+ "lv",
+ "1"
+ ],
+ "taskreqex": [
+ "star",
+ "5"
+ ],
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
+ }
+ ],
+ "rewardex": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 20000
+ }
+ ]
+ },
+ {
+ "id": 4,
+ "type": 1,
+ "taskname": {
+ "key": "story_80",
+ "text": "普通任务3"
+ },
+ "taskcd": 168,
+ "tasktime": 2,
+ "tasktxt": {
+ "key": "story_80",
+ "text": "普通任务文本3"
+ },
+ "taskneed": 2,
+ "taskreq": [
+ "lv",
+ "1"
+ ],
+ "taskreqex": [
+ "star",
+ "5"
+ ],
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
+ }
+ ],
+ "rewardex": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 20000
+ }
+ ]
+ },
+ {
+ "id": 5,
+ "type": 1,
+ "taskname": {
+ "key": "story_80",
+ "text": "普通任务4"
+ },
+ "taskcd": 168,
+ "tasktime": 2,
+ "tasktxt": {
+ "key": "story_80",
+ "text": "普通任务文本4"
+ },
+ "taskneed": 2,
+ "taskreq": [
+ "lv",
+ "1"
+ ],
+ "taskreqex": [
+ "star",
+ "5"
+ ],
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
+ }
+ ],
+ "rewardex": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 20000
+ }
+ ]
+ },
+ {
+ "id": 6,
+ "type": 1,
+ "taskname": {
+ "key": "story_80",
+ "text": "普通任务5"
+ },
+ "taskcd": 168,
+ "tasktime": 2,
+ "tasktxt": {
+ "key": "story_80",
+ "text": "普通任务文本5"
+ },
+ "taskneed": 2,
+ "taskreq": [
+ "lv",
+ "1"
+ ],
+ "taskreqex": [
+ "star",
+ "5"
+ ],
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
+ }
+ ],
+ "rewardex": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 20000
+ }
+ ]
+ },
+ {
+ "id": 7,
+ "type": 1,
+ "taskname": {
+ "key": "story_80",
+ "text": "普通任务6"
+ },
+ "taskcd": 168,
+ "tasktime": 2,
+ "tasktxt": {
+ "key": "story_80",
+ "text": "普通任务文本6"
+ },
+ "taskneed": 2,
+ "taskreq": [
+ "lv",
+ "1"
+ ],
+ "taskreqex": [
+ "star",
+ "5"
+ ],
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
+ }
+ ],
+ "rewardex": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 20000
+ }
+ ]
+ },
+ {
+ "id": 8,
+ "type": 1,
+ "taskname": {
+ "key": "story_80",
+ "text": "普通任务7"
+ },
+ "taskcd": 168,
+ "tasktime": 2,
+ "tasktxt": {
+ "key": "story_80",
+ "text": "普通任务文本7"
+ },
+ "taskneed": 2,
+ "taskreq": [
+ "lv",
+ "1"
+ ],
+ "taskreqex": [
+ "star",
+ "5"
+ ],
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 10000
+ }
+ ],
+ "rewardex": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 20000
+ }
+ ]
+ },
+ {
+ "id": 9,
+ "type": 1,
+ "taskname": {
+ "key": "story_80",
+ "text": "普通任务8"
+ },
+ "taskcd": 168,
+ "tasktime": 2,
+ "tasktxt": {
+ "key": "story_80",
+ "text": "普通任务文本8"
+ },
+ "taskneed": 2,
+ "taskreq": [
+ "lv",
+ "1"
+ ],
+ "taskreqex": [
+ "star",
+ "5"
+ ],
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 20000
+ }
+ ],
+ "rewardex": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 40000
+ }
+ ]
+ },
+ {
+ "id": 10,
+ "type": 2,
+ "taskname": {
+ "key": "story_80",
+ "text": "稀有任务1"
+ },
+ "taskcd": 168,
+ "tasktime": 2,
+ "tasktxt": {
+ "key": "story_80",
+ "text": "稀有任务文本1"
+ },
+ "taskneed": 2,
+ "taskreq": [
+ "lv",
+ "1"
+ ],
+ "taskreqex": [
+ "star",
+ "5"
+ ],
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 20000
+ }
+ ],
+ "rewardex": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 40000
+ }
+ ]
+ },
+ {
+ "id": 11,
+ "type": 2,
+ "taskname": {
+ "key": "story_80",
+ "text": "稀有任务2"
+ },
+ "taskcd": 168,
+ "tasktime": 2,
+ "tasktxt": {
+ "key": "story_80",
+ "text": "稀有任务文本2"
+ },
+ "taskneed": 2,
+ "taskreq": [
+ "lv",
+ "1"
+ ],
+ "taskreqex": [
+ "star",
+ "5"
+ ],
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 20000
+ }
+ ],
+ "rewardex": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 40000
+ }
+ ]
+ },
+ {
+ "id": 12,
+ "type": 2,
+ "taskname": {
+ "key": "story_80",
+ "text": "稀有任务3"
+ },
+ "taskcd": 168,
+ "tasktime": 2,
+ "tasktxt": {
+ "key": "story_80",
+ "text": "稀有任务文本3"
+ },
+ "taskneed": 2,
+ "taskreq": [
+ "lv",
+ "1"
+ ],
+ "taskreqex": [
+ "star",
+ "5"
+ ],
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 20000
+ }
+ ],
+ "rewardex": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 40000
+ }
+ ]
+ },
+ {
+ "id": 13,
+ "type": 2,
+ "taskname": {
+ "key": "story_80",
+ "text": "稀有任务4"
+ },
+ "taskcd": 168,
+ "tasktime": 2,
+ "tasktxt": {
+ "key": "story_80",
+ "text": "稀有任务文本4"
+ },
+ "taskneed": 2,
+ "taskreq": [
+ "lv",
+ "1"
+ ],
+ "taskreqex": [
+ "star",
+ "5"
+ ],
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 20000
+ }
+ ],
+ "rewardex": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 40000
+ }
+ ]
+ },
+ {
+ "id": 14,
+ "type": 2,
+ "taskname": {
+ "key": "story_80",
+ "text": "稀有任务5"
+ },
+ "taskcd": 168,
+ "tasktime": 2,
+ "tasktxt": {
+ "key": "story_80",
+ "text": "稀有任务文本5"
+ },
+ "taskneed": 2,
+ "taskreq": [
+ "lv",
+ "1"
+ ],
+ "taskreqex": [
+ "star",
+ "5"
+ ],
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 20000
+ }
+ ],
+ "rewardex": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 40000
+ }
+ ]
+ },
+ {
+ "id": 15,
+ "type": 3,
+ "taskname": {
+ "key": "story_80",
+ "text": "史诗任务1"
+ },
+ "taskcd": 168,
+ "tasktime": 2,
+ "tasktxt": {
+ "key": "story_80",
+ "text": "史诗任务文本1"
+ },
+ "taskneed": 2,
+ "taskreq": [
+ "lv",
+ "1"
+ ],
+ "taskreqex": [
+ "star",
+ "5"
+ ],
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 30000
+ }
+ ],
+ "rewardex": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ]
+ },
+ {
+ "id": 16,
+ "type": 3,
+ "taskname": {
+ "key": "story_80",
+ "text": "史诗任务2"
+ },
+ "taskcd": 168,
+ "tasktime": 2,
+ "tasktxt": {
+ "key": "story_80",
+ "text": "史诗任务文本2"
+ },
+ "taskneed": 2,
+ "taskreq": [
+ "lv",
+ "1"
+ ],
+ "taskreqex": [
+ "star",
+ "5"
+ ],
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 30000
+ }
+ ],
+ "rewardex": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ]
+ },
+ {
+ "id": 17,
+ "type": 3,
+ "taskname": {
+ "key": "story_80",
+ "text": "史诗任务3"
+ },
+ "taskcd": 168,
+ "tasktime": 2,
+ "tasktxt": {
+ "key": "story_80",
+ "text": "史诗任务文本3"
+ },
+ "taskneed": 2,
+ "taskreq": [
+ "lv",
+ "1"
+ ],
+ "taskreqex": [
+ "star",
+ "5"
+ ],
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 30000
+ }
+ ],
+ "rewardex": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ]
+ },
+ {
+ "id": 18,
+ "type": 3,
+ "taskname": {
+ "key": "story_80",
+ "text": "史诗任务4"
+ },
+ "taskcd": 168,
+ "tasktime": 2,
+ "tasktxt": {
+ "key": "story_80",
+ "text": "史诗任务文本4"
+ },
+ "taskneed": 2,
+ "taskreq": [
+ "lv",
+ "1"
+ ],
+ "taskreqex": [
+ "star",
+ "5"
+ ],
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 30000
+ }
+ ],
+ "rewardex": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ]
+ },
+ {
+ "id": 19,
+ "type": 3,
+ "taskname": {
+ "key": "story_80",
+ "text": "史诗任务5"
+ },
+ "taskcd": 168,
+ "tasktime": 2,
+ "tasktxt": {
+ "key": "story_80",
+ "text": "史诗任务文本5"
+ },
+ "taskneed": 2,
+ "taskreq": [
+ "lv",
+ "1"
+ ],
+ "taskreqex": [
+ "star",
+ "5"
+ ],
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 30000
+ }
+ ],
+ "rewardex": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ]
+ },
+ {
+ "id": 20,
+ "type": 3,
+ "taskname": {
+ "key": "story_80",
+ "text": "史诗任务6"
+ },
+ "taskcd": 168,
+ "tasktime": 2,
+ "tasktxt": {
+ "key": "story_80",
+ "text": "史诗任务文本6"
+ },
+ "taskneed": 2,
+ "taskreq": [
+ "lv",
+ "1"
+ ],
+ "taskreqex": [
+ "star",
+ "5"
+ ],
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 30000
+ }
+ ],
+ "rewardex": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ]
+ },
+ {
+ "id": 21,
+ "type": 4,
+ "taskname": {
+ "key": "story_80",
+ "text": "传说任务1"
+ },
+ "taskcd": 168,
+ "tasktime": 2,
+ "tasktxt": {
+ "key": "story_80",
+ "text": "传说任务文本1"
+ },
+ "taskneed": 2,
+ "taskreq": [
+ "lv",
+ "1"
+ ],
+ "taskreqex": [
+ "star",
+ "5"
+ ],
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 40000
+ }
+ ],
+ "rewardex": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 510000
+ }
+ ]
+ },
+ {
+ "id": 22,
+ "type": 4,
+ "taskname": {
+ "key": "story_80",
+ "text": "传说任务2"
+ },
+ "taskcd": 168,
+ "tasktime": 2,
+ "tasktxt": {
+ "key": "story_80",
+ "text": "传说任务文本2"
+ },
+ "taskneed": 2,
+ "taskreq": [
+ "lv",
+ "1"
+ ],
+ "taskreqex": [
+ "star",
+ "5"
+ ],
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 40000
+ }
+ ],
+ "rewardex": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 510000
+ }
+ ]
+ },
+ {
+ "id": 23,
+ "type": 4,
+ "taskname": {
+ "key": "story_80",
+ "text": "传说任务3"
+ },
+ "taskcd": 168,
+ "tasktime": 2,
+ "tasktxt": {
+ "key": "story_80",
+ "text": "传说任务文本3"
+ },
+ "taskneed": 2,
+ "taskreq": [
+ "lv",
+ "1"
+ ],
+ "taskreqex": [
+ "star",
+ "5"
+ ],
+ "reward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 40000
+ }
+ ],
+ "rewardex": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 510000
+ }
+ ]
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index c02d65a95..f4636e56e 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -548,13 +548,17 @@
50,
50
],
- "raise_temperature": [
- 110001,
- 50
- ],
- "exemption_TemperatureCos": [
- 110002,
- 50
- ]
+ "raise_temperature": {
+ "a": "item",
+ "t": "1110001",
+ "n": 1
+ },
+ "raise_temperatureNum": 50,
+ "exemption_TemperatureCos": {
+ "a": "item",
+ "t": "110002",
+ "n": 1
+ },
+ "exemption_TemperatureCosNum": 50
}
]
\ No newline at end of file
diff --git a/bin/json/game_newsmithy.json b/bin/json/game_newsmithy.json
index 823344eb4..47a993a78 100644
--- a/bin/json/game_newsmithy.json
+++ b/bin/json/game_newsmithy.json
@@ -45,8 +45,8 @@
"n": 4
},
"customized_lv": [
- 10,
- 15
+ 1,
+ 2
],
"customized_lv_distribution": [
50,
@@ -99,8 +99,8 @@
"n": 5
},
"customized_lv": [
- 10,
- 15
+ 1,
+ 2
],
"customized_lv_distribution": [
50,
@@ -153,8 +153,8 @@
"n": 6
},
"customized_lv": [
- 10,
- 15
+ 1,
+ 2
],
"customized_lv_distribution": [
50,
@@ -207,8 +207,8 @@
"n": 7
},
"customized_lv": [
- 10,
- 15
+ 1,
+ 2
],
"customized_lv_distribution": [
50,
@@ -261,8 +261,8 @@
"n": 8
},
"customized_lv": [
- 10,
- 15
+ 1,
+ 2
],
"customized_lv_distribution": [
50,
@@ -315,8 +315,8 @@
"n": 9
},
"customized_lv": [
- 10,
- 15
+ 1,
+ 2
],
"customized_lv_distribution": [
50,
@@ -369,8 +369,8 @@
"n": 10
},
"customized_lv": [
- 10,
- 15
+ 1,
+ 2
],
"customized_lv_distribution": [
50,
@@ -423,8 +423,8 @@
"n": 11
},
"customized_lv": [
- 10,
- 15
+ 1,
+ 2
],
"customized_lv_distribution": [
50,
@@ -477,8 +477,8 @@
"n": 12
},
"customized_lv": [
- 10,
- 15
+ 1,
+ 2
],
"customized_lv_distribution": [
50,
@@ -531,8 +531,8 @@
"n": 13
},
"customized_lv": [
- 10,
- 15
+ 1,
+ 2
],
"customized_lv_distribution": [
50,
@@ -585,8 +585,8 @@
"n": 14
},
"customized_lv": [
- 10,
- 15
+ 1,
+ 2
],
"customized_lv_distribution": [
50,
@@ -639,8 +639,8 @@
"n": 15
},
"customized_lv": [
- 10,
- 15
+ 1,
+ 2
],
"customized_lv_distribution": [
50,
@@ -693,8 +693,8 @@
"n": 16
},
"customized_lv": [
- 10,
- 15
+ 1,
+ 2
],
"customized_lv_distribution": [
50,
@@ -747,8 +747,8 @@
"n": 17
},
"customized_lv": [
- 10,
- 15
+ 1,
+ 2
],
"customized_lv_distribution": [
50,
@@ -801,8 +801,8 @@
"n": 18
},
"customized_lv": [
- 10,
- 15
+ 1,
+ 2
],
"customized_lv_distribution": [
50,
@@ -855,8 +855,8 @@
"n": 19
},
"customized_lv": [
- 10,
- 15
+ 1,
+ 2
],
"customized_lv_distribution": [
50,
@@ -909,8 +909,8 @@
"n": 20
},
"customized_lv": [
- 10,
- 15
+ 1,
+ 2
],
"customized_lv_distribution": [
50,
@@ -963,8 +963,8 @@
"n": 21
},
"customized_lv": [
- 10,
- 15
+ 1,
+ 2
],
"customized_lv_distribution": [
50,
@@ -1017,8 +1017,8 @@
"n": 22
},
"customized_lv": [
- 10,
- 15
+ 1,
+ 2
],
"customized_lv_distribution": [
50,
@@ -1071,8 +1071,8 @@
"n": 23
},
"customized_lv": [
- 10,
- 15
+ 1,
+ 2
],
"customized_lv_distribution": [
50,
@@ -1125,8 +1125,8 @@
"n": 24
},
"customized_lv": [
- 10,
- 15
+ 1,
+ 2
],
"customized_lv_distribution": [
50,
@@ -1179,8 +1179,8 @@
"n": 25
},
"customized_lv": [
- 10,
- 15
+ 1,
+ 2
],
"customized_lv_distribution": [
50,
@@ -1233,8 +1233,8 @@
"n": 26
},
"customized_lv": [
- 10,
- 15
+ 1,
+ 2
],
"customized_lv_distribution": [
50,
diff --git a/bin/json/game_smithytask.json b/bin/json/game_smithytask.json
new file mode 100644
index 000000000..092b1cafb
--- /dev/null
+++ b/bin/json/game_smithytask.json
@@ -0,0 +1,226 @@
+[
+ {
+ "key": 10001,
+ "id_list": 1,
+ "task_display": {
+ "key": "task_10001",
+ "text": "进行1次普通招募"
+ },
+ "type_id": 2018001,
+ "reword": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 10
+ }
+ ]
+ },
+ {
+ "key": 10002,
+ "id_list": 2,
+ "task_display": {
+ "key": "task_10002",
+ "text": "为任意英雄提升1次等级"
+ },
+ "type_id": 2024001,
+ "reword": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 10
+ }
+ ]
+ },
+ {
+ "key": 10004,
+ "id_list": 4,
+ "task_display": {
+ "key": "task_10004",
+ "text": "强化任意装备成功1次"
+ },
+ "type_id": 2047001,
+ "reword": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 10
+ }
+ ]
+ },
+ {
+ "key": 10006,
+ "id_list": 6,
+ "task_display": {
+ "key": "task_10006",
+ "text": "在商店购买任意1件商品"
+ },
+ "type_id": 2064001,
+ "reword": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 10
+ }
+ ]
+ },
+ {
+ "key": 10007,
+ "id_list": 7,
+ "task_display": {
+ "key": "task_10007",
+ "text": "使用好友助战英雄战斗1次"
+ },
+ "type_id": 2012001,
+ "reword": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 10
+ }
+ ]
+ },
+ {
+ "key": 10008,
+ "id_list": 8,
+ "task_display": {
+ "key": "task_10008",
+ "text": "进行竞技场挑战1次"
+ },
+ "type_id": 2130001,
+ "reword": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 10
+ }
+ ]
+ },
+ {
+ "key": 10009,
+ "id_list": 9,
+ "task_display": {
+ "key": "task_10009",
+ "text": "进行10次普通招募"
+ },
+ "type_id": 3018001,
+ "reword": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 10
+ }
+ ]
+ },
+ {
+ "key": 10010,
+ "id_list": 10,
+ "task_display": {
+ "key": "task_10010",
+ "text": "为任意英雄提升10次等级"
+ },
+ "type_id": 3024001,
+ "reword": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 10
+ }
+ ]
+ },
+ {
+ "key": 10011,
+ "id_list": 12,
+ "task_display": {
+ "key": "task_10011",
+ "text": "强化任意装备成功6次"
+ },
+ "type_id": 3047001,
+ "reword": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 10
+ }
+ ]
+ },
+ {
+ "key": 10012,
+ "id_list": 14,
+ "task_display": {
+ "key": "task_10012",
+ "text": "在商店购买任意7件商品"
+ },
+ "type_id": 3064001,
+ "reword": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 10
+ }
+ ]
+ },
+ {
+ "key": 10013,
+ "id_list": 15,
+ "task_display": {
+ "key": "task_10013",
+ "text": "使用好友助战英雄战斗7次"
+ },
+ "type_id": 3012001,
+ "reword": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 10
+ }
+ ]
+ },
+ {
+ "key": 10014,
+ "id_list": 17,
+ "task_display": {
+ "key": "task_10014",
+ "text": "刷新商店10次"
+ },
+ "type_id": 3105001,
+ "reword": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 10
+ }
+ ]
+ },
+ {
+ "key": 10015,
+ "id_list": 18,
+ "task_display": {
+ "key": "task_10015",
+ "text": "消费1000颗钻石"
+ },
+ "type_id": 3104001,
+ "reword": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 10
+ }
+ ]
+ },
+ {
+ "key": 10016,
+ "id_list": 19,
+ "task_display": {
+ "key": "task_10016",
+ "text": "进行30场竞技场挑战"
+ },
+ "type_id": 3130001,
+ "reword": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 10
+ }
+ ]
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_smithytool.json b/bin/json/game_smithytool.json
index 69677abfd..cced3f840 100644
--- a/bin/json/game_smithytool.json
+++ b/bin/json/game_smithytool.json
@@ -2,6 +2,38 @@
{
"id": 1,
"skill_type": 1,
+ "skill_lv": 0,
+ "preconditions": 0,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
+ "name_text": {
+ "key": "newsmithy_name_text_1",
+ "text": "测量尺lv.{0}"
+ },
+ "content_text": {
+ "key": "newsmithy_content_text_1",
+ "text": "史诗品质概率提升{0}%"
+ },
+ "value": 0
+ },
+ {
+ "id": 2,
+ "skill_type": 1,
"skill_lv": 1,
"preconditions": 0,
"up_material": [
@@ -22,17 +54,17 @@
}
],
"name_text": {
- "key": "1",
+ "key": "newsmithy_name_text_1",
"text": "测量尺lv.{0}"
},
"content_text": {
- "key": "1",
+ "key": "newsmithy_content_text_1",
"text": "史诗品质概率提升{0}%"
},
"value": 5
},
{
- "id": 2,
+ "id": 3,
"skill_type": 1,
"skill_lv": 2,
"preconditions": 0,
@@ -54,17 +86,17 @@
}
],
"name_text": {
- "key": "2",
+ "key": "newsmithy_name_text_1",
"text": "测量尺lv.{0}"
},
"content_text": {
- "key": "2",
+ "key": "newsmithy_content_text_1",
"text": "史诗品质概率提升{0}%"
},
"value": 10
},
{
- "id": 3,
+ "id": 4,
"skill_type": 1,
"skill_lv": 3,
"preconditions": 0,
@@ -86,17 +118,17 @@
}
],
"name_text": {
- "key": "3",
+ "key": "newsmithy_name_text_1",
"text": "测量尺lv.{0}"
},
"content_text": {
- "key": "3",
+ "key": "newsmithy_content_text_1",
"text": "史诗品质概率提升{0}%"
},
"value": 15
},
{
- "id": 4,
+ "id": 5,
"skill_type": 1,
"skill_lv": 4,
"preconditions": 0,
@@ -118,17 +150,17 @@
}
],
"name_text": {
- "key": "4",
+ "key": "newsmithy_name_text_1",
"text": "测量尺lv.{0}"
},
"content_text": {
- "key": "4",
+ "key": "newsmithy_content_text_1",
"text": "史诗品质概率提升{0}%"
},
"value": 20
},
{
- "id": 5,
+ "id": 6,
"skill_type": 1,
"skill_lv": 5,
"preconditions": 0,
@@ -150,17 +182,17 @@
}
],
"name_text": {
- "key": "5",
+ "key": "newsmithy_name_text_1",
"text": "测量尺lv.{0}"
},
"content_text": {
- "key": "5",
+ "key": "newsmithy_content_text_1",
"text": "史诗品质概率提升{0}%"
},
"value": 25
},
{
- "id": 6,
+ "id": 7,
"skill_type": 1,
"skill_lv": 6,
"preconditions": 0,
@@ -182,17 +214,17 @@
}
],
"name_text": {
- "key": "6",
+ "key": "newsmithy_name_text_1",
"text": "测量尺lv.{0}"
},
"content_text": {
- "key": "6",
+ "key": "newsmithy_content_text_1",
"text": "史诗品质概率提升{0}%"
},
"value": 30
},
{
- "id": 7,
+ "id": 8,
"skill_type": 1,
"skill_lv": 7,
"preconditions": 0,
@@ -214,17 +246,17 @@
}
],
"name_text": {
- "key": "7",
+ "key": "newsmithy_name_text_1",
"text": "测量尺lv.{0}"
},
"content_text": {
- "key": "7",
+ "key": "newsmithy_content_text_1",
"text": "史诗品质概率提升{0}%"
},
"value": 35
},
{
- "id": 8,
+ "id": 9,
"skill_type": 1,
"skill_lv": 8,
"preconditions": 0,
@@ -246,17 +278,17 @@
}
],
"name_text": {
- "key": "8",
+ "key": "newsmithy_name_text_1",
"text": "测量尺lv.{0}"
},
"content_text": {
- "key": "8",
+ "key": "newsmithy_content_text_1",
"text": "史诗品质概率提升{0}%"
},
"value": 40
},
{
- "id": 9,
+ "id": 10,
"skill_type": 1,
"skill_lv": 9,
"preconditions": 0,
@@ -278,20 +310,36 @@
}
],
"name_text": {
- "key": "9",
+ "key": "newsmithy_name_text_1",
"text": "测量尺lv.{0}"
},
"content_text": {
- "key": "9",
+ "key": "newsmithy_content_text_1",
"text": "史诗品质概率提升{0}%"
},
"value": 45
},
{
- "id": 10,
+ "id": 11,
"skill_type": 1,
"skill_lv": 10,
"preconditions": 0,
+ "up_material": [],
+ "name_text": {
+ "key": "newsmithy_name_text_1",
+ "text": "测量尺lv.{0}"
+ },
+ "content_text": {
+ "key": "newsmithy_content_text_1",
+ "text": "史诗品质概率提升{0}%"
+ },
+ "value": 50
+ },
+ {
+ "id": 12,
+ "skill_type": 2,
+ "skill_lv": 0,
+ "preconditions": 0,
"up_material": [
{
"a": "item",
@@ -310,653 +358,1325 @@
}
],
"name_text": {
- "key": "10",
- "text": "测量尺lv.{0}"
+ "key": "newsmithy_name_text_2",
+ "text": "包装盒lv.{0}"
},
"content_text": {
- "key": "10",
- "text": "史诗品质概率提升{0}%"
- },
- "value": 50
- },
- {
- "id": 11,
- "skill_type": 2,
- "skill_lv": 1,
- "preconditions": 15,
- "up_material": [],
- "name_text": {
- "key": "",
- "text": ""
- },
- "content_text": {
- "key": "11",
+ "key": "newsmithy_content_text_1",
"text": "所有装备售价提升{0}%"
},
- "value": 1
- },
- {
- "id": 12,
- "skill_type": 2,
- "skill_lv": 2,
- "preconditions": 15,
- "up_material": [],
- "name_text": {
- "key": "",
- "text": ""
- },
- "content_text": {
- "key": "12",
- "text": "所有装备售价提升{0}%"
- },
- "value": 1
+ "value": 0
},
{
"id": 13,
"skill_type": 2,
- "skill_lv": 3,
- "preconditions": 15,
- "up_material": [],
+ "skill_lv": 1,
+ "preconditions": 6,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_2",
+ "text": "包装盒lv.{0}"
},
"content_text": {
- "key": "13",
+ "key": "newsmithy_content_text_2",
"text": "所有装备售价提升{0}%"
},
- "value": 1
+ "value": 20
},
{
"id": 14,
"skill_type": 2,
- "skill_lv": 4,
- "preconditions": 15,
- "up_material": [],
+ "skill_lv": 2,
+ "preconditions": 6,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_2",
+ "text": "包装盒lv.{0}"
},
"content_text": {
- "key": "14",
+ "key": "newsmithy_content_text_2",
"text": "所有装备售价提升{0}%"
},
- "value": 1
+ "value": 40
},
{
"id": 15,
"skill_type": 2,
- "skill_lv": 5,
- "preconditions": 15,
- "up_material": [],
+ "skill_lv": 3,
+ "preconditions": 6,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_2",
+ "text": "包装盒lv.{0}"
},
"content_text": {
- "key": "15",
+ "key": "newsmithy_content_text_2",
"text": "所有装备售价提升{0}%"
},
- "value": 1
+ "value": 60
},
{
"id": 16,
"skill_type": 2,
- "skill_lv": 6,
- "preconditions": 15,
- "up_material": [],
+ "skill_lv": 4,
+ "preconditions": 6,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_2",
+ "text": "包装盒lv.{0}"
},
"content_text": {
- "key": "16",
+ "key": "newsmithy_content_text_2",
"text": "所有装备售价提升{0}%"
},
- "value": 1
+ "value": 80
},
{
"id": 17,
"skill_type": 2,
- "skill_lv": 7,
- "preconditions": 15,
- "up_material": [],
+ "skill_lv": 5,
+ "preconditions": 6,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_2",
+ "text": "包装盒lv.{0}"
},
"content_text": {
- "key": "17",
+ "key": "newsmithy_content_text_2",
"text": "所有装备售价提升{0}%"
},
- "value": 1
+ "value": 100
},
{
"id": 18,
"skill_type": 2,
- "skill_lv": 8,
- "preconditions": 15,
- "up_material": [],
+ "skill_lv": 6,
+ "preconditions": 6,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_2",
+ "text": "包装盒lv.{0}"
},
"content_text": {
- "key": "18",
+ "key": "newsmithy_content_text_2",
"text": "所有装备售价提升{0}%"
},
- "value": 1
+ "value": 120
},
{
"id": 19,
"skill_type": 2,
- "skill_lv": 9,
- "preconditions": 15,
- "up_material": [],
+ "skill_lv": 7,
+ "preconditions": 6,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_2",
+ "text": "包装盒lv.{0}"
},
"content_text": {
- "key": "19",
+ "key": "newsmithy_content_text_2",
"text": "所有装备售价提升{0}%"
},
- "value": 1
+ "value": 140
},
{
"id": 20,
"skill_type": 2,
- "skill_lv": 10,
- "preconditions": 15,
- "up_material": [],
+ "skill_lv": 8,
+ "preconditions": 6,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_2",
+ "text": "包装盒lv.{0}"
},
"content_text": {
- "key": "20",
+ "key": "newsmithy_content_text_2",
"text": "所有装备售价提升{0}%"
},
- "value": 1
+ "value": 160
},
{
"id": 21,
- "skill_type": 3,
- "skill_lv": 1,
- "preconditions": 25,
- "up_material": [],
+ "skill_type": 2,
+ "skill_lv": 9,
+ "preconditions": 6,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_2",
+ "text": "包装盒lv.{0}"
},
"content_text": {
- "key": "21",
- "text": "所有图纸炉温消耗减少{0}%"
+ "key": "newsmithy_content_text_2",
+ "text": "所有装备售价提升{0}%"
},
- "value": 1
+ "value": 180
},
{
"id": 22,
- "skill_type": 3,
- "skill_lv": 2,
- "preconditions": 25,
+ "skill_type": 2,
+ "skill_lv": 10,
+ "preconditions": 6,
"up_material": [],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_2",
+ "text": "包装盒lv.{0}"
},
"content_text": {
- "key": "22",
- "text": "所有图纸炉温消耗减少{0}%"
+ "key": "newsmithy_content_text_2",
+ "text": "所有装备售价提升{0}%"
},
- "value": 1
+ "value": 200
},
{
"id": 23,
"skill_type": 3,
- "skill_lv": 3,
- "preconditions": 25,
- "up_material": [],
+ "skill_lv": 0,
+ "preconditions": 0,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_3",
+ "text": "温控装置lv.{0}"
},
"content_text": {
- "key": "23",
+ "key": "newsmithy_content_text_2",
"text": "所有图纸炉温消耗减少{0}%"
},
- "value": 1
+ "value": 0
},
{
"id": 24,
"skill_type": 3,
- "skill_lv": 4,
- "preconditions": 25,
- "up_material": [],
+ "skill_lv": 1,
+ "preconditions": 17,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_3",
+ "text": "温控装置lv.{0}"
},
"content_text": {
- "key": "24",
+ "key": "newsmithy_content_text_3",
"text": "所有图纸炉温消耗减少{0}%"
},
- "value": 1
+ "value": 30
},
{
"id": 25,
"skill_type": 3,
- "skill_lv": 5,
- "preconditions": 25,
- "up_material": [],
+ "skill_lv": 2,
+ "preconditions": 17,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_3",
+ "text": "温控装置lv.{0}"
},
"content_text": {
- "key": "25",
+ "key": "newsmithy_content_text_3",
"text": "所有图纸炉温消耗减少{0}%"
},
- "value": 1
+ "value": 60
},
{
"id": 26,
"skill_type": 3,
- "skill_lv": 6,
- "preconditions": 25,
- "up_material": [],
+ "skill_lv": 3,
+ "preconditions": 17,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_3",
+ "text": "温控装置lv.{0}"
},
"content_text": {
- "key": "26",
+ "key": "newsmithy_content_text_3",
"text": "所有图纸炉温消耗减少{0}%"
},
- "value": 1
+ "value": 90
},
{
"id": 27,
"skill_type": 3,
- "skill_lv": 7,
- "preconditions": 25,
- "up_material": [],
+ "skill_lv": 4,
+ "preconditions": 17,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_3",
+ "text": "温控装置lv.{0}"
},
"content_text": {
- "key": "27",
+ "key": "newsmithy_content_text_3",
"text": "所有图纸炉温消耗减少{0}%"
},
- "value": 1
+ "value": 120
},
{
"id": 28,
"skill_type": 3,
- "skill_lv": 8,
- "preconditions": 25,
- "up_material": [],
+ "skill_lv": 5,
+ "preconditions": 17,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_3",
+ "text": "温控装置lv.{0}"
},
"content_text": {
- "key": "28",
+ "key": "newsmithy_content_text_3",
"text": "所有图纸炉温消耗减少{0}%"
},
- "value": 1
+ "value": 150
},
{
"id": 29,
"skill_type": 3,
- "skill_lv": 9,
- "preconditions": 25,
- "up_material": [],
+ "skill_lv": 6,
+ "preconditions": 17,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_3",
+ "text": "温控装置lv.{0}"
},
"content_text": {
- "key": "29",
+ "key": "newsmithy_content_text_3",
"text": "所有图纸炉温消耗减少{0}%"
},
- "value": 1
+ "value": 180
},
{
"id": 30,
"skill_type": 3,
- "skill_lv": 10,
- "preconditions": 25,
- "up_material": [],
+ "skill_lv": 7,
+ "preconditions": 17,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_3",
+ "text": "温控装置lv.{0}"
},
"content_text": {
- "key": "30",
+ "key": "newsmithy_content_text_3",
"text": "所有图纸炉温消耗减少{0}%"
},
- "value": 1
+ "value": 210
},
{
"id": 31,
- "skill_type": 4,
- "skill_lv": 1,
- "preconditions": 35,
- "up_material": [],
+ "skill_type": 3,
+ "skill_lv": 8,
+ "preconditions": 17,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_3",
+ "text": "温控装置lv.{0}"
},
"content_text": {
- "key": "31",
- "text": "每日顾客数量提升至{0}人"
+ "key": "newsmithy_content_text_3",
+ "text": "所有图纸炉温消耗减少{0}%"
},
- "value": 1
+ "value": 240
},
{
"id": 32,
- "skill_type": 4,
- "skill_lv": 2,
- "preconditions": 35,
- "up_material": [],
+ "skill_type": 3,
+ "skill_lv": 9,
+ "preconditions": 17,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_3",
+ "text": "温控装置lv.{0}"
},
"content_text": {
- "key": "32",
- "text": "每日顾客数量提升至{0}人"
+ "key": "newsmithy_content_text_3",
+ "text": "所有图纸炉温消耗减少{0}%"
},
- "value": 1
+ "value": 270
},
{
"id": 33,
- "skill_type": 4,
- "skill_lv": 3,
- "preconditions": 35,
+ "skill_type": 3,
+ "skill_lv": 10,
+ "preconditions": 17,
"up_material": [],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_3",
+ "text": "温控装置lv.{0}"
},
"content_text": {
- "key": "33",
- "text": "每日顾客数量提升至{0}人"
+ "key": "newsmithy_content_text_3",
+ "text": "所有图纸炉温消耗减少{0}%"
},
- "value": 1
+ "value": 300
},
{
"id": 34,
"skill_type": 4,
- "skill_lv": 4,
- "preconditions": 35,
- "up_material": [],
+ "skill_lv": 0,
+ "preconditions": 0,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_4",
+ "text": "宣传单lv.{0}"
},
"content_text": {
- "key": "34",
+ "key": "newsmithy_content_text_3",
"text": "每日顾客数量提升至{0}人"
},
- "value": 1
+ "value": 20
},
{
"id": 35,
"skill_type": 4,
- "skill_lv": 5,
- "preconditions": 35,
- "up_material": [],
+ "skill_lv": 1,
+ "preconditions": 28,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_4",
+ "text": "宣传单lv.{0}"
},
"content_text": {
- "key": "35",
+ "key": "newsmithy_content_text35",
"text": "每日顾客数量提升至{0}人"
},
- "value": 1
+ "value": 21
},
{
"id": 36,
"skill_type": 4,
- "skill_lv": 6,
- "preconditions": 35,
- "up_material": [],
+ "skill_lv": 2,
+ "preconditions": 28,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_4",
+ "text": "宣传单lv.{0}"
},
"content_text": {
- "key": "36",
+ "key": "newsmithy_content_text36",
"text": "每日顾客数量提升至{0}人"
},
- "value": 1
+ "value": 22
},
{
"id": 37,
"skill_type": 4,
- "skill_lv": 7,
- "preconditions": 35,
- "up_material": [],
+ "skill_lv": 3,
+ "preconditions": 28,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_4",
+ "text": "宣传单lv.{0}"
},
"content_text": {
- "key": "37",
+ "key": "newsmithy_content_text37",
"text": "每日顾客数量提升至{0}人"
},
- "value": 1
+ "value": 23
},
{
"id": 38,
"skill_type": 4,
- "skill_lv": 8,
- "preconditions": 35,
- "up_material": [],
+ "skill_lv": 4,
+ "preconditions": 28,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_4",
+ "text": "宣传单lv.{0}"
},
"content_text": {
- "key": "38",
+ "key": "newsmithy_content_text38",
"text": "每日顾客数量提升至{0}人"
},
- "value": 1
+ "value": 24
},
{
"id": 39,
"skill_type": 4,
- "skill_lv": 9,
- "preconditions": 35,
- "up_material": [],
+ "skill_lv": 5,
+ "preconditions": 28,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_4",
+ "text": "宣传单lv.{0}"
},
"content_text": {
- "key": "39",
+ "key": "newsmithy_content_text39",
"text": "每日顾客数量提升至{0}人"
},
- "value": 1
+ "value": 25
},
{
"id": 40,
"skill_type": 4,
- "skill_lv": 10,
- "preconditions": 35,
- "up_material": [],
+ "skill_lv": 6,
+ "preconditions": 28,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_4",
+ "text": "宣传单lv.{0}"
},
"content_text": {
- "key": "40",
+ "key": "newsmithy_content_text40",
"text": "每日顾客数量提升至{0}人"
},
- "value": 1
+ "value": 26
},
{
"id": 41,
- "skill_type": 5,
- "skill_lv": 1,
- "preconditions": 45,
- "up_material": [],
+ "skill_type": 4,
+ "skill_lv": 7,
+ "preconditions": 28,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_4",
+ "text": "宣传单lv.{0}"
},
"content_text": {
- "key": "41",
- "text": "顾客购买装备数量上限提高至{0}件"
+ "key": "newsmithy_content_text41",
+ "text": "每日顾客数量提升至{0}人"
},
- "value": 1
+ "value": 27
},
{
"id": 42,
- "skill_type": 5,
- "skill_lv": 2,
- "preconditions": 45,
- "up_material": [],
+ "skill_type": 4,
+ "skill_lv": 8,
+ "preconditions": 28,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_4",
+ "text": "宣传单lv.{0}"
},
"content_text": {
- "key": "42",
- "text": "顾客购买装备数量上限提高至{0}件"
+ "key": "newsmithy_content_text42",
+ "text": "每日顾客数量提升至{0}人"
},
- "value": 1
+ "value": 28
},
{
"id": 43,
- "skill_type": 5,
- "skill_lv": 3,
- "preconditions": 45,
- "up_material": [],
+ "skill_type": 4,
+ "skill_lv": 9,
+ "preconditions": 28,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_4",
+ "text": "宣传单lv.{0}"
},
"content_text": {
- "key": "43",
- "text": "顾客购买装备数量上限提高至{0}件"
+ "key": "newsmithy_content_text43",
+ "text": "每日顾客数量提升至{0}人"
},
- "value": 1
+ "value": 29
},
{
"id": 44,
- "skill_type": 5,
- "skill_lv": 4,
- "preconditions": 45,
+ "skill_type": 4,
+ "skill_lv": 10,
+ "preconditions": 28,
"up_material": [],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_4",
+ "text": "宣传单lv.{0}"
},
"content_text": {
- "key": "44",
- "text": "顾客购买装备数量上限提高至{0}件"
+ "key": "newsmithy_content_text44",
+ "text": "每日顾客数量提升至{0}人"
},
- "value": 1
+ "value": 30
},
{
"id": 45,
"skill_type": 5,
- "skill_lv": 5,
- "preconditions": 45,
- "up_material": [],
+ "skill_lv": 0,
+ "preconditions": 0,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_5",
+ "text": "会员制lv.{0}"
},
"content_text": {
- "key": "45",
+ "key": "newsmithy_content_text45",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 1
+ "value": 5
},
{
"id": 46,
"skill_type": 5,
- "skill_lv": 6,
- "preconditions": 45,
- "up_material": [],
+ "skill_lv": 1,
+ "preconditions": 39,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_5",
+ "text": "会员制lv.{0}"
},
"content_text": {
- "key": "46",
+ "key": "newsmithy_content_text46",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 1
+ "value": 6
},
{
"id": 47,
"skill_type": 5,
- "skill_lv": 7,
- "preconditions": 45,
- "up_material": [],
+ "skill_lv": 2,
+ "preconditions": 39,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_5",
+ "text": "会员制lv.{0}"
},
"content_text": {
- "key": "47",
+ "key": "newsmithy_content_text47",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 1
+ "value": 7
},
{
"id": 48,
"skill_type": 5,
- "skill_lv": 8,
- "preconditions": 45,
- "up_material": [],
+ "skill_lv": 3,
+ "preconditions": 39,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_5",
+ "text": "会员制lv.{0}"
},
"content_text": {
- "key": "48",
+ "key": "newsmithy_content_text48",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 1
+ "value": 8
},
{
"id": 49,
"skill_type": 5,
- "skill_lv": 9,
- "preconditions": 45,
- "up_material": [],
+ "skill_lv": 4,
+ "preconditions": 39,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_5",
+ "text": "会员制lv.{0}"
},
"content_text": {
- "key": "49",
+ "key": "newsmithy_content_text49",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 1
+ "value": 9
},
{
"id": 50,
"skill_type": 5,
- "skill_lv": 10,
- "preconditions": 45,
- "up_material": [],
+ "skill_lv": 5,
+ "preconditions": 39,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
"name_text": {
- "key": "",
- "text": ""
+ "key": "newsmithy_name_text_5",
+ "text": "会员制lv.{0}"
},
"content_text": {
- "key": "50",
+ "key": "newsmithy_content_text50",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 1
+ "value": 10
+ },
+ {
+ "id": 51,
+ "skill_type": 5,
+ "skill_lv": 6,
+ "preconditions": 39,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
+ "name_text": {
+ "key": "newsmithy_name_text_5",
+ "text": "会员制lv.{0}"
+ },
+ "content_text": {
+ "key": "newsmithy_content_text51",
+ "text": "顾客购买装备数量上限提高至{0}件"
+ },
+ "value": 11
+ },
+ {
+ "id": 52,
+ "skill_type": 5,
+ "skill_lv": 7,
+ "preconditions": 39,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
+ "name_text": {
+ "key": "newsmithy_name_text_5",
+ "text": "会员制lv.{0}"
+ },
+ "content_text": {
+ "key": "newsmithy_content_text52",
+ "text": "顾客购买装备数量上限提高至{0}件"
+ },
+ "value": 12
+ },
+ {
+ "id": 53,
+ "skill_type": 5,
+ "skill_lv": 8,
+ "preconditions": 39,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
+ "name_text": {
+ "key": "newsmithy_name_text_5",
+ "text": "会员制lv.{0}"
+ },
+ "content_text": {
+ "key": "newsmithy_content_text53",
+ "text": "顾客购买装备数量上限提高至{0}件"
+ },
+ "value": 13
+ },
+ {
+ "id": 54,
+ "skill_type": 5,
+ "skill_lv": 9,
+ "preconditions": 39,
+ "up_material": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 2
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 3
+ }
+ ],
+ "name_text": {
+ "key": "newsmithy_name_text_5",
+ "text": "会员制lv.{0}"
+ },
+ "content_text": {
+ "key": "newsmithy_content_text54",
+ "text": "顾客购买装备数量上限提高至{0}件"
+ },
+ "value": 14
+ },
+ {
+ "id": 55,
+ "skill_type": 5,
+ "skill_lv": 10,
+ "preconditions": 39,
+ "up_material": [],
+ "name_text": {
+ "key": "newsmithy_name_text_5",
+ "text": "会员制lv.{0}"
+ },
+ "content_text": {
+ "key": "newsmithy_content_text55",
+ "text": "顾客购买装备数量上限提高至{0}件"
+ },
+ "value": 15
}
]
\ No newline at end of file
diff --git a/comm/const.go b/comm/const.go
index 8418a001b..eb3d52af8 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -142,7 +142,8 @@ const (
TableSeasonRecord = "seasonRecord" // 赛季塔记录
/// 美食馆
TableSmithy = "smithy"
- TableSmithyTrade = "trade"
+ TableSmithyTrade = "smithytrade"
+ TableSmithyTask = "smithytask"
/// 赛季塔数据表
TableSeasonPagoda = "seasonpagoda"
//
diff --git a/modules/equipment/module.go b/modules/equipment/module.go
index a21a86bde..2afc6a115 100644
--- a/modules/equipment/module.go
+++ b/modules/equipment/module.go
@@ -364,6 +364,10 @@ func (this *Equipment) GetForgeEquip(session comm.IUserSession, suiteId int32, p
lvs = append(lvs, v)
}
}
+ if len(lvs) == 0 {
+ code = pb.ErrorCode_ConfigNoFound
+ return
+ }
r := rand.New(rand.NewSource(time.Now().Unix()))
index := r.Perm(len(lvs))[0]
if eruip, err = this.modelEquipment.newEquipment(session.GetUserId(), lvs[index], dyweight); err == nil {
diff --git a/modules/friend/api_cross_qiecuo.go b/modules/friend/api_cross_qiecuo.go
index be3dad986..7f7a4c55c 100644
--- a/modules/friend/api_cross_qiecuo.go
+++ b/modules/friend/api_cross_qiecuo.go
@@ -8,6 +8,7 @@ import (
"google.golang.org/protobuf/proto"
)
+// 踢馆(熊猫武馆)
func (this *apiComp) QiecuoCheck(session comm.IUserSession, req *pb.FriendQiecuoReq) (code pb.ErrorCode) {
if req.TargetUid == "" {
code = pb.ErrorCode_ReqParameterError
@@ -27,8 +28,7 @@ func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.FriendQiecuoReq)
}
//切磋请求处理
- err := this.moduleFriend.ModelFriendQiecuo.qiecuoReq(session.GetUserId(), req.TargetUid)
- if err != nil {
+ if err := this.moduleFriend.ModelFriendQiecuo.qiecuoReq(session.GetUserId(), req.TargetUid); err != nil {
var customErr = new(comm.CustomError)
if errors.As(err, &customErr) {
code = customErr.Code
diff --git a/modules/friend/model_qiecuo.go b/modules/friend/model_qiecuo.go
index 1a6c12c1a..4321a4998 100644
--- a/modules/friend/model_qiecuo.go
+++ b/modules/friend/model_qiecuo.go
@@ -57,7 +57,7 @@ func (this *ModelFriendQiecuo) qiecuoReq(uid, targetUid string) error {
now := configure.Now().Unix()
if qr.Status == 1 && now-qr.Timestamp < 10 {
return comm.NewCustomError(pb.ErrorCode_FriendQiecuoRequested)
- } else if qr.Status == 2 || qr.MatchId != "" {
+ } else if qr.Status == 2 || qr.MatchId != "" {
return comm.NewCustomError(pb.ErrorCode_FriendQiecuoing)
} else {
update := map[string]interface{}{
@@ -78,8 +78,9 @@ func (this *ModelFriendQiecuo) updateQiecuoRecord(uid, targetUid, matchId string
qr := this.getQiecuo(uid)
if qr != nil {
update := map[string]interface{}{
- "matchId": matchId,
- "status": 2, //已接受
+ "matchId": matchId,
+ "status": 2, //已接受
+ "timestamp": configure.Now().Unix(),
}
if err := this.Change(uid, update); err != nil {
this.moduleFriend.Errorln(err)
diff --git a/modules/friend/module.go b/modules/friend/module.go
index 1981e7380..f5babd2f7 100644
--- a/modules/friend/module.go
+++ b/modules/friend/module.go
@@ -177,15 +177,24 @@ func (this *Friend) UseAssistHero(uid, friendId string) (*pb.DBHero, error) {
return nil, errors.New("非好友")
}
+// 挑战完成通知
func (this *Friend) QiecuoFinishNotify(redUid, matchId string) error {
qr := this.ModelFriendQiecuo.getQiecuo(redUid)
if qr != nil && qr.MatchId == matchId {
log.Debug("清理切磋记录",
log.Field{Key: "redUid", Value: redUid},
log.Field{Key: "matchId", Value: matchId})
- if err := this.ModelFriendQiecuo.DelByUId(redUid); err != nil {
- log.Error("删除", log.Field{Key: "redUid", Value: redUid})
+ //更新时间戳
+ update := map[string]interface{}{
+ "endTime": configure.Now().Unix(),
}
+ if err := this.ModelFriendQiecuo.Change(redUid, update); err != nil {
+ return err
+ }
+ return nil
+ // if err := this.ModelFriendQiecuo.DelByUId(redUid); err != nil {
+ // log.Error("删除", log.Field{Key: "redUid", Value: redUid})
+ // }
}
return nil
}
diff --git a/modules/smithy/api_atlasactivate.go b/modules/smithy/api_atlasactivate.go
new file mode 100644
index 000000000..255fb2d80
--- /dev/null
+++ b/modules/smithy/api_atlasactivate.go
@@ -0,0 +1,62 @@
+package smithy
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+
+ "google.golang.org/protobuf/proto"
+)
+
+//参数校验
+func (this *apiComp) AtlasActivateCheck(session comm.IUserSession, req *pb.SmithyAtlasActivateReq) (code pb.ErrorCode) {
+ if req.Id == "" {
+ code = pb.ErrorCode_ReqParameterError
+ }
+ return
+}
+
+// 获取铁匠铺图鉴信息
+func (this *apiComp) AtlasActivate(session comm.IUserSession, req *pb.SmithyAtlasActivateReq) (code pb.ErrorCode, data proto.Message) {
+ var (
+ addScore int32 // 更新图鉴增加的积分
+ )
+ code = this.AtlasActivateCheck(session, req)
+ if code != pb.ErrorCode_Success {
+ return // 参数校验失败直接返回
+ }
+ atlas, err := this.module.modelAtlas.getSmithyAtlasList(session.GetUserId())
+ if err != nil {
+ code = pb.ErrorCode_DBError
+ return
+ }
+ conf := this.module.configure.GetSmithyAtlasConf(req.Id)
+ if conf == nil {
+ code = pb.ErrorCode_SmithyNoFoundAtlas
+ return
+ }
+ if v, ok := atlas.Atlas[req.Id]; ok {
+ if !v.Activate { // 激活
+ v.Activate = true
+ addScore = v.Data[0].Score
+ } else { //更新操作
+ if len(v.Data) > 1 {
+ addScore = v.Data[1].Score - v.Data[0].Score
+ v.Data = append(v.Data[:0], v.Data[1:]...)
+ } else {
+ code = pb.ErrorCode_SmithyNoActivateAtlas
+ return
+ }
+ }
+ update := make(map[string]interface{}, 0)
+ update["atlas"] = v
+ atlas.Score += addScore
+ update["score"] = atlas.Score
+ this.module.modelAtlas.modifySmithyAtlasList(session.GetUserId(), update)
+ } else {
+ code = pb.ErrorCode_SmithyNoFoundAtlas
+ return
+ }
+
+ session.SendMsg(string(this.module.GetType()), "atlasactivate", &pb.SmithyAtlasActivateResp{Data: atlas})
+ return
+}
diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go
index b0c1e2c07..685aa6fc5 100644
--- a/modules/smithy/api_forgeequip.go
+++ b/modules/smithy/api_forgeequip.go
@@ -5,7 +5,6 @@ import (
"go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs"
- "strconv"
"google.golang.org/protobuf/proto"
)
@@ -26,10 +25,12 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
err error
update map[string]interface{}
- costRes []*cfg.Gameatn
- customLv int32 // 定制装备的等级
- rsp *pb.SmithyForgeEquipResp
+ costRes []*cfg.Gameatn
+ customLv int32 // 定制装备的等级
+ rsp *pb.SmithyForgeEquipResp
+ needTemperatureCos int32 // 需要消耗的温度
)
+ rsp = &pb.SmithyForgeEquipResp{}
update = make(map[string]interface{})
code = this.ForgeEquipCheck(session, req)
if code != pb.ErrorCode_Success {
@@ -55,7 +56,6 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
Lv: 1,
Value: 0,
}
- //update["data"] = stove.Data
}
stove.Data[req.ReelId].Value += 1
stove.Forge[req.ReelId] += 1
@@ -82,39 +82,36 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
customLv = reelcfg.CustomizedLv[index]
}
}
+ needTemperatureCos = reelcfg.TemperatureCos
+ // 熟练度减少的温度
+ t := this.module.modelStove.CheckTemperature(req.ReelId, stove.Data[req.ReelId].Lv)
+ needTemperatureCos = reelcfg.TemperatureCos * (1000 - t) / 1000
+ // 检查炉温 是否够
+ if stove.Temperature < needTemperatureCos {
+ code = pb.ErrorCode_SmithyNoTemperature // 炉温不够 直接返回
+ return
+ }
- // 是否是熔岩打造
- if req.Lava > 0 {
- // 预计消耗温度
- exemption := this.module.configure.GetGlobalConf().ExemptionTemperatureCos
- if len(exemption) != 2 {
- code = pb.ErrorCode_ConfigNoFound
- return
- }
- if reelcfg.TemperatureCos > req.Lava*exemption[1] {
+ if req.Lava > 0 { // 是否是熔岩打造
+ exemption := this.module.configure.GetGlobalConf().ExemptionTemperatureCos // 预计消耗温度
+ raise_temperatureNum := this.module.configure.GetGlobalConf().ExemptionTemperatureCosNum
+ raise_temperatureNum = req.Lava * exemption.N
+ if needTemperatureCos > raise_temperatureNum {
code = pb.ErrorCode_SmithyLackLava // 缺少熔岩
return
}
// 检查消耗
lavaCost := &cfg.Gameatn{
- A: "item",
- T: strconv.Itoa(int(exemption[0])),
- N: req.Lava,
+ A: exemption.A,
+ T: exemption.T,
+ N: exemption.N * req.Lava,
}
if code = this.module.CheckRes(session, []*cfg.Gameatn{lavaCost}); code != pb.ErrorCode_Success {
return
}
costRes = append(costRes, lavaCost)
-
} else {
- // 熟练度减少的温度
- t := this.module.modelStove.CheckTemperature(req.ReelId, stove.Data[req.ReelId].Lv)
- // 检查炉温 是否够
- if stove.Temperature < reelcfg.TemperatureCos-t {
- code = pb.ErrorCode_SmithyNoTemperature // 炉温不够 直接返回
- return
- }
- stove.Temperature -= (reelcfg.TemperatureCos - t) // 消耗温度
+ stove.Temperature -= needTemperatureCos // 消耗温度
update["temperature"] = stove.Temperature
}
@@ -127,7 +124,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
// 检查是否提升了熟练度等级
nextProficiency := this.module.configure.GetSmithyProficileData(req.ReelId, stove.Data[req.ReelId].Lv+1)
- if nextProficiency != nil && nextProficiency.Proficiency >= stove.Data[req.ReelId].Value { // 提升熟练度
+ if nextProficiency != nil && nextProficiency.Proficiency <= stove.Data[req.ReelId].Value { // 提升熟练度
stove.Data[req.ReelId].Lv += 1
stove.Data[req.ReelId].Value = 0
// 校验是否解锁了新的图纸
@@ -153,18 +150,25 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
// 装备资源分发
if customLv > 0 { //
+
sz := make([]int32, 4) // 最高 4个品质
// 获得极品权重
sz[3] = this.module.modelStove.StoveToolsQualityProbability(stove)
- if equip, code1 := this.module.ModuleEquipment.GetForgeEquip(session, req.SuiteId, req.Position, customLv, sz); code1 != pb.ErrorCode_Success {
- rsp.Equip = append(rsp.Equip, equip.CId)
+ if equip, code1 := this.module.ModuleEquipment.GetForgeEquip(session, req.SuiteId, req.Position, customLv, sz); code1 == pb.ErrorCode_Success {
+ rsp.Equip = append(rsp.Equip, equip)
+ } else {
+ code = code1
return
}
} else {
+
res := this.module.configure.GetDropReward(reelcfg.BasicDrop)
- this.module.DispenseRes(session, res, true)
- for _, v := range res {
- rsp.Equip = append(rsp.Equip, v.T)
+ if err, atno := this.module.DispenseAtno(session, res, true); err == pb.ErrorCode_Success {
+ for _, v := range atno {
+ if eq, err1 := this.module.ModuleEquipment.QueryEquipment(session.GetUserId(), v.O); err1 == pb.ErrorCode_Success {
+ rsp.Equip = append(rsp.Equip, eq)
+ }
+ }
}
}
@@ -175,5 +179,12 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
this.module.modelStove.updateSmithyStove(session.GetUserId(), update)
rsp.Data = stove
session.SendMsg(string(this.module.GetType()), "forgeequip", rsp)
+ // 更新图鉴信息
+ for _, v := range rsp.Equip {
+ if equipConf := this.module.configure.GetEquipmentConfigureById(v.CId); equipConf != nil { // 获取装备等级
+ this.module.modelAtlas.CheckActivateAtlas(session.GetUserId(), v.CId, equipConf.Star, int32(len(v.AdverbEntry)), stove.Forge[req.ReelId])
+ }
+ }
+
return
}
diff --git a/modules/smithy/api_receive.go b/modules/smithy/api_receive.go
new file mode 100644
index 000000000..222afe047
--- /dev/null
+++ b/modules/smithy/api_receive.go
@@ -0,0 +1,27 @@
+package smithy
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+
+ "google.golang.org/protobuf/proto"
+)
+
+// 图鉴任务奖励领取
+func (this *apiComp) TaskAwardCheck(session comm.IUserSession, req *pb.SmithyTaskAwardReq) (code pb.ErrorCode) {
+ if req.TaskId == 0 {
+ return pb.ErrorCode_ReqParameterError
+ }
+ return
+}
+
+func (this *apiComp) TaskAward(session comm.IUserSession, req *pb.SmithyTaskAwardReq) (code pb.ErrorCode, data proto.Message) {
+ if code = this.TaskAwardCheck(session, req); code != pb.ErrorCode_Success {
+ return
+ }
+
+ resp:= &pb.SmithyTaskAwardResp{}
+
+ session.SendMsg(string(this.module.GetType()),"taskaward", resp)
+ return
+}
diff --git a/modules/smithy/api_refuse.go b/modules/smithy/api_refuse.go
new file mode 100644
index 000000000..3439578dd
--- /dev/null
+++ b/modules/smithy/api_refuse.go
@@ -0,0 +1,34 @@
+package smithy
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+
+ "google.golang.org/protobuf/proto"
+)
+
+func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.SmithyRefuseReq) (code pb.ErrorCode) {
+ if req.CustomerId == 0 {
+ code = pb.ErrorCode_ReqParameterError
+ }
+ return
+}
+
+func (this *apiComp) Refuse(session comm.IUserSession, req *pb.SmithyRefuseReq) (code pb.ErrorCode, data proto.Message) {
+ if code = this.RefuseCheck(session, req); code != pb.ErrorCode_Success {
+ return
+ }
+
+ cus, err := this.module.modelTrade.updateCustomer(session.GetUserId(), req.CustomerId)
+ if err != nil {
+ code = pb.ErrorCode_DBError
+ return
+ }
+
+ resp := &pb.SmithyRefuseResp{
+ Customers: cus.Customers,
+ }
+
+ session.SendMsg(string(this.module.GetType()), "refuse", resp)
+ return
+}
diff --git a/modules/smithy/api_rise.go b/modules/smithy/api_rise.go
index 712dc61c0..395f16bbc 100644
--- a/modules/smithy/api_rise.go
+++ b/modules/smithy/api_rise.go
@@ -4,7 +4,6 @@ import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
- "strconv"
"google.golang.org/protobuf/proto"
)
@@ -32,40 +31,32 @@ func (this *apiComp) Rise(session comm.IUserSession, req *pb.SmithyRiseReq) (cod
code = pb.ErrorCode_DBError
return
}
- conf := this.module.configure.GetSmithyStoveConf(stove.Lv)
- if conf != nil {
- cost = append(cost, &cfg.Gameatn{
- A: "item",
- T: req.ItemId,
- N: req.Count,
- })
-
- raise := this.module.configure.GetGlobalConf().RaiseTemperature
- if len(raise) != 2 {
- code = pb.ErrorCode_ConfigNoFound // 配置有误 直接返回
- return //
- }
- if req.ItemId != strconv.Itoa(int(raise[0])) {
- code = pb.ErrorCode_ReqParameterError
- return
- }
+ if conf := this.module.configure.GetSmithyStoveConf(stove.Lv); conf != nil {
if stove.Temperature >= conf.MaxTemperature { // 已经达到最大的温度值了
code = pb.ErrorCode_SmithyMaxTemperature
return
}
+ raise := this.module.configure.GetGlobalConf().RaiseTemperature
+ raise_temperatureNum := this.module.configure.GetGlobalConf().RaiseTemperatureNum
+ cost = append(cost, &cfg.Gameatn{
+ A: raise.A,
+ T: raise.T,
+ N: raise.N * req.Count,
+ })
- if stove.Temperature+req.Count*raise[0] >= conf.MaxTemperature-raise[0] {
+ if stove.Temperature+req.Count*raise_temperatureNum >= conf.MaxTemperature-raise_temperatureNum {
code = pb.ErrorCode_SmithyMaxTemperature
return
}
if code = this.module.ConsumeRes(session, cost, true); code != pb.ErrorCode_Success {
return
}
- stove.Temperature += req.Count * raise[0]
+ stove.Temperature += req.Count * raise_temperatureNum
update := make(map[string]interface{}, 0)
update["temperature"] = stove.Temperature
this.module.modelStove.updateSmithyStove(session.GetUserId(), update)
+ session.SendMsg(string(this.module.GetType()), "rise", &pb.SmithyRiseResp{Data: stove})
}
- session.SendMsg(string(this.module.GetType()), "rise", &pb.SmithyRiseResp{Data: stove})
+ code = pb.ErrorCode_ConfigNoFound
return
}
diff --git a/modules/smithy/api_stoveup.go b/modules/smithy/api_stoveup.go
index 8ccf8114c..10ed8e6e5 100644
--- a/modules/smithy/api_stoveup.go
+++ b/modules/smithy/api_stoveup.go
@@ -39,8 +39,8 @@ func (this *apiComp) StoveUp(session comm.IUserSession, req *pb.SmithyStoveUpReq
}
stove.Lv += 1
update := make(map[string]interface{})
- update["temperature"] = stove.Temperature
- update["recoveTime"] = stove.RecoveTime
+ //update["temperature"] = stove.Temperature
+ update["lv"] = stove.Lv
this.module.modelStove.updateSmithyStove(session.GetUserId(), update)
session.SendMsg(string(this.module.GetType()), "stoveup", &pb.SmithyStoveUpResp{Data: stove})
return
diff --git a/modules/smithy/api_trade.go b/modules/smithy/api_trade.go
index 725f7f014..9b2160a5e 100644
--- a/modules/smithy/api_trade.go
+++ b/modules/smithy/api_trade.go
@@ -32,7 +32,11 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.SmithySellReq) (cod
this.module.ModuleEquipment.RecycleEquipments(session, req.EquipIds, this.module.modelStove.StoveToolsSellUp(session.GetUserId()))
- _ = this.module.modelTrade.updateCustomer(session.GetUserId(), req.CustomerId)
+ cus, err := this.module.modelTrade.updateCustomer(session.GetUserId(), req.CustomerId)
+ if err != nil {
+ code = pb.ErrorCode_DBError
+ return
+ }
conf := this.module.configure.GetSmithyCustomerConf(req.CustomerId)
if conf == nil {
@@ -46,6 +50,7 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.SmithySellReq) (cod
rsp := &pb.SmithySellResp{
CustomerId: req.CustomerId,
EquipIds: req.EquipIds,
+ Customers: cus.Customers,
}
session.SendMsg(string(this.module.GetType()), "sell", rsp)
diff --git a/modules/smithy/comp_configure.go b/modules/smithy/comp_configure.go
index f6adcef32..e7edce6f6 100644
--- a/modules/smithy/comp_configure.go
+++ b/modules/smithy/comp_configure.go
@@ -21,6 +21,7 @@ const (
game_smithyatlas = "game_smithyatlas.json" // 收藏图鉴
game_smithyatlaslv = "game_smithyatlaslv.json" // 收藏等级积分
game_smithyatlasscore = "game_smithyatlasscore.json" // 图鉴积分
+ game_smithytask = "game_smithytask.json" //图鉴任务
)
// /配置管理基础组件
@@ -70,7 +71,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
err = this.LoadConfigure(game_smithyatlas, cfg.NewGameSmithyAtlas)
err = this.LoadConfigure(game_smithyatlaslv, cfg.NewGameSmithyAtlasLv)
err = this.LoadConfigure(game_smithyatlasscore, cfg.NewGameSmithyAtlasScore)
-
+ err = this.LoadConfigure(game_smithytask, cfg.NewGameSmithyTask)
return
}
@@ -290,3 +291,15 @@ func (this *configureComp) LoadSmithyAtlasScoreConf() {
log.Errorf("get LoadSmithyAtlasScoreConf conf err:%v", err)
}
}
+
+// 获取图鉴任务配置
+func(this *configureComp) GetSmithyTask(taskId int32) (data *cfg.GameSmithyTaskData) {
+ if v, err := this.GetConfigure(game_smithytask); err == nil {
+ if configure, ok := v.(*cfg.GameSmithyTask); ok {
+ data = configure.Get(taskId)
+ return
+ }
+ }
+ this.module.Errorf("GetSmithyTask notfound taskId:%d", taskId)
+ return
+}
\ No newline at end of file
diff --git a/modules/smithy/model_atlas.go b/modules/smithy/model_atlas.go
index e8a8c0bea..5c96ed25b 100644
--- a/modules/smithy/model_atlas.go
+++ b/modules/smithy/model_atlas.go
@@ -50,67 +50,90 @@ func (this *modelAtlas) modifySmithyAtlasList(uid string, data map[string]interf
}
// 检查是否激活图鉴
-
func (this *modelAtlas) CheckActivateAtlas(uid string, id string, lv int32, quality int32, forgeCount int32) bool {
- conf := this.module.configure.GetSmithyAtlasConf(id)
- if conf != nil {
+ atlasConf := this.module.configure.GetSmithyAtlasConf(id)
+ if atlasConf == nil {
return false
}
list, err := this.module.modelAtlas.getSmithyAtlasList(uid)
if err != nil {
return false
}
- scoreConf := this.module.configure.GetSmithyAtlasScoreConf(quality, lv)
- if scoreConf == nil {
- return false
- }
- if v, ok := list.Atlas[id]; ok { // 找到相同的 校验 对应的分数
- // 获取分数
- if len(v.Data) == 1 {
- if v.Data[0].Score <= scoreConf.Score {
- newData := &pb.ForgeData{
- ForgeCount: forgeCount,
- Lv: lv,
- Quality: quality,
- Score: scoreConf.Score,
- Time: configure.Now().Unix(),
- }
- v.Data = append(v.Data, newData)
- update := make(map[string]interface{}, 0)
- update["tujian"] = list.Atlas
- this.module.modelAtlas.modifySmithyAtlasList(uid, update) // 更新分数信息
- return true
- }
- } else if len(v.Data) == 2 { // 更新第二条数据
- if v.Data[1].Score <= scoreConf.Score {
- v.Data[1].Lv = lv
- v.Data[1].Quality = quality
- v.Data[1].Score = scoreConf.Score
- v.Data[1].ForgeCount = forgeCount // 更新锻造次数
- update := make(map[string]interface{}, 0)
- update["tujian"] = list.Atlas
- this.module.modelAtlas.modifySmithyAtlasList(uid, update) // 更新分数信息
- return true
- }
+ if atlasConf.TypeId == 1 { // 装备收藏图鉴信息
+ scoreConf := this.module.configure.GetSmithyAtlasScoreConf(quality, lv)
+ if scoreConf == nil {
+ return false
}
-
- return false
- } else {
- sz := &pb.ForgeList{}
- newData := &pb.ForgeData{
- ForgeCount: forgeCount,
- Lv: lv,
- Quality: quality,
- Score: scoreConf.Score,
- Time: configure.Now().Unix(),
- }
- sz.Data = append(sz.Data, newData)
- sz.Activate = false // 第一次获得 默认是非激活状态
- list.Atlas[id] = sz
update := make(map[string]interface{}, 0)
- update["tujian"] = list.Atlas
+ if v, ok := list.Atlas[id]; ok { // 找到相同的
+ if v.Activate { // 已经激活的
+ if len(v.Data) > 1 {
+ if v.Data[1].Score <= scoreConf.Score {
+ v.Data[1].ForgeCount = forgeCount
+ v.Data[1].Lv = lv
+ v.Data[1].Quality = quality
+ v.Data[1].Score = scoreConf.Score
+ v.Data[1].Time = configure.Now().Unix()
+ }
+ }
+ } else { // 没有激活的
+ if len(v.Data) == 1 {
+ if v.Data[0].Score <= scoreConf.Score {
+ v.Data[0].ForgeCount = forgeCount
+ v.Data[0].Lv = lv
+ v.Data[0].Quality = quality
+ v.Data[0].Score = scoreConf.Score
+ v.Data[0].Time = configure.Now().Unix()
+ }
+ } else {
+ v.Data = make([]*pb.ForgeData, 0)
+ newData := &pb.ForgeData{
+ ForgeCount: forgeCount,
+ Lv: lv,
+ Quality: quality,
+ Score: scoreConf.Score,
+ Time: configure.Now().Unix(),
+ }
+ v.Data = append(v.Data, newData)
+ }
+ }
+ } else {
+ sz := &pb.ForgeList{}
+ newData := &pb.ForgeData{
+ ForgeCount: forgeCount,
+ Lv: lv,
+ Quality: quality,
+ Score: scoreConf.Score,
+ Time: configure.Now().Unix(),
+ }
+ sz.Data = append(sz.Data, newData)
+ sz.Activate = false // 第一次获得 默认是非激活状态
+ list.Atlas[id] = sz
+ }
+ update["atlas"] = list.Atlas
this.module.modelAtlas.modifySmithyAtlasList(uid, update) // 更新分数信息
}
-
return true
}
+
+// 检查是否激活收藏品
+func (this *modelAtlas) CheckActivateAtlasCollect(uid string, id string) {
+ atlasConf := this.module.configure.GetSmithyAtlasConf(id)
+ if atlasConf != nil && atlasConf.TypeId == 2 {
+ if list, err := this.module.modelAtlas.getSmithyAtlasList(uid); err == nil {
+
+ if _, ok := list.Collect[id]; !ok {
+ list.Collect[id] = &pb.CollectData{
+ Id: id,
+ Score: atlasConf.AtlasScore,
+ Time: configure.Now().Unix(),
+ }
+ list.Score += atlasConf.AtlasScore
+ update := make(map[string]interface{}, 0)
+ update["collect"] = list.Collect
+ update["score"] = list.Score
+ this.module.modelAtlas.modifySmithyAtlasList(uid, update) // 更新分数信息
+ }
+ }
+ }
+}
diff --git a/modules/smithy/model_stove.go b/modules/smithy/model_stove.go
index 936e19663..e278827a5 100644
--- a/modules/smithy/model_stove.go
+++ b/modules/smithy/model_stove.go
@@ -45,9 +45,11 @@ func (this *modelStove) getSmithyStoveList(uid string) (result *pb.DBStove, err
result.Skill = make(map[int32]int32, 0)
result.Forge = make(map[int32]int32, 0)
result.Lv = 1
- result.Temperature = 20000 // 配置
+ result.Temperature = 2000 // 配置
result.RecoveTime = 0
-
+ if conf := this.module.configure.GetSmithyStoveConf(1); conf != nil { // 获取1级炉子温度配置
+ result.Temperature = conf.MaxTemperature
+ }
if err = this.Add(uid, result); err != nil {
this.module.Errorf("err:%v", err)
err = nil
diff --git a/modules/smithy/model_task.go b/modules/smithy/model_task.go
new file mode 100644
index 000000000..87ea1aef2
--- /dev/null
+++ b/modules/smithy/model_task.go
@@ -0,0 +1,73 @@
+package smithy
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/lego/core"
+ "go_dreamfactory/modules"
+ "go_dreamfactory/pb"
+
+ "go.mongodb.org/mongo-driver/mongo"
+ "go.mongodb.org/mongo-driver/x/bsonx"
+)
+
+type modelTask struct {
+ modules.MCompModel
+ module *Smithy
+}
+
+func (this *modelTask) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
+ this.TableName = string(comm.TableSmithyTask)
+ err = this.MCompModel.Init(service, module, comp, options)
+ this.module = module.(*Smithy)
+ this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
+ Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}},
+ })
+ return
+}
+
+func (this *modelTask) getTaskRecord(uid string) (*pb.DBTujianTask, error) {
+ tt := &pb.DBTujianTask{}
+ if err := this.Get(uid, tt); err != nil {
+ return tt, err
+ }
+ return tt, nil
+}
+
+func (this *modelTask) updateTaskRecord(uid string, taskId int32) error {
+ if !this.CheckTaskStatus(uid, taskId) {
+ return comm.NewCustomError(pb.ErrorCode_SmithyTaskNoFinished)
+ }
+ dt, err := this.getTaskRecord(uid)
+ if err != nil {
+ return err
+ }
+
+ if dt.Uid == "" {
+ this.Add(uid, &pb.DBTujianTask{Uid: uid, TaskId: taskId, Received: 2})
+ } else {
+ // 已存在 重复领取
+ if dt.Received == 2 {
+ return comm.NewCustomError(pb.ErrorCode_SmithyTaskReceived)
+ } else {
+ update := map[string]interface{}{
+ "received": 2,
+ }
+ if err := this.Change(uid, update); err != nil {
+ return err
+ }
+ }
+ }
+ return nil
+}
+
+// 检查任务状态
+func (this *modelTask) CheckTaskStatus(uid string, taskId int32) bool {
+ conf := this.module.configure.GetSmithyTask(taskId)
+ if conf == nil {
+ return false
+ }
+ if ec := this.module.ModuleRtask.CheckCondi(uid, conf.TypeId); ec != pb.ErrorCode_Success {
+ return false
+ }
+ return true
+}
diff --git a/modules/smithy/model_trade.go b/modules/smithy/model_trade.go
index 9af59a2ad..94c8c599c 100644
--- a/modules/smithy/model_trade.go
+++ b/modules/smithy/model_trade.go
@@ -119,16 +119,16 @@ func (s *modelTrade) removeCustomer(cus *pb.DBCustomer, customerId int32) *pb.DB
}
// 随机新顾客
-func (s *modelTrade) updateCustomer(uid string, customerId int32) error {
+func (s *modelTrade) updateCustomer(uid string, customerId int32) (*pb.DBCustomer, error) {
cus, err := s.getDBCustomer(uid)
if err == nil {
cus = s.removeCustomer(cus, customerId)
cus.Total++
//上限
- limit := 20
- left := limit - int(cus.Total)
+ limit := s.module.modelStove.StoveSkillAddCustomer(uid)
+ left := limit - cus.Total
if left <= 0 {
- return comm.NewCustomError(pb.ErrorCode_SmithyCustomerLimit)
+ return nil, comm.NewCustomError(pb.ErrorCode_SmithyCustomerLimit)
}
cus.Customers = append(cus.Customers, &pb.CustomerInfo{
@@ -143,10 +143,10 @@ func (s *modelTrade) updateCustomer(uid string, customerId int32) error {
"lastRefreshTime": cus.LastRefreshTime,
}
if err := s.Change(uid, update); err != nil {
- return err
+ return nil, err
}
}
- return nil
+ return cus, nil
}
// 返回概率下的套装
@@ -166,8 +166,8 @@ func (s *modelTrade) GetSuitRandom(uid string) (suiteId int32) {
}
//获取玩家已有装备
ec, suites := s.module.ModuleEquipment.GetActionableSuit(uid)
- if ec!=pb.ErrorCode_Success {
- s.module.Error("获取玩家已有装备:", log.Field{Key:"code",Value: ec})
+ if ec != pb.ErrorCode_Success {
+ s.module.Error("获取玩家已有装备:", log.Field{Key: "code", Value: ec})
return
}
var ownerSuiteItems []*WeightItem
diff --git a/modules/user/model_expand.go b/modules/user/model_expand.go
index 9f4946e91..b4a31c128 100644
--- a/modules/user/model_expand.go
+++ b/modules/user/model_expand.go
@@ -29,7 +29,7 @@ func (this *ModelExpand) Init(service core.IService, module core.IModule, comp c
return
}
-//获取用户通过扩展表
+// 获取用户通过扩展表
func (this *ModelExpand) GetUserExpand(uid string) (result *pb.DBUserExpand, err error) {
result = &pb.DBUserExpand{}
if db.IsCross() {
@@ -45,12 +45,13 @@ func (this *ModelExpand) GetUserExpand(uid string) (result *pb.DBUserExpand, err
} else {
if err = this.Get(uid, result); err != nil && mongo.ErrNoDocuments != err {
this.module.Error("Get", log.Field{Key: "uid", Value: uid})
+ return result, err
}
}
return
}
-//修改用户扩展数据
+// 修改用户扩展数据
func (this *ModelExpand) ChangeUserExpand(uid string, value map[string]interface{}) (err error) {
if len(value) == 0 {
return nil
diff --git a/modules/worldtask/module.go b/modules/worldtask/module.go
index be20ef8e8..93a607e27 100644
--- a/modules/worldtask/module.go
+++ b/modules/worldtask/module.go
@@ -66,7 +66,7 @@ func (this *Worldtask) TaskcondNotify(session comm.IUserSession, condId int32) e
}
if len(finishedTaskIds) == 0 {
- this.Debug("没有匹配到任务世界任务", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "condId", Value: condId})
+ //this.Debug("没有匹配到任务世界任务", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "condId", Value: condId})
return nil
}
this.Debug("世界任务完成通知-查找到世界任务", log.Field{Key: "uid", Value: uid}, log.Field{Key: "condId", Value: condId}, log.Field{Key: "params", Value: finishedTaskIds})
diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index 7211d525a..955a6d789 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -95,6 +95,7 @@ const (
ErrorCode_FriendQiecuoNoRequest ErrorCode = 1119 //无切磋请求
ErrorCode_FriendQiecuoing ErrorCode = 1120 //好友切磋中
ErrorCode_FriendQiecuoTargetPk ErrorCode = 1121 //目标已经在战斗
+ ErrorCode_FriendTicketNoEnough ErrorCode = 1122 //挑战券
// item
ErrorCode_ItemsNoEnough ErrorCode = 1200 //背包物品不足
ErrorCode_ItemsNoFoundGird ErrorCode = 1201 //背包未找到物品格子
@@ -327,6 +328,10 @@ const (
ErrorCode_SmithyLackLava ErrorCode = 4107 // 缺少熔岩
ErrorCode_SmithyAtlasMaxLv ErrorCode = 4108 // 图鉴奖励满级
ErrorCode_SmithyAtlasLackLv ErrorCode = 4109 // 图鉴奖励等级不足
+ ErrorCode_SmithyTaskNoFinished ErrorCode = 4110 //图鉴任务未完成
+ ErrorCode_SmithyTaskReceived ErrorCode = 4111 //图鉴任务奖励已领
+ ErrorCode_SmithyNoFoundAtlas ErrorCode = 4112 // 没有找到图鉴数据
+ ErrorCode_SmithyNoActivateAtlas ErrorCode = 4113 // 没有图鉴更新数据
)
// Enum value maps for ErrorCode.
@@ -401,6 +406,7 @@ var (
1119: "FriendQiecuoNoRequest",
1120: "FriendQiecuoing",
1121: "FriendQiecuoTargetPk",
+ 1122: "FriendTicketNoEnough",
1200: "ItemsNoEnough",
1201: "ItemsNoFoundGird",
1202: "ItemsGridNumUpper",
@@ -604,6 +610,10 @@ var (
4107: "SmithyLackLava",
4108: "SmithyAtlasMaxLv",
4109: "SmithyAtlasLackLv",
+ 4110: "SmithyTaskNoFinished",
+ 4111: "SmithyTaskReceived",
+ 4112: "SmithyNoFoundAtlas",
+ 4113: "SmithyNoActivateAtlas",
}
ErrorCode_value = map[string]int32{
"Success": 0,
@@ -675,6 +685,7 @@ var (
"FriendQiecuoNoRequest": 1119,
"FriendQiecuoing": 1120,
"FriendQiecuoTargetPk": 1121,
+ "FriendTicketNoEnough": 1122,
"ItemsNoEnough": 1200,
"ItemsNoFoundGird": 1201,
"ItemsGridNumUpper": 1202,
@@ -878,6 +889,10 @@ var (
"SmithyLackLava": 4107,
"SmithyAtlasMaxLv": 4108,
"SmithyAtlasLackLv": 4109,
+ "SmithyTaskNoFinished": 4110,
+ "SmithyTaskReceived": 4111,
+ "SmithyNoFoundAtlas": 4112,
+ "SmithyNoActivateAtlas": 4113,
}
)
@@ -912,7 +927,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, 0xae, 0x31, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+ 0x6f, 0x2a, 0xb2, 0x32, 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,
@@ -1004,311 +1019,319 @@ var file_errorcode_proto_rawDesc = []byte{
0xdf, 0x08, 0x12, 0x14, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x51, 0x69, 0x65, 0x63,
0x75, 0x6f, 0x69, 0x6e, 0x67, 0x10, 0xe0, 0x08, 0x12, 0x19, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65,
0x6e, 0x64, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x50, 0x6b,
- 0x10, 0xe1, 0x08, 0x12, 0x12, 0x0a, 0x0d, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x6f, 0x45, 0x6e,
- 0x6f, 0x75, 0x67, 0x68, 0x10, 0xb0, 0x09, 0x12, 0x15, 0x0a, 0x10, 0x49, 0x74, 0x65, 0x6d, 0x73,
- 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x47, 0x69, 0x72, 0x64, 0x10, 0xb1, 0x09, 0x12, 0x16,
- 0x0a, 0x11, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x47, 0x72, 0x69, 0x64, 0x4e, 0x75, 0x6d, 0x55, 0x70,
- 0x70, 0x65, 0x72, 0x10, 0xb2, 0x09, 0x12, 0x19, 0x0a, 0x14, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x47,
- 0x69, 0x72, 0x64, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x55, 0x70, 0x70, 0x65, 0x72, 0x10, 0xb3,
- 0x09, 0x12, 0x19, 0x0a, 0x14, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x55, 0x73, 0x65, 0x4e, 0x6f, 0x74,
- 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x10, 0xb4, 0x09, 0x12, 0x16, 0x0a, 0x11,
- 0x49, 0x74, 0x65, 0x6d, 0x73, 0x55, 0x73, 0x65, 0x4e, 0x6f, 0x43, 0x61, 0x6e, 0x53, 0x65, 0x6c,
- 0x6c, 0x10, 0xb5, 0x09, 0x12, 0x19, 0x0a, 0x14, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x42, 0x75, 0x79,
- 0x50, 0x73, 0x55, 0x70, 0x70, 0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xb6, 0x09, 0x12,
- 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0x94,
- 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67,
- 0x68, 0x10, 0x95, 0x0a, 0x12, 0x0e, 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x4c,
- 0x76, 0x10, 0x96, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x6e, 0x69, 0x74,
- 0x43, 0x72, 0x65, 0x61, 0x74, 0x10, 0x97, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f,
- 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x45, 0x72, 0x72, 0x10, 0x98, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48,
- 0x65, 0x72, 0x6f, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x55, 0x70, 0x45, 0x72, 0x72, 0x10, 0x99, 0x0a,
- 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x52, 0x65, 0x73, 0x6f, 0x6e,
- 0x61, 0x74, 0x65, 0x10, 0x9a, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f,
- 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x10, 0x9b, 0x0a, 0x12, 0x18, 0x0a, 0x13, 0x48,
- 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x74, 0x4e, 0x65, 0x65, 0x64, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61,
- 0x74, 0x65, 0x10, 0x9c, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45,
- 0x6e, 0x65, 0x72, 0x67, 0x79, 0x10, 0x9d, 0x0a, 0x12, 0x0f, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f,
- 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x10, 0x9e, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72,
- 0x6f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x10, 0x9f, 0x0a, 0x12,
- 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e,
- 0x10, 0xa0, 0x0a, 0x12, 0x0f, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x73, 0x4c, 0x6f, 0x63,
- 0x6b, 0x10, 0xa1, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x43,
- 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xa2, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x43,
- 0x6f, 0x73, 0x74, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa3, 0x0a, 0x12, 0x10, 0x0a,
- 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x45, 0x72, 0x72, 0x10, 0xa4, 0x0a, 0x12,
- 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa5,
- 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x54, 0x79, 0x70, 0x65,
- 0x45, 0x72, 0x72, 0x10, 0xa6, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x64,
- 0x64, 0x4d, 0x61, 0x78, 0x45, 0x78, 0x70, 0x10, 0xa7, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65,
- 0x72, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0xa8, 0x0a, 0x12, 0x12,
- 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x53, 0x74, 0x61, 0x72, 0x4c, 0x76, 0x10,
- 0xa9, 0x0a, 0x12, 0x19, 0x0a, 0x14, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x54, 0x79,
- 0x70, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xaa, 0x0a, 0x12, 0x13, 0x0a,
- 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x10,
- 0xab, 0x0a, 0x12, 0x1c, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64,
- 0x79, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x10, 0xac, 0x0a,
- 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x76, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75,
- 0x67, 0x68, 0x10, 0xad, 0x0a, 0x12, 0x1e, 0x0a, 0x19, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65,
- 0x6e, 0x74, 0x4f, 0x6e, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65,
- 0x6e, 0x74, 0x10, 0xf8, 0x0a, 0x12, 0x1c, 0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65,
- 0x6e, 0x74, 0x4c, 0x76, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64,
- 0x10, 0xf9, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74,
- 0x49, 0x73, 0x57, 0x6f, 0x72, 0x6e, 0x10, 0xfa, 0x0a, 0x12, 0x17, 0x0a, 0x12, 0x45, 0x71, 0x75,
- 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4e, 0x6f, 0x43, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10,
- 0xfb, 0x0a, 0x12, 0x1b, 0x0a, 0x16, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x53,
- 0x75, 0x69, 0x74, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xfc, 0x0a, 0x12,
- 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x69,
- 0x6e, 0x64, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x10, 0xdc, 0x0b, 0x12, 0x15, 0x0a, 0x10,
- 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x44, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64,
- 0x10, 0xdd, 0x0b, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e,
- 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xde, 0x0b, 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61,
- 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e,
- 0x64, 0x10, 0xdf, 0x0b, 0x12, 0x19, 0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
- 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe0, 0x0b, 0x12,
- 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6c,
- 0x65, 0x74, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe1, 0x0b, 0x12, 0x19, 0x0a, 0x14,
- 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68,
- 0x53, 0x74, 0x61, 0x72, 0x10, 0xe2, 0x0b, 0x12, 0x0d, 0x0a, 0x08, 0x54, 0x61, 0x73, 0x6b, 0x49,
- 0x6e, 0x69, 0x74, 0x10, 0xc0, 0x0c, 0x12, 0x0e, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65,
- 0x73, 0x65, 0x74, 0x10, 0xc1, 0x0c, 0x12, 0x0f, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x48, 0x61,
- 0x6e, 0x64, 0x6c, 0x65, 0x10, 0xc2, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x52,
- 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xc3, 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61,
- 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc4, 0x0c, 0x12,
- 0x16, 0x0a, 0x11, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x66,
- 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xc5, 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x54, 0x61, 0x73, 0x6b, 0x41,
- 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x65, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xc6, 0x0c,
- 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68,
- 0x65, 0x64, 0x10, 0xc7, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e,
- 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xc8, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b,
- 0x54, 0x61, 0x67, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xc9, 0x0c, 0x12, 0x10, 0x0a, 0x0b, 0x54,
- 0x61, 0x73, 0x6b, 0x49, 0x64, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xca, 0x0c, 0x12, 0x11, 0x0a,
- 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xcb, 0x0c,
- 0x12, 0x17, 0x0a, 0x12, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x73, 0x53,
- 0x6f, 0x6c, 0x64, 0x4f, 0x75, 0x74, 0x10, 0xa4, 0x0d, 0x12, 0x1c, 0x0a, 0x17, 0x53, 0x68, 0x6f,
- 0x70, 0x4e, 0x6f, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73,
- 0x68, 0x4e, 0x75, 0x6d, 0x10, 0xa5, 0x0d, 0x12, 0x0c, 0x0a, 0x07, 0x4d, 0x61, 0x69, 0x6c, 0x45,
- 0x72, 0x72, 0x10, 0x88, 0x0e, 0x12, 0x13, 0x0a, 0x0e, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x4e,
- 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xec, 0x0e, 0x12, 0x12, 0x0a, 0x0d, 0x50, 0x61,
- 0x67, 0x6f, 0x64, 0x61, 0x4c, 0x65, 0x76, 0x6c, 0x45, 0x72, 0x72, 0x10, 0xed, 0x0e, 0x12, 0x17,
- 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72,
- 0x64, 0x45, 0x72, 0x72, 0x10, 0xee, 0x0e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64,
- 0x61, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x72, 0x72, 0x10, 0xef, 0x0e,
- 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x4e,
- 0x6f, 0x74, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd0, 0x0f, 0x12, 0x15, 0x0a,
- 0x10, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x49, 0x6e, 0x55, 0x73,
- 0x65, 0x10, 0xd1, 0x0f, 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68,
- 0x61, 0x6c, 0x6c, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd2, 0x0f, 0x12, 0x1a,
- 0x0a, 0x15, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x4e, 0x6f, 0x55,
- 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd3, 0x0f, 0x12, 0x19, 0x0a, 0x14, 0x47, 0x6f,
- 0x75, 0x72, 0x6d, 0x65, 0x74, 0x4d, 0x6f, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x69,
- 0x6d, 0x65, 0x10, 0xb5, 0x10, 0x12, 0x16, 0x0a, 0x11, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74,
- 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0xb6, 0x10, 0x12, 0x12, 0x0a,
- 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x99,
- 0x11, 0x12, 0x14, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69,
- 0x73, 0x68, 0x65, 0x64, 0x10, 0x9a, 0x11, 0x12, 0x11, 0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b,
- 0x4e, 0x6f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x10, 0x9b, 0x11, 0x12, 0x12, 0x0a, 0x0d, 0x52, 0x74,
- 0x61, 0x73, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x65, 0x64, 0x10, 0x9c, 0x11, 0x12, 0x15,
- 0x0a, 0x10, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69,
- 0x73, 0x68, 0x10, 0x9d, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f,
- 0x6e, 0x64, 0x69, 0x4e, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x68, 0x10, 0x9e, 0x11, 0x12, 0x13, 0x0a,
- 0x0e, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x4c, 0x61, 0x73, 0x74, 0x4f, 0x6e, 0x65, 0x10,
- 0x9f, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6e, 0x64, 0x69,
- 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xa0, 0x11, 0x12, 0x10, 0x0a, 0x0b, 0x56, 0x69,
- 0x6b, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0xfd, 0x11, 0x12, 0x13, 0x0a, 0x0e,
- 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0xfe,
- 0x11, 0x12, 0x16, 0x0a, 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x4d, 0x61,
- 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xff, 0x11, 0x12, 0x1c, 0x0a, 0x17, 0x56, 0x69, 0x6b,
- 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43,
- 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x80, 0x12, 0x12, 0x1a, 0x0a, 0x15, 0x4d, 0x6f, 0x6f, 0x6e, 0x66,
- 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x48, 0x61, 0x73, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64,
- 0x10, 0xe1, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61,
- 0x73, 0x79, 0x4a, 0x6f, 0x69, 0x6e, 0x55, 0x70, 0x10, 0xe2, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d,
- 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x44, 0x61, 0x72, 0x65, 0x55, 0x70,
- 0x10, 0xe3, 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61,
- 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xe4, 0x12,
- 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42,
- 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57, 0x69, 0x6e, 0x10, 0xe5, 0x12, 0x12, 0x16, 0x0a,
- 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4e, 0x6f, 0x4a, 0x6f,
- 0x69, 0x6e, 0x10, 0xe6, 0x12, 0x12, 0x20, 0x0a, 0x1b, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e,
- 0x74, 0x61, 0x73, 0x79, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x62, 0x61, 0x74,
- 0x74, 0x6c, 0x65, 0x73, 0x10, 0xe7, 0x12, 0x12, 0x18, 0x0a, 0x13, 0x42, 0x61, 0x74, 0x74, 0x6c,
- 0x65, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x10, 0xc5,
- 0x13, 0x12, 0x1a, 0x0a, 0x15, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61,
- 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xa9, 0x14, 0x12, 0x17, 0x0a,
- 0x12, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x4e, 0x6f, 0x52, 0x65, 0x63, 0x65,
- 0x69, 0x76, 0x65, 0x10, 0xaa, 0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74,
- 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x45,
- 0x6e, 0x74, 0x65, 0x72, 0x10, 0xab, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x4c, 0x69, 0x6e, 0x65, 0x73,
- 0x74, 0x6f, 0x72, 0x79, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x4f, 0x70, 0x65,
- 0x6e, 0x10, 0xac, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72,
- 0x79, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10, 0xad,
- 0x14, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72,
- 0x72, 0x10, 0x8d, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42,
- 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0x8e, 0x15, 0x12, 0x17, 0x0a, 0x12, 0x48, 0x75,
- 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74,
- 0x10, 0x8f, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4d, 0x61,
+ 0x10, 0xe1, 0x08, 0x12, 0x19, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x69, 0x63,
+ 0x6b, 0x65, 0x74, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xe2, 0x08, 0x12, 0x12,
+ 0x0a, 0x0d, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10,
+ 0xb0, 0x09, 0x12, 0x15, 0x0a, 0x10, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x6f, 0x46, 0x6f, 0x75,
+ 0x6e, 0x64, 0x47, 0x69, 0x72, 0x64, 0x10, 0xb1, 0x09, 0x12, 0x16, 0x0a, 0x11, 0x49, 0x74, 0x65,
+ 0x6d, 0x73, 0x47, 0x72, 0x69, 0x64, 0x4e, 0x75, 0x6d, 0x55, 0x70, 0x70, 0x65, 0x72, 0x10, 0xb2,
+ 0x09, 0x12, 0x19, 0x0a, 0x14, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x47, 0x69, 0x72, 0x64, 0x41, 0x6d,
+ 0x6f, 0x75, 0x6e, 0x74, 0x55, 0x70, 0x70, 0x65, 0x72, 0x10, 0xb3, 0x09, 0x12, 0x19, 0x0a, 0x14,
+ 0x49, 0x74, 0x65, 0x6d, 0x73, 0x55, 0x73, 0x65, 0x4e, 0x6f, 0x74, 0x53, 0x75, 0x70, 0x70, 0x6f,
+ 0x72, 0x74, 0x65, 0x64, 0x10, 0xb4, 0x09, 0x12, 0x16, 0x0a, 0x11, 0x49, 0x74, 0x65, 0x6d, 0x73,
+ 0x55, 0x73, 0x65, 0x4e, 0x6f, 0x43, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10, 0xb5, 0x09, 0x12,
+ 0x19, 0x0a, 0x14, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x42, 0x75, 0x79, 0x50, 0x73, 0x55, 0x70, 0x70,
+ 0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xb6, 0x09, 0x12, 0x10, 0x0a, 0x0b, 0x48, 0x65,
+ 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0x94, 0x0a, 0x12, 0x11, 0x0a, 0x0c,
+ 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x95, 0x0a, 0x12,
+ 0x0e, 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0x96, 0x0a, 0x12,
+ 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x6e, 0x69, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74,
+ 0x10, 0x97, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x6c, 0x6f, 0x72,
+ 0x45, 0x72, 0x72, 0x10, 0x98, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x6b,
+ 0x69, 0x6c, 0x6c, 0x55, 0x70, 0x45, 0x72, 0x72, 0x10, 0x99, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48,
+ 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x10, 0x9a,
+ 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e,
+ 0x61, 0x74, 0x65, 0x10, 0x9b, 0x0a, 0x12, 0x18, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f,
+ 0x74, 0x4e, 0x65, 0x65, 0x64, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x10, 0x9c, 0x0a,
+ 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79,
+ 0x10, 0x9d, 0x0a, 0x12, 0x0f, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x72, 0x65, 0x61, 0x74,
+ 0x65, 0x10, 0x9e, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x71, 0x75, 0x69,
+ 0x70, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x10, 0x9f, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65,
+ 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x10, 0xa0, 0x0a, 0x12, 0x0f,
+ 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x73, 0x4c, 0x6f, 0x63, 0x6b, 0x10, 0xa1, 0x0a, 0x12,
+ 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10,
+ 0xa2, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x79,
+ 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa3, 0x0a, 0x12, 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f,
+ 0x53, 0x74, 0x61, 0x72, 0x45, 0x72, 0x72, 0x10, 0xa4, 0x0a, 0x12, 0x10, 0x0a, 0x0b, 0x48, 0x65,
+ 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa5, 0x0a, 0x12, 0x13, 0x0a, 0x0e,
+ 0x48, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa6,
+ 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x64, 0x64, 0x4d, 0x61, 0x78, 0x45,
+ 0x78, 0x70, 0x10, 0xa7, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x61,
+ 0x72, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0xa8, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72,
+ 0x6f, 0x4d, 0x61, 0x78, 0x53, 0x74, 0x61, 0x72, 0x4c, 0x76, 0x10, 0xa9, 0x0a, 0x12, 0x19, 0x0a,
+ 0x14, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x6f, 0x74,
+ 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xaa, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f,
+ 0x4d, 0x61, 0x78, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x10, 0xab, 0x0a, 0x12, 0x1c, 0x0a,
+ 0x17, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x4b, 0x6f, 0x6e, 0x67,
+ 0x46, 0x75, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x10, 0xac, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48,
+ 0x65, 0x72, 0x6f, 0x4c, 0x76, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xad, 0x0a,
+ 0x12, 0x1e, 0x0a, 0x19, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x6e, 0x46,
+ 0x6f, 0x75, 0x6e, 0x64, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0xf8, 0x0a,
+ 0x12, 0x1c, 0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4c, 0x76, 0x6c,
+ 0x69, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xf9, 0x0a, 0x12, 0x14,
+ 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x73, 0x57, 0x6f, 0x72,
+ 0x6e, 0x10, 0xfa, 0x0a, 0x12, 0x17, 0x0a, 0x12, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e,
+ 0x74, 0x4e, 0x6f, 0x43, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10, 0xfb, 0x0a, 0x12, 0x1b, 0x0a,
+ 0x16, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x75, 0x69, 0x74, 0x65, 0x4e,
+ 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xfc, 0x0a, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61,
+ 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61,
+ 0x70, 0x74, 0x65, 0x72, 0x10, 0xdc, 0x0b, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c,
+ 0x69, 0x6e, 0x65, 0x49, 0x44, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xdd, 0x0b, 0x12, 0x15,
+ 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75,
+ 0x6e, 0x64, 0x10, 0xde, 0x0b, 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e,
+ 0x65, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xdf, 0x0b, 0x12,
+ 0x19, 0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x70, 0x65, 0x61,
+ 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe0, 0x0b, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61,
+ 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65,
+ 0x77, 0x61, 0x72, 0x64, 0x10, 0xe1, 0x0b, 0x12, 0x19, 0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c,
+ 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x53, 0x74, 0x61, 0x72, 0x10,
+ 0xe2, 0x0b, 0x12, 0x0d, 0x0a, 0x08, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc0,
+ 0x0c, 0x12, 0x0e, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x65, 0x74, 0x10, 0xc1,
+ 0x0c, 0x12, 0x0f, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x10,
+ 0xc2, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76,
+ 0x65, 0x64, 0x10, 0xc3, 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74,
+ 0x69, 0x76, 0x65, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc4, 0x0c, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61,
+ 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x10,
+ 0xc5, 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65,
+ 0x4e, 0x6f, 0x65, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xc6, 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54,
+ 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xc7, 0x0c,
+ 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64,
+ 0x10, 0xc8, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x61, 0x67, 0x45, 0x6d,
+ 0x70, 0x74, 0x79, 0x10, 0xc9, 0x0c, 0x12, 0x10, 0x0a, 0x0b, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64,
+ 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xca, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b,
+ 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xcb, 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x53,
+ 0x68, 0x6f, 0x70, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x73, 0x53, 0x6f, 0x6c, 0x64, 0x4f, 0x75,
+ 0x74, 0x10, 0xa4, 0x0d, 0x12, 0x1c, 0x0a, 0x17, 0x53, 0x68, 0x6f, 0x70, 0x4e, 0x6f, 0x53, 0x75,
+ 0x72, 0x70, 0x6c, 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x10,
+ 0xa5, 0x0d, 0x12, 0x0c, 0x0a, 0x07, 0x4d, 0x61, 0x69, 0x6c, 0x45, 0x72, 0x72, 0x10, 0x88, 0x0e,
+ 0x12, 0x13, 0x0a, 0x0e, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75,
+ 0x6e, 0x64, 0x10, 0xec, 0x0e, 0x12, 0x12, 0x0a, 0x0d, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x4c,
+ 0x65, 0x76, 0x6c, 0x45, 0x72, 0x72, 0x10, 0xed, 0x0e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x67,
+ 0x6f, 0x64, 0x61, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x72, 0x72, 0x10,
+ 0xee, 0x0e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x43, 0x6f, 0x6e, 0x64,
+ 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x72, 0x72, 0x10, 0xef, 0x0e, 0x12, 0x1b, 0x0a, 0x16, 0x4d,
+ 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x4e, 0x6f, 0x74, 0x55, 0x6e, 0x6c,
+ 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd0, 0x0f, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x72, 0x74,
+ 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x49, 0x6e, 0x55, 0x73, 0x65, 0x10, 0xd1, 0x0f, 0x12,
+ 0x18, 0x0a, 0x13, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x55, 0x6e,
+ 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd2, 0x0f, 0x12, 0x1a, 0x0a, 0x15, 0x4d, 0x61, 0x72,
+ 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x4e, 0x6f, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b,
+ 0x65, 0x64, 0x10, 0xd3, 0x0f, 0x12, 0x19, 0x0a, 0x14, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74,
+ 0x4d, 0x6f, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xb5, 0x10,
+ 0x12, 0x16, 0x0a, 0x11, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c,
+ 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0xb6, 0x10, 0x12, 0x12, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73,
+ 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x99, 0x11, 0x12, 0x14, 0x0a, 0x0f,
+ 0x52, 0x74, 0x61, 0x73, 0x6b, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10,
+ 0x9a, 0x11, 0x12, 0x11, 0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x52, 0x74, 0x61,
+ 0x73, 0x6b, 0x10, 0x9b, 0x11, 0x12, 0x12, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65,
+ 0x77, 0x61, 0x72, 0x64, 0x65, 0x64, 0x10, 0x9c, 0x11, 0x12, 0x15, 0x0a, 0x10, 0x52, 0x74, 0x61,
+ 0x73, 0x6b, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0x9d, 0x11,
+ 0x12, 0x16, 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x4e, 0x6f,
+ 0x52, 0x65, 0x61, 0x63, 0x68, 0x10, 0x9e, 0x11, 0x12, 0x13, 0x0a, 0x0e, 0x52, 0x74, 0x61, 0x73,
+ 0x6b, 0x4e, 0x6f, 0x4c, 0x61, 0x73, 0x74, 0x4f, 0x6e, 0x65, 0x10, 0x9f, 0x11, 0x12, 0x16, 0x0a,
+ 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x4e, 0x6f, 0x46, 0x6f, 0x75,
+ 0x6e, 0x64, 0x10, 0xa0, 0x11, 0x12, 0x10, 0x0a, 0x0b, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x4c,
+ 0x76, 0x45, 0x72, 0x72, 0x10, 0xfd, 0x11, 0x12, 0x13, 0x0a, 0x0e, 0x56, 0x69, 0x6b, 0x69, 0x6e,
+ 0x67, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0xfe, 0x11, 0x12, 0x16, 0x0a, 0x11,
+ 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e,
+ 0x74, 0x10, 0xff, 0x11, 0x12, 0x1c, 0x0a, 0x17, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x4d, 0x61,
0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10,
- 0x90, 0x15, 0x12, 0x1c, 0x0a, 0x17, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4e, 0x6f, 0x43,
- 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x91, 0x15,
- 0x12, 0x11, 0x0a, 0x0c, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x4c, 0x76, 0x45, 0x72, 0x72,
- 0x10, 0x97, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x42, 0x6f,
- 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0x98, 0x15, 0x12, 0x17, 0x0a, 0x12, 0x45, 0x6e, 0x63,
- 0x68, 0x61, 0x6e, 0x74, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10,
- 0x99, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x4d, 0x61, 0x78,
- 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x9a,
- 0x15, 0x12, 0x1c, 0x0a, 0x17, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x4e, 0x6f, 0x43, 0x68,
- 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x9b, 0x15, 0x12,
- 0x11, 0x0a, 0x0c, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10,
- 0xf1, 0x15, 0x12, 0x12, 0x0a, 0x0d, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4e, 0x6f, 0x44,
- 0x61, 0x74, 0x61, 0x10, 0xf2, 0x15, 0x12, 0x16, 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72,
- 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xf3, 0x15, 0x12, 0x12,
- 0x0a, 0x0d, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10,
- 0xf4, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52,
- 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xf5, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x4c, 0x69, 0x62, 0x72,
- 0x61, 0x72, 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46,
- 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xf6, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x4c, 0x69, 0x62, 0x72, 0x61,
- 0x72, 0x79, 0x50, 0x72, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73,
- 0x68, 0x65, 0x64, 0x10, 0xf7, 0x15, 0x12, 0x1b, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
- 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64,
- 0x10, 0xd5, 0x16, 0x12, 0x10, 0x0a, 0x0b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57,
- 0x69, 0x6e, 0x10, 0xd6, 0x16, 0x12, 0x17, 0x0a, 0x12, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43,
- 0x72, 0x65, 0x61, 0x74, 0x65, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd7, 0x16, 0x12, 0x16,
- 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x46, 0x61, 0x69,
- 0x6c, 0x65, 0x64, 0x10, 0xd8, 0x16, 0x12, 0x12, 0x0a, 0x0d, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
- 0x55, 0x73, 0x65, 0x72, 0x4f, 0x66, 0x66, 0x10, 0xd9, 0x16, 0x12, 0x1e, 0x0a, 0x19, 0x42, 0x61,
- 0x74, 0x74, 0x6c, 0x65, 0x43, 0x61, 0x70, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x43, 0x68, 0x65, 0x63,
- 0x6b, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xda, 0x16, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f,
- 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xb8, 0x17, 0x12,
- 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10,
- 0xb9, 0x17, 0x12, 0x1b, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x61,
- 0x6d, 0x6f, 0x6e, 0x64, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xba, 0x17, 0x12,
- 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x4d, 0x65, 0x6d, 0x62,
- 0x65, 0x72, 0x10, 0xbb, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
- 0x4e, 0x6f, 0x52, 0x69, 0x67, 0x68, 0x74, 0x10, 0xbc, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f,
- 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, 0xbd, 0x17, 0x12,
- 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73,
- 0x73, 0x10, 0xbe, 0x17, 0x12, 0x10, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x51,
- 0x75, 0x69, 0x74, 0x10, 0xbf, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
- 0x79, 0x41, 0x67, 0x72, 0x65, 0x65, 0x10, 0xc0, 0x17, 0x12, 0x12, 0x0a, 0x0d, 0x53, 0x6f, 0x63,
- 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x10, 0xc1, 0x17, 0x12, 0x16, 0x0a,
- 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x50, 0x61, 0x72, 0x61, 0x6d,
- 0x73, 0x10, 0xba, 0xea, 0x01, 0x12, 0x19, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
- 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x44, 0x69, 0x73, 0x73, 0x10, 0xbb, 0xea, 0x01,
- 0x12, 0x17, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69,
- 0x6e, 0x67, 0x4a, 0x6f, 0x62, 0x10, 0xbc, 0xea, 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63,
- 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xbd, 0xea, 0x01, 0x12,
- 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x75,
- 0x73, 0x65, 0x10, 0xbe, 0xea, 0x01, 0x12, 0x11, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
- 0x79, 0x53, 0x69, 0x67, 0x6e, 0x10, 0xbf, 0xea, 0x01, 0x12, 0x13, 0x0a, 0x0d, 0x53, 0x6f, 0x63,
- 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x10, 0xc0, 0xea, 0x01, 0x12, 0x14,
- 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x44, 0x4c, 0x69, 0x6d, 0x69, 0x74,
- 0x10, 0xc1, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41,
- 0x70, 0x70, 0x6c, 0x79, 0x4d, 0x61, 0x78, 0x10, 0xc2, 0xea, 0x01, 0x12, 0x18, 0x0a, 0x12, 0x53,
- 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x6c, 0x66, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e,
- 0x67, 0x10, 0xc3, 0xea, 0x01, 0x12, 0x1d, 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
- 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x4c, 0x69, 0x6d, 0x69, 0x74,
- 0x10, 0xc4, 0xea, 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52,
- 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xc5, 0xea,
- 0x01, 0x12, 0x1a, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x77, 0x61,
- 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xc6, 0xea, 0x01, 0x12, 0x15, 0x0a,
- 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
- 0x10, 0xc7, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42,
- 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x54, 0x6f, 0x10, 0xc9, 0xea, 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53,
- 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x65, 0x64, 0x10, 0xca, 0xea,
- 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x79,
- 0x4c, 0x76, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xcb, 0xea, 0x01, 0x12, 0x1b,
- 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x56, 0x61, 0x6c,
- 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xcc, 0xea, 0x01, 0x12, 0x1d, 0x0a, 0x17, 0x53,
- 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4e, 0x6f,
- 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xcd, 0xea, 0x01, 0x12, 0x1c, 0x0a, 0x16, 0x53, 0x6f,
- 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x69, 0x74, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63,
- 0x65, 0x69, 0x76, 0x65, 0x10, 0xce, 0xea, 0x01, 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69,
- 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x65, 0x64, 0x10, 0xcf, 0xea, 0x01,
- 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x45,
- 0x78, 0x69, 0x73, 0x74, 0x10, 0xd0, 0xea, 0x01, 0x12, 0x1a, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69,
- 0x61, 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, 0x4e, 0x6f, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64,
- 0x10, 0xd1, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e,
- 0x6f, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x10, 0xd2, 0xea, 0x01, 0x12, 0x18, 0x0a, 0x12, 0x53,
- 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f,
- 0x6e, 0x10, 0xd3, 0xea, 0x01, 0x12, 0x1c, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
- 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10,
- 0xd4, 0xea, 0x01, 0x12, 0x19, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x70,
- 0x6f, 0x72, 0x74, 0x73, 0x4e, 0x6f, 0x69, 0x6e, 0x69, 0x74, 0x10, 0xd5, 0xea, 0x01, 0x12, 0x16,
- 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x45,
- 0x6e, 0x64, 0x10, 0xd6, 0xea, 0x01, 0x12, 0x17, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
- 0x79, 0x54, 0x65, 0x61, 0x6d, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0xd7, 0xea, 0x01, 0x12,
- 0x18, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f,
- 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xd8, 0xea, 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63,
- 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68,
- 0x65, 0x64, 0x10, 0xd9, 0xea, 0x01, 0x12, 0x19, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
- 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xda, 0xea,
- 0x01, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74,
- 0x42, 0x75, 0x79, 0x55, 0x70, 0x10, 0x9d, 0x18, 0x12, 0x19, 0x0a, 0x14, 0x41, 0x72, 0x65, 0x6e,
- 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68,
- 0x10, 0x9e, 0x18, 0x12, 0x17, 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b,
- 0x65, 0x74, 0x4e, 0x70, 0x63, 0x49, 0x6e, 0x43, 0x64, 0x10, 0x9f, 0x18, 0x12, 0x16, 0x0a, 0x11,
- 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x4c, 0x65, 0x61, 0x72,
- 0x6e, 0x10, 0x81, 0x19, 0x12, 0x12, 0x0a, 0x0d, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x72,
- 0x72, 0x44, 0x61, 0x74, 0x61, 0x10, 0x82, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x54, 0x61, 0x6c, 0x65,
- 0x6e, 0x74, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65,
- 0x10, 0x83, 0x19, 0x12, 0x15, 0x0a, 0x10, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73,
- 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x10, 0x84, 0x19, 0x12, 0x10, 0x0a, 0x0b, 0x54, 0x72,
- 0x6f, 0x6c, 0x6c, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x10, 0xe5, 0x19, 0x12, 0x11, 0x0a, 0x0c,
- 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x53, 0x65, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x10, 0xe6, 0x19, 0x12,
- 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x6c, 0x6c, 0x43,
- 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe7, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c,
- 0x4d, 0x61, 0x78, 0x49, 0x74, 0x65, 0x6d, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe8, 0x19, 0x12,
- 0x18, 0x0a, 0x13, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64,
- 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe9, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72,
- 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x4e, 0x6f, 0x74, 0x54, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x4f,
- 0x6e, 0x10, 0xc9, 0x1a, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70,
- 0x65, 0x52, 0x65, 0x73, 0x74, 0x43, 0x44, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xca, 0x1a, 0x12,
- 0x16, 0x0a, 0x11, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x4e, 0x6f, 0x74, 0x46,
- 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xad, 0x1b, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x72, 0x69, 0x76, 0x69,
- 0x6c, 0x65, 0x67, 0x65, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xae, 0x1b,
- 0x12, 0x0f, 0x0a, 0x0a, 0x56, 0x69, 0x70, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xaf,
- 0x1b, 0x12, 0x11, 0x0a, 0x0c, 0x56, 0x69, 0x70, 0x47, 0x69, 0x66, 0x74, 0x45, 0x72, 0x72, 0x6f,
- 0x72, 0x10, 0xb0, 0x1b, 0x12, 0x11, 0x0a, 0x0c, 0x56, 0x69, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65,
- 0x70, 0x65, 0x61, 0x74, 0x10, 0xb1, 0x1b, 0x12, 0x14, 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x77, 0x74,
- 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x91, 0x1c, 0x12, 0x17, 0x0a,
- 0x12, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x64, 0x76, 0x52, 0x65, 0x63, 0x65,
- 0x69, 0x76, 0x65, 0x10, 0x92, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x79, 0x42, 0x75, 0x79,
- 0x4e, 0x75, 0x6d, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf5, 0x1c, 0x12,
- 0x14, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x45,
- 0x72, 0x72, 0x10, 0xf6, 0x1c, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65,
- 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x10, 0xf7, 0x1c, 0x12, 0x14, 0x0a,
- 0x0f, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68,
- 0x10, 0xd9, 0x1d, 0x12, 0x19, 0x0a, 0x14, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b,
- 0x4c, 0x76, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xda, 0x1d, 0x12, 0x16,
- 0x0a, 0x11, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x41, 0x63, 0x63,
- 0x65, 0x70, 0x74, 0x10, 0xdb, 0x1d, 0x12, 0x18, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74,
- 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10, 0xdc, 0x1d,
- 0x12, 0x15, 0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e,
- 0x69, 0x68, 0x65, 0x64, 0x10, 0xdd, 0x1d, 0x12, 0x1c, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c, 0x64,
- 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x61, 0x73, 0x74, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68,
- 0x65, 0x64, 0x10, 0xde, 0x1d, 0x12, 0x1b, 0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61,
- 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x4e, 0x6f, 0x73, 0x61, 0x6d, 0x65, 0x10,
- 0xdf, 0x1d, 0x12, 0x1e, 0x0a, 0x19, 0x41, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x54, 0x61, 0x73,
- 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 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, 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,
- 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x4d,
- 0x61, 0x78, 0x4c, 0x76, 0x10, 0x87, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68,
- 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0x88,
- 0x20, 0x12, 0x20, 0x0a, 0x1b, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f,
- 0x6d, 0x65, 0x72, 0x45, 0x71, 0x75, 0x69, 0x70, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68,
- 0x10, 0x89, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4d, 0x61, 0x78,
- 0x54, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x10, 0x8a, 0x20, 0x12, 0x13,
- 0x0a, 0x0e, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x61, 0x63, 0x6b, 0x4c, 0x61, 0x76, 0x61,
- 0x10, 0x8b, 0x20, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c,
- 0x61, 0x73, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0x8c, 0x20, 0x12, 0x16, 0x0a, 0x11, 0x53, 0x6d,
- 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4c, 0x61, 0x63, 0x6b, 0x4c, 0x76, 0x10,
- 0x8d, 0x20, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
- 0x6f, 0x33,
+ 0x80, 0x12, 0x12, 0x1a, 0x0a, 0x15, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73,
+ 0x79, 0x48, 0x61, 0x73, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x10, 0xe1, 0x12, 0x12, 0x16,
+ 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4a, 0x6f, 0x69,
+ 0x6e, 0x55, 0x70, 0x10, 0xe2, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61,
+ 0x6e, 0x74, 0x61, 0x73, 0x79, 0x44, 0x61, 0x72, 0x65, 0x55, 0x70, 0x10, 0xe3, 0x12, 0x12, 0x1b,
+ 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74,
+ 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xe4, 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d,
+ 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
+ 0x4e, 0x6f, 0x57, 0x69, 0x6e, 0x10, 0xe5, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e,
+ 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4e, 0x6f, 0x4a, 0x6f, 0x69, 0x6e, 0x10, 0xe6, 0x12,
+ 0x12, 0x20, 0x0a, 0x1b, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4e,
+ 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x73, 0x10,
+ 0xe7, 0x12, 0x12, 0x18, 0x0a, 0x13, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x46, 0x6f,
+ 0x75, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x10, 0xc5, 0x13, 0x12, 0x1a, 0x0a, 0x15,
+ 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e,
+ 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xa9, 0x14, 0x12, 0x17, 0x0a, 0x12, 0x4c, 0x69, 0x6e, 0x65,
+ 0x73, 0x74, 0x6f, 0x72, 0x79, 0x4e, 0x6f, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xaa,
+ 0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61,
+ 0x73, 0x6b, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x10,
+ 0xab, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x43,
+ 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x4f, 0x70, 0x65, 0x6e, 0x10, 0xac, 0x14, 0x12,
+ 0x1b, 0x0a, 0x16, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x50, 0x72, 0x65, 0x4e,
+ 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10, 0xad, 0x14, 0x12, 0x11, 0x0a, 0x0c,
+ 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0x8d, 0x15, 0x12,
+ 0x14, 0x0a, 0x0f, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79,
+ 0x70, 0x65, 0x10, 0x8e, 0x15, 0x12, 0x17, 0x0a, 0x12, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67,
+ 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x8f, 0x15, 0x12, 0x1d,
+ 0x0a, 0x18, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c,
+ 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x90, 0x15, 0x12, 0x1c, 0x0a,
+ 0x17, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4e, 0x6f, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65,
+ 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x91, 0x15, 0x12, 0x11, 0x0a, 0x0c, 0x45,
+ 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0x97, 0x15, 0x12, 0x14,
+ 0x0a, 0x0f, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70,
+ 0x65, 0x10, 0x98, 0x15, 0x12, 0x17, 0x0a, 0x12, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x42,
+ 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x99, 0x15, 0x12, 0x1d, 0x0a,
+ 0x18, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c,
+ 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x9a, 0x15, 0x12, 0x1c, 0x0a, 0x17,
+ 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x4e, 0x6f, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e,
+ 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x9b, 0x15, 0x12, 0x11, 0x0a, 0x0c, 0x4c, 0x69,
+ 0x62, 0x72, 0x61, 0x72, 0x79, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0xf1, 0x15, 0x12, 0x12, 0x0a,
+ 0x0d, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xf2,
+ 0x15, 0x12, 0x16, 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x41, 0x63, 0x74, 0x69,
+ 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xf3, 0x15, 0x12, 0x12, 0x0a, 0x0d, 0x4c, 0x69, 0x62,
+ 0x72, 0x61, 0x72, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xf4, 0x15, 0x12, 0x14, 0x0a,
+ 0x0f, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64,
+ 0x10, 0xf5, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65,
+ 0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10,
+ 0xf6, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x50, 0x72, 0x65,
+ 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xf7,
+ 0x15, 0x12, 0x1b, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64,
+ 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd5, 0x16, 0x12, 0x10,
+ 0x0a, 0x0b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57, 0x69, 0x6e, 0x10, 0xd6, 0x16,
+ 0x12, 0x17, 0x0a, 0x12, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
+ 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd7, 0x16, 0x12, 0x16, 0x0a, 0x11, 0x42, 0x61, 0x74,
+ 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd8,
+ 0x16, 0x12, 0x12, 0x0a, 0x0d, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x55, 0x73, 0x65, 0x72, 0x4f,
+ 0x66, 0x66, 0x10, 0xd9, 0x16, 0x12, 0x1e, 0x0a, 0x19, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43,
+ 0x61, 0x70, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x46, 0x61, 0x69, 0x6c,
+ 0x65, 0x64, 0x10, 0xda, 0x16, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+ 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xb8, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f,
+ 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, 0xb9, 0x17, 0x12, 0x1b, 0x0a,
+ 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4e,
+ 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xba, 0x17, 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x6f,
+ 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0xbb, 0x17,
+ 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x52, 0x69, 0x67,
+ 0x68, 0x74, 0x10, 0xbc, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+ 0x4e, 0x6f, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, 0xbd, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f,
+ 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x10, 0xbe, 0x17, 0x12,
+ 0x10, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, 0x10, 0xbf,
+ 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x67, 0x72, 0x65,
+ 0x65, 0x10, 0xc0, 0x17, 0x12, 0x12, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52,
+ 0x65, 0x66, 0x75, 0x73, 0x65, 0x10, 0xc1, 0x17, 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69,
+ 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x10, 0xba, 0xea, 0x01,
+ 0x12, 0x19, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x61, 0x73, 0x74, 0x65,
+ 0x72, 0x4e, 0x6f, 0x44, 0x69, 0x73, 0x73, 0x10, 0xbb, 0xea, 0x01, 0x12, 0x17, 0x0a, 0x11, 0x53,
+ 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x4a, 0x6f, 0x62,
+ 0x10, 0xbc, 0xea, 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53,
+ 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xbd, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f,
+ 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x75, 0x73, 0x65, 0x10, 0xbe, 0xea,
+ 0x01, 0x12, 0x11, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e,
+ 0x10, 0xbf, 0xea, 0x01, 0x12, 0x13, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53,
+ 0x69, 0x67, 0x6e, 0x65, 0x64, 0x10, 0xc0, 0xea, 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63,
+ 0x69, 0x61, 0x74, 0x79, 0x43, 0x44, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xc1, 0xea, 0x01, 0x12,
+ 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4d,
+ 0x61, 0x78, 0x10, 0xc2, 0xea, 0x01, 0x12, 0x18, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
+ 0x79, 0x53, 0x65, 0x6c, 0x66, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xc3, 0xea, 0x01,
+ 0x12, 0x1d, 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65,
+ 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xc4, 0xea, 0x01, 0x12,
+ 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64,
+ 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xc5, 0xea, 0x01, 0x12, 0x1a, 0x0a, 0x14,
+ 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63,
+ 0x65, 0x69, 0x76, 0x65, 0x10, 0xc6, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69,
+ 0x61, 0x74, 0x79, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x10, 0xc7, 0xea, 0x01, 0x12,
+ 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x65, 0x6c, 0x6f, 0x6e, 0x67,
+ 0x54, 0x6f, 0x10, 0xc9, 0xea, 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
+ 0x79, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x65, 0x64, 0x10, 0xca, 0xea, 0x01, 0x12, 0x1b, 0x0a, 0x15,
+ 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x79, 0x4c, 0x76, 0x4e, 0x6f, 0x45,
+ 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xcb, 0xea, 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63,
+ 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69,
+ 0x6f, 0x6e, 0x10, 0xcc, 0xea, 0x01, 0x12, 0x1d, 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
+ 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67,
+ 0x68, 0x10, 0xcd, 0xea, 0x01, 0x12, 0x1c, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+ 0x41, 0x63, 0x69, 0x74, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10,
+ 0xce, 0xea, 0x01, 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69,
+ 0x73, 0x6d, 0x69, 0x73, 0x73, 0x65, 0x64, 0x10, 0xcf, 0xea, 0x01, 0x12, 0x16, 0x0a, 0x10, 0x53,
+ 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10,
+ 0xd0, 0xea, 0x01, 0x12, 0x1a, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, 0x75,
+ 0x69, 0x74, 0x4e, 0x6f, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x10, 0xd1, 0xea, 0x01, 0x12,
+ 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x4d, 0x61, 0x73, 0x74,
+ 0x65, 0x72, 0x10, 0xd2, 0xea, 0x01, 0x12, 0x18, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
+ 0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xd3, 0xea, 0x01,
+ 0x12, 0x1c, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x69, 0x63, 0x6b, 0x65,
+ 0x74, 0x73, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xd4, 0xea, 0x01, 0x12, 0x19,
+ 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x4e,
+ 0x6f, 0x69, 0x6e, 0x69, 0x74, 0x10, 0xd5, 0xea, 0x01, 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63,
+ 0x69, 0x61, 0x74, 0x79, 0x53, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x45, 0x6e, 0x64, 0x10, 0xd6, 0xea,
+ 0x01, 0x12, 0x17, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x65, 0x61, 0x6d,
+ 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0xd7, 0xea, 0x01, 0x12, 0x18, 0x0a, 0x12, 0x53, 0x6f,
+ 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64,
+ 0x10, 0xd8, 0xea, 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54,
+ 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xd9, 0xea,
+ 0x01, 0x12, 0x19, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b,
+ 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xda, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x10,
+ 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, 0x55, 0x70,
+ 0x10, 0x9d, 0x18, 0x12, 0x19, 0x0a, 0x14, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b,
+ 0x65, 0x74, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x9e, 0x18, 0x12, 0x17,
+ 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x70, 0x63,
+ 0x49, 0x6e, 0x43, 0x64, 0x10, 0x9f, 0x18, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x6c, 0x65, 0x6e,
+ 0x74, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10, 0x81, 0x19, 0x12,
+ 0x12, 0x0a, 0x0d, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x72, 0x72, 0x44, 0x61, 0x74, 0x61,
+ 0x10, 0x82, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x4c,
+ 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x10, 0x83, 0x19, 0x12, 0x15,
+ 0x0a, 0x10, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x53, 0x74, 0x61,
+ 0x74, 0x65, 0x10, 0x84, 0x19, 0x12, 0x10, 0x0a, 0x0b, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x42, 0x75,
+ 0x79, 0x4d, 0x61, 0x78, 0x10, 0xe5, 0x19, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x72, 0x6f, 0x6c, 0x6c,
+ 0x53, 0x65, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x10, 0xe6, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72,
+ 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x6c, 0x6c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10,
+ 0xe7, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x49, 0x74,
+ 0x65, 0x6d, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe8, 0x19, 0x12, 0x18, 0x0a, 0x13, 0x54, 0x72,
+ 0x6f, 0x6c, 0x6c, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x77, 0x61, 0x72,
+ 0x64, 0x10, 0xe9, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70,
+ 0x65, 0x4e, 0x6f, 0x74, 0x54, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x4f, 0x6e, 0x10, 0xc9, 0x1a, 0x12,
+ 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x52, 0x65, 0x73, 0x74,
+ 0x43, 0x44, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xca, 0x1a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x72,
+ 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10,
+ 0xad, 0x1b, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52,
+ 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xae, 0x1b, 0x12, 0x0f, 0x0a, 0x0a, 0x56,
+ 0x69, 0x70, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xaf, 0x1b, 0x12, 0x11, 0x0a, 0x0c,
+ 0x56, 0x69, 0x70, 0x47, 0x69, 0x66, 0x74, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xb0, 0x1b, 0x12,
+ 0x11, 0x0a, 0x0c, 0x56, 0x69, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x10,
+ 0xb1, 0x1b, 0x12, 0x14, 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65,
+ 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x91, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x47, 0x72, 0x6f, 0x77,
+ 0x74, 0x61, 0x73, 0x6b, 0x41, 0x64, 0x76, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x92,
+ 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x79, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x4e, 0x6f,
+ 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf5, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x61,
+ 0x79, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x45, 0x72, 0x72, 0x10, 0xf6, 0x1c,
+ 0x12, 0x16, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70,
+ 0x6c, 0x65, 0x74, 0x65, 0x64, 0x10, 0xf7, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6c,
+ 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0xd9, 0x1d, 0x12, 0x19,
+ 0x0a, 0x14, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x76, 0x4e, 0x6f, 0x74,
+ 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xda, 0x1d, 0x12, 0x16, 0x0a, 0x11, 0x57, 0x6f, 0x72,
+ 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x10, 0xdb,
+ 0x1d, 0x12, 0x18, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f,
+ 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10, 0xdc, 0x1d, 0x12, 0x15, 0x0a, 0x10, 0x57,
+ 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x68, 0x65, 0x64, 0x10,
+ 0xdd, 0x1d, 0x12, 0x1c, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c,
+ 0x61, 0x73, 0x74, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xde, 0x1d,
+ 0x12, 0x1b, 0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f,
+ 0x75, 0x70, 0x49, 0x64, 0x4e, 0x6f, 0x73, 0x61, 0x6d, 0x65, 0x10, 0xdf, 0x1d, 0x12, 0x1e, 0x0a,
+ 0x19, 0x41, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f,
+ 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 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, 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, 0x12, 0x15, 0x0a, 0x10, 0x53,
+ 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10,
+ 0x87, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x75, 0x73, 0x74,
+ 0x6f, 0x6d, 0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0x88, 0x20, 0x12, 0x20, 0x0a, 0x1b,
+ 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x45, 0x71,
+ 0x75, 0x69, 0x70, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x89, 0x20, 0x12, 0x19,
+ 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4d, 0x61, 0x78, 0x54, 0x65, 0x6d, 0x70, 0x65,
+ 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x10, 0x8a, 0x20, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6d, 0x69,
+ 0x74, 0x68, 0x79, 0x4c, 0x61, 0x63, 0x6b, 0x4c, 0x61, 0x76, 0x61, 0x10, 0x8b, 0x20, 0x12, 0x15,
+ 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4d, 0x61, 0x78,
+ 0x4c, 0x76, 0x10, 0x8c, 0x20, 0x12, 0x16, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41,
+ 0x74, 0x6c, 0x61, 0x73, 0x4c, 0x61, 0x63, 0x6b, 0x4c, 0x76, 0x10, 0x8d, 0x20, 0x12, 0x19, 0x0a,
+ 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e,
+ 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x8e, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74,
+ 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0x8f,
+ 0x20, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x75,
+ 0x6e, 0x64, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x10, 0x90, 0x20, 0x12, 0x1a, 0x0a, 0x15, 0x53, 0x6d,
+ 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x41, 0x74,
+ 0x6c, 0x61, 0x73, 0x10, 0x91, 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 b19a352ed..98431e475 100644
--- a/pb/smithy_db.pb.go
+++ b/pb/smithy_db.pb.go
@@ -414,9 +414,9 @@ type CollectData struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"`
- Score int32 `protobuf:"varint,2,opt,name=score,proto3" json:"score"`
- Time int64 `protobuf:"varint,3,opt,name=time,proto3" json:"time"` // 获得时间
+ Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"` // 收集图鉴id
+ Score int32 `protobuf:"varint,2,opt,name=score,proto3" json:"score"`
+ Time int64 `protobuf:"varint,3,opt,name=time,proto3" json:"time"` // 获得时间
}
func (x *CollectData) Reset() {
@@ -451,11 +451,11 @@ func (*CollectData) Descriptor() ([]byte, []int) {
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{5}
}
-func (x *CollectData) GetId() int32 {
+func (x *CollectData) GetId() string {
if x != nil {
return x.Id
}
- return 0
+ return ""
}
func (x *CollectData) GetScore() int32 {
@@ -1006,7 +1006,7 @@ var file_smithy_smithy_db_proto_rawDesc = []byte{
0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c,
0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x47, 0x0a, 0x0b, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63,
0x74, 0x44, 0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x02,
+ 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x02,
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74,
0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x22,
0x47, 0x0a, 0x09, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x04,
diff --git a/pb/smithy_msg.pb.go b/pb/smithy_msg.pb.go
index e3abe22d6..7e64270a5 100644
--- a/pb/smithy_msg.pb.go
+++ b/pb/smithy_msg.pb.go
@@ -191,8 +191,8 @@ type SmithyForgeEquipResp struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Equip []string `protobuf:"bytes,1,rep,name=equip,proto3" json:"equip"` // 装备ID
- Data *DBStove `protobuf:"bytes,2,opt,name=data,proto3" json:"data"`
+ Equip []*DB_Equipment `protobuf:"bytes,1,rep,name=equip,proto3" json:"equip"` // 装备ID
+ Data *DBStove `protobuf:"bytes,2,opt,name=data,proto3" json:"data"`
}
func (x *SmithyForgeEquipResp) Reset() {
@@ -227,7 +227,7 @@ func (*SmithyForgeEquipResp) Descriptor() ([]byte, []int) {
return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{3}
}
-func (x *SmithyForgeEquipResp) GetEquip() []string {
+func (x *SmithyForgeEquipResp) GetEquip() []*DB_Equipment {
if x != nil {
return x.Equip
}
@@ -911,6 +911,101 @@ func (x *SmithyAtlasListResp) GetData() *DBAtlas {
return nil
}
+// 图鉴激活更新
+type SmithyAtlasActivateReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"` // 图鉴ID
+}
+
+func (x *SmithyAtlasActivateReq) Reset() {
+ *x = SmithyAtlasActivateReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_smithy_smithy_msg_proto_msgTypes[18]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *SmithyAtlasActivateReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SmithyAtlasActivateReq) ProtoMessage() {}
+
+func (x *SmithyAtlasActivateReq) ProtoReflect() protoreflect.Message {
+ mi := &file_smithy_smithy_msg_proto_msgTypes[18]
+ 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 SmithyAtlasActivateReq.ProtoReflect.Descriptor instead.
+func (*SmithyAtlasActivateReq) Descriptor() ([]byte, []int) {
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{18}
+}
+
+func (x *SmithyAtlasActivateReq) GetId() string {
+ if x != nil {
+ return x.Id
+ }
+ return ""
+}
+
+type SmithyAtlasActivateResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Data *DBAtlas `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
+}
+
+func (x *SmithyAtlasActivateResp) Reset() {
+ *x = SmithyAtlasActivateResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_smithy_smithy_msg_proto_msgTypes[19]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *SmithyAtlasActivateResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SmithyAtlasActivateResp) ProtoMessage() {}
+
+func (x *SmithyAtlasActivateResp) ProtoReflect() protoreflect.Message {
+ mi := &file_smithy_smithy_msg_proto_msgTypes[19]
+ 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 SmithyAtlasActivateResp.ProtoReflect.Descriptor instead.
+func (*SmithyAtlasActivateResp) Descriptor() ([]byte, []int) {
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{19}
+}
+
+func (x *SmithyAtlasActivateResp) GetData() *DBAtlas {
+ if x != nil {
+ return x.Data
+ }
+ return nil
+}
+
// 图鉴信息奖励任务领取
type SmithyAtlasAwardReq struct {
state protoimpl.MessageState
@@ -921,7 +1016,7 @@ type SmithyAtlasAwardReq struct {
func (x *SmithyAtlasAwardReq) Reset() {
*x = SmithyAtlasAwardReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[18]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[20]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -934,7 +1029,7 @@ func (x *SmithyAtlasAwardReq) String() string {
func (*SmithyAtlasAwardReq) ProtoMessage() {}
func (x *SmithyAtlasAwardReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[18]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[20]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -947,7 +1042,7 @@ func (x *SmithyAtlasAwardReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyAtlasAwardReq.ProtoReflect.Descriptor instead.
func (*SmithyAtlasAwardReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{18}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{20}
}
type SmithyAtlasAwardResp struct {
@@ -961,7 +1056,7 @@ type SmithyAtlasAwardResp struct {
func (x *SmithyAtlasAwardResp) Reset() {
*x = SmithyAtlasAwardResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[19]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[21]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -974,7 +1069,7 @@ func (x *SmithyAtlasAwardResp) String() string {
func (*SmithyAtlasAwardResp) ProtoMessage() {}
func (x *SmithyAtlasAwardResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[19]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[21]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -987,7 +1082,7 @@ func (x *SmithyAtlasAwardResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyAtlasAwardResp.ProtoReflect.Descriptor instead.
func (*SmithyAtlasAwardResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{19}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{21}
}
func (x *SmithyAtlasAwardResp) GetData() *DBAtlas {
@@ -1009,7 +1104,7 @@ type SmithyTaskAwardReq struct {
func (x *SmithyTaskAwardReq) Reset() {
*x = SmithyTaskAwardReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[20]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[22]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1022,7 +1117,7 @@ func (x *SmithyTaskAwardReq) String() string {
func (*SmithyTaskAwardReq) ProtoMessage() {}
func (x *SmithyTaskAwardReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[20]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[22]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1035,7 +1130,7 @@ func (x *SmithyTaskAwardReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyTaskAwardReq.ProtoReflect.Descriptor instead.
func (*SmithyTaskAwardReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{20}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{22}
}
func (x *SmithyTaskAwardReq) GetTaskId() int32 {
@@ -1056,7 +1151,7 @@ type SmithyTaskAwardResp struct {
func (x *SmithyTaskAwardResp) Reset() {
*x = SmithyTaskAwardResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[21]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[23]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1069,7 +1164,7 @@ func (x *SmithyTaskAwardResp) String() string {
func (*SmithyTaskAwardResp) ProtoMessage() {}
func (x *SmithyTaskAwardResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[21]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[23]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1082,7 +1177,7 @@ func (x *SmithyTaskAwardResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyTaskAwardResp.ProtoReflect.Descriptor instead.
func (*SmithyTaskAwardResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{21}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{23}
}
func (x *SmithyTaskAwardResp) GetTaskId() int32 {
@@ -1105,7 +1200,7 @@ type SmithyCreateOrderReq struct {
func (x *SmithyCreateOrderReq) Reset() {
*x = SmithyCreateOrderReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[22]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[24]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1118,7 +1213,7 @@ func (x *SmithyCreateOrderReq) String() string {
func (*SmithyCreateOrderReq) ProtoMessage() {}
func (x *SmithyCreateOrderReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[22]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[24]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1131,7 +1226,7 @@ func (x *SmithyCreateOrderReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyCreateOrderReq.ProtoReflect.Descriptor instead.
func (*SmithyCreateOrderReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{22}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{24}
}
func (x *SmithyCreateOrderReq) GetOrder() []*OrderClang {
@@ -1152,7 +1247,7 @@ type SmithyCreateOrderResp struct {
func (x *SmithyCreateOrderResp) Reset() {
*x = SmithyCreateOrderResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[23]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[25]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1165,7 +1260,7 @@ func (x *SmithyCreateOrderResp) String() string {
func (*SmithyCreateOrderResp) ProtoMessage() {}
func (x *SmithyCreateOrderResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[23]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[25]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1178,7 +1273,7 @@ func (x *SmithyCreateOrderResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyCreateOrderResp.ProtoReflect.Descriptor instead.
func (*SmithyCreateOrderResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{23}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{25}
}
func (x *SmithyCreateOrderResp) GetData() *DBSmithy {
@@ -1198,7 +1293,7 @@ type SmithyGetRewardReq struct {
func (x *SmithyGetRewardReq) Reset() {
*x = SmithyGetRewardReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[24]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[26]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1211,7 +1306,7 @@ func (x *SmithyGetRewardReq) String() string {
func (*SmithyGetRewardReq) ProtoMessage() {}
func (x *SmithyGetRewardReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[24]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[26]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1224,7 +1319,7 @@ func (x *SmithyGetRewardReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyGetRewardReq.ProtoReflect.Descriptor instead.
func (*SmithyGetRewardReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{24}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{26}
}
type SmithyGetRewardResp struct {
@@ -1238,7 +1333,7 @@ type SmithyGetRewardResp struct {
func (x *SmithyGetRewardResp) Reset() {
*x = SmithyGetRewardResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[25]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[27]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1251,7 +1346,7 @@ func (x *SmithyGetRewardResp) String() string {
func (*SmithyGetRewardResp) ProtoMessage() {}
func (x *SmithyGetRewardResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[25]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[27]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1264,7 +1359,7 @@ func (x *SmithyGetRewardResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyGetRewardResp.ProtoReflect.Descriptor instead.
func (*SmithyGetRewardResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{25}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{27}
}
func (x *SmithyGetRewardResp) GetData() *DBSmithy {
@@ -1286,7 +1381,7 @@ type SmithyDeskSkillLvReq struct {
func (x *SmithyDeskSkillLvReq) Reset() {
*x = SmithyDeskSkillLvReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[26]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[28]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1299,7 +1394,7 @@ func (x *SmithyDeskSkillLvReq) String() string {
func (*SmithyDeskSkillLvReq) ProtoMessage() {}
func (x *SmithyDeskSkillLvReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[26]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[28]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1312,7 +1407,7 @@ func (x *SmithyDeskSkillLvReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyDeskSkillLvReq.ProtoReflect.Descriptor instead.
func (*SmithyDeskSkillLvReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{26}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{28}
}
func (x *SmithyDeskSkillLvReq) GetDeskType() int32 {
@@ -1333,7 +1428,7 @@ type SmithyDeskSkillLvResp struct {
func (x *SmithyDeskSkillLvResp) Reset() {
*x = SmithyDeskSkillLvResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[27]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[29]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1346,7 +1441,7 @@ func (x *SmithyDeskSkillLvResp) String() string {
func (*SmithyDeskSkillLvResp) ProtoMessage() {}
func (x *SmithyDeskSkillLvResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[27]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[29]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1359,7 +1454,7 @@ func (x *SmithyDeskSkillLvResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyDeskSkillLvResp.ProtoReflect.Descriptor instead.
func (*SmithyDeskSkillLvResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{27}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{29}
}
func (x *SmithyDeskSkillLvResp) GetData() *DBSmithy {
@@ -1379,7 +1474,7 @@ type SmithyStoveSkillLvReq struct {
func (x *SmithyStoveSkillLvReq) Reset() {
*x = SmithyStoveSkillLvReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[28]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[30]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1392,7 +1487,7 @@ func (x *SmithyStoveSkillLvReq) String() string {
func (*SmithyStoveSkillLvReq) ProtoMessage() {}
func (x *SmithyStoveSkillLvReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[28]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[30]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1405,7 +1500,7 @@ func (x *SmithyStoveSkillLvReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyStoveSkillLvReq.ProtoReflect.Descriptor instead.
func (*SmithyStoveSkillLvReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{28}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{30}
}
type SmithyStoveSkillLvResp struct {
@@ -1419,7 +1514,7 @@ type SmithyStoveSkillLvResp struct {
func (x *SmithyStoveSkillLvResp) Reset() {
*x = SmithyStoveSkillLvResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[29]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[31]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1432,7 +1527,7 @@ func (x *SmithyStoveSkillLvResp) String() string {
func (*SmithyStoveSkillLvResp) ProtoMessage() {}
func (x *SmithyStoveSkillLvResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[29]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[31]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1445,7 +1540,7 @@ func (x *SmithyStoveSkillLvResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyStoveSkillLvResp.ProtoReflect.Descriptor instead.
func (*SmithyStoveSkillLvResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{29}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{31}
}
func (x *SmithyStoveSkillLvResp) GetData() *DBSmithy {
@@ -1466,7 +1561,7 @@ type SmithyGetRandUserReq struct {
func (x *SmithyGetRandUserReq) Reset() {
*x = SmithyGetRandUserReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[30]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[32]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1479,7 +1574,7 @@ func (x *SmithyGetRandUserReq) String() string {
func (*SmithyGetRandUserReq) ProtoMessage() {}
func (x *SmithyGetRandUserReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[30]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[32]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1492,7 +1587,7 @@ func (x *SmithyGetRandUserReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyGetRandUserReq.ProtoReflect.Descriptor instead.
func (*SmithyGetRandUserReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{30}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{32}
}
func (x *SmithyGetRandUserReq) GetPeople() int32 {
@@ -1513,7 +1608,7 @@ type SmithyGetRandUserResp struct {
func (x *SmithyGetRandUserResp) Reset() {
*x = SmithyGetRandUserResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[31]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[33]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1526,7 +1621,7 @@ func (x *SmithyGetRandUserResp) String() string {
func (*SmithyGetRandUserResp) ProtoMessage() {}
func (x *SmithyGetRandUserResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[31]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[33]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1539,7 +1634,7 @@ func (x *SmithyGetRandUserResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyGetRandUserResp.ProtoReflect.Descriptor instead.
func (*SmithyGetRandUserResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{31}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{33}
}
func (x *SmithyGetRandUserResp) GetUser() []*DBUser {
@@ -1558,7 +1653,7 @@ type SmithyGetListReq struct {
func (x *SmithyGetListReq) Reset() {
*x = SmithyGetListReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[32]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[34]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1571,7 +1666,7 @@ func (x *SmithyGetListReq) String() string {
func (*SmithyGetListReq) ProtoMessage() {}
func (x *SmithyGetListReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[32]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[34]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1584,7 +1679,7 @@ func (x *SmithyGetListReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyGetListReq.ProtoReflect.Descriptor instead.
func (*SmithyGetListReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{32}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{34}
}
// 返回进度信息
@@ -1599,7 +1694,7 @@ type SmithyGetListResp struct {
func (x *SmithyGetListResp) Reset() {
*x = SmithyGetListResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[33]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[35]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1612,7 +1707,7 @@ func (x *SmithyGetListResp) String() string {
func (*SmithyGetListResp) ProtoMessage() {}
func (x *SmithyGetListResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[33]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[35]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1625,7 +1720,7 @@ func (x *SmithyGetListResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyGetListResp.ProtoReflect.Descriptor instead.
func (*SmithyGetListResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{33}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{35}
}
func (x *SmithyGetListResp) GetData() *DBSmithy {
@@ -1642,70 +1737,79 @@ var file_smithy_smithy_msg_proto_rawDesc = []byte{
0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x73, 0x6d, 0x69, 0x74, 0x68,
0x79, 0x2f, 0x73, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x1a, 0x12, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x64, 0x62, 0x2e,
- 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x17, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47,
- 0x65, 0x74, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x36,
- 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, 0x91, 0x01, 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, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x18,
- 0x04, 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, 0x05, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 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, 0x03, 0x28,
- 0x09, 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,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74,
+ 0x2f, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72,
+ 0x6f, 0x74, 0x6f, 0x22, 0x17, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74,
+ 0x53, 0x74, 0x6f, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x36, 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, 0x91, 0x01, 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, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x18, 0x04, 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, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
+ 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x59, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74,
+ 0x68, 0x79, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70,
+ 0x12, 0x23, 0x0a, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
+ 0x0d, 0x2e, 0x44, 0x42, 0x5f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 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, 0x13, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x75, 0x73,
- 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x52, 0x65, 0x71, 0x22, 0x41, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74,
- 0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2b,
- 0x0a, 0x09, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
- 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f,
- 0x52, 0x09, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x73, 0x22, 0x4b, 0x0a, 0x0d, 0x53,
- 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08,
- 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08,
- 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74,
- 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x75,
- 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x22, 0x79, 0x0a, 0x0e, 0x53, 0x6d, 0x69, 0x74,
- 0x68, 0x79, 0x53, 0x65, 0x6c, 0x6c, 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, 0x1a, 0x0a, 0x08, 0x65, 0x71,
- 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x65, 0x71,
- 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x12, 0x2b, 0x0a, 0x09, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d,
- 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x75, 0x73, 0x74,
- 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d,
- 0x65, 0x72, 0x73, 0x22, 0x31, 0x0a, 0x0f, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x65, 0x66,
- 0x75, 0x73, 0x65, 0x52, 0x65, 0x71, 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, 0x22, 0x3f, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
- 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2b, 0x0a, 0x09, 0x63, 0x75,
- 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
- 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x63, 0x75,
- 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x73, 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68,
- 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x33, 0x0a,
- 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4c, 0x69, 0x73, 0x74,
+ 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, 0x13, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d,
+ 0x65, 0x72, 0x52, 0x65, 0x71, 0x22, 0x41, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43,
+ 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2b, 0x0a, 0x09, 0x63,
+ 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d,
+ 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x63,
+ 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x73, 0x22, 0x4b, 0x0a, 0x0d, 0x53, 0x6d, 0x69, 0x74,
+ 0x68, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x71, 0x75,
+ 0x69, 0x70, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x65, 0x71, 0x75,
+ 0x69, 0x70, 0x49, 0x64, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65,
+ 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f,
+ 0x6d, 0x65, 0x72, 0x49, 0x64, 0x22, 0x79, 0x0a, 0x0e, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53,
+ 0x65, 0x6c, 0x6c, 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, 0x1a, 0x0a, 0x08, 0x65, 0x71, 0x75, 0x69, 0x70,
+ 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x65, 0x71, 0x75, 0x69, 0x70,
+ 0x49, 0x64, 0x73, 0x12, 0x2b, 0x0a, 0x09, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x73,
+ 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65,
+ 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x73,
+ 0x22, 0x31, 0x0a, 0x0f, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65,
+ 0x52, 0x65, 0x71, 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, 0x22, 0x3f, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x65, 0x66,
+ 0x75, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2b, 0x0a, 0x09, 0x63, 0x75, 0x73, 0x74, 0x6f,
+ 0x6d, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x75, 0x73,
+ 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x63, 0x75, 0x73, 0x74, 0x6f,
+ 0x6d, 0x65, 0x72, 0x73, 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74,
+ 0x6c, 0x61, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x33, 0x0a, 0x13, 0x53, 0x6d,
+ 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73,
+ 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+ 0x08, 0x2e, 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22,
+ 0x28, 0x0a, 0x16, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x41, 0x63,
+ 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x37, 0x0a, 0x17, 0x53, 0x6d, 0x69,
+ 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65,
0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52, 0x04, 0x64, 0x61,
0x74, 0x61, 0x22, 0x15, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61,
@@ -1769,72 +1873,77 @@ func file_smithy_smithy_msg_proto_rawDescGZIP() []byte {
return file_smithy_smithy_msg_proto_rawDescData
}
-var file_smithy_smithy_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 34)
+var file_smithy_smithy_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 36)
var file_smithy_smithy_msg_proto_goTypes = []interface{}{
- (*SmithyGetStoveInfoReq)(nil), // 0: SmithyGetStoveInfoReq
- (*SmithyGetStoveInfoResp)(nil), // 1: SmithyGetStoveInfoResp
- (*SmithyForgeEquipReq)(nil), // 2: SmithyForgeEquipReq
- (*SmithyForgeEquipResp)(nil), // 3: SmithyForgeEquipResp
- (*SmithyStoveUpReq)(nil), // 4: SmithyStoveUpReq
- (*SmithyStoveUpResp)(nil), // 5: SmithyStoveUpResp
- (*SmithyRiseReq)(nil), // 6: SmithyRiseReq
- (*SmithyRiseResp)(nil), // 7: SmithyRiseResp
- (*SmithyToolsUpReq)(nil), // 8: SmithyToolsUpReq
- (*SmithyToolsUpResp)(nil), // 9: SmithyToolsUpResp
- (*SmithyCustomerReq)(nil), // 10: SmithyCustomerReq
- (*SmithyCustomerResp)(nil), // 11: SmithyCustomerResp
- (*SmithySellReq)(nil), // 12: SmithySellReq
- (*SmithySellResp)(nil), // 13: SmithySellResp
- (*SmithyRefuseReq)(nil), // 14: SmithyRefuseReq
- (*SmithyRefuseResp)(nil), // 15: SmithyRefuseResp
- (*SmithyAtlasListReq)(nil), // 16: SmithyAtlasListReq
- (*SmithyAtlasListResp)(nil), // 17: SmithyAtlasListResp
- (*SmithyAtlasAwardReq)(nil), // 18: SmithyAtlasAwardReq
- (*SmithyAtlasAwardResp)(nil), // 19: SmithyAtlasAwardResp
- (*SmithyTaskAwardReq)(nil), // 20: SmithyTaskAwardReq
- (*SmithyTaskAwardResp)(nil), // 21: SmithyTaskAwardResp
- (*SmithyCreateOrderReq)(nil), // 22: SmithyCreateOrderReq
- (*SmithyCreateOrderResp)(nil), // 23: SmithyCreateOrderResp
- (*SmithyGetRewardReq)(nil), // 24: SmithyGetRewardReq
- (*SmithyGetRewardResp)(nil), // 25: SmithyGetRewardResp
- (*SmithyDeskSkillLvReq)(nil), // 26: SmithyDeskSkillLvReq
- (*SmithyDeskSkillLvResp)(nil), // 27: SmithyDeskSkillLvResp
- (*SmithyStoveSkillLvReq)(nil), // 28: SmithyStoveSkillLvReq
- (*SmithyStoveSkillLvResp)(nil), // 29: SmithyStoveSkillLvResp
- (*SmithyGetRandUserReq)(nil), // 30: SmithyGetRandUserReq
- (*SmithyGetRandUserResp)(nil), // 31: SmithyGetRandUserResp
- (*SmithyGetListReq)(nil), // 32: SmithyGetListReq
- (*SmithyGetListResp)(nil), // 33: SmithyGetListResp
- (*DBStove)(nil), // 34: DBStove
- (*CustomerInfo)(nil), // 35: CustomerInfo
- (*DBAtlas)(nil), // 36: DBAtlas
- (*OrderClang)(nil), // 37: OrderClang
- (*DBSmithy)(nil), // 38: DBSmithy
- (*DBUser)(nil), // 39: DBUser
+ (*SmithyGetStoveInfoReq)(nil), // 0: SmithyGetStoveInfoReq
+ (*SmithyGetStoveInfoResp)(nil), // 1: SmithyGetStoveInfoResp
+ (*SmithyForgeEquipReq)(nil), // 2: SmithyForgeEquipReq
+ (*SmithyForgeEquipResp)(nil), // 3: SmithyForgeEquipResp
+ (*SmithyStoveUpReq)(nil), // 4: SmithyStoveUpReq
+ (*SmithyStoveUpResp)(nil), // 5: SmithyStoveUpResp
+ (*SmithyRiseReq)(nil), // 6: SmithyRiseReq
+ (*SmithyRiseResp)(nil), // 7: SmithyRiseResp
+ (*SmithyToolsUpReq)(nil), // 8: SmithyToolsUpReq
+ (*SmithyToolsUpResp)(nil), // 9: SmithyToolsUpResp
+ (*SmithyCustomerReq)(nil), // 10: SmithyCustomerReq
+ (*SmithyCustomerResp)(nil), // 11: SmithyCustomerResp
+ (*SmithySellReq)(nil), // 12: SmithySellReq
+ (*SmithySellResp)(nil), // 13: SmithySellResp
+ (*SmithyRefuseReq)(nil), // 14: SmithyRefuseReq
+ (*SmithyRefuseResp)(nil), // 15: SmithyRefuseResp
+ (*SmithyAtlasListReq)(nil), // 16: SmithyAtlasListReq
+ (*SmithyAtlasListResp)(nil), // 17: SmithyAtlasListResp
+ (*SmithyAtlasActivateReq)(nil), // 18: SmithyAtlasActivateReq
+ (*SmithyAtlasActivateResp)(nil), // 19: SmithyAtlasActivateResp
+ (*SmithyAtlasAwardReq)(nil), // 20: SmithyAtlasAwardReq
+ (*SmithyAtlasAwardResp)(nil), // 21: SmithyAtlasAwardResp
+ (*SmithyTaskAwardReq)(nil), // 22: SmithyTaskAwardReq
+ (*SmithyTaskAwardResp)(nil), // 23: SmithyTaskAwardResp
+ (*SmithyCreateOrderReq)(nil), // 24: SmithyCreateOrderReq
+ (*SmithyCreateOrderResp)(nil), // 25: SmithyCreateOrderResp
+ (*SmithyGetRewardReq)(nil), // 26: SmithyGetRewardReq
+ (*SmithyGetRewardResp)(nil), // 27: SmithyGetRewardResp
+ (*SmithyDeskSkillLvReq)(nil), // 28: SmithyDeskSkillLvReq
+ (*SmithyDeskSkillLvResp)(nil), // 29: SmithyDeskSkillLvResp
+ (*SmithyStoveSkillLvReq)(nil), // 30: SmithyStoveSkillLvReq
+ (*SmithyStoveSkillLvResp)(nil), // 31: SmithyStoveSkillLvResp
+ (*SmithyGetRandUserReq)(nil), // 32: SmithyGetRandUserReq
+ (*SmithyGetRandUserResp)(nil), // 33: SmithyGetRandUserResp
+ (*SmithyGetListReq)(nil), // 34: SmithyGetListReq
+ (*SmithyGetListResp)(nil), // 35: SmithyGetListResp
+ (*DBStove)(nil), // 36: DBStove
+ (*DB_Equipment)(nil), // 37: DB_Equipment
+ (*CustomerInfo)(nil), // 38: CustomerInfo
+ (*DBAtlas)(nil), // 39: DBAtlas
+ (*OrderClang)(nil), // 40: OrderClang
+ (*DBSmithy)(nil), // 41: DBSmithy
+ (*DBUser)(nil), // 42: DBUser
}
var file_smithy_smithy_msg_proto_depIdxs = []int32{
- 34, // 0: SmithyGetStoveInfoResp.data:type_name -> DBStove
- 34, // 1: SmithyForgeEquipResp.data:type_name -> DBStove
- 34, // 2: SmithyStoveUpResp.data:type_name -> DBStove
- 34, // 3: SmithyRiseResp.data:type_name -> DBStove
- 34, // 4: SmithyToolsUpResp.data:type_name -> DBStove
- 35, // 5: SmithyCustomerResp.customers:type_name -> CustomerInfo
- 35, // 6: SmithySellResp.customers:type_name -> CustomerInfo
- 35, // 7: SmithyRefuseResp.customers:type_name -> CustomerInfo
- 36, // 8: SmithyAtlasListResp.data:type_name -> DBAtlas
- 36, // 9: SmithyAtlasAwardResp.data:type_name -> DBAtlas
- 37, // 10: SmithyCreateOrderReq.order:type_name -> OrderClang
- 38, // 11: SmithyCreateOrderResp.data:type_name -> DBSmithy
- 38, // 12: SmithyGetRewardResp.data:type_name -> DBSmithy
- 38, // 13: SmithyDeskSkillLvResp.data:type_name -> DBSmithy
- 38, // 14: SmithyStoveSkillLvResp.data:type_name -> DBSmithy
- 39, // 15: SmithyGetRandUserResp.user:type_name -> DBUser
- 38, // 16: SmithyGetListResp.data:type_name -> DBSmithy
- 17, // [17:17] is the sub-list for method output_type
- 17, // [17:17] is the sub-list for method input_type
- 17, // [17:17] is the sub-list for extension type_name
- 17, // [17:17] is the sub-list for extension extendee
- 0, // [0:17] is the sub-list for field type_name
+ 36, // 0: SmithyGetStoveInfoResp.data:type_name -> DBStove
+ 37, // 1: SmithyForgeEquipResp.equip:type_name -> DB_Equipment
+ 36, // 2: SmithyForgeEquipResp.data:type_name -> DBStove
+ 36, // 3: SmithyStoveUpResp.data:type_name -> DBStove
+ 36, // 4: SmithyRiseResp.data:type_name -> DBStove
+ 36, // 5: SmithyToolsUpResp.data:type_name -> DBStove
+ 38, // 6: SmithyCustomerResp.customers:type_name -> CustomerInfo
+ 38, // 7: SmithySellResp.customers:type_name -> CustomerInfo
+ 38, // 8: SmithyRefuseResp.customers:type_name -> CustomerInfo
+ 39, // 9: SmithyAtlasListResp.data:type_name -> DBAtlas
+ 39, // 10: SmithyAtlasActivateResp.data:type_name -> DBAtlas
+ 39, // 11: SmithyAtlasAwardResp.data:type_name -> DBAtlas
+ 40, // 12: SmithyCreateOrderReq.order:type_name -> OrderClang
+ 41, // 13: SmithyCreateOrderResp.data:type_name -> DBSmithy
+ 41, // 14: SmithyGetRewardResp.data:type_name -> DBSmithy
+ 41, // 15: SmithyDeskSkillLvResp.data:type_name -> DBSmithy
+ 41, // 16: SmithyStoveSkillLvResp.data:type_name -> DBSmithy
+ 42, // 17: SmithyGetRandUserResp.user:type_name -> DBUser
+ 41, // 18: SmithyGetListResp.data:type_name -> DBSmithy
+ 19, // [19:19] is the sub-list for method output_type
+ 19, // [19:19] is the sub-list for method input_type
+ 19, // [19:19] is the sub-list for extension type_name
+ 19, // [19:19] is the sub-list for extension extendee
+ 0, // [0:19] is the sub-list for field type_name
}
func init() { file_smithy_smithy_msg_proto_init() }
@@ -1844,6 +1953,7 @@ func file_smithy_smithy_msg_proto_init() {
}
file_smithy_smithy_db_proto_init()
file_user_user_db_proto_init()
+ file_equipment_equipment_db_proto_init()
if !protoimpl.UnsafeEnabled {
file_smithy_smithy_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*SmithyGetStoveInfoReq); i {
@@ -2062,7 +2172,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyAtlasAwardReq); i {
+ switch v := v.(*SmithyAtlasActivateReq); i {
case 0:
return &v.state
case 1:
@@ -2074,7 +2184,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyAtlasAwardResp); i {
+ switch v := v.(*SmithyAtlasActivateResp); i {
case 0:
return &v.state
case 1:
@@ -2086,7 +2196,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyTaskAwardReq); i {
+ switch v := v.(*SmithyAtlasAwardReq); i {
case 0:
return &v.state
case 1:
@@ -2098,7 +2208,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyTaskAwardResp); i {
+ switch v := v.(*SmithyAtlasAwardResp); i {
case 0:
return &v.state
case 1:
@@ -2110,7 +2220,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyCreateOrderReq); i {
+ switch v := v.(*SmithyTaskAwardReq); i {
case 0:
return &v.state
case 1:
@@ -2122,7 +2232,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyCreateOrderResp); i {
+ switch v := v.(*SmithyTaskAwardResp); i {
case 0:
return &v.state
case 1:
@@ -2134,7 +2244,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyGetRewardReq); i {
+ switch v := v.(*SmithyCreateOrderReq); i {
case 0:
return &v.state
case 1:
@@ -2146,7 +2256,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyGetRewardResp); i {
+ switch v := v.(*SmithyCreateOrderResp); i {
case 0:
return &v.state
case 1:
@@ -2158,7 +2268,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyDeskSkillLvReq); i {
+ switch v := v.(*SmithyGetRewardReq); i {
case 0:
return &v.state
case 1:
@@ -2170,7 +2280,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyDeskSkillLvResp); i {
+ switch v := v.(*SmithyGetRewardResp); i {
case 0:
return &v.state
case 1:
@@ -2182,7 +2292,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyStoveSkillLvReq); i {
+ switch v := v.(*SmithyDeskSkillLvReq); i {
case 0:
return &v.state
case 1:
@@ -2194,7 +2304,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyStoveSkillLvResp); i {
+ switch v := v.(*SmithyDeskSkillLvResp); i {
case 0:
return &v.state
case 1:
@@ -2206,7 +2316,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyGetRandUserReq); i {
+ switch v := v.(*SmithyStoveSkillLvReq); i {
case 0:
return &v.state
case 1:
@@ -2218,7 +2328,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyGetRandUserResp); i {
+ switch v := v.(*SmithyStoveSkillLvResp); i {
case 0:
return &v.state
case 1:
@@ -2230,7 +2340,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyGetListReq); i {
+ switch v := v.(*SmithyGetRandUserReq); i {
case 0:
return &v.state
case 1:
@@ -2242,6 +2352,30 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*SmithyGetRandUserResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_smithy_smithy_msg_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*SmithyGetListReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_smithy_smithy_msg_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*SmithyGetListResp); i {
case 0:
return &v.state
@@ -2260,7 +2394,7 @@ func file_smithy_smithy_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_smithy_smithy_msg_proto_rawDesc,
NumEnums: 0,
- NumMessages: 34,
+ NumMessages: 36,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/pb/userexpand.pb.go b/pb/userexpand.pb.go
index 26b800c02..dd8075b3a 100644
--- a/pb/userexpand.pb.go
+++ b/pb/userexpand.pb.go
@@ -57,7 +57,6 @@ type DBUserExpand struct {
SociatyTicket int32 `protobuf:"varint,33,opt,name=sociatyTicket,proto3" json:"sociatyTicket" bson:"sociatyTicket"` //公会boss挑战券数量
Mline map[int32]int32 `protobuf:"bytes,34,rep,name=mline,proto3" json:"mline" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"mline"` //主线关卡最大进度 key难度val是关卡ID
SuiteId []int32 `protobuf:"varint,35,rep,packed,name=suiteId,proto3" json:"suiteId" bson:"suiteId"` // 套装Id
- KungfuTickt int32 `protobuf:"varint,36,opt,name=kungfuTickt,proto3" json:"kungfuTickt" bson:"kungfuTickt"` //武馆挑战券
}
func (x *DBUserExpand) Reset() {
@@ -309,18 +308,11 @@ func (x *DBUserExpand) GetSuiteId() []int32 {
return nil
}
-func (x *DBUserExpand) GetKungfuTickt() int32 {
- if x != nil {
- return x.KungfuTickt
- }
- return 0
-}
-
var File_userexpand_proto protoreflect.FileDescriptor
var file_userexpand_proto_rawDesc = []byte{
0x0a, 0x10, 0x75, 0x73, 0x65, 0x72, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x70, 0x72, 0x6f,
- 0x74, 0x6f, 0x22, 0xae, 0x0a, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70,
+ 0x74, 0x6f, 0x22, 0x8c, 0x0a, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70,
0x61, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x61,
@@ -393,18 +385,16 @@ var file_userexpand_proto_rawDesc = []byte{
0x32, 0x18, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e,
0x4d, 0x6c, 0x69, 0x6e, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x6d, 0x6c, 0x69, 0x6e,
0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x18, 0x23, 0x20, 0x03,
- 0x28, 0x05, 0x52, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x6b,
- 0x75, 0x6e, 0x67, 0x66, 0x75, 0x54, 0x69, 0x63, 0x6b, 0x74, 0x18, 0x24, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x0b, 0x6b, 0x75, 0x6e, 0x67, 0x66, 0x75, 0x54, 0x69, 0x63, 0x6b, 0x74, 0x1a, 0x3a, 0x0a,
- 0x0c, 0x45, 0x78, 0x70, 0x69, 0x74, 0x65, 0x6d, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
- 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
- 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
- 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x4d, 0x6c, 0x69,
- 0x6e, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
- 0x74, 0x6f, 0x33,
+ 0x28, 0x05, 0x52, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x1a, 0x3a, 0x0a, 0x0c, 0x45,
+ 0x78, 0x70, 0x69, 0x74, 0x65, 0x6d, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+ 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
+ 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61,
+ 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x4d, 0x6c, 0x69, 0x6e, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+ 0x33,
}
var (
diff --git a/sys/configure/structs/Game.Dispatch_All.go b/sys/configure/structs/Game.Dispatch_All.go
new file mode 100644
index 000000000..c09f6442c
--- /dev/null
+++ b/sys/configure/structs/Game.Dispatch_All.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 GameDispatch_All struct {
+ _dataMap map[int32]*GameDispatch_AllData
+ _dataList []*GameDispatch_AllData
+}
+
+func NewGameDispatch_All(_buf []map[string]interface{}) (*GameDispatch_All, error) {
+ _dataList := make([]*GameDispatch_AllData, 0, len(_buf))
+ dataMap := make(map[int32]*GameDispatch_AllData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameDispatch_AllData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameDispatch_All{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameDispatch_All) GetDataMap() map[int32]*GameDispatch_AllData {
+ return table._dataMap
+}
+
+func (table *GameDispatch_All) GetDataList() []*GameDispatch_AllData {
+ return table._dataList
+}
+
+func (table *GameDispatch_All) Get(key int32) *GameDispatch_AllData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.Dispatch_AllData.go b/sys/configure/structs/Game.Dispatch_AllData.go
new file mode 100644
index 000000000..f7dc896c4
--- /dev/null
+++ b/sys/configure/structs/Game.Dispatch_AllData.go
@@ -0,0 +1,37 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameDispatch_AllData struct {
+ Id int32
+ Quantity float32
+}
+
+const TypeId_GameDispatch_AllData = 1167514754
+
+func (*GameDispatch_AllData) GetTypeId() int32 {
+ return 1167514754
+}
+
+func (_v *GameDispatch_AllData)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["quantity"].(float64); !_ok_ { err = errors.New("quantity error"); return }; _v.Quantity = float32(_tempNum_) }
+ return
+}
+
+func DeserializeGameDispatch_AllData(_buf map[string]interface{}) (*GameDispatch_AllData, error) {
+ v := &GameDispatch_AllData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.Dispatch_Battle.go b/sys/configure/structs/Game.Dispatch_Battle.go
new file mode 100644
index 000000000..4bb6d86e5
--- /dev/null
+++ b/sys/configure/structs/Game.Dispatch_Battle.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 GameDispatch_Battle struct {
+ _dataMap map[int32]*GameDispatch_BattleData
+ _dataList []*GameDispatch_BattleData
+}
+
+func NewGameDispatch_Battle(_buf []map[string]interface{}) (*GameDispatch_Battle, error) {
+ _dataList := make([]*GameDispatch_BattleData, 0, len(_buf))
+ dataMap := make(map[int32]*GameDispatch_BattleData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameDispatch_BattleData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameDispatch_Battle{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameDispatch_Battle) GetDataMap() map[int32]*GameDispatch_BattleData {
+ return table._dataMap
+}
+
+func (table *GameDispatch_Battle) GetDataList() []*GameDispatch_BattleData {
+ return table._dataList
+}
+
+func (table *GameDispatch_Battle) Get(key int32) *GameDispatch_BattleData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.Dispatch_BattleData.go b/sys/configure/structs/Game.Dispatch_BattleData.go
new file mode 100644
index 000000000..4f1dd0ffa
--- /dev/null
+++ b/sys/configure/structs/Game.Dispatch_BattleData.go
@@ -0,0 +1,124 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameDispatch_BattleData struct {
+ Id int32
+ Model string
+ Startstory int32
+ Rejectstory int32
+ Endstory int32
+ Battlename string
+ Battletxt string
+ FormatList []int32
+ BattleReadyID int32
+ EventList []int32
+ Award []*Gameatn
+ Onlookers []string
+ Onlookersstory []int32
+}
+
+const TypeId_GameDispatch_BattleData = 5907851
+
+func (*GameDispatch_BattleData) GetTypeId() int32 {
+ return 5907851
+}
+
+func (_v *GameDispatch_BattleData)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; if _v.Model, _ok_ = _buf["model"].(string); !_ok_ { err = errors.New("model error"); return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["startstory"].(float64); !_ok_ { err = errors.New("startstory error"); return }; _v.Startstory = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rejectstory"].(float64); !_ok_ { err = errors.New("rejectstory error"); return }; _v.Rejectstory = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["endstory"].(float64); !_ok_ { err = errors.New("endstory error"); return }; _v.Endstory = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["battlename"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Battlename error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Battlename, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["battletxt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Battletxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Battletxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["FormatList"].([]interface{}); !_ok_ { err = errors.New("FormatList error"); return }
+
+ _v.FormatList = 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.FormatList = append(_v.FormatList, _list_v_)
+ }
+ }
+
+ { 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["EventList"].([]interface{}); !_ok_ { err = errors.New("EventList error"); return }
+
+ _v.EventList = 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.EventList = append(_v.EventList, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["award"].([]interface{}); !_ok_ { err = errors.New("award error"); return }
+
+ _v.Award = make([]*Gameatn, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+ _v.Award = append(_v.Award, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["onlookers"].([]interface{}); !_ok_ { err = errors.New("onlookers error"); return }
+
+ _v.Onlookers = make([]string, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ string
+ { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
+ _v.Onlookers = append(_v.Onlookers, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["onlookersstory"].([]interface{}); !_ok_ { err = errors.New("onlookersstory error"); return }
+
+ _v.Onlookersstory = 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.Onlookersstory = append(_v.Onlookersstory, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameDispatch_BattleData(_buf map[string]interface{}) (*GameDispatch_BattleData, error) {
+ v := &GameDispatch_BattleData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.Dispatch_Lv.go b/sys/configure/structs/Game.Dispatch_Lv.go
new file mode 100644
index 000000000..d483b6251
--- /dev/null
+++ b/sys/configure/structs/Game.Dispatch_Lv.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 GameDispatch_Lv struct {
+ _dataMap map[int32]*GameDispatch_LvData
+ _dataList []*GameDispatch_LvData
+}
+
+func NewGameDispatch_Lv(_buf []map[string]interface{}) (*GameDispatch_Lv, error) {
+ _dataList := make([]*GameDispatch_LvData, 0, len(_buf))
+ dataMap := make(map[int32]*GameDispatch_LvData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameDispatch_LvData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Lv] = _v
+ }
+ }
+ return &GameDispatch_Lv{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameDispatch_Lv) GetDataMap() map[int32]*GameDispatch_LvData {
+ return table._dataMap
+}
+
+func (table *GameDispatch_Lv) GetDataList() []*GameDispatch_LvData {
+ return table._dataList
+}
+
+func (table *GameDispatch_Lv) Get(key int32) *GameDispatch_LvData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.Dispatch_LvData.go b/sys/configure/structs/Game.Dispatch_LvData.go
new file mode 100644
index 000000000..f09d821aa
--- /dev/null
+++ b/sys/configure/structs/Game.Dispatch_LvData.go
@@ -0,0 +1,52 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameDispatch_LvData struct {
+ Lv int32
+ Probability []float32
+ Upgrade int32
+}
+
+const TypeId_GameDispatch_LvData = 222107101
+
+func (*GameDispatch_LvData) GetTypeId() int32 {
+ return 222107101
+}
+
+func (_v *GameDispatch_LvData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lv"].(float64); !_ok_ { err = errors.New("lv error"); return }; _v.Lv = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["probability"].([]interface{}); !_ok_ { err = errors.New("probability error"); return }
+
+ _v.Probability = make([]float32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ float32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = float32(_x_) }
+ _v.Probability = append(_v.Probability, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Upgrade"].(float64); !_ok_ { err = errors.New("Upgrade error"); return }; _v.Upgrade = int32(_tempNum_) }
+ return
+}
+
+func DeserializeGameDispatch_LvData(_buf map[string]interface{}) (*GameDispatch_LvData, error) {
+ v := &GameDispatch_LvData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.Dispatch_Reward.go b/sys/configure/structs/Game.Dispatch_Reward.go
new file mode 100644
index 000000000..ff1ae14b5
--- /dev/null
+++ b/sys/configure/structs/Game.Dispatch_Reward.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 GameDispatch_Reward struct {
+ _dataMap map[int32]*GameDispatch_RewardData
+ _dataList []*GameDispatch_RewardData
+}
+
+func NewGameDispatch_Reward(_buf []map[string]interface{}) (*GameDispatch_Reward, error) {
+ _dataList := make([]*GameDispatch_RewardData, 0, len(_buf))
+ dataMap := make(map[int32]*GameDispatch_RewardData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameDispatch_RewardData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameDispatch_Reward{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameDispatch_Reward) GetDataMap() map[int32]*GameDispatch_RewardData {
+ return table._dataMap
+}
+
+func (table *GameDispatch_Reward) GetDataList() []*GameDispatch_RewardData {
+ return table._dataList
+}
+
+func (table *GameDispatch_Reward) Get(key int32) *GameDispatch_RewardData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.Dispatch_RewardData.go b/sys/configure/structs/Game.Dispatch_RewardData.go
new file mode 100644
index 000000000..fa0809315
--- /dev/null
+++ b/sys/configure/structs/Game.Dispatch_RewardData.go
@@ -0,0 +1,67 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameDispatch_RewardData struct {
+ Id int32
+ Num []int32
+ Reward []*Gameatn
+ Day int32
+}
+
+const TypeId_GameDispatch_RewardData = -356577150
+
+func (*GameDispatch_RewardData) GetTypeId() int32 {
+ return -356577150
+}
+
+func (_v *GameDispatch_RewardData)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 _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["num"].([]interface{}); !_ok_ { err = errors.New("num error"); return }
+
+ _v.Num = 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.Num = append(_v.Num, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["reward"].([]interface{}); !_ok_ { err = errors.New("reward error"); return }
+
+ _v.Reward = 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.Reward = append(_v.Reward, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["day"].(float64); !_ok_ { err = errors.New("day error"); return }; _v.Day = int32(_tempNum_) }
+ return
+}
+
+func DeserializeGameDispatch_RewardData(_buf map[string]interface{}) (*GameDispatch_RewardData, error) {
+ v := &GameDispatch_RewardData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.Dispatch_Task.go b/sys/configure/structs/Game.Dispatch_Task.go
new file mode 100644
index 000000000..136a6d34a
--- /dev/null
+++ b/sys/configure/structs/Game.Dispatch_Task.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 GameDispatch_Task struct {
+ _dataMap map[int32]*GameDispatch_TaskData
+ _dataList []*GameDispatch_TaskData
+}
+
+func NewGameDispatch_Task(_buf []map[string]interface{}) (*GameDispatch_Task, error) {
+ _dataList := make([]*GameDispatch_TaskData, 0, len(_buf))
+ dataMap := make(map[int32]*GameDispatch_TaskData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameDispatch_TaskData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameDispatch_Task{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameDispatch_Task) GetDataMap() map[int32]*GameDispatch_TaskData {
+ return table._dataMap
+}
+
+func (table *GameDispatch_Task) GetDataList() []*GameDispatch_TaskData {
+ return table._dataList
+}
+
+func (table *GameDispatch_Task) Get(key int32) *GameDispatch_TaskData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.Dispatch_TaskData.go b/sys/configure/structs/Game.Dispatch_TaskData.go
new file mode 100644
index 000000000..92ef5e605
--- /dev/null
+++ b/sys/configure/structs/Game.Dispatch_TaskData.go
@@ -0,0 +1,107 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameDispatch_TaskData struct {
+ Id int32
+ Type int32
+ Taskname string
+ Taskcd float32
+ Tasktime float32
+ Tasktxt string
+ Taskneed int32
+ Taskreq []string
+ Taskreqex []string
+ Reward []*Gameatn
+ Rewardex []*Gameatn
+}
+
+const TypeId_GameDispatch_TaskData = -350189032
+
+func (*GameDispatch_TaskData) GetTypeId() int32 {
+ return -350189032
+}
+
+func (_v *GameDispatch_TaskData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["taskname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Taskname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Taskname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["taskcd"].(float64); !_ok_ { err = errors.New("taskcd error"); return }; _v.Taskcd = float32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tasktime"].(float64); !_ok_ { err = errors.New("tasktime error"); return }; _v.Tasktime = float32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["tasktxt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Tasktxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Tasktxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["taskneed"].(float64); !_ok_ { err = errors.New("taskneed error"); return }; _v.Taskneed = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["taskreq"].([]interface{}); !_ok_ { err = errors.New("taskreq error"); return }
+
+ _v.Taskreq = make([]string, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ string
+ { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
+ _v.Taskreq = append(_v.Taskreq, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["taskreqex"].([]interface{}); !_ok_ { err = errors.New("taskreqex error"); return }
+
+ _v.Taskreqex = make([]string, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ string
+ { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
+ _v.Taskreqex = append(_v.Taskreqex, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["reward"].([]interface{}); !_ok_ { err = errors.New("reward error"); return }
+
+ _v.Reward = 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.Reward = append(_v.Reward, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["rewardex"].([]interface{}); !_ok_ { err = errors.New("rewardex error"); return }
+
+ _v.Rewardex = 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.Rewardex = append(_v.Rewardex, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameDispatch_TaskData(_buf map[string]interface{}) (*GameDispatch_TaskData, error) {
+ v := &GameDispatch_TaskData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.SmithyTask.go b/sys/configure/structs/Game.SmithyTask.go
new file mode 100644
index 000000000..7331b44ff
--- /dev/null
+++ b/sys/configure/structs/Game.SmithyTask.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 GameSmithyTask struct {
+ _dataMap map[int32]*GameSmithyTaskData
+ _dataList []*GameSmithyTaskData
+}
+
+func NewGameSmithyTask(_buf []map[string]interface{}) (*GameSmithyTask, error) {
+ _dataList := make([]*GameSmithyTaskData, 0, len(_buf))
+ dataMap := make(map[int32]*GameSmithyTaskData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameSmithyTaskData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Key] = _v
+ }
+ }
+ return &GameSmithyTask{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameSmithyTask) GetDataMap() map[int32]*GameSmithyTaskData {
+ return table._dataMap
+}
+
+func (table *GameSmithyTask) GetDataList() []*GameSmithyTaskData {
+ return table._dataList
+}
+
+func (table *GameSmithyTask) Get(key int32) *GameSmithyTaskData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.SmithyTaskData.go b/sys/configure/structs/Game.SmithyTaskData.go
new file mode 100644
index 000000000..83bc2e71e
--- /dev/null
+++ b/sys/configure/structs/Game.SmithyTaskData.go
@@ -0,0 +1,56 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameSmithyTaskData struct {
+ Key int32
+ IdList int32
+ TaskDisplay string
+ TypeId int32
+ Reword []*Gameatn
+}
+
+const TypeId_GameSmithyTaskData = -1483471039
+
+func (*GameSmithyTaskData) GetTypeId() int32 {
+ return -1483471039
+}
+
+func (_v *GameSmithyTaskData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id_list"].(float64); !_ok_ { err = errors.New("id_list error"); return }; _v.IdList = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["task_display"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskDisplay error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskDisplay, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type_id"].(float64); !_ok_ { err = errors.New("type_id error"); return }; _v.TypeId = int32(_tempNum_) }
+ {
+ var _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 DeserializeGameSmithyTaskData(_buf map[string]interface{}) (*GameSmithyTaskData, error) {
+ v := &GameSmithyTaskData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go
index 34ab75167..05675a272 100644
--- a/sys/configure/structs/game.globalData.go
+++ b/sys/configure/structs/game.globalData.go
@@ -176,8 +176,10 @@ type GameGlobalData struct {
Moonshopmoney []int32
Generaltp *Gameatn
SmithyPurchaseType []int32
- RaiseTemperature []int32
- ExemptionTemperatureCos []int32
+ RaiseTemperature *Gameatn
+ RaiseTemperatureNum int32
+ ExemptionTemperatureCos *Gameatn
+ ExemptionTemperatureCosNum int32
}
const TypeId_GameGlobalData = 477542761
@@ -755,34 +757,10 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
}
}
- {
- var _arr_ []interface{}
- var _ok_ bool
- if _arr_, _ok_ = _buf["raise_temperature"].([]interface{}); !_ok_ { err = errors.New("raise_temperature error"); return }
-
- _v.RaiseTemperature = 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.RaiseTemperature = append(_v.RaiseTemperature, _list_v_)
- }
- }
-
- {
- var _arr_ []interface{}
- var _ok_ bool
- if _arr_, _ok_ = _buf["exemption_TemperatureCos"].([]interface{}); !_ok_ { err = errors.New("exemption_TemperatureCos error"); return }
-
- _v.ExemptionTemperatureCos = 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.ExemptionTemperatureCos = append(_v.ExemptionTemperatureCos, _list_v_)
- }
- }
-
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["raise_temperature"].(map[string]interface{}); !_ok_ { err = errors.New("raise_temperature error"); return }; if _v.RaiseTemperature, err = DeserializeGameatn(_x_); err != nil { return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["raise_temperatureNum"].(float64); !_ok_ { err = errors.New("raise_temperatureNum error"); return }; _v.RaiseTemperatureNum = int32(_tempNum_) }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["exemption_TemperatureCos"].(map[string]interface{}); !_ok_ { err = errors.New("exemption_TemperatureCos error"); return }; if _v.ExemptionTemperatureCos, err = DeserializeGameatn(_x_); err != nil { return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["exemption_TemperatureCosNum"].(float64); !_ok_ { err = errors.New("exemption_TemperatureCosNum error"); return }; _v.ExemptionTemperatureCosNum = int32(_tempNum_) }
return
}