diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json
index 442a33030..a74bf8aee 100644
--- a/bin/json/game_battleready.json
+++ b/bin/json/game_battleready.json
@@ -7,7 +7,8 @@
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
- "CanFriendHelp": 1
+ "CanFriendHelp": 1,
+ "Numrounds": 0
},
{
"id": 101,
@@ -17,7 +18,8 @@
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
- "CanFriendHelp": 0
+ "CanFriendHelp": 0,
+ "Numrounds": 0
},
{
"id": 102,
@@ -27,7 +29,8 @@
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
- "CanFriendHelp": 0
+ "CanFriendHelp": 0,
+ "Numrounds": 0
},
{
"id": 103,
@@ -37,7 +40,8 @@
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
- "CanFriendHelp": 0
+ "CanFriendHelp": 0,
+ "Numrounds": 0
},
{
"id": 104,
@@ -47,7 +51,8 @@
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
- "CanFriendHelp": 0
+ "CanFriendHelp": 0,
+ "Numrounds": 0
},
{
"id": 105,
@@ -57,7 +62,8 @@
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
- "CanFriendHelp": 0
+ "CanFriendHelp": 0,
+ "Numrounds": 0
},
{
"id": 106,
@@ -67,7 +73,8 @@
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
- "CanFriendHelp": 0
+ "CanFriendHelp": 0,
+ "Numrounds": 0
},
{
"id": 107,
@@ -77,7 +84,8 @@
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
- "CanFriendHelp": 0
+ "CanFriendHelp": 0,
+ "Numrounds": 0
},
{
"id": 108,
@@ -87,7 +95,8 @@
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
- "CanFriendHelp": 0
+ "CanFriendHelp": 0,
+ "Numrounds": 0
},
{
"id": 109,
@@ -97,7 +106,8 @@
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
- "CanFriendHelp": 0
+ "CanFriendHelp": 0,
+ "Numrounds": 0
},
{
"id": 110,
@@ -107,7 +117,8 @@
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
- "CanFriendHelp": 0
+ "CanFriendHelp": 0,
+ "Numrounds": 0
},
{
"id": 111,
@@ -117,6 +128,18 @@
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
- "CanFriendHelp": 0
+ "CanFriendHelp": 0,
+ "Numrounds": 0
+ },
+ {
+ "id": 112,
+ "PlayType": "panda",
+ "HeroCount": 5,
+ "DefaultHero": 0,
+ "DisableHero": [],
+ "LockSlots": [],
+ "AssistTeam": 0,
+ "CanFriendHelp": 0,
+ "Numrounds": 10
}
]
\ No newline at end of file
diff --git a/bin/json/game_battleready_capskill.json b/bin/json/game_battleready_capskill.json
new file mode 100644
index 000000000..f48bf4fb7
--- /dev/null
+++ b/bin/json/game_battleready_capskill.json
@@ -0,0 +1,21 @@
+[
+ {
+ "id": 101,
+ "lv": [
+ 20,
+ 1
+ ],
+ "start": [
+ 5,
+ 1
+ ],
+ "race": [
+ 2,
+ 1
+ ],
+ "heroid": [
+ "25001"
+ ],
+ "disableplay": []
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_coin.json b/bin/json/game_coin.json
index 07e638431..bf37dbbfe 100644
--- a/bin/json/game_coin.json
+++ b/bin/json/game_coin.json
@@ -170,7 +170,7 @@
},
{
"key": "moongold",
- "name": "moongold",
+ "name": "Badge of honor",
"color": 5,
"effects": "",
"access": 107,
diff --git a/bin/json/game_drawcard.json b/bin/json/game_drawcard.json
index 23110cdaf..199bd0672 100644
--- a/bin/json/game_drawcard.json
+++ b/bin/json/game_drawcard.json
@@ -5,8 +5,8 @@
"card_pool_type": "base_pool1",
"star": 3,
"race": 1,
- "id": "24004",
- "weight": 1000
+ "id": "35006",
+ "weight": 10000
},
{
"key": 2,
diff --git a/bin/json/game_equip.json b/bin/json/game_equip.json
index 0582107f8..bb0db1a68 100644
--- a/bin/json/game_equip.json
+++ b/bin/json/game_equip.json
@@ -6,6 +6,7 @@
"key": "equip_13001",
"text": "神龙大侠"
},
+ "atlas_id": "10",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -54,6 +55,7 @@
"key": "equip_13002",
"text": "神龙大侠"
},
+ "atlas_id": "11",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -102,6 +104,7 @@
"key": "equip_13003",
"text": "神龙大侠"
},
+ "atlas_id": "12",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -150,6 +153,7 @@
"key": "equip_13004",
"text": "神龙大侠"
},
+ "atlas_id": "13",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -198,6 +202,7 @@
"key": "equip_13001",
"text": "神龙大侠"
},
+ "atlas_id": "10",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -246,6 +251,7 @@
"key": "equip_13002",
"text": "神龙大侠"
},
+ "atlas_id": "11",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -294,6 +300,7 @@
"key": "equip_13003",
"text": "神龙大侠"
},
+ "atlas_id": "12",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -342,6 +349,7 @@
"key": "equip_13004",
"text": "神龙大侠"
},
+ "atlas_id": "13",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -390,6 +398,7 @@
"key": "equip_13001",
"text": "神龙大侠"
},
+ "atlas_id": "10",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -438,6 +447,7 @@
"key": "equip_13002",
"text": "神龙大侠"
},
+ "atlas_id": "11",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -486,6 +496,7 @@
"key": "equip_13003",
"text": "神龙大侠"
},
+ "atlas_id": "12",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -534,6 +545,7 @@
"key": "equip_13004",
"text": "神龙大侠"
},
+ "atlas_id": "13",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -582,6 +594,7 @@
"key": "equip_13001",
"text": "神龙大侠"
},
+ "atlas_id": "10",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -630,6 +643,7 @@
"key": "equip_13002",
"text": "神龙大侠"
},
+ "atlas_id": "11",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -678,6 +692,7 @@
"key": "equip_13003",
"text": "神龙大侠"
},
+ "atlas_id": "12",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -726,6 +741,7 @@
"key": "equip_13004",
"text": "神龙大侠"
},
+ "atlas_id": "13",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -774,6 +790,7 @@
"key": "equip_13001",
"text": "神龙大侠"
},
+ "atlas_id": "10",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -822,6 +839,7 @@
"key": "equip_13002",
"text": "神龙大侠"
},
+ "atlas_id": "11",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -870,6 +888,7 @@
"key": "equip_13003",
"text": "神龙大侠"
},
+ "atlas_id": "12",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -918,6 +937,7 @@
"key": "equip_13004",
"text": "神龙大侠"
},
+ "atlas_id": "13",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -966,6 +986,7 @@
"key": "equip_13001",
"text": "神龙大侠"
},
+ "atlas_id": "10",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -1014,6 +1035,7 @@
"key": "equip_13002",
"text": "神龙大侠"
},
+ "atlas_id": "11",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -1062,6 +1084,7 @@
"key": "equip_13003",
"text": "神龙大侠"
},
+ "atlas_id": "12",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -1110,6 +1133,7 @@
"key": "equip_13004",
"text": "神龙大侠"
},
+ "atlas_id": "13",
"suittype": 1,
"suitintr": {
"key": "suit_equip_10001",
@@ -1158,6 +1182,7 @@
"key": "equip_13001",
"text": "无牙仔"
},
+ "atlas_id": "20",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10001",
@@ -1206,6 +1231,7 @@
"key": "equip_13002",
"text": "无牙仔"
},
+ "atlas_id": "21",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10001",
@@ -1254,6 +1280,7 @@
"key": "equip_13003",
"text": "无牙仔"
},
+ "atlas_id": "22",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10001",
@@ -1302,6 +1329,7 @@
"key": "equip_13004",
"text": "无牙仔"
},
+ "atlas_id": "23",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10001",
@@ -1350,6 +1378,7 @@
"key": "equip_13001",
"text": "无牙仔"
},
+ "atlas_id": "20",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10001",
@@ -1398,6 +1427,7 @@
"key": "equip_13002",
"text": "无牙仔"
},
+ "atlas_id": "21",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10001",
@@ -1446,6 +1476,7 @@
"key": "equip_13003",
"text": "无牙仔"
},
+ "atlas_id": "22",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10001",
@@ -1494,6 +1525,7 @@
"key": "equip_13004",
"text": "无牙仔"
},
+ "atlas_id": "23",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10001",
@@ -1542,6 +1574,7 @@
"key": "equip_13001",
"text": "无牙仔"
},
+ "atlas_id": "20",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10001",
@@ -1590,6 +1623,7 @@
"key": "equip_13002",
"text": "无牙仔"
},
+ "atlas_id": "21",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10001",
@@ -1638,6 +1672,7 @@
"key": "equip_13003",
"text": "无牙仔"
},
+ "atlas_id": "22",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10001",
@@ -1686,6 +1721,7 @@
"key": "equip_13004",
"text": "无牙仔"
},
+ "atlas_id": "23",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10001",
@@ -1734,6 +1770,7 @@
"key": "equip_13001",
"text": "无牙仔"
},
+ "atlas_id": "20",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10002",
@@ -1782,6 +1819,7 @@
"key": "equip_13002",
"text": "无牙仔"
},
+ "atlas_id": "21",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10002",
@@ -1830,6 +1868,7 @@
"key": "equip_13003",
"text": "无牙仔"
},
+ "atlas_id": "22",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10002",
@@ -1878,6 +1917,7 @@
"key": "equip_13004",
"text": "无牙仔"
},
+ "atlas_id": "23",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10002",
@@ -1926,6 +1966,7 @@
"key": "equip_13001",
"text": "无牙仔"
},
+ "atlas_id": "20",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10002",
@@ -1974,6 +2015,7 @@
"key": "equip_13002",
"text": "无牙仔"
},
+ "atlas_id": "21",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10002",
@@ -2022,6 +2064,7 @@
"key": "equip_13003",
"text": "无牙仔"
},
+ "atlas_id": "22",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10002",
@@ -2070,6 +2113,7 @@
"key": "equip_13004",
"text": "无牙仔"
},
+ "atlas_id": "23",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10002",
@@ -2118,6 +2162,7 @@
"key": "equip_13001",
"text": "无牙仔"
},
+ "atlas_id": "20",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10002",
@@ -2166,6 +2211,7 @@
"key": "equip_13002",
"text": "无牙仔"
},
+ "atlas_id": "21",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10002",
@@ -2214,6 +2260,7 @@
"key": "equip_13003",
"text": "无牙仔"
},
+ "atlas_id": "22",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10002",
@@ -2262,6 +2309,7 @@
"key": "equip_13004",
"text": "无牙仔"
},
+ "atlas_id": "23",
"suittype": 2,
"suitintr": {
"key": "suit_equip_10002",
@@ -2310,6 +2358,7 @@
"key": "equip_13001",
"text": "冰霜杰克"
},
+ "atlas_id": "30",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2358,6 +2407,7 @@
"key": "equip_13002",
"text": "冰霜杰克"
},
+ "atlas_id": "31",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2406,6 +2456,7 @@
"key": "equip_13003",
"text": "冰霜杰克"
},
+ "atlas_id": "32",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2454,6 +2505,7 @@
"key": "equip_13004",
"text": "冰霜杰克"
},
+ "atlas_id": "33",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2502,6 +2554,7 @@
"key": "equip_13001",
"text": "冰霜杰克"
},
+ "atlas_id": "30",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2550,6 +2603,7 @@
"key": "equip_13002",
"text": "冰霜杰克"
},
+ "atlas_id": "31",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2598,6 +2652,7 @@
"key": "equip_13003",
"text": "冰霜杰克"
},
+ "atlas_id": "32",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2646,6 +2701,7 @@
"key": "equip_13004",
"text": "冰霜杰克"
},
+ "atlas_id": "33",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2694,6 +2750,7 @@
"key": "equip_13001",
"text": "冰霜杰克"
},
+ "atlas_id": "30",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2742,6 +2799,7 @@
"key": "equip_13002",
"text": "冰霜杰克"
},
+ "atlas_id": "31",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2790,6 +2848,7 @@
"key": "equip_13003",
"text": "冰霜杰克"
},
+ "atlas_id": "32",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2838,6 +2897,7 @@
"key": "equip_13004",
"text": "冰霜杰克"
},
+ "atlas_id": "33",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2886,6 +2946,7 @@
"key": "equip_13001",
"text": "冰霜杰克"
},
+ "atlas_id": "30",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2934,6 +2995,7 @@
"key": "equip_13002",
"text": "冰霜杰克"
},
+ "atlas_id": "31",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -2982,6 +3044,7 @@
"key": "equip_13003",
"text": "冰霜杰克"
},
+ "atlas_id": "32",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -3030,6 +3093,7 @@
"key": "equip_13004",
"text": "冰霜杰克"
},
+ "atlas_id": "33",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -3078,6 +3142,7 @@
"key": "equip_13001",
"text": "冰霜杰克"
},
+ "atlas_id": "30",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -3126,6 +3191,7 @@
"key": "equip_13002",
"text": "冰霜杰克"
},
+ "atlas_id": "31",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -3174,6 +3240,7 @@
"key": "equip_13003",
"text": "冰霜杰克"
},
+ "atlas_id": "32",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -3222,6 +3289,7 @@
"key": "equip_13004",
"text": "冰霜杰克"
},
+ "atlas_id": "33",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -3270,6 +3338,7 @@
"key": "equip_13001",
"text": "冰霜杰克"
},
+ "atlas_id": "30",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -3318,6 +3387,7 @@
"key": "equip_13002",
"text": "冰霜杰克"
},
+ "atlas_id": "31",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -3366,6 +3436,7 @@
"key": "equip_13003",
"text": "冰霜杰克"
},
+ "atlas_id": "32",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -3414,6 +3485,7 @@
"key": "equip_13004",
"text": "冰霜杰克"
},
+ "atlas_id": "33",
"suittype": 3,
"suitintr": {
"key": "suit_equip_10002",
@@ -3462,6 +3534,7 @@
"key": "equip_13001",
"text": "漆黑"
},
+ "atlas_id": "40",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -3510,6 +3583,7 @@
"key": "equip_13002",
"text": "漆黑"
},
+ "atlas_id": "41",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -3558,6 +3632,7 @@
"key": "equip_13003",
"text": "漆黑"
},
+ "atlas_id": "42",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -3606,6 +3681,7 @@
"key": "equip_13004",
"text": "漆黑"
},
+ "atlas_id": "43",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -3654,6 +3730,7 @@
"key": "equip_13001",
"text": "漆黑"
},
+ "atlas_id": "40",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -3702,6 +3779,7 @@
"key": "equip_13002",
"text": "漆黑"
},
+ "atlas_id": "41",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -3750,6 +3828,7 @@
"key": "equip_13003",
"text": "漆黑"
},
+ "atlas_id": "42",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -3798,6 +3877,7 @@
"key": "equip_13004",
"text": "漆黑"
},
+ "atlas_id": "43",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -3846,6 +3926,7 @@
"key": "equip_13001",
"text": "漆黑"
},
+ "atlas_id": "40",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -3894,6 +3975,7 @@
"key": "equip_13002",
"text": "漆黑"
},
+ "atlas_id": "41",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -3942,6 +4024,7 @@
"key": "equip_13003",
"text": "漆黑"
},
+ "atlas_id": "42",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -3990,6 +4073,7 @@
"key": "equip_13004",
"text": "漆黑"
},
+ "atlas_id": "43",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4038,6 +4122,7 @@
"key": "equip_13001",
"text": "漆黑"
},
+ "atlas_id": "40",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4086,6 +4171,7 @@
"key": "equip_13002",
"text": "漆黑"
},
+ "atlas_id": "41",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4134,6 +4220,7 @@
"key": "equip_13003",
"text": "漆黑"
},
+ "atlas_id": "42",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4182,6 +4269,7 @@
"key": "equip_13004",
"text": "漆黑"
},
+ "atlas_id": "43",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4230,6 +4318,7 @@
"key": "equip_13001",
"text": "漆黑"
},
+ "atlas_id": "40",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4278,6 +4367,7 @@
"key": "equip_13002",
"text": "漆黑"
},
+ "atlas_id": "41",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4326,6 +4416,7 @@
"key": "equip_13003",
"text": "漆黑"
},
+ "atlas_id": "42",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4374,6 +4465,7 @@
"key": "equip_13004",
"text": "漆黑"
},
+ "atlas_id": "43",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4422,6 +4514,7 @@
"key": "equip_13001",
"text": "漆黑"
},
+ "atlas_id": "40",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4470,6 +4563,7 @@
"key": "equip_13002",
"text": "漆黑"
},
+ "atlas_id": "41",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4518,6 +4612,7 @@
"key": "equip_13003",
"text": "漆黑"
},
+ "atlas_id": "42",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4566,6 +4661,7 @@
"key": "equip_13004",
"text": "漆黑"
},
+ "atlas_id": "43",
"suittype": 4,
"suitintr": {
"key": "suit_equip_10002",
@@ -4614,6 +4710,7 @@
"key": "equip_13001",
"text": "醉乡民谣"
},
+ "atlas_id": "50",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -4662,6 +4759,7 @@
"key": "equip_13002",
"text": "醉乡民谣"
},
+ "atlas_id": "51",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -4710,6 +4808,7 @@
"key": "equip_13003",
"text": "醉乡民谣"
},
+ "atlas_id": "52",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -4758,6 +4857,7 @@
"key": "equip_13004",
"text": "醉乡民谣"
},
+ "atlas_id": "53",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -4806,6 +4906,7 @@
"key": "equip_13001",
"text": "醉乡民谣"
},
+ "atlas_id": "50",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -4854,6 +4955,7 @@
"key": "equip_13002",
"text": "醉乡民谣"
},
+ "atlas_id": "51",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -4902,6 +5004,7 @@
"key": "equip_13003",
"text": "醉乡民谣"
},
+ "atlas_id": "52",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -4950,6 +5053,7 @@
"key": "equip_13004",
"text": "醉乡民谣"
},
+ "atlas_id": "53",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -4998,6 +5102,7 @@
"key": "equip_13001",
"text": "醉乡民谣"
},
+ "atlas_id": "50",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5046,6 +5151,7 @@
"key": "equip_13002",
"text": "醉乡民谣"
},
+ "atlas_id": "51",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5094,6 +5200,7 @@
"key": "equip_13003",
"text": "醉乡民谣"
},
+ "atlas_id": "52",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5142,6 +5249,7 @@
"key": "equip_13004",
"text": "醉乡民谣"
},
+ "atlas_id": "53",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5190,6 +5298,7 @@
"key": "equip_13001",
"text": "醉乡民谣"
},
+ "atlas_id": "50",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5238,6 +5347,7 @@
"key": "equip_13002",
"text": "醉乡民谣"
},
+ "atlas_id": "51",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5286,6 +5396,7 @@
"key": "equip_13003",
"text": "醉乡民谣"
},
+ "atlas_id": "52",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5334,6 +5445,7 @@
"key": "equip_13004",
"text": "醉乡民谣"
},
+ "atlas_id": "53",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5382,6 +5494,7 @@
"key": "equip_13001",
"text": "醉乡民谣"
},
+ "atlas_id": "50",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5430,6 +5543,7 @@
"key": "equip_13002",
"text": "醉乡民谣"
},
+ "atlas_id": "51",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5478,6 +5592,7 @@
"key": "equip_13003",
"text": "醉乡民谣"
},
+ "atlas_id": "52",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5526,6 +5641,7 @@
"key": "equip_13004",
"text": "醉乡民谣"
},
+ "atlas_id": "53",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5574,6 +5690,7 @@
"key": "equip_13001",
"text": "醉乡民谣"
},
+ "atlas_id": "50",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5622,6 +5739,7 @@
"key": "equip_13002",
"text": "醉乡民谣"
},
+ "atlas_id": "51",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5670,6 +5788,7 @@
"key": "equip_13003",
"text": "醉乡民谣"
},
+ "atlas_id": "52",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5718,6 +5837,7 @@
"key": "equip_13004",
"text": "醉乡民谣"
},
+ "atlas_id": "53",
"suittype": 5,
"suitintr": {
"key": "suit_equip_10002",
@@ -5766,6 +5886,7 @@
"key": "equip_13001",
"text": "果子酒"
},
+ "atlas_id": "60",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -5814,6 +5935,7 @@
"key": "equip_13002",
"text": "果子酒"
},
+ "atlas_id": "61",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -5862,6 +5984,7 @@
"key": "equip_13003",
"text": "果子酒"
},
+ "atlas_id": "62",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -5910,6 +6033,7 @@
"key": "equip_13004",
"text": "果子酒"
},
+ "atlas_id": "63",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -5958,6 +6082,7 @@
"key": "equip_13001",
"text": "果子酒"
},
+ "atlas_id": "60",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6006,6 +6131,7 @@
"key": "equip_13002",
"text": "果子酒"
},
+ "atlas_id": "61",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6054,6 +6180,7 @@
"key": "equip_13003",
"text": "果子酒"
},
+ "atlas_id": "62",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6102,6 +6229,7 @@
"key": "equip_13004",
"text": "果子酒"
},
+ "atlas_id": "63",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6150,6 +6278,7 @@
"key": "equip_13001",
"text": "果子酒"
},
+ "atlas_id": "60",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6198,6 +6327,7 @@
"key": "equip_13002",
"text": "果子酒"
},
+ "atlas_id": "61",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6246,6 +6376,7 @@
"key": "equip_13003",
"text": "果子酒"
},
+ "atlas_id": "62",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6294,6 +6425,7 @@
"key": "equip_13004",
"text": "果子酒"
},
+ "atlas_id": "63",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6342,6 +6474,7 @@
"key": "equip_13001",
"text": "果子酒"
},
+ "atlas_id": "60",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6390,6 +6523,7 @@
"key": "equip_13002",
"text": "果子酒"
},
+ "atlas_id": "61",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6438,6 +6572,7 @@
"key": "equip_13003",
"text": "果子酒"
},
+ "atlas_id": "62",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6486,6 +6621,7 @@
"key": "equip_13004",
"text": "果子酒"
},
+ "atlas_id": "63",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6534,6 +6670,7 @@
"key": "equip_13001",
"text": "果子酒"
},
+ "atlas_id": "60",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6582,6 +6719,7 @@
"key": "equip_13002",
"text": "果子酒"
},
+ "atlas_id": "61",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6630,6 +6768,7 @@
"key": "equip_13003",
"text": "果子酒"
},
+ "atlas_id": "62",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6678,6 +6817,7 @@
"key": "equip_13004",
"text": "果子酒"
},
+ "atlas_id": "63",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6726,6 +6866,7 @@
"key": "equip_13001",
"text": "果子酒"
},
+ "atlas_id": "60",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6774,6 +6915,7 @@
"key": "equip_13002",
"text": "果子酒"
},
+ "atlas_id": "61",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6822,6 +6964,7 @@
"key": "equip_13003",
"text": "果子酒"
},
+ "atlas_id": "62",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6870,6 +7013,7 @@
"key": "equip_13004",
"text": "果子酒"
},
+ "atlas_id": "63",
"suittype": 6,
"suitintr": {
"key": "suit_equip_10002",
@@ -6918,6 +7062,7 @@
"key": "equip_13001",
"text": "月中人"
},
+ "atlas_id": "70",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -6966,6 +7111,7 @@
"key": "equip_13002",
"text": "月中人"
},
+ "atlas_id": "71",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7014,6 +7160,7 @@
"key": "equip_13003",
"text": "月中人"
},
+ "atlas_id": "72",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7062,6 +7209,7 @@
"key": "equip_13004",
"text": "月中人"
},
+ "atlas_id": "73",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7110,6 +7258,7 @@
"key": "equip_13001",
"text": "月中人"
},
+ "atlas_id": "70",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7158,6 +7307,7 @@
"key": "equip_13002",
"text": "月中人"
},
+ "atlas_id": "71",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7206,6 +7356,7 @@
"key": "equip_13003",
"text": "月中人"
},
+ "atlas_id": "72",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7254,6 +7405,7 @@
"key": "equip_13004",
"text": "月中人"
},
+ "atlas_id": "73",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7302,6 +7454,7 @@
"key": "equip_13001",
"text": "月中人"
},
+ "atlas_id": "70",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7350,6 +7503,7 @@
"key": "equip_13002",
"text": "月中人"
},
+ "atlas_id": "71",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7398,6 +7552,7 @@
"key": "equip_13003",
"text": "月中人"
},
+ "atlas_id": "72",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7446,6 +7601,7 @@
"key": "equip_13004",
"text": "月中人"
},
+ "atlas_id": "73",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7494,6 +7650,7 @@
"key": "equip_13001",
"text": "月中人"
},
+ "atlas_id": "70",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7542,6 +7699,7 @@
"key": "equip_13002",
"text": "月中人"
},
+ "atlas_id": "71",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7590,6 +7748,7 @@
"key": "equip_13003",
"text": "月中人"
},
+ "atlas_id": "72",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7638,6 +7797,7 @@
"key": "equip_13004",
"text": "月中人"
},
+ "atlas_id": "73",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7686,6 +7846,7 @@
"key": "equip_13001",
"text": "月中人"
},
+ "atlas_id": "70",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7734,6 +7895,7 @@
"key": "equip_13002",
"text": "月中人"
},
+ "atlas_id": "71",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7782,6 +7944,7 @@
"key": "equip_13003",
"text": "月中人"
},
+ "atlas_id": "72",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7830,6 +7993,7 @@
"key": "equip_13004",
"text": "月中人"
},
+ "atlas_id": "73",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7878,6 +8042,7 @@
"key": "equip_13001",
"text": "月中人"
},
+ "atlas_id": "70",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7926,6 +8091,7 @@
"key": "equip_13002",
"text": "月中人"
},
+ "atlas_id": "71",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -7974,6 +8140,7 @@
"key": "equip_13003",
"text": "月中人"
},
+ "atlas_id": "72",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -8022,6 +8189,7 @@
"key": "equip_13004",
"text": "月中人"
},
+ "atlas_id": "73",
"suittype": 7,
"suitintr": {
"key": "suit_equip_10002",
@@ -8070,6 +8238,7 @@
"key": "equip_13001",
"text": "功夫五侠"
},
+ "atlas_id": "80",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8118,6 +8287,7 @@
"key": "equip_13002",
"text": "功夫五侠"
},
+ "atlas_id": "81",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8166,6 +8336,7 @@
"key": "equip_13003",
"text": "功夫五侠"
},
+ "atlas_id": "82",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8214,6 +8385,7 @@
"key": "equip_13004",
"text": "功夫五侠"
},
+ "atlas_id": "83",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8262,6 +8434,7 @@
"key": "equip_13001",
"text": "功夫五侠"
},
+ "atlas_id": "80",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8310,6 +8483,7 @@
"key": "equip_13002",
"text": "功夫五侠"
},
+ "atlas_id": "81",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8358,6 +8532,7 @@
"key": "equip_13003",
"text": "功夫五侠"
},
+ "atlas_id": "82",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8406,6 +8581,7 @@
"key": "equip_13004",
"text": "功夫五侠"
},
+ "atlas_id": "83",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8454,6 +8630,7 @@
"key": "equip_13001",
"text": "功夫五侠"
},
+ "atlas_id": "80",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8502,6 +8679,7 @@
"key": "equip_13002",
"text": "功夫五侠"
},
+ "atlas_id": "81",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8550,6 +8728,7 @@
"key": "equip_13003",
"text": "功夫五侠"
},
+ "atlas_id": "82",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8598,6 +8777,7 @@
"key": "equip_13004",
"text": "功夫五侠"
},
+ "atlas_id": "83",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8646,6 +8826,7 @@
"key": "equip_13001",
"text": "功夫五侠"
},
+ "atlas_id": "80",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8694,6 +8875,7 @@
"key": "equip_13002",
"text": "功夫五侠"
},
+ "atlas_id": "81",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8742,6 +8924,7 @@
"key": "equip_13003",
"text": "功夫五侠"
},
+ "atlas_id": "82",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8790,6 +8973,7 @@
"key": "equip_13004",
"text": "功夫五侠"
},
+ "atlas_id": "83",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8838,6 +9022,7 @@
"key": "equip_13001",
"text": "功夫五侠"
},
+ "atlas_id": "80",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8886,6 +9071,7 @@
"key": "equip_13002",
"text": "功夫五侠"
},
+ "atlas_id": "81",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8934,6 +9120,7 @@
"key": "equip_13003",
"text": "功夫五侠"
},
+ "atlas_id": "82",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -8982,6 +9169,7 @@
"key": "equip_13004",
"text": "功夫五侠"
},
+ "atlas_id": "83",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -9030,6 +9218,7 @@
"key": "equip_13001",
"text": "功夫五侠"
},
+ "atlas_id": "80",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -9078,6 +9267,7 @@
"key": "equip_13002",
"text": "功夫五侠"
},
+ "atlas_id": "81",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -9126,6 +9316,7 @@
"key": "equip_13003",
"text": "功夫五侠"
},
+ "atlas_id": "82",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -9174,6 +9365,7 @@
"key": "equip_13004",
"text": "功夫五侠"
},
+ "atlas_id": "83",
"suittype": 8,
"suitintr": {
"key": "suit_equip_10002",
@@ -9222,6 +9414,7 @@
"key": "equip_13001",
"text": "黄金包子"
},
+ "atlas_id": "90",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9270,6 +9463,7 @@
"key": "equip_13002",
"text": "黄金包子"
},
+ "atlas_id": "91",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9318,6 +9512,7 @@
"key": "equip_13003",
"text": "黄金包子"
},
+ "atlas_id": "92",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9366,6 +9561,7 @@
"key": "equip_13004",
"text": "黄金包子"
},
+ "atlas_id": "93",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9414,6 +9610,7 @@
"key": "equip_13001",
"text": "黄金包子"
},
+ "atlas_id": "90",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9462,6 +9659,7 @@
"key": "equip_13002",
"text": "黄金包子"
},
+ "atlas_id": "91",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9510,6 +9708,7 @@
"key": "equip_13003",
"text": "黄金包子"
},
+ "atlas_id": "92",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9558,6 +9757,7 @@
"key": "equip_13004",
"text": "黄金包子"
},
+ "atlas_id": "93",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9606,6 +9806,7 @@
"key": "equip_13001",
"text": "黄金包子"
},
+ "atlas_id": "90",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9654,6 +9855,7 @@
"key": "equip_13002",
"text": "黄金包子"
},
+ "atlas_id": "91",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9702,6 +9904,7 @@
"key": "equip_13003",
"text": "黄金包子"
},
+ "atlas_id": "92",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9750,6 +9953,7 @@
"key": "equip_13004",
"text": "黄金包子"
},
+ "atlas_id": "93",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9798,6 +10002,7 @@
"key": "equip_13001",
"text": "黄金包子"
},
+ "atlas_id": "90",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9846,6 +10051,7 @@
"key": "equip_13002",
"text": "黄金包子"
},
+ "atlas_id": "91",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9894,6 +10100,7 @@
"key": "equip_13003",
"text": "黄金包子"
},
+ "atlas_id": "92",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9942,6 +10149,7 @@
"key": "equip_13004",
"text": "黄金包子"
},
+ "atlas_id": "93",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -9990,6 +10198,7 @@
"key": "equip_13001",
"text": "黄金包子"
},
+ "atlas_id": "90",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -10038,6 +10247,7 @@
"key": "equip_13002",
"text": "黄金包子"
},
+ "atlas_id": "91",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -10086,6 +10296,7 @@
"key": "equip_13003",
"text": "黄金包子"
},
+ "atlas_id": "92",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -10134,6 +10345,7 @@
"key": "equip_13004",
"text": "黄金包子"
},
+ "atlas_id": "93",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -10182,6 +10394,7 @@
"key": "equip_13001",
"text": "黄金包子"
},
+ "atlas_id": "90",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -10230,6 +10443,7 @@
"key": "equip_13002",
"text": "黄金包子"
},
+ "atlas_id": "91",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -10278,6 +10492,7 @@
"key": "equip_13003",
"text": "黄金包子"
},
+ "atlas_id": "92",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -10326,6 +10541,7 @@
"key": "equip_13004",
"text": "黄金包子"
},
+ "atlas_id": "93",
"suittype": 9,
"suitintr": {
"key": "suit_equip_10002",
@@ -10374,6 +10590,7 @@
"key": "equip_13001",
"text": "月台"
},
+ "atlas_id": "100",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10422,6 +10639,7 @@
"key": "equip_13002",
"text": "月台"
},
+ "atlas_id": "101",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10470,6 +10688,7 @@
"key": "equip_13003",
"text": "月台"
},
+ "atlas_id": "102",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10518,6 +10737,7 @@
"key": "equip_13004",
"text": "月台"
},
+ "atlas_id": "103",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10566,6 +10786,7 @@
"key": "equip_13001",
"text": "月台"
},
+ "atlas_id": "100",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10614,6 +10835,7 @@
"key": "equip_13002",
"text": "月台"
},
+ "atlas_id": "101",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10662,6 +10884,7 @@
"key": "equip_13003",
"text": "月台"
},
+ "atlas_id": "102",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10710,6 +10933,7 @@
"key": "equip_13004",
"text": "月台"
},
+ "atlas_id": "103",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10758,6 +10982,7 @@
"key": "equip_13001",
"text": "月台"
},
+ "atlas_id": "100",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10806,6 +11031,7 @@
"key": "equip_13002",
"text": "月台"
},
+ "atlas_id": "101",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10854,6 +11080,7 @@
"key": "equip_13003",
"text": "月台"
},
+ "atlas_id": "102",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10902,6 +11129,7 @@
"key": "equip_13004",
"text": "月台"
},
+ "atlas_id": "103",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10950,6 +11178,7 @@
"key": "equip_13001",
"text": "月台"
},
+ "atlas_id": "100",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -10998,6 +11227,7 @@
"key": "equip_13002",
"text": "月台"
},
+ "atlas_id": "101",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -11046,6 +11276,7 @@
"key": "equip_13003",
"text": "月台"
},
+ "atlas_id": "102",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -11094,6 +11325,7 @@
"key": "equip_13004",
"text": "月台"
},
+ "atlas_id": "103",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -11142,6 +11374,7 @@
"key": "equip_13001",
"text": "月台"
},
+ "atlas_id": "100",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -11190,6 +11423,7 @@
"key": "equip_13002",
"text": "月台"
},
+ "atlas_id": "101",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -11238,6 +11472,7 @@
"key": "equip_13003",
"text": "月台"
},
+ "atlas_id": "102",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -11286,6 +11521,7 @@
"key": "equip_13004",
"text": "月台"
},
+ "atlas_id": "103",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -11334,6 +11570,7 @@
"key": "equip_13001",
"text": "月台"
},
+ "atlas_id": "100",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -11382,6 +11619,7 @@
"key": "equip_13002",
"text": "月台"
},
+ "atlas_id": "101",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -11430,6 +11668,7 @@
"key": "equip_13003",
"text": "月台"
},
+ "atlas_id": "102",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -11478,6 +11717,7 @@
"key": "equip_13004",
"text": "月台"
},
+ "atlas_id": "103",
"suittype": 10,
"suitintr": {
"key": "suit_equip_10002",
@@ -11526,6 +11766,7 @@
"key": "equip_13005",
"text": "老板"
},
+ "atlas_id": "114",
"suittype": 11,
"suitintr": {
"key": "suit_equip_10002",
@@ -11574,6 +11815,7 @@
"key": "equip_13006",
"text": "老板"
},
+ "atlas_id": "115",
"suittype": 11,
"suitintr": {
"key": "suit_equip_10002",
@@ -11622,6 +11864,7 @@
"key": "equip_13005",
"text": "老板"
},
+ "atlas_id": "114",
"suittype": 11,
"suitintr": {
"key": "suit_equip_10002",
@@ -11670,6 +11913,7 @@
"key": "equip_13006",
"text": "老板"
},
+ "atlas_id": "115",
"suittype": 11,
"suitintr": {
"key": "suit_equip_10002",
@@ -11718,6 +11962,7 @@
"key": "equip_13005",
"text": "老板"
},
+ "atlas_id": "114",
"suittype": 11,
"suitintr": {
"key": "suit_equip_10002",
@@ -11766,6 +12011,7 @@
"key": "equip_13006",
"text": "老板"
},
+ "atlas_id": "115",
"suittype": 11,
"suitintr": {
"key": "suit_equip_10002",
@@ -11814,6 +12060,7 @@
"key": "equip_13005",
"text": "老板"
},
+ "atlas_id": "114",
"suittype": 11,
"suitintr": {
"key": "suit_equip_10002",
@@ -11862,6 +12109,7 @@
"key": "equip_13006",
"text": "老板"
},
+ "atlas_id": "115",
"suittype": 11,
"suitintr": {
"key": "suit_equip_10002",
@@ -11910,6 +12158,7 @@
"key": "equip_13005",
"text": "老板"
},
+ "atlas_id": "114",
"suittype": 11,
"suitintr": {
"key": "suit_equip_10002",
@@ -11958,6 +12207,7 @@
"key": "equip_13006",
"text": "老板"
},
+ "atlas_id": "115",
"suittype": 11,
"suitintr": {
"key": "suit_equip_10002",
@@ -12006,6 +12256,7 @@
"key": "equip_13005",
"text": "老板"
},
+ "atlas_id": "114",
"suittype": 11,
"suitintr": {
"key": "suit_equip_10002",
@@ -12054,6 +12305,7 @@
"key": "equip_13006",
"text": "老板"
},
+ "atlas_id": "115",
"suittype": 11,
"suitintr": {
"key": "suit_equip_10002",
@@ -12102,6 +12354,7 @@
"key": "equip_13005",
"text": "野蛮人"
},
+ "atlas_id": "124",
"suittype": 12,
"suitintr": {
"key": "suit_equip_10002",
@@ -12150,6 +12403,7 @@
"key": "equip_13006",
"text": "野蛮人"
},
+ "atlas_id": "125",
"suittype": 12,
"suitintr": {
"key": "suit_equip_10002",
@@ -12198,6 +12452,7 @@
"key": "equip_13005",
"text": "野蛮人"
},
+ "atlas_id": "124",
"suittype": 12,
"suitintr": {
"key": "suit_equip_10002",
@@ -12246,6 +12501,7 @@
"key": "equip_13006",
"text": "野蛮人"
},
+ "atlas_id": "125",
"suittype": 12,
"suitintr": {
"key": "suit_equip_10002",
@@ -12294,6 +12550,7 @@
"key": "equip_13005",
"text": "野蛮人"
},
+ "atlas_id": "124",
"suittype": 12,
"suitintr": {
"key": "suit_equip_10002",
@@ -12342,6 +12599,7 @@
"key": "equip_13006",
"text": "野蛮人"
},
+ "atlas_id": "125",
"suittype": 12,
"suitintr": {
"key": "suit_equip_10002",
@@ -12390,6 +12648,7 @@
"key": "equip_13005",
"text": "野蛮人"
},
+ "atlas_id": "124",
"suittype": 12,
"suitintr": {
"key": "suit_equip_10002",
@@ -12438,6 +12697,7 @@
"key": "equip_13006",
"text": "野蛮人"
},
+ "atlas_id": "125",
"suittype": 12,
"suitintr": {
"key": "suit_equip_10002",
@@ -12486,6 +12746,7 @@
"key": "equip_13005",
"text": "野蛮人"
},
+ "atlas_id": "124",
"suittype": 12,
"suitintr": {
"key": "suit_equip_10002",
@@ -12534,6 +12795,7 @@
"key": "equip_13006",
"text": "野蛮人"
},
+ "atlas_id": "125",
"suittype": 12,
"suitintr": {
"key": "suit_equip_10002",
@@ -12582,6 +12844,7 @@
"key": "equip_13005",
"text": "野蛮人"
},
+ "atlas_id": "124",
"suittype": 12,
"suitintr": {
"key": "suit_equip_10002",
@@ -12630,6 +12893,7 @@
"key": "equip_13006",
"text": "野蛮人"
},
+ "atlas_id": "125",
"suittype": 12,
"suitintr": {
"key": "suit_equip_10002",
@@ -12678,6 +12942,7 @@
"key": "equip_13005",
"text": "文明人"
},
+ "atlas_id": "134",
"suittype": 13,
"suitintr": {
"key": "suit_equip_10002",
@@ -12726,6 +12991,7 @@
"key": "equip_13006",
"text": "文明人"
},
+ "atlas_id": "135",
"suittype": 13,
"suitintr": {
"key": "suit_equip_10002",
@@ -12774,6 +13040,7 @@
"key": "equip_13005",
"text": "文明人"
},
+ "atlas_id": "134",
"suittype": 13,
"suitintr": {
"key": "suit_equip_10002",
@@ -12822,6 +13089,7 @@
"key": "equip_13006",
"text": "文明人"
},
+ "atlas_id": "135",
"suittype": 13,
"suitintr": {
"key": "suit_equip_10002",
@@ -12870,6 +13138,7 @@
"key": "equip_13005",
"text": "文明人"
},
+ "atlas_id": "134",
"suittype": 13,
"suitintr": {
"key": "suit_equip_10002",
@@ -12918,6 +13187,7 @@
"key": "equip_13006",
"text": "文明人"
},
+ "atlas_id": "135",
"suittype": 13,
"suitintr": {
"key": "suit_equip_10002",
@@ -12966,6 +13236,7 @@
"key": "equip_13005",
"text": "文明人"
},
+ "atlas_id": "134",
"suittype": 13,
"suitintr": {
"key": "suit_equip_10002",
@@ -13014,6 +13285,7 @@
"key": "equip_13006",
"text": "文明人"
},
+ "atlas_id": "135",
"suittype": 13,
"suitintr": {
"key": "suit_equip_10002",
@@ -13062,6 +13334,7 @@
"key": "equip_13005",
"text": "文明人"
},
+ "atlas_id": "134",
"suittype": 13,
"suitintr": {
"key": "suit_equip_10002",
@@ -13110,6 +13383,7 @@
"key": "equip_13006",
"text": "文明人"
},
+ "atlas_id": "135",
"suittype": 13,
"suitintr": {
"key": "suit_equip_10002",
@@ -13158,6 +13432,7 @@
"key": "equip_13005",
"text": "文明人"
},
+ "atlas_id": "134",
"suittype": 13,
"suitintr": {
"key": "suit_equip_10002",
@@ -13206,6 +13481,7 @@
"key": "equip_13006",
"text": "文明人"
},
+ "atlas_id": "135",
"suittype": 13,
"suitintr": {
"key": "suit_equip_10002",
@@ -13254,6 +13530,7 @@
"key": "equip_13005",
"text": "玉如意"
},
+ "atlas_id": "144",
"suittype": 14,
"suitintr": {
"key": "suit_equip_10002",
@@ -13302,6 +13579,7 @@
"key": "equip_13006",
"text": "玉如意"
},
+ "atlas_id": "145",
"suittype": 14,
"suitintr": {
"key": "suit_equip_10002",
@@ -13350,6 +13628,7 @@
"key": "equip_13005",
"text": "玉如意"
},
+ "atlas_id": "144",
"suittype": 14,
"suitintr": {
"key": "suit_equip_10002",
@@ -13398,6 +13677,7 @@
"key": "equip_13006",
"text": "玉如意"
},
+ "atlas_id": "145",
"suittype": 14,
"suitintr": {
"key": "suit_equip_10002",
@@ -13446,6 +13726,7 @@
"key": "equip_13005",
"text": "玉如意"
},
+ "atlas_id": "144",
"suittype": 14,
"suitintr": {
"key": "suit_equip_10002",
@@ -13494,6 +13775,7 @@
"key": "equip_13006",
"text": "玉如意"
},
+ "atlas_id": "145",
"suittype": 14,
"suitintr": {
"key": "suit_equip_10002",
@@ -13542,6 +13824,7 @@
"key": "equip_13005",
"text": "玉如意"
},
+ "atlas_id": "144",
"suittype": 14,
"suitintr": {
"key": "suit_equip_10002",
@@ -13590,6 +13873,7 @@
"key": "equip_13006",
"text": "玉如意"
},
+ "atlas_id": "145",
"suittype": 14,
"suitintr": {
"key": "suit_equip_10002",
@@ -13638,6 +13922,7 @@
"key": "equip_13005",
"text": "玉如意"
},
+ "atlas_id": "144",
"suittype": 14,
"suitintr": {
"key": "suit_equip_10002",
@@ -13686,6 +13971,7 @@
"key": "equip_13006",
"text": "玉如意"
},
+ "atlas_id": "145",
"suittype": 14,
"suitintr": {
"key": "suit_equip_10002",
@@ -13734,6 +14020,7 @@
"key": "equip_13005",
"text": "玉如意"
},
+ "atlas_id": "144",
"suittype": 14,
"suitintr": {
"key": "suit_equip_10002",
@@ -13782,6 +14069,7 @@
"key": "equip_13006",
"text": "玉如意"
},
+ "atlas_id": "145",
"suittype": 14,
"suitintr": {
"key": "suit_equip_10002",
@@ -13830,6 +14118,7 @@
"key": "equip_13005",
"text": "牙仙"
},
+ "atlas_id": "154",
"suittype": 15,
"suitintr": {
"key": "suit_equip_10002",
@@ -13878,6 +14167,7 @@
"key": "equip_13006",
"text": "牙仙"
},
+ "atlas_id": "155",
"suittype": 15,
"suitintr": {
"key": "suit_equip_10002",
@@ -13926,6 +14216,7 @@
"key": "equip_13005",
"text": "牙仙"
},
+ "atlas_id": "154",
"suittype": 15,
"suitintr": {
"key": "suit_equip_10002",
@@ -13974,6 +14265,7 @@
"key": "equip_13006",
"text": "牙仙"
},
+ "atlas_id": "155",
"suittype": 15,
"suitintr": {
"key": "suit_equip_10002",
@@ -14022,6 +14314,7 @@
"key": "equip_13005",
"text": "牙仙"
},
+ "atlas_id": "154",
"suittype": 15,
"suitintr": {
"key": "suit_equip_10002",
@@ -14070,6 +14363,7 @@
"key": "equip_13006",
"text": "牙仙"
},
+ "atlas_id": "155",
"suittype": 15,
"suitintr": {
"key": "suit_equip_10002",
@@ -14118,6 +14412,7 @@
"key": "equip_13005",
"text": "牙仙"
},
+ "atlas_id": "154",
"suittype": 15,
"suitintr": {
"key": "suit_equip_10002",
@@ -14166,6 +14461,7 @@
"key": "equip_13006",
"text": "牙仙"
},
+ "atlas_id": "155",
"suittype": 15,
"suitintr": {
"key": "suit_equip_10002",
@@ -14214,6 +14510,7 @@
"key": "equip_13005",
"text": "牙仙"
},
+ "atlas_id": "154",
"suittype": 15,
"suitintr": {
"key": "suit_equip_10002",
@@ -14262,6 +14559,7 @@
"key": "equip_13006",
"text": "牙仙"
},
+ "atlas_id": "155",
"suittype": 15,
"suitintr": {
"key": "suit_equip_10002",
@@ -14310,6 +14608,7 @@
"key": "equip_13005",
"text": "牙仙"
},
+ "atlas_id": "154",
"suittype": 15,
"suitintr": {
"key": "suit_equip_10002",
@@ -14358,6 +14657,7 @@
"key": "equip_13006",
"text": "牙仙"
},
+ "atlas_id": "155",
"suittype": 15,
"suitintr": {
"key": "suit_equip_10002",
@@ -14406,6 +14706,7 @@
"key": "equip_13005",
"text": "圣诞老人"
},
+ "atlas_id": "164",
"suittype": 16,
"suitintr": {
"key": "suit_equip_10002",
@@ -14454,6 +14755,7 @@
"key": "equip_13006",
"text": "圣诞老人"
},
+ "atlas_id": "165",
"suittype": 16,
"suitintr": {
"key": "suit_equip_10002",
@@ -14502,6 +14804,7 @@
"key": "equip_13005",
"text": "圣诞老人"
},
+ "atlas_id": "164",
"suittype": 16,
"suitintr": {
"key": "suit_equip_10002",
@@ -14550,6 +14853,7 @@
"key": "equip_13006",
"text": "圣诞老人"
},
+ "atlas_id": "165",
"suittype": 16,
"suitintr": {
"key": "suit_equip_10002",
@@ -14598,6 +14902,7 @@
"key": "equip_13005",
"text": "圣诞老人"
},
+ "atlas_id": "164",
"suittype": 16,
"suitintr": {
"key": "suit_equip_10002",
@@ -14646,6 +14951,7 @@
"key": "equip_13006",
"text": "圣诞老人"
},
+ "atlas_id": "165",
"suittype": 16,
"suitintr": {
"key": "suit_equip_10002",
@@ -14694,6 +15000,7 @@
"key": "equip_13005",
"text": "圣诞老人"
},
+ "atlas_id": "164",
"suittype": 16,
"suitintr": {
"key": "suit_equip_10002",
@@ -14742,6 +15049,7 @@
"key": "equip_13006",
"text": "圣诞老人"
},
+ "atlas_id": "165",
"suittype": 16,
"suitintr": {
"key": "suit_equip_10002",
@@ -14790,6 +15098,7 @@
"key": "equip_13005",
"text": "圣诞老人"
},
+ "atlas_id": "164",
"suittype": 16,
"suitintr": {
"key": "suit_equip_10002",
@@ -14838,6 +15147,7 @@
"key": "equip_13006",
"text": "圣诞老人"
},
+ "atlas_id": "165",
"suittype": 16,
"suitintr": {
"key": "suit_equip_10002",
@@ -14886,6 +15196,7 @@
"key": "equip_13005",
"text": "圣诞老人"
},
+ "atlas_id": "164",
"suittype": 16,
"suitintr": {
"key": "suit_equip_10002",
@@ -14934,6 +15245,7 @@
"key": "equip_13006",
"text": "圣诞老人"
},
+ "atlas_id": "165",
"suittype": 16,
"suitintr": {
"key": "suit_equip_10002",
@@ -14982,6 +15294,7 @@
"key": "equip_13005",
"text": "睡神"
},
+ "atlas_id": "174",
"suittype": 17,
"suitintr": {
"key": "suit_equip_10002",
@@ -15030,6 +15343,7 @@
"key": "equip_13006",
"text": "睡神"
},
+ "atlas_id": "175",
"suittype": 17,
"suitintr": {
"key": "suit_equip_10002",
@@ -15078,6 +15392,7 @@
"key": "equip_13005",
"text": "睡神"
},
+ "atlas_id": "174",
"suittype": 17,
"suitintr": {
"key": "suit_equip_10002",
@@ -15126,6 +15441,7 @@
"key": "equip_13006",
"text": "睡神"
},
+ "atlas_id": "175",
"suittype": 17,
"suitintr": {
"key": "suit_equip_10002",
@@ -15174,6 +15490,7 @@
"key": "equip_13005",
"text": "睡神"
},
+ "atlas_id": "174",
"suittype": 17,
"suitintr": {
"key": "suit_equip_10002",
@@ -15222,6 +15539,7 @@
"key": "equip_13006",
"text": "睡神"
},
+ "atlas_id": "175",
"suittype": 17,
"suitintr": {
"key": "suit_equip_10002",
@@ -15270,6 +15588,7 @@
"key": "equip_13005",
"text": "睡神"
},
+ "atlas_id": "174",
"suittype": 17,
"suitintr": {
"key": "suit_equip_10002",
@@ -15318,6 +15637,7 @@
"key": "equip_13006",
"text": "睡神"
},
+ "atlas_id": "175",
"suittype": 17,
"suitintr": {
"key": "suit_equip_10002",
@@ -15366,6 +15686,7 @@
"key": "equip_13005",
"text": "睡神"
},
+ "atlas_id": "174",
"suittype": 17,
"suitintr": {
"key": "suit_equip_10002",
@@ -15414,6 +15735,7 @@
"key": "equip_13006",
"text": "睡神"
},
+ "atlas_id": "175",
"suittype": 17,
"suitintr": {
"key": "suit_equip_10002",
@@ -15462,6 +15784,7 @@
"key": "equip_13005",
"text": "睡神"
},
+ "atlas_id": "174",
"suittype": 17,
"suitintr": {
"key": "suit_equip_10002",
@@ -15510,6 +15833,7 @@
"key": "equip_13006",
"text": "睡神"
},
+ "atlas_id": "175",
"suittype": 17,
"suitintr": {
"key": "suit_equip_10002",
@@ -15558,6 +15882,7 @@
"key": "equip_13005",
"text": "维京"
},
+ "atlas_id": "184",
"suittype": 18,
"suitintr": {
"key": "suit_equip_10002",
@@ -15606,6 +15931,7 @@
"key": "equip_13006",
"text": "维京"
},
+ "atlas_id": "185",
"suittype": 18,
"suitintr": {
"key": "suit_equip_10002",
@@ -15654,6 +15980,7 @@
"key": "equip_13005",
"text": "维京"
},
+ "atlas_id": "184",
"suittype": 18,
"suitintr": {
"key": "suit_equip_10002",
@@ -15702,6 +16029,7 @@
"key": "equip_13006",
"text": "维京"
},
+ "atlas_id": "185",
"suittype": 18,
"suitintr": {
"key": "suit_equip_10002",
@@ -15750,6 +16078,7 @@
"key": "equip_13005",
"text": "维京"
},
+ "atlas_id": "184",
"suittype": 18,
"suitintr": {
"key": "suit_equip_10002",
@@ -15798,6 +16127,7 @@
"key": "equip_13006",
"text": "维京"
},
+ "atlas_id": "185",
"suittype": 18,
"suitintr": {
"key": "suit_equip_10002",
@@ -15846,6 +16176,7 @@
"key": "equip_13005",
"text": "维京"
},
+ "atlas_id": "184",
"suittype": 18,
"suitintr": {
"key": "suit_equip_10002",
@@ -15894,6 +16225,7 @@
"key": "equip_13006",
"text": "维京"
},
+ "atlas_id": "185",
"suittype": 18,
"suitintr": {
"key": "suit_equip_10002",
@@ -15942,6 +16274,7 @@
"key": "equip_13005",
"text": "维京"
},
+ "atlas_id": "184",
"suittype": 18,
"suitintr": {
"key": "suit_equip_10002",
@@ -15990,6 +16323,7 @@
"key": "equip_13006",
"text": "维京"
},
+ "atlas_id": "185",
"suittype": 18,
"suitintr": {
"key": "suit_equip_10002",
@@ -16038,6 +16372,7 @@
"key": "equip_13005",
"text": "维京"
},
+ "atlas_id": "184",
"suittype": 18,
"suitintr": {
"key": "suit_equip_10002",
@@ -16086,6 +16421,7 @@
"key": "equip_13006",
"text": "维京"
},
+ "atlas_id": "185",
"suittype": 18,
"suitintr": {
"key": "suit_equip_10002",
@@ -16134,6 +16470,7 @@
"key": "equip_13005",
"text": "史莱克"
},
+ "atlas_id": "194",
"suittype": 19,
"suitintr": {
"key": "suit_equip_10002",
@@ -16182,6 +16519,7 @@
"key": "equip_13006",
"text": "史莱克"
},
+ "atlas_id": "195",
"suittype": 19,
"suitintr": {
"key": "suit_equip_10002",
@@ -16230,6 +16568,7 @@
"key": "equip_13005",
"text": "史莱克"
},
+ "atlas_id": "194",
"suittype": 19,
"suitintr": {
"key": "suit_equip_10002",
@@ -16278,6 +16617,7 @@
"key": "equip_13006",
"text": "史莱克"
},
+ "atlas_id": "195",
"suittype": 19,
"suitintr": {
"key": "suit_equip_10002",
@@ -16326,6 +16666,7 @@
"key": "equip_13005",
"text": "史莱克"
},
+ "atlas_id": "194",
"suittype": 19,
"suitintr": {
"key": "suit_equip_10002",
@@ -16374,6 +16715,7 @@
"key": "equip_13006",
"text": "史莱克"
},
+ "atlas_id": "195",
"suittype": 19,
"suitintr": {
"key": "suit_equip_10002",
@@ -16422,6 +16764,7 @@
"key": "equip_13005",
"text": "史莱克"
},
+ "atlas_id": "194",
"suittype": 19,
"suitintr": {
"key": "suit_equip_10002",
@@ -16470,6 +16813,7 @@
"key": "equip_13006",
"text": "史莱克"
},
+ "atlas_id": "195",
"suittype": 19,
"suitintr": {
"key": "suit_equip_10002",
@@ -16518,6 +16862,7 @@
"key": "equip_13005",
"text": "史莱克"
},
+ "atlas_id": "194",
"suittype": 19,
"suitintr": {
"key": "suit_equip_10002",
@@ -16566,6 +16911,7 @@
"key": "equip_13006",
"text": "史莱克"
},
+ "atlas_id": "195",
"suittype": 19,
"suitintr": {
"key": "suit_equip_10002",
@@ -16614,6 +16960,7 @@
"key": "equip_13005",
"text": "史莱克"
},
+ "atlas_id": "194",
"suittype": 19,
"suitintr": {
"key": "suit_equip_10002",
@@ -16662,6 +17009,7 @@
"key": "equip_13006",
"text": "史莱克"
},
+ "atlas_id": "195",
"suittype": 19,
"suitintr": {
"key": "suit_equip_10002",
@@ -16710,6 +17058,7 @@
"key": "equip_20001",
"text": "输出武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -16758,6 +17107,7 @@
"key": "equip_20002",
"text": "防御武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -16806,6 +17156,7 @@
"key": "equip_20003",
"text": "辅助武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -16854,6 +17205,7 @@
"key": "equip_20004",
"text": "控制武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -16902,6 +17254,7 @@
"key": "equip_20001",
"text": "输出武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -16950,6 +17303,7 @@
"key": "equip_20002",
"text": "防御武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -16998,6 +17352,7 @@
"key": "equip_20003",
"text": "辅助武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17046,6 +17401,7 @@
"key": "equip_20004",
"text": "控制武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17094,6 +17450,7 @@
"key": "equip_20001",
"text": "输出武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17142,6 +17499,7 @@
"key": "equip_20002",
"text": "防御武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17190,6 +17548,7 @@
"key": "equip_20003",
"text": "辅助武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17238,6 +17597,7 @@
"key": "equip_20004",
"text": "控制武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17286,6 +17646,7 @@
"key": "equip_20001",
"text": "输出武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17334,6 +17695,7 @@
"key": "equip_20002",
"text": "防御武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17382,6 +17744,7 @@
"key": "equip_20003",
"text": "辅助武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17430,6 +17793,7 @@
"key": "equip_20004",
"text": "控制武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17478,6 +17842,7 @@
"key": "equip_20001",
"text": "输出武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17524,6 +17889,7 @@
"key": "equip_20002",
"text": "防御武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17570,6 +17936,7 @@
"key": "equip_20003",
"text": "辅助武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17616,6 +17983,7 @@
"key": "equip_20004",
"text": "控制武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17662,6 +18030,7 @@
"key": "equip_20001",
"text": "输出武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17708,6 +18077,7 @@
"key": "equip_20002",
"text": "防御武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17754,6 +18124,7 @@
"key": "equip_20003",
"text": "辅助武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17800,6 +18171,7 @@
"key": "equip_20004",
"text": "控制武器"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17846,6 +18218,7 @@
"key": "equip_30001",
"text": "直觉饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17894,6 +18267,7 @@
"key": "equip_30002",
"text": "真诚饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17942,6 +18316,7 @@
"key": "equip_30003",
"text": "共情饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -17990,6 +18365,7 @@
"key": "equip_30004",
"text": "责任饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18038,6 +18414,7 @@
"key": "equip_30001",
"text": "直觉饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18086,6 +18463,7 @@
"key": "equip_30002",
"text": "真诚饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18134,6 +18512,7 @@
"key": "equip_30003",
"text": "共情饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18182,6 +18561,7 @@
"key": "equip_30004",
"text": "责任饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18230,6 +18610,7 @@
"key": "equip_30001",
"text": "直觉饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18278,6 +18659,7 @@
"key": "equip_30002",
"text": "真诚饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18326,6 +18708,7 @@
"key": "equip_30003",
"text": "共情饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18374,6 +18757,7 @@
"key": "equip_30004",
"text": "责任饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18422,6 +18806,7 @@
"key": "equip_30001",
"text": "直觉饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18470,6 +18855,7 @@
"key": "equip_30002",
"text": "真诚饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18518,6 +18904,7 @@
"key": "equip_30003",
"text": "共情饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18566,6 +18953,7 @@
"key": "equip_30004",
"text": "责任饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18614,6 +19002,7 @@
"key": "equip_30001",
"text": "直觉饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18660,6 +19049,7 @@
"key": "equip_30002",
"text": "真诚饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18706,6 +19096,7 @@
"key": "equip_30003",
"text": "共情饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18752,6 +19143,7 @@
"key": "equip_30004",
"text": "责任饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18798,6 +19190,7 @@
"key": "equip_30001",
"text": "直觉饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18844,6 +19237,7 @@
"key": "equip_30002",
"text": "真诚饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18890,6 +19284,7 @@
"key": "equip_30003",
"text": "共情饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
@@ -18936,6 +19331,7 @@
"key": "equip_30004",
"text": "责任饰品"
},
+ "atlas_id": "",
"suittype": 0,
"suitintr": {
"key": "",
diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index 119d6ad13..c02d65a95 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -547,6 +547,14 @@
"smithy_PurchaseType": [
50,
50
+ ],
+ "raise_temperature": [
+ 110001,
+ 50
+ ],
+ "exemption_TemperatureCos": [
+ 110002,
+ 50
]
}
]
\ No newline at end of file
diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json
index 3ceadf6b6..6503ca7e3 100644
--- a/bin/json/game_hero.json
+++ b/bin/json/game_hero.json
@@ -32,6 +32,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 113001011,
"skill1": 113001111,
"skill2": 113001211,
@@ -111,6 +112,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 113002011,
"skill1": 113002111,
"skill2": 113002211,
@@ -190,6 +192,7 @@
"y": -0.69,
"z": 0
},
+ "capskillrule": 101,
"skill": 113003011,
"skill1": 113003111,
"skill2": 113003211,
@@ -269,6 +272,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 113004011,
"skill1": 113004111,
"skill2": 113004211,
@@ -348,6 +352,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 113005011,
"skill1": 113005111,
"skill2": 113005211,
@@ -427,6 +432,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 114001011,
"skill1": 114001111,
"skill2": 114001211,
@@ -506,6 +512,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 114002011,
"skill1": 114002111,
"skill2": 114002211,
@@ -585,6 +592,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 114003011,
"skill1": 114003111,
"skill2": 114003211,
@@ -664,6 +672,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 114004011,
"skill1": 114004111,
"skill2": 114004211,
@@ -743,6 +752,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 114005011,
"skill1": 114005111,
"skill2": 114005211,
@@ -822,6 +832,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 114006011,
"skill1": 114006111,
"skill2": 114006211,
@@ -901,6 +912,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 114007011,
"skill1": 114007111,
"skill2": 114007211,
@@ -980,6 +992,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 115001011,
"skill1": 115001111,
"skill2": 115001211,
@@ -1059,6 +1072,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 115002011,
"skill1": 115002111,
"skill2": 115002211,
@@ -1138,6 +1152,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 115003011,
"skill1": 115003111,
"skill2": 115003211,
@@ -1217,6 +1232,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 115004011,
"skill1": 115004111,
"skill2": 115004211,
@@ -1296,6 +1312,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 123001011,
"skill1": 123001111,
"skill2": 123001211,
@@ -1375,6 +1392,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 123002011,
"skill1": 123002111,
"skill2": 123002211,
@@ -1454,6 +1472,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 123003011,
"skill1": 123003111,
"skill2": 123003211,
@@ -1533,6 +1552,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 123004011,
"skill1": 123004111,
"skill2": 123004211,
@@ -1612,6 +1632,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 124001011,
"skill1": 124001111,
"skill2": 124001211,
@@ -1691,6 +1712,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 124002111,
"skill2": 124002211,
@@ -1770,6 +1792,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 124003011,
"skill1": 124003111,
"skill2": 124003211,
@@ -1849,6 +1872,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 124004011,
"skill1": 124004111,
"skill2": 124004211,
@@ -1928,6 +1952,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 124005011,
"skill1": 124005111,
"skill2": 124005211,
@@ -2007,6 +2032,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 124006011,
"skill1": 124006111,
"skill2": 124006211,
@@ -2086,6 +2112,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 124007011,
"skill1": 124007111,
"skill2": 124007211,
@@ -2165,6 +2192,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 124008011,
"skill1": 124008111,
"skill2": 124008211,
@@ -2244,6 +2272,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 124009011,
"skill1": 124009111,
"skill2": 124009211,
@@ -2323,6 +2352,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 125001011,
"skill1": 125001111,
"skill2": 125001211,
@@ -2402,6 +2432,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 125002011,
"skill1": 125002111,
"skill2": 125002211,
@@ -2481,6 +2512,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 125003011,
"skill1": 125003111,
"skill2": 125003211,
@@ -2560,6 +2592,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 125004011,
"skill1": 125004111,
"skill2": 125004211,
@@ -2639,6 +2672,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 133001011,
"skill1": 133001111,
"skill2": 133001211,
@@ -2718,6 +2752,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 133002011,
"skill1": 133002111,
"skill2": 133002211,
@@ -2797,6 +2832,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 133003011,
"skill1": 133003111,
"skill2": 133003211,
@@ -2876,6 +2912,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 133004011,
"skill1": 133004111,
"skill2": 133004211,
@@ -2955,6 +2992,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 133005011,
"skill1": 133005111,
"skill2": 133005211,
@@ -3034,6 +3072,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 133006011,
"skill1": 133006111,
"skill2": 133006211,
@@ -3113,6 +3152,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 134001011,
"skill1": 134001111,
"skill2": 134001211,
@@ -3192,6 +3232,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 134002011,
"skill1": 134002111,
"skill2": 134002211,
@@ -3271,6 +3312,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 134003011,
"skill1": 134003111,
"skill2": 134003211,
@@ -3350,6 +3392,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 134004011,
"skill1": 134004111,
"skill2": 134004211,
@@ -3429,6 +3472,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 134005011,
"skill1": 134005111,
"skill2": 134005211,
@@ -3508,6 +3552,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 134006011,
"skill1": 134006111,
"skill2": 134006211,
@@ -3587,6 +3632,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 134007011,
"skill1": 134007111,
"skill2": 134007211,
@@ -3666,6 +3712,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 134008011,
"skill1": 134008111,
"skill2": 134008211,
@@ -3745,6 +3792,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 135001011,
"skill1": 135001111,
"skill2": 135001211,
@@ -3824,6 +3872,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 135002011,
"skill1": 135002111,
"skill2": 135002211,
@@ -3903,6 +3952,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 135003011,
"skill1": 135003111,
"skill2": 135003211,
@@ -3982,6 +4032,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 135004011,
"skill1": 135004111,
"skill2": 135004211,
@@ -4061,6 +4112,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 135005011,
"skill1": 135005111,
"skill2": 135005211,
@@ -4140,6 +4192,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 135006011,
"skill1": 135006111,
"skill2": 135006211,
@@ -4219,6 +4272,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 143001011,
"skill1": 143001111,
"skill2": 143001211,
@@ -4298,6 +4352,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 143002011,
"skill1": 143002111,
"skill2": 143002211,
@@ -4377,6 +4432,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 143003011,
"skill1": 143003111,
"skill2": 143003211,
@@ -4456,6 +4512,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 143004011,
"skill1": 143004111,
"skill2": 143004211,
@@ -4535,6 +4592,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 143005011,
"skill1": 143005111,
"skill2": 143005211,
@@ -4614,6 +4672,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 143006011,
"skill1": 143006111,
"skill2": 143006211,
@@ -4693,6 +4752,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 143007011,
"skill1": 143007111,
"skill2": 143007211,
@@ -4772,6 +4832,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 144001011,
"skill1": 144001111,
"skill2": 144001211,
@@ -4851,6 +4912,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 144002011,
"skill1": 144002111,
"skill2": 144002211,
@@ -4930,6 +4992,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 144003011,
"skill1": 144003111,
"skill2": 144003211,
@@ -5009,6 +5072,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 144004011,
"skill1": 144004111,
"skill2": 144004211,
@@ -5088,6 +5152,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 144006111,
"skill2": 144006211,
@@ -5167,6 +5232,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 145001011,
"skill1": 145001111,
"skill2": 145001211,
@@ -5246,6 +5312,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 145002011,
"skill1": 145002111,
"skill2": 145002211,
@@ -5325,6 +5392,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 145003011,
"skill1": 145003111,
"skill2": 145003211,
@@ -5404,6 +5472,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 145004011,
"skill1": 145004111,
"skill2": 145004211,
@@ -5483,6 +5552,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 144005011,
"skill1": 144005111,
"skill2": 144005211,
@@ -5562,6 +5632,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 115005011,
"skill1": 115005111,
"skill2": 115005211,
@@ -5641,6 +5712,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 151001111,
"skill2": 0,
@@ -5720,6 +5792,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 151002111,
"skill2": 151002211,
@@ -5799,6 +5872,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 151003111,
"skill2": 151003211,
@@ -5878,6 +5952,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 151004111,
"skill2": 151004211,
@@ -5957,6 +6032,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 151005111,
"skill2": 151005211,
@@ -6036,6 +6112,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 151006111,
"skill2": 151006211,
@@ -6115,6 +6192,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 151007111,
"skill2": 151007211,
@@ -6194,6 +6272,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 154005111,
"skill2": 154005211,
@@ -6273,6 +6352,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 151010111,
"skill2": 151010211,
@@ -6352,6 +6432,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 151011111,
"skill2": 151011211,
@@ -6431,6 +6512,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 151012111,
"skill2": 151012211,
@@ -6510,6 +6592,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 151013111,
"skill2": 151013211,
@@ -6589,6 +6672,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 151014111,
"skill2": 151014211,
@@ -6668,6 +6752,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 154001111,
"skill2": 154001211,
@@ -6747,6 +6832,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 153001111,
"skill2": 153001211,
@@ -6826,6 +6912,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 153002111,
"skill2": 153002211,
@@ -6905,6 +6992,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 153003111,
"skill2": 153003211,
@@ -6984,6 +7072,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 153004111,
"skill2": 153004211,
@@ -7063,6 +7152,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 153005111,
"skill2": 153005211,
@@ -7142,6 +7232,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 153006111,
"skill2": 153006211,
@@ -7221,6 +7312,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 155001011,
"skill1": 155001111,
"skill2": 155001211,
@@ -7300,6 +7392,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 155002011,
"skill1": 155002111,
"skill2": 155002211,
@@ -7379,6 +7472,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 155003011,
"skill1": 155003111,
"skill2": 155003211,
@@ -7458,6 +7552,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 155004011,
"skill1": 155004111,
"skill2": 155004211,
@@ -7537,6 +7632,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 155005011,
"skill1": 155005111,
"skill2": 155005211,
@@ -7616,6 +7712,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 155006011,
"skill1": 155006111,
"skill2": 155006211,
@@ -7695,6 +7792,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 155007011,
"skill1": 155007111,
"skill2": 155007211,
@@ -7774,6 +7872,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 155006011,
"skill1": 155006111,
"skill2": 155006211,
@@ -7855,6 +7954,7 @@
"y": 0.154,
"z": 0
},
+ "capskillrule": 101,
"skill": 112003011,
"skill1": 112003111,
"skill2": 112003211,
@@ -7934,6 +8034,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 0,
"skill2": 0,
@@ -8013,6 +8114,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 0,
"skill2": 0,
@@ -8092,6 +8194,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 0,
"skill2": 0,
@@ -8171,6 +8274,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 0,
"skill2": 0,
@@ -8250,6 +8354,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 0,
"skill2": 0,
@@ -8329,6 +8434,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 0,
"skill2": 0,
@@ -8408,6 +8514,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 0,
"skill2": 0,
@@ -8487,6 +8594,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 0,
"skill2": 0,
@@ -8566,6 +8674,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 0,
"skill2": 0,
@@ -8645,6 +8754,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 0,
"skill2": 0,
@@ -8724,6 +8834,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 0,
"skill2": 0,
@@ -8803,6 +8914,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 125004011,
"skill1": 125004111,
"skill2": 125004211,
@@ -8882,6 +8994,7 @@
"y": 0,
"z": 0
},
+ "capskillrule": 101,
"skill": 0,
"skill1": 151004111,
"skill2": 151004211,
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index 5003f96de..6c996110c 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -1723,7 +1723,7 @@
"id": "90001",
"name": {
"key": "itemname_90001",
- "text": "阿宝天赋点"
+ "text": "阿宝星辉"
},
"usetype": 3,
"color": 5,
@@ -1767,7 +1767,7 @@
"id": "90002",
"name": {
"key": "itemname_90002",
- "text": "波比天赋点"
+ "text": "波比星辉"
},
"usetype": 3,
"color": 5,
@@ -1811,7 +1811,7 @@
"id": "90003",
"name": {
"key": "itemname_90003",
- "text": "小伊天赋点"
+ "text": "小伊星辉"
},
"usetype": 3,
"color": 5,
@@ -3126,8 +3126,8 @@
{
"id": "513001",
"name": {
- "key": "itemname_90001",
- "text": "闪闪天赋点"
+ "key": "itemdesc_513001",
+ "text": "闪闪星辉"
},
"usetype": 3,
"color": 5,
@@ -3170,8 +3170,8 @@
{
"id": "513002",
"name": {
- "key": "itemname_90001",
- "text": "食人鱼先生天赋点"
+ "key": "itemdesc_513002",
+ "text": "食人鱼先生星辉"
},
"usetype": 3,
"color": 5,
@@ -3214,8 +3214,8 @@
{
"id": "513003",
"name": {
- "key": "itemname_90001",
- "text": "啊啊天赋点"
+ "key": "itemdesc_513003",
+ "text": "啊啊星辉"
},
"usetype": 3,
"color": 5,
@@ -3258,8 +3258,8 @@
{
"id": "513004",
"name": {
- "key": "itemname_90001",
- "text": "法夸德勋爵天赋点"
+ "key": "itemdesc_513004",
+ "text": "法夸德勋爵星辉"
},
"usetype": 3,
"color": 5,
@@ -3302,8 +3302,8 @@
{
"id": "513005",
"name": {
- "key": "itemname_90001",
- "text": "大大天赋点"
+ "key": "itemdesc_513005",
+ "text": "大大星辉"
},
"usetype": 3,
"color": 5,
@@ -3346,8 +3346,8 @@
{
"id": "514001",
"name": {
- "key": "itemname_90001",
- "text": "史图依克天赋点"
+ "key": "itemdesc_514001",
+ "text": "史图依克星辉"
},
"usetype": 3,
"color": 5,
@@ -3390,8 +3390,8 @@
{
"id": "514002",
"name": {
- "key": "itemname_90001",
- "text": "大龙天赋点"
+ "key": "itemdesc_514002",
+ "text": "大龙星辉"
},
"usetype": 3,
"color": 5,
@@ -3434,8 +3434,8 @@
{
"id": "514003",
"name": {
- "key": "itemname_90001",
- "text": "亚丝翠天赋点"
+ "key": "itemdesc_514003",
+ "text": "亚丝翠星辉"
},
"usetype": 3,
"color": 5,
@@ -3478,8 +3478,8 @@
{
"id": "514004",
"name": {
- "key": "itemname_90001",
- "text": "克莱尔·努涅斯天赋点"
+ "key": "itemdesc_514004",
+ "text": "克莱尔·努涅斯星辉"
},
"usetype": 3,
"color": 5,
@@ -3522,8 +3522,8 @@
{
"id": "514005",
"name": {
- "key": "itemname_90001",
- "text": "鹤大师天赋点"
+ "key": "itemdesc_514005",
+ "text": "鹤大师星辉"
},
"usetype": 3,
"color": 5,
@@ -3566,8 +3566,8 @@
{
"id": "514006",
"name": {
- "key": "itemname_90001",
- "text": "布兰奇天赋点"
+ "key": "itemdesc_514006",
+ "text": "布兰奇星辉"
},
"usetype": 3,
"color": 5,
@@ -3610,8 +3610,8 @@
{
"id": "514007",
"name": {
- "key": "itemname_90001",
- "text": "格里斯特王子天赋点"
+ "key": "itemdesc_514007",
+ "text": "格里斯特王子星辉"
},
"usetype": 3,
"color": 5,
@@ -3654,8 +3654,8 @@
{
"id": "515001",
"name": {
- "key": "itemname_90001",
- "text": "吉姆·莱克天赋点"
+ "key": "itemdesc_515001",
+ "text": "吉姆·莱克星辉"
},
"usetype": 3,
"color": 5,
@@ -3698,8 +3698,8 @@
{
"id": "515002",
"name": {
- "key": "itemname_90001",
- "text": "船长天赋点"
+ "key": "itemdesc_515002",
+ "text": "船长星辉"
},
"usetype": 3,
"color": 5,
@@ -3742,8 +3742,8 @@
{
"id": "515003",
"name": {
- "key": "itemname_90001",
- "text": "希沙窦斯天赋点"
+ "key": "itemdesc_515003",
+ "text": "希沙窦斯星辉"
},
"usetype": 3,
"color": 5,
@@ -3786,8 +3786,8 @@
{
"id": "515004",
"name": {
- "key": "itemname_90001",
- "text": "小欧天赋点"
+ "key": "itemdesc_515004",
+ "text": "小欧星辉"
},
"usetype": 3,
"color": 5,
@@ -3830,8 +3830,8 @@
{
"id": "523001",
"name": {
- "key": "itemname_90001",
- "text": "斯梅克船长天赋点"
+ "key": "itemdesc_523001",
+ "text": "斯梅克船长星辉"
},
"usetype": 3,
"color": 5,
@@ -3874,8 +3874,8 @@
{
"id": "523002",
"name": {
- "key": "itemname_90001",
- "text": "警卫队长天赋点"
+ "key": "itemdesc_523002",
+ "text": "警卫队长星辉"
},
"usetype": 3,
"color": 5,
@@ -3918,8 +3918,8 @@
{
"id": "523003",
"name": {
- "key": "itemname_90001",
- "text": "泰德·邓普顿天赋点"
+ "key": "itemdesc_523003",
+ "text": "泰德·邓普顿星辉"
},
"usetype": 3,
"color": 5,
@@ -3962,8 +3962,8 @@
{
"id": "523004",
"name": {
- "key": "itemname_90001",
- "text": "吉姆·普雷斯科特天赋点"
+ "key": "itemdesc_523004",
+ "text": "吉姆·普雷斯科特星辉"
},
"usetype": 3,
"color": 5,
@@ -4006,8 +4006,8 @@
{
"id": "524001",
"name": {
- "key": "itemname_90001",
- "text": "警长天赋点"
+ "key": "itemdesc_524001",
+ "text": "警长星辉"
},
"usetype": 3,
"color": 5,
@@ -4050,8 +4050,8 @@
{
"id": "524002",
"name": {
- "key": "itemname_90001",
- "text": "牙仙天赋点"
+ "key": "itemdesc_524002",
+ "text": "牙仙星辉"
},
"usetype": 3,
"color": 5,
@@ -4094,8 +4094,8 @@
{
"id": "524003",
"name": {
- "key": "itemname_90001",
- "text": "睡神沙人天赋点"
+ "key": "itemdesc_524003",
+ "text": "睡神沙人星辉"
},
"usetype": 3,
"color": 5,
@@ -4138,8 +4138,8 @@
{
"id": "524004",
"name": {
- "key": "itemname_90001",
- "text": "邦尼兔天赋点"
+ "key": "itemdesc_524004",
+ "text": "邦尼兔星辉"
},
"usetype": 3,
"color": 5,
@@ -4182,8 +4182,8 @@
{
"id": "524005",
"name": {
- "key": "itemname_90001",
- "text": "金猴天赋点"
+ "key": "itemdesc_524005",
+ "text": "金猴星辉"
},
"usetype": 3,
"color": 5,
@@ -4226,8 +4226,8 @@
{
"id": "524006",
"name": {
- "key": "itemname_90001",
- "text": "凯尔天赋点"
+ "key": "itemdesc_524006",
+ "text": "凯尔星辉"
},
"usetype": 3,
"color": 5,
@@ -4270,8 +4270,8 @@
{
"id": "524007",
"name": {
- "key": "itemname_90001",
- "text": "小钱天赋点"
+ "key": "itemdesc_524007",
+ "text": "小钱星辉"
},
"usetype": 3,
"color": 5,
@@ -4314,8 +4314,8 @@
{
"id": "524008",
"name": {
- "key": "itemname_90001",
- "text": "暴芙那特天赋点"
+ "key": "itemdesc_524008",
+ "text": "暴芙那特星辉"
},
"usetype": 3,
"color": 5,
@@ -4358,8 +4358,8 @@
{
"id": "524009",
"name": {
- "key": "itemname_90001",
- "text": "云朵先生天赋点"
+ "key": "itemdesc_524009",
+ "text": "云朵先生星辉"
},
"usetype": 3,
"color": 5,
@@ -4402,8 +4402,8 @@
{
"id": "525001",
"name": {
- "key": "itemname_90001",
- "text": "阿宝天赋点"
+ "key": "itemdesc_525001",
+ "text": "阿宝星辉"
},
"usetype": 3,
"color": 5,
@@ -4446,8 +4446,8 @@
{
"id": "525002",
"name": {
- "key": "itemname_90001",
- "text": "沃尔夫先生天赋点"
+ "key": "itemdesc_525002",
+ "text": "沃尔夫先生星辉"
},
"usetype": 3,
"color": 5,
@@ -4490,8 +4490,8 @@
{
"id": "525003",
"name": {
- "key": "itemname_90001",
- "text": "羊仙姑天赋点"
+ "key": "itemdesc_525003",
+ "text": "羊仙姑星辉"
},
"usetype": 3,
"color": 5,
@@ -4534,8 +4534,8 @@
{
"id": "525004",
"name": {
- "key": "itemname_90001",
- "text": "波比天赋点"
+ "key": "itemdesc_525004",
+ "text": "波比星辉"
},
"usetype": 3,
"color": 5,
@@ -4578,8 +4578,8 @@
{
"id": "533001",
"name": {
- "key": "itemname_90001",
- "text": "巫嘎天赋点"
+ "key": "itemdesc_533001",
+ "text": "巫嘎星辉"
},
"usetype": 3,
"color": 5,
@@ -4622,8 +4622,8 @@
{
"id": "533002",
"name": {
- "key": "itemname_90001",
- "text": "坦克天赋点"
+ "key": "itemdesc_533002",
+ "text": "坦克星辉"
},
"usetype": 3,
"color": 5,
@@ -4666,8 +4666,8 @@
{
"id": "533003",
"name": {
- "key": "itemname_90001",
- "text": "胡德先生天赋点"
+ "key": "itemdesc_533003",
+ "text": "胡德先生星辉"
},
"usetype": 3,
"color": 5,
@@ -4710,8 +4710,8 @@
{
"id": "533004",
"name": {
- "key": "itemname_90001",
- "text": "普鲁格兰杰天赋点"
+ "key": "itemdesc_533004",
+ "text": "普鲁格兰杰星辉"
},
"usetype": 3,
"color": 5,
@@ -4754,8 +4754,8 @@
{
"id": "533005",
"name": {
- "key": "itemname_90001",
- "text": "鼻涕粗天赋点"
+ "key": "itemdesc_533005",
+ "text": "鼻涕粗星辉"
},
"usetype": 3,
"color": 5,
@@ -4798,8 +4798,8 @@
{
"id": "533006",
"name": {
- "key": "itemname_90001",
- "text": "珍妮丝·邓普顿天赋点"
+ "key": "itemdesc_533006",
+ "text": "珍妮丝·邓普顿星辉"
},
"usetype": 3,
"color": 5,
@@ -4842,8 +4842,8 @@
{
"id": "534001",
"name": {
- "key": "itemname_90001",
- "text": "贫嘴驴天赋点"
+ "key": "itemdesc_534001",
+ "text": "贫嘴驴星辉"
},
"usetype": 3,
"color": 5,
@@ -4886,8 +4886,8 @@
{
"id": "534002",
"name": {
- "key": "itemname_90001",
- "text": "蒂姆·邓普顿天赋点"
+ "key": "itemdesc_534002",
+ "text": "蒂姆·邓普顿星辉"
},
"usetype": 3,
"color": 5,
@@ -4930,8 +4930,8 @@
{
"id": "534003",
"name": {
- "key": "itemname_90001",
- "text": "圣诞老人天赋点"
+ "key": "itemdesc_534003",
+ "text": "圣诞老人星辉"
},
"usetype": 3,
"color": 5,
@@ -4974,8 +4974,8 @@
{
"id": "534004",
"name": {
- "key": "itemname_90001",
- "text": "瓜哥天赋点"
+ "key": "itemdesc_534004",
+ "text": "瓜哥星辉"
},
"usetype": 3,
"color": 5,
@@ -5018,8 +5018,8 @@
{
"id": "534005",
"name": {
- "key": "itemname_90001",
- "text": "沃尔特·史翠克勒天赋点"
+ "key": "itemdesc_534005",
+ "text": "沃尔特·史翠克勒星辉"
},
"usetype": 3,
"color": 5,
@@ -5062,8 +5062,8 @@
{
"id": "534006",
"name": {
- "key": "itemname_90001",
- "text": "冰霜杰克天赋点"
+ "key": "itemdesc_534006",
+ "text": "冰霜杰克星辉"
},
"usetype": 3,
"color": 5,
@@ -5106,8 +5106,8 @@
{
"id": "534007",
"name": {
- "key": "itemname_90001",
- "text": "菲奥娜天赋点"
+ "key": "itemdesc_534007",
+ "text": "菲奥娜星辉"
},
"usetype": 3,
"color": 5,
@@ -5150,8 +5150,8 @@
{
"id": "534008",
"name": {
- "key": "itemname_90001",
- "text": "悍夫那特天赋点"
+ "key": "itemdesc_534008",
+ "text": "悍夫那特星辉"
},
"usetype": 3,
"color": 5,
@@ -5194,8 +5194,8 @@
{
"id": "535001",
"name": {
- "key": "itemname_90001",
- "text": "师父天赋点"
+ "key": "itemdesc_535001",
+ "text": "师父星辉"
},
"usetype": 3,
"color": 5,
@@ -5238,8 +5238,8 @@
{
"id": "535002",
"name": {
- "key": "itemname_90001",
- "text": "希卡普天赋点"
+ "key": "itemdesc_535002",
+ "text": "希卡普星辉"
},
"usetype": 3,
"color": 5,
@@ -5282,8 +5282,8 @@
{
"id": "535003",
"name": {
- "key": "itemname_90001",
- "text": "漆黑天赋点"
+ "key": "itemdesc_535003",
+ "text": "漆黑星辉"
},
"usetype": 3,
"color": 5,
@@ -5326,8 +5326,8 @@
{
"id": "535004",
"name": {
- "key": "itemname_90001",
- "text": "黛安·福克斯顿天赋点"
+ "key": "itemdesc_535004",
+ "text": "黛安·福克斯顿星辉"
},
"usetype": 3,
"color": 5,
@@ -5370,8 +5370,8 @@
{
"id": "535005",
"name": {
- "key": "itemname_90001",
- "text": "幸运·普雷斯科特天赋点"
+ "key": "itemdesc_535005",
+ "text": "幸运·普雷斯科特星辉"
},
"usetype": 3,
"color": 5,
@@ -5414,8 +5414,8 @@
{
"id": "535006",
"name": {
- "key": "itemname_90001",
- "text": "平先生天赋点"
+ "key": "itemdesc_535006",
+ "text": "平先生星辉"
},
"usetype": 3,
"color": 5,
@@ -5458,8 +5458,8 @@
{
"id": "543001",
"name": {
- "key": "itemname_90001",
- "text": "阿比盖尔·斯通天赋点"
+ "key": "itemdesc_543001",
+ "text": "阿比盖尔·斯通星辉"
},
"usetype": 3,
"color": 5,
@@ -5502,8 +5502,8 @@
{
"id": "543002",
"name": {
- "key": "itemname_90001",
- "text": "果酱教授天赋点"
+ "key": "itemdesc_543002",
+ "text": "果酱教授星辉"
},
"usetype": 3,
"color": 5,
@@ -5546,8 +5546,8 @@
{
"id": "543003",
"name": {
- "key": "itemname_90001",
- "text": "史蒂夫·帕丘克天赋点"
+ "key": "itemdesc_543003",
+ "text": "史蒂夫·帕丘克星辉"
},
"usetype": 3,
"color": 5,
@@ -5590,8 +5590,8 @@
{
"id": "543004",
"name": {
- "key": "itemname_90001",
- "text": "姜饼人天赋点"
+ "key": "itemdesc_543004",
+ "text": "姜饼人星辉"
},
"usetype": 3,
"color": 5,
@@ -5634,8 +5634,8 @@
{
"id": "543005",
"name": {
- "key": "itemname_90001",
- "text": "瓦希尔指挥官天赋点"
+ "key": "itemdesc_543005",
+ "text": "瓦希尔指挥官星辉"
},
"usetype": 3,
"color": 5,
@@ -5678,8 +5678,8 @@
{
"id": "543006",
"name": {
- "key": "itemname_90001",
- "text": "布里奇特天赋点"
+ "key": "itemdesc_543006",
+ "text": "布里奇特星辉"
},
"usetype": 3,
"color": 5,
@@ -5722,8 +5722,8 @@
{
"id": "543007",
"name": {
- "key": "itemname_90001",
- "text": "戈伯天赋点"
+ "key": "itemdesc_543007",
+ "text": "戈伯星辉"
},
"usetype": 3,
"color": 5,
@@ -5766,8 +5766,8 @@
{
"id": "544001",
"name": {
- "key": "itemname_90001",
- "text": "美肚鲨天赋点"
+ "key": "itemdesc_544001",
+ "text": "美肚鲨星辉"
},
"usetype": 3,
"color": 5,
@@ -5810,8 +5810,8 @@
{
"id": "544002",
"name": {
- "key": "itemname_90001",
- "text": "蛇先生天赋点"
+ "key": "itemdesc_544002",
+ "text": "蛇先生星辉"
},
"usetype": 3,
"color": 5,
@@ -5854,8 +5854,8 @@
{
"id": "544003",
"name": {
- "key": "itemname_90001",
- "text": "匹诺曹天赋点"
+ "key": "itemdesc_544003",
+ "text": "匹诺曹星辉"
},
"usetype": 3,
"color": 5,
@@ -5898,8 +5898,8 @@
{
"id": "544004",
"name": {
- "key": "itemname_90001",
- "text": "骇客蛛天赋点"
+ "key": "itemdesc_544004",
+ "text": "骇客蛛星辉"
},
"usetype": 3,
"color": 5,
@@ -5942,8 +5942,8 @@
{
"id": "544006",
"name": {
- "key": "itemname_90001",
- "text": "悍娇虎天赋点"
+ "key": "itemdesc_544006",
+ "text": "悍娇虎星辉"
},
"usetype": 3,
"color": 5,
@@ -5986,8 +5986,8 @@
{
"id": "545001",
"name": {
- "key": "itemname_90001",
- "text": "乌龟大师天赋点"
+ "key": "itemdesc_545001",
+ "text": "乌龟大师星辉"
},
"usetype": 3,
"color": 5,
@@ -6030,8 +6030,8 @@
{
"id": "545002",
"name": {
- "key": "itemname_90001",
- "text": "梅林天赋点"
+ "key": "itemdesc_545002",
+ "text": "梅林星辉"
},
"usetype": 3,
"color": 5,
@@ -6074,8 +6074,8 @@
{
"id": "545003",
"name": {
- "key": "itemname_90001",
- "text": "盖天赋点"
+ "key": "itemdesc_545003",
+ "text": "盖星辉"
},
"usetype": 3,
"color": 5,
@@ -6118,8 +6118,8 @@
{
"id": "545004",
"name": {
- "key": "itemname_90001",
- "text": "穿靴子的猫天赋点"
+ "key": "itemdesc_545004",
+ "text": "穿靴子的猫星辉"
},
"usetype": 3,
"color": 5,
@@ -6162,8 +6162,8 @@
{
"id": "544005",
"name": {
- "key": "itemname_90001",
- "text": "小伊天赋点"
+ "key": "itemdesc_544005",
+ "text": "小伊星辉"
},
"usetype": 3,
"color": 5,
@@ -6206,8 +6206,8 @@
{
"id": "515005",
"name": {
- "key": "itemname_90001",
- "text": "亚力克斯天赋点"
+ "key": "itemdesc_515005",
+ "text": "亚力克斯星辉"
},
"usetype": 3,
"color": 5,
@@ -6250,7 +6250,7 @@
{
"id": "500000",
"name": {
- "key": "itemname_90001",
+ "key": "itemdesc_515005",
"text": "通用共鸣道具"
},
"usetype": 3,
@@ -6295,7 +6295,7 @@
"id": "1000001",
"name": {
"key": "itemname_1000001",
- "text": "天赋点宝箱"
+ "text": "星辉宝箱"
},
"usetype": 6,
"color": 6,
@@ -6324,7 +6324,7 @@
"decompose_deplete": [],
"tipstxt": {
"key": "itemtipstxt_1000001",
- "text": "天赋点宝箱不足"
+ "text": "星辉宝箱不足"
}
},
{
@@ -6377,11 +6377,55 @@
"text": "体力药剂不足"
}
},
+ {
+ "id": "600001",
+ "name": {
+ "key": "itemdesc_515005",
+ "text": "秘传书通用技能升级"
+ },
+ "usetype": 3,
+ "color": 5,
+ "bagtype": 1,
+ "index": 99,
+ "special_type": 0,
+ "time": 0,
+ "effects": "effect_ui_wuping_2",
+ "box_id": 0,
+ "synthetize_num": 0,
+ "access": [
+ 155
+ ],
+ "use_skip": 155,
+ "upper_limit": 999,
+ "uselv": 0,
+ "isani": 0,
+ "star": 0,
+ "race": 0,
+ "img": "ytx_js_25001",
+ "ico": "ytx_js_25001",
+ "intr": {
+ "key": "itemdesc_600001",
+ "text": "阿宝天赋点"
+ },
+ "sale": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ],
+ "synthetize_deplete": [],
+ "decompose_deplete": [],
+ "tipstxt": {
+ "key": "itemtipstxt_600001",
+ "text": "阿宝的天赋点不足"
+ }
+ },
{
"id": "625001",
"name": {
- "key": "itemname_90001",
- "text": "阿宝碎片"
+ "key": "itemdesc_515005",
+ "text": "阿宝守护之心(专属升级)"
},
"usetype": 3,
"color": 5,
@@ -6424,7 +6468,7 @@
{
"id": "625002",
"name": {
- "key": "itemname_90001",
+ "key": "itemdesc_515005",
"text": "经验道具"
},
"usetype": 12,
diff --git a/bin/json/game_pandsmasexp.json b/bin/json/game_pandsmasexp.json
index 6be4649f3..ac1208a43 100644
--- a/bin/json/game_pandsmasexp.json
+++ b/bin/json/game_pandsmasexp.json
@@ -8,6 +8,7 @@
},
"ReadyID": 104,
"difficulty": 1,
+ "Numrounds": 10,
"BattleReadyID": 104,
"captionrecommend": [
25001,
@@ -86,6 +87,7 @@
},
"ReadyID": 104,
"difficulty": 2,
+ "Numrounds": 10,
"BattleReadyID": 104,
"captionrecommend": [
25001,
@@ -164,6 +166,7 @@
},
"ReadyID": 104,
"difficulty": 3,
+ "Numrounds": 10,
"BattleReadyID": 104,
"captionrecommend": [
25001,
@@ -242,6 +245,7 @@
},
"ReadyID": 104,
"difficulty": 4,
+ "Numrounds": 10,
"BattleReadyID": 104,
"captionrecommend": [
25001,
@@ -320,6 +324,7 @@
},
"ReadyID": 104,
"difficulty": 1,
+ "Numrounds": 10,
"BattleReadyID": 104,
"captionrecommend": [
25001,
@@ -398,6 +403,7 @@
},
"ReadyID": 104,
"difficulty": 2,
+ "Numrounds": 10,
"BattleReadyID": 104,
"captionrecommend": [
25001,
@@ -476,6 +482,7 @@
},
"ReadyID": 104,
"difficulty": 3,
+ "Numrounds": 10,
"BattleReadyID": 104,
"captionrecommend": [
25001,
@@ -554,6 +561,7 @@
},
"ReadyID": 104,
"difficulty": 4,
+ "Numrounds": 10,
"BattleReadyID": 104,
"captionrecommend": [
25001,
@@ -632,6 +640,7 @@
},
"ReadyID": 104,
"difficulty": 1,
+ "Numrounds": 10,
"BattleReadyID": 104,
"captionrecommend": [
25001,
@@ -710,6 +719,7 @@
},
"ReadyID": 104,
"difficulty": 2,
+ "Numrounds": 10,
"BattleReadyID": 104,
"captionrecommend": [
25001,
@@ -788,6 +798,7 @@
},
"ReadyID": 104,
"difficulty": 3,
+ "Numrounds": 10,
"BattleReadyID": 104,
"captionrecommend": [
25001,
@@ -866,6 +877,7 @@
},
"ReadyID": 104,
"difficulty": 4,
+ "Numrounds": 10,
"BattleReadyID": 104,
"captionrecommend": [
25001,
@@ -944,6 +956,7 @@
},
"ReadyID": 104,
"difficulty": 1,
+ "Numrounds": 10,
"BattleReadyID": 104,
"captionrecommend": [
25001,
diff --git a/bin/json/game_smithyatlas.json b/bin/json/game_smithyatlas.json
new file mode 100644
index 000000000..e8ad79f1e
--- /dev/null
+++ b/bin/json/game_smithyatlas.json
@@ -0,0 +1,258 @@
+[
+ {
+ "id": "10",
+ "tab_id": 1,
+ "type_id": 1,
+ "name_text": {
+ "key": "1",
+ "text": "神龙卷轴残卷一"
+ },
+ "content_text": {
+ "key": "1",
+ "text": "神龙卷轴来历描述"
+ },
+ "atlas_score": 0,
+ "atlas_giver": 0,
+ "quality": 0
+ },
+ {
+ "id": "11",
+ "tab_id": 1,
+ "type_id": 1,
+ "name_text": {
+ "key": "2",
+ "text": "神龙卷轴残卷二"
+ },
+ "content_text": {
+ "key": "2",
+ "text": "神龙卷轴来历描述"
+ },
+ "atlas_score": 0,
+ "atlas_giver": 0,
+ "quality": 0
+ },
+ {
+ "id": "12",
+ "tab_id": 1,
+ "type_id": 1,
+ "name_text": {
+ "key": "3",
+ "text": "神龙卷轴残卷三"
+ },
+ "content_text": {
+ "key": "3",
+ "text": "神龙卷轴来历描述"
+ },
+ "atlas_score": 0,
+ "atlas_giver": 0,
+ "quality": 0
+ },
+ {
+ "id": "13",
+ "tab_id": 1,
+ "type_id": 1,
+ "name_text": {
+ "key": "4",
+ "text": "神龙卷轴残卷四"
+ },
+ "content_text": {
+ "key": "4",
+ "text": "神龙卷轴来历描述"
+ },
+ "atlas_score": 0,
+ "atlas_giver": 0,
+ "quality": 0
+ },
+ {
+ "id": "14",
+ "tab_id": 2,
+ "type_id": 1,
+ "name_text": {
+ "key": "5",
+ "text": "魔法大师卷一"
+ },
+ "content_text": {
+ "key": "5",
+ "text": "魔法大师来历描述"
+ },
+ "atlas_score": 0,
+ "atlas_giver": 0,
+ "quality": 0
+ },
+ {
+ "id": "15",
+ "tab_id": 2,
+ "type_id": 1,
+ "name_text": {
+ "key": "6",
+ "text": "魔法大师卷二"
+ },
+ "content_text": {
+ "key": "6",
+ "text": "魔法大师来历描述"
+ },
+ "atlas_score": 0,
+ "atlas_giver": 0,
+ "quality": 0
+ },
+ {
+ "id": "16",
+ "tab_id": 2,
+ "type_id": 1,
+ "name_text": {
+ "key": "7",
+ "text": "魔法大师卷三"
+ },
+ "content_text": {
+ "key": "7",
+ "text": "魔法大师来历描述"
+ },
+ "atlas_score": 0,
+ "atlas_giver": 0,
+ "quality": 0
+ },
+ {
+ "id": "17",
+ "tab_id": 2,
+ "type_id": 1,
+ "name_text": {
+ "key": "8",
+ "text": "魔法大师卷四"
+ },
+ "content_text": {
+ "key": "8",
+ "text": "魔法大师来历描述"
+ },
+ "atlas_score": 0,
+ "atlas_giver": 0,
+ "quality": 0
+ },
+ {
+ "id": "18",
+ "tab_id": 3,
+ "type_id": 1,
+ "name_text": {
+ "key": "",
+ "text": ""
+ },
+ "content_text": {
+ "key": "",
+ "text": ""
+ },
+ "atlas_score": 0,
+ "atlas_giver": 0,
+ "quality": 0
+ },
+ {
+ "id": "19",
+ "tab_id": 3,
+ "type_id": 1,
+ "name_text": {
+ "key": "",
+ "text": ""
+ },
+ "content_text": {
+ "key": "",
+ "text": ""
+ },
+ "atlas_score": 0,
+ "atlas_giver": 0,
+ "quality": 0
+ },
+ {
+ "id": "20",
+ "tab_id": 3,
+ "type_id": 1,
+ "name_text": {
+ "key": "",
+ "text": ""
+ },
+ "content_text": {
+ "key": "",
+ "text": ""
+ },
+ "atlas_score": 0,
+ "atlas_giver": 0,
+ "quality": 0
+ },
+ {
+ "id": "21",
+ "tab_id": 3,
+ "type_id": 1,
+ "name_text": {
+ "key": "",
+ "text": ""
+ },
+ "content_text": {
+ "key": "",
+ "text": ""
+ },
+ "atlas_score": 0,
+ "atlas_giver": 0,
+ "quality": 0
+ },
+ {
+ "id": "10013",
+ "tab_id": 4,
+ "type_id": 2,
+ "name_text": {
+ "key": "",
+ "text": ""
+ },
+ "content_text": {
+ "key": "",
+ "text": ""
+ },
+ "atlas_score": 30,
+ "atlas_giver": 30,
+ "quality": 1
+ },
+ {
+ "id": "10014",
+ "tab_id": 4,
+ "type_id": 2,
+ "name_text": {
+ "key": "",
+ "text": ""
+ },
+ "content_text": {
+ "key": "",
+ "text": ""
+ },
+ "atlas_score": 60,
+ "atlas_giver": 60,
+ "quality": 2
+ },
+ {
+ "id": "10015",
+ "tab_id": 4,
+ "type_id": 2,
+ "name_text": {
+ "key": "",
+ "text": ""
+ },
+ "content_text": {
+ "key": "",
+ "text": ""
+ },
+ "atlas_score": 120,
+ "atlas_giver": 120,
+ "quality": 3
+ },
+ {
+ "id": "10016",
+ "tab_id": 4,
+ "type_id": 2,
+ "name_text": {
+ "key": "",
+ "text": ""
+ },
+ "content_text": {
+ "key": "",
+ "text": ""
+ },
+ "atlas_score": 240,
+ "atlas_giver": 240,
+ "quality": 4
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_smithyatlaslv.json b/bin/json/game_smithyatlaslv.json
new file mode 100644
index 000000000..1086e56b5
--- /dev/null
+++ b/bin/json/game_smithyatlaslv.json
@@ -0,0 +1,178 @@
+[
+ {
+ "atlas_lv": 1,
+ "atlas_score": 0,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 2,
+ "atlas_score": 1000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 3,
+ "atlas_score": 2000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 4,
+ "atlas_score": 3000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10004",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 5,
+ "atlas_score": 4000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10005",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 6,
+ "atlas_score": 5000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10006",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 7,
+ "atlas_score": 6000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10007",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 8,
+ "atlas_score": 7000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10008",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 9,
+ "atlas_score": 8000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10009",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 10,
+ "atlas_score": 9000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10010",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 11,
+ "atlas_score": 10000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10011",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 12,
+ "atlas_score": 11000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10012",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 13,
+ "atlas_score": 12000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10013",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 14,
+ "atlas_score": 13000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10014",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 15,
+ "atlas_score": 14000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10015",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "atlas_lv": 16,
+ "atlas_score": 15000,
+ "item_id": [
+ {
+ "a": "item",
+ "t": "10016",
+ "n": 1
+ }
+ ]
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_smithyatlasscore.json b/bin/json/game_smithyatlasscore.json
new file mode 100644
index 000000000..eb3bdeb26
--- /dev/null
+++ b/bin/json/game_smithyatlasscore.json
@@ -0,0 +1,452 @@
+[
+ {
+ "id": 1,
+ "quality": 1,
+ "lv": 1,
+ "score": 1
+ },
+ {
+ "id": 2,
+ "quality": 1,
+ "lv": 5,
+ "score": 2
+ },
+ {
+ "id": 3,
+ "quality": 1,
+ "lv": 10,
+ "score": 3
+ },
+ {
+ "id": 4,
+ "quality": 1,
+ "lv": 15,
+ "score": 4
+ },
+ {
+ "id": 5,
+ "quality": 1,
+ "lv": 20,
+ "score": 5
+ },
+ {
+ "id": 6,
+ "quality": 1,
+ "lv": 25,
+ "score": 6
+ },
+ {
+ "id": 7,
+ "quality": 1,
+ "lv": 30,
+ "score": 7
+ },
+ {
+ "id": 8,
+ "quality": 1,
+ "lv": 25,
+ "score": 8
+ },
+ {
+ "id": 9,
+ "quality": 1,
+ "lv": 30,
+ "score": 9
+ },
+ {
+ "id": 10,
+ "quality": 1,
+ "lv": 35,
+ "score": 10
+ },
+ {
+ "id": 11,
+ "quality": 1,
+ "lv": 40,
+ "score": 11
+ },
+ {
+ "id": 12,
+ "quality": 1,
+ "lv": 45,
+ "score": 12
+ },
+ {
+ "id": 13,
+ "quality": 1,
+ "lv": 50,
+ "score": 13
+ },
+ {
+ "id": 14,
+ "quality": 1,
+ "lv": 55,
+ "score": 14
+ },
+ {
+ "id": 15,
+ "quality": 1,
+ "lv": 60,
+ "score": 15
+ },
+ {
+ "id": 16,
+ "quality": 2,
+ "lv": 1,
+ "score": 17
+ },
+ {
+ "id": 17,
+ "quality": 2,
+ "lv": 5,
+ "score": 19
+ },
+ {
+ "id": 18,
+ "quality": 2,
+ "lv": 10,
+ "score": 21
+ },
+ {
+ "id": 19,
+ "quality": 2,
+ "lv": 15,
+ "score": 23
+ },
+ {
+ "id": 20,
+ "quality": 2,
+ "lv": 20,
+ "score": 25
+ },
+ {
+ "id": 21,
+ "quality": 2,
+ "lv": 25,
+ "score": 27
+ },
+ {
+ "id": 22,
+ "quality": 2,
+ "lv": 30,
+ "score": 29
+ },
+ {
+ "id": 23,
+ "quality": 2,
+ "lv": 25,
+ "score": 31
+ },
+ {
+ "id": 24,
+ "quality": 2,
+ "lv": 30,
+ "score": 33
+ },
+ {
+ "id": 25,
+ "quality": 2,
+ "lv": 35,
+ "score": 35
+ },
+ {
+ "id": 26,
+ "quality": 2,
+ "lv": 40,
+ "score": 37
+ },
+ {
+ "id": 27,
+ "quality": 2,
+ "lv": 45,
+ "score": 39
+ },
+ {
+ "id": 28,
+ "quality": 2,
+ "lv": 50,
+ "score": 41
+ },
+ {
+ "id": 29,
+ "quality": 2,
+ "lv": 55,
+ "score": 43
+ },
+ {
+ "id": 30,
+ "quality": 2,
+ "lv": 60,
+ "score": 45
+ },
+ {
+ "id": 31,
+ "quality": 3,
+ "lv": 1,
+ "score": 48
+ },
+ {
+ "id": 32,
+ "quality": 3,
+ "lv": 5,
+ "score": 51
+ },
+ {
+ "id": 33,
+ "quality": 3,
+ "lv": 10,
+ "score": 54
+ },
+ {
+ "id": 34,
+ "quality": 3,
+ "lv": 15,
+ "score": 57
+ },
+ {
+ "id": 35,
+ "quality": 3,
+ "lv": 20,
+ "score": 60
+ },
+ {
+ "id": 36,
+ "quality": 3,
+ "lv": 25,
+ "score": 63
+ },
+ {
+ "id": 37,
+ "quality": 3,
+ "lv": 30,
+ "score": 66
+ },
+ {
+ "id": 38,
+ "quality": 3,
+ "lv": 25,
+ "score": 69
+ },
+ {
+ "id": 39,
+ "quality": 3,
+ "lv": 30,
+ "score": 72
+ },
+ {
+ "id": 40,
+ "quality": 3,
+ "lv": 35,
+ "score": 75
+ },
+ {
+ "id": 41,
+ "quality": 3,
+ "lv": 40,
+ "score": 78
+ },
+ {
+ "id": 42,
+ "quality": 3,
+ "lv": 45,
+ "score": 81
+ },
+ {
+ "id": 43,
+ "quality": 3,
+ "lv": 50,
+ "score": 84
+ },
+ {
+ "id": 44,
+ "quality": 3,
+ "lv": 55,
+ "score": 87
+ },
+ {
+ "id": 45,
+ "quality": 3,
+ "lv": 60,
+ "score": 90
+ },
+ {
+ "id": 46,
+ "quality": 4,
+ "lv": 1,
+ "score": 94
+ },
+ {
+ "id": 47,
+ "quality": 4,
+ "lv": 5,
+ "score": 98
+ },
+ {
+ "id": 48,
+ "quality": 4,
+ "lv": 10,
+ "score": 102
+ },
+ {
+ "id": 49,
+ "quality": 4,
+ "lv": 15,
+ "score": 106
+ },
+ {
+ "id": 50,
+ "quality": 4,
+ "lv": 20,
+ "score": 110
+ },
+ {
+ "id": 51,
+ "quality": 4,
+ "lv": 25,
+ "score": 114
+ },
+ {
+ "id": 52,
+ "quality": 4,
+ "lv": 30,
+ "score": 118
+ },
+ {
+ "id": 53,
+ "quality": 4,
+ "lv": 25,
+ "score": 122
+ },
+ {
+ "id": 54,
+ "quality": 4,
+ "lv": 30,
+ "score": 126
+ },
+ {
+ "id": 55,
+ "quality": 4,
+ "lv": 35,
+ "score": 130
+ },
+ {
+ "id": 56,
+ "quality": 4,
+ "lv": 40,
+ "score": 134
+ },
+ {
+ "id": 57,
+ "quality": 4,
+ "lv": 45,
+ "score": 138
+ },
+ {
+ "id": 58,
+ "quality": 4,
+ "lv": 50,
+ "score": 142
+ },
+ {
+ "id": 59,
+ "quality": 4,
+ "lv": 55,
+ "score": 146
+ },
+ {
+ "id": 60,
+ "quality": 4,
+ "lv": 60,
+ "score": 150
+ },
+ {
+ "id": 61,
+ "quality": 5,
+ "lv": 1,
+ "score": 155
+ },
+ {
+ "id": 62,
+ "quality": 5,
+ "lv": 5,
+ "score": 160
+ },
+ {
+ "id": 63,
+ "quality": 5,
+ "lv": 10,
+ "score": 165
+ },
+ {
+ "id": 64,
+ "quality": 5,
+ "lv": 15,
+ "score": 170
+ },
+ {
+ "id": 65,
+ "quality": 5,
+ "lv": 20,
+ "score": 175
+ },
+ {
+ "id": 66,
+ "quality": 5,
+ "lv": 25,
+ "score": 180
+ },
+ {
+ "id": 67,
+ "quality": 5,
+ "lv": 30,
+ "score": 185
+ },
+ {
+ "id": 68,
+ "quality": 5,
+ "lv": 25,
+ "score": 190
+ },
+ {
+ "id": 69,
+ "quality": 5,
+ "lv": 30,
+ "score": 195
+ },
+ {
+ "id": 70,
+ "quality": 5,
+ "lv": 35,
+ "score": 200
+ },
+ {
+ "id": 71,
+ "quality": 5,
+ "lv": 40,
+ "score": 205
+ },
+ {
+ "id": 72,
+ "quality": 5,
+ "lv": 45,
+ "score": 210
+ },
+ {
+ "id": 73,
+ "quality": 5,
+ "lv": 50,
+ "score": 215
+ },
+ {
+ "id": 74,
+ "quality": 5,
+ "lv": 55,
+ "score": 220
+ },
+ {
+ "id": 75,
+ "quality": 5,
+ "lv": 60,
+ "score": 225
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_smithytool.json b/bin/json/game_smithytool.json
index 50bea78d3..9bc66ddbc 100644
--- a/bin/json/game_smithytool.json
+++ b/bin/json/game_smithytool.json
@@ -323,7 +323,7 @@
"id": 11,
"skill_type": 2,
"skill_lv": 1,
- "preconditions": 10,
+ "preconditions": 15,
"up_material": [],
"name_text": {
"key": "",
@@ -339,7 +339,7 @@
"id": 12,
"skill_type": 2,
"skill_lv": 2,
- "preconditions": 10,
+ "preconditions": 15,
"up_material": [],
"name_text": {
"key": "",
@@ -355,7 +355,7 @@
"id": 13,
"skill_type": 2,
"skill_lv": 3,
- "preconditions": 10,
+ "preconditions": 15,
"up_material": [],
"name_text": {
"key": "",
@@ -371,7 +371,7 @@
"id": 14,
"skill_type": 2,
"skill_lv": 4,
- "preconditions": 10,
+ "preconditions": 15,
"up_material": [],
"name_text": {
"key": "",
@@ -387,7 +387,7 @@
"id": 15,
"skill_type": 2,
"skill_lv": 5,
- "preconditions": 10,
+ "preconditions": 15,
"up_material": [],
"name_text": {
"key": "",
@@ -403,7 +403,7 @@
"id": 16,
"skill_type": 2,
"skill_lv": 6,
- "preconditions": 10,
+ "preconditions": 15,
"up_material": [],
"name_text": {
"key": "",
@@ -419,7 +419,7 @@
"id": 17,
"skill_type": 2,
"skill_lv": 7,
- "preconditions": 10,
+ "preconditions": 15,
"up_material": [],
"name_text": {
"key": "",
@@ -435,7 +435,7 @@
"id": 18,
"skill_type": 2,
"skill_lv": 8,
- "preconditions": 10,
+ "preconditions": 15,
"up_material": [],
"name_text": {
"key": "",
@@ -451,7 +451,7 @@
"id": 19,
"skill_type": 2,
"skill_lv": 9,
- "preconditions": 10,
+ "preconditions": 15,
"up_material": [],
"name_text": {
"key": "",
@@ -467,7 +467,7 @@
"id": 20,
"skill_type": 2,
"skill_lv": 10,
- "preconditions": 10,
+ "preconditions": 15,
"up_material": [],
"name_text": {
"key": "",
@@ -483,7 +483,7 @@
"id": 21,
"skill_type": 3,
"skill_lv": 1,
- "preconditions": 20,
+ "preconditions": 25,
"up_material": [],
"name_text": {
"key": "",
@@ -499,7 +499,7 @@
"id": 22,
"skill_type": 3,
"skill_lv": 2,
- "preconditions": 21,
+ "preconditions": 25,
"up_material": [],
"name_text": {
"key": "",
@@ -515,7 +515,7 @@
"id": 23,
"skill_type": 3,
"skill_lv": 3,
- "preconditions": 22,
+ "preconditions": 25,
"up_material": [],
"name_text": {
"key": "",
@@ -531,7 +531,7 @@
"id": 24,
"skill_type": 3,
"skill_lv": 4,
- "preconditions": 23,
+ "preconditions": 25,
"up_material": [],
"name_text": {
"key": "",
@@ -547,7 +547,7 @@
"id": 25,
"skill_type": 3,
"skill_lv": 5,
- "preconditions": 24,
+ "preconditions": 25,
"up_material": [],
"name_text": {
"key": "",
@@ -813,7 +813,7 @@
"key": "41",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 6
+ "value": 5
},
{
"id": 42,
@@ -829,7 +829,7 @@
"key": "42",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 7
+ "value": 0
},
{
"id": 43,
@@ -845,7 +845,7 @@
"key": "43",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 8
+ "value": 0
},
{
"id": 44,
@@ -861,7 +861,7 @@
"key": "44",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 9
+ "value": 0
},
{
"id": 45,
@@ -877,7 +877,7 @@
"key": "45",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 10
+ "value": 0
},
{
"id": 46,
@@ -893,7 +893,7 @@
"key": "46",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 11
+ "value": 0
},
{
"id": 47,
@@ -909,7 +909,7 @@
"key": "47",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 12
+ "value": 0
},
{
"id": 48,
@@ -925,7 +925,7 @@
"key": "48",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 13
+ "value": 0
},
{
"id": 49,
@@ -941,7 +941,7 @@
"key": "49",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 14
+ "value": 0
},
{
"id": 50,
@@ -957,6 +957,6 @@
"key": "50",
"text": "顾客购买装备数量上限提高至{0}件"
},
- "value": 15
+ "value": 0
}
]
\ No newline at end of file
diff --git a/bin/json/game_vikingboss.json b/bin/json/game_vikingboss.json
index 017c32686..419601971 100644
--- a/bin/json/game_vikingboss.json
+++ b/bin/json/game_vikingboss.json
@@ -3698,5 +3698,954 @@
"n": 1
}
]
+ },
+ {
+ "id": 30010,
+ "copytype": 4,
+ "bossid": 31,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "火焰泰坦"
+ },
+ "difficulty": 1,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "10110",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10111",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10112",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10113",
+ "n": 1
+ }
+ ],
+ "drop": 1001,
+ "scene": "",
+ "bossmodel": 1001,
+ "boss_skill": 51004,
+ "boss": [
+ 11009
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 6
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 5
+ }
+ ]
+ },
+ {
+ "id": 30020,
+ "copytype": 4,
+ "bossid": 31,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "火焰泰坦"
+ },
+ "difficulty": 2,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "10120",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10121",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10122",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10113",
+ "n": 1
+ }
+ ],
+ "drop": 1002,
+ "scene": "",
+ "bossmodel": 1002,
+ "boss_skill": 51004,
+ "boss": [
+ 11009
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 7
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 6
+ }
+ ]
+ },
+ {
+ "id": 30030,
+ "copytype": 4,
+ "bossid": 31,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "火焰泰坦"
+ },
+ "difficulty": 3,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "10120",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10121",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10122",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10123",
+ "n": 1
+ }
+ ],
+ "drop": 1003,
+ "scene": "",
+ "bossmodel": 1003,
+ "boss_skill": 51004,
+ "boss": [
+ 11009
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 8
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 7
+ }
+ ]
+ },
+ {
+ "id": 30040,
+ "copytype": 4,
+ "bossid": 31,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "火焰泰坦"
+ },
+ "difficulty": 4,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "10130",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10131",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10132",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10123",
+ "n": 1
+ }
+ ],
+ "drop": 1004,
+ "scene": "",
+ "bossmodel": 1004,
+ "boss_skill": 51004,
+ "boss": [
+ 11009
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 9
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 8
+ }
+ ]
+ },
+ {
+ "id": 30050,
+ "copytype": 4,
+ "bossid": 32,
+ "name": {
+ "key": "viking_boss_1002",
+ "text": "冰之泰坦"
+ },
+ "difficulty": 1,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "10110",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10111",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10112",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10113",
+ "n": 1
+ }
+ ],
+ "drop": 1011,
+ "scene": "",
+ "bossmodel": 1011,
+ "boss_skill": 51004,
+ "boss": [
+ 11003
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 6
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 5
+ }
+ ]
+ },
+ {
+ "id": 30060,
+ "copytype": 4,
+ "bossid": 32,
+ "name": {
+ "key": "viking_boss_1002",
+ "text": "冰之泰坦"
+ },
+ "difficulty": 2,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "10120",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10121",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10122",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10113",
+ "n": 1
+ }
+ ],
+ "drop": 1012,
+ "scene": "",
+ "bossmodel": 1012,
+ "boss_skill": 51004,
+ "boss": [
+ 11003
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 7
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 6
+ }
+ ]
+ },
+ {
+ "id": 30070,
+ "copytype": 4,
+ "bossid": 32,
+ "name": {
+ "key": "viking_boss_1002",
+ "text": "冰之泰坦"
+ },
+ "difficulty": 3,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "10120",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10121",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10122",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10123",
+ "n": 1
+ }
+ ],
+ "drop": 1013,
+ "scene": "",
+ "bossmodel": 1013,
+ "boss_skill": 51004,
+ "boss": [
+ 11003
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 8
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 7
+ }
+ ]
+ },
+ {
+ "id": 30080,
+ "copytype": 4,
+ "bossid": 32,
+ "name": {
+ "key": "viking_boss_1002",
+ "text": "冰之泰坦"
+ },
+ "difficulty": 4,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "10130",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10131",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10132",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10123",
+ "n": 1
+ }
+ ],
+ "drop": 1014,
+ "scene": "",
+ "bossmodel": 1014,
+ "boss_skill": 51004,
+ "boss": [
+ 11003
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 9
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 8
+ }
+ ]
+ },
+ {
+ "id": 30090,
+ "copytype": 4,
+ "bossid": 33,
+ "name": {
+ "key": "viking_boss_1003",
+ "text": "森林泰坦"
+ },
+ "difficulty": 1,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "10110",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10111",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10112",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10113",
+ "n": 1
+ }
+ ],
+ "drop": 1021,
+ "scene": "",
+ "bossmodel": 1021,
+ "boss_skill": 51004,
+ "boss": [
+ 11018
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 6
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 5
+ }
+ ]
+ },
+ {
+ "id": 30100,
+ "copytype": 4,
+ "bossid": 33,
+ "name": {
+ "key": "viking_boss_1003",
+ "text": "森林泰坦"
+ },
+ "difficulty": 2,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "10120",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10121",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10122",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10113",
+ "n": 1
+ }
+ ],
+ "drop": 1022,
+ "scene": "",
+ "bossmodel": 1022,
+ "boss_skill": 51004,
+ "boss": [
+ 11018
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 7
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 6
+ }
+ ]
+ },
+ {
+ "id": 30110,
+ "copytype": 4,
+ "bossid": 33,
+ "name": {
+ "key": "viking_boss_1003",
+ "text": "森林泰坦"
+ },
+ "difficulty": 3,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "10120",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10121",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10122",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10123",
+ "n": 1
+ }
+ ],
+ "drop": 1023,
+ "scene": "",
+ "bossmodel": 1023,
+ "boss_skill": 51004,
+ "boss": [
+ 11018
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 8
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 7
+ }
+ ]
+ },
+ {
+ "id": 30120,
+ "copytype": 4,
+ "bossid": 33,
+ "name": {
+ "key": "viking_boss_1003",
+ "text": "森林泰坦"
+ },
+ "difficulty": 4,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "10130",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10131",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10132",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "10123",
+ "n": 1
+ }
+ ],
+ "drop": 1024,
+ "scene": "",
+ "bossmodel": 1024,
+ "boss_skill": 51004,
+ "boss": [
+ 11018
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 9
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 8
+ }
+ ]
+ },
+ {
+ "id": 30130,
+ "copytype": 4,
+ "bossid": 34,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "武器BOSS"
+ },
+ "difficulty": 1,
+ "BattleReadyID": 112,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ {
+ "a": "equi",
+ "t": "20010",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "20011",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "20012",
+ "n": 1
+ },
+ {
+ "a": "equi",
+ "t": "20013",
+ "n": 1
+ }
+ ],
+ "drop": 1001,
+ "scene": "",
+ "bossmodel": 1001,
+ "boss_skill": 51004,
+ "boss": [
+ 11009
+ ],
+ "ps_consume": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 6
+ }
+ ],
+ "ps_mg": [
+ {
+ "a": "item",
+ "t": "100100",
+ "n": 5
+ }
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_vikingbossskill.json b/bin/json/game_vikingbossskill.json
index 68eb33d29..a31a68cf3 100644
--- a/bin/json/game_vikingbossskill.json
+++ b/bin/json/game_vikingbossskill.json
@@ -83,5 +83,22 @@
124004111,
144005111
]
+ },
+ {
+ "bossid": 31,
+ "copytype": 4,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "火焰泰坦"
+ },
+ "introduce": {
+ "key": "viking_boss_20001",
+ "text": "熔岩泰坦巨人来自于遥远的火山，它的火焰属性使得所到之处，一片荒芜"
+ },
+ "icon": "wjyz_img013",
+ "guardskill": [
+ 124004111,
+ 144005111
+ ]
}
]
\ No newline at end of file
diff --git a/cmd/v2/ui/tool_valid.go b/cmd/v2/ui/tool_valid.go
index 35062e743..ab81905de 100644
--- a/cmd/v2/ui/tool_valid.go
+++ b/cmd/v2/ui/tool_valid.go
@@ -7,6 +7,8 @@ import (
"go_dreamfactory/cmd/v2/service/observer"
mytheme "go_dreamfactory/cmd/v2/theme"
"io/ioutil"
+ "path"
+ "strings"
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/container"
@@ -18,26 +20,31 @@ import (
)
type jsonFileList struct {
- selItemId string //选择的文件ID
- cacheList common.List
- itemList *widget.List
- fileTotal int //文件数
+ selItemId string //选择的文件ID
+ cachedList common.List
+ itemList *widget.List
+ fileTotal int //文件数
+
+ //字段
+ columnList *widget.List
+
}
func newJsonFileList() *jsonFileList {
return &jsonFileList{
- cacheList: common.NewList(""),
+ cachedList: common.NewList(""),
}
}
type appConfigValid struct {
appAdapter
- jsonFileList
+ jsonFileList *jsonFileList
+ jsonDirString string //json目录
}
func (a *appConfigValid) LazyInit(pt service.PttService, obs observer.Observer) error {
a.tabItem = container.NewTabItemWithIcon(common.TOOLBAR_VALID, mytheme.ResourceExcelJpg, nil)
- a.jsonFileList = *newJsonFileList()
+ a.jsonFileList = newJsonFileList()
//load conf
storage, _ := os_storage.NewOSStorage()
@@ -47,8 +54,8 @@ func (a *appConfigValid) LazyInit(pt service.PttService, obs observer.Observer)
return err
}
- if conf.JsonDir!=""{
-
+ if conf.JsonDir != "" {
+ a.jsonDirString = conf.JsonDir
}
content := container.NewMax()
content.Objects = []fyne.CanvasObject{}
@@ -72,6 +79,10 @@ func (a *appConfigValid) LazyInit(pt service.PttService, obs observer.Observer)
//配置json路径
jsonDir := widget.NewEntry()
jsonDir.PlaceHolder = "json目录"
+ jsonDir.OnChanged = func(s string) {
+ a.jsonFileList.initItem(jsonDir.Text)
+ a.jsonDirString = jsonDir.Text
+ }
form := widget.NewForm(
widget.NewFormItem("json目录", container.NewBorder(nil, nil, nil, widget.NewButtonWithIcon("", theme.FolderIcon(), func() {
openFolder(jsonDir)
@@ -80,8 +91,27 @@ func (a *appConfigValid) LazyInit(pt service.PttService, obs observer.Observer)
)
jsonDir.SetText(conf.JsonDir)
-
- c := container.NewBorder(form, nil, nil, nil)
+
+ confBtn := &widget.Button{Text: "保存配置", Icon: theme.DocumentCreateIcon()}
+ confBtn.OnTapped = func() {
+ conf.JsonDir = jsonDir.Text
+
+ if err := storage.StoreConfig(conf); err != nil {
+ logrus.WithField("err", err).Debug("保存配置")
+ return
+ }
+ }
+
+ // 创建json文件 List
+ a.jsonFileList.itemList = a.jsonFileList.createList()
+
+ //创建字段
+
+ c := container.NewBorder(form,
+ container.NewHBox(confBtn),
+ nil, nil,
+ container.NewGridWithColumns(3,
+ container.NewVScroll(a.jsonFileList.itemList)))
content.Objects = append(content.Objects, c)
a.tabItem.Content = content
@@ -104,19 +134,39 @@ func (f *jsonFileList) initItem(dir string) {
}
for _, file := range files {
- if file.IsDir() {
- if file.Name() == ".vscode" {
- continue
- }
- fm := common.Item{
- Text: file.Name(),
- Checked: false,
- }
- f.cacheList.Items = append(f.cacheList.Items, fm)
- // f.selItemIds = append(f.selItemIds, fm.Id)
- f.fileTotal++
- // logrus.Debugf("%v", fm.Id)
+ fileSuffix := path.Ext(file.Name())
+ name := strings.TrimSuffix(file.Name(), fileSuffix)
+ name = strings.TrimPrefix(name, "game_")
+ fm := common.Item{
+ Id: file.Name(),
+ Text: name,
+ Checked: false,
}
+ f.cachedList.Items = append(f.cachedList.Items, fm)
+ f.fileTotal++
+ // logrus.Debugf("%v", fm.Id)
}
-
+}
+
+func (f *jsonFileList) createList() *widget.List {
+ f.itemList = widget.NewList(
+ func() int {
+ return len(f.cachedList.Items)
+ },
+ func() fyne.CanvasObject {
+ return widget.NewLabel("Template")
+ },
+ func(id widget.ListItemID, item fyne.CanvasObject) {
+ c, _ := item.(*widget.Label)
+ c.Text = f.cachedList.Items[id].Text
+ c.Refresh()
+ },
+ )
+
+ f.itemList.OnSelected = func(id widget.ListItemID) {
+ selId := f.cachedList.Items[id].Id
+ f.selItemId = selId
+ return
+ }
+ return f.itemList
}
diff --git a/cmd/v2/ui/views/smithy.go b/cmd/v2/ui/views/smithy.go
index fad4d8847..bd6d1f99f 100644
--- a/cmd/v2/ui/views/smithy.go
+++ b/cmd/v2/ui/views/smithy.go
@@ -27,9 +27,25 @@ func (s *SmithyView) CreateView(t *model.TestCase) fyne.CanvasObject {
return
}
}
- customerBtn := widget.NewButton("顾客", loadCustomer)
- btns := container.NewHBox(customerBtn)
+ //交易
+ jiaoyi := func() {
+ if err := service.GetPttService().SendToClient(
+ t.MainType,
+ "jiaoyi",
+ &pb.SmithySellReq{
+ EquipIds: []string{},
+ CustomerId: 1,
+ },
+ ); err != nil {
+ logrus.Error(err)
+ return
+ }
+ }
+ customerBtn := widget.NewButton("顾客", loadCustomer)
+ jiaoyiBtn := widget.NewButton("交易", jiaoyi)
+
+ btns := container.NewHBox(customerBtn, jiaoyiBtn)
c := container.NewBorder(btns, nil, nil, nil)
return c
}
diff --git a/comm/const.go b/comm/const.go
index c1c5d2d6e..b352bf155 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -225,6 +225,8 @@ const (
// 铁匠铺铸造台
TableStove = "stove"
+ // 铁匠铺图鉴
+ TableAtlas = "atlas"
)
// RPC服务接口定义处
@@ -731,7 +733,7 @@ const (
SmithyReelType1 = 1 //炉温消耗减少
SmithyReelType2 = 2 // 材料消耗减少
SmithyReelType3 = 3 // 解锁图纸【紫金雷神锤】
- SmithyReelType4 = 4
+ SmithyReelType4 = 4 // 解锁新套装
SmithyReelType5 = 5 // 概率制造两件装备
)
diff --git a/comm/imodule.go b/comm/imodule.go
index 3834c4e72..3d7b8026c 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -149,6 +149,17 @@ type (
SellEquipments(session IUserSession, equs []string) (code pb.ErrorCode, atno []*pb.UserAtno)
//回收装备接口
RecycleEquipments(session IUserSession, equs []string, discount int32) (code pb.ErrorCode, atno []*pb.UserAtno)
+ //获得可操作用户装备列表
+ GetActionableEquipments(uid string) (code pb.ErrorCode, eruips []*pb.DB_Equipment)
+ //获取可用套装 （铁匠铺使用）
+ GetActionableSuit(uid string) (code pb.ErrorCode, Suit []int32)
+ // 随机获得一件N级的装备装备
+ /*
+ suiteId: 套装id
+ pos: 位置(-1 表示随机位置 大于0 表示获得指定位置 )
+ lv: 装备等级
+ */
+ GetForgeEquip(session IUserSession, suiteId int32, pos int32, lv int32) (eruip *pb.DB_Equipment, code pb.ErrorCode)
}
IMainline interface {
ModifyMainlineDataByNanduID(uid string, nandu, id int32) (code pb.ErrorCode)
diff --git a/modules/battle/configure.go b/modules/battle/configure.go
index 9412de76b..67ab17b6e 100644
--- a/modules/battle/configure.go
+++ b/modules/battle/configure.go
@@ -10,14 +10,15 @@ import (
)
const (
- game_equipsuit = "game_equipsuit.json" //套装技能表
- game_monsterformat = "game_monsterformat.json" //整容表
- game_monster = "game_monster.json" //怪物表
- game_skillatk = "game_skillatk" //主技能表
- game_skillafteratk = "game_skillafteratk" //子技能表
- game_skillbuff = "game_skillbuff" //技能buff表
- game_skillpassive = "game_skillpassive" //被动技能表
- game_battletasktesting = "game_battletasktesting.json" //被动技能表
+ game_equipsuit = "game_equipsuit.json" //套装技能表
+ game_monsterformat = "game_monsterformat.json" //整容表
+ game_monster = "game_monster.json" //怪物表
+ game_battletasktesting = "game_battletasktesting.json" //被动技能表
+ game_skillatk = "game_skillatk" //主技能表
+ game_skillafteratk = "game_skillafteratk" //子技能表
+ game_skillbuff = "game_skillbuff" //技能buff表
+ game_skillpassive = "game_skillpassive" //被动技能表
+ game_battleready_capskill = "game_battleready_capskill.json" //队长技能激活规则
)
///背包配置管理组件
@@ -55,6 +56,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
}
this.mformatlock.Unlock()
})
+ this.LoadConfigure(game_battleready_capskill, cfg.NewGameBattleready_capskill)
// configure.RegisterConfigure(game_skillatk, cfg.NewGameSkillAtk, func() {
// this.skillatklock.Lock()
// if v, err := this.GetConfigure(game_skillatk); err != nil {
@@ -126,6 +128,23 @@ func (this *configureComp) Getequipsuit(id int32) (result *cfg.GameEquipSuitData
return
}
+//查询队长技激活规则
+func (this *configureComp) GetBattlereadyCapskill(id int32) (result *cfg.GameBattleready_capskillData, err error) {
+ var (
+ v interface{}
+ ok bool
+ )
+ if v, err = this.GetConfigure(game_battleready_capskill); err != nil {
+ this.module.Errorln(err)
+ } else {
+ if result, ok = v.(*cfg.GameBattleready_capskill).GetDataMap()[id]; !ok {
+ err = fmt.Errorf("on found BattlereadyCapskill:%d", id)
+ this.module.Errorln(err)
+ }
+ }
+ return
+}
+
///获取主动技能配置表
func (this *configureComp) GetSkillAtk(skillId int32, skillLv int32) (result *cfg.GameSkillAtkData, err error) {
if skills, ok := this.skillatk[skillId]; ok {
diff --git a/modules/battle/modelBattle.go b/modules/battle/modelBattle.go
index 372123da3..401df5298 100644
--- a/modules/battle/modelBattle.go
+++ b/modules/battle/modelBattle.go
@@ -180,6 +180,9 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon
//创建pve 战斗记录
func (this *modelBattleComp) createpve(session comm.IUserSession, conn *db.DBConn, btype pb.BattleType, req *pb.BattlePVEReq) (record *pb.DBBattleRecord, code pb.ErrorCode) {
+ var (
+ heros []*pb.DBHero = make([]*pb.DBHero, 5)
+ )
record = &pb.DBBattleRecord{
Id: primitive.NewObjectID().Hex(),
Title: req.Title,
@@ -199,13 +202,13 @@ func (this *modelBattleComp) createpve(session comm.IUserSession, conn *db.DBCon
//自己的英雄阵营
for i, v := range req.Format.Format {
if v != "" {
- hero := &pb.DBHero{}
- if err := model.GetListObj(session.GetUserId(), v, hero); err != nil {
+ heros[i] = &pb.DBHero{}
+ if err := model.GetListObj(session.GetUserId(), v, heros[i]); err != nil {
code = pb.ErrorCode_HeroNoExist
return
}
tid := 100 + i
- if record.Redflist[0].Team[i], code = this.createBattleRole(hero, tid, i); code != pb.ErrorCode_Success {
+ if record.Redflist[0].Team[i], code = this.createBattleRole(heros[i], tid, i); code != pb.ErrorCode_Success {
return
}
} else {
@@ -216,35 +219,38 @@ func (this *modelBattleComp) createpve(session comm.IUserSession, conn *db.DBCon
for i, v := range req.Format.Friendformat {
if v != "" {
var (
- hero *pb.DBHero
- err error
+ err error
)
// 获取好友英雄信息
if this.module.IsCross() {
- if hero, err = this.module.friend.UseAssistHero(session.GetUserId(), v); err != nil {
+ if heros[i], err = this.module.friend.UseAssistHero(session.GetUserId(), v); err != nil {
this.module.Errorln(err)
code = pb.ErrorCode_HeroNoExist
return
}
} else { //获取跨服数据
- hero = &pb.DBHero{}
+ heros[i] = &pb.DBHero{}
if err = this.module.service.AcrossClusterRpcCall(
context.Background(),
this.module.GetCrossTag(),
comm.Service_Worker,
string(comm.Rpc_ModuleFriendUseAssitHero),
pb.RPCGeneralReqA2{Param1: session.GetUserId(), Param2: v},
- hero); err != nil {
+ heros[i]); err != nil {
this.module.Errorln(err)
}
}
tid := 100 + i
- if record.Redflist[0].Team[i], code = this.createBattleRole(hero, tid, i); code != pb.ErrorCode_Success {
+ if record.Redflist[0].Team[i], code = this.createBattleRole(heros[i], tid, i); code != pb.ErrorCode_Success {
return
}
record.Redflist[0].Team[i].Ishelp = true
}
}
+ if ok := this.checkBattlereadyCapskill(req.Format.Leadpos, heros); ok {
+ code = pb.ErrorCode_BattleCapskillCheckFailed
+ return
+ }
var (
captain int32
masters []*pb.BattleRole
@@ -275,6 +281,7 @@ func (this *modelBattleComp) createpvb(session comm.IUserSession, conn *db.DBCon
Buleflist: make([]*pb.DBBattleFormt, len(req.Mformat)),
}
for ii, v := range req.Format {
+ heros := make([]*pb.DBHero, 5)
record.Redflist[ii] = &pb.DBBattleFormt{
Leadpos: v.Leadpos,
Team: make([]*pb.BattleRole, len(v.Format)),
@@ -283,13 +290,13 @@ func (this *modelBattleComp) createpvb(session comm.IUserSession, conn *db.DBCon
//自己的英雄阵营
for i, v := range v.Format {
if v != "" {
- hero := &pb.DBHero{}
- if err := model.GetListObj(session.GetUserId(), v, hero); err != nil {
+ heros[i] = &pb.DBHero{}
+ if err := model.GetListObj(session.GetUserId(), v, heros[i]); err != nil {
code = pb.ErrorCode_HeroNoExist
return
}
tid := 100 + i
- if record.Redflist[ii].Team[i], code = this.createBattleRole(hero, tid, i); code != pb.ErrorCode_Success {
+ if record.Redflist[ii].Team[i], code = this.createBattleRole(heros[i], tid, i); code != pb.ErrorCode_Success {
return
}
} else {
@@ -300,35 +307,38 @@ func (this *modelBattleComp) createpvb(session comm.IUserSession, conn *db.DBCon
for i, v := range v.Friendformat {
if v != "" {
var (
- hero *pb.DBHero
- err error
+ err error
)
// 获取好友英雄信息
if this.module.IsCross() {
- if hero, err = this.module.friend.UseAssistHero(session.GetUserId(), v); err != nil {
+ if heros[i], err = this.module.friend.UseAssistHero(session.GetUserId(), v); err != nil {
this.module.Errorln(err)
code = pb.ErrorCode_HeroNoExist
return
}
} else { //获取跨服数据
- hero = &pb.DBHero{}
+ heros[i] = &pb.DBHero{}
if err = this.module.service.AcrossClusterRpcCall(
context.Background(),
this.module.GetCrossTag(),
comm.Service_Worker,
string(comm.Rpc_ModuleFriendUseAssitHero),
pb.RPCGeneralReqA2{Param1: session.GetUserId(), Param2: v},
- hero); err != nil {
+ heros[i]); err != nil {
this.module.Errorln(err)
}
}
tid := 100 + i
- if record.Redflist[ii].Team[i], code = this.createBattleRole(hero, tid, i); code != pb.ErrorCode_Success {
+ if record.Redflist[ii].Team[i], code = this.createBattleRole(heros[i], tid, i); code != pb.ErrorCode_Success {
return
}
record.Redflist[ii].Team[i].Ishelp = true
}
}
+ if ok := this.checkBattlereadyCapskill(v.Leadpos, heros); ok {
+ code = pb.ErrorCode_BattleCapskillCheckFailed
+ return
+ }
}
var (
@@ -375,6 +385,11 @@ func (this *modelBattleComp) createpvp(session comm.IUserSession, conn *db.DBCon
record.Redflist[0].Team[i] = nil
}
}
+ if ok := this.checkBattlereadyCapskill(req.Redformat.Leadpos, req.Redformat.Format); ok {
+ code = pb.ErrorCode_BattleCapskillCheckFailed
+ return
+ }
+
record.Buleflist[0] = &pb.DBBattleFormt{
Leadpos: req.Buleformat.Leadpos,
Team: make([]*pb.BattleRole, len(req.Buleformat.Format)),
@@ -390,6 +405,10 @@ func (this *modelBattleComp) createpvp(session comm.IUserSession, conn *db.DBCon
record.Buleflist[0].Team[i] = nil
}
}
+ if ok := this.checkBattlereadyCapskill(req.Buleformat.Leadpos, req.Buleformat.Format); ok {
+ code = pb.ErrorCode_BattleCapskillCheckFailed
+ return
+ }
return
}
@@ -407,46 +426,56 @@ func (this *modelBattleComp) creatertpvp(redmodel, bluemodel *db.DBModel, btype
Buleflist: make([]*pb.DBBattleFormt, len(req.Bulefformat)),
}
for ii, v := range req.Redformat {
+ heros := make([]*pb.DBHero, 5)
record.Redflist[ii] = &pb.DBBattleFormt{
Leadpos: v.Leadpos,
Team: make([]*pb.BattleRole, len(v.Format)),
}
for i, v := range v.Format {
if v != "" {
- hero := &pb.DBHero{}
- if err := redmodel.GetListObj(req.RedCompId, v, hero); err != nil {
+ heros[i] = &pb.DBHero{}
+ if err := redmodel.GetListObj(req.RedCompId, v, heros[i]); err != nil {
code = pb.ErrorCode_HeroNoExist
return
}
tid := 100 + i
- if record.Redflist[ii].Team[i], code = this.createBattleRole(hero, tid, i); code != pb.ErrorCode_Success {
+ if record.Redflist[ii].Team[i], code = this.createBattleRole(heros[i], tid, i); code != pb.ErrorCode_Success {
return
}
} else {
record.Redflist[ii].Team[i] = nil
}
}
+ if ok := this.checkBattlereadyCapskill(v.Leadpos, heros); ok {
+ code = pb.ErrorCode_BattleCapskillCheckFailed
+ return
+ }
}
for ii, v := range req.Bulefformat {
+ heros := make([]*pb.DBHero, 5)
record.Buleflist[ii] = &pb.DBBattleFormt{
Leadpos: v.Leadpos,
Team: make([]*pb.BattleRole, len(v.Format)),
}
for i, v := range v.Format {
if v != "" {
- hero := &pb.DBHero{}
- if err := bluemodel.GetListObj(req.BlueCompId, v, hero); err != nil {
+ heros[i] = &pb.DBHero{}
+ if err := bluemodel.GetListObj(req.BlueCompId, v, heros[i]); err != nil {
code = pb.ErrorCode_HeroNoExist
return
}
tid := 200 + i
- if record.Buleflist[ii].Team[i], code = this.createBattleRole(hero, tid, i); code != pb.ErrorCode_Success {
+ if record.Buleflist[ii].Team[i], code = this.createBattleRole(heros[i], tid, i); code != pb.ErrorCode_Success {
return
}
} else {
record.Buleflist[ii].Team[i] = nil
}
}
+ if ok := this.checkBattlereadyCapskill(v.Leadpos, heros); ok {
+ code = pb.ErrorCode_BattleCapskillCheckFailed
+ return
+ }
}
return
}
@@ -574,3 +603,86 @@ func (this *modelBattleComp) createMasterRoles(comp, wheel int, fid int32) (capt
}
return
}
+
+//校验队长技是否激活 暂时不启用
+func (this *modelBattleComp) checkBattlereadyCapskill(leadpos int32, heros []*pb.DBHero) (ok bool) {
+ // if leadpos < 0 || leadpos > 5 {
+ ok = true
+ return
+ // }
+ var (
+ conf []*cfg.GameHeroData
+ caprule *cfg.GameBattleready_capskillData
+ err error
+ )
+ if heros[leadpos] == nil {
+ ok = true
+ return
+ }
+ conf = make([]*cfg.GameHeroData, len(heros))
+ for i, v := range heros {
+ if v != nil {
+ conf[i] = this.module.configure.GetHeroConfig(v.HeroID)
+ }
+ }
+ if caprule, err = this.module.configure.GetBattlereadyCapskill(conf[leadpos].Capskillrule); err != nil {
+ this.module.Errorln(err)
+ ok = false
+ return
+ }
+ if len(caprule.Lv) == 2 { //等级校验
+ n := 0
+ for _, v := range heros {
+ if v != nil && v.Lv >= caprule.Lv[0] {
+ n++
+ }
+ }
+ if n < int(caprule.Lv[1]) {
+ ok = false
+ return
+ }
+ }
+ if len(caprule.Start) == 2 { //星级校验
+ n := 0
+ for _, v := range heros {
+ if v != nil && v.Star >= caprule.Start[0] {
+ n++
+ }
+ }
+ if n < int(caprule.Start[1]) {
+ ok = false
+ return
+ }
+ }
+
+ if len(caprule.Race) == 2 { //阵营校验
+ n := 0
+ for _, v := range conf {
+ if v != nil && v.Race == caprule.Race[0] {
+ n++
+ }
+ }
+ if n < int(caprule.Race[1]) {
+ ok = false
+ return
+ }
+ }
+
+ if len(caprule.Heroid) > 0 { //阵营校验
+
+ for _, v := range caprule.Heroid {
+ iskeep := false
+ for _, v1 := range heros {
+ if v1 != nil && v1.HeroID == v {
+ iskeep = true
+ }
+ }
+ if !iskeep {
+ ok = false
+ return
+ }
+ }
+
+ }
+ return
+}
diff --git a/modules/comp_configure.go b/modules/comp_configure.go
index 014617f50..c373a155a 100644
--- a/modules/comp_configure.go
+++ b/modules/comp_configure.go
@@ -250,6 +250,18 @@ func (this *MCompConfigure) GetColor(id int32) (item *cfg.GameGameColorData, err
return
}
+// 获取英雄原始星级
+func (this *MCompConfigure) GetHeroConfig(heroCfgId string) *cfg.GameHeroData {
+ if v, err := this.GetConfigure(new_hero); err == nil {
+ if configure, ok := v.(*cfg.GameHero); ok {
+ if v, ok := configure.GetDataMap()[heroCfgId]; ok {
+ return v
+ }
+ }
+ }
+ return nil
+}
+
// 获取英雄原始星级
func (this *MCompConfigure) GetHeroConfigStar(heroCfgId string) int32 {
if v, err := this.GetConfigure(new_hero); err == nil {
diff --git a/modules/equipment/configure.go b/modules/equipment/configure.go
index 3e6c229e8..3f5e292ae 100644
--- a/modules/equipment/configure.go
+++ b/modules/equipment/configure.go
@@ -3,7 +3,9 @@ package equipment
import (
"fmt"
"go_dreamfactory/modules"
+ "go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs"
+ "sync"
"go_dreamfactory/lego/core"
)
@@ -21,7 +23,9 @@ const (
///背包配置管理组件
type configureComp struct {
modules.MCompConfigure
- module *Equipment
+ module *Equipment
+ equiplock sync.RWMutex
+ suit map[int32][]*cfg.GameEquipData
}
//组件初始化接口
@@ -35,6 +39,22 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
this.LoadConfigure(game_equipcompose, cfg.NewGameEquipSCompose)
this.LoadConfigure(game_equipattribute, cfg.NewGameEquipAttribute)
this.LoadConfigure(game_equipenchanting, cfg.NewGameEquipEnchanting)
+ configure.RegisterConfigure(game_equip, cfg.NewGameEquip, func() {
+ this.equiplock.Lock()
+ if v, err := this.GetConfigure(game_equip); err != nil {
+ this.module.Errorf("err:%v", err)
+ return
+ } else {
+ this.suit = make(map[int32][]*cfg.GameEquipData)
+ for _, v := range v.(*cfg.GameEquip).GetDataList() {
+ if this.suit[v.Suittype] == nil {
+ this.suit[v.Suittype] = make([]*cfg.GameEquipData, 0)
+ }
+ this.suit[v.Suittype] = append(this.suit[v.Suittype], v)
+ }
+ }
+ this.equiplock.Unlock()
+ })
return
}
@@ -57,6 +77,18 @@ func (this *configureComp) GetEquipmentConfigure() (configure *cfg.GameEquip, er
return
}
+//获取装备配置数据
+func (this *configureComp) GetSuitEquipmentConfigure(suitid int32) (configures []*cfg.GameEquipData, err error) {
+ var ok bool
+ this.equiplock.RLock()
+ configures, ok = this.suit[suitid]
+ this.equiplock.RUnlock()
+ if !ok {
+ err = fmt.Errorf("no found suitid:%d", suitid)
+ }
+ return
+}
+
//获取装备配置数据
func (this *configureComp) GetEquipmentConfigureById(equipmentId string) (configure *cfg.GameEquipData, err error) {
var (
diff --git a/modules/equipment/module.go b/modules/equipment/module.go
index 7c48ac876..3d32570bd 100644
--- a/modules/equipment/module.go
+++ b/modules/equipment/module.go
@@ -8,6 +8,8 @@ import (
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
"math"
+ "math/rand"
+ "time"
"github.com/go-redis/redis/v8"
)
@@ -282,6 +284,95 @@ func (this *Equipment) RecycleEquipments(session comm.IUserSession, equs []strin
return
}
+//获得可操作用户装备列表
+func (this *Equipment) GetActionableEquipments(uid string) (code pb.ErrorCode, eruips []*pb.DB_Equipment) {
+ var (
+ err error
+ equipments []*pb.DB_Equipment
+ )
+ eruips = make([]*pb.DB_Equipment, 0)
+ if equipments, err = this.modelEquipment.QueryUserEquipments(uid); err != nil {
+ return
+ }
+ for _, v := range equipments {
+ if v.HeroId == "" && !v.Islock {
+ eruips = append(eruips, v)
+ }
+ }
+ return
+}
+
+//获取可用套装 （铁匠铺使用）
+func (this *Equipment) GetActionableSuit(uid string) (code pb.ErrorCode, Suit []int32) {
+ var (
+ err error
+ equipments []*pb.DB_Equipment
+ suit map[int32]struct{}
+ )
+ suit = make(map[int32]struct{})
+ if equipments, err = this.modelEquipment.QueryUserEquipments(uid); err != nil {
+ return
+ }
+ for _, v := range equipments {
+ if v.HeroId == "" && !v.Islock {
+ if conf, err := this.configure.GetEquipmentConfigureById(v.CId); err == nil {
+ suit[conf.Suittype] = struct{}{}
+ }
+ }
+ }
+ for i, _ := range suit {
+ Suit = append(Suit, i)
+ }
+ return
+}
+
+// 随机获得一件N级的装备装备
+/*
+ suiteId: 套装id
+ pos: 位置(-1 表示随机位置 大于0 表示获得指定位置 )
+ lv: 装备等级
+*/
+func (this *Equipment) GetForgeEquip(session comm.IUserSession, suiteId int32, pos int32, lv int32) (eruip *pb.DB_Equipment, code pb.ErrorCode) {
+ var (
+ configures []*cfg.GameEquipData
+ lvs []*cfg.GameEquipData
+ change []*pb.DB_Equipment
+ err error
+ )
+ if configures, err = this.configure.GetSuitEquipmentConfigure(suiteId); err != nil {
+ code = pb.ErrorCode_EquipmentSuiteNotFound
+ return
+ }
+ if pos != -1 {
+ for _, v := range configures {
+ if v.Pos == pos && v.Star == lv {
+ if change, code = this.AddNewEquipments(session, map[string]uint32{v.Id: 1}, true); code == pb.ErrorCode_Success {
+ eruip = change[0]
+ return
+ }
+ }
+ }
+ code = pb.ErrorCode_ConfigNoFound
+ return
+ } else {
+ lvs = make([]*cfg.GameEquipData, 0)
+ for _, v := range configures {
+ if v.Star == lv {
+ lvs = append(lvs, v)
+ }
+ }
+ r := rand.New(rand.NewSource(time.Now().Unix()))
+ index := r.Perm(len(lvs))[0]
+
+ if change, code = this.AddNewEquipments(session, map[string]uint32{lvs[index].Id: 1}, true); code == pb.ErrorCode_Success {
+ eruip = change[0]
+ return
+ }
+ }
+
+ return
+}
+
//Evens--------------------------------------------------------------------------------------------------------------------------------
//推送道具变化消息
func (this *Equipment) equipmentsChangePush(session comm.IUserSession, items []*pb.DB_Equipment) (err error) {
diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go
index 37baee464..5c9f96175 100644
--- a/modules/hero/configure_comp.go
+++ b/modules/hero/configure_comp.go
@@ -136,12 +136,9 @@ func (this *configureComp) SetHeroDrawConfig() {
err error
)
if v, err = this.GetConfigure(hero_drawcard); err == nil {
- if _configure, ok := v.(*cfg.GameDrawCard); !ok {
- err = fmt.Errorf("%T no is *cfg.Game_drawCard", v)
- return
- } else {
+ if _configure, ok := v.(*cfg.GameDrawCard); ok {
this.hlock.Lock()
- defer this.hlock.Unlock()
+ this.drawCardCfg = make(map[string]map[int32][]*cfg.GameDrawCardData, 0)
for _, v := range _configure.GetDataList() {
if _, ok := this.drawCardCfg[v.CardPoolType]; !ok {
this.drawCardCfg[v.CardPoolType] = make(map[int32][]*cfg.GameDrawCardData, 0)
@@ -151,13 +148,15 @@ func (this *configureComp) SetHeroDrawConfig() {
}
this.drawCardCfg[v.CardPoolType][v.Star] = append(this.drawCardCfg[v.CardPoolType][v.Star], v)
}
+ this.hlock.Unlock()
+ this.module.Debug("update cfg.Game_drawCard over")
+ return
}
- } else {
- err = fmt.Errorf("%T no is *cfg.Game_drawCard", v)
}
-
+ err = fmt.Errorf("%T no is *cfg.Game_drawCard", v)
return
}
+
func (this *configureComp) GetPollByType(poosType string) map[int32][]*cfg.GameDrawCardData {
return this.drawCardCfg[poosType]
}
diff --git a/modules/smithy/api_atlasaward.go b/modules/smithy/api_atlasaward.go
new file mode 100644
index 000000000..118983fd6
--- /dev/null
+++ b/modules/smithy/api_atlasaward.go
@@ -0,0 +1,55 @@
+package smithy
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+
+ "google.golang.org/protobuf/proto"
+)
+
+//参数校验
+func (this *apiComp) AtlasAwardCheck(session comm.IUserSession, req *pb.SmithyAtlasAwardReq) (code pb.ErrorCode) {
+
+ return
+}
+
+// 获取铁匠铺图鉴信息
+func (this *apiComp) AtlasAward(session comm.IUserSession, req *pb.SmithyAtlasAwardReq) (code pb.ErrorCode, data proto.Message) {
+
+ code = this.AtlasAwardCheck(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.GetSmithyAtlasLvConf(atlas.Award)
+ if conf == nil {
+ code = pb.ErrorCode_ConfigNoFound
+ return
+ }
+ nexLv := this.module.configure.GetSmithyAtlasLvConf(atlas.Award + 1)
+ if nexLv == nil { //满级
+ code = pb.ErrorCode_SmithyAtlasMaxLv
+ return
+ }
+ // 校验能否领取奖励
+ if atlas.Score < nexLv.AtlasLv {
+ code = pb.ErrorCode_SmithyAtlasLackLv
+ return
+ }
+ if code = this.module.DispenseRes(session, conf.ItemId, true); code != pb.ErrorCode_Success {
+ return
+ }
+ //修改数据
+ atlas.Award += 1
+ update := make(map[string]interface{}, 0)
+ update["award"] = atlas.Award
+ this.module.modelAtlas.modifySmithyAtlasList(session.GetUserId(), update)
+
+ session.SendMsg(string(this.module.GetType()), "atlasaward", &pb.SmithyAtlasAwardResp{Data: atlas})
+ return
+}
diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go
index 4ca04c2dd..e312d2d8c 100644
--- a/modules/smithy/api_forgeequip.go
+++ b/modules/smithy/api_forgeequip.go
@@ -5,13 +5,14 @@ import (
"go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs"
+ "strconv"
"google.golang.org/protobuf/proto"
)
//参数校验
func (this *apiComp) ForgeEquipCheck(session comm.IUserSession, req *pb.SmithyForgeEquipReq) (code pb.ErrorCode) {
- if req.ReelId == 0 {
+ if req.ReelId == 0 || req.Lava < 0 || req.Quality < 0 {
code = pb.ErrorCode_ReqParameterError
return
}
@@ -25,7 +26,9 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
err error
update map[string]interface{}
- costRes []*cfg.Gameatn
+ costRes []*cfg.Gameatn
+ customLv int32 // 定制装备的等级
+ rsp *pb.SmithyForgeEquipResp
)
update = make(map[string]interface{})
code = this.ForgeEquipCheck(session, req)
@@ -55,23 +58,72 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
//update["data"] = stove.Data
}
stove.Data[req.ReelId].Value += 1
+ stove.Forge[req.ReelId] += 1
// 是否是精益打造
if req.Quality > 0 {
costRes = append(costRes, reelcfg.RefineCos)
}
+ // 校验是不是装备定制打造
+ if req.SuiteId != 0 {
+ // 检查消耗
+ if code = this.module.CheckRes(session, []*cfg.Gameatn{reelcfg.CustomizedCos1}); code != pb.ErrorCode_Success {
+ return
+ }
+ costRes = append(costRes, reelcfg.CustomizedCos1)
+ if req.Position == -1 {
+ if code = this.module.CheckRes(session, []*cfg.Gameatn{reelcfg.CustomizedCos2}); code != pb.ErrorCode_Success {
+ return
+ }
+ costRes = append(costRes, reelcfg.CustomizedCos2)
+ }
+ // 随机权重 获取等级
+ index := this.module.modelStove.GetRandEquipLv(reelcfg.CustomizedLvDistribution)
+ if int32(len(reelcfg.CustomizedLv)) > index {
+ customLv = reelcfg.CustomizedLv[index]
+ }
+ }
+
+ // 是否是熔岩打造
+ if req.Lava > 0 {
+ // 预计消耗温度
+ exemption := this.module.configure.GetGlobalConf().ExemptionTemperatureCos
+ if len(exemption) != 2 {
+ code = pb.ErrorCode_ConfigNoFound
+ return
+ }
+ if reelcfg.TemperatureCos > req.Lava*exemption[1] {
+ code = pb.ErrorCode_SmithyLackLava // 缺少熔岩
+ return
+ }
+ // 检查消耗
+ lavaCost := &cfg.Gameatn{
+ A: "item",
+ T: strconv.Itoa(int(exemption[0])),
+ N: req.Lava,
+ }
+ if code = this.module.CheckRes(session, []*cfg.Gameatn{lavaCost}); code != pb.ErrorCode_Success {
+ return
+ }
+ costRes = append(costRes, lavaCost)
+
+ } else {
+ // 熟练度减少的温度
+ t := this.module.modelStove.CheckTemperature(req.ReelId, stove.Data[req.ReelId].Lv)
+ // 检查炉温 是否够
+ if stove.Temperature < reelcfg.TemperatureCos-t {
+ code = pb.ErrorCode_SmithyNoTemperature // 炉温不够 直接返回
+ return
+ }
+ stove.Temperature -= (reelcfg.TemperatureCos - t) // 消耗温度
+ update["temperature"] = stove.Temperature
+ }
+
costRes = append(costRes, reelcfg.BasicCos...)
subAtn := this.module.modelStove.CheckForgeConsume(req.ReelId, stove.Data[req.ReelId].Lv)
costRes = append(costRes, subAtn...)
if code = this.module.CheckRes(session, costRes); code != pb.ErrorCode_Success {
return
}
- // 熟练度减少的温度
- t := this.module.modelStove.CheckTemperature(req.ReelId, stove.Data[req.ReelId].Lv)
- // 检查炉温 是否够
- if stove.Temperature < reelcfg.TemperatureCos-t {
- code = pb.ErrorCode_SmithyNoTemperature // 炉温不够 直接返回
- return
- }
// 检查是否提升了熟练度等级
nextProficiency := this.module.configure.GetSmithyProficileData(req.ReelId, stove.Data[req.ReelId].Lv+1)
@@ -85,16 +137,40 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
Value: 0,
}
}
+ // 是否解锁新套装
+ if nextProficiency.Type == comm.SmithyReelType4 {
+ if rst, err := this.module.ModuleUser.GetUserExpand(session.GetUserId()); err == nil {
+ rst.SuiteId = append(rst.SuiteId, nextProficiency.Value1)
+ update := make(map[string]interface{}, 0)
+ update["suiteId"] = rst.SuiteId
+ this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), update)
+ }
+ }
}
if code = this.module.ConsumeRes(session, costRes, true); code != pb.ErrorCode_Success {
return
}
- stove.Temperature -= (reelcfg.TemperatureCos - t) // 消耗温度
+
+ // 装备资源分发
+ if customLv > 0 { //
+ if equip, code1 := this.module.ModuleEquipment.GetForgeEquip(session, req.SuiteId, req.Position, customLv); code1 != pb.ErrorCode_Success {
+ rsp.Equip = append(rsp.Equip, equip.CId)
+ 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)
+ }
+ }
+
stove.RecoveTime = configure.Now().Unix()
update["data"] = stove.Data
update["recoveTime"] = stove.RecoveTime
- update["temperature"] = stove.Temperature
+ update["forge"] = stove.Forge // 打造次数
this.module.modelStove.updateSmithyStove(session.GetUserId(), update)
- session.SendMsg(string(this.module.GetType()), "forgeequip", &pb.SmithyForgeEquipResp{Data: stove})
+ rsp.Data = stove
+ session.SendMsg(string(this.module.GetType()), "forgeequip", rsp)
return
}
diff --git a/modules/smithy/api_getatlas.go b/modules/smithy/api_getatlas.go
new file mode 100644
index 000000000..dbd7511af
--- /dev/null
+++ b/modules/smithy/api_getatlas.go
@@ -0,0 +1,30 @@
+package smithy
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+
+ "google.golang.org/protobuf/proto"
+)
+
+//参数校验
+func (this *apiComp) AtlasListCheck(session comm.IUserSession, req *pb.SmithyAtlasListReq) (code pb.ErrorCode) {
+
+ return
+}
+
+// 获取铁匠铺图鉴信息
+func (this *apiComp) AtlasList(session comm.IUserSession, req *pb.SmithyAtlasListReq) (code pb.ErrorCode, data proto.Message) {
+
+ code = this.AtlasListCheck(session, req)
+ if code != pb.ErrorCode_Success {
+ return // 参数校验失败直接返回
+ }
+ atlas, err := this.module.modelAtlas.getSmithyAtlasList(session.GetUserId())
+ if err != nil {
+ code = pb.ErrorCode_DBError
+ return
+ }
+ session.SendMsg(string(this.module.GetType()), "atlaslist", &pb.SmithyAtlasListResp{Data: atlas})
+ return
+}
diff --git a/modules/smithy/api_orderequip.go b/modules/smithy/api_orderequip.go
deleted file mode 100644
index 55c08b842..000000000
--- a/modules/smithy/api_orderequip.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package smithy
-
-import (
- "go_dreamfactory/comm"
- "go_dreamfactory/pb"
-
- "google.golang.org/protobuf/proto"
-)
-
-//参数校验
-func (this *apiComp) OrderEquipCheck(session comm.IUserSession, req *pb.SmithyOrderEquipReq) (code pb.ErrorCode) {
- if req.SuiteId == 0 || req.Position == 0 {
- code = pb.ErrorCode_ReqParameterError
- return
- }
- return
-}
-
-// 打造装备
-func (this *apiComp) OrderEquip(session comm.IUserSession, req *pb.SmithyOrderEquipReq) (code pb.ErrorCode, data proto.Message) {
- var ()
-
- code = this.OrderEquipCheck(session, req)
- if code != pb.ErrorCode_Success {
- return // 参数校验失败直接返回
- }
- stove, err := this.module.modelStove.getSmithyStoveList(session.GetUserId())
- if err != nil {
- code = pb.ErrorCode_DBError
- return
- }
-
- session.SendMsg(string(this.module.GetType()), "orderequip", &pb.SmithyOrderEquipResp{Data: stove})
- return
-}
diff --git a/modules/smithy/api_rise.go b/modules/smithy/api_rise.go
index f25f4bc66..712dc61c0 100644
--- a/modules/smithy/api_rise.go
+++ b/modules/smithy/api_rise.go
@@ -3,6 +3,8 @@ package smithy
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
+ cfg "go_dreamfactory/sys/configure/structs"
+ "strconv"
"google.golang.org/protobuf/proto"
)
@@ -17,7 +19,9 @@ func (this *apiComp) RiseCheck(session comm.IUserSession, req *pb.SmithyRiseReq)
// 炉子升温
func (this *apiComp) Rise(session comm.IUserSession, req *pb.SmithyRiseReq) (code pb.ErrorCode, data proto.Message) {
- var ()
+ var (
+ cost []*cfg.Gameatn // 消耗材料
+ )
code = this.RiseCheck(session, req)
if code != pb.ErrorCode_Success {
@@ -28,7 +32,40 @@ 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 stove.Temperature >= conf.MaxTemperature { // 已经达到最大的温度值了
+ code = pb.ErrorCode_SmithyMaxTemperature
+ return
+ }
+
+ if stove.Temperature+req.Count*raise[0] >= conf.MaxTemperature-raise[0] {
+ code = pb.ErrorCode_SmithyMaxTemperature
+ return
+ }
+ if code = this.module.ConsumeRes(session, cost, true); code != pb.ErrorCode_Success {
+ return
+ }
+ stove.Temperature += req.Count * raise[0]
+ 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})
return
}
diff --git a/modules/smithy/api_trade.go b/modules/smithy/api_trade.go
index 1f99bea94..725f7f014 100644
--- a/modules/smithy/api_trade.go
+++ b/modules/smithy/api_trade.go
@@ -30,12 +30,7 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.SmithySellReq) (cod
// return
// }
-
- if imodule, err := this.service.GetModule(comm.ModuleEquipment); err == nil {
- if iequip, ok := imodule.(comm.IEquipment); ok {
- iequip.RecycleEquipments(session, req.EquipIds, this.module.modelStove.StoveToolsSellUp(session.GetUserId()))
- }
- }
+ this.module.ModuleEquipment.RecycleEquipments(session, req.EquipIds, this.module.modelStove.StoveToolsSellUp(session.GetUserId()))
_ = this.module.modelTrade.updateCustomer(session.GetUserId(), req.CustomerId)
diff --git a/modules/smithy/comp_configure.go b/modules/smithy/comp_configure.go
index 9aae9b2f6..21716c1c5 100644
--- a/modules/smithy/comp_configure.go
+++ b/modules/smithy/comp_configure.go
@@ -13,11 +13,14 @@ const (
game_smithy = "game_smithy.json"
game_smithystoveold = "game_smithystove.json"
- game_smithyreel = "game_newsmithy.json" // 新版铁匠铺卷轴
- game_smproficiency = "game_smithyproficiency.json" // 铁匠铺熟练度
- game_smithystove = "game_smithystovev1.json" // 铁匠铺台子 打造配置
- game_smithytools = "game_smithytool.json" // 铁匠铺工具台
- game_smithycustomer = "game_smithycustomer.json"
+ game_smithyreel = "game_newsmithy.json" // 新版铁匠铺卷轴
+ game_smproficiency = "game_smithyproficiency.json" // 铁匠铺熟练度
+ game_smithystove = "game_smithystovev1.json" // 铁匠铺台子 打造配置
+ game_smithytools = "game_smithytool.json" // 铁匠铺工具台
+ game_smithycustomer = "game_smithycustomer.json"
+ game_smithyatlas = "game_smithyatlas.json" // 收藏图鉴
+ game_smithyatlaslv = "game_smithyatlaslv.json" // 收藏等级积分
+ game_smithyatlasscore = "game_smithyatlasscore.json" // 图鉴积分
)
// /配置管理基础组件
@@ -27,8 +30,9 @@ type configureComp struct {
hlock sync.RWMutex
_smithyMap map[int64]*cfg.GameSmithyData
- _mapProficile map[int64]*cfg.GameSmithyProficiencyData // 熟练度 key 卷轴ID+ 等级
- _mapskill map[int64]*cfg.GameSmithyToolData // 熟练度 key 技能类型+ 技能等级等级
+ _mapProficile map[int64]*cfg.GameSmithyProficiencyData // 熟练度 key 卷轴ID+ 等级
+ _mapskill map[int64]*cfg.GameSmithyToolData // 熟练度 key 技能类型+ 技能等级等级
+ _mapAtlasScore map[int64]*cfg.GameSmithyAtlasScoreData // 图鉴积分
}
// 组件初始化接口
@@ -55,11 +59,17 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
configure.RegisterConfigure(game_smproficiency, cfg.NewGameSmithyProficiency, this.LoadProficileData)
this._mapskill = make(map[int64]*cfg.GameSmithyToolData, 0)
configure.RegisterConfigure(game_smithytools, cfg.NewGameSmithyTool, this.LoadSmithySkillData)
+
+ this._mapAtlasScore = make(map[int64]*cfg.GameSmithyAtlasScoreData, 0)
+ configure.RegisterConfigure(game_smithyatlasscore, cfg.NewGameSmithyAtlasScore, this.LoadSmithyAtlasScoreConf)
err = this.LoadConfigure(game_smithyreel, cfg.NewGameNewSmithy)
err = this.LoadConfigure(game_smithystove, cfg.NewGameSmithyStoveV1)
err = this.LoadConfigure(game_smithytools, cfg.NewGameSmithyTool)
err = this.LoadConfigure(game_smithystoveold, cfg.NewGameSmithyStove)
err = this.LoadConfigure(game_smithycustomer, cfg.NewGameSmithyCustomer)
+ err = this.LoadConfigure(game_smithyatlas, cfg.NewGameSmithyAtlas)
+ err = this.LoadConfigure(game_smithyatlaslv, cfg.NewGameSmithyAtlasLv)
+ err = this.LoadConfigure(game_smithyatlasscore, cfg.NewGameSmithyAtlasScore)
_d := this.GetSmithProficiencyConf(1)
this.module.Errorf("%v", _d)
@@ -225,6 +235,7 @@ func (this *configureComp) GetSmithyToolsData(id int32) (data *cfg.GameSmithyToo
}
}
+ this.module.Errorf("GetSmithyToolsData notfound id:%d", id)
return nil
}
@@ -235,5 +246,49 @@ func (this *configureComp) GetSmithyStoveConf(level int32) (data *cfg.GameSmithy
return
}
}
+ this.module.Errorf("GetSmithyStoveConf notfound level:%d", level)
return
}
+
+// 获取图鉴信息
+func (this *configureComp) GetSmithyAtlasConf(id string) (data *cfg.GameSmithyAtlasData) {
+ if v, err := this.GetConfigure(game_smithystove); err == nil {
+ if configure, ok := v.(*cfg.GameSmithyAtlas); ok {
+ data = configure.Get(id)
+ return
+ }
+ }
+ this.module.Errorf("GetSmithyAtlasConf notfound id:%d", id)
+ return
+}
+
+func (this *configureComp) GetSmithyAtlasLvConf(lv int32) (data *cfg.GameSmithyAtlasLvData) {
+ if v, err := this.GetConfigure(game_smithystove); err == nil {
+ if configure, ok := v.(*cfg.GameSmithyAtlasLv); ok {
+ data = configure.Get(lv)
+ return
+ }
+ }
+ this.module.Errorf("GetSmithyAtlasLvConf notfound lv:%d", lv)
+ return
+}
+
+func (this *configureComp) GetSmithyAtlasScoreConf(quality int32, lv int32) (data *cfg.GameSmithyAtlasScoreData) {
+ return this._mapAtlasScore[int64(quality<<16)+int64(lv)]
+}
+
+// 获取图鉴分数
+func (this *configureComp) LoadSmithyAtlasScoreConf() {
+ if v, err := this.GetConfigure(game_smithystove); err == nil {
+ if configure, ok := v.(*cfg.GameSmithyAtlasScore); ok {
+ this.hlock.Lock()
+ defer this.hlock.Unlock()
+ for _, value := range configure.GetDataList() {
+ this._mapAtlasScore[int64(value.Quality<<16)+int64(value.Lv)] = value
+ }
+ return
+ }
+ } else {
+ log.Errorf("get LoadSmithyAtlasScoreConf conf err:%v", err)
+ }
+}
diff --git a/modules/smithy/model_atlas.go b/modules/smithy/model_atlas.go
new file mode 100644
index 000000000..99f4530a7
--- /dev/null
+++ b/modules/smithy/model_atlas.go
@@ -0,0 +1,81 @@
+package smithy
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/lego/core"
+ "go_dreamfactory/modules"
+ "go_dreamfactory/pb"
+
+ "go.mongodb.org/mongo-driver/bson/primitive"
+ "go.mongodb.org/mongo-driver/mongo"
+ "go.mongodb.org/mongo-driver/x/bsonx"
+)
+
+type modelAtlas struct {
+ modules.MCompModel
+ module *Smithy
+}
+
+func (this *modelAtlas) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
+ this.TableName = string(comm.TableAtlas)
+ err = this.MCompModel.Init(service, module, comp, options)
+ this.module = module.(*Smithy)
+ // uid 创建索引
+ this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
+ Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}},
+ })
+ return
+}
+
+func (this *modelAtlas) getSmithyAtlasList(uid string) (result *pb.DBAtlas, err error) {
+ result = &pb.DBAtlas{}
+ if err = this.Get(uid, result); err != nil {
+ if mongo.ErrNoDocuments == err {
+ result.Id = primitive.NewObjectID().Hex()
+ result.Uid = uid
+ result.Atlas = make(map[string]*pb.ForgeData, 0)
+ result.Award = 1 // 初始1级
+ this.Add(uid, result)
+ err = nil
+ }
+ return
+ }
+ return
+}
+
+func (this *modelAtlas) modifySmithyAtlasList(uid string, data map[string]interface{}) error {
+ return this.Change(uid, data)
+}
+
+// 检查是否激活图鉴
+
+func (this *modelAtlas) CheckActivateAtlas(uid string, id string, lv int32, quality int32, forgeCount int32) bool {
+ conf := this.module.configure.GetSmithyAtlasConf(id)
+ if conf != nil {
+ return false
+ }
+ list, err := this.module.modelAtlas.getSmithyAtlasList(uid)
+ if err != nil {
+ return false
+ }
+ for k, v := range list.Atlas {
+ if k == id { // 找到相同的 校验 对应的分数
+ // 获取分数
+ scoreConf := this.module.configure.GetSmithyAtlasScoreConf(quality, lv)
+ if scoreConf != nil {
+ if v.Score <= scoreConf.Score {
+ v.Lv = lv
+ v.Quality = quality
+ v.Score = scoreConf.Score
+ v.ForgeCount = forgeCount // 更新锻造次数
+ update := make(map[string]interface{}, 0)
+ update["tujian"] = list.Atlas
+ this.module.modelAtlas.modifySmithyAtlasList(uid, update) // 更新分数信息
+ }
+ return true
+ }
+ return false
+ }
+ }
+ return true
+}
diff --git a/modules/smithy/model_smithy.go b/modules/smithy/model_smithy.go
index 728863f21..299cac5da 100644
--- a/modules/smithy/model_smithy.go
+++ b/modules/smithy/model_smithy.go
@@ -58,7 +58,7 @@ func (this *modelSmithy) getSmithyList(uid string) (result *pb.DBSmithy, err err
err = nil
return result, err
}
-func (this *modelSmithy) modifySmithyDataByObjId(uid string, data map[string]interface{}) error {
+func (this *modelSmithy) modifySmithyDataByUid(uid string, data map[string]interface{}) error {
return this.Change(uid, data)
}
func (this *modelSmithy) CalculationSmithy(uid string, smithy *pb.DBSmithy) {
diff --git a/modules/smithy/model_stove.go b/modules/smithy/model_stove.go
index 52b656ace..936e19663 100644
--- a/modules/smithy/model_stove.go
+++ b/modules/smithy/model_stove.go
@@ -1,6 +1,7 @@
package smithy
import (
+ "crypto/rand"
"go_dreamfactory/comm"
"go_dreamfactory/lego/core"
"go_dreamfactory/lego/sys/redis"
@@ -8,9 +9,9 @@ import (
"go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs"
- "math/rand"
+ "math/big"
+
"strconv"
- "time"
"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/mongo"
@@ -91,8 +92,9 @@ func (this *modelStove) CheckForgetwoEquip(reelId int32, lv int32) (b bool) {
}
}
if value > 0 {
- rand.Seed(time.Now().UnixNano())
- if value < int32(rand.Intn(100)) {
+ n, _ := rand.Int(rand.Reader, big.NewInt(100))
+
+ if value < int32(n.Int64()) {
return true
}
}
@@ -212,3 +214,23 @@ func (this *modelStove) StoveSkillBuyEquip(uid string) int32 {
}
return 0
}
+
+func (this *modelStove) GetRandEquipLv(sz []int32) int32 {
+
+ if len(sz) > 0 {
+ var _totalW int64 // 总权重
+ var _tmpW int64 // 临时权重
+ for _, v := range sz {
+ _totalW += int64(v)
+ }
+ // 随机权重
+ n, _ := rand.Int(rand.Reader, big.NewInt(_totalW))
+ for i, v := range sz {
+ _tmpW += int64(v)
+ if n.Int64() < _tmpW {
+ return int32(i)
+ }
+ }
+ }
+ return 0
+}
diff --git a/modules/smithy/model_trade.go b/modules/smithy/model_trade.go
index 929a3489f..9af59a2ad 100644
--- a/modules/smithy/model_trade.go
+++ b/modules/smithy/model_trade.go
@@ -3,6 +3,7 @@ package smithy
import (
"go_dreamfactory/comm"
"go_dreamfactory/lego/core"
+ "go_dreamfactory/lego/sys/log"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
@@ -149,33 +150,41 @@ func (s *modelTrade) updateCustomer(uid string, customerId int32) error {
}
// 返回概率下的套装
-func (s *modelTrade) GetSuitRandom(uid string) string {
+func (s *modelTrade) GetSuitRandom(uid string) (suiteId int32) {
//获取玩家所有解锁套装
- unlockEquips := []*pb.DB_Equipment{}
- var unlockEquipsItems []*WeightItem
- for _, v := range unlockEquips {
- unlockEquipsItems = append(unlockEquipsItems, &WeightItem{
- Id: v.Id,
+ uex, err := s.module.ModuleUser.GetUserExpand(uid)
+ if err != nil {
+ s.module.Errorln(err)
+ return
+ }
+ var unlockSuiteItems []*WeightItem
+ for _, v := range uex.SuiteId {
+ unlockSuiteItems = append(unlockSuiteItems, &WeightItem{
+ Id: v,
Weight: 5,
})
}
//获取玩家已有装备
- ownerEquips := []*pb.DB_Equipment{}
- var ownerEquipsItems []*WeightItem
- for _, v := range ownerEquips {
- ownerEquipsItems = append(ownerEquipsItems, &WeightItem{
- Id: v.Id,
+ ec, suites := s.module.ModuleEquipment.GetActionableSuit(uid)
+ if ec!=pb.ErrorCode_Success {
+ s.module.Error("获取玩家已有装备:", log.Field{Key:"code",Value: ec})
+ return
+ }
+ var ownerSuiteItems []*WeightItem
+ for _, v := range suites {
+ ownerSuiteItems = append(ownerSuiteItems, &WeightItem{
+ Id: v,
Weight: 7,
})
}
- merge := append(unlockEquipsItems, ownerEquipsItems...)
+ merge := append(unlockSuiteItems, ownerSuiteItems...)
// 设置权重
wr := newWeightedRandom(merge)
if c := wr.pick(); c != nil {
- return c.Id.(string)
+ return c.Id.(int32)
}
- return ""
+ return
}
// 交易
diff --git a/modules/smithy/module.go b/modules/smithy/module.go
index a1b888948..485cd36aa 100644
--- a/modules/smithy/module.go
+++ b/modules/smithy/module.go
@@ -19,6 +19,7 @@ type Smithy struct {
api *apiComp
configure *configureComp
modelStove *modelStove
+ modelAtlas *modelAtlas
}
func NewModule() core.IModule {
@@ -46,7 +47,7 @@ func (this *Smithy) OnInstallComp() {
// 接口信息
func (this *Smithy) ModifySmithyData(uid string, data map[string]interface{}) (code pb.ErrorCode) {
- err := this.modelSmithy.modifySmithyDataByObjId(uid, data)
+ err := this.modelSmithy.modifySmithyDataByUid(uid, data)
if err != nil {
code = pb.ErrorCode_DBError
}
diff --git a/pb/battle_msg.pb.go b/pb/battle_msg.pb.go
index c3f436510..5b8e3b1f8 100644
--- a/pb/battle_msg.pb.go
+++ b/pb/battle_msg.pb.go
@@ -795,12 +795,13 @@ type BattleReport struct {
Info *BattleInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
Costtime int32 `protobuf:"varint,2,opt,name=Costtime,proto3" json:"Costtime"` //战斗时长 单位ms
- Incmd []*BattleCmd `protobuf:"bytes,3,rep,name=incmd,proto3" json:"incmd"` //输入指令
- Outcmd []*BattleCmd `protobuf:"bytes,4,rep,name=outcmd,proto3" json:"outcmd"` //输出指令
- Completetask []int32 `protobuf:"varint,5,rep,packed,name=completetask,proto3" json:"completetask"` //完成任务
- Death int32 `protobuf:"varint,6,opt,name=death,proto3" json:"death"` // 死亡人数
- Round int32 `protobuf:"varint,7,opt,name=round,proto3" json:"round"` // 回合数
- Harm int32 `protobuf:"varint,8,opt,name=harm,proto3" json:"harm"` //伤害积分
+ WinSide int32 `protobuf:"varint,3,opt,name=winSide,proto3" json:"winSide"` //胜利方 1 - red 2 = blue
+ Incmd []*BattleCmd `protobuf:"bytes,4,rep,name=incmd,proto3" json:"incmd"` //输入指令
+ Outcmd []*BattleCmd `protobuf:"bytes,5,rep,name=outcmd,proto3" json:"outcmd"` //输出指令
+ Completetask []int32 `protobuf:"varint,6,rep,packed,name=completetask,proto3" json:"completetask"` //完成任务
+ Death int32 `protobuf:"varint,7,opt,name=death,proto3" json:"death"` // 死亡人数
+ Round int32 `protobuf:"varint,8,opt,name=round,proto3" json:"round"` // 回合数
+ Harm int32 `protobuf:"varint,9,opt,name=harm,proto3" json:"harm"` //伤害积分
}
func (x *BattleReport) Reset() {
@@ -849,6 +850,13 @@ func (x *BattleReport) GetCosttime() int32 {
return 0
}
+func (x *BattleReport) GetWinSide() int32 {
+ if x != nil {
+ return x.WinSide
+ }
+ return 0
+}
+
func (x *BattleReport) GetIncmd() []*BattleCmd {
if x != nil {
return x.Incmd
@@ -1709,83 +1717,85 @@ var file_battle_battle_msg_proto_rawDesc = []byte{
0x6d, 0x64, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18,
0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x14, 0x0a, 0x05,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c,
- 0x75, 0x65, 0x22, 0xf5, 0x01, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70,
+ 0x75, 0x65, 0x22, 0x8f, 0x02, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70,
0x6f, 0x72, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28,
0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04,
0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65,
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65,
- 0x12, 0x20, 0x0a, 0x05, 0x69, 0x6e, 0x63, 0x6d, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
- 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x05, 0x69, 0x6e, 0x63,
- 0x6d, 0x64, 0x12, 0x22, 0x0a, 0x06, 0x6f, 0x75, 0x74, 0x63, 0x6d, 0x64, 0x18, 0x04, 0x20, 0x03,
- 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x06,
- 0x6f, 0x75, 0x74, 0x63, 0x6d, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
- 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x6f,
- 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x65,
- 0x61, 0x74, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x64, 0x65, 0x61, 0x74, 0x68,
- 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52,
- 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x72, 0x6d, 0x18, 0x08,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x68, 0x61, 0x72, 0x6d, 0x22, 0x66, 0x0a, 0x10, 0x42, 0x61,
- 0x74, 0x74, 0x6c, 0x65, 0x52, 0x70, 0x63, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x10,
- 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x69, 0x64,
- 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
- 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
- 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
- 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x64, 0x61,
- 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x12, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x68, 0x65, 0x63,
- 0x6b, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73, 0x63, 0x68,
- 0x65, 0x63, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x63, 0x68, 0x65,
- 0x63, 0x6b, 0x22, 0x2e, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x47, 0x65, 0x74, 0x49,
- 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
- 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
- 0x69, 0x64, 0x22, 0x55, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x47, 0x65, 0x74, 0x49,
- 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c,
- 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c,
- 0x65, 0x69, 0x64, 0x12, 0x24, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28,
- 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x49,
- 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x38, 0x0a, 0x15, 0x42, 0x61, 0x74,
- 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52,
- 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69,
- 0x6e, 0x66, 0x6f, 0x22, 0x30, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65,
- 0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a,
- 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69,
- 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x5c, 0x0a, 0x0e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49,
- 0x6e, 0x43, 0x6d, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c,
- 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c,
- 0x65, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x02, 0x69, 0x6e, 0x18, 0x03, 0x20,
- 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52,
- 0x02, 0x69, 0x6e, 0x22, 0x61, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x43,
- 0x6d, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
- 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
- 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x02, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a,
- 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x02, 0x69, 0x6e, 0x12, 0x16,
- 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06,
- 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x4c, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
- 0x4f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61,
- 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61,
- 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x03, 0x63, 0x6d, 0x64, 0x18, 0x02, 0x20,
- 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52,
- 0x03, 0x63, 0x6d, 0x64, 0x22, 0x2e, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69,
- 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74,
- 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74,
- 0x6c, 0x65, 0x69, 0x64, 0x22, 0x42, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f,
- 0x6e, 0x63, 0x65, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74,
- 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74,
- 0x6c, 0x65, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x22, 0x2b, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74,
- 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x63, 0x65, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a,
- 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69,
- 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x82, 0x01, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
- 0x53, 0x74, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66,
- 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
- 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x24, 0x0a, 0x07, 0x6f, 0x75,
- 0x74, 0x43, 0x6d, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61,
- 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x07, 0x6f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73,
- 0x12, 0x28, 0x0a, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x18, 0x03, 0x20,
- 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52,
- 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
- 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x12, 0x20, 0x0a, 0x05, 0x69, 0x6e,
+ 0x63, 0x6d, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74,
+ 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x05, 0x69, 0x6e, 0x63, 0x6d, 0x64, 0x12, 0x22, 0x0a, 0x06,
+ 0x6f, 0x75, 0x74, 0x63, 0x6d, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42,
+ 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x06, 0x6f, 0x75, 0x74, 0x63, 0x6d, 0x64,
+ 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b,
+ 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65,
+ 0x74, 0x61, 0x73, 0x6b, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x65, 0x61, 0x74, 0x68, 0x18, 0x07, 0x20,
+ 0x01, 0x28, 0x05, 0x52, 0x05, 0x64, 0x65, 0x61, 0x74, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f,
+ 0x75, 0x6e, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64,
+ 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x72, 0x6d, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04,
+ 0x68, 0x61, 0x72, 0x6d, 0x22, 0x66, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x70,
+ 0x63, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65,
+ 0x74, 0x68, 0x6f, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68,
+ 0x6f, 0x64, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
+ 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+ 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x12,
+ 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x75, 0x6c,
+ 0x74, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x22, 0x2e, 0x0a, 0x10,
+ 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71,
+ 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x22, 0x55, 0x0a, 0x11,
+ 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73,
+ 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x24, 0x0a,
+ 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61,
+ 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69,
+ 0x6e, 0x66, 0x6f, 0x22, 0x38, 0x0a, 0x15, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65,
+ 0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x04,
+ 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74,
+ 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x30, 0x0a,
+ 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x72,
+ 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63,
+ 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22,
+ 0x5c, 0x0a, 0x0e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x52, 0x65,
+ 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x12, 0x0a,
+ 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64,
+ 0x65, 0x12, 0x1a, 0x0a, 0x02, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e,
+ 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x02, 0x69, 0x6e, 0x22, 0x61, 0x0a,
+ 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x52, 0x65, 0x73, 0x70,
+ 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x02,
+ 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
+ 0x65, 0x43, 0x6d, 0x64, 0x52, 0x02, 0x69, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75,
+ 0x63, 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63,
+ 0x22, 0x4c, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4f, 0x75, 0x74, 0x43, 0x6d, 0x64,
+ 0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64,
+ 0x12, 0x1c, 0x0a, 0x03, 0x63, 0x6d, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e,
+ 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x03, 0x63, 0x6d, 0x64, 0x22, 0x2e,
+ 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75,
+ 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x22, 0x42,
+ 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x63, 0x65, 0x64, 0x65, 0x52,
+ 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x12,
+ 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69,
+ 0x64, 0x65, 0x22, 0x2b, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x63,
+ 0x65, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63,
+ 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22,
+ 0x82, 0x01, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x49,
+ 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04,
+ 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x24, 0x0a, 0x07, 0x6f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x18,
+ 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d,
+ 0x64, 0x52, 0x07, 0x6f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x12, 0x28, 0x0a, 0x09, 0x69, 0x6e,
+ 0x70, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e,
+ 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74,
+ 0x43, 0x6d, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+ 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index c5d36b89d..7211d525a 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -135,6 +135,7 @@ const (
ErrorCode_EquipmentLvlimitReached ErrorCode = 1401 // 武器等级已达上限
ErrorCode_EquipmentIsWorn ErrorCode = 1402 // 武器已经穿戴
ErrorCode_EquipmentNoCanSell ErrorCode = 1403 // 装备不能出售
+ ErrorCode_EquipmentSuiteNotFound ErrorCode = 1404 // 套装未找到
// mainMainline
ErrorCode_MainlineNotFindChapter ErrorCode = 1500 // 没有找到主线关卡信息
ErrorCode_MainlineIDFailed ErrorCode = 1501 // 关卡ID 错误
@@ -223,11 +224,12 @@ const (
ErrorCode_LibraryFetterTaskNoFound ErrorCode = 2806 //未找到羁绊任务数据
ErrorCode_LibraryPreTaskNoFinished ErrorCode = 2807 //前置任务未完成
// Battle
- ErrorCode_BattleValidationFailed ErrorCode = 2901 //战斗校验失败
- ErrorCode_BattleNoWin ErrorCode = 2902 //战斗失败
- ErrorCode_BattleCreateFailed ErrorCode = 2903 //创建战斗失败
- ErrorCode_BattleInCmdFailed ErrorCode = 2904 //战斗指令输入失败
- ErrorCode_BattleUserOff ErrorCode = 2905 //由用户离线
+ ErrorCode_BattleValidationFailed ErrorCode = 2901 //战斗校验失败
+ ErrorCode_BattleNoWin ErrorCode = 2902 //战斗失败
+ ErrorCode_BattleCreateFailed ErrorCode = 2903 //创建战斗失败
+ ErrorCode_BattleInCmdFailed ErrorCode = 2904 //战斗指令输入失败
+ ErrorCode_BattleUserOff ErrorCode = 2905 //由用户离线
+ ErrorCode_BattleCapskillCheckFailed ErrorCode = 2906 //战斗队长技校验失败
// sociaty
ErrorCode_SociatyNoFound ErrorCode = 3000 //公会不存在
ErrorCode_SociatyAdded ErrorCode = 3001 //已在公会里
@@ -321,6 +323,10 @@ const (
ErrorCode_SmithyStoveMaxLv ErrorCode = 4103 // 炉子达到最大等级
ErrorCode_SmithyCustomerLimit ErrorCode = 4104 //顾客上限
ErrorCode_SmithyCustomerEquipNoEnough ErrorCode = 4105 //装备回收数量不足
+ ErrorCode_SmithyMaxTemperature ErrorCode = 4106 // 炉温达上限
+ ErrorCode_SmithyLackLava ErrorCode = 4107 // 缺少熔岩
+ ErrorCode_SmithyAtlasMaxLv ErrorCode = 4108 // 图鉴奖励满级
+ ErrorCode_SmithyAtlasLackLv ErrorCode = 4109 // 图鉴奖励等级不足
)
// Enum value maps for ErrorCode.
@@ -432,6 +438,7 @@ var (
1401: "EquipmentLvlimitReached",
1402: "EquipmentIsWorn",
1403: "EquipmentNoCanSell",
+ 1404: "EquipmentSuiteNotFound",
1500: "MainlineNotFindChapter",
1501: "MainlineIDFailed",
1502: "MainlineNotFound",
@@ -511,6 +518,7 @@ var (
2903: "BattleCreateFailed",
2904: "BattleInCmdFailed",
2905: "BattleUserOff",
+ 2906: "BattleCapskillCheckFailed",
3000: "SociatyNoFound",
3001: "SociatyAdded",
3002: "SociatyDiamondNoEnough",
@@ -592,6 +600,10 @@ var (
4103: "SmithyStoveMaxLv",
4104: "SmithyCustomerLimit",
4105: "SmithyCustomerEquipNoEnough",
+ 4106: "SmithyMaxTemperature",
+ 4107: "SmithyLackLava",
+ 4108: "SmithyAtlasMaxLv",
+ 4109: "SmithyAtlasLackLv",
}
ErrorCode_value = map[string]int32{
"Success": 0,
@@ -700,6 +712,7 @@ var (
"EquipmentLvlimitReached": 1401,
"EquipmentIsWorn": 1402,
"EquipmentNoCanSell": 1403,
+ "EquipmentSuiteNotFound": 1404,
"MainlineNotFindChapter": 1500,
"MainlineIDFailed": 1501,
"MainlineNotFound": 1502,
@@ -779,6 +792,7 @@ var (
"BattleCreateFailed": 2903,
"BattleInCmdFailed": 2904,
"BattleUserOff": 2905,
+ "BattleCapskillCheckFailed": 2906,
"SociatyNoFound": 3000,
"SociatyAdded": 3001,
"SociatyDiamondNoEnough": 3002,
@@ -860,6 +874,10 @@ var (
"SmithyStoveMaxLv": 4103,
"SmithyCustomerLimit": 4104,
"SmithyCustomerEquipNoEnough": 4105,
+ "SmithyMaxTemperature": 4106,
+ "SmithyLackLava": 4107,
+ "SmithyAtlasMaxLv": 4108,
+ "SmithyAtlasLackLv": 4109,
}
)
@@ -894,7 +912,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
var file_errorcode_proto_rawDesc = []byte{
0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
- 0x6f, 0x2a, 0x92, 0x30, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+ 0x6f, 0x2a, 0xae, 0x31, 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,
@@ -1037,250 +1055,260 @@ var file_errorcode_proto_rawDesc = []byte{
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, 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, 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, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
- 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 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,
+ 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,
}
var (
diff --git a/pb/smithy_db.pb.go b/pb/smithy_db.pb.go
index cb2c41e8c..42c434bc7 100644
--- a/pb/smithy_db.pb.go
+++ b/pb/smithy_db.pb.go
@@ -184,9 +184,9 @@ type CustomerInfo struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- CustomerId int32 `protobuf:"varint,1,opt,name=customerId,proto3" json:"customerId"` //顾客ID
- SuitId string `protobuf:"bytes,2,opt,name=suitId,proto3" json:"suitId"` //套装ID 随机套装
- EquipCount int32 `protobuf:"varint,3,opt,name=equipCount,proto3" json:"equipCount"` //装备数量
+ CustomerId int32 `protobuf:"varint,1,opt,name=customerId,proto3" json:"customerId"` //顾客ID
+ SuitId int32 `protobuf:"varint,2,opt,name=suitId,proto3" json:"suitId"` //套装ID 随机套装
+ EquipCount int32 `protobuf:"varint,3,opt,name=equipCount,proto3" json:"equipCount"` //装备数量
}
func (x *CustomerInfo) Reset() {
@@ -228,11 +228,11 @@ func (x *CustomerInfo) GetCustomerId() int32 {
return 0
}
-func (x *CustomerInfo) GetSuitId() string {
+func (x *CustomerInfo) GetSuitId() int32 {
if x != nil {
return x.SuitId
}
- return ""
+ return 0
}
func (x *CustomerInfo) GetEquipCount() int32 {
@@ -322,19 +322,20 @@ func (x *DBCustomer) GetLastRefreshTime() int64 {
}
// 装备图鉴
-type DBTujian struct {
+type DBAtlas struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
- Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID
- Tujian map[int32]*ForgeData `protobuf:"bytes,3,rep,name=tujian,proto3" json:"tujian" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 图鉴信息
- Slider int32 `protobuf:"varint,4,opt,name=slider,proto3" json:"slider"` // 进度
+ Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
+ Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID
+ Atlas map[string]*ForgeData `protobuf:"bytes,3,rep,name=atlas,proto3" json:"atlas" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 图鉴信息
+ Score int32 `protobuf:"varint,4,opt,name=score,proto3" json:"score"` // 总积分
+ Award int32 `protobuf:"varint,5,opt,name=award,proto3" json:"award"` // 奖励进度
}
-func (x *DBTujian) Reset() {
- *x = DBTujian{}
+func (x *DBAtlas) Reset() {
+ *x = DBAtlas{}
if protoimpl.UnsafeEnabled {
mi := &file_smithy_smithy_db_proto_msgTypes[4]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -342,13 +343,13 @@ func (x *DBTujian) Reset() {
}
}
-func (x *DBTujian) String() string {
+func (x *DBAtlas) String() string {
return protoimpl.X.MessageStringOf(x)
}
-func (*DBTujian) ProtoMessage() {}
+func (*DBAtlas) ProtoMessage() {}
-func (x *DBTujian) ProtoReflect() protoreflect.Message {
+func (x *DBAtlas) ProtoReflect() protoreflect.Message {
mi := &file_smithy_smithy_db_proto_msgTypes[4]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -360,35 +361,42 @@ func (x *DBTujian) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x)
}
-// Deprecated: Use DBTujian.ProtoReflect.Descriptor instead.
-func (*DBTujian) Descriptor() ([]byte, []int) {
+// Deprecated: Use DBAtlas.ProtoReflect.Descriptor instead.
+func (*DBAtlas) Descriptor() ([]byte, []int) {
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{4}
}
-func (x *DBTujian) GetId() string {
+func (x *DBAtlas) GetId() string {
if x != nil {
return x.Id
}
return ""
}
-func (x *DBTujian) GetUid() string {
+func (x *DBAtlas) GetUid() string {
if x != nil {
return x.Uid
}
return ""
}
-func (x *DBTujian) GetTujian() map[int32]*ForgeData {
+func (x *DBAtlas) GetAtlas() map[string]*ForgeData {
if x != nil {
- return x.Tujian
+ return x.Atlas
}
return nil
}
-func (x *DBTujian) GetSlider() int32 {
+func (x *DBAtlas) GetScore() int32 {
if x != nil {
- return x.Slider
+ return x.Score
+ }
+ return 0
+}
+
+func (x *DBAtlas) GetAward() int32 {
+ if x != nil {
+ return x.Award
}
return 0
}
@@ -401,6 +409,7 @@ type ForgeData struct {
ForgeCount int32 `protobuf:"varint,1,opt,name=forgeCount,proto3" json:"forgeCount"` // 打造次数
Lv int32 `protobuf:"varint,2,opt,name=lv,proto3" json:"lv"`
Quality int32 `protobuf:"varint,3,opt,name=quality,proto3" json:"quality"`
+ Score int32 `protobuf:"varint,4,opt,name=score,proto3" json:"score"`
}
func (x *ForgeData) Reset() {
@@ -456,6 +465,13 @@ func (x *ForgeData) GetQuality() int32 {
return 0
}
+func (x *ForgeData) GetScore() int32 {
+ if x != nil {
+ return x.Score
+ }
+ return 0
+}
+
////////
type Clang struct {
state protoimpl.MessageState
@@ -757,7 +773,7 @@ var file_smithy_smithy_db_proto_rawDesc = []byte{
0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 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, 0x16, 0x0a, 0x06, 0x73, 0x75,
- 0x69, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x75, 0x69, 0x74,
+ 0x69, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x75, 0x69, 0x74,
0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x43, 0x6f, 0x75, 0x6e, 0x74,
0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x43, 0x6f, 0x75,
0x6e, 0x74, 0x22, 0x9b, 0x01, 0x0a, 0x0a, 0x44, 0x42, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65,
@@ -770,68 +786,70 @@ var file_smithy_smithy_db_proto_rawDesc = []byte{
0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x52, 0x65,
0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52,
0x0f, 0x6c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65,
- 0x22, 0xba, 0x01, 0x0a, 0x08, 0x44, 0x42, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x12, 0x0e, 0x0a,
- 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a,
- 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12,
- 0x2d, 0x0a, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
- 0x15, 0x2e, 0x44, 0x42, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x2e, 0x54, 0x75, 0x6a, 0x69, 0x61,
- 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x12, 0x16,
- 0x0a, 0x06, 0x73, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
- 0x73, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x1a, 0x45, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e,
- 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
- 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61,
- 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x55, 0x0a,
- 0x09, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1e, 0x0a, 0x0a, 0x66, 0x6f,
- 0x72, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
- 0x66, 0x6f, 0x72, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76,
- 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75,
- 0x61, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x71, 0x75, 0x61,
- 0x6c, 0x69, 0x74, 0x79, 0x22, 0x4f, 0x0a, 0x05, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a,
- 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
- 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69,
- 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12,
- 0x14, 0x0a, 0x05, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
- 0x73, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x5a, 0x0a, 0x0a, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c,
- 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18,
- 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12,
- 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
- 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d,
- 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d,
- 0x65, 0x22, 0x82, 0x04, 0x0a, 0x08, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x12, 0x0e,
- 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10,
- 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
- 0x12, 0x1c, 0x0a, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
- 0x06, 0x2e, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x23,
- 0x0a, 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b,
- 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x06, 0x6f, 0x72, 0x64,
- 0x65, 0x72, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03,
- 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52,
- 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x2a, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18,
- 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
- 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69,
- 0x6c, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x18, 0x07, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x12, 0x24, 0x0a, 0x0d,
- 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69,
- 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28,
- 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x36, 0x0a, 0x09, 0x64, 0x65, 0x73, 0x6b,
- 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42,
- 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72,
- 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72,
- 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0b,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72,
- 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x38,
- 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
- 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
- 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76,
- 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x44, 0x65, 0x73, 0x6b,
- 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
- 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
- 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c,
- 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
- 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x22, 0xc8, 0x01, 0x0a, 0x07, 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x12, 0x0e, 0x0a, 0x02,
+ 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03,
+ 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x29,
+ 0x0a, 0x05, 0x61, 0x74, 0x6c, 0x61, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e,
+ 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x2e, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x45, 0x6e, 0x74,
+ 0x72, 0x79, 0x52, 0x05, 0x61, 0x74, 0x6c, 0x61, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f,
+ 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12,
+ 0x14, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
+ 0x61, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x44, 0x0a, 0x0a, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x45, 0x6e,
+ 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61,
+ 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x6b, 0x0a, 0x09, 0x46,
+ 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1e, 0x0a, 0x0a, 0x66, 0x6f, 0x72, 0x67,
+ 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x66, 0x6f,
+ 0x72, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, 0x61, 0x6c,
+ 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69,
+ 0x74, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x4f, 0x0a, 0x05, 0x43, 0x6c, 0x61, 0x6e,
+ 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a,
+ 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54,
+ 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01,
+ 0x28, 0x03, 0x52, 0x05, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x5a, 0x0a, 0x0a, 0x4f, 0x72, 0x64,
+ 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54,
+ 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54,
+ 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x65,
+ 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x65,
+ 0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x82, 0x04, 0x0a, 0x08, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74,
+ 0x68, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
+ 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+ 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x18, 0x03, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x05, 0x63, 0x6c, 0x61,
+ 0x6e, 0x67, 0x12, 0x23, 0x0a, 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03,
+ 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52,
+ 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73,
+ 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73,
+ 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x2a, 0x0a, 0x05, 0x73, 0x6b,
+ 0x69, 0x6c, 0x6c, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x53, 0x6d,
+ 0x69, 0x74, 0x68, 0x79, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
+ 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c,
+ 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76,
+ 0x12, 0x24, 0x0a, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d,
+ 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f,
+ 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18,
+ 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x36, 0x0a, 0x09,
+ 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32,
+ 0x18, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2e, 0x44, 0x65, 0x73, 0x6b, 0x46,
+ 0x6c, 0x6f, 0x6f, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46,
+ 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f,
+ 0x6f, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46,
+ 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d,
+ 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69,
+ 0x6d, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79,
+ 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b,
+ 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e,
+ 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
+ 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79,
+ 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
+ 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -852,7 +870,7 @@ var file_smithy_smithy_db_proto_goTypes = []interface{}{
(*DBStove)(nil), // 1: DBStove
(*CustomerInfo)(nil), // 2: CustomerInfo
(*DBCustomer)(nil), // 3: DBCustomer
- (*DBTujian)(nil), // 4: DBTujian
+ (*DBAtlas)(nil), // 4: DBAtlas
(*ForgeData)(nil), // 5: ForgeData
(*Clang)(nil), // 6: Clang
(*OrderClang)(nil), // 7: OrderClang
@@ -860,7 +878,7 @@ var file_smithy_smithy_db_proto_goTypes = []interface{}{
nil, // 9: DBStove.DataEntry
nil, // 10: DBStove.SkillEntry
nil, // 11: DBStove.ForgeEntry
- nil, // 12: DBTujian.TujianEntry
+ nil, // 12: DBAtlas.AtlasEntry
nil, // 13: DBSmithy.SkillEntry
nil, // 14: DBSmithy.DeskFloorEntry
(*UserAssets)(nil), // 15: UserAssets
@@ -870,14 +888,14 @@ var file_smithy_smithy_db_proto_depIdxs = []int32{
10, // 1: DBStove.skill:type_name -> DBStove.SkillEntry
11, // 2: DBStove.forge:type_name -> DBStove.ForgeEntry
2, // 3: DBCustomer.customers:type_name -> CustomerInfo
- 12, // 4: DBTujian.tujian:type_name -> DBTujian.TujianEntry
+ 12, // 4: DBAtlas.atlas:type_name -> DBAtlas.AtlasEntry
6, // 5: DBSmithy.clang:type_name -> Clang
7, // 6: DBSmithy.orders:type_name -> OrderClang
15, // 7: DBSmithy.items:type_name -> UserAssets
13, // 8: DBSmithy.skill:type_name -> DBSmithy.SkillEntry
14, // 9: DBSmithy.deskFloor:type_name -> DBSmithy.DeskFloorEntry
0, // 10: DBStove.DataEntry.value:type_name -> Mastery
- 5, // 11: DBTujian.TujianEntry.value:type_name -> ForgeData
+ 5, // 11: DBAtlas.AtlasEntry.value:type_name -> ForgeData
12, // [12:12] is the sub-list for method output_type
12, // [12:12] is the sub-list for method input_type
12, // [12:12] is the sub-list for extension type_name
@@ -941,7 +959,7 @@ func file_smithy_smithy_db_proto_init() {
}
}
file_smithy_smithy_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*DBTujian); i {
+ switch v := v.(*DBAtlas); i {
case 0:
return &v.state
case 1:
diff --git a/pb/smithy_msg.pb.go b/pb/smithy_msg.pb.go
index 76fecf44c..02279dfd3 100644
--- a/pb/smithy_msg.pb.go
+++ b/pb/smithy_msg.pb.go
@@ -112,9 +112,11 @@ type SmithyForgeEquipReq struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- ReelId int32 `protobuf:"varint,1,opt,name=reelId,proto3" json:"reelId"` // 卷轴ID
- Lava int32 `protobuf:"varint,2,opt,name=lava,proto3" json:"lava"` // 添加熔岩
- Quality int32 `protobuf:"varint,3,opt,name=quality,proto3" json:"quality"` // 精益制造
+ ReelId int32 `protobuf:"varint,1,opt,name=reelId,proto3" json:"reelId"` // 卷轴ID
+ Lava int32 `protobuf:"varint,2,opt,name=lava,proto3" json:"lava"` // 添加熔岩
+ Quality int32 `protobuf:"varint,3,opt,name=quality,proto3" json:"quality"` // 精益制造
+ SuiteId int32 `protobuf:"varint,4,opt,name=suiteId,proto3" json:"suiteId"` // 套装ID (非定制传0 )
+ Position int32 `protobuf:"varint,5,opt,name=position,proto3" json:"position"` // 装备位置(没有指定位置传 -1)
}
func (x *SmithyForgeEquipReq) Reset() {
@@ -170,12 +172,26 @@ func (x *SmithyForgeEquipReq) GetQuality() int32 {
return 0
}
+func (x *SmithyForgeEquipReq) GetSuiteId() int32 {
+ if x != nil {
+ return x.SuiteId
+ }
+ return 0
+}
+
+func (x *SmithyForgeEquipReq) GetPosition() int32 {
+ if x != nil {
+ return x.Position
+ }
+ return 0
+}
+
type SmithyForgeEquipResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Equip int32 `protobuf:"varint,1,opt,name=equip,proto3" json:"equip"` // 装备ID
+ Equip []string `protobuf:"bytes,1,rep,name=equip,proto3" json:"equip"` // 装备ID
Data *DBStove `protobuf:"bytes,2,opt,name=data,proto3" json:"data"`
}
@@ -211,141 +227,14 @@ func (*SmithyForgeEquipResp) Descriptor() ([]byte, []int) {
return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{3}
}
-func (x *SmithyForgeEquipResp) GetEquip() int32 {
+func (x *SmithyForgeEquipResp) GetEquip() []string {
if x != nil {
return x.Equip
}
- return 0
-}
-
-func (x *SmithyForgeEquipResp) GetData() *DBStove {
- if x != nil {
- return x.Data
- }
return nil
}
-// 定制装备
-type SmithyOrderEquipReq struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- SuiteId int32 `protobuf:"varint,1,opt,name=suiteId,proto3" json:"suiteId"` // 套装ID
- Position int32 `protobuf:"varint,2,opt,name=position,proto3" json:"position"` // 装备位置
- Lava int32 `protobuf:"varint,3,opt,name=lava,proto3" json:"lava"` // 添加熔岩
- Quality int32 `protobuf:"varint,4,opt,name=quality,proto3" json:"quality"` // 精益制造
-}
-
-func (x *SmithyOrderEquipReq) Reset() {
- *x = SmithyOrderEquipReq{}
- if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[4]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *SmithyOrderEquipReq) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SmithyOrderEquipReq) ProtoMessage() {}
-
-func (x *SmithyOrderEquipReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[4]
- if protoimpl.UnsafeEnabled && x != nil {
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- if ms.LoadMessageInfo() == nil {
- ms.StoreMessageInfo(mi)
- }
- return ms
- }
- return mi.MessageOf(x)
-}
-
-// Deprecated: Use SmithyOrderEquipReq.ProtoReflect.Descriptor instead.
-func (*SmithyOrderEquipReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *SmithyOrderEquipReq) GetSuiteId() int32 {
- if x != nil {
- return x.SuiteId
- }
- return 0
-}
-
-func (x *SmithyOrderEquipReq) GetPosition() int32 {
- if x != nil {
- return x.Position
- }
- return 0
-}
-
-func (x *SmithyOrderEquipReq) GetLava() int32 {
- if x != nil {
- return x.Lava
- }
- return 0
-}
-
-func (x *SmithyOrderEquipReq) GetQuality() int32 {
- if x != nil {
- return x.Quality
- }
- return 0
-}
-
-type SmithyOrderEquipResp struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Equip int32 `protobuf:"varint,1,opt,name=equip,proto3" json:"equip"` // 装备ID
- Data *DBStove `protobuf:"bytes,2,opt,name=data,proto3" json:"data"`
-}
-
-func (x *SmithyOrderEquipResp) Reset() {
- *x = SmithyOrderEquipResp{}
- if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[5]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *SmithyOrderEquipResp) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SmithyOrderEquipResp) ProtoMessage() {}
-
-func (x *SmithyOrderEquipResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[5]
- if protoimpl.UnsafeEnabled && x != nil {
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- if ms.LoadMessageInfo() == nil {
- ms.StoreMessageInfo(mi)
- }
- return ms
- }
- return mi.MessageOf(x)
-}
-
-// Deprecated: Use SmithyOrderEquipResp.ProtoReflect.Descriptor instead.
-func (*SmithyOrderEquipResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *SmithyOrderEquipResp) GetEquip() int32 {
- if x != nil {
- return x.Equip
- }
- return 0
-}
-
-func (x *SmithyOrderEquipResp) GetData() *DBStove {
+func (x *SmithyForgeEquipResp) GetData() *DBStove {
if x != nil {
return x.Data
}
@@ -362,7 +251,7 @@ type SmithyStoveUpReq struct {
func (x *SmithyStoveUpReq) Reset() {
*x = SmithyStoveUpReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[6]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[4]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -375,7 +264,7 @@ func (x *SmithyStoveUpReq) String() string {
func (*SmithyStoveUpReq) ProtoMessage() {}
func (x *SmithyStoveUpReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[6]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[4]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -388,7 +277,7 @@ func (x *SmithyStoveUpReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyStoveUpReq.ProtoReflect.Descriptor instead.
func (*SmithyStoveUpReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{6}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{4}
}
type SmithyStoveUpResp struct {
@@ -402,7 +291,7 @@ type SmithyStoveUpResp struct {
func (x *SmithyStoveUpResp) Reset() {
*x = SmithyStoveUpResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[7]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[5]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -415,7 +304,7 @@ func (x *SmithyStoveUpResp) String() string {
func (*SmithyStoveUpResp) ProtoMessage() {}
func (x *SmithyStoveUpResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[7]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[5]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -428,7 +317,7 @@ func (x *SmithyStoveUpResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyStoveUpResp.ProtoReflect.Descriptor instead.
func (*SmithyStoveUpResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{7}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{5}
}
func (x *SmithyStoveUpResp) GetData() *DBStove {
@@ -451,7 +340,7 @@ type SmithyRiseReq struct {
func (x *SmithyRiseReq) Reset() {
*x = SmithyRiseReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[8]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[6]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -464,7 +353,7 @@ func (x *SmithyRiseReq) String() string {
func (*SmithyRiseReq) ProtoMessage() {}
func (x *SmithyRiseReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[8]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[6]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -477,7 +366,7 @@ func (x *SmithyRiseReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyRiseReq.ProtoReflect.Descriptor instead.
func (*SmithyRiseReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{8}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{6}
}
func (x *SmithyRiseReq) GetItemId() string {
@@ -505,7 +394,7 @@ type SmithyRiseResp struct {
func (x *SmithyRiseResp) Reset() {
*x = SmithyRiseResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[9]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[7]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -518,7 +407,7 @@ func (x *SmithyRiseResp) String() string {
func (*SmithyRiseResp) ProtoMessage() {}
func (x *SmithyRiseResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[9]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[7]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -531,7 +420,7 @@ func (x *SmithyRiseResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyRiseResp.ProtoReflect.Descriptor instead.
func (*SmithyRiseResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{9}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{7}
}
func (x *SmithyRiseResp) GetData() *DBStove {
@@ -553,7 +442,7 @@ type SmithyToolsUpReq struct {
func (x *SmithyToolsUpReq) Reset() {
*x = SmithyToolsUpReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[10]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[8]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -566,7 +455,7 @@ func (x *SmithyToolsUpReq) String() string {
func (*SmithyToolsUpReq) ProtoMessage() {}
func (x *SmithyToolsUpReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[10]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[8]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -579,7 +468,7 @@ func (x *SmithyToolsUpReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyToolsUpReq.ProtoReflect.Descriptor instead.
func (*SmithyToolsUpReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{10}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{8}
}
func (x *SmithyToolsUpReq) GetId() int32 {
@@ -600,7 +489,7 @@ type SmithyToolsUpResp struct {
func (x *SmithyToolsUpResp) Reset() {
*x = SmithyToolsUpResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[11]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[9]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -613,7 +502,7 @@ func (x *SmithyToolsUpResp) String() string {
func (*SmithyToolsUpResp) ProtoMessage() {}
func (x *SmithyToolsUpResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[11]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[9]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -626,7 +515,7 @@ func (x *SmithyToolsUpResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyToolsUpResp.ProtoReflect.Descriptor instead.
func (*SmithyToolsUpResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{11}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{9}
}
func (x *SmithyToolsUpResp) GetData() *DBStove {
@@ -646,7 +535,7 @@ type SmithyCustomerReq struct {
func (x *SmithyCustomerReq) Reset() {
*x = SmithyCustomerReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[12]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[10]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -659,7 +548,7 @@ func (x *SmithyCustomerReq) String() string {
func (*SmithyCustomerReq) ProtoMessage() {}
func (x *SmithyCustomerReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[12]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[10]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -672,7 +561,7 @@ func (x *SmithyCustomerReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyCustomerReq.ProtoReflect.Descriptor instead.
func (*SmithyCustomerReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{12}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{10}
}
type SmithyCustomerResp struct {
@@ -686,7 +575,7 @@ type SmithyCustomerResp struct {
func (x *SmithyCustomerResp) Reset() {
*x = SmithyCustomerResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[13]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[11]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -699,7 +588,7 @@ func (x *SmithyCustomerResp) String() string {
func (*SmithyCustomerResp) ProtoMessage() {}
func (x *SmithyCustomerResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[13]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[11]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -712,7 +601,7 @@ func (x *SmithyCustomerResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyCustomerResp.ProtoReflect.Descriptor instead.
func (*SmithyCustomerResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{13}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{11}
}
func (x *SmithyCustomerResp) GetCustomers() []*CustomerInfo {
@@ -735,7 +624,7 @@ type SmithySellReq struct {
func (x *SmithySellReq) Reset() {
*x = SmithySellReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[14]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[12]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -748,7 +637,7 @@ func (x *SmithySellReq) String() string {
func (*SmithySellReq) ProtoMessage() {}
func (x *SmithySellReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[14]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[12]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -761,7 +650,7 @@ func (x *SmithySellReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithySellReq.ProtoReflect.Descriptor instead.
func (*SmithySellReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{14}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{12}
}
func (x *SmithySellReq) GetEquipIds() []string {
@@ -790,7 +679,7 @@ type SmithySellResp struct {
func (x *SmithySellResp) Reset() {
*x = SmithySellResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[15]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[13]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -803,7 +692,7 @@ func (x *SmithySellResp) String() string {
func (*SmithySellResp) ProtoMessage() {}
func (x *SmithySellResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[15]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[13]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -816,7 +705,7 @@ func (x *SmithySellResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithySellResp.ProtoReflect.Descriptor instead.
func (*SmithySellResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{15}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{13}
}
func (x *SmithySellResp) GetCustomerId() int32 {
@@ -833,6 +722,178 @@ func (x *SmithySellResp) GetEquipIds() []string {
return nil
}
+// 查看图鉴信息
+type SmithyAtlasListReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+}
+
+func (x *SmithyAtlasListReq) Reset() {
+ *x = SmithyAtlasListReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_smithy_smithy_msg_proto_msgTypes[14]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *SmithyAtlasListReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SmithyAtlasListReq) ProtoMessage() {}
+
+func (x *SmithyAtlasListReq) ProtoReflect() protoreflect.Message {
+ mi := &file_smithy_smithy_msg_proto_msgTypes[14]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use SmithyAtlasListReq.ProtoReflect.Descriptor instead.
+func (*SmithyAtlasListReq) Descriptor() ([]byte, []int) {
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{14}
+}
+
+type SmithyAtlasListResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Data *DBAtlas `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
+}
+
+func (x *SmithyAtlasListResp) Reset() {
+ *x = SmithyAtlasListResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_smithy_smithy_msg_proto_msgTypes[15]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *SmithyAtlasListResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SmithyAtlasListResp) ProtoMessage() {}
+
+func (x *SmithyAtlasListResp) ProtoReflect() protoreflect.Message {
+ mi := &file_smithy_smithy_msg_proto_msgTypes[15]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use SmithyAtlasListResp.ProtoReflect.Descriptor instead.
+func (*SmithyAtlasListResp) Descriptor() ([]byte, []int) {
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{15}
+}
+
+func (x *SmithyAtlasListResp) GetData() *DBAtlas {
+ if x != nil {
+ return x.Data
+ }
+ return nil
+}
+
+// 图鉴信息奖励任务领取
+type SmithyAtlasAwardReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+}
+
+func (x *SmithyAtlasAwardReq) Reset() {
+ *x = SmithyAtlasAwardReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_smithy_smithy_msg_proto_msgTypes[16]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *SmithyAtlasAwardReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SmithyAtlasAwardReq) ProtoMessage() {}
+
+func (x *SmithyAtlasAwardReq) ProtoReflect() protoreflect.Message {
+ mi := &file_smithy_smithy_msg_proto_msgTypes[16]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use SmithyAtlasAwardReq.ProtoReflect.Descriptor instead.
+func (*SmithyAtlasAwardReq) Descriptor() ([]byte, []int) {
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{16}
+}
+
+type SmithyAtlasAwardResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Data *DBAtlas `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` // 奖励信息
+}
+
+func (x *SmithyAtlasAwardResp) Reset() {
+ *x = SmithyAtlasAwardResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_smithy_smithy_msg_proto_msgTypes[17]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *SmithyAtlasAwardResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SmithyAtlasAwardResp) ProtoMessage() {}
+
+func (x *SmithyAtlasAwardResp) ProtoReflect() protoreflect.Message {
+ mi := &file_smithy_smithy_msg_proto_msgTypes[17]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use SmithyAtlasAwardResp.ProtoReflect.Descriptor instead.
+func (*SmithyAtlasAwardResp) Descriptor() ([]byte, []int) {
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{17}
+}
+
+func (x *SmithyAtlasAwardResp) GetData() *DBAtlas {
+ if x != nil {
+ return x.Data
+ }
+ return nil
+}
+
//////////////////////////////////////////
// 创建订单
type SmithyCreateOrderReq struct {
@@ -846,7 +907,7 @@ type SmithyCreateOrderReq struct {
func (x *SmithyCreateOrderReq) Reset() {
*x = SmithyCreateOrderReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[16]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[18]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -859,7 +920,7 @@ func (x *SmithyCreateOrderReq) String() string {
func (*SmithyCreateOrderReq) ProtoMessage() {}
func (x *SmithyCreateOrderReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[16]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[18]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -872,7 +933,7 @@ func (x *SmithyCreateOrderReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyCreateOrderReq.ProtoReflect.Descriptor instead.
func (*SmithyCreateOrderReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{16}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{18}
}
func (x *SmithyCreateOrderReq) GetOrder() []*OrderClang {
@@ -893,7 +954,7 @@ type SmithyCreateOrderResp struct {
func (x *SmithyCreateOrderResp) Reset() {
*x = SmithyCreateOrderResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[17]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[19]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -906,7 +967,7 @@ func (x *SmithyCreateOrderResp) String() string {
func (*SmithyCreateOrderResp) ProtoMessage() {}
func (x *SmithyCreateOrderResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[17]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[19]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -919,7 +980,7 @@ func (x *SmithyCreateOrderResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyCreateOrderResp.ProtoReflect.Descriptor instead.
func (*SmithyCreateOrderResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{17}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{19}
}
func (x *SmithyCreateOrderResp) GetData() *DBSmithy {
@@ -939,7 +1000,7 @@ type SmithyGetRewardReq struct {
func (x *SmithyGetRewardReq) Reset() {
*x = SmithyGetRewardReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[18]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[20]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -952,7 +1013,7 @@ func (x *SmithyGetRewardReq) String() string {
func (*SmithyGetRewardReq) ProtoMessage() {}
func (x *SmithyGetRewardReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[18]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[20]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -965,7 +1026,7 @@ func (x *SmithyGetRewardReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyGetRewardReq.ProtoReflect.Descriptor instead.
func (*SmithyGetRewardReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{18}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{20}
}
type SmithyGetRewardResp struct {
@@ -979,7 +1040,7 @@ type SmithyGetRewardResp struct {
func (x *SmithyGetRewardResp) Reset() {
*x = SmithyGetRewardResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[19]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[21]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -992,7 +1053,7 @@ func (x *SmithyGetRewardResp) String() string {
func (*SmithyGetRewardResp) ProtoMessage() {}
func (x *SmithyGetRewardResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[19]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[21]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1005,7 +1066,7 @@ func (x *SmithyGetRewardResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyGetRewardResp.ProtoReflect.Descriptor instead.
func (*SmithyGetRewardResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{19}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{21}
}
func (x *SmithyGetRewardResp) GetData() *DBSmithy {
@@ -1027,7 +1088,7 @@ type SmithyDeskSkillLvReq struct {
func (x *SmithyDeskSkillLvReq) Reset() {
*x = SmithyDeskSkillLvReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[20]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[22]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1040,7 +1101,7 @@ func (x *SmithyDeskSkillLvReq) String() string {
func (*SmithyDeskSkillLvReq) ProtoMessage() {}
func (x *SmithyDeskSkillLvReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[20]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[22]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1053,7 +1114,7 @@ func (x *SmithyDeskSkillLvReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyDeskSkillLvReq.ProtoReflect.Descriptor instead.
func (*SmithyDeskSkillLvReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{20}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{22}
}
func (x *SmithyDeskSkillLvReq) GetDeskType() int32 {
@@ -1074,7 +1135,7 @@ type SmithyDeskSkillLvResp struct {
func (x *SmithyDeskSkillLvResp) Reset() {
*x = SmithyDeskSkillLvResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[21]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[23]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1087,7 +1148,7 @@ func (x *SmithyDeskSkillLvResp) String() string {
func (*SmithyDeskSkillLvResp) ProtoMessage() {}
func (x *SmithyDeskSkillLvResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[21]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[23]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1100,7 +1161,7 @@ func (x *SmithyDeskSkillLvResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyDeskSkillLvResp.ProtoReflect.Descriptor instead.
func (*SmithyDeskSkillLvResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{21}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{23}
}
func (x *SmithyDeskSkillLvResp) GetData() *DBSmithy {
@@ -1120,7 +1181,7 @@ type SmithyStoveSkillLvReq struct {
func (x *SmithyStoveSkillLvReq) Reset() {
*x = SmithyStoveSkillLvReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[22]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[24]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1133,7 +1194,7 @@ func (x *SmithyStoveSkillLvReq) String() string {
func (*SmithyStoveSkillLvReq) ProtoMessage() {}
func (x *SmithyStoveSkillLvReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[22]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[24]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1146,7 +1207,7 @@ func (x *SmithyStoveSkillLvReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyStoveSkillLvReq.ProtoReflect.Descriptor instead.
func (*SmithyStoveSkillLvReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{22}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{24}
}
type SmithyStoveSkillLvResp struct {
@@ -1160,7 +1221,7 @@ type SmithyStoveSkillLvResp struct {
func (x *SmithyStoveSkillLvResp) Reset() {
*x = SmithyStoveSkillLvResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[23]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[25]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1173,7 +1234,7 @@ func (x *SmithyStoveSkillLvResp) String() string {
func (*SmithyStoveSkillLvResp) ProtoMessage() {}
func (x *SmithyStoveSkillLvResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[23]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[25]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1186,7 +1247,7 @@ func (x *SmithyStoveSkillLvResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyStoveSkillLvResp.ProtoReflect.Descriptor instead.
func (*SmithyStoveSkillLvResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{23}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{25}
}
func (x *SmithyStoveSkillLvResp) GetData() *DBSmithy {
@@ -1207,7 +1268,7 @@ type SmithyGetRandUserReq struct {
func (x *SmithyGetRandUserReq) Reset() {
*x = SmithyGetRandUserReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[24]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[26]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1220,7 +1281,7 @@ func (x *SmithyGetRandUserReq) String() string {
func (*SmithyGetRandUserReq) ProtoMessage() {}
func (x *SmithyGetRandUserReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[24]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[26]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1233,7 +1294,7 @@ func (x *SmithyGetRandUserReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyGetRandUserReq.ProtoReflect.Descriptor instead.
func (*SmithyGetRandUserReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{24}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{26}
}
func (x *SmithyGetRandUserReq) GetPeople() int32 {
@@ -1254,7 +1315,7 @@ type SmithyGetRandUserResp struct {
func (x *SmithyGetRandUserResp) Reset() {
*x = SmithyGetRandUserResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[25]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[27]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1267,7 +1328,7 @@ func (x *SmithyGetRandUserResp) String() string {
func (*SmithyGetRandUserResp) ProtoMessage() {}
func (x *SmithyGetRandUserResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[25]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[27]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1280,7 +1341,7 @@ func (x *SmithyGetRandUserResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyGetRandUserResp.ProtoReflect.Descriptor instead.
func (*SmithyGetRandUserResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{25}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{27}
}
func (x *SmithyGetRandUserResp) GetUser() []*DBUser {
@@ -1299,7 +1360,7 @@ type SmithyGetListReq struct {
func (x *SmithyGetListReq) Reset() {
*x = SmithyGetListReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[26]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[28]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1312,7 +1373,7 @@ func (x *SmithyGetListReq) String() string {
func (*SmithyGetListReq) ProtoMessage() {}
func (x *SmithyGetListReq) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[26]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[28]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1325,7 +1386,7 @@ func (x *SmithyGetListReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyGetListReq.ProtoReflect.Descriptor instead.
func (*SmithyGetListReq) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{26}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{28}
}
// 返回进度信息
@@ -1340,7 +1401,7 @@ type SmithyGetListResp struct {
func (x *SmithyGetListResp) Reset() {
*x = SmithyGetListResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_smithy_smithy_msg_proto_msgTypes[27]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[29]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1353,7 +1414,7 @@ func (x *SmithyGetListResp) String() string {
func (*SmithyGetListResp) ProtoMessage() {}
func (x *SmithyGetListResp) ProtoReflect() protoreflect.Message {
- mi := &file_smithy_smithy_msg_proto_msgTypes[27]
+ mi := &file_smithy_smithy_msg_proto_msgTypes[29]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1366,7 +1427,7 @@ func (x *SmithyGetListResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use SmithyGetListResp.ProtoReflect.Descriptor instead.
func (*SmithyGetListResp) Descriptor() ([]byte, []int) {
- return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{27}
+ return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{29}
}
func (x *SmithyGetListResp) GetData() *DBSmithy {
@@ -1388,28 +1449,19 @@ var file_smithy_smithy_msg_proto_rawDesc = []byte{
0x0a, 0x16, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, 0x76, 0x65,
0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65,
- 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x5b, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
- 0x46, 0x6f, 0x72, 0x67, 0x65, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a,
- 0x06, 0x72, 0x65, 0x65, 0x6c, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x72,
- 0x65, 0x65, 0x6c, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x61, 0x76, 0x61, 0x18, 0x02, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x04, 0x6c, 0x61, 0x76, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, 0x61,
- 0x6c, 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x71, 0x75, 0x61, 0x6c,
- 0x69, 0x74, 0x79, 0x22, 0x4a, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x46, 0x6f, 0x72,
- 0x67, 0x65, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x65,
- 0x71, 0x75, 0x69, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x65, 0x71, 0x75, 0x69,
- 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
- 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22,
- 0x79, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x45, 0x71,
- 0x75, 0x69, 0x70, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49,
- 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64,
- 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04,
- 0x6c, 0x61, 0x76, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x6c, 0x61, 0x76, 0x61,
- 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x22, 0x4a, 0x0a, 0x14, 0x53, 0x6d,
- 0x69, 0x74, 0x68, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x45, 0x71, 0x75, 0x69, 0x70, 0x52, 0x65,
- 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x05, 0x65, 0x71, 0x75, 0x69, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
+ 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,
@@ -1443,43 +1495,52 @@ var file_smithy_smithy_msg_proto_rawDesc = []byte{
0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x71,
0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x65, 0x71,
- 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x22, 0x39, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
- 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x21,
- 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
- 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65,
- 0x72, 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74,
- 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61,
+ 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
+ 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x33, 0x0a, 0x13,
+ 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52,
+ 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74,
+ 0x61, 0x22, 0x15, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73,
+ 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x34, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74,
+ 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70,
+ 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08,
+ 0x2e, 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x39,
+ 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72,
+ 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x21, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18,
+ 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61,
+ 0x6e, 0x67, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, 0x69,
+ 0x74, 0x68, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65,
+ 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+ 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74,
+ 0x61, 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65,
+ 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x34, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68,
+ 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d,
+ 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44,
+ 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x32, 0x0a,
+ 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x44, 0x65, 0x73, 0x6b, 0x53, 0x6b, 0x69, 0x6c, 0x6c,
+ 0x4c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70,
+ 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70,
+ 0x65, 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x44, 0x65, 0x73, 0x6b, 0x53,
+ 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61,
0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69,
- 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6d, 0x69,
- 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22,
- 0x34, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61,
- 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52,
- 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x32, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x44,
- 0x65, 0x73, 0x6b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a,
- 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
- 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, 0x69,
- 0x74, 0x68, 0x79, 0x44, 0x65, 0x73, 0x6b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65,
- 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74,
- 0x61, 0x22, 0x17, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65,
- 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, 0x16, 0x53, 0x6d,
- 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76,
- 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64,
- 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74,
- 0x52, 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x70,
- 0x65, 0x6f, 0x70, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x65, 0x6f,
- 0x70, 0x6c, 0x65, 0x22, 0x34, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74,
- 0x52, 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04,
- 0x75, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55,
- 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x6d, 0x69,
- 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a,
- 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
- 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74,
- 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
- 0x33,
+ 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x17, 0x0a, 0x15, 0x53, 0x6d, 0x69,
+ 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52,
+ 0x65, 0x71, 0x22, 0x37, 0x0a, 0x16, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76,
+ 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04,
+ 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53,
+ 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x14, 0x53,
+ 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72,
+ 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x65, 0x6f, 0x70, 0x6c, 0x65, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x65, 0x6f, 0x70, 0x6c, 0x65, 0x22, 0x34, 0x0a, 0x15, 0x53,
+ 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72,
+ 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03,
+ 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65,
+ 0x72, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69,
+ 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47,
+ 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61,
+ 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69,
+ 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
+ 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -1494,62 +1555,66 @@ func file_smithy_smithy_msg_proto_rawDescGZIP() []byte {
return file_smithy_smithy_msg_proto_rawDescData
}
-var file_smithy_smithy_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 28)
+var file_smithy_smithy_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 30)
var file_smithy_smithy_msg_proto_goTypes = []interface{}{
(*SmithyGetStoveInfoReq)(nil), // 0: SmithyGetStoveInfoReq
(*SmithyGetStoveInfoResp)(nil), // 1: SmithyGetStoveInfoResp
(*SmithyForgeEquipReq)(nil), // 2: SmithyForgeEquipReq
(*SmithyForgeEquipResp)(nil), // 3: SmithyForgeEquipResp
- (*SmithyOrderEquipReq)(nil), // 4: SmithyOrderEquipReq
- (*SmithyOrderEquipResp)(nil), // 5: SmithyOrderEquipResp
- (*SmithyStoveUpReq)(nil), // 6: SmithyStoveUpReq
- (*SmithyStoveUpResp)(nil), // 7: SmithyStoveUpResp
- (*SmithyRiseReq)(nil), // 8: SmithyRiseReq
- (*SmithyRiseResp)(nil), // 9: SmithyRiseResp
- (*SmithyToolsUpReq)(nil), // 10: SmithyToolsUpReq
- (*SmithyToolsUpResp)(nil), // 11: SmithyToolsUpResp
- (*SmithyCustomerReq)(nil), // 12: SmithyCustomerReq
- (*SmithyCustomerResp)(nil), // 13: SmithyCustomerResp
- (*SmithySellReq)(nil), // 14: SmithySellReq
- (*SmithySellResp)(nil), // 15: SmithySellResp
- (*SmithyCreateOrderReq)(nil), // 16: SmithyCreateOrderReq
- (*SmithyCreateOrderResp)(nil), // 17: SmithyCreateOrderResp
- (*SmithyGetRewardReq)(nil), // 18: SmithyGetRewardReq
- (*SmithyGetRewardResp)(nil), // 19: SmithyGetRewardResp
- (*SmithyDeskSkillLvReq)(nil), // 20: SmithyDeskSkillLvReq
- (*SmithyDeskSkillLvResp)(nil), // 21: SmithyDeskSkillLvResp
- (*SmithyStoveSkillLvReq)(nil), // 22: SmithyStoveSkillLvReq
- (*SmithyStoveSkillLvResp)(nil), // 23: SmithyStoveSkillLvResp
- (*SmithyGetRandUserReq)(nil), // 24: SmithyGetRandUserReq
- (*SmithyGetRandUserResp)(nil), // 25: SmithyGetRandUserResp
- (*SmithyGetListReq)(nil), // 26: SmithyGetListReq
- (*SmithyGetListResp)(nil), // 27: SmithyGetListResp
- (*DBStove)(nil), // 28: DBStove
- (*CustomerInfo)(nil), // 29: CustomerInfo
- (*OrderClang)(nil), // 30: OrderClang
- (*DBSmithy)(nil), // 31: DBSmithy
- (*DBUser)(nil), // 32: DBUser
+ (*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
+ (*SmithyAtlasListReq)(nil), // 14: SmithyAtlasListReq
+ (*SmithyAtlasListResp)(nil), // 15: SmithyAtlasListResp
+ (*SmithyAtlasAwardReq)(nil), // 16: SmithyAtlasAwardReq
+ (*SmithyAtlasAwardResp)(nil), // 17: SmithyAtlasAwardResp
+ (*SmithyCreateOrderReq)(nil), // 18: SmithyCreateOrderReq
+ (*SmithyCreateOrderResp)(nil), // 19: SmithyCreateOrderResp
+ (*SmithyGetRewardReq)(nil), // 20: SmithyGetRewardReq
+ (*SmithyGetRewardResp)(nil), // 21: SmithyGetRewardResp
+ (*SmithyDeskSkillLvReq)(nil), // 22: SmithyDeskSkillLvReq
+ (*SmithyDeskSkillLvResp)(nil), // 23: SmithyDeskSkillLvResp
+ (*SmithyStoveSkillLvReq)(nil), // 24: SmithyStoveSkillLvReq
+ (*SmithyStoveSkillLvResp)(nil), // 25: SmithyStoveSkillLvResp
+ (*SmithyGetRandUserReq)(nil), // 26: SmithyGetRandUserReq
+ (*SmithyGetRandUserResp)(nil), // 27: SmithyGetRandUserResp
+ (*SmithyGetListReq)(nil), // 28: SmithyGetListReq
+ (*SmithyGetListResp)(nil), // 29: SmithyGetListResp
+ (*DBStove)(nil), // 30: DBStove
+ (*CustomerInfo)(nil), // 31: CustomerInfo
+ (*DBAtlas)(nil), // 32: DBAtlas
+ (*OrderClang)(nil), // 33: OrderClang
+ (*DBSmithy)(nil), // 34: DBSmithy
+ (*DBUser)(nil), // 35: DBUser
}
var file_smithy_smithy_msg_proto_depIdxs = []int32{
- 28, // 0: SmithyGetStoveInfoResp.data:type_name -> DBStove
- 28, // 1: SmithyForgeEquipResp.data:type_name -> DBStove
- 28, // 2: SmithyOrderEquipResp.data:type_name -> DBStove
- 28, // 3: SmithyStoveUpResp.data:type_name -> DBStove
- 28, // 4: SmithyRiseResp.data:type_name -> DBStove
- 28, // 5: SmithyToolsUpResp.data:type_name -> DBStove
- 29, // 6: SmithyCustomerResp.customers:type_name -> CustomerInfo
- 30, // 7: SmithyCreateOrderReq.order:type_name -> OrderClang
- 31, // 8: SmithyCreateOrderResp.data:type_name -> DBSmithy
- 31, // 9: SmithyGetRewardResp.data:type_name -> DBSmithy
- 31, // 10: SmithyDeskSkillLvResp.data:type_name -> DBSmithy
- 31, // 11: SmithyStoveSkillLvResp.data:type_name -> DBSmithy
- 32, // 12: SmithyGetRandUserResp.user:type_name -> DBUser
- 31, // 13: SmithyGetListResp.data:type_name -> DBSmithy
- 14, // [14:14] is the sub-list for method output_type
- 14, // [14:14] is the sub-list for method input_type
- 14, // [14:14] is the sub-list for extension type_name
- 14, // [14:14] is the sub-list for extension extendee
- 0, // [0:14] is the sub-list for field type_name
+ 30, // 0: SmithyGetStoveInfoResp.data:type_name -> DBStove
+ 30, // 1: SmithyForgeEquipResp.data:type_name -> DBStove
+ 30, // 2: SmithyStoveUpResp.data:type_name -> DBStove
+ 30, // 3: SmithyRiseResp.data:type_name -> DBStove
+ 30, // 4: SmithyToolsUpResp.data:type_name -> DBStove
+ 31, // 5: SmithyCustomerResp.customers:type_name -> CustomerInfo
+ 32, // 6: SmithyAtlasListResp.data:type_name -> DBAtlas
+ 32, // 7: SmithyAtlasAwardResp.data:type_name -> DBAtlas
+ 33, // 8: SmithyCreateOrderReq.order:type_name -> OrderClang
+ 34, // 9: SmithyCreateOrderResp.data:type_name -> DBSmithy
+ 34, // 10: SmithyGetRewardResp.data:type_name -> DBSmithy
+ 34, // 11: SmithyDeskSkillLvResp.data:type_name -> DBSmithy
+ 34, // 12: SmithyStoveSkillLvResp.data:type_name -> DBSmithy
+ 35, // 13: SmithyGetRandUserResp.user:type_name -> DBUser
+ 34, // 14: SmithyGetListResp.data:type_name -> DBSmithy
+ 15, // [15:15] is the sub-list for method output_type
+ 15, // [15:15] is the sub-list for method input_type
+ 15, // [15:15] is the sub-list for extension type_name
+ 15, // [15:15] is the sub-list for extension extendee
+ 0, // [0:15] is the sub-list for field type_name
}
func init() { file_smithy_smithy_msg_proto_init() }
@@ -1609,30 +1674,6 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyOrderEquipReq); 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[5].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyOrderEquipResp); 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[6].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*SmithyStoveUpReq); i {
case 0:
return &v.state
@@ -1644,7 +1685,7 @@ func file_smithy_smithy_msg_proto_init() {
return nil
}
}
- file_smithy_smithy_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+ file_smithy_smithy_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*SmithyStoveUpResp); i {
case 0:
return &v.state
@@ -1656,7 +1697,7 @@ func file_smithy_smithy_msg_proto_init() {
return nil
}
}
- file_smithy_smithy_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+ file_smithy_smithy_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*SmithyRiseReq); i {
case 0:
return &v.state
@@ -1668,7 +1709,7 @@ func file_smithy_smithy_msg_proto_init() {
return nil
}
}
- file_smithy_smithy_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+ file_smithy_smithy_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*SmithyRiseResp); i {
case 0:
return &v.state
@@ -1680,7 +1721,7 @@ func file_smithy_smithy_msg_proto_init() {
return nil
}
}
- file_smithy_smithy_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+ file_smithy_smithy_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*SmithyToolsUpReq); i {
case 0:
return &v.state
@@ -1692,7 +1733,7 @@ func file_smithy_smithy_msg_proto_init() {
return nil
}
}
- file_smithy_smithy_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+ file_smithy_smithy_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*SmithyToolsUpResp); i {
case 0:
return &v.state
@@ -1704,7 +1745,7 @@ func file_smithy_smithy_msg_proto_init() {
return nil
}
}
- file_smithy_smithy_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+ file_smithy_smithy_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*SmithyCustomerReq); i {
case 0:
return &v.state
@@ -1716,7 +1757,7 @@ func file_smithy_smithy_msg_proto_init() {
return nil
}
}
- file_smithy_smithy_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+ file_smithy_smithy_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*SmithyCustomerResp); i {
case 0:
return &v.state
@@ -1728,7 +1769,7 @@ func file_smithy_smithy_msg_proto_init() {
return nil
}
}
- file_smithy_smithy_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+ file_smithy_smithy_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*SmithySellReq); i {
case 0:
return &v.state
@@ -1740,7 +1781,7 @@ func file_smithy_smithy_msg_proto_init() {
return nil
}
}
- file_smithy_smithy_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+ file_smithy_smithy_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*SmithySellResp); i {
case 0:
return &v.state
@@ -1752,8 +1793,32 @@ func file_smithy_smithy_msg_proto_init() {
return nil
}
}
+ file_smithy_smithy_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*SmithyAtlasListReq); 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[15].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*SmithyAtlasListResp); 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[16].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyCreateOrderReq); i {
+ switch v := v.(*SmithyAtlasAwardReq); i {
case 0:
return &v.state
case 1:
@@ -1765,7 +1830,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyCreateOrderResp); i {
+ switch v := v.(*SmithyAtlasAwardResp); i {
case 0:
return &v.state
case 1:
@@ -1777,7 +1842,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyGetRewardReq); i {
+ switch v := v.(*SmithyCreateOrderReq); i {
case 0:
return &v.state
case 1:
@@ -1789,7 +1854,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyGetRewardResp); i {
+ switch v := v.(*SmithyCreateOrderResp); i {
case 0:
return &v.state
case 1:
@@ -1801,7 +1866,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyDeskSkillLvReq); i {
+ switch v := v.(*SmithyGetRewardReq); i {
case 0:
return &v.state
case 1:
@@ -1813,7 +1878,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyDeskSkillLvResp); i {
+ switch v := v.(*SmithyGetRewardResp); i {
case 0:
return &v.state
case 1:
@@ -1825,7 +1890,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyStoveSkillLvReq); i {
+ switch v := v.(*SmithyDeskSkillLvReq); i {
case 0:
return &v.state
case 1:
@@ -1837,7 +1902,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyStoveSkillLvResp); i {
+ switch v := v.(*SmithyDeskSkillLvResp); i {
case 0:
return &v.state
case 1:
@@ -1849,7 +1914,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyGetRandUserReq); i {
+ switch v := v.(*SmithyStoveSkillLvReq); i {
case 0:
return &v.state
case 1:
@@ -1861,7 +1926,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyGetRandUserResp); i {
+ switch v := v.(*SmithyStoveSkillLvResp); i {
case 0:
return &v.state
case 1:
@@ -1873,7 +1938,7 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SmithyGetListReq); i {
+ switch v := v.(*SmithyGetRandUserReq); i {
case 0:
return &v.state
case 1:
@@ -1885,6 +1950,30 @@ func file_smithy_smithy_msg_proto_init() {
}
}
file_smithy_smithy_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*SmithyGetRandUserResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_smithy_smithy_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*SmithyGetListReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_smithy_smithy_msg_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*SmithyGetListResp); i {
case 0:
return &v.state
@@ -1903,7 +1992,7 @@ func file_smithy_smithy_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_smithy_smithy_msg_proto_rawDesc,
NumEnums: 0,
- NumMessages: 28,
+ NumMessages: 30,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/pb/userexpand.pb.go b/pb/userexpand.pb.go
index 9b64e4c8d..dd8075b3a 100644
--- a/pb/userexpand.pb.go
+++ b/pb/userexpand.pb.go
@@ -56,6 +56,7 @@ type DBUserExpand struct {
SociatyTicketBuyNum int32 `protobuf:"varint,32,opt,name=sociatyTicketBuyNum,proto3" json:"sociatyTicketBuyNum" bson:"sociatyTicketBuyNum"` //公会boss挑战券购买次数
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
}
func (x *DBUserExpand) Reset() {
@@ -300,11 +301,18 @@ func (x *DBUserExpand) GetMline() map[int32]int32 {
return nil
}
+func (x *DBUserExpand) GetSuiteId() []int32 {
+ if x != nil {
+ return x.SuiteId
+ }
+ return nil
+}
+
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, 0xf2, 0x09, 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,
@@ -376,15 +384,17 @@ var file_userexpand_proto_rawDesc = []byte{
0x74, 0x12, 0x2e, 0x0a, 0x05, 0x6d, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x22, 0x20, 0x03, 0x28, 0x0b,
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, 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,
+ 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, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
- 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 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.BattleReadyData.go b/sys/configure/structs/Game.BattleReadyData.go
index 976524dd8..e3b84ff4e 100644
--- a/sys/configure/structs/Game.BattleReadyData.go
+++ b/sys/configure/structs/Game.BattleReadyData.go
@@ -19,6 +19,7 @@ type GameBattleReadyData struct {
LockSlots []int32
AssistTeam int32
CanFriendHelp int32
+ Numrounds int32
}
const TypeId_GameBattleReadyData = -266091495
@@ -62,6 +63,7 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["AssistTeam"].(float64); !_ok_ { err = errors.New("AssistTeam error"); return }; _v.AssistTeam = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["CanFriendHelp"].(float64); !_ok_ { err = errors.New("CanFriendHelp error"); return }; _v.CanFriendHelp = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Numrounds"].(float64); !_ok_ { err = errors.New("Numrounds error"); return }; _v.Numrounds = int32(_tempNum_) }
return
}
diff --git a/sys/configure/structs/Game.Battleready_capskill.go b/sys/configure/structs/Game.Battleready_capskill.go
new file mode 100644
index 000000000..0b069e382
--- /dev/null
+++ b/sys/configure/structs/Game.Battleready_capskill.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 GameBattleready_capskill struct {
+ _dataMap map[int32]*GameBattleready_capskillData
+ _dataList []*GameBattleready_capskillData
+}
+
+func NewGameBattleready_capskill(_buf []map[string]interface{}) (*GameBattleready_capskill, error) {
+ _dataList := make([]*GameBattleready_capskillData, 0, len(_buf))
+ dataMap := make(map[int32]*GameBattleready_capskillData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameBattleready_capskillData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameBattleready_capskill{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameBattleready_capskill) GetDataMap() map[int32]*GameBattleready_capskillData {
+ return table._dataMap
+}
+
+func (table *GameBattleready_capskill) GetDataList() []*GameBattleready_capskillData {
+ return table._dataList
+}
+
+func (table *GameBattleready_capskill) Get(key int32) *GameBattleready_capskillData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.Battleready_capskillData.go b/sys/configure/structs/Game.Battleready_capskillData.go
new file mode 100644
index 000000000..03fa1d0a9
--- /dev/null
+++ b/sys/configure/structs/Game.Battleready_capskillData.go
@@ -0,0 +1,110 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameBattleready_capskillData struct {
+ Id int32
+ Lv []int32
+ Start []int32
+ Race []int32
+ Heroid []string
+ Disableplay []string
+}
+
+const TypeId_GameBattleready_capskillData = 544342105
+
+func (*GameBattleready_capskillData) GetTypeId() int32 {
+ return 544342105
+}
+
+func (_v *GameBattleready_capskillData)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["lv"].([]interface{}); !_ok_ { err = errors.New("lv error"); return }
+
+ _v.Lv = 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.Lv = append(_v.Lv, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["start"].([]interface{}); !_ok_ { err = errors.New("start error"); return }
+
+ _v.Start = 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.Start = append(_v.Start, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["race"].([]interface{}); !_ok_ { err = errors.New("race error"); return }
+
+ _v.Race = 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.Race = append(_v.Race, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["heroid"].([]interface{}); !_ok_ { err = errors.New("heroid error"); return }
+
+ _v.Heroid = 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.Heroid = append(_v.Heroid, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["disableplay"].([]interface{}); !_ok_ { err = errors.New("disableplay error"); return }
+
+ _v.Disableplay = 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.Disableplay = append(_v.Disableplay, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameBattleready_capskillData(_buf map[string]interface{}) (*GameBattleready_capskillData, error) {
+ v := &GameBattleready_capskillData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.SmithyAtlas.go b/sys/configure/structs/Game.SmithyAtlas.go
new file mode 100644
index 000000000..fd4fc665f
--- /dev/null
+++ b/sys/configure/structs/Game.SmithyAtlas.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameSmithyAtlas struct {
+ _dataMap map[string]*GameSmithyAtlasData
+ _dataList []*GameSmithyAtlasData
+}
+
+func NewGameSmithyAtlas(_buf []map[string]interface{}) (*GameSmithyAtlas, error) {
+ _dataList := make([]*GameSmithyAtlasData, 0, len(_buf))
+ dataMap := make(map[string]*GameSmithyAtlasData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameSmithyAtlasData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameSmithyAtlas{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameSmithyAtlas) GetDataMap() map[string]*GameSmithyAtlasData {
+ return table._dataMap
+}
+
+func (table *GameSmithyAtlas) GetDataList() []*GameSmithyAtlasData {
+ return table._dataList
+}
+
+func (table *GameSmithyAtlas) Get(key string) *GameSmithyAtlasData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.SmithyAtlasData.go b/sys/configure/structs/Game.SmithyAtlasData.go
new file mode 100644
index 000000000..e6294f498
--- /dev/null
+++ b/sys/configure/structs/Game.SmithyAtlasData.go
@@ -0,0 +1,49 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameSmithyAtlasData struct {
+ Id string
+ TabId int32
+ TypeId int32
+ NameText string
+ ContentText string
+ AtlasScore int32
+ AtlasGiver int32
+ Quality int32
+}
+
+const TypeId_GameSmithyAtlasData = 2126233763
+
+func (*GameSmithyAtlasData) GetTypeId() int32 {
+ return 2126233763
+}
+
+func (_v *GameSmithyAtlasData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tab_id"].(float64); !_ok_ { err = errors.New("tab_id error"); return }; _v.TabId = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type_id"].(float64); !_ok_ { err = errors.New("type_id error"); return }; _v.TypeId = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.NameText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.NameText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["content_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ContentText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ContentText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atlas_score"].(float64); !_ok_ { err = errors.New("atlas_score error"); return }; _v.AtlasScore = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atlas_giver"].(float64); !_ok_ { err = errors.New("atlas_giver error"); return }; _v.AtlasGiver = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["quality"].(float64); !_ok_ { err = errors.New("quality error"); return }; _v.Quality = int32(_tempNum_) }
+ return
+}
+
+func DeserializeGameSmithyAtlasData(_buf map[string]interface{}) (*GameSmithyAtlasData, error) {
+ v := &GameSmithyAtlasData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.SmithyAtlasLv.go b/sys/configure/structs/Game.SmithyAtlasLv.go
new file mode 100644
index 000000000..d0224786c
--- /dev/null
+++ b/sys/configure/structs/Game.SmithyAtlasLv.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameSmithyAtlasLv struct {
+ _dataMap map[int32]*GameSmithyAtlasLvData
+ _dataList []*GameSmithyAtlasLvData
+}
+
+func NewGameSmithyAtlasLv(_buf []map[string]interface{}) (*GameSmithyAtlasLv, error) {
+ _dataList := make([]*GameSmithyAtlasLvData, 0, len(_buf))
+ dataMap := make(map[int32]*GameSmithyAtlasLvData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameSmithyAtlasLvData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.AtlasLv] = _v
+ }
+ }
+ return &GameSmithyAtlasLv{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameSmithyAtlasLv) GetDataMap() map[int32]*GameSmithyAtlasLvData {
+ return table._dataMap
+}
+
+func (table *GameSmithyAtlasLv) GetDataList() []*GameSmithyAtlasLvData {
+ return table._dataList
+}
+
+func (table *GameSmithyAtlasLv) Get(key int32) *GameSmithyAtlasLvData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.SmithyAtlasLvData.go b/sys/configure/structs/Game.SmithyAtlasLvData.go
new file mode 100644
index 000000000..94a3a29ed
--- /dev/null
+++ b/sys/configure/structs/Game.SmithyAtlasLvData.go
@@ -0,0 +1,52 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameSmithyAtlasLvData struct {
+ AtlasLv int32
+ AtlasScore int32
+ ItemId []*Gameatn
+}
+
+const TypeId_GameSmithyAtlasLvData = -846785779
+
+func (*GameSmithyAtlasLvData) GetTypeId() int32 {
+ return -846785779
+}
+
+func (_v *GameSmithyAtlasLvData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atlas_lv"].(float64); !_ok_ { err = errors.New("atlas_lv error"); return }; _v.AtlasLv = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atlas_score"].(float64); !_ok_ { err = errors.New("atlas_score error"); return }; _v.AtlasScore = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["item_id"].([]interface{}); !_ok_ { err = errors.New("item_id error"); return }
+
+ _v.ItemId = make([]*Gameatn, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+ _v.ItemId = append(_v.ItemId, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameSmithyAtlasLvData(_buf map[string]interface{}) (*GameSmithyAtlasLvData, error) {
+ v := &GameSmithyAtlasLvData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.SmithyAtlasScore.go b/sys/configure/structs/Game.SmithyAtlasScore.go
new file mode 100644
index 000000000..fd9c7fe7f
--- /dev/null
+++ b/sys/configure/structs/Game.SmithyAtlasScore.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameSmithyAtlasScore struct {
+ _dataMap map[int32]*GameSmithyAtlasScoreData
+ _dataList []*GameSmithyAtlasScoreData
+}
+
+func NewGameSmithyAtlasScore(_buf []map[string]interface{}) (*GameSmithyAtlasScore, error) {
+ _dataList := make([]*GameSmithyAtlasScoreData, 0, len(_buf))
+ dataMap := make(map[int32]*GameSmithyAtlasScoreData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameSmithyAtlasScoreData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameSmithyAtlasScore{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameSmithyAtlasScore) GetDataMap() map[int32]*GameSmithyAtlasScoreData {
+ return table._dataMap
+}
+
+func (table *GameSmithyAtlasScore) GetDataList() []*GameSmithyAtlasScoreData {
+ return table._dataList
+}
+
+func (table *GameSmithyAtlasScore) Get(key int32) *GameSmithyAtlasScoreData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.SmithyAtlasScoreData.go b/sys/configure/structs/Game.SmithyAtlasScoreData.go
new file mode 100644
index 000000000..6aea6b827
--- /dev/null
+++ b/sys/configure/structs/Game.SmithyAtlasScoreData.go
@@ -0,0 +1,41 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameSmithyAtlasScoreData struct {
+ Id int32
+ Quality int32
+ Lv int32
+ Score int32
+}
+
+const TypeId_GameSmithyAtlasScoreData = -793121789
+
+func (*GameSmithyAtlasScoreData) GetTypeId() int32 {
+ return -793121789
+}
+
+func (_v *GameSmithyAtlasScoreData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["quality"].(float64); !_ok_ { err = errors.New("quality error"); return }; _v.Quality = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lv"].(float64); !_ok_ { err = errors.New("lv error"); return }; _v.Lv = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["score"].(float64); !_ok_ { err = errors.New("score error"); return }; _v.Score = int32(_tempNum_) }
+ return
+}
+
+func DeserializeGameSmithyAtlasScoreData(_buf map[string]interface{}) (*GameSmithyAtlasScoreData, error) {
+ v := &GameSmithyAtlasScoreData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.pandsmasexpData.go b/sys/configure/structs/Game.pandsmasexpData.go
index 5ad352ff6..96b29f73f 100644
--- a/sys/configure/structs/Game.pandsmasexpData.go
+++ b/sys/configure/structs/Game.pandsmasexpData.go
@@ -16,6 +16,7 @@ type GamepandsmasexpData struct {
Name string
ReadyID int32
Difficulty int32
+ Numrounds int32
BattleReadyID int32
Captionrecommend []int32
Firstprize []*Gameatn
@@ -41,6 +42,7 @@ func (_v *GamepandsmasexpData)Deserialize(_buf map[string]interface{}) (err erro
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ReadyID"].(float64); !_ok_ { err = errors.New("ReadyID error"); return }; _v.ReadyID = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["difficulty"].(float64); !_ok_ { err = errors.New("difficulty error"); return }; _v.Difficulty = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Numrounds"].(float64); !_ok_ { err = errors.New("Numrounds error"); return }; _v.Numrounds = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) }
{
var _arr_ []interface{}
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index d2557223b..bf1953aca 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -132,7 +132,6 @@ type Tables struct {
Recharge *GameRecharge
PrivilegeCard *GamePrivilegeCard
Privilege *GamePrivilege
- WorldTask *GameWorldTask
Teaching *GameTeaching
HeroStrategy *GameHeroStrategy
FightGlobalEvent *GameFightGlobalEvent
@@ -165,6 +164,9 @@ type Tables struct {
SmithyTool *GameSmithyTool
pandsmasexp *Gamepandsmasexp
SmithyCustomer *GameSmithyCustomer
+ SmithyAtlas *GameSmithyAtlas
+ SmithyAtlasLv *GameSmithyAtlasLv
+ SmithyAtlasScore *GameSmithyAtlasScore
}
func NewTables(loader JsonLoader) (*Tables, error) {
@@ -898,12 +900,6 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.Privilege, err = NewGamePrivilege(buf) ; err != nil {
return nil, err
}
- if buf, err = loader("game_worldtask") ; err != nil {
- return nil, err
- }
- if tables.WorldTask, err = NewGameWorldTask(buf) ; err != nil {
- return nil, err
- }
if buf, err = loader("game_teaching") ; err != nil {
return nil, err
}
@@ -1096,5 +1092,23 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.SmithyCustomer, err = NewGameSmithyCustomer(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_smithyatlas") ; err != nil {
+ return nil, err
+ }
+ if tables.SmithyAtlas, err = NewGameSmithyAtlas(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_smithyatlaslv") ; err != nil {
+ return nil, err
+ }
+ if tables.SmithyAtlasLv, err = NewGameSmithyAtlasLv(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_smithyatlasscore") ; err != nil {
+ return nil, err
+ }
+ if tables.SmithyAtlasScore, err = NewGameSmithyAtlasScore(buf) ; err != nil {
+ return nil, err
+ }
return tables, nil
}
diff --git a/sys/configure/structs/game.equipData.go b/sys/configure/structs/game.equipData.go
index efe9fdae8..3f34c8474 100644
--- a/sys/configure/structs/game.equipData.go
+++ b/sys/configure/structs/game.equipData.go
@@ -14,6 +14,7 @@ type GameEquipData struct {
Id string
EquipId int32
Name string
+ AtlasId string
Suittype int32
Suitintr string
Pos int32
@@ -41,6 +42,7 @@ func (_v *GameEquipData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["equip_id"].(float64); !_ok_ { err = errors.New("equip_id error"); return }; _v.EquipId = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; if _v.AtlasId, _ok_ = _buf["atlas_id"].(string); !_ok_ { err = errors.New("atlas_id error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["suittype"].(float64); !_ok_ { err = errors.New("suittype error"); return }; _v.Suittype = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["suitintr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Suitintr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Suitintr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pos"].(float64); !_ok_ { err = errors.New("pos error"); return }; _v.Pos = int32(_tempNum_) }
diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go
index 5eb796c8d..34ab75167 100644
--- a/sys/configure/structs/game.globalData.go
+++ b/sys/configure/structs/game.globalData.go
@@ -176,6 +176,8 @@ type GameGlobalData struct {
Moonshopmoney []int32
Generaltp *Gameatn
SmithyPurchaseType []int32
+ RaiseTemperature []int32
+ ExemptionTemperatureCos []int32
}
const TypeId_GameGlobalData = 477542761
@@ -753,6 +755,34 @@ 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_)
+ }
+ }
+
return
}
diff --git a/sys/configure/structs/game.heroData.go b/sys/configure/structs/game.heroData.go
index bf46f541e..46b6d6f39 100644
--- a/sys/configure/structs/game.heroData.go
+++ b/sys/configure/structs/game.heroData.go
@@ -32,6 +32,7 @@ type GameHeroData struct {
Cite string
Effectstay []string
Hpspace serialization.Vector3
+ Capskillrule int32
Skill int32
Skill1 int32
Skill2 int32
@@ -109,6 +110,7 @@ func (_v *GameHeroData)Deserialize(_buf map[string]interface{}) (err error) {
_v.Hpspace = serialization.NewVector3(_x_, _y_, _z_)
}
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["capskillrule"].(float64); !_ok_ { err = errors.New("capskillrule error"); return }; _v.Capskillrule = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill"].(float64); !_ok_ { err = errors.New("skill error"); return }; _v.Skill = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill1"].(float64); !_ok_ { err = errors.New("skill1 error"); return }; _v.Skill1 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill2"].(float64); !_ok_ { err = errors.New("skill2 error"); return }; _v.Skill2 = int32(_tempNum_) }