diff --git a/bin/json/game_combatlevel.json b/bin/json/game_combatlevel.json
index ecfa969d0..29eae9ea1 100644
--- a/bin/json/game_combatlevel.json
+++ b/bin/json/game_combatlevel.json
@@ -77,6 +77,8 @@
],
"passformatList": [],
"passdroplist": [
+ 10401,
+ 10402,
10403
],
"award": [
@@ -86,5 +88,146 @@
"n": 1650
}
]
+ },
+ {
+ "id": 10005,
+ "scene": "LevelDemo_Fcamer_1_5",
+ "formatList": [
+ 101011,
+ 101012,
+ 101013
+ ],
+ "droplist": [],
+ "passformatList": [
+ 101011,
+ 101012,
+ 101013
+ ],
+ "passdroplist": [],
+ "award": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1650
+ }
+ ]
+ },
+ {
+ "id": 10006,
+ "scene": "LevelDemo_Fcamer_1_6",
+ "formatList": [
+ 101011,
+ 101012,
+ 101013
+ ],
+ "droplist": [],
+ "passformatList": [
+ 101011,
+ 101012,
+ 101013
+ ],
+ "passdroplist": [],
+ "award": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1650
+ }
+ ]
+ },
+ {
+ "id": 10007,
+ "scene": "LevelDemo_Fcamer_1_7",
+ "formatList": [
+ 101011,
+ 101012,
+ 101013
+ ],
+ "droplist": [],
+ "passformatList": [
+ 101011,
+ 101012,
+ 101013
+ ],
+ "passdroplist": [],
+ "award": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1650
+ }
+ ]
+ },
+ {
+ "id": 10008,
+ "scene": "LevelDemo_Fcamer_1_8",
+ "formatList": [
+ 101011,
+ 101021
+ ],
+ "droplist": [
+ 10301,
+ 10302
+ ],
+ "passformatList": [],
+ "passdroplist": [
+ 10301,
+ 10302
+ ],
+ "award": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1650
+ }
+ ]
+ },
+ {
+ "id": 10009,
+ "scene": "LevelDemo_Fcamer_1_9",
+ "formatList": [
+ 101011,
+ 101021
+ ],
+ "droplist": [
+ 10301,
+ 10302
+ ],
+ "passformatList": [],
+ "passdroplist": [
+ 10301,
+ 10302
+ ],
+ "award": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1650
+ }
+ ]
+ },
+ {
+ "id": 10010,
+ "scene": "LevelDemo_Fcamer_1_10",
+ "formatList": [
+ 101011,
+ 101021
+ ],
+ "droplist": [
+ 10301,
+ 10302
+ ],
+ "passformatList": [],
+ "passdroplist": [
+ 10301,
+ 10302
+ ],
+ "award": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1650
+ }
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_combatmanster.json b/bin/json/game_combatmanster.json
index 1cda05891..c078de435 100644
--- a/bin/json/game_combatmanster.json
+++ b/bin/json/game_combatmanster.json
@@ -1,6 +1,53 @@
[
{
"id": 101011,
+ "type": 1,
+ "sencenstory": [
+ 3000011,
+ 3000012
+ ],
+ "time": 3,
+ "clickstory": 0,
+ "formatList": [
+ 101011
+ ],
+ "award": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1650
+ }
+ ]
+ },
+ {
+ "id": 101012,
+ "type": 1,
+ "sencenstory": [
+ 3000011,
+ 3000012
+ ],
+ "time": 3,
+ "clickstory": 0,
+ "formatList": [
+ 101011
+ ],
+ "award": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1650
+ }
+ ]
+ },
+ {
+ "id": 101013,
+ "type": 1,
+ "sencenstory": [
+ 3000011,
+ 3000012
+ ],
+ "time": 3,
+ "clickstory": 0,
"formatList": [
101011
],
@@ -14,6 +61,13 @@
},
{
"id": 101021,
+ "type": 1,
+ "sencenstory": [
+ 3000011,
+ 3000012
+ ],
+ "time": 3,
+ "clickstory": 0,
"formatList": [
101021
],
@@ -27,6 +81,13 @@
},
{
"id": 110213,
+ "type": 1,
+ "sencenstory": [
+ 3000011,
+ 3000012
+ ],
+ "time": 3,
+ "clickstory": 0,
"formatList": [
101072
],
@@ -40,6 +101,10 @@
},
{
"id": 110214,
+ "type": 1,
+ "sencenstory": [],
+ "time": 0,
+ "clickstory": 0,
"formatList": [
101072
],
@@ -53,6 +118,10 @@
},
{
"id": 110215,
+ "type": 1,
+ "sencenstory": [],
+ "time": 0,
+ "clickstory": 0,
"formatList": [
101072
],
@@ -66,6 +135,10 @@
},
{
"id": 110216,
+ "type": 1,
+ "sencenstory": [],
+ "time": 0,
+ "clickstory": 0,
"formatList": [
101072
],
@@ -79,6 +152,10 @@
},
{
"id": 120031,
+ "type": 1,
+ "sencenstory": [],
+ "time": 0,
+ "clickstory": 0,
"formatList": [
101072
],
@@ -92,6 +169,10 @@
},
{
"id": 120032,
+ "type": 1,
+ "sencenstory": [],
+ "time": 0,
+ "clickstory": 0,
"formatList": [
101072
],
@@ -105,6 +186,10 @@
},
{
"id": 120033,
+ "type": 1,
+ "sencenstory": [],
+ "time": 0,
+ "clickstory": 0,
"formatList": [
101072
],
@@ -118,6 +203,10 @@
},
{
"id": 120034,
+ "type": 1,
+ "sencenstory": [],
+ "time": 0,
+ "clickstory": 0,
"formatList": [
101072
],
@@ -131,6 +220,10 @@
},
{
"id": 120035,
+ "type": 1,
+ "sencenstory": [],
+ "time": 0,
+ "clickstory": 0,
"formatList": [
101072
],
@@ -144,6 +237,10 @@
},
{
"id": 120036,
+ "type": 1,
+ "sencenstory": [],
+ "time": 0,
+ "clickstory": 0,
"formatList": [
101072
],
@@ -157,6 +254,10 @@
},
{
"id": 130011,
+ "type": 1,
+ "sencenstory": [],
+ "time": 0,
+ "clickstory": 0,
"formatList": [
101072
],
@@ -170,6 +271,10 @@
},
{
"id": 130012,
+ "type": 1,
+ "sencenstory": [],
+ "time": 0,
+ "clickstory": 0,
"formatList": [
101072
],
@@ -183,6 +288,10 @@
},
{
"id": 130013,
+ "type": 1,
+ "sencenstory": [],
+ "time": 0,
+ "clickstory": 0,
"formatList": [
101072
],
@@ -193,5 +302,41 @@
"n": 1650
}
]
+ },
+ {
+ "id": 200001,
+ "type": 2,
+ "sencenstory": [
+ 3000011,
+ 3000012
+ ],
+ "time": 3,
+ "clickstory": 100002,
+ "formatList": [],
+ "award": []
+ },
+ {
+ "id": 200002,
+ "type": 2,
+ "sencenstory": [
+ 3000011,
+ 3000012
+ ],
+ "time": 3,
+ "clickstory": 100002,
+ "formatList": [],
+ "award": []
+ },
+ {
+ "id": 200003,
+ "type": 2,
+ "sencenstory": [
+ 3000011,
+ 3000012
+ ],
+ "time": 3,
+ "clickstory": 100002,
+ "formatList": [],
+ "award": []
}
]
\ No newline at end of file
diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index 80cefbaaf..e1ca23070 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -280,9 +280,9 @@
],
"run_horsetime1": 3,
"run_horsetime2": 10,
- "boy_headPortrait": "action_44006",
- "girl_headPortrait": "action_11011",
- "namecolor": "#000080",
+ "boy_headPortrait": "ytx_js_45003",
+ "girl_headPortrait": "action_44005",
+ "namecolor": "#FFFF00",
"skillGetLocation": [
114
],
@@ -295,6 +295,16 @@
10
],
"DrawCard_ContinuousRestriction_Star5": 20,
- "DrawCard_ContinuousRestriction_Camp": 2
+ "DrawCard_ContinuousRestriction_Camp": 2,
+ "EquipmentConsumption": [
+ 1000,
+ 2000,
+ 3000,
+ 4000,
+ 5000,
+ 6000
+ ],
+ "DrawCard_supplement1": 1000001,
+ "DrawCard_supplement10": 1000002
}
]
\ No newline at end of file
diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json
index 724974408..7772c3fdf 100644
--- a/bin/json/game_rdtaskcondi.json
+++ b/bin/json/game_rdtaskcondi.json
@@ -1076,6 +1076,17 @@
"data4": 4,
"data5": 4
},
+ {
+ "id": 194,
+ "datatype": 2,
+ "type": 138,
+ "inited": [],
+ "data1": 30,
+ "data2": 0,
+ "data3": 0,
+ "data4": 0,
+ "data5": 0
+ },
{
"id": 10001,
"datatype": 2,
diff --git a/bin/json/game_shop.json b/bin/json/game_shop.json
index cb016be14..7a14852e2 100644
--- a/bin/json/game_shop.json
+++ b/bin/json/game_shop.json
@@ -34,13 +34,13 @@
],
"shopitem": [
10001,
- 10001,
- 10001,
- 10001,
- 10001,
- 10001,
- 10001,
- 10001
+ 10002,
+ 10003,
+ 10004,
+ 10005,
+ 10006,
+ 10007,
+ 10008
]
},
{
@@ -48,7 +48,7 @@
"tab": 2,
"shopname": {
"key": "shop_2",
- "text": "友情商店"
+ "text": "钻石商店"
},
"upper_shop": {
"key": "",
@@ -72,14 +72,7 @@
"rneed": [],
"shopitem": [
20001,
- 20002,
- 20003,
- 20004,
- 20005,
- 20006,
- 20007,
- 20008,
- 20009
+ 20002
]
},
{
@@ -87,7 +80,7 @@
"tab": 3,
"shopname": {
"key": "shop_3",
- "text": "PVP商店"
+ "text": "友情商店"
},
"upper_shop": {
"key": "shop_title1",
@@ -96,7 +89,7 @@
"needshow": [
{
"a": "attr",
- "t": "gold",
+ "t": "friend",
"n": 1
},
{
@@ -105,7 +98,7 @@
"n": 1
}
],
- "rtype": 3,
+ "rtype": 2,
"rtime": 1,
"rnum": -1,
"rneed": [],
@@ -120,7 +113,7 @@
"tab": 4,
"shopname": {
"key": "shop_4",
- "text": "PVE商店"
+ "text": "竞技商店"
},
"upper_shop": {
"key": "shop_title1",
@@ -129,7 +122,7 @@
"needshow": [
{
"a": "attr",
- "t": "gold",
+ "t": "arenacoin",
"n": 1
},
{
@@ -144,7 +137,48 @@
"rneed": [],
"shopitem": [
40001,
- 40002
+ 40002,
+ 40003,
+ 40004,
+ 40005,
+ 40006
+ ]
+ },
+ {
+ "shopid": 5,
+ "tab": 5,
+ "shopname": {
+ "key": "shop_5",
+ "text": "公会商店"
+ },
+ "upper_shop": {
+ "key": "shop_title1",
+ "text": "玩法商店"
+ },
+ "needshow": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 1
+ }
+ ],
+ "rtype": 3,
+ "rtime": 1,
+ "rnum": -1,
+ "rneed": [],
+ "shopitem": [
+ 50001,
+ 50002,
+ 50003,
+ 50004,
+ 50005,
+ 50006,
+ 50007
]
}
]
\ No newline at end of file
diff --git a/bin/json/game_shopitem.json b/bin/json/game_shopitem.json
index bbf788283..58a4cb81f 100644
--- a/bin/json/game_shopitem.json
+++ b/bin/json/game_shopitem.json
@@ -28,7 +28,7 @@
1000
],
"buyminnum": 1,
- "buymaxnum": 10,
+ "buymaxnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
@@ -64,7 +64,7 @@
1000
],
"buyminnum": 1,
- "buymaxnum": 10,
+ "buymaxnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
@@ -100,7 +100,7 @@
1000
],
"buyminnum": 1,
- "buymaxnum": 10,
+ "buymaxnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
@@ -136,7 +136,7 @@
1000
],
"buyminnum": 1,
- "buymaxnum": 10,
+ "buymaxnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
@@ -172,7 +172,7 @@
1000
],
"buyminnum": 1,
- "buymaxnum": 10,
+ "buymaxnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
@@ -208,7 +208,7 @@
1000
],
"buyminnum": 1,
- "buymaxnum": 10,
+ "buymaxnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
@@ -244,7 +244,7 @@
1000
],
"buyminnum": 1,
- "buymaxnum": 10,
+ "buymaxnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
@@ -280,7 +280,7 @@
1000
],
"buyminnum": 1,
- "buymaxnum": 10,
+ "buymaxnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
@@ -316,7 +316,7 @@
1000
],
"buyminnum": 1,
- "buymaxnum": 10,
+ "buymaxnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
@@ -352,7 +352,7 @@
1000
],
"buyminnum": 1,
- "buymaxnum": 10,
+ "buymaxnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
@@ -388,7 +388,7 @@
1000
],
"buyminnum": 1,
- "buymaxnum": 10,
+ "buymaxnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
@@ -424,7 +424,7 @@
1000
],
"buyminnum": 1,
- "buymaxnum": 10,
+ "buymaxnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
@@ -460,7 +460,7 @@
1000
],
"buyminnum": 1,
- "buymaxnum": 10,
+ "buymaxnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
@@ -496,7 +496,7 @@
1000
],
"buyminnum": 1,
- "buymaxnum": 10,
+ "buymaxnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
@@ -532,7 +532,7 @@
1000
],
"buyminnum": 1,
- "buymaxnum": 10,
+ "buymaxnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
@@ -568,7 +568,7 @@
1000
],
"buyminnum": 1,
- "buymaxnum": 10,
+ "buymaxnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
@@ -604,7 +604,7 @@
1000
],
"buyminnum": 1,
- "buymaxnum": 10,
+ "buymaxnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
@@ -640,7 +640,7 @@
1000
],
"buyminnum": 1,
- "buymaxnum": 10,
+ "buymaxnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
@@ -676,7 +676,7 @@
1000
],
"buyminnum": 1,
- "buymaxnum": 10,
+ "buymaxnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
@@ -712,7 +712,7 @@
1000
],
"buyminnum": 1,
- "buymaxnum": 10,
+ "buymaxnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
@@ -748,7 +748,7 @@
1000
],
"buyminnum": 1,
- "buymaxnum": 10,
+ "buymaxnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
@@ -757,21 +757,21 @@
},
{
"key": 22,
- "id": 20001,
+ "id": 10002,
"iteminfo": [
{
- "a": "hero",
- "t": "43901",
+ "a": "equi",
+ "t": "10031",
"n": 1
}
],
- "preview": false,
+ "preview": true,
"probability": 1000,
"need": [
{
"a": "attr",
"t": "gold",
- "n": 200000
+ "n": 50000
}
],
"sale": 1000,
@@ -783,332 +783,332 @@
1000,
1000
],
- "buyminnum": 3,
- "buymaxnum": 50,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 23,
- "id": 20002,
- "iteminfo": [
- {
- "a": "hero",
- "t": "43902",
- "n": 1
- }
- ],
- "preview": false,
- "probability": 1000,
- "need": [
- {
- "a": "attr",
- "t": "gold",
- "n": 200000
- }
- ],
- "sale": 1000,
- "salelist": [
- 1000,
- 1000,
- 1000,
- 1000,
- 1000,
- 1000
- ],
- "buyminnum": 3,
- "buymaxnum": 50,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 24,
- "id": 20003,
- "iteminfo": [
- {
- "a": "hero",
- "t": "43903",
- "n": 1
- }
- ],
- "preview": false,
- "probability": 1000,
- "need": [
- {
- "a": "attr",
- "t": "gold",
- "n": 200000
- }
- ],
- "sale": 1000,
- "salelist": [
- 1000,
- 1000,
- 1000,
- 1000,
- 1000,
- 1000
- ],
- "buyminnum": 3,
- "buymaxnum": 50,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 25,
- "id": 20004,
- "iteminfo": [
- {
- "a": "hero",
- "t": "42911",
- "n": 1
- }
- ],
- "preview": false,
- "probability": 1000,
- "need": [
- {
- "a": "attr",
- "t": "gold",
- "n": 200000
- }
- ],
- "sale": 1000,
- "salelist": [
- 1000,
- 1000,
- 1000,
- 1000,
- 1000,
- 1000
- ],
- "buyminnum": 3,
- "buymaxnum": 50,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 26,
- "id": 20005,
- "iteminfo": [
- {
- "a": "hero",
- "t": "43911",
- "n": 1
- }
- ],
- "preview": false,
- "probability": 1000,
- "need": [
- {
- "a": "attr",
- "t": "gold",
- "n": 200000
- }
- ],
- "sale": 1000,
- "salelist": [
- 1000,
- 1000,
- 1000,
- 1000,
- 1000,
- 1000
- ],
- "buyminnum": 3,
- "buymaxnum": 50,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 27,
- "id": 20006,
- "iteminfo": [
- {
- "a": "hero",
- "t": "44911",
- "n": 1
- }
- ],
- "preview": false,
- "probability": 1000,
- "need": [
- {
- "a": "attr",
- "t": "gold",
- "n": 200000
- }
- ],
- "sale": 1000,
- "salelist": [
- 1000,
- 1000,
- 1000,
- 1000,
- 1000,
- 1000
- ],
- "buyminnum": 3,
- "buymaxnum": 50,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 28,
- "id": 20007,
- "iteminfo": [
- {
- "a": "hero",
- "t": "43921",
- "n": 1
- }
- ],
- "preview": false,
- "probability": 1000,
- "need": [
- {
- "a": "attr",
- "t": "gold",
- "n": 200000
- }
- ],
- "sale": 1000,
- "salelist": [
- 1000,
- 1000,
- 1000,
- 1000,
- 1000,
- 1000
- ],
- "buyminnum": 3,
- "buymaxnum": 50,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 29,
- "id": 20008,
- "iteminfo": [
- {
- "a": "hero",
- "t": "44921",
- "n": 1
- }
- ],
- "preview": false,
- "probability": 1000,
- "need": [
- {
- "a": "attr",
- "t": "gold",
- "n": 200000
- }
- ],
- "sale": 1000,
- "salelist": [
- 1000,
- 1000,
- 1000,
- 1000,
- 1000,
- 1000
- ],
- "buyminnum": 3,
- "buymaxnum": 50,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 30,
- "id": 20009,
- "iteminfo": [
- {
- "a": "hero",
- "t": "45921",
- "n": 1
- }
- ],
- "preview": false,
- "probability": 1000,
- "need": [
- {
- "a": "attr",
- "t": "gold",
- "n": 200000
- }
- ],
- "sale": 1000,
- "salelist": [
- 1000,
- 1000,
- 1000,
- 1000,
- 1000,
- 1000
- ],
- "buyminnum": 3,
- "buymaxnum": 50,
- "vip": 0,
- "lvmin": 1,
- "lvmax": 60,
- "mapidmin": 101,
- "mapidmax": 9999
- },
- {
- "key": 31,
- "id": 30001,
- "iteminfo": [
- {
- "a": "item",
- "t": "60001",
- "n": 1
- }
- ],
- "preview": false,
- "probability": 1000,
- "need": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 350
- }
- ],
- "sale": 800,
- "salelist": [
- 1000,
- 1000,
- 1000,
- 1000,
- 1000,
- 1000
- ],
"buyminnum": 1,
- "buymaxnum": 10,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 23,
+ "id": 10002,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10032",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 24,
+ "id": 10002,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10033",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 25,
+ "id": 10002,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10034",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 26,
+ "id": 10002,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10035",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 27,
+ "id": 10002,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10036",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 28,
+ "id": 10002,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10041",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 29,
+ "id": 10002,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10042",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 30,
+ "id": 10002,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10043",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 31,
+ "id": 10002,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10044",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
@@ -1117,21 +1117,21 @@
},
{
"key": 32,
- "id": 30002,
+ "id": 10002,
"iteminfo": [
{
- "a": "item",
- "t": "60002",
+ "a": "equi",
+ "t": "10045",
"n": 1
}
],
- "preview": false,
- "probability": 1000,
+ "preview": true,
+ "probability": 500,
"need": [
{
"a": "attr",
- "t": "diamond",
- "n": 200
+ "t": "gold",
+ "n": 150000
}
],
"sale": 1000,
@@ -1143,8 +1143,8 @@
1000,
1000
],
- "buyminnum": 2,
- "buymaxnum": 10,
+ "buyminnum": 1,
+ "buymaxnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
@@ -1153,21 +1153,21 @@
},
{
"key": 33,
- "id": 30003,
+ "id": 10002,
"iteminfo": [
{
- "a": "item",
- "t": "60003",
+ "a": "equi",
+ "t": "10046",
"n": 1
}
],
- "preview": false,
- "probability": 1000,
+ "preview": true,
+ "probability": 500,
"need": [
{
"a": "attr",
- "t": "diamond",
- "n": 2100
+ "t": "gold",
+ "n": 150000
}
],
"sale": 1000,
@@ -1179,8 +1179,8 @@
1000,
1000
],
- "buyminnum": 2,
- "buymaxnum": 10,
+ "buyminnum": 1,
+ "buymaxnum": 1,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
@@ -1189,7 +1189,4867 @@
},
{
"key": 34,
- "id": 40001,
+ "id": 10002,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10051",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 35,
+ "id": 10002,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10052",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 36,
+ "id": 10002,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10053",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 37,
+ "id": 10002,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10054",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 38,
+ "id": 10002,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10055",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 39,
+ "id": 10002,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10056",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 40,
+ "id": 10002,
+ "iteminfo": [
+ {
+ "a": "hero",
+ "t": "43901",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 41,
+ "id": 10002,
+ "iteminfo": [
+ {
+ "a": "hero",
+ "t": "42911",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 42,
+ "id": 10002,
+ "iteminfo": [
+ {
+ "a": "item",
+ "t": "30001",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 200,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 200000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 43,
+ "id": 10003,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10031",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 44,
+ "id": 10003,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10032",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 45,
+ "id": 10003,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10033",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 46,
+ "id": 10003,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10034",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 47,
+ "id": 10003,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10035",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 48,
+ "id": 10003,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10036",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 49,
+ "id": 10003,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10041",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 50,
+ "id": 10003,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10042",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 51,
+ "id": 10003,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10043",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 52,
+ "id": 10003,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10044",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 53,
+ "id": 10003,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10045",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 54,
+ "id": 10003,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10046",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 55,
+ "id": 10003,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10051",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 56,
+ "id": 10003,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10052",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 57,
+ "id": 10003,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10053",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 58,
+ "id": 10003,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10054",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 59,
+ "id": 10003,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10055",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 60,
+ "id": 10003,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10056",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 61,
+ "id": 10003,
+ "iteminfo": [
+ {
+ "a": "hero",
+ "t": "43901",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 62,
+ "id": 10003,
+ "iteminfo": [
+ {
+ "a": "hero",
+ "t": "42911",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 63,
+ "id": 10003,
+ "iteminfo": [
+ {
+ "a": "item",
+ "t": "30001",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 200,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 200000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 64,
+ "id": 10004,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10031",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 65,
+ "id": 10004,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10032",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 66,
+ "id": 10004,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10033",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 67,
+ "id": 10004,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10034",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 68,
+ "id": 10004,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10035",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 69,
+ "id": 10004,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10036",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 70,
+ "id": 10004,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10041",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 71,
+ "id": 10004,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10042",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 72,
+ "id": 10004,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10043",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 73,
+ "id": 10004,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10044",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 74,
+ "id": 10004,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10045",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 75,
+ "id": 10004,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10046",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 76,
+ "id": 10004,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10051",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 77,
+ "id": 10004,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10052",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 78,
+ "id": 10004,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10053",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 79,
+ "id": 10004,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10054",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 80,
+ "id": 10004,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10055",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 81,
+ "id": 10004,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10056",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 82,
+ "id": 10004,
+ "iteminfo": [
+ {
+ "a": "hero",
+ "t": "43901",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 83,
+ "id": 10004,
+ "iteminfo": [
+ {
+ "a": "hero",
+ "t": "42911",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 84,
+ "id": 10004,
+ "iteminfo": [
+ {
+ "a": "item",
+ "t": "30001",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 200,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 200000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 85,
+ "id": 10005,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10031",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 86,
+ "id": 10005,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10032",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 87,
+ "id": 10005,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10033",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 88,
+ "id": 10005,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10034",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 89,
+ "id": 10005,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10035",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 90,
+ "id": 10005,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10036",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 91,
+ "id": 10005,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10041",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 92,
+ "id": 10005,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10042",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 93,
+ "id": 10005,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10043",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 94,
+ "id": 10005,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10044",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 95,
+ "id": 10005,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10045",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 96,
+ "id": 10005,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10046",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 97,
+ "id": 10005,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10051",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 98,
+ "id": 10005,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10052",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 99,
+ "id": 10005,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10053",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 100,
+ "id": 10005,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10054",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 101,
+ "id": 10005,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10055",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 102,
+ "id": 10005,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10056",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 103,
+ "id": 10005,
+ "iteminfo": [
+ {
+ "a": "hero",
+ "t": "43901",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 104,
+ "id": 10005,
+ "iteminfo": [
+ {
+ "a": "hero",
+ "t": "42911",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 105,
+ "id": 10005,
+ "iteminfo": [
+ {
+ "a": "item",
+ "t": "30001",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 200,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 200000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 106,
+ "id": 10006,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10031",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 107,
+ "id": 10006,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10032",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 108,
+ "id": 10006,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10033",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 109,
+ "id": 10006,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10034",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 110,
+ "id": 10006,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10035",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 111,
+ "id": 10006,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10036",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 112,
+ "id": 10006,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10041",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 113,
+ "id": 10006,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10042",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 114,
+ "id": 10006,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10043",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 115,
+ "id": 10006,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10044",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 116,
+ "id": 10006,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10045",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 117,
+ "id": 10006,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10046",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 118,
+ "id": 10006,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10051",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 119,
+ "id": 10006,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10052",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 120,
+ "id": 10006,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10053",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 121,
+ "id": 10006,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10054",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 122,
+ "id": 10006,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10055",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 123,
+ "id": 10006,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10056",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 124,
+ "id": 10006,
+ "iteminfo": [
+ {
+ "a": "hero",
+ "t": "43901",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 125,
+ "id": 10006,
+ "iteminfo": [
+ {
+ "a": "hero",
+ "t": "42911",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 126,
+ "id": 10006,
+ "iteminfo": [
+ {
+ "a": "item",
+ "t": "30001",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 200,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 200000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 127,
+ "id": 10007,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10031",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 128,
+ "id": 10007,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10032",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 129,
+ "id": 10007,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10033",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 130,
+ "id": 10007,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10034",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 131,
+ "id": 10007,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10035",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 132,
+ "id": 10007,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10036",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 133,
+ "id": 10007,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10041",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 134,
+ "id": 10007,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10042",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 135,
+ "id": 10007,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10043",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 136,
+ "id": 10007,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10044",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 137,
+ "id": 10007,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10045",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 138,
+ "id": 10007,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10046",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 139,
+ "id": 10007,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10051",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 140,
+ "id": 10007,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10052",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 141,
+ "id": 10007,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10053",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 142,
+ "id": 10007,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10054",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 143,
+ "id": 10007,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10055",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 144,
+ "id": 10007,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10056",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 145,
+ "id": 10007,
+ "iteminfo": [
+ {
+ "a": "hero",
+ "t": "43901",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 146,
+ "id": 10007,
+ "iteminfo": [
+ {
+ "a": "hero",
+ "t": "42911",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 147,
+ "id": 10007,
+ "iteminfo": [
+ {
+ "a": "item",
+ "t": "30001",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 200,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 200000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 148,
+ "id": 10008,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10031",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 149,
+ "id": 10008,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10032",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 150,
+ "id": 10008,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10033",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 151,
+ "id": 10008,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10034",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 152,
+ "id": 10008,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10035",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 153,
+ "id": 10008,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10036",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 154,
+ "id": 10008,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10041",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 155,
+ "id": 10008,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10042",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 156,
+ "id": 10008,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10043",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 157,
+ "id": 10008,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10044",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 158,
+ "id": 10008,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10045",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 159,
+ "id": 10008,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10046",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 500,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 160,
+ "id": 10008,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10051",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 161,
+ "id": 10008,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10052",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 162,
+ "id": 10008,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10053",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 163,
+ "id": 10008,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10054",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 164,
+ "id": 10008,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10055",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 165,
+ "id": 10008,
+ "iteminfo": [
+ {
+ "a": "equi",
+ "t": "10056",
+ "n": 1
+ }
+ ],
+ "preview": true,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 450000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 166,
+ "id": 10008,
+ "iteminfo": [
+ {
+ "a": "hero",
+ "t": "43901",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 50000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 167,
+ "id": 10008,
+ "iteminfo": [
+ {
+ "a": "hero",
+ "t": "42911",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 250,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 150000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 168,
+ "id": 10008,
+ "iteminfo": [
+ {
+ "a": "item",
+ "t": "30001",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 200,
+ "need": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 200000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 169,
+ "id": 20001,
"iteminfo": [
{
"a": "item",
@@ -1224,8 +6084,8 @@
"mapidmax": 9999
},
{
- "key": 35,
- "id": 40002,
+ "key": 170,
+ "id": 20002,
"iteminfo": [
{
"a": "attr",
@@ -1258,5 +6118,653 @@
"lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999
+ },
+ {
+ "key": 171,
+ "id": 30001,
+ "iteminfo": [
+ {
+ "a": "hero",
+ "t": "43921",
+ "n": 100
+ }
+ ],
+ "preview": false,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "friend",
+ "n": 100
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 172,
+ "id": 30002,
+ "iteminfo": [
+ {
+ "a": "hero",
+ "t": "43901",
+ "n": 100
+ }
+ ],
+ "preview": false,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "friend",
+ "n": 100
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 173,
+ "id": 30003,
+ "iteminfo": [
+ {
+ "a": "hero",
+ "t": "42911",
+ "n": 100
+ }
+ ],
+ "preview": false,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "friend",
+ "n": 50
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 174,
+ "id": 40001,
+ "iteminfo": [
+ {
+ "a": "hero",
+ "t": "45921",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "arenacoin",
+ "n": 1000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 175,
+ "id": 40002,
+ "iteminfo": [
+ {
+ "a": "hero",
+ "t": "43903",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "arenacoin",
+ "n": 1000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 176,
+ "id": 40003,
+ "iteminfo": [
+ {
+ "a": "item",
+ "t": "30001",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "arenacoin",
+ "n": 200
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 2,
+ "buymaxnum": 2,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 177,
+ "id": 40004,
+ "iteminfo": [
+ {
+ "a": "hero",
+ "t": "44921",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "arenacoin",
+ "n": 200
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 2,
+ "buymaxnum": 2,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 178,
+ "id": 40005,
+ "iteminfo": [
+ {
+ "a": "hero",
+ "t": "43902",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "arenacoin",
+ "n": 200
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 2,
+ "buymaxnum": 2,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 179,
+ "id": 40006,
+ "iteminfo": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
+ }
+ ],
+ "preview": false,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "arenacoin",
+ "n": 50
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 180,
+ "id": 50001,
+ "iteminfo": [
+ {
+ "a": "item",
+ "t": "30001",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 1001,
+ "need": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 400
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 181,
+ "id": 50002,
+ "iteminfo": [
+ {
+ "a": "item",
+ "t": "30001",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 1002,
+ "need": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 400
+ }
+ ],
+ "sale": 700,
+ "salelist": [
+ 700,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 182,
+ "id": 50003,
+ "iteminfo": [
+ {
+ "a": "item",
+ "t": "30002",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 1003,
+ "need": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 400
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 3,
+ "buymaxnum": 3,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 183,
+ "id": 50004,
+ "iteminfo": [
+ {
+ "a": "item",
+ "t": "30003",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 1004,
+ "need": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 400
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 3,
+ "buymaxnum": 3,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 184,
+ "id": 50005,
+ "iteminfo": [
+ {
+ "a": "item",
+ "t": "30004",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 1005,
+ "need": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 400
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 3,
+ "buymaxnum": 3,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 185,
+ "id": 50006,
+ "iteminfo": [
+ {
+ "a": "hero",
+ "t": "43902",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 1006,
+ "need": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 300
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 186,
+ "id": 50007,
+ "iteminfo": [
+ {
+ "a": "hero",
+ "t": "43903",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 1007,
+ "need": [
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 1500
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 1,
+ "buymaxnum": 1,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 187,
+ "id": 1000001,
+ "iteminfo": [
+ {
+ "a": "item",
+ "t": "30001",
+ "n": 1
+ }
+ ],
+ "preview": false,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 0,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 600,
+ "buymaxnum": 600,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
+ },
+ {
+ "key": 188,
+ "id": 1000002,
+ "iteminfo": [
+ {
+ "a": "item",
+ "t": "30001",
+ "n": 10
+ }
+ ],
+ "preview": false,
+ "probability": 1000,
+ "need": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 2000
+ }
+ ],
+ "sale": 1000,
+ "salelist": [
+ 500,
+ 1000,
+ 1000,
+ 1000,
+ 1000,
+ 1000
+ ],
+ "buyminnum": 600,
+ "buymaxnum": 600,
+ "vip": 0,
+ "lvmin": 1,
+ "lvmax": 60,
+ "mapidmin": 101,
+ "mapidmax": 9999
}
]
\ No newline at end of file
diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index f3913f79a..54ab8239e 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -11,7 +11,7 @@
"task_display": "新剧情文本10100",
"npc": [
"scenes_ boundary_02",
- "阿宝起身入场",
+ "杰克",
"150"
],
"getafter_event": [
@@ -94,7 +94,7 @@
"task_display": "新剧情文本10103",
"npc": [
"dreamwork_restaurant_01",
- "阿宝组件名",
+ "波比组件名",
"140"
],
"getafter_event": [
@@ -153,7 +153,7 @@
"task_display": "新剧情文本10105",
"npc": [
"scenes_ boundary_02",
- "阿宝组件名",
+ "杰克",
"150"
],
"getafter_event": [
@@ -177,7 +177,7 @@
"task_display": "新剧情文本10106",
"npc": [
"scenes_ boundary_02",
- "阿宝组件名",
+ "杰克",
"150"
],
"getafter_event": [
@@ -201,7 +201,7 @@
"task_display": "新剧情文本10107",
"npc": [
"scenes_ boundary_02",
- "阿宝组件名",
+ "杰克",
"150"
],
"getafter_event": [
@@ -225,7 +225,7 @@
"task_display": "新剧情文本10108",
"npc": [
"scenes_ boundary_02",
- "阿宝组件名",
+ "杰克",
"150"
],
"getafter_event": [
@@ -304,7 +304,7 @@
2,
100012
],
- "completetask": 175,
+ "completetask": 184,
"auto_accept": 1,
"overtips": 1,
"reword": []
@@ -352,7 +352,7 @@
2,
100014
],
- "completetask": 0,
+ "completetask": 185,
"auto_accept": 1,
"overtips": 1,
"reword": []
@@ -393,7 +393,7 @@
"task_display": "新剧情文本10115",
"npc": [
"scenes_boundary_02night",
- "阿宝夜晚组件名",
+ "瓜哥夜晚组件名",
"153"
],
"getafter_event": [
@@ -417,7 +417,7 @@
"task_display": "新剧情文本10116",
"npc": [
"scenes_boundary_02night",
- "阿宝组件名",
+ "杰克",
"150"
],
"getafter_event": [
@@ -441,7 +441,7 @@
"task_display": "新剧情文本10117",
"npc": [
"scenes_ boundary_02",
- "瓜哥主城组件名",
+ "杰克",
"150"
],
"getafter_event": [
@@ -465,7 +465,7 @@
"task_display": "新剧情文本10118",
"npc": [
"scenes_ boundary_02",
- "瓜哥主城组件名",
+ "杰克",
"150"
],
"getafter_event": [
@@ -489,7 +489,7 @@
"task_display": "新剧情文本10119",
"npc": [
"scenes_ boundary_02",
- "阿宝维京区",
+ "瓜哥维京区",
"151"
],
"getafter_event": [
@@ -513,7 +513,7 @@
"task_display": "新剧情文本10120",
"npc": [
"scenes_ boundary_02",
- "阿宝维京区",
+ "瓜哥维京区",
"151"
],
"getafter_event": [
@@ -537,14 +537,14 @@
"task_display": "新剧情文本10121",
"npc": [
"scenes_ boundary_02",
- "阿宝维京区",
+ "瓜哥维京区",
"151"
],
"getafter_event": [
2,
100022
],
- "completetask": 0,
+ "completetask": 186,
"auto_accept": 1,
"overtips": 1,
"reword": []
@@ -561,7 +561,7 @@
"task_display": "新剧情文本10122",
"npc": [
"scenes_ boundary_02",
- "阿宝维京区",
+ "瓜哥维京区",
"151"
],
"getafter_event": [
@@ -585,7 +585,7 @@
"task_display": "新剧情文本10123",
"npc": [
"scenes_ boundary_02",
- "阿宝维京区",
+ "瓜哥维京区",
"151"
],
"getafter_event": [
@@ -616,7 +616,7 @@
2,
100025
],
- "completetask": 176,
+ "completetask": 195,
"auto_accept": 1,
"overtips": 1,
"reword": []
@@ -664,7 +664,7 @@
2,
100027
],
- "completetask": 177,
+ "completetask": 196,
"auto_accept": 1,
"overtips": 1,
"reword": []
@@ -688,7 +688,7 @@
2,
100028
],
- "completetask": 178,
+ "completetask": 197,
"auto_accept": 1,
"overtips": 1,
"reword": []
@@ -760,7 +760,7 @@
2,
100031
],
- "completetask": 158,
+ "completetask": 198,
"auto_accept": 1,
"overtips": 1,
"reword": []
@@ -777,7 +777,7 @@
"task_display": "新剧情文本10131",
"npc": [
"scenes_ boundary_02",
- "阿宝组件名",
+ "瓜哥维京区",
"151"
],
"getafter_event": [
@@ -801,7 +801,7 @@
"task_display": "新剧情文本10132",
"npc": [
"scenes_ boundary_02",
- "阿宝组件名",
+ "杰克",
"150"
],
"getafter_event": [
@@ -825,7 +825,7 @@
"task_display": "新剧情文本10133",
"npc": [
"scenes_ boundary_02",
- "阿宝组件名",
+ "杰克",
"150"
],
"getafter_event": [
@@ -849,7 +849,7 @@
"task_display": "新剧情文本10134",
"npc": [
"scenes_ boundary_02",
- "阿宝组件名",
+ "杰克",
"150"
],
"getafter_event": [
@@ -873,7 +873,7 @@
"task_display": "新剧情文本10135",
"npc": [
"scenes_ boundary_02",
- "阿宝组件名",
+ "杰克",
"150"
],
"getafter_event": [
@@ -897,7 +897,7 @@
"task_display": "新剧情文本10136",
"npc": [
"scenes_ boundary_02",
- "阿宝现代区",
+ "瓜哥现代区",
"152"
],
"getafter_event": [
@@ -969,7 +969,7 @@
"task_display": "新剧情文本10139",
"npc": [
"scenes_ boundary_02",
- "阿宝现代区",
+ "瓜哥现代区",
"152"
],
"getafter_event": [
@@ -993,7 +993,7 @@
"task_display": "新剧情文本10140",
"npc": [
"scenes_ boundary_02",
- "阿宝现代区",
+ "瓜哥现代区",
"152"
],
"getafter_event": [
@@ -1017,14 +1017,14 @@
"task_display": "新剧情文本10141",
"npc": [
"scenes_ boundary_02",
- "阿宝现代区",
+ "瓜哥现代区",
"152"
],
"getafter_event": [
2,
100043
],
- "completetask": 180,
+ "completetask": 199,
"auto_accept": 1,
"overtips": 1,
"reword": []
@@ -1041,7 +1041,7 @@
"task_display": "新剧情文本10142",
"npc": [
"scenes_ boundary_02",
- "阿宝现代区",
+ "瓜哥现代区",
"152"
],
"getafter_event": [
@@ -1065,7 +1065,7 @@
"task_display": "新剧情文本10143",
"npc": [
"scenes_ boundary_02",
- "阿宝现代区",
+ "瓜哥现代区",
"152"
],
"getafter_event": [
@@ -1089,7 +1089,7 @@
"task_display": "新剧情文本10144",
"npc": [
"scenes_ boundary_02",
- "阿宝现代区",
+ "瓜哥现代区",
"152"
],
"getafter_event": [
@@ -1113,7 +1113,7 @@
"task_display": "新剧情文本10145",
"npc": [
"scenes_ boundary_02",
- "阿宝现代区",
+ "瓜哥现代区",
"152"
],
"getafter_event": [
@@ -1137,7 +1137,7 @@
"task_display": "新剧情文本10146",
"npc": [
"scenes_ boundary_02",
- "阿宝组件名",
+ "杰克",
"150"
],
"getafter_event": [
@@ -1161,7 +1161,7 @@
"task_display": "新剧情文本10147",
"npc": [
"scenes_ boundary_02",
- "阿宝组件名",
+ "杰克",
"150"
],
"getafter_event": [
@@ -1185,7 +1185,7 @@
"task_display": "新剧情文本10148",
"npc": [
"scenes_ boundary_02",
- "阿宝组件名",
+ "杰克",
"150"
],
"getafter_event": [
@@ -1209,7 +1209,7 @@
"task_display": "新剧情文本10149",
"npc": [
"scenes_ boundary_02",
- "阿宝组件名",
+ "杰克",
"150"
],
"getafter_event": [
@@ -1233,7 +1233,7 @@
"task_display": "新剧情文本10150",
"npc": [
"scenes_ boundary_02",
- "阿宝组件名",
+ "杰克",
"150"
],
"getafter_event": [
@@ -1257,7 +1257,7 @@
"task_display": "新剧情文本10151",
"npc": [
"scenes_ boundary_02",
- "阿宝组件名",
+ "杰克",
"150"
],
"getafter_event": [
@@ -1281,7 +1281,7 @@
"task_display": "新剧情文本10152",
"npc": [
"scenes_ boundary_02",
- "阿宝组件名",
+ "杰克",
"150"
],
"getafter_event": [
@@ -1305,7 +1305,7 @@
"task_display": "新剧情文本10153",
"npc": [
"scenes_martialarts_01",
- "武馆熊貓",
+ "武馆杰克 ",
"137"
],
"getafter_event": [
@@ -1329,7 +1329,7 @@
"task_display": "新剧情文本10154",
"npc": [
"scenes_martialarts_01",
- "武馆熊貓",
+ "武馆杰克 ",
"137"
],
"getafter_event": [
@@ -1353,7 +1353,7 @@
"task_display": "新剧情文本10155",
"npc": [
"scenes_martialarts_01",
- "武馆熊貓",
+ "武馆杰克 ",
"137"
],
"getafter_event": [
@@ -1377,7 +1377,7 @@
"task_display": "新剧情文本10156",
"npc": [
"scenes_martialarts_01",
- "武馆熊貓",
+ "武馆杰克 ",
"137"
],
"getafter_event": [
@@ -1401,7 +1401,7 @@
"task_display": "新剧情文本10157",
"npc": [
"scenes_martialarts_01",
- "武馆熊貓",
+ "武馆杰克 ",
"137"
],
"getafter_event": [
@@ -1425,7 +1425,7 @@
"task_display": "新剧情文本10158",
"npc": [
"scenes_martialarts_01",
- "武馆熊貓",
+ "武馆杰克 ",
"137"
],
"getafter_event": [
@@ -1449,7 +1449,7 @@
"task_display": "新剧情文本10159",
"npc": [
"scenes_martialarts_01",
- "武馆熊貓",
+ "武馆杰克 ",
"137"
],
"getafter_event": [
@@ -1473,7 +1473,7 @@
"task_display": "新剧情文本10160",
"npc": [
"scenes_martialarts_01",
- "武馆熊貓",
+ "武馆杰克 ",
"137"
],
"getafter_event": [
@@ -1497,7 +1497,7 @@
"task_display": "新剧情文本10161",
"npc": [
"scenes_martialarts_01",
- "武馆熊貓",
+ "武馆杰克 ",
"137"
],
"getafter_event": [
@@ -1521,7 +1521,7 @@
"task_display": "新剧情文本10162",
"npc": [
"scenes_martialarts_01",
- "武馆熊貓",
+ "武馆杰克 ",
"137"
],
"getafter_event": [
@@ -1545,7 +1545,7 @@
"task_display": "新剧情文本10163",
"npc": [
"scenes_martialarts_01",
- "武馆熊貓",
+ "武馆杰克 ",
"137"
],
"getafter_event": [
@@ -1569,7 +1569,7 @@
"task_display": "新剧情文本10164",
"npc": [
"scenes_martialarts_01",
- "武馆熊貓",
+ "武馆杰克 ",
"137"
],
"getafter_event": [
@@ -1593,7 +1593,7 @@
"task_display": "新剧情文本10165",
"npc": [
"scenes_martialarts_01",
- "武馆熊貓",
+ "武馆杰克 ",
"137"
],
"getafter_event": [
diff --git a/cmd/cmd.go b/cmd/cmd.go
index ce5e09422..ce9874c69 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -33,6 +33,7 @@ func init() {
RootCmd.AddCommand(runCmd)
initLog()
robot.InitDb()
+
}
var account = flag.String("account", "", "登录账号")
@@ -47,7 +48,7 @@ func CloneNewHero(hero *pb.DBHero) (newHero *pb.DBHero) {
return
}
func main() {
- //Execute()
+ Execute()
}
var runCmd = &cobra.Command{
diff --git a/cmd/robot/options.go b/cmd/robot/options.go
index b42161034..35fbfb84b 100644
--- a/cmd/robot/options.go
+++ b/cmd/robot/options.go
@@ -12,8 +12,8 @@ type Options struct {
func DefaultOpts() *Options {
return &Options{
- WsUrl: "ws://10.0.5.73:7891/gateway",
- RegUrl: "http://10.0.5.73:8000/register",
+ WsUrl: "ws://10.0.0.9:7891/gateway",
+ RegUrl: "http://10.0.0.9:8000/register",
Create: false,
ServerId: "1",
}
diff --git a/cmd/v2/ui/views/task_list.go b/cmd/v2/ui/views/task_list.go
index 3af319888..b0893d6e4 100644
--- a/cmd/v2/ui/views/task_list.go
+++ b/cmd/v2/ui/views/task_list.go
@@ -37,6 +37,7 @@ func (this *TaskListView) CreateView(t *model.TestCase) fyne.CanvasObject {
// task list button
taskListBtn := widget.NewButtonWithIcon("任务列表", theme.ConfirmIcon(), func() {
+ this.itemList.Reset()
if err := service.GetPttService().SendToClient(t.MainType, t.SubType, &pb.TaskListReq{
TaskTag: cast.ToInt32(tagSelect.Selected),
}); err != nil {
@@ -46,13 +47,14 @@ func (this *TaskListView) CreateView(t *model.TestCase) fyne.CanvasObject {
// task receive button
receiveBtn := widget.NewButtonWithIcon("任务领取", theme.ConfirmIcon(), func() {
- if len(this.itemList.SelItemIds) != 1 {
+ selId := this.itemList.SelItemId
+ if selId == "" {
dialog.ShowError(errors.New("请选择一项"), this.w)
return
}
if err := service.GetPttService().SendToClient(
t.MainType, "receive",
- &pb.TaskReceiveReq{Id: this.itemList.SelItemIds[0], TaskTag: cast.ToInt32(tagSelect.Selected)}); err != nil {
+ &pb.TaskReceiveReq{Id: selId, TaskTag: cast.ToInt32(tagSelect.Selected)}); err != nil {
logrus.Error(err)
return
}
diff --git a/comm/const.go b/comm/const.go
index 5ef705984..f1cde8be9 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -575,3 +575,46 @@ const (
Yueka_1 string = "Activity_PrivilegeCardDailyReward_lv1"
Yueka_2 string = "Activity_PrivilegeCardDailyReward_lv2"
)
+
+// open funcName
+const (
+ Hero = "hero"
+ Backpack = "backpack"
+ Shop = "shop"
+ Friend = "friend"
+ Mall = "mall"
+ Rdtask = "rdtask"
+ Currency = "currency"
+ Alliance = "alliance"
+ Task = "task"
+ Trials = "trials"
+ Moon = "moon"
+ Story = "story"
+ Kungfu = "kungfu"
+ Event = "event"
+ MistyIsland = "mistyIsland"
+ Vikingexpedition = "vikingexpedition"
+ Vikingexpedition2 = "vikingexpedition2"
+ Vikingexpedition3 = "vikingexpedition3"
+ HjeartDemonTower = "hjeart demon tower"
+ Catchsheep = "catchsheep"
+ Darkcuisine = "darkcuisine"
+ UndergroundArena = "underground Arena"
+ Crazycompetition = "crazycompetition"
+ Fiveheroeschallenge = "fiveheroeschallenge"
+ Library = "library"
+ Bonfiredance = "bonfiredance"
+ Caravan = "caravan"
+ Gourmetrestaurant = "gourmetrestaurant"
+ Goberblacksmithshop = "goberblacksmithshop"
+ Hunting = "hunting"
+ Channel_lock_icon = "channel_lock_icon"
+ Channel_lock_world = "channel_lock_world"
+ Channel_lock_guild = "channel_lock_guild"
+ Channel_lock_private = "channel_lock_private"
+ Channel_lock_public = "channel_lock_public"
+ Channel_lock_system = "channel_lock_system"
+ Guild = "guild"
+ Arena = "arena"
+ Sign = "sign"
+)
diff --git a/comm/imodule.go b/comm/imodule.go
index 6f7fc69d3..b44876301 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -16,7 +16,7 @@ type (
type (
ISys interface {
- IsAccess(funcName string, userLv int32) bool
+ IsAccess(funcName string, uid string) (code pb.ErrorCode)
}
//邮件业务模块对外接口定义 提供给其他模块使用的
@@ -90,8 +90,6 @@ type (
IUser interface {
//获取本服用户数据
GetUser(uid string) *pb.DBUser
- // 获取跨服用户数据
- GetCrossUser(uid string) (*pb.DBUser, error)
//获取用户回话
GetUserSession(uid string) *pb.CacheUser
//查询用户属性值 例如 金币 经验
@@ -114,14 +112,8 @@ type (
CrossUserSession(uid string) *pb.CacheUser
// 跨服搜索玩家
CrossSearchUser(nickname string) ([]*pb.DBUser, error)
- // 获取远程用户
- GetRemoteUser(uid string) (*pb.DBUser, error)
// 搜索远程用户
SearchRmoteUser(nickname string) ([]*pb.DBUser, error)
- // 获取远程用户expand
- GetRemoteUserExpand(uid string) (result *pb.DBUserExpand, err error)
- // 更新远程用户expand
- ChangeRemoteUserExpand(uid string, value map[string]interface{}) error
}
//武器模块
IEquipment interface {
@@ -170,6 +162,8 @@ type (
RemoteCheckCondi(uid string, condiId int32, rsp *pb.DBRtaskRecord) error
// 删除任务条件数据
RemoveCondi(uid string, condiId int32) error
+ // 更新任务条件数据
+ ChangeCondi(uid string, data map[int32]*pb.RtaskData) error
//任务触发
SendToRtask(session IUserSession, rtaskType TaskType, params ...int32) (code pb.ErrorCode)
// 初始化条件数据
diff --git a/go.mod b/go.mod
index c25e5c670..2461bd9c8 100644
--- a/go.mod
+++ b/go.mod
@@ -37,8 +37,10 @@ require (
go.mongodb.org/mongo-driver v1.5.1
go.uber.org/multierr v1.6.0
golang.org/x/net v0.2.0
+ google.golang.org/grpc v1.46.2
google.golang.org/protobuf v1.28.0
gopkg.in/yaml.v2 v2.4.0
+ layeh.com/radius v0.0.0-20210819152912-ad72663a72ab
)
require (
@@ -48,6 +50,7 @@ require (
github.com/onsi/gomega v1.20.0 // indirect
github.com/rogpeppe/go-internal v1.8.1 // indirect
github.com/smartystreets/assertions v1.2.0 // indirect
+ google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
)
require (
@@ -181,7 +184,7 @@ require (
golang.org/x/mod v0.7.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.2.0 // indirect
- golang.org/x/text v0.4.0 // indirect
+ golang.org/x/text v0.4.0
golang.org/x/tools v0.3.0 // indirect
gopkg.in/ini.v1 v1.66.6 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
diff --git a/go.sum b/go.sum
index 4dc60df26..77b371f61 100644
--- a/go.sum
+++ b/go.sum
@@ -122,6 +122,10 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
+github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
@@ -146,6 +150,7 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a h1:yDWHCSQ40h88yih2JAcL6Ls/kVkSE8GFACTGVnMPruw=
github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a/go.mod h1:7Ga40egUymuWXxAe151lTNnCv97MddSOVsjpPPkityA=
@@ -828,6 +833,7 @@ go.opentelemetry.io/otel/oteltest v0.19.0/go.mod h1:tI4yxwh8U21v7JD6R3BcA/2+RBoT
go.opentelemetry.io/otel/trace v0.19.0/go.mod h1:4IXiNextNOpPnRlI4ryK69mn5iC84bjBWZQA5DXz/qg=
go.opentelemetry.io/otel/trace v1.6.3 h1:IqN4L+5b0mPNjdXIiZ90Ni4Bl5BRkDQywePLWemd9bc=
go.opentelemetry.io/otel/trace v1.6.3/go.mod h1:GNJQusJlUgZl9/TQBPKU/Y/ty+0iVB5fjhKeJGZPGFs=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
@@ -854,6 +860,7 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -1253,6 +1260,8 @@ google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6D
google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd h1:e0TwkXOdbnH/1x5rc5MZ/VYyiZ4v+RdVfrGMqEwT68I=
+google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
@@ -1276,6 +1285,9 @@ google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG
google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.46.2 h1:u+MLGgVf7vRdjEYZ8wDFhAVNmhkbJ5hmrA1LMWK1CAQ=
+google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -1288,6 +1300,7 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
@@ -1332,6 +1345,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+layeh.com/radius v0.0.0-20210819152912-ad72663a72ab h1:05KeMI4s7jEdIfHb7QCjUr5X2BRA0gjLZLZEmmjGNc4=
+layeh.com/radius v0.0.0-20210819152912-ad72663a72ab/go.mod h1:pFWM9De99EY9TPVyHIyA56QmoRViVck/x41WFkUlc9A=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
diff --git a/modules/friend/api.go b/modules/friend/api.go
index cb03888ea..e6b7913d8 100644
--- a/modules/friend/api.go
+++ b/modules/friend/api.go
@@ -2,7 +2,6 @@ package friend
import (
"go_dreamfactory/lego/core"
- "go_dreamfactory/lego/sys/log"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
)
@@ -41,19 +40,15 @@ func (this *apiComp) Init(service core.IService, module core.IModule, comp core.
}
func (this *apiComp) setDefaultFriendUserBaseInfo(userId string) *pb.FriendBase {
- if user, err := this.moduleFriend.ModuleUser.GetRemoteUser(userId); err != nil {
- this.moduleFriend.Error("GetRmoteUser", log.Fields{"err": err.Error()})
- return nil
- } else {
- if user != nil {
- return &pb.FriendBase{
- ServerId: user.Sid,
- UserId: userId,
- NickName: user.Name,
- Level: user.Lv,
- Avatar: user.Avatar,
- OfflineTime: user.Offlinetime,
- }
+ user := this.moduleFriend.ModuleUser.GetUser(userId)
+ if user != nil {
+ return &pb.FriendBase{
+ ServerId: user.Sid,
+ UserId: userId,
+ NickName: user.Name,
+ Level: user.Lv,
+ Avatar: user.Avatar,
+ OfflineTime: user.Offlinetime,
}
}
diff --git a/modules/friend/api_cross_agree.go b/modules/friend/api_cross_agree.go
index 740f1ea4a..16faeb3fe 100644
--- a/modules/friend/api_cross_agree.go
+++ b/modules/friend/api_cross_agree.go
@@ -42,11 +42,8 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (c
agreeIds := []string{}
for _, friendId := range req.FriendIds {
// 验证friendId是否有效
- user, err := this.moduleFriend.ModuleUser.GetRemoteUser(friendId)
- if err != nil {
- continue
- }
- if user.Uid == "" {
+ user := this.moduleFriend.ModuleUser.GetUser(friendId)
+ if user == nil {
continue
}
if _, ok := utils.Find(self.FriendIds, friendId); !ok {
diff --git a/modules/gourmet/api_getranduser.go b/modules/gourmet/api_getranduser.go
index 57d1eed04..dcaa0b710 100644
--- a/modules/gourmet/api_getranduser.go
+++ b/modules/gourmet/api_getranduser.go
@@ -85,7 +85,7 @@ func (this *apiComp) GetRandUser(session comm.IUserSession, req *pb.GourmetGetRa
}
}
for k := range mapUser {
- if user, err := this.module.ModuleUser.GetRemoteUser(k); err == nil && user.Uid != "" {
+ if user := this.module.ModuleUser.GetUser(k); user != nil {
szDbUser = append(szDbUser, user) // 转成user对象
} else {
this.module.Errorf("%v", err)
diff --git a/modules/hero/api_buy.go b/modules/hero/api_buy.go
new file mode 100644
index 000000000..4b7f4ca37
--- /dev/null
+++ b/modules/hero/api_buy.go
@@ -0,0 +1,103 @@
+package hero
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+ cfg "go_dreamfactory/sys/configure/structs"
+ "go_dreamfactory/utils"
+ "math"
+
+ "google.golang.org/protobuf/proto"
+)
+
+//参数校验
+func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.HeroBuyReq) (code pb.ErrorCode) {
+ if req.BuyType == 0 || req.BuyCount == 0 {
+ code = pb.ErrorCode_ReqParameterError
+ }
+ return
+}
+
+///获取用户商品列表
+func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (code pb.ErrorCode, data proto.Message) {
+ var (
+ err error
+ conf *cfg.GameShopitemData
+ global *cfg.GameGlobalData
+ need []*cfg.Gameatn
+ give []*cfg.Gameatn
+ totalCount int32 // 当前购买的总次数
+ update map[string]interface{}
+ )
+ update = make(map[string]interface{})
+ if code = this.BuyCheck(session, req); code != pb.ErrorCode_Success {
+ return
+ }
+
+ if conf, err = this.module.configure.GetShopItemsConfigure(req.BuyType); err != nil { // 找配置
+ code = pb.ErrorCode_ConfigNoFound
+ return
+ }
+
+ record, err := this.module.modelRecord.GetHeroRecord(session.GetUserId())
+ if err != nil {
+ code = pb.ErrorCode_SystemError
+ return
+ }
+ global = this.module.configure.GetGlobalConf()
+ if req.BuyType == global.DrawCardSupplement1 {
+ totalCount = record.Onebuy + req.BuyCount
+ update["onebuy"] = totalCount // 记录购买的数据
+ } else if req.BuyType == global.DrawCardSupplement10 {
+ totalCount = record.Tenbuy + req.BuyCount
+ update["tenbuy"] = totalCount
+ } else {
+ code = pb.ErrorCode_ReqParameterError
+ return
+ }
+ if totalCount > conf.Buymaxnum { // 购买达到上限
+ code = pb.ErrorCode_ShopGoodsIsSoldOut
+ return
+ }
+ need = make([]*cfg.Gameatn, len(conf.Need))
+ for i, v := range conf.Need {
+ need[i] = &cfg.Gameatn{
+ A: v.A,
+ T: v.T,
+ N: int32(math.Ceil(float64(v.N)*float64(conf.Sale)/float64(1000))) * req.BuyCount,
+ }
+ }
+ // 消耗
+ if code = this.module.ConsumeRes(session, need, true); code != pb.ErrorCode_Success {
+ return
+ }
+ give = make([]*cfg.Gameatn, len(conf.Iteminfo))
+ for i, v := range conf.Iteminfo {
+ give[i] = &cfg.Gameatn{
+ A: v.A,
+ T: v.T,
+ N: v.N * req.BuyCount,
+ }
+ }
+ // 获得的道具
+ if code = this.module.DispenseRes(session, give, true); code != pb.ErrorCode_Success {
+ return
+ }
+
+ this.module.modelRecord.ChangeHeroRecord(session.GetUserId(), update)
+ //随机任务
+ this.module.ModuleRtask.SendToRtask(session, comm.Rtype64, 1)
+ for _, v := range give {
+ if v.A == comm.ItemType {
+ this.module.ModuleRtask.SendToRtask(session, comm.Rtype65, v.N, utils.ToInt32(v.T))
+ }
+ }
+
+ for _, v := range need {
+ if v.A == comm.AttrType && (v.T == comm.ResGold || v.T == comm.ResDiamond) {
+ this.module.ModuleRtask.SendToRtask(session, comm.Rtype67, v.N, utils.ToInt32(v.T))
+ }
+ }
+ session.SendMsg(string(this.module.GetType()), "buy", &pb.HeroBuyResp{IsSucc: true})
+ return
+}
diff --git a/modules/hero/api_list.go b/modules/hero/api_list.go
index 6f6c99bcd..74513dd02 100644
--- a/modules/hero/api_list.go
+++ b/modules/hero/api_list.go
@@ -3,6 +3,8 @@ package hero
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
+ "go_dreamfactory/sys/configure"
+ "go_dreamfactory/utils"
"google.golang.org/protobuf/proto"
)
@@ -24,5 +26,21 @@ func (this *apiComp) List(session comm.IUserSession, req *pb.HeroListReq) (code
}()
rsp.List = this.module.GetHeroList(session.GetUserId())
+ // 重置当天抽卡次数 和商店购买次数
+ heroRecord, err := this.module.modelRecord.GetHeroRecord(session.GetUserId())
+ if err != nil {
+ code = pb.ErrorCode_SystemError
+ }
+ if !utils.IsToday(heroRecord.Mtime) {
+ update := map[string]interface{}{}
+ update["onebuy"] = 0
+ update["tenbuy"] = 0
+ update["daycount"] = 0
+ heroRecord.Mtime = configure.Now().Unix()
+ update["mtime"] = heroRecord.Mtime
+ if err := this.module.modelRecord.ChangeHeroRecord(session.GetUserId(), update); err != nil {
+ this.module.Errorf("ChangeHeroRecord error: %v", err)
+ }
+ }
return
}
diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go
index bb186256e..1edacf894 100644
--- a/modules/hero/configure_comp.go
+++ b/modules/hero/configure_comp.go
@@ -30,6 +30,7 @@ const (
hero_talentskill = "game_talentskill.json" // 天赋
hero_talent = "game_herotalent.json" // 天赋详细数据
hero_itembox = "game_itembox.json" // 天赋详细数据
+ game_shopitem = "game_shopitem.json"
)
///配置管理组件
@@ -63,6 +64,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
hero_talentskill: cfg.NewGameTalentSkill,
hero_talent: cfg.NewGameHeroTalent,
hero_itembox: cfg.NewGameItemBox,
+ game_shopitem: cfg.NewGameShopitem,
})
this.drawCardCfg = make(map[string]map[int32][]*cfg.GameDrawCardData, 0)
configure.RegisterConfigure(hero_drawcard, cfg.NewGameDrawCard, this.SetHeroDrawConfig)
@@ -442,3 +444,22 @@ func (this *configureComp) GetHeroTalentBoxItem(heroid string) (itemid string) {
this.module.Errorf("cfg.GameItemBoxData GetHeroTalentBoxItem:skillId = %d", heroid)
return ""
}
+
+//读取商品
+func (this *configureComp) GetShopItemsConfigure(key int32) (result *cfg.GameShopitemData, err error) {
+ var (
+ v interface{}
+ ok bool
+ )
+ if v, err = this.GetConfigure(game_shopitem); err != nil {
+ this.module.Errorf("err:%v", err)
+ return
+ } else {
+ if result, ok = v.(*cfg.GameShopitem).GetDataMap()[key]; !ok {
+ err = fmt.Errorf("ShopConfigure not found:%d ", key)
+ this.module.Errorf("err:%v", err)
+ return
+ }
+ }
+ return
+}
diff --git a/modules/hero/model_record.go b/modules/hero/model_record.go
index c2f238f6c..63fef19cb 100644
--- a/modules/hero/model_record.go
+++ b/modules/hero/model_record.go
@@ -3,10 +3,12 @@ package hero
import (
"go_dreamfactory/comm"
"go_dreamfactory/lego/core"
- "go_dreamfactory/lego/sys/redis"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
+
+ "go.mongodb.org/mongo-driver/bson/primitive"
+ "go.mongodb.org/mongo-driver/mongo"
)
// 记录一些扩展数据 图鉴 改名次数等
@@ -23,9 +25,18 @@ func (this *ModelRecord) Init(service core.IService, module core.IModule, comp c
//获取用户通过扩展表
func (this *ModelRecord) GetHeroRecord(uid string) (result *pb.DBHeroRecord, err error) {
result = &pb.DBHeroRecord{}
- if err = this.Get(uid, result); err != nil && err != redis.RedisNil {
+ if err = this.Get(uid, result); err != nil {
+ if mongo.ErrNoDocuments == err { // 创建一条新的数据
+ result.Id = primitive.NewObjectID().Hex()
+ result.Uid = uid
+ result.Condition = map[string]int32{}
+ result.Star5Hero = map[string]int32{}
+ result.Mtime = configure.Now().Unix()
+ this.Add(uid, result)
+ }
return
}
+
err = nil
return result, err
}
diff --git a/modules/rtask/model_record.go b/modules/rtask/model_record.go
index 46a5fe567..646d57b81 100644
--- a/modules/rtask/model_record.go
+++ b/modules/rtask/model_record.go
@@ -99,4 +99,4 @@ func (this *ModelRtaskRecord) initCondiData(uid string) error {
}
}
return nil
-}
+}
\ No newline at end of file
diff --git a/modules/rtask/module.go b/modules/rtask/module.go
index b43def226..6dc8f5bcb 100644
--- a/modules/rtask/module.go
+++ b/modules/rtask/module.go
@@ -425,6 +425,17 @@ func (this *ModuleRtask) RemoteCheckCondi(uid string, condiId int32, rsp *pb.DBR
return nil
}
+func (this *ModuleRtask) ChangeCondi(uid string, data map[int32]*pb.RtaskData) error {
+ if len(data) > 0 {
+ update := map[string]interface{}{
+ "vals": data,
+ }
+ return this.modelRtaskRecord.Change(uid, update)
+ }
+
+ return nil
+}
+
//接收区服worker发起的秘境事件
func (this *ModuleRtask) Rpc_ModuleRtaskSendTask(ctx context.Context, args *pb.RPCRTaskReq, reply *pb.EmptyResp) (err error) {
this.Debug("Rpc_ModuleRtaskSendTask", log.Fields{"args": args.String()})
diff --git a/modules/smithy/api_getranduser.go b/modules/smithy/api_getranduser.go
index a545de272..8389d55d7 100644
--- a/modules/smithy/api_getranduser.go
+++ b/modules/smithy/api_getranduser.go
@@ -85,7 +85,7 @@ func (this *apiComp) GetRandUser(session comm.IUserSession, req *pb.SmithyGetRan
}
}
for k := range mapUser {
- if user, err := this.module.ModuleUser.GetRemoteUser(k); err == nil && user.Uid != "" {
+ if user := this.module.ModuleUser.GetUser(k); user != nil {
szDbUser = append(szDbUser, user) // 转成user对象
} else {
this.module.Errorf("%v", err)
diff --git a/modules/sociaty/api_cross_apply.go b/modules/sociaty/api_cross_apply.go
index a992338ac..9ec538245 100644
--- a/modules/sociaty/api_cross_apply.go
+++ b/modules/sociaty/api_cross_apply.go
@@ -35,7 +35,7 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.SociatyApplyReq) (
}
// userex
- userEx, err := this.module.ModuleUser.GetRemoteUserExpand(uid)
+ userEx, err := this.module.ModuleUser.GetUserExpand(uid)
if err != nil {
this.module.Error("GetRemoteUserExpand", log.Fields{"uid": uid, "err": err.Error()})
code = pb.ErrorCode_UserSessionNobeing
@@ -53,12 +53,7 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.SociatyApplyReq) (
return
}
- user, err := this.module.ModuleUser.GetRemoteUser(uid)
- if err != nil {
- code = pb.ErrorCode_DBError
- return
- }
-
+ user := this.module.ModuleUser.GetUser(uid)
if user == nil {
code = pb.ErrorCode_UserSessionNobeing
return
diff --git a/modules/sociaty/api_cross_create.go b/modules/sociaty/api_cross_create.go
index d6c5cfbd2..04521853b 100644
--- a/modules/sociaty/api_cross_create.go
+++ b/modules/sociaty/api_cross_create.go
@@ -29,20 +29,14 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.SociatyCreateReq)
}
uid := session.GetUserId()
-
- user, err := this.module.ModuleUser.GetRemoteUser(uid)
- if err != nil {
- code = pb.ErrorCode_DBError
- return
- }
-
- if user.Uid == "" {
+ user := this.module.ModuleUser.GetUser(uid)
+ if user == nil{
this.module.Error("GetRmoteUser not found", log.Fields{"uid": uid})
code = pb.ErrorCode_UserSessionNobeing
return
}
- userExpand, err := this.module.ModuleUser.GetRemoteUserExpand(uid)
+ userExpand, err := this.module.ModuleUser.GetUserExpand(uid)
if err != nil {
code = pb.ErrorCode_DBError
return
@@ -111,7 +105,7 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.SociatyCreateReq)
"sociatyId": sociaty.Id,
}
- if err = this.module.ModuleUser.ChangeRemoteUserExpand(user.Uid, update); err != nil {
+ if err = this.module.ModuleUser.ChangeUserExpand(user.Uid, update); err != nil {
code = pb.ErrorCode_DBError
this.module.Error("更新玩家公会ID", log.Fields{"uid": uid, "sociatyId": sociaty.Id, "err": err.Error()})
return
diff --git a/modules/sociaty/api_cross_discharge.go b/modules/sociaty/api_cross_discharge.go
index 44ca08375..7f444e377 100644
--- a/modules/sociaty/api_cross_discharge.go
+++ b/modules/sociaty/api_cross_discharge.go
@@ -62,7 +62,7 @@ func (this *apiComp) Discharge(session comm.IUserSession, req *pb.SociatyDischar
"sociatyId": "", //公会ID置空
}
- if err := this.module.ModuleUser.ChangeRemoteUserExpand(req.TargetId, update); err != nil {
+ if err := this.module.ModuleUser.ChangeUserExpand(req.TargetId, update); err != nil {
code = pb.ErrorCode_DBError
this.module.Error("更新玩家公会ID", log.Fields{"uid": uid, "被踢人": req.TargetId, "err": err.Error()})
return
diff --git a/modules/sociaty/api_cross_list.go b/modules/sociaty/api_cross_list.go
index 6f1a5265e..a63c45459 100644
--- a/modules/sociaty/api_cross_list.go
+++ b/modules/sociaty/api_cross_list.go
@@ -18,6 +18,9 @@ func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.SociatyListReq
}
func (this *apiComp) List(session comm.IUserSession, req *pb.SociatyListReq) (code pb.ErrorCode, data proto.Message) {
+ if code = this.module.ModuleSys.IsAccess(comm.Guild, session.GetUserId()); code != pb.ErrorCode_Success {
+ return
+ }
if code = this.ListCheck(session, req); code != pb.ErrorCode_Success {
return
}
diff --git a/modules/sociaty/api_cross_mine.go b/modules/sociaty/api_cross_mine.go
index 3b171dcfd..d66eb7ddf 100644
--- a/modules/sociaty/api_cross_mine.go
+++ b/modules/sociaty/api_cross_mine.go
@@ -17,7 +17,7 @@ func (this *apiComp) MineCheck(session comm.IUserSession, req *pb.SociatyMineReq
func (this *apiComp) Mine(session comm.IUserSession, req *pb.SociatyMineReq) (code pb.ErrorCode, data proto.Message) {
uid := session.GetUserId()
- userEx, err := this.module.ModuleUser.GetRemoteUserExpand(uid)
+ userEx, err := this.module.ModuleUser.GetUserExpand(uid)
if err != nil {
this.module.Error("GetRemoteUserExpand", log.Fields{"uid": uid, "err": err})
code = pb.ErrorCode_UserSessionNobeing
diff --git a/modules/sociaty/api_cross_quit.go b/modules/sociaty/api_cross_quit.go
index 7eaf00543..41a82f8c0 100644
--- a/modules/sociaty/api_cross_quit.go
+++ b/modules/sociaty/api_cross_quit.go
@@ -44,7 +44,7 @@ func (this *apiComp) Quit(session comm.IUserSession, req *pb.SociatyQuitReq) (co
"sociatyCd": utils.AddHour(int(this.module.globalConf.GuildRejoinCd)).Unix(),
}
- if err := this.module.ModuleUser.ChangeRemoteUserExpand(uid, update); err != nil {
+ if err := this.module.ModuleUser.ChangeUserExpand(uid, update); err != nil {
code = pb.ErrorCode_DBError
this.module.Error("退出公会,更新玩家公会ID", log.Fields{"uid": uid, "sociatyId": sociaty.Id, "err": err.Error()})
return
diff --git a/modules/sociaty/model_sociaty.go b/modules/sociaty/model_sociaty.go
index 69306c56e..759641aea 100644
--- a/modules/sociaty/model_sociaty.go
+++ b/modules/sociaty/model_sociaty.go
@@ -90,10 +90,10 @@ func (this *ModelSociaty) isNameExist(name string) error {
// 公会列表
func (this *ModelSociaty) list(uid string, filter pb.SociatyListFilter) (list []*pb.DBSociaty) {
- user, err := this.moduleSociaty.ModuleUser.GetRemoteUser(uid)
- if err != nil {
- return
- }
+ user := this.moduleSociaty.ModuleUser.GetUser(uid)
+ // if err != nil {
+ // return
+ // }
if user == nil {
return
}
@@ -196,7 +196,7 @@ func (this *ModelSociaty) getUserSociaty(uid string) (sociaty *pb.DBSociaty) {
err error
)
if this.moduleSociaty.IsCross() {
- userEx, err = this.moduleSociaty.ModuleUser.GetRemoteUserExpand(uid)
+ userEx, err = this.moduleSociaty.ModuleUser.GetUserExpand(uid)
if err != nil {
return
}
@@ -232,7 +232,7 @@ func (this *ModelSociaty) getUserSociaty(uid string) (sociaty *pb.DBSociaty) {
}
// 申请公会
-func (this *ModelSociaty) apply(uid string, sociaty *pb.DBSociaty) (isCheck bool,err error) {
+func (this *ModelSociaty) apply(uid string, sociaty *pb.DBSociaty) (isCheck bool, err error) {
// 判断公会审批设置
if sociaty.IsApplyCheck { //需要审核
isCheck = true
@@ -246,12 +246,12 @@ func (this *ModelSociaty) apply(uid string, sociaty *pb.DBSociaty) (isCheck bool
err = this.updateSociaty(sociaty.Id, update)
} else { //无需审核直接入会
if err := this.addMember(uid, sociaty); err != nil {
- return isCheck,err
+ return isCheck, err
}
//初始玩家公会任务
this.moduleSociaty.modelSociatyTask.initSociatyTask(uid, sociaty.Id)
}
- return
+ return
}
// 设置公会
@@ -283,8 +283,8 @@ func (this *ModelSociaty) isApplied(uid string, sociaty *pb.DBSociaty) bool {
// 申请列表
func (this *ModelSociaty) applyList(sociaty *pb.DBSociaty) (list []*pb.SociatyMemberInfo) {
for _, r := range sociaty.ApplyRecord {
- user, err := this.moduleSociaty.ModuleUser.GetRemoteUser(r.Uid)
- if err != nil || user.Uid == "" {
+ user := this.moduleSociaty.ModuleUser.GetUser(r.Uid)
+ if user == nil {
continue
}
@@ -399,7 +399,7 @@ func (this *ModelSociaty) addMember(uid string, sociaty *pb.DBSociaty) error {
updateEx := map[string]interface{}{
"sociatyId": sociaty.Id,
}
- if err := this.moduleSociaty.ModuleUser.ChangeRemoteUserExpand(uid, updateEx); err != nil {
+ if err := this.moduleSociaty.ModuleUser.ChangeUserExpand(uid, updateEx); err != nil {
return err
}
@@ -424,8 +424,8 @@ func (this *ModelSociaty) sendMail(confId string, params []string, receiver []st
// 成员列表
func (this *ModelSociaty) members(sociaty *pb.DBSociaty) (list []*pb.SociatyMemberInfo) {
for _, m := range sociaty.Members {
- user, err := this.moduleSociaty.ModuleUser.GetRemoteUser(m.Uid)
- if err != nil || user.Uid == "" {
+ user := this.moduleSociaty.ModuleUser.GetUser(m.Uid)
+ if user == nil {
continue
}
list = append(list, &pb.SociatyMemberInfo{
@@ -534,8 +534,8 @@ func (this *ModelSociaty) settingJob(targetId string, job pb.SociatyJob, sociaty
func (this *ModelSociaty) getMasterInfo(sociaty *pb.DBSociaty) *pb.SociatyMemberInfo {
for _, m := range sociaty.Members {
if m.Job == pb.SociatyJob_PRESIDENT {
- user, err := this.moduleSociaty.ModuleUser.GetRemoteUser(m.Uid)
- if err != nil || user.Uid == "" {
+ user := this.moduleSociaty.ModuleUser.GetUser(m.Uid)
+ if user == nil {
continue
}
return &pb.SociatyMemberInfo{
@@ -557,9 +557,9 @@ func (this *ModelSociaty) accuse(sociaty *pb.DBSociaty) error {
return comm.NewCustomError(pb.ErrorCode_SociatyNoMaster)
}
- user, err := this.moduleSociaty.ModuleUser.GetRemoteUser(master.Uid)
- if err != nil {
- return err
+ user := this.moduleSociaty.ModuleUser.GetUser(master.Uid)
+ if user == nil {
+ return comm.NewCustomError(pb.ErrorCode_UserSessionNobeing)
}
globalCnf := this.moduleSociaty.globalConf
@@ -913,7 +913,7 @@ func (this *ModelSociaty) memberClear(sociaty *pb.DBSociaty) error {
update := map[string]interface{}{
"sociatyId": "", //公会ID置空
}
- if err := this.moduleSociaty.ModuleUser.ChangeRemoteUserExpand(m.Uid, update); err != nil {
+ if err := this.moduleSociaty.ModuleUser.ChangeUserExpand(m.Uid, update); err != nil {
log.Errorf("更新玩家公会ID err:%v", err)
}
diff --git a/modules/sociaty/model_sociatylog.go b/modules/sociaty/model_sociatylog.go
index 55164e545..9918eb01e 100644
--- a/modules/sociaty/model_sociatylog.go
+++ b/modules/sociaty/model_sociatylog.go
@@ -40,8 +40,8 @@ func (this *ModelSociatyLog) addLog(tag Tag, sociatyId string, params ...string)
return comm.NewCustomError(pb.ErrorCode_SociatyLogParams)
}
for i := 0; i < len(params); i++ {
- user, err := this.moduleSociaty.ModuleUser.GetRemoteUser(params[i])
- if err == nil && user.Uid != "" {
+ user := this.moduleSociaty.ModuleUser.GetUser(params[i])
+ if user != nil {
content = strings.Replace(content, "%s", user.Name, 1)
}
}
@@ -52,8 +52,8 @@ func (this *ModelSociatyLog) addLog(tag Tag, sociatyId string, params ...string)
return comm.NewCustomError(pb.ErrorCode_SociatyLogParams)
}
for i := 0; i < len(params); i++ {
- user, err := this.moduleSociaty.ModuleUser.GetRemoteUser(params[i])
- if err == nil && user.Uid != "" {
+ user := this.moduleSociaty.ModuleUser.GetUser(params[i])
+ if user != nil {
content = strings.Replace(content, "%s", user.Name, 1)
}
}
@@ -78,8 +78,8 @@ func (this *ModelSociatyLog) addLog(tag Tag, sociatyId string, params ...string)
}
content = strings.Replace(content, "%s", job, 1)
} else {
- user, err := this.moduleSociaty.ModuleUser.GetRemoteUser(params[i])
- if err == nil && user.Uid != "" {
+ user := this.moduleSociaty.ModuleUser.GetUser(params[i])
+ if user != nil {
content = strings.Replace(content, "%s", user.Name, 1)
}
}
@@ -91,8 +91,8 @@ func (this *ModelSociatyLog) addLog(tag Tag, sociatyId string, params ...string)
return comm.NewCustomError(pb.ErrorCode_SociatyLogParams)
}
for i := 0; i < len(params); i++ {
- user, err := this.moduleSociaty.ModuleUser.GetRemoteUser(params[i])
- if err == nil && user.Uid != "" {
+ user := this.moduleSociaty.ModuleUser.GetUser(params[i])
+ if user != nil {
content = strings.Replace(content, "%s", params[i], 1)
}
}
diff --git a/modules/sys/model_sys.go b/modules/sys/model_sys.go
index e6feddb94..6d2e9804c 100644
--- a/modules/sys/model_sys.go
+++ b/modules/sys/model_sys.go
@@ -4,6 +4,7 @@ import (
"go_dreamfactory/comm"
"go_dreamfactory/lego/core"
"go_dreamfactory/modules"
+ "go_dreamfactory/pb"
)
type ModelSys struct {
@@ -21,10 +22,17 @@ func (this *ModelSys) Init(service core.IService, module core.IModule, comp core
}
// 是否允许访问功能，条件:玩家等级
-func (this *ModelSys) IsAccess(funName string, userLv int32) bool {
- conf := this.moduleSys.configure.getFuncCfg(funName)
- if conf != nil {
- return userLv >= conf.Main
+func (this *ModelSys) IsAccess(funName string, uid string) (code pb.ErrorCode) {
+ user := this.moduleSys.ModuleUser.GetUser(uid)
+ if user != nil {
+ conf := this.moduleSys.configure.getFuncCfg(funName)
+ if conf != nil {
+ if user.Lv < conf.Main{
+ code = pb.ErrorCode_NoOpened
+ return
+ }
+ }
}
- return false
+
+ return
}
diff --git a/modules/sys/module.go b/modules/sys/module.go
index a077ae4d4..28bf966c5 100644
--- a/modules/sys/module.go
+++ b/modules/sys/module.go
@@ -4,6 +4,7 @@ import (
"go_dreamfactory/comm"
"go_dreamfactory/lego/core"
"go_dreamfactory/modules"
+ "go_dreamfactory/pb"
)
var _ comm.ISys = (*ModuleSys)(nil)
@@ -31,6 +32,7 @@ func (this *ModuleSys) GetType() core.M_Modules {
return comm.ModuleSys
}
-func (this *ModuleSys) IsAccess(funcName string, userLv int32) bool {
- return this.modelSys.IsAccess(funcName, userLv)
+func (this *ModuleSys) IsAccess(funcName string, userId string) (code pb.ErrorCode) {
+ // return this.modelSys.IsAccess(funcName, userId)
+ return pb.ErrorCode_Success
}
diff --git a/modules/task/model_task.go b/modules/task/model_task.go
index 99fcad4ef..a335ad27a 100644
--- a/modules/task/model_task.go
+++ b/modules/task/model_task.go
@@ -224,21 +224,24 @@ func (this *ModelTask) modifyUserTask(uid string, taskId string, data map[string
//清空任务
func (this *ModelTask) clearTask(uid string, taskTag ...comm.TaskTag) {
if len(taskTag) == 0 {
- this.moduleTask.Errorf("least one param for taskTag")
+ this.moduleTask.Error("TaskTag参数缺失", log.Fields{"uid": uid, "params": taskTag})
return
}
taskList := this.getTaskListByTag(uid, taskTag[0])
+ dr := this.moduleTask.ModuleRtask.GetCondiData(uid)
for _, v := range taskList {
if err := this.moduleTask.modelTask.DelListlds(uid, v.Id); err != nil {
- this.moduleTask.Errorf("uid: %v err:%v", uid, err)
+ this.moduleTask.Error("清除任务", log.Fields{"uid": uid, "taskId": v.Id})
return
}
//删除任务条件数据
- dr := this.moduleTask.ModuleRtask.GetCondiData(uid)
- if dr != nil && dr.Vals!=nil{
+ if dr != nil && dr.Vals != nil {
delete(dr.Vals, v.TypeId)
}
}
+ if err := this.moduleTask.ModuleRtask.ChangeCondi(uid, dr.Vals); err != nil {
+ this.moduleTask.Error("更新任务条件数据", log.Fields{"uid": uid})
+ }
}
//进入卡牌攻略
diff --git a/modules/user/module.go b/modules/user/module.go
index 9e88111c2..1d6727efa 100644
--- a/modules/user/module.go
+++ b/modules/user/module.go
@@ -92,8 +92,17 @@ func (this *User) OnInstallComp() {
}
//获取用户数据
-func (this *User) GetUser(uid string) *pb.DBUser {
- user := this.modelUser.GetUser(uid)
+func (this *User) GetUser(uid string) (user *pb.DBUser) {
+ var err error
+ if this.IsCross() {
+ user, err = this.getRemoteUser(uid)
+ if err != nil {
+ return nil
+ }
+ } else {
+ user = this.modelUser.GetUser(uid)
+ }
+
if user.Id == "" {
return nil
}
@@ -108,8 +117,8 @@ func (this *User) GetCrossUser(uid string) (*pb.DBUser, error) {
return reply, err
}
-// 获取远程用户数据sss
-func (this *User) GetRemoteUser(uid string) (*pb.DBUser, error) {
+// 获取远程用户数据
+func (this *User) getRemoteUser(uid string) (*pb.DBUser, error) {
reply := &pb.DBUser{}
if err := this.getUserFromRemoteDb(uid, reply); err != nil {
return nil, err
@@ -117,20 +126,6 @@ func (this *User) GetRemoteUser(uid string) (*pb.DBUser, error) {
return reply, nil
}
-// 获取远程用户expand
-func (this *User) GetRemoteUserExpand(uid string) (result *pb.DBUserExpand, err error) {
- reply := &pb.DBUserExpand{}
- if err := this.getUserExpandFromRemoteDb(uid, reply); err != nil {
- return nil, err
- }
- return reply, nil
-}
-
-// 更新远程用户expand
-func (this *User) ChangeRemoteUserExpand(uid string, value map[string]interface{}) error {
- return this.changeUserExpandFromRemoteDb(uid, value)
-}
-
//获取用户会话
func (this *User) GetUserSession(uid string) *pb.CacheUser {
return this.modelSession.getUserSession(uid)
@@ -212,7 +207,7 @@ func (this *User) QueryAttributeValue(uid string, attr string) (value int64) {
err error
)
if this.IsCross() {
- user, err = this.GetRemoteUser(uid)
+ user, err = this.getRemoteUser(uid)
if err != nil {
return
}
@@ -251,25 +246,12 @@ func (this *User) change(session comm.IUserSession, attr string, add int32) (cha
userEx *pb.DBUserExpand
err error
)
- if this.IsCross() {
- user, err = this.GetRemoteUser(uid)
- if err != nil {
- code = pb.ErrorCode_UserSessionNobeing
- return
- }
-
- userEx, err = this.GetRemoteUserExpand(uid)
- if err != nil {
- code = pb.ErrorCode_UserExpandNull
- return
- }
- } else {
- user = this.GetUser(uid)
- userEx, err = this.GetUserExpand(uid)
- if err != nil {
- code = pb.ErrorCode_UserExpandNull
- return
- }
+
+ user = this.GetUser(uid)
+ userEx, err = this.GetUserExpand(uid)
+ if err != nil {
+ code = pb.ErrorCode_UserExpandNull
+ return
}
if user == nil {
diff --git a/modules/worldtask/api_finish.go b/modules/worldtask/api_finish.go
index 6aa101688..a496486c9 100644
--- a/modules/worldtask/api_finish.go
+++ b/modules/worldtask/api_finish.go
@@ -25,6 +25,11 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
uid := session.GetUserId()
+ rsp := &pb.WorldtaskFinishResp{
+ GroupId: req.GroupId,
+ TaskId: req.TaskId,
+ }
+
// 获取用户信息
user := this.module.ModuleUser.GetUser(uid)
if user == nil {
@@ -69,18 +74,27 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
}
}
- //判断任务是否已完成
- for _, t := range userTask.TaskList {
- if t.TaskId == req.TaskId {
- code = pb.ErrorCode_WorldtaskFinihed
+ var nextTaskId int32
+ nextTaskId = curTaskConf.IdAfter
+ finishRsp := func() {
+ if err := session.SendMsg(string(this.module.GetType()), WorldtaskSubtypeFinish, rsp); err != nil {
+ code = pb.ErrorCode_SystemError
return
}
+
+ // 世界任务类型
+ if curTaskConf.Des == 2 {
+ // 任务完成推送
+ if err := session.SendMsg(string(this.module.GetType()), WorldtaskNexttaskPush, &pb.WorldtaskNexttaskPush{
+ NextTaskId: nextTaskId,
+ }); err != nil {
+ code = pb.ErrorCode_SystemError
+ return
+ }
+ }
}
- var nextTaskId int32
-
finishCall := func() {
- nextTaskId = curTaskConf.IdAfter
defer func() {
this.module.Debug("世界任务完成", log.Fields{"uid": uid, "params": req, "nextTaskId": nextTaskId})
}()
@@ -97,35 +111,31 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
}
}
+ //判断任务是否已完成
+ for _, t := range userTask.TaskList {
+ if t.TaskId == req.TaskId {
+ this.module.Debug("任务已完成,返回下一个", log.Fields{"uid": uid, "taskId": req.TaskId})
+ finishRsp()
+ return
+ }
+ }
+
if curTaskConf.Completetask != 0 {
if c := this.module.ModuleRtask.CheckCondi(uid, curTaskConf.Completetask); c == pb.ErrorCode_Success {
finishCall()
} else {
this.module.Debug("任务完成条件未通过", log.Fields{"uid": uid, "condiId": curTaskConf.Completetask})
+ if err := session.SendMsg(string(this.module.GetType()), WorldtaskSubtypeFinish, rsp); err != nil {
+ code = pb.ErrorCode_SystemError
+ return
+ }
return
}
} else {
finishCall()
}
- rsp := &pb.WorldtaskFinishResp{
- GroupId: req.GroupId,
- TaskId: req.TaskId,
- }
-
- if err := session.SendMsg(string(this.module.GetType()), WorldtaskSubtypeFinish, rsp); err != nil {
- code = pb.ErrorCode_SystemError
- }
-
- // 世界任务类型
- if curTaskConf.Des == 2 {
- // 任务完成推送
- if err := session.SendMsg(string(this.module.GetType()), WorldtaskNexttaskPush, &pb.WorldtaskNexttaskPush{
- NextTaskId: nextTaskId,
- }); err != nil {
- code = pb.ErrorCode_SystemError
- }
- }
+ finishRsp()
return
}
diff --git a/modules/worldtask/module.go b/modules/worldtask/module.go
index 0b8c58f47..29c3ad5d4 100644
--- a/modules/worldtask/module.go
+++ b/modules/worldtask/module.go
@@ -94,6 +94,7 @@ func (this *Worldtask) TaskcondNotify(session comm.IUserSession, condId int32) e
}
taskConf, err := this.configure.getWorldtaskById(taskId)
if err != nil {
+ this.Error("world_task config not found", logFields)
return err
}
if taskConf != nil {
diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index 84193011b..674728639 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -48,6 +48,7 @@ const (
ErrorCode_ConfigurationException ErrorCode = 103 //配置异常
ErrorCode_ConfigNoFound ErrorCode = 104 //配置未找到
ErrorCode_UserLogined ErrorCode = 105 //已在其它终端登录
+ ErrorCode_NoOpened ErrorCode = 106 //模块未开放
// user
ErrorCode_SecKeyInvalid ErrorCode = 1000 //秘钥无效
ErrorCode_SecKey ErrorCode = 1001 //秘钥格式错误
@@ -300,6 +301,7 @@ var (
103: "ConfigurationException",
104: "ConfigNoFound",
105: "UserLogined",
+ 106: "NoOpened",
1000: "SecKeyInvalid",
1001: "SecKey",
1002: "BindUser",
@@ -521,6 +523,7 @@ var (
"ConfigurationException": 103,
"ConfigNoFound": 104,
"UserLogined": 105,
+ "NoOpened": 106,
"SecKeyInvalid": 1000,
"SecKey": 1001,
"BindUser": 1002,
@@ -750,7 +753,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, 0x8d, 0x27, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+ 0x6f, 0x2a, 0x9b, 0x27, 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,
@@ -779,292 +782,292 @@ var file_errorcode_proto_rawDesc = []byte{
0x0a, 0x16, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x45,
0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x67, 0x12, 0x11, 0x0a, 0x0d, 0x43, 0x6f,
0x6e, 0x66, 0x69, 0x67, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0x68, 0x12, 0x0f, 0x0a,
- 0x0b, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x65, 0x64, 0x10, 0x69, 0x12, 0x12,
- 0x0a, 0x0d, 0x53, 0x65, 0x63, 0x4b, 0x65, 0x79, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10,
- 0xe8, 0x07, 0x12, 0x0b, 0x0a, 0x06, 0x53, 0x65, 0x63, 0x4b, 0x65, 0x79, 0x10, 0xe9, 0x07, 0x12,
- 0x0d, 0x0a, 0x08, 0x42, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x10, 0xea, 0x07, 0x12, 0x11,
- 0x0a, 0x0c, 0x47, 0x6f, 0x6c, 0x64, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xeb,
- 0x07, 0x12, 0x14, 0x0a, 0x0f, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4e, 0x6f, 0x45, 0x6e,
- 0x6f, 0x75, 0x67, 0x68, 0x10, 0xec, 0x07, 0x12, 0x10, 0x0a, 0x0b, 0x52, 0x6f, 0x6c, 0x65, 0x43,
- 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x10, 0xed, 0x07, 0x12, 0x16, 0x0a, 0x11, 0x55, 0x73, 0x65,
- 0x72, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0xee,
- 0x07, 0x12, 0x14, 0x0a, 0x0f, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x4e, 0x6f, 0x56,
- 0x61, 0x6c, 0x69, 0x64, 0x10, 0xef, 0x07, 0x12, 0x14, 0x0a, 0x0f, 0x56, 0x65, 0x72, 0x69, 0x43,
- 0x6f, 0x64, 0x65, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x10, 0xf0, 0x07, 0x12, 0x12, 0x0a,
- 0x0d, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x65, 0x74, 0x44, 0x61, 0x74, 0x61, 0x10, 0xf1,
- 0x07, 0x12, 0x16, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x4e, 0x61, 0x6d,
- 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xf2, 0x07, 0x12, 0x16, 0x0a, 0x11, 0x55, 0x73, 0x65,
- 0x72, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xf3,
- 0x07, 0x12, 0x13, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x4e,
- 0x75, 0x6c, 0x6c, 0x10, 0xf4, 0x07, 0x12, 0x14, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78,
- 0x70, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf5, 0x07, 0x12, 0x17, 0x0a, 0x12,
- 0x55, 0x73, 0x65, 0x72, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75,
- 0x67, 0x68, 0x10, 0xf6, 0x07, 0x12, 0x1c, 0x0a, 0x17, 0x55, 0x73, 0x65, 0x72, 0x53, 0x6f, 0x63,
- 0x69, 0x61, 0x74, 0x79, 0x43, 0x6f, 0x69, 0x6e, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68,
- 0x10, 0xf7, 0x07, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4e, 0x6f, 0x74,
- 0x53, 0x65, 0x6c, 0x66, 0x10, 0xcc, 0x08, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e,
- 0x64, 0x53, 0x65, 0x6c, 0x66, 0x4d, 0x61, 0x78, 0x10, 0xcd, 0x08, 0x12, 0x14, 0x0a, 0x0f, 0x46,
- 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4d, 0x61, 0x78, 0x10, 0xce,
- 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x6c, 0x66, 0x4e,
- 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xcf, 0x08, 0x12, 0x17, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65,
- 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xd0,
- 0x08, 0x12, 0x0e, 0x0a, 0x09, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x59, 0x65, 0x74, 0x10, 0xd1,
- 0x08, 0x12, 0x13, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79,
- 0x59, 0x65, 0x74, 0x10, 0xd2, 0x08, 0x12, 0x17, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
- 0x53, 0x65, 0x6c, 0x66, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x59, 0x65, 0x74, 0x10, 0xd3, 0x08, 0x12,
- 0x19, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x42,
- 0x6c, 0x61, 0x63, 0x6b, 0x59, 0x65, 0x74, 0x10, 0xd4, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72,
- 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xd5,
- 0x08, 0x12, 0x13, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b,
- 0x4d, 0x61, 0x78, 0x10, 0xd6, 0x08, 0x12, 0x1a, 0x0a, 0x15, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
- 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10,
- 0xd7, 0x08, 0x12, 0x10, 0x0a, 0x0b, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x65,
- 0x64, 0x10, 0xd8, 0x08, 0x12, 0x16, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61,
- 0x6e, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xd9, 0x08, 0x12, 0x12, 0x0a, 0x0d,
- 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x66, 0x10, 0xda, 0x08,
- 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4c,
- 0x69, 0x6d, 0x69, 0x74, 0x10, 0xdb, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e,
- 0x64, 0x4e, 0x6f, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xdc, 0x08, 0x12, 0x12,
- 0x0a, 0x0d, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10,
- 0xb0, 0x09, 0x12, 0x15, 0x0a, 0x10, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x6f, 0x46, 0x6f, 0x75,
- 0x6e, 0x64, 0x47, 0x69, 0x72, 0x64, 0x10, 0xb1, 0x09, 0x12, 0x16, 0x0a, 0x11, 0x49, 0x74, 0x65,
- 0x6d, 0x73, 0x47, 0x72, 0x69, 0x64, 0x4e, 0x75, 0x6d, 0x55, 0x70, 0x70, 0x65, 0x72, 0x10, 0xb2,
- 0x09, 0x12, 0x19, 0x0a, 0x14, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x47, 0x69, 0x72, 0x64, 0x41, 0x6d,
- 0x6f, 0x75, 0x6e, 0x74, 0x55, 0x70, 0x70, 0x65, 0x72, 0x10, 0xb3, 0x09, 0x12, 0x19, 0x0a, 0x14,
- 0x49, 0x74, 0x65, 0x6d, 0x73, 0x55, 0x73, 0x65, 0x4e, 0x6f, 0x74, 0x53, 0x75, 0x70, 0x70, 0x6f,
- 0x72, 0x74, 0x65, 0x64, 0x10, 0xb4, 0x09, 0x12, 0x16, 0x0a, 0x11, 0x49, 0x74, 0x65, 0x6d, 0x73,
- 0x55, 0x73, 0x65, 0x4e, 0x6f, 0x43, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10, 0xb5, 0x09, 0x12,
- 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0x94,
- 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67,
- 0x68, 0x10, 0x95, 0x0a, 0x12, 0x0e, 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x4c,
- 0x76, 0x10, 0x96, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x6e, 0x69, 0x74,
- 0x43, 0x72, 0x65, 0x61, 0x74, 0x10, 0x97, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f,
- 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x45, 0x72, 0x72, 0x10, 0x98, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48,
- 0x65, 0x72, 0x6f, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x55, 0x70, 0x45, 0x72, 0x72, 0x10, 0x99, 0x0a,
- 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x52, 0x65, 0x73, 0x6f, 0x6e,
- 0x61, 0x74, 0x65, 0x10, 0x9a, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f,
- 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x10, 0x9b, 0x0a, 0x12, 0x18, 0x0a, 0x13, 0x48,
- 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x74, 0x4e, 0x65, 0x65, 0x64, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61,
- 0x74, 0x65, 0x10, 0x9c, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45,
- 0x6e, 0x65, 0x72, 0x67, 0x79, 0x10, 0x9d, 0x0a, 0x12, 0x0f, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f,
- 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x10, 0x9e, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72,
- 0x6f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x10, 0x9f, 0x0a, 0x12,
- 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e,
- 0x10, 0xa0, 0x0a, 0x12, 0x0f, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x73, 0x4c, 0x6f, 0x63,
- 0x6b, 0x10, 0xa1, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x43,
- 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xa2, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x43,
- 0x6f, 0x73, 0x74, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa3, 0x0a, 0x12, 0x10, 0x0a,
- 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x45, 0x72, 0x72, 0x10, 0xa4, 0x0a, 0x12,
- 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa5,
- 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x54, 0x79, 0x70, 0x65,
- 0x45, 0x72, 0x72, 0x10, 0xa6, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x64,
- 0x64, 0x4d, 0x61, 0x78, 0x45, 0x78, 0x70, 0x10, 0xa7, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65,
- 0x72, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0xa8, 0x0a, 0x12, 0x12,
- 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x53, 0x74, 0x61, 0x72, 0x4c, 0x76, 0x10,
- 0xa9, 0x0a, 0x12, 0x19, 0x0a, 0x14, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x54, 0x79,
- 0x70, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xaa, 0x0a, 0x12, 0x13, 0x0a,
- 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x10,
- 0xab, 0x0a, 0x12, 0x1c, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64,
- 0x79, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x10, 0xac, 0x0a,
- 0x12, 0x1e, 0x0a, 0x19, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x6e, 0x46,
- 0x6f, 0x75, 0x6e, 0x64, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0xf8, 0x0a,
- 0x12, 0x1c, 0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4c, 0x76, 0x6c,
- 0x69, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xf9, 0x0a, 0x12, 0x14,
- 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x73, 0x57, 0x6f, 0x72,
- 0x6e, 0x10, 0xfa, 0x0a, 0x12, 0x17, 0x0a, 0x12, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e,
- 0x74, 0x4e, 0x6f, 0x43, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10, 0xfb, 0x0a, 0x12, 0x1b, 0x0a,
- 0x16, 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, 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, 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, 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, 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, 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, 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, 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, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
- 0x33,
+ 0x0b, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x65, 0x64, 0x10, 0x69, 0x12, 0x0c,
+ 0x0a, 0x08, 0x4e, 0x6f, 0x4f, 0x70, 0x65, 0x6e, 0x65, 0x64, 0x10, 0x6a, 0x12, 0x12, 0x0a, 0x0d,
+ 0x53, 0x65, 0x63, 0x4b, 0x65, 0x79, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0xe8, 0x07,
+ 0x12, 0x0b, 0x0a, 0x06, 0x53, 0x65, 0x63, 0x4b, 0x65, 0x79, 0x10, 0xe9, 0x07, 0x12, 0x0d, 0x0a,
+ 0x08, 0x42, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x10, 0xea, 0x07, 0x12, 0x11, 0x0a, 0x0c,
+ 0x47, 0x6f, 0x6c, 0x64, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xeb, 0x07, 0x12,
+ 0x14, 0x0a, 0x0f, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75,
+ 0x67, 0x68, 0x10, 0xec, 0x07, 0x12, 0x10, 0x0a, 0x0b, 0x52, 0x6f, 0x6c, 0x65, 0x43, 0x72, 0x65,
+ 0x61, 0x74, 0x65, 0x64, 0x10, 0xed, 0x07, 0x12, 0x16, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4e,
+ 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0xee, 0x07, 0x12,
+ 0x14, 0x0a, 0x0f, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x4e, 0x6f, 0x56, 0x61, 0x6c,
+ 0x69, 0x64, 0x10, 0xef, 0x07, 0x12, 0x14, 0x0a, 0x0f, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64,
+ 0x65, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x10, 0xf0, 0x07, 0x12, 0x12, 0x0a, 0x0d, 0x55,
+ 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x65, 0x74, 0x44, 0x61, 0x74, 0x61, 0x10, 0xf1, 0x07, 0x12,
+ 0x16, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x4e, 0x61, 0x6d, 0x65, 0x43,
+ 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xf2, 0x07, 0x12, 0x16, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4e,
+ 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xf3, 0x07, 0x12,
+ 0x13, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x4e, 0x75, 0x6c,
+ 0x6c, 0x10, 0xf4, 0x07, 0x12, 0x14, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x4e,
+ 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf5, 0x07, 0x12, 0x17, 0x0a, 0x12, 0x55, 0x73,
+ 0x65, 0x72, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68,
+ 0x10, 0xf6, 0x07, 0x12, 0x1c, 0x0a, 0x17, 0x55, 0x73, 0x65, 0x72, 0x53, 0x6f, 0x63, 0x69, 0x61,
+ 0x74, 0x79, 0x43, 0x6f, 0x69, 0x6e, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf7,
+ 0x07, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4e, 0x6f, 0x74, 0x53, 0x65,
+ 0x6c, 0x66, 0x10, 0xcc, 0x08, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53,
+ 0x65, 0x6c, 0x66, 0x4d, 0x61, 0x78, 0x10, 0xcd, 0x08, 0x12, 0x14, 0x0a, 0x0f, 0x46, 0x72, 0x69,
+ 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4d, 0x61, 0x78, 0x10, 0xce, 0x08, 0x12,
+ 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x6c, 0x66, 0x4e, 0x6f, 0x44,
+ 0x61, 0x74, 0x61, 0x10, 0xcf, 0x08, 0x12, 0x17, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
+ 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xd0, 0x08, 0x12,
+ 0x0e, 0x0a, 0x09, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x59, 0x65, 0x74, 0x10, 0xd1, 0x08, 0x12,
+ 0x13, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x59, 0x65,
+ 0x74, 0x10, 0xd2, 0x08, 0x12, 0x17, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65,
+ 0x6c, 0x66, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x59, 0x65, 0x74, 0x10, 0xd3, 0x08, 0x12, 0x19, 0x0a,
+ 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x42, 0x6c, 0x61,
+ 0x63, 0x6b, 0x59, 0x65, 0x74, 0x10, 0xd4, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65,
+ 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xd5, 0x08, 0x12,
+ 0x13, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4d, 0x61,
+ 0x78, 0x10, 0xd6, 0x08, 0x12, 0x1a, 0x0a, 0x15, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65,
+ 0x61, 0x72, 0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xd7, 0x08,
+ 0x12, 0x10, 0x0a, 0x0b, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x65, 0x64, 0x10,
+ 0xd8, 0x08, 0x12, 0x16, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x72,
+ 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xd9, 0x08, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72,
+ 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x66, 0x10, 0xda, 0x08, 0x12, 0x15,
+ 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4c, 0x69, 0x6d,
+ 0x69, 0x74, 0x10, 0xdb, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4e,
+ 0x6f, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xdc, 0x08, 0x12, 0x12, 0x0a, 0x0d,
+ 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xb0, 0x09,
+ 0x12, 0x15, 0x0a, 0x10, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64,
+ 0x47, 0x69, 0x72, 0x64, 0x10, 0xb1, 0x09, 0x12, 0x16, 0x0a, 0x11, 0x49, 0x74, 0x65, 0x6d, 0x73,
+ 0x47, 0x72, 0x69, 0x64, 0x4e, 0x75, 0x6d, 0x55, 0x70, 0x70, 0x65, 0x72, 0x10, 0xb2, 0x09, 0x12,
+ 0x19, 0x0a, 0x14, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x47, 0x69, 0x72, 0x64, 0x41, 0x6d, 0x6f, 0x75,
+ 0x6e, 0x74, 0x55, 0x70, 0x70, 0x65, 0x72, 0x10, 0xb3, 0x09, 0x12, 0x19, 0x0a, 0x14, 0x49, 0x74,
+ 0x65, 0x6d, 0x73, 0x55, 0x73, 0x65, 0x4e, 0x6f, 0x74, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74,
+ 0x65, 0x64, 0x10, 0xb4, 0x09, 0x12, 0x16, 0x0a, 0x11, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x55, 0x73,
+ 0x65, 0x4e, 0x6f, 0x43, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10, 0xb5, 0x09, 0x12, 0x10, 0x0a,
+ 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0x94, 0x0a, 0x12,
+ 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10,
+ 0x95, 0x0a, 0x12, 0x0e, 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10,
+ 0x96, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x6e, 0x69, 0x74, 0x43, 0x72,
+ 0x65, 0x61, 0x74, 0x10, 0x97, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x6f,
+ 0x6c, 0x6f, 0x72, 0x45, 0x72, 0x72, 0x10, 0x98, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72,
+ 0x6f, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x55, 0x70, 0x45, 0x72, 0x72, 0x10, 0x99, 0x0a, 0x12, 0x14,
+ 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74,
+ 0x65, 0x10, 0x9a, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x52, 0x65,
+ 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x10, 0x9b, 0x0a, 0x12, 0x18, 0x0a, 0x13, 0x48, 0x65, 0x72,
+ 0x6f, 0x4e, 0x6f, 0x74, 0x4e, 0x65, 0x65, 0x64, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65,
+ 0x10, 0x9c, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x65,
+ 0x72, 0x67, 0x79, 0x10, 0x9d, 0x0a, 0x12, 0x0f, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x72,
+ 0x65, 0x61, 0x74, 0x65, 0x10, 0x9e, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x45,
+ 0x71, 0x75, 0x69, 0x70, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x10, 0x9f, 0x0a, 0x12, 0x12, 0x0a,
+ 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x10, 0xa0,
+ 0x0a, 0x12, 0x0f, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x73, 0x4c, 0x6f, 0x63, 0x6b, 0x10,
+ 0xa1, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75,
+ 0x6e, 0x74, 0x10, 0xa2, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x73,
+ 0x74, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa3, 0x0a, 0x12, 0x10, 0x0a, 0x0b, 0x48,
+ 0x65, 0x72, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x45, 0x72, 0x72, 0x10, 0xa4, 0x0a, 0x12, 0x10, 0x0a,
+ 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa5, 0x0a, 0x12,
+ 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72,
+ 0x72, 0x10, 0xa6, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x64, 0x64, 0x4d,
+ 0x61, 0x78, 0x45, 0x78, 0x70, 0x10, 0xa7, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f,
+ 0x53, 0x74, 0x61, 0x72, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0xa8, 0x0a, 0x12, 0x12, 0x0a, 0x0d,
+ 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x53, 0x74, 0x61, 0x72, 0x4c, 0x76, 0x10, 0xa9, 0x0a,
+ 0x12, 0x19, 0x0a, 0x14, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x54, 0x79, 0x70, 0x65,
+ 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xaa, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48,
+ 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x10, 0xab, 0x0a,
+ 0x12, 0x1c, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x4b,
+ 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x10, 0xac, 0x0a, 0x12, 0x1e,
+ 0x0a, 0x19, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x6e, 0x46, 0x6f, 0x75,
+ 0x6e, 0x64, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0xf8, 0x0a, 0x12, 0x1c,
+ 0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4c, 0x76, 0x6c, 0x69, 0x6d,
+ 0x69, 0x74, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xf9, 0x0a, 0x12, 0x14, 0x0a, 0x0f,
+ 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x73, 0x57, 0x6f, 0x72, 0x6e, 0x10,
+ 0xfa, 0x0a, 0x12, 0x17, 0x0a, 0x12, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4e,
+ 0x6f, 0x43, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10, 0xfb, 0x0a, 0x12, 0x1b, 0x0a, 0x16, 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, 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, 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, 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, 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, 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, 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, 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,
+ 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, 0x42,
+ 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/pb/hero_db.pb.go b/pb/hero_db.pb.go
index f8c467e82..2e0fb5712 100644
--- a/pb/hero_db.pb.go
+++ b/pb/hero_db.pb.go
@@ -440,6 +440,8 @@ type DBHeroRecord struct {
Star5Hero map[string]int32 `protobuf:"bytes,8,rep,name=star5Hero,proto3" json:"star5Hero" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 第totalcount 次抽到的5星英雄 key 英雄id
Totalcount int32 `protobuf:"varint,9,opt,name=totalcount,proto3" json:"totalcount"` // 总的累计抽卡次数
Daycount int32 `protobuf:"varint,10,opt,name=daycount,proto3" json:"daycount"` // 今天抽卡次数
+ Onebuy int32 `protobuf:"varint,11,opt,name=onebuy,proto3" json:"onebuy"` // 单次购买次数
+ Tenbuy int32 `protobuf:"varint,12,opt,name=tenbuy,proto3" json:"tenbuy"` // 十连购买次数
}
func (x *DBHeroRecord) Reset() {
@@ -544,6 +546,20 @@ func (x *DBHeroRecord) GetDaycount() int32 {
return 0
}
+func (x *DBHeroRecord) GetOnebuy() int32 {
+ if x != nil {
+ return x.Onebuy
+ }
+ return 0
+}
+
+func (x *DBHeroRecord) GetTenbuy() int32 {
+ if x != nil {
+ return x.Tenbuy
+ }
+ return 0
+}
+
// 英雄天赋系统
type DBHeroTalent struct {
state protoimpl.MessageState
@@ -727,7 +743,7 @@ var file_hero_hero_db_proto_rawDesc = []byte{
0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x27, 0x0a, 0x05, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12,
0x0e, 0x0a, 0x02, 0x68, 0x34, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x34, 0x12,
0x0e, 0x0a, 0x02, 0x68, 0x35, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x35, 0x22,
- 0xc0, 0x03, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64,
+ 0xf0, 0x03, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 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, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x18, 0x03, 0x20, 0x01, 0x28,
@@ -747,7 +763,10 @@ var file_hero_hero_db_proto_rawDesc = []byte{
0x74, 0x61, 0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
0x74, 0x6f, 0x74, 0x61, 0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x61,
0x79, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x61,
- 0x79, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x1a, 0x3c, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74,
+ 0x79, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79,
+ 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x12, 0x16,
+ 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
+ 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x1a, 0x3c, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74,
0x69, 0x6f, 0x6e, 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,
diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go
index ab0af989c..b5cc4bc27 100644
--- a/pb/hero_msg.pb.go
+++ b/pb/hero_msg.pb.go
@@ -2105,6 +2105,108 @@ func (x *HeroTalentResetResp) GetTelnet() *DBHeroTalent {
return nil
}
+type HeroBuyReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ BuyType int32 `protobuf:"varint,1,opt,name=buyType,proto3" json:"buyType"` //类型
+ BuyCount int32 `protobuf:"varint,2,opt,name=buyCount,proto3" json:"buyCount"` // 购买的数量
+}
+
+func (x *HeroBuyReq) Reset() {
+ *x = HeroBuyReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_hero_hero_msg_proto_msgTypes[40]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *HeroBuyReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HeroBuyReq) ProtoMessage() {}
+
+func (x *HeroBuyReq) ProtoReflect() protoreflect.Message {
+ mi := &file_hero_hero_msg_proto_msgTypes[40]
+ 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 HeroBuyReq.ProtoReflect.Descriptor instead.
+func (*HeroBuyReq) Descriptor() ([]byte, []int) {
+ return file_hero_hero_msg_proto_rawDescGZIP(), []int{40}
+}
+
+func (x *HeroBuyReq) GetBuyType() int32 {
+ if x != nil {
+ return x.BuyType
+ }
+ return 0
+}
+
+func (x *HeroBuyReq) GetBuyCount() int32 {
+ if x != nil {
+ return x.BuyCount
+ }
+ return 0
+}
+
+type HeroBuyResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ IsSucc bool `protobuf:"varint,1,opt,name=IsSucc,proto3" json:"IsSucc"`
+}
+
+func (x *HeroBuyResp) Reset() {
+ *x = HeroBuyResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_hero_hero_msg_proto_msgTypes[41]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *HeroBuyResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HeroBuyResp) ProtoMessage() {}
+
+func (x *HeroBuyResp) ProtoReflect() protoreflect.Message {
+ mi := &file_hero_hero_msg_proto_msgTypes[41]
+ 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 HeroBuyResp.ProtoReflect.Descriptor instead.
+func (*HeroBuyResp) Descriptor() ([]byte, []int) {
+ return file_hero_hero_msg_proto_rawDescGZIP(), []int{41}
+}
+
+func (x *HeroBuyResp) GetIsSucc() bool {
+ if x != nil {
+ return x.IsSucc
+ }
+ return false
+}
+
var File_hero_hero_msg_proto protoreflect.FileDescriptor
var file_hero_hero_msg_proto_rawDesc = []byte{
@@ -2292,7 +2394,14 @@ var file_hero_hero_msg_proto_rawDesc = []byte{
0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x65, 0x6c,
0x6e, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65,
0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74,
- 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x22, 0x42, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x18,
+ 0x0a, 0x07, 0x62, 0x75, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x07, 0x62, 0x75, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x75, 0x79, 0x43,
+ 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x75, 0x79, 0x43,
+ 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x25, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x75, 0x79, 0x52,
+ 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+ 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -2307,7 +2416,7 @@ func file_hero_hero_msg_proto_rawDescGZIP() []byte {
return file_hero_hero_msg_proto_rawDescData
}
-var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 43)
+var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 45)
var file_hero_hero_msg_proto_goTypes = []interface{}{
(*HeroInfoReq)(nil), // 0: HeroInfoReq
(*HeroInfoResp)(nil), // 1: HeroInfoResp
@@ -2349,36 +2458,38 @@ var file_hero_hero_msg_proto_goTypes = []interface{}{
(*HeroTalentLearnResp)(nil), // 37: HeroTalentLearnResp
(*HeroTalentResetReq)(nil), // 38: HeroTalentResetReq
(*HeroTalentResetResp)(nil), // 39: HeroTalentResetResp
- nil, // 40: HeroPropertyPush.PropertyEntry
- nil, // 41: HeroPropertyPush.AddPropertyEntry
- nil, // 42: HeroFusionReq.HerosEntry
- (*DBHero)(nil), // 43: DBHero
- (*DBHeroTalent)(nil), // 44: DBHeroTalent
+ (*HeroBuyReq)(nil), // 40: HeroBuyReq
+ (*HeroBuyResp)(nil), // 41: HeroBuyResp
+ nil, // 42: HeroPropertyPush.PropertyEntry
+ nil, // 43: HeroPropertyPush.AddPropertyEntry
+ nil, // 44: HeroFusionReq.HerosEntry
+ (*DBHero)(nil), // 45: DBHero
+ (*DBHeroTalent)(nil), // 46: DBHeroTalent
}
var file_hero_hero_msg_proto_depIdxs = []int32{
- 43, // 0: HeroInfoResp.base:type_name -> DBHero
- 43, // 1: HeroListResp.list:type_name -> DBHero
+ 45, // 0: HeroInfoResp.base:type_name -> DBHero
+ 45, // 1: HeroListResp.list:type_name -> DBHero
5, // 2: HeroStrengthenUplvReq.expCards:type_name -> MapStringInt32
- 43, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero
+ 45, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero
8, // 4: HeroStrengthenUpStarReq.hero:type_name -> CostCardData
8, // 5: HeroStrengthenUpStarReq.heroRace:type_name -> CostCardData
- 43, // 6: HeroStrengthenUpStarResp.hero:type_name -> DBHero
- 43, // 7: HeroStrengthenUpSkillResp.hero:type_name -> DBHero
- 43, // 8: HeroResonanceResp.hero:type_name -> DBHero
- 43, // 9: HeroResonanceResp.upStarCard:type_name -> DBHero
- 43, // 10: HeroResonanceResetResp.hero:type_name -> DBHero
+ 45, // 6: HeroStrengthenUpStarResp.hero:type_name -> DBHero
+ 45, // 7: HeroStrengthenUpSkillResp.hero:type_name -> DBHero
+ 45, // 8: HeroResonanceResp.hero:type_name -> DBHero
+ 45, // 9: HeroResonanceResp.upStarCard:type_name -> DBHero
+ 45, // 10: HeroResonanceResetResp.hero:type_name -> DBHero
17, // 11: HeroResonanceUseEnergyReq.energy:type_name -> EnergyData
- 43, // 12: HeroResonanceUseEnergyResp.hero:type_name -> DBHero
- 43, // 13: HeroAwakenResp.hero:type_name -> DBHero
- 40, // 14: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry
- 41, // 15: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry
- 43, // 16: HeroLockResp.hero:type_name -> DBHero
- 43, // 17: HeroGetSpecifiedResp.hero:type_name -> DBHero
- 43, // 18: HeroChangePush.list:type_name -> DBHero
- 42, // 19: HeroFusionReq.heros:type_name -> HeroFusionReq.HerosEntry
- 44, // 20: HeroTalentListResp.telnet:type_name -> DBHeroTalent
- 44, // 21: HeroTalentLearnResp.telnet:type_name -> DBHeroTalent
- 44, // 22: HeroTalentResetResp.telnet:type_name -> DBHeroTalent
+ 45, // 12: HeroResonanceUseEnergyResp.hero:type_name -> DBHero
+ 45, // 13: HeroAwakenResp.hero:type_name -> DBHero
+ 42, // 14: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry
+ 43, // 15: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry
+ 45, // 16: HeroLockResp.hero:type_name -> DBHero
+ 45, // 17: HeroGetSpecifiedResp.hero:type_name -> DBHero
+ 45, // 18: HeroChangePush.list:type_name -> DBHero
+ 44, // 19: HeroFusionReq.heros:type_name -> HeroFusionReq.HerosEntry
+ 46, // 20: HeroTalentListResp.telnet:type_name -> DBHeroTalent
+ 46, // 21: HeroTalentLearnResp.telnet:type_name -> DBHeroTalent
+ 46, // 22: HeroTalentResetResp.telnet:type_name -> DBHeroTalent
23, // [23:23] is the sub-list for method output_type
23, // [23:23] is the sub-list for method input_type
23, // [23:23] is the sub-list for extension type_name
@@ -2873,6 +2984,30 @@ func file_hero_hero_msg_proto_init() {
return nil
}
}
+ file_hero_hero_msg_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*HeroBuyReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_hero_hero_msg_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*HeroBuyResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
}
type x struct{}
out := protoimpl.TypeBuilder{
@@ -2880,7 +3015,7 @@ func file_hero_hero_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_hero_hero_msg_proto_rawDesc,
NumEnums: 0,
- NumMessages: 43,
+ NumMessages: 45,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/stress/README.md b/stress/README.md
new file mode 100644
index 000000000..1b4ca058c
--- /dev/null
+++ b/stress/README.md
@@ -0,0 +1,969 @@
+# go实现的压测工具【单台机器100w连接压测实战】
+
+本文介绍压测是什么，解释压测的专属名词，教大家如何压测。介绍市面上的常见压测工具(ab、locust、Jmeter、go实现的压测工具、云压测)，对比这些压测工具，教大家如何选择一款适合自己的压测工具，本文还有两个压测实战项目：
+
+- 单台机器对 HTTP 短连接 QPS 1W+ 的压测实战
+- 单台机器 100W 长连接的压测实战
+- 对 grpc 接口进行压测
+- 支持http1.1和2.0长连接
+> 简单扩展即可支持 私有协议
+
+## 目录
+- [1、项目说明](#1项目说明)
+ - [1.1 go-stress-testing](#11-go-stress-testing)
+ - [1.2 项目体验](#12-项目体验)
+- [2、压测](#2压测)
+ - [2.1 压测是什么](#21-压测是什么)
+ - [2.2 为什么要压测](#22-为什么要压测)
+ - [2.3 压测名词解释](#23-压测名词解释)
+ - [2.3.1 压测类型解释](#231-压测类型解释)
+ - [2.3.2 压测名词解释](#232-压测名词解释)
+ - [2.3.3 机器性能指标解释](#233-机器性能指标解释)
+ - [2.3.4 访问指标解释](#234-访问指标解释)
+ - [3.4 如何计算压测指标](#24-如何计算压测指标)
+- [3、常见的压测工具](#3常见的压测工具)
+ - [3.1 ab](#31-ab)
+ - [3.2 locust](#32-locust)
+ - [3.3 JMeter](#33-JMeter)
+ - [3.4 云压测](#34-云压测)
+ - [3.4.1 云压测介绍](#341-云压测介绍)
+ - [3.4.2 阿里云 性能测试 PTS](#342-阿里云-性能测试-PTS)
+ - [3.4.3 腾讯云 压测大师 LM](#343-腾讯云-压测大师-LM)
+- [4、go-stress-testing go语言实现的压测工具](#4go-stress-testing-go语言实现的压测工具)
+ - [4.1 介绍](#41-介绍)
+ - [4.2 用法](#42-用法)
+ - [4.3 实现](#43-实现)
+ - [4.4 go-stress-testing 对 Golang web 压测](#44-go-stress-testing-对-golang-web-压测)
+ - [4.5 grpc压测](#45-grpc压测)
+- [5、压测工具的比较](#5压测工具的比较)
+ - [5.1 比较](#51-比较)
+ - [5.2 如何选择压测工具](#52-如何选择压测工具)
+- [6、单台机器100w连接压测实战](#6单台机器100w连接压测实战)
+ - [6.1 说明](#61-说明)
+ - [6.2 内核优化](#62-内核优化)
+ - [6.3 客户端配置](#63-客户端配置)
+ - [6.4 准备](#64-准备)
+ - [6.5 压测数据](#65-压测数据)
+- [7、常见问题](#7常见问题)
+- [8、总结](#8总结)
+- [9、参考文献](#9参考文献)
+
+
+## 1、项目说明
+### 1.1 go-stress-testing
+
+go 实现的压测工具，每个用户用一个协程的方式模拟，最大限度的利用 CPU 资源
+
+### 1.2 项目体验
+
+- 可以在 mac/linux/windows 不同平台下执行的命令
+
+- [go-stress-testing](https://github.com/link1st/go-stress-testing/releases) 压测工具下载地址
+
+参数说明:
+
+`-c` 表示并发数
+
+`-n` 每个并发执行请求的次数，总请求的次数 = 并发数 `*` 每个并发执行请求的次数
+
+`-u` 需要压测的地址
+
+```shell
+
+# 运行 以mac为示例
+./go-stress-testing-mac -c 1 -n 100 -u https://www.baidu.com/
+
+```
+
+- 压测结果展示
+
+执行以后，终端每秒钟都会输出一次结果，压测完成以后输出执行的压测结果
+
+压测结果展示:
+
+```
+
+─────┬───────┬───────┬───────┬────────┬────────┬────────┬────────┬────────
+ 耗时│ 并发数 │ 成功数│ 失败数 │ qps │最长耗时 │最短耗时│平均耗时 │ 错误码
+─────┼───────┼───────┼───────┼────────┼────────┼────────┼────────┼────────
+ 1s│ 1│ 8│ 0│ 8.09│ 133.16│ 110.98│ 123.56│200:8
+ 2s│ 1│ 15│ 0│ 8.02│ 138.74│ 110.98│ 124.61│200:15
+ 3s│ 1│ 23│ 0│ 7.80│ 220.43│ 110.98│ 128.18│200:23
+ 4s│ 1│ 31│ 0│ 7.83│ 220.43│ 110.23│ 127.67│200:31
+ 5s│ 1│ 39│ 0│ 7.81│ 220.43│ 110.23│ 128.03│200:39
+ 6s│ 1│ 46│ 0│ 7.72│ 220.43│ 110.23│ 129.59│200:46
+ 7s│ 1│ 54│ 0│ 7.79│ 220.43│ 110.23│ 128.42│200:54
+ 8s│ 1│ 62│ 0│ 7.81│ 220.43│ 110.23│ 128.09│200:62
+ 9s│ 1│ 70│ 0│ 7.79│ 220.43│ 110.23│ 128.33│200:70
+ 10s│ 1│ 78│ 0│ 7.82│ 220.43│ 106.47│ 127.85│200:78
+ 11s│ 1│ 84│ 0│ 7.64│ 371.02│ 106.47│ 130.96│200:84
+ 12s│ 1│ 91│ 0│ 7.63│ 371.02│ 106.47│ 131.02│200:91
+ 13s│ 1│ 99│ 0│ 7.66│ 371.02│ 106.47│ 130.54│200:99
+ 13s│ 1│ 100│ 0│ 7.66│ 371.02│ 106.47│ 130.52│200:100
+
+
+************************* 结果 stat ****************************
+处理协程数量: 1
+请求总数: 100 总请求时间: 13.055 秒 successNum: 100 failureNum: 0
+************************* 结果 end ****************************
+
+```
+
+参数解释:
+
+**耗时**: 程序运行耗时。程序每秒钟输出一次压测结果
+
+**并发数**: 并发数，启动的协程数
+
+**成功数**: 压测中，请求成功的数量
+
+**失败数**: 压测中，请求失败的数量
+
+**qps**: 当前压测的QPS(每秒钟处理请求数量)
+
+**最长耗时**: 压测中，单个请求最长的响应时长
+
+**最短耗时**: 压测中，单个请求最短的响应时长
+
+**平均耗时**: 压测中，单个请求平均的响应时长
+
+**错误码**: 压测中，接口返回的 code码:返回次数的集合
+
+## 2、压测
+### 2.1 压测是什么
+
+压测，即压力测试，是确立系统稳定性的一种测试方法，通常在系统正常运作范围之外进行，以考察其功能极限和隐患。
+
+主要检测服务器的承受能力，包括用户承受能力（多少用户同时玩基本不影响质量）、流量承受等。
+
+### 2.2 为什么要压测
+
+- 压测的目的就是通过压测(模拟真实用户的行为)，测算出机器的性能(单台机器的QPS)，从而推算出系统在承受指定用户数(100W)时，需要多少机器能支撑得住
+- 压测是在上线前为了应对未来可能达到的用户数量的一次预估(提前演练)，压测以后通过优化程序的性能或准备充足的机器，来保证用户的体验。
+
+### 2.3 压测名词解释
+#### 2.3.1 压测类型解释
+
+| 压测类型 | 解释 |
+| :---- | :---- |
+| 压力测试(Stress Testing) | 也称之为强度测试，测试一个系统的最大抗压能力，在强负载(大数据、高并发)的情况下，测试系统所能承受的最大压力，预估系统的瓶颈 |
+| 并发测试(Concurrency Testing) | 通过模拟很多用户同一时刻访问系统或对系统某一个功能进行操作，来测试系统的性能，从中发现问题(并发读写、线程控制、资源争抢) |
+| 耐久性测试(Configuration Testing) | 通过对系统在大负荷的条件下长时间运行，测试系统、机器的长时间运行下的状况,从中发现问题(内存泄漏、数据库连接池不释放、资源不回收) |
+
+
+#### 2.3.2 压测名词解释
+
+| 压测名词 | 解释 |
+| :---- | :---- |
+| 并发(Concurrency) | 指一个处理器同时处理多个任务的能力(逻辑上处理的能力) |
+| 并行(Parallel) | 多个处理器或者是多核的处理器同时处理多个不同的任务(物理上同时执行) |
+| QPS(每秒钟查询数量 Query Per Second) | 服务器每秒钟处理请求数量 (req/sec 请求数/秒 一段时间内总请求数/请求时间) |
+| 事务(Transactions) | 是用户一次或者是几次请求的集合 |
+| TPS(每秒钟处理事务数量 Transaction Per Second) | 服务器每秒钟处理事务数量(一个事务可能包括多个请求) |
+| 请求成功数(Request Success Number) | 在一次压测中，请求成功的数量 |
+| 请求失败数(Request Failures Number) | 在一次压测中，请求失败的数量 |
+| 错误率(Error Rate) | 在压测中，请求成功的数量与请求失败数量的比率 |
+| 最大响应时间(Max Response Time) | 在一次压测中，从发出请求或指令系统做出的反映(响应)的最大时间 |
+| 最少响应时间(Mininum Response Time) | 在一次压测中，从发出请求或指令系统做出的反映(响应)的最少时间 |
+| 平均响应时间(Average Response Time) | 在一次压测中，从发出请求或指令系统做出的反映(响应)的平均时间 |
+
+#### 2.3.3 机器性能指标解释
+
+| 机器性能 | 解释 |
+| :---- | :---- |
+| CUP利用率(CPU Usage) | CUP 利用率分用户态、系统态和空闲态，CPU利用率是指:CPU执行非系统空闲进程的时间与CPU总执行时间的比率 |
+| 内存使用率(Memory usage) | 内存使用率指的是此进程所开销的内存。 |
+| IO(Disk input/ output) | 磁盘的读写包速率 |
+| 网卡负载(Network Load) | 网卡的进出带宽,包量 |
+
+#### 2.3.4 访问指标解释
+
+| 访问 | 解释 |
+| :---- | :---- |
+| PV(页面浏览量 Page View) | 用户每打开1个网站页面，记录1个PV。用户多次打开同一页面，PV值累计多次 |
+| UV(网站独立访客 Unique Visitor) | 通过互联网访问、流量网站的自然人。1天内相同访客多次访问网站，只计算为1个独立访客 |
+
+### 2.4 如何计算压测指标
+
+- 压测我们需要有目的性的压测，这次压测我们需要达到什么目标(如:单台机器的性能为 100QPS?网站能同时满足100W人同时在线)
+- 可以通过以下计算方法来进行计算:
+- 压测原则:每天80%的访问量集中在20%的时间里，这20%的时间就叫做峰值
+- 公式: ( 总PV数`*`80% ) / ( 每天的秒数`*`20% ) = 峰值时间每秒钟请求数(QPS)
+- 机器: 峰值时间每秒钟请求数(QPS) / 单台机器的QPS = 需要的机器的数量
+
+- 假设:网站每天的用户数(100W)，每天的用户的访问量约为3000W PV，这台机器的需要多少QPS?
+> ( 30000000\*0.8 ) / (86400 * 0.2) ≈ 1389 (QPS)
+
+- 假设:单台机器的的QPS是69，需要需要多少台机器来支撑？
+> 1389 / 69 ≈ 20
+
+## 3、常见的压测工具
+### 3.1 ab
+- 简介
+
+ApacheBench 是 Apache 服务器自带的一个web压力测试工具，简称 ab。ab 又是一个命令行工具，对发起负载的本机要求很低，根据 ab 命令可以创建很多的并发访问线程，模拟多个访问者同时对某一 URL 地址进行访问，因此可以用来测试目标服务器的负载压力。总的来说 ab 工具小巧简单，上手学习较快，可以提供需要的基本性能指标，但是没有图形化结果，不能监控。
+
+ab 属于一个轻量级的压测工具，结果不会特别准确，可以用作参考。
+
+- 安装
+
+```shell
+# 在linux环境安装
+sudo yum -y install httpd
+```
+
+- 用法
+
+```
+Usage: ab [options] [http[s]://]hostname[:port]/path
+用法：ab [选项] 地址
+
+选项：
+Options are:
+ -n requests #执行的请求数，即一共发起多少请求。
+ -c concurrency #请求并发数。
+ -s timeout #指定每个请求的超时时间，默认是30秒。
+ -k #启用HTTP KeepAlive功能，即在一个HTTP会话中执行多个请求。默认时，不启用KeepAlive功能。
+```
+
+- 压测命令
+
+```shell
+# 使用ab压测工具，对百度的链接 请求100次，并发数1
+ab -n 100 -c 1 https://www.baidu.com/
+```
+
+压测结果
+
+```
+~ >ab -n 100 -c 1 https://www.baidu.com/
+This is ApacheBench, Version 2.3 <$Revision: 1430300 $>
+Copyright 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/
+Licensed to The Apache Software Foundation, http://www.apache.org/
+
+Benchmarking www.baidu.com (be patient).....done
+
+
+Server Software: BWS/1.1
+Server Hostname: www.baidu.com
+Server Port: 443
+SSL/TLS Protocol: TLSv1.2,ECDHE-RSA-AES128-GCM-SHA256,2048,128
+
+Document Path: /
+Document Length: 227 bytes
+
+Concurrency Level: 1
+Time taken for tests: 9.430 seconds
+Complete requests: 100
+Failed requests: 0
+Write errors: 0
+Total transferred: 89300 bytes
+HTML transferred: 22700 bytes
+Requests per second: 10.60 [#/sec] (mean)
+Time per request: 94.301 [ms] (mean)
+Time per request: 94.301 [ms] (mean, across all concurrent requests)
+Transfer rate: 9.25 [Kbytes/sec] received
+
+Connection Times (ms)
+ min mean[+/-sd] median max
+Connect: 54 70 16.5 69 180
+Processing: 18 24 12.0 23 140
+Waiting: 18 24 12.0 23 139
+Total: 72 94 20.5 93 203
+
+Percentage of the requests served within a certain time (ms)
+ 50% 93
+ 66% 99
+ 75% 101
+ 80% 102
+ 90% 108
+ 95% 122
+ 98% 196
+ 99% 203
+ 100% 203 (longest request)
+```
+
+- 主要关注的测试指标
+
+- `Concurrency Level` 并发请求数
+
+- `Time taken for tests` 整个测试时间
+
+- `Complete requests` 完成请求个数
+
+- `Failed requests` 失败个数
+
+- `Requests per second` 吞吐量，指的是某个并发用户下单位时间内处理的请求数。等效于 QPS，其实可以看作同一个统计方式，只是叫法不同而已。
+
+- `Time per request` 用户平均请求等待时间
+
+- `Time per request` 服务器处理时间
+
+### 3.2 Locust
+
+- 简介
+
+是非常简单易用、分布式、python 开发的压力测试工具。有图形化界面，支持将压测数据导出。
+
+- 安装
+
+```shell
+# pip3 安装locust
+pip3 install locust
+# 查看是否安装成功
+locust -h
+# 运行 Locust 分布在多个进程/机器库
+pip3 install pyzmq
+# webSocket 压测库
+pip3 install websocket-client
+```
+
+- 用法
+
+编写压测脚本 **test.py**
+
+```python
+from locust import HttpUser, TaskSet, task
+
+# 定义用户行为
+class UserBehavior(TaskSet):
+
+ @task
+ def baidu_index(self):
+ self.client.get("/")
+
+class WebsiteUser(HttpUser):
+ task = [UserBehavior] # 指向一个定义的用户行为类
+ min_wait = 3000 # 执行事务之间用户等待时间的下界（单位：毫秒）
+ max_wait = 6000 # 执行事务之间用户等待时间的上界（单位：毫秒）
+```
+
+- 启动压测
+
+```shell
+locust -f test.py --host=https://www.baidu.com
+```
+
+访问 http://localhost:8089 进入压测首页
+
+Number of users to simulate 模拟用户数
+
+Hatch rate (users spawned/second) 每秒钟增加用户数
+
+点击 "Start swarming" 进入压测页面
+
+
+
+
+
+压测界面右上角有:被压测的地址、当前状态、RPS、失败率、开始或重启按钮
+
+性能测试参数
+
+- `Type` 请求的类型，例如GET/POST
+
+- `Name` 请求的路径
+
+- `Request` 当前请求的数量
+
+- `Fails` 当前请求失败的数量
+
+- `Median` 中间值，单位毫秒，请求响应时间的中间值
+
+- `Average` 平均值，单位毫秒，请求的平均响应时间
+
+- `Min` 请求的最小服务器响应时间，单位毫秒
+
+- `Max` 请求的最大服务器响应时间，单位毫秒
+
+- `Average size` 单个请求的大小，单位字节
+
+- `Current RPS` 代表吞吐量(Requests Per Second的缩写)，指的是某个并发用户数下单位时间内处理的请求数。等效于QPS，其实可以看作同一个统计方式，只是叫法不同而已。
+
+
+
+### 3.3 JMeter
+
+- 简介
+
+Apache JMeter是Apache组织开发的基于Java的压力测试工具。用于对软件做压力测试，它最初被设计用于Web应用测试，但后来扩展到其他测试领域。
+JMeter能够对应用程序做功能/回归测试，通过创建带有断言的脚本来验证你的程序返回了你期望的结果。
+
+- 安装
+
+访问 https://jmeter-plugins.org/install/Install/ 下载解压以后即可使用
+
+- 用法
+
+JMeter的功能过于强大，这里暂时不介绍用法，可以查询相关文档使用(参考文献中有推荐的教程文档)
+
+
+### 3.4 云压测
+
+#### 3.4.1 云压测介绍
+
+顾名思义就是将压测脚本部署在云端，通过云端对对我们的应用进行全方位压测，只需要配置压测的参数，无需准备实体机，云端自动给我们分配需要压测的云主机，对被压测目标进行压测。
+
+云压测的优势:
+
+1. 轻易的实现分布式部署
+2. 能够模拟海量用户的访问
+3. 流量可以从全国各地发起，更加真实的反映用户的体验
+4. 全方位的监控压测指标
+5. 文档比较完善
+
+当然了云压测是一款商业产品，在使用的时候自然还是需要收费的，而且价格还是比较昂贵的~
+
+#### 3.4.2 阿里云 性能测试 PTS
+
+PTS（Performance Testing Service）是面向所有技术背景人员的云化测试工具。有别于传统工具的繁复，PTS以互联网化的交互，提供性能测试、API调试和监测等多种能力。自研和适配开源的功能都可以轻松模拟任意体量的用户访问业务的场景，任务随时发起，免去繁琐的搭建和维护成本。更是紧密结合监控、流控等兄弟产品提供一站式高可用能力，高效检验和管理业务性能。
+
+阿里云同样还是支持渗透测试，通过模拟黑客对业务系统进行全面深入的安全测试。
+
+
+#### 3.4.3 腾讯云 压测大师 LM
+
+通过创建虚拟机器人模拟多用户的并发场景，提供一整套完整的服务器压测解决方案
+
+
+## 4、go-stress-testing go语言实现的压测工具
+
+### 4.1 介绍
+
+- go-stress-testing 是go语言实现的简单压测工具，源码开源、支持二次开发，可以压测http、webSocket请求、私有rpc调用，使用协程模拟单个用户，可以更高效的利用CPU资源。
+
+- 项目地址 [https://github.com/link1st/go-stress-testing](https://github.com/link1st/go-stress-testing)
+
+### 4.2 用法
+
+- [go-stress-testing](https://github.com/link1st/go-stress-testing/releases) 下载地址
+- clone 项目源码运行的时候，需要将项目 clone 到 **$GOPATH** 目录下
+- 支持参数:
+
+```
+Usage of ./go-stress-testing-mac:
+ -c uint
+ 并发数 (default 1)
+ -n uint
+ 请求数(单个并发/协程) (default 1)
+ -u string
+ 压测地址
+ -d string
+ 调试模式 (default "false")
+ -http2
+ 是否开http2.0
+ -k 是否开启长连接
+ -m int
+ 单个host最大连接数 (default 1)
+ -H value
+ 自定义头信息传递给服务器 示例:-H 'Content-Type: application/json'
+ -data string
+ HTTP POST方式传送数据
+ -v string
+ 验证方法 http 支持:statusCode、json webSocket支持:json
+ -p string
+ curl文件路径
+```
+
+- `-n` 是单个用户请求的次数，请求总次数 = `-c`* `-n`， 这里考虑的是模拟用户行为，所以这个是每个用户请求的次数
+
+- 下载以后执行下面命令即可压测
+
+- 使用示例:
+
+```
+# 查看用法
+./go-stress-testing-mac
+
+# 使用请求百度页面
+./go-stress-testing-mac -c 1 -n 100 -u https://www.baidu.com/
+
+# 使用debug模式请求百度页面
+./go-stress-testing-mac -c 1 -n 1 -d true -u https://www.baidu.com/
+
+# 使用 curl文件(文件在curl目录下) 的方式请求
+./go-stress-testing-mac -c 1 -n 1 -p curl/baidu.curl.txt
+
+# 压测webSocket连接
+./go-stress-testing-mac -c 10 -n 10 -u ws://127.0.0.1:8089/acc
+```
+
+- 完整压测命令示例
+```shell script
+# 更多参数 支持 header、post body
+go run main.go -c 1 -n 1 -d true -u 'https://page.aliyun.com/delivery/plan/list' \
+ -H 'authority: page.aliyun.com' \
+ -H 'accept: application/json, text/plain, */*' \
+ -H 'content-type: application/x-www-form-urlencoded' \
+ -H 'origin: https://cn.aliyun.com' \
+ -H 'sec-fetch-site: same-site' \
+ -H 'sec-fetch-mode: cors' \
+ -H 'sec-fetch-dest: empty' \
+ -H 'referer: https://cn.aliyun.com/' \
+ -H 'accept-language: zh-CN,zh;q=0.9' \
+ -H 'cookie: aliyun_choice=CN; JSESSIONID=J8866281-CKCFJ4BUZ7GDO9V89YBW1-KJ3J5V9K-GYUW7; maliyun_temporary_console0=1AbLByOMHeZe3G41KYd5WWZvrM%2BGErkaLcWfBbgveKA9ifboArprPASvFUUfhwHtt44qsDwVqMk8Wkdr1F5LccYk2mPCZJiXb0q%2Bllj5u3SQGQurtyPqnG489y%2FkoA%2FEvOwsXJTvXTFQPK%2BGJD4FJg%3D%3D; cna=L3Q5F8cHDGgCAXL3r8fEZtdU; isg=BFNThsmSCcgX-sUcc5Jo2s2T4tF9COfKYi8g9wVwr3KphHMmjdh3GrHFvPTqJD_C; l=eBaceXLnQGBjstRJBOfwPurza77OSIRAguPzaNbMiT5POw1B5WAlWZbqyNY6C3GVh6lwR37EODnaBeYBc3K-nxvOu9eFfGMmn' \
+ -data 'adPlanQueryParam=%7B%22adZone%22%3A%7B%22positionList%22%3A%5B%7B%22positionId%22%3A83%7D%5D%7D%2C%22requestId%22%3A%2217958651-f205-44c7-ad5d-f8af92a6217a%22%7D'
+```
+
+- 使用 curl文件进行压测
+
+curl是Linux在命令行下的工作的文件传输工具，是一款很强大的http命令行工具。
+
+使用curl文件可以压测使用非GET的请求，支持设置http请求的 method、cookies、header、body等参数
+
+
+**I:** chrome 浏览器生成 curl文件，打开开发者模式(快捷键F12)，如图所示，生成 curl 在终端执行命令
+
+
+**II:** postman 生成 curl 命令
+
+
+生成内容粘贴到项目目录下的**curl/baidu.curl.txt**文件中，执行下面命令就可以从curl.txt文件中读取需要压测的内容进行压测了
+
+```
+# 使用 curl文件(文件在curl目录下) 的方式请求
+go run main.go -c 1 -n 1 -p curl/baidu.curl.txt
+```
+
+
+### 4.3 实现
+
+- 具体需求可以查看项目源码
+
+- 项目目录结构
+
+```
+|____main.go // main函数，获取命令行参数
+|____server // 处理程序目录
+| |____dispose.go // 压测启动，注册验证器、启动统计函数、启动协程进行压测
+| |____statistics // 统计目录
+| | |____statistics.go // 接收压测统计结果并处理
+| |____golink // 建立连接目录
+| | |____http_link.go // http建立连接
+| | |____websocket_link.go // webSocket建立连接
+| |____client // 请求数据客户端目录
+| | |____http_client.go // http客户端
+| | |____websocket_client.go // webSocket客户端
+| |____verify // 对返回数据校验目录
+| | |____http_verify.go // http返回数据校验
+| | |____websokcet_verify.go // webSocket返回数据校验
+|____heper // 通用函数目录
+| |____heper.go // 通用函数
+|____model // 模型目录
+| |____request_model.go // 请求数据模型
+| |____curl_model.go // curl文件解析
+|____vendor // 项目依赖目录
+```
+
+
+### 4.4 go-stress-testing 对 Golang web 压测
+
+
+这里使用go-stress-testing对go server进行压测(部署在同一台机器上)，并统计压测结果
+
+- 申请的服务器配置
+
+CPU: 4核 (Intel Xeon(Cascade Lake) Platinum 8269 2.5 GHz/3.2 GHz)
+
+内存: 16G
+硬盘: 20G SSD
+系统: CentOS 7.6
+
+go version: go1.12.9 linux/amd64
+
+
+
+- go server
+
+```golangpackage main
+
+import (
+ "log"
+ "net/http"
+ "runtime"
+)
+
+const (
+ httpPort = "8088"
+)
+
+func main() {
+
+ runtime.GOMAXPROCS(runtime.NumCPU() - 1)
+
+ hello := func(w http.ResponseWriter, req *http.Request) {
+ data := "Hello, go-stress-testing! \n"
+
+ w.Header().Add("Server", "golang")
+ w.Write([]byte(data))
+
+ return
+ }
+
+ http.HandleFunc("/", hello)
+ err := http.ListenAndServe(":"+httpPort, nil)
+
+ if err != nil {
+ log.Fatal("ListenAndServe: ", err)
+ }
+}
+
+```
+
+- go_stress_testing 压测命令
+
+```
+./go-stress-testing-linux -c 100 -n 10000 -u http://127.0.0.1:8088/
+```
+
+
+- 压测结果
+- [压测结果 示例](https://github.com/link1st/go-stress-testing/issues/32)
+
+| 并发数 | go_stress_testing QPS |
+| :----: | :----: |
+| 1 | 6394.86 |
+| 4 | 16909.36 |
+| 10 | 18456.81 |
+| 20 | 19490.50 |
+| 30 | 19947.47 |
+| 50 | 19922.56 |
+| 80 | 19155.33 |
+| 100 | 18336.46 |
+
+从压测的结果上看：效果还不错，压测QPS有接近2W
+
+### 4.5 grpc压测
+- 介绍如何压测 grpc 接口
+> [添加对 grpc 接口压测 commit](https://github.com/link1st/go-stress-testing/commit/2b4b14aaf026d08276531cf76f42de90efd3bc61)
+- 1. 启动Server
+```shell script
+# 进入 grpc server 目录
+cd tests/grpc
+
+# 启动 grpc server
+go run main.go
+```
+
+- 2. 对 grpc server 协议进行压测
+```
+# 回到项目根目录
+go run main.go -c 300 -n 1000 -u grpc://127.0.0.1:8099 -data world
+
+开始启动 并发数:300 请求数:1000 请求参数:
+request:
+ form:grpc
+ url:grpc://127.0.0.1:8099
+ method:POST
+ headers:map[Content-Type:application/x-www-form-urlencoded; charset=utf-8]
+ data:world
+ verify:
+ timeout:30s
+ debug:false
+
+─────┬───────┬───────┬───────┬────────┬────────┬────────┬────────┬────────┬────────┬────────
+ 耗时 │ 并发数 │ 成功数 │ 失败数 │ qps │最长耗时 │最短耗时 │平均耗时 │下载字节 │字节每秒 │ 错误码
+─────┼───────┼───────┼───────┼────────┼────────┼────────┼────────┼────────┼────────┼────────
+ 1s│ 186│ 14086│ 0│34177.69│ 22.40│ 0.63│ 8.78│ │ │200:14086
+ 2s│ 265│ 30408│ 0│26005.09│ 32.68│ 0.63│ 11.54│ │ │200:30408
+ 3s│ 300│ 46747│ 0│21890.46│ 40.84│ 0.63│ 13.70│ │ │200:46747
+ 4s│ 300│ 62837│ 0│20057.06│ 45.81│ 0.63│ 14.96│ │ │200:62837
+ 5s│ 300│ 79119│ 0│19134.52│ 45.81│ 0.63│ 15.68│ │ │200:79119
+```
+
+- 如何扩展其它私有协议
+> 由于私有协议、grpc 协议 都涉及到代码的书写，所以需要 编写go 的代码才能完成
+> 参考 [添加对 grpc 接口压测 commit](https://github.com/link1st/go-stress-testing/commit/2b4b14aaf026d08276531cf76f42de90efd3bc61)
+
+## 5、压测工具的比较
+### 5.1 比较
+
+| - | ab | locust | Jmeter | go-stress-testing | 云压测 |
+| :---- | :---- | :---- | :---- | :---- | :---- |
+| 实现语言 | C | Python | Java | Golang | - |
+| UI界面 | 无 | 有 | 有 | 无 | 无 |
+| 优势 | 使用简单，上手简单 | 支持分布式、压测数据支持导出 | 插件丰富，支持生成HTML报告 | 项目开源，使用简单，没有依赖，支持webSocket压测 | 更加真实的模拟用户，支持更高的压测力度 |
+
+
+### 5.2 如何选择压测工具
+
+这个世界上**没有最好的，只有最适合的**，工具千千万，选择一款适合你的才是最重要的
+
+在实际使用中有各种场景，选择工具的时候就需要考虑这些:
+
+* 明确你的目的，需要做什么压测、压测的目标是什么？
+
+* 使用的工具你是否熟悉，你愿意花多大的成本了解它？
+
+* 你是为了测试还是想了解其中的原理？
+
+* 工具是否能支持你需要压测的场景
+
+
+## 6、单台机器100w连接压测实战
+### 6.1 说明
+
+之前写了一篇文章，[基于websocket单台机器支持百万连接分布式聊天(IM)系统](https://github.com/link1st/gowebsocket)(不了解这个项目可以查看上一篇或搜索一下文章)，这里我们要实现单台机器支持100W连接的压测
+
+目标:
+
+* 单台机器能保持100W个长连接
+* 机器的CPU、内存、网络、I/O 状态都正常
+
+说明:
+
+gowebsocket 分布式聊天(IM)系统:
+
+* 之前用户连接以后有个全员广播，这里需要将用户连接、退出等事件关闭
+
+
+- 服务器准备:
+> 由于自己手上没有自己的服务器，所以需要临时购买的云服务器
+
+压测服务器:
+
+16台(稍后解释为什么需要16台机器)
+
+CPU: 2核
+内存: 8G
+硬盘: 20G
+系统: CentOS 7.6
+
+
+
+
+被压测服务:
+
+1台
+
+CPU: 4核
+内存: 32G
+硬盘: 20G SSD
+系统: CentOS 7.6
+
+
+
+
+### 6.2 内核优化
+
+- 修改程序最大打开文件数
+
+被压测服务器需要保持100W长连接，客户和服务器端是通过socket通讯的，每个连接需要建立一个socket，程序需要保持100W长连接就需要单个程序能打开100W个文件句柄
+
+
+```
+# 查看系统默认的值
+ulimit -n
+# 设置最大打开文件数
+ulimit -n 1040000
+```
+
+这里设置的要超过100W，程序除了有100W连接还有其它资源连接(数据库、资源等连接)，这里设置为 104W
+
+centOS 7.6 上述设置不生效，需要手动修改配置文件
+
+`vim /etc/security/limits.conf`
+
+这里需要把硬限制和软限制、root用户和所有用户都设置为 1040000
+
+core 是限制内核文件的大小，这里设置为 unlimited
+
+```
+# 添加以下参数
+root soft nofile 1040000
+root hard nofile 1040000
+root soft nproc 1040000
+root hard nproc 1040000
+
+* soft nofile 1040000
+* hard nofile 1040000
+* soft nproc 1040000
+* hard nproc 1040000
+
+root soft core unlimited
+root hard core unlimited
+
+* soft core unlimited
+* hard core unlimited
+```
+
+注意:
+
+`/proc/sys/fs/file-max` 表示系统级别的能够打开的文件句柄的数量，不能小于limits中设置的值
+
+如果file-max的值小于limits设置的值会导致系统重启以后无法登录
+
+```
+# file-max 设置的值参考
+cat /proc/sys/fs/file-max
+12553500
+```
+
+修改以后重启服务器，`ulimit -n` 查看配置是否生效
+
+
+### 6.3 客户端配置
+
+由于linux端口的范围是 `0~65535(2^16-1)`这个和操作系统无关，不管linux是32位的还是64位的
+
+这个数字是由于tcp协议决定的，tcp协议头部表示端口只有16位，所以最大值只有65535(如果每台机器多几个虚拟ip就能突破这个限制)
+
+1024以下是系统保留端口，所以能使用的1024到65535
+
+如果需要100W长连接，每台机器有 65535-1024 个端口， 100W / (65535-1024) ≈ 15.5，所以这里需要16台服务器
+
+- `vim /etc/sysctl.conf` 在文件末尾添加
+
+```
+net.ipv4.ip_local_port_range = 1024 65000
+net.ipv4.tcp_mem = 786432 2097152 3145728
+net.ipv4.tcp_rmem = 4096 4096 16777216
+net.ipv4.tcp_wmem = 4096 4096 16777216
+```
+
+`sysctl -p` 修改配置以后使得配置生效命令
+
+配置解释:
+
+- `ip_local_port_range` 表示TCP/UDP协议允许使用的本地端口号 范围:1024~65000
+- `tcp_mem` 确定TCP栈应该如何反映内存使用，每个值的单位都是内存页（通常是4KB）。第一个值是内存使用的下限；第二个值是内存压力模式开始对缓冲区使用应用压力的上限；第三个值是内存使用的上限。在这个层次上可以将报文丢弃，从而减少对内存的使用。对于较大的BDP可以增大这些值（注意，其单位是内存页而不是字节）
+- `tcp_rmem` 为自动调优定义socket使用的内存。第一个值是为socket接收缓冲区分配的最少字节数；第二个值是默认值（该值会被rmem_default覆盖），缓冲区在系统负载不重的情况下可以增长到这个值；第三个值是接收缓冲区空间的最大字节数（该值会被rmem_max覆盖）。
+- `tcp_wmem` 为自动调优定义socket使用的内存。第一个值是为socket发送缓冲区分配的最少字节数；第二个值是默认值（该值会被wmem_default覆盖），缓冲区在系统负载不重的情况下可以增长到这个值；第三个值是发送缓冲区空间的最大字节数（该值会被wmem_max覆盖）。
+
+### 6.4 准备
+
+
+1. 在被压测服务器上启动Server服务(gowebsocket)
+
+2. 查看被压测服务器的内网端口
+
+3. 登录上16台压测服务器，这里我提前把需要优化的系统做成了镜像，申请机器的时候就可以直接使用这个镜像(参数已经调好)
+
+
+
+4. 启动压测
+
+```
+ ./go_stress_testing_linux -c 62500 -n 1 -u ws://192.168.0.74:443/acc
+```
+
+`62500*16 = 100W `正好可以达到我们的要求
+
+建立连接以后，`-n 1`发送一个**ping**的消息给服务器，收到响应以后保持连接不中断
+
+5. 通过 gowebsocket服务器的http接口，实时查询连接数和项目启动的协程数
+
+6. 压测过程中查看系统状态
+
+```
+# linux 命令
+ps # 查看进程内存、cup使用情况
+iostat # 查看系统IO情况
+nload # 查看网络流量情况
+/proc/pid/status # 查看进程状态
+```
+
+### 6.5 压测数据
+
+- 压测以后，查看连接数到100W，然后保持10分钟观察系统是否正常
+
+- 观察以后，系统运行正常、CPU、内存、I/O 都正常，打开页面都正常
+
+- 压测完成以后的数据
+
+查看goWebSocket连接数统计，可以看到 **clientsLen**连接数为100W，**goroutine**数量2000008个，每个连接两个goroutine加上项目启动默认的8个。这里可以看到连接数满足了100W
+
+
+
+从压测服务上查看连接数是否达到了要求，压测完成的统计数据并发数为62500，是每个客户端连接的数量,总连接数： `62500*16=100W`，
+
+
+
+- 记录内存使用情况，分别记录了1W到100W连接数内存使用情况
+
+| 连接数 | 内存 |
+| :----: | :----:|
+| 10000 | 281M |
+| 100000 | 2.7g |
+| 200000 | 5.4g |
+| 500000 | 13.1g |
+| 1000000 | 25.8g |
+
+
+100W连接时的查看内存详细数据:
+
+```
+cat /proc/pid/status
+VmSize: 27133804 kB
+```
+
+`27133804/1000000≈27.1` 100W连接，占用了25.8g的内存，粗略计算了一下，一个连接占用了27.1Kb的内存，由于goWebSocket项目每个用户连接起了两个协程处理用户的读写事件，所以内存占用稍微多一点
+
+如果需要如何减少内存使用可以参考 **@Roy11568780** 大佬给的解决方案
+> 传统的golang中是采用的一个goroutine循环read的方法对应每一个socket。实际百万链路场景中这是巨大的资源浪费，优化的原理也不是什么新东西，golang中一样也可以使用epoll的，把fd拿到epoll中，检测到事件然后在协程池里面去读就行了，看情况读写分别10-20的协程goroutine池应该就足够了
+
+至此，压测已经全部完成，单台机器支持100W连接已经满足~
+
+## 7.常见问题
+- **Q:** 压测过程中会出现大量 **TIME_WAIT**
+
+ A: 参考TCP四次挥手原理，主动关闭连接的一方会出现 **TIME_WAIT** 状态，等待的时长为 2MSL(约1分钟左右)
+
+ 原因是：主动断开的一方回复 ACK 消息可能丢失，TCP 是可靠的传输协议，在没有收到 ACK 消息的另一端会重试，重新发送FIN消息，所以主动关闭的一方会等待 2MSL 时间，防止对方重试，这就出现了大量 **TIME_WAIT** 状态（参考: 四次挥手的最后两次）
+
+TCP 握手：
+
+
+- **Q:** 没有go环境无法使用最新功能
+
+ A： 可以使用Dockerfile构建一个容器镜像，假设容器镜像名称为gostress:1111，docker build -t gostress:1111 .
+ 启动一个名称为go-stress的容器docker run -d --name=go-stress gostress:1111
+ 开始压测 docker exec -it go-stress -c 10 -n 10 -u www.baidu.com
+
+## 8、总结
+到这里压测总算完成，本次压测花费16元巨款。
+
+单台机器支持100W连接是实测是满足的，但是实际业务比较复杂，还是需要持续优化~
+
+本文通过介绍什么是压测，在什么情况下需要压测，通过单台机器100W长连接的压测实战了解Linux内核的参数的调优。如果觉得现有的压测工具不适用，可以自己实现或者是改造成属于自己的自己的工具。
+
+## 9、参考文献
+
+[性能测试工具](https://testerhome.com/topics/17068)
+
+[性能测试常见名词解释](https://blog.csdn.net/r455678/article/details/53063989)
+
+[性能测试名词解释](https://codeigniter.org.cn/forums/blog-39678-2456.html)
+
+[PV、TPS、QPS是怎么计算出来的？](https://www.zhihu.com/question/21556347)
+
+[超实用压力测试工具－ab工具](https://www.jianshu.com/p/43d04d8baaf7)
+
+[Locust 介绍](http://www.testclass.net/locust/introduce)
+
+[Jmeter性能测试 入门](https://www.cnblogs.com/TankXiao/p/4045439.html)
+
+[基于websocket单台机器支持百万连接分布式聊天(IM)系统](https://github.com/link1st/gowebsocket)
+
+[https://github.com/link1st/go-stress-testing](https://github.com/link1st/go-stress-testing)
+
+github 搜:link1st 查看项目 go-stress-testing
+
+### 意见反馈
+
+- 在项目中遇到问题可以直接在这里找找答案或者提问 [issues](https://github.com/link1st/go-stress-testing/issues)
+- 也可以添加我的微信(申请信息填写:公司、姓名，我好备注下)，直接反馈给我
+
+
+ 
+
+
+### 赞助商
+
+- 感谢[JetBrains](https://www.jetbrains.com/?from=gowebsocket)对本项目的支持！
+
+
+
+ 
+
+
diff --git a/stress/build.sh b/stress/build.sh
new file mode 100644
index 000000000..3bc98ca74
--- /dev/null
+++ b/stress/build.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# 编译mac下可以执行文件
+go build -ldflags "-s -w" -o go-stress-testing-mac main.go
+
+# 使用交叉编译 linux和windows版本可以执行的文件
+CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-s -w" -o go-stress-testing-linux main.go
+CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags "-s -w" -o go-stress-testing-win.exe main.go
diff --git a/stress/curl/.gitignore b/stress/curl/.gitignore
new file mode 100644
index 000000000..f935021a8
--- /dev/null
+++ b/stress/curl/.gitignore
@@ -0,0 +1 @@
+!.gitignore
diff --git a/stress/curl/test.chrome.curl.txt b/stress/curl/test.chrome.curl.txt
new file mode 100644
index 000000000..9f539729a
--- /dev/null
+++ b/stress/curl/test.chrome.curl.txt
@@ -0,0 +1,11 @@
+curl 'https://www.baidu.com/sugrec?prod=pc_his&from=pc_web&json=1&sid=1464_21098_31424_31341_31464_31229_30823_31163_31475&hisdata=&req=2&csor=0' \
+ -H 'Connection: keep-alive' \
+ -H 'Accept: application/json, text/javascript, */*; q=0.01' \
+ -H 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.129 Safari/537.36' \
+ -H 'Sec-Fetch-Site: same-origin' \
+ -H 'Sec-Fetch-Mode: cors' \
+ -H 'Sec-Fetch-Dest: empty' \
+ -H 'Referer: https://www.baidu.com/' \
+ -H 'Accept-Language: zh-CN,zh;q=0.9' \
+ -H 'Cookie: BIDUPSID=A2CDAA36D74F85E5007CAA415E35B9DF; PSTM=1588732560; BAIDUID=A2CDAA36D74F85E59E4B8060EC4A0230:FG=1; BD_HOME=1; BD_UPN=123253; H_PS_PSSID=1464_21098_31424_31341_31464_31229_30823_31163_31475' \
+ --compressed
\ No newline at end of file
diff --git a/stress/curl/test.curl.txt b/stress/curl/test.curl.txt
new file mode 100644
index 000000000..9f539729a
--- /dev/null
+++ b/stress/curl/test.curl.txt
@@ -0,0 +1,11 @@
+curl 'https://www.baidu.com/sugrec?prod=pc_his&from=pc_web&json=1&sid=1464_21098_31424_31341_31464_31229_30823_31163_31475&hisdata=&req=2&csor=0' \
+ -H 'Connection: keep-alive' \
+ -H 'Accept: application/json, text/javascript, */*; q=0.01' \
+ -H 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.129 Safari/537.36' \
+ -H 'Sec-Fetch-Site: same-origin' \
+ -H 'Sec-Fetch-Mode: cors' \
+ -H 'Sec-Fetch-Dest: empty' \
+ -H 'Referer: https://www.baidu.com/' \
+ -H 'Accept-Language: zh-CN,zh;q=0.9' \
+ -H 'Cookie: BIDUPSID=A2CDAA36D74F85E5007CAA415E35B9DF; PSTM=1588732560; BAIDUID=A2CDAA36D74F85E59E4B8060EC4A0230:FG=1; BD_HOME=1; BD_UPN=123253; H_PS_PSSID=1464_21098_31424_31341_31464_31229_30823_31163_31475' \
+ --compressed
\ No newline at end of file
diff --git a/stress/curl/test.post.curl.txt b/stress/curl/test.post.curl.txt
new file mode 100644
index 000000000..63f8c3b57
--- /dev/null
+++ b/stress/curl/test.post.curl.txt
@@ -0,0 +1,14 @@
+curl 'https://page.aliyun.com/delivery/plan/list' \
+ -H 'authority: page.aliyun.com' \
+ -H 'accept: application/json, text/plain, */*' \
+ -H 'user-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.129 Safari/537.36' \
+ -H 'content-type: application/x-www-form-urlencoded' \
+ -H 'origin: https://cn.aliyun.com' \
+ -H 'sec-fetch-site: same-site' \
+ -H 'sec-fetch-mode: cors' \
+ -H 'sec-fetch-dest: empty' \
+ -H 'referer: https://cn.aliyun.com/' \
+ -H 'accept-language: zh-CN,zh;q=0.9' \
+ -H 'cookie: aliyun_choice=CN; JSESSIONID=J8866281-CKCFJ4BUZ7GDO9V89YBW1-KJ3J5V9K-GYUW7; maliyun_temporary_console0=1AbLByOMHeZe3G41KYd5WWZvrM%2BGErkaLcWfBbgveKA9ifboArprPASvFUUfhwHtt44qsDwVqMk8Wkdr1F5LccYk2mPCZJiXb0q%2Bllj5u3SQGQurtyPqnG489y%2FkoA%2FEvOwsXJTvXTFQPK%2BGJD4FJg%3D%3D; cna=L3Q5F8cHDGgCAXL3r8fEZtdU; isg=BFNThsmSCcgX-sUcc5Jo2s2T4tF9COfKYi8g9wVwr3KphHMmjdh3GrHFvPTqJD_C; l=eBaceXLnQGBjstRJBOfwPurza77OSIRAguPzaNbMiT5POw1B5WAlWZbqyNY6C3GVh6lwR37EODnaBeYBc3K-nxvOu9eFfGMmn' \
+ --data 'adPlanQueryParam=%7B%22adZone%22%3A%7B%22positionList%22%3A%5B%7B%22positionId%22%3A83%7D%5D%7D%2C%22requestId%22%3A%2217958651-f205-44c7-ad5d-f8af92a6217a%22%7D' \
+ --compressed
\ No newline at end of file
diff --git a/stress/curl/test.postman.curl.txt b/stress/curl/test.postman.curl.txt
new file mode 100644
index 000000000..ad81434be
--- /dev/null
+++ b/stress/curl/test.postman.curl.txt
@@ -0,0 +1,4 @@
+curl -X GET \
+ 'https://www.baidu.com/sugrec?prod=pc_his&from=pc_web&json=1&sid=1464_21098_31424_31341_31464_31229_30823_31163_31475&hisdata=&req=2&csor=0' \
+ -H 'Postman-Token: c9b71950-61fd-43be-a38a-6596de238f0f' \
+ -H 'cache-control: no-cache'
\ No newline at end of file
diff --git a/stress/helper/helper.go b/stress/helper/helper.go
new file mode 100644
index 000000000..ea7c30636
--- /dev/null
+++ b/stress/helper/helper.go
@@ -0,0 +1,23 @@
+// Package helper 帮助函数，时间、数组的通用处理
+package helper
+
+import (
+ "time"
+)
+
+// DiffNano 时间差，纳秒
+func DiffNano(startTime time.Time) (diff int64) {
+ diff = int64(time.Since(startTime))
+ return
+}
+
+// InArrayStr 判断字符串是否在数组内
+func InArrayStr(str string, arr []string) (inArray bool) {
+ for _, s := range arr {
+ if s == str {
+ inArray = true
+ break
+ }
+ }
+ return
+}
diff --git a/stress/model/curl_model.go b/stress/model/curl_model.go
new file mode 100644
index 000000000..2e1c9b297
--- /dev/null
+++ b/stress/model/curl_model.go
@@ -0,0 +1,204 @@
+// Package model 数据模型
+package model
+
+import (
+ "encoding/json"
+ "errors"
+ "io/ioutil"
+ "os"
+ "strings"
+
+ "go_dreamfactory/stress/helper"
+)
+
+// CURL curl参数解析
+type CURL struct {
+ Data map[string][]string
+}
+
+// getDataValue 获取数据
+func (c *CURL) getDataValue(keys []string) []string {
+ var (
+ value = make([]string, 0)
+ )
+ for _, key := range keys {
+ var (
+ ok bool
+ )
+ value, ok = c.Data[key]
+ if ok {
+ break
+ }
+ }
+ return value
+}
+
+// ParseTheFile 从文件中解析curl
+func ParseTheFile(path string) (curl *CURL, err error) {
+ if path == "" {
+ err = errors.New("路径不能为空")
+ return
+ }
+ curl = &CURL{
+ Data: make(map[string][]string),
+ }
+ file, err := os.Open(path)
+ if err != nil {
+ err = errors.New("打开文件失败:" + err.Error())
+ return
+ }
+ defer func() {
+ _ = file.Close()
+ }()
+ dataBytes, err := ioutil.ReadAll(file)
+ if err != nil {
+ err = errors.New("读取文件失败:" + err.Error())
+ return
+ }
+ data := string(dataBytes)
+ for len(data) > 0 {
+ if strings.HasPrefix(data, "curl") {
+ data = data[5:]
+ }
+ data = strings.TrimSpace(data)
+ var (
+ key string
+ value string
+ )
+ index := strings.Index(data, " ")
+ if index <= 0 {
+ break
+ }
+ key = strings.TrimSpace(data[:index])
+ data = data[index+1:]
+ data = strings.TrimSpace(data)
+ // url
+ if !strings.HasPrefix(key, "-") {
+ key = strings.Trim(key, "'")
+ curl.Data["curl"] = []string{key}
+ // 去除首尾空格
+ data = strings.TrimFunc(data, func(r rune) bool {
+ if r == ' ' || r == '\\' || r == '\n' {
+ return true
+ }
+ return false
+ })
+ continue
+ }
+ if strings.HasPrefix(data, "-") {
+ continue
+ }
+ var (
+ endSymbol = " "
+ )
+ if strings.HasPrefix(data, "'") {
+ endSymbol = "'"
+ data = data[1:]
+ }
+ index = strings.Index(data, endSymbol)
+ if index <= -1 {
+ index = len(data)
+ // break
+ }
+ value = data[:index]
+ if len(data) >= index+1 {
+ data = data[index+1:]
+ } else {
+ data = ""
+ }
+ // 去除首尾空格
+ data = strings.TrimFunc(data, func(r rune) bool {
+ if r == ' ' || r == '\\' || r == '\n' {
+ return true
+ }
+ return false
+ })
+ if key == "" {
+ continue
+ }
+ curl.Data[key] = append(curl.Data[key], value)
+ }
+ return
+}
+
+// String string
+func (c *CURL) String() (url string) {
+ curlByte, _ := json.Marshal(c)
+ return string(curlByte)
+}
+
+// GetURL 获取url
+func (c *CURL) GetURL() (url string) {
+ keys := []string{"curl", "--url"}
+ value := c.getDataValue(keys)
+ if len(value) <= 0 {
+ return
+ }
+ url = value[0]
+ return
+}
+
+// GetMethod 获取 请求方式
+func (c *CURL) GetMethod() (method string) {
+ keys := []string{"-X", "--request"}
+ value := c.getDataValue(keys)
+ if len(value) <= 0 {
+ return c.defaultMethod()
+ }
+ method = strings.ToUpper(value[0])
+ if helper.InArrayStr(method, []string{"GET", "POST", "PUT", "DELETE"}) {
+ return method
+ }
+ return c.defaultMethod()
+}
+
+// defaultMethod 获取默认方法
+func (c *CURL) defaultMethod() (method string) {
+ method = "GET"
+ body := c.GetBody()
+ if len(body) > 0 {
+ return "POST"
+ }
+ return
+}
+
+// GetHeaders 获取请求头
+func (c *CURL) GetHeaders() (headers map[string]string) {
+ headers = make(map[string]string, 0)
+ keys := []string{"-H", "--header"}
+ value := c.getDataValue(keys)
+ for _, v := range value {
+ getHeaderValue(v, headers)
+ }
+ return
+}
+
+// GetHeadersStr 获取请求头string
+func (c *CURL) GetHeadersStr() string {
+ headers := c.GetHeaders()
+ bytes, _ := json.Marshal(&headers)
+ return string(bytes)
+}
+
+// GetBody 获取body
+func (c *CURL) GetBody() (body string) {
+ keys := []string{"--data", "-d", "--data-urlencode", "--data-raw", "--data-binary"}
+ value := c.getDataValue(keys)
+ if len(value) <= 0 {
+ body = c.getPostForm()
+ return
+ }
+ body = value[0]
+ return
+}
+
+// getPostForm get post form
+func (c *CURL) getPostForm() (body string) {
+ keys := []string{"--form", "-F", "--form-string"}
+ value := c.getDataValue(keys)
+ if len(value) <= 0 {
+ return
+ }
+ body = strings.Join(value, "&")
+ return
+}
diff --git a/stress/model/curl_model_test.go b/stress/model/curl_model_test.go
new file mode 100644
index 000000000..68c0b2140
--- /dev/null
+++ b/stress/model/curl_model_test.go
@@ -0,0 +1,24 @@
+// Package model 数据模型
+package model
+
+import (
+ "fmt"
+ "testing"
+)
+
+// TestCurl 测试函数
+func TestCurl(t *testing.T) {
+ // ../curl.txt
+ c, err := ParseTheFile("../curl/post.curl.txt")
+ fmt.Println(c, err)
+
+ if err != nil {
+ return
+ }
+ fmt.Printf("curl:%s \n", c.String())
+ fmt.Printf("url:%s \n", c.GetURL())
+ fmt.Printf("method:%s \n", c.GetMethod())
+ fmt.Printf("body:%v \n", c.GetBody())
+ fmt.Printf("body string:%v \n", c.GetBody())
+ fmt.Printf("headers:%s \n", c.GetHeadersStr())
+}
diff --git a/stress/model/request_model.go b/stress/model/request_model.go
new file mode 100644
index 000000000..523461590
--- /dev/null
+++ b/stress/model/request_model.go
@@ -0,0 +1,284 @@
+// Package model 请求数据模型package model
+package model
+
+import (
+ "errors"
+ "fmt"
+ "io"
+ "net/http"
+ "strings"
+ "sync"
+ "time"
+)
+
+// 返回 code 码
+const (
+ // HTTPOk 请求成功
+ HTTPOk = 200
+ // RequestErr 请求错误
+ RequestErr = 509
+ // ParseError 解析错误
+ ParseError = 510 // 解析错误
+)
+
+// 支持协议
+const (
+ // FormTypeHTTP http 协议
+ FormTypeHTTP = "http"
+ // FormTypeWebSocket webSocket 协议
+ FormTypeWebSocket = "webSocket"
+ // FormTypeGRPC grpc 协议
+ FormTypeGRPC = "grpc"
+ FormTypeRadius = "radius"
+)
+
+// 校验函数
+var (
+ // verifyMapHTTP http 校验函数
+ verifyMapHTTP = make(map[string]VerifyHTTP)
+ // verifyMapHTTPMutex http 并发锁
+ verifyMapHTTPMutex sync.RWMutex
+ // verifyMapWebSocket webSocket 校验函数
+ verifyMapWebSocket = make(map[string]VerifyWebSocket)
+ // verifyMapWebSocketMutex webSocket 并发锁
+ verifyMapWebSocketMutex sync.RWMutex
+)
+
+// RegisterVerifyHTTP 注册 http 校验函数
+func RegisterVerifyHTTP(verify string, verifyFunc VerifyHTTP) {
+ verifyMapHTTPMutex.Lock()
+ defer verifyMapHTTPMutex.Unlock()
+ key := fmt.Sprintf("%s.%s", FormTypeHTTP, verify)
+ verifyMapHTTP[key] = verifyFunc
+}
+
+// RegisterVerifyWebSocket 注册 webSocket 校验函数
+func RegisterVerifyWebSocket(verify string, verifyFunc VerifyWebSocket) {
+ verifyMapWebSocketMutex.Lock()
+ defer verifyMapWebSocketMutex.Unlock()
+ key := fmt.Sprintf("%s.%s", FormTypeWebSocket, verify)
+ verifyMapWebSocket[key] = verifyFunc
+}
+
+// Verify 验证器
+type Verify interface {
+ GetCode() int // 有一个方法，返回code为200为成功
+ GetResult() bool // 返回是否成功
+}
+
+// VerifyHTTP http 验证
+type VerifyHTTP func(request *Request, response *http.Response) (code int, isSucceed bool)
+
+// VerifyWebSocket webSocket 验证
+type VerifyWebSocket func(request *Request, seq string, msg []byte) (code int, isSucceed bool)
+
+// Request 请求数据
+type Request struct {
+ URL string // URL
+ Form string // http/webSocket/tcp
+ Method string // 方法 GET/POST/PUT
+ Headers map[string]string // Headers
+ Body string // body
+ Verify string // 验证的方法
+ Timeout time.Duration // 请求超时时间
+ Debug bool // 是否开启Debug模式
+ MaxCon int // 每个连接的请求数
+ HTTP2 bool // 是否使用http2.0
+ Keepalive bool // 是否开启长连接
+ Code int // 验证的状态码
+}
+
+// GetBody 获取请求数据
+func (r *Request) GetBody() (body io.Reader) {
+ return strings.NewReader(r.Body)
+}
+
+// getVerifyKey 获取校验 key
+func (r *Request) getVerifyKey() (key string) {
+ return fmt.Sprintf("%s.%s", r.Form, r.Verify)
+}
+
+// GetVerifyHTTP 获取数据校验方法
+func (r *Request) GetVerifyHTTP() VerifyHTTP {
+ verify, ok := verifyMapHTTP[r.getVerifyKey()]
+ if !ok {
+ panic("GetVerifyHTTP 验证方法不存在:" + r.Verify)
+ }
+ return verify
+}
+
+// GetVerifyWebSocket 获取数据校验方法
+func (r *Request) GetVerifyWebSocket() VerifyWebSocket {
+ verify, ok := verifyMapWebSocket[r.getVerifyKey()]
+ if !ok {
+ panic("GetVerifyWebSocket 验证方法不存在:" + r.Verify)
+ }
+ return verify
+}
+
+// NewRequest 生成请求结构体
+// url 压测的url
+// verify 验证方法 在server/verify中 http 支持:statusCode、json webSocket支持:json
+// timeout 请求超时时间
+// debug 是否开启debug
+// path curl文件路径 http接口压测，自定义参数设置
+func NewRequest(url string, verify string, code int, timeout time.Duration, debug bool, path string,
+ reqHeaders []string,
+ reqBody string, maxCon int, http2 bool, keepalive bool) (request *Request, err error) {
+ var (
+ method = "GET"
+ headers = make(map[string]string)
+ body string
+ )
+ if path != "" {
+ var curl *CURL
+ curl, err = ParseTheFile(path)
+ if err != nil {
+ return nil, err
+ }
+ if url == "" {
+ url = curl.GetURL()
+ }
+ method = curl.GetMethod()
+ headers = curl.GetHeaders()
+ body = curl.GetBody()
+ } else {
+ if reqBody != "" {
+ method = "POST"
+ body = reqBody
+ }
+ for _, v := range reqHeaders {
+ getHeaderValue(v, headers)
+ }
+ if _, ok := headers["Content-Type"]; !ok {
+ headers["Content-Type"] = "application/x-www-form-urlencoded; charset=utf-8"
+ }
+ }
+ form := ""
+ if strings.HasPrefix(url, "http://") || strings.HasPrefix(url, "https://") {
+ form = FormTypeHTTP
+ } else if strings.HasPrefix(url, "ws://") || strings.HasPrefix(url, "wss://") {
+ form = FormTypeWebSocket
+ } else if strings.HasPrefix(url, "grpc://") || strings.HasPrefix(url, "rpc://") {
+ form = FormTypeGRPC
+ } else if strings.HasPrefix(url, "radius://") {
+ form = FormTypeRadius
+ url = url[9:]
+ } else {
+ form = FormTypeHTTP
+ url = fmt.Sprintf("http://%s", url)
+ }
+ if form == "" {
+ err = fmt.Errorf("url:%s 不合法,必须是完整http、webSocket连接", url)
+ return
+ }
+ var ok bool
+ switch form {
+ case FormTypeHTTP:
+ // verify
+ if verify == "" {
+ verify = "statusCode"
+ }
+ key := fmt.Sprintf("%s.%s", form, verify)
+ _, ok = verifyMapHTTP[key]
+ if !ok {
+ err = errors.New("验证器不存在:" + key)
+ return
+ }
+ case FormTypeWebSocket:
+ // verify
+ if verify == "" {
+ verify = "json"
+ }
+ key := fmt.Sprintf("%s.%s", form, verify)
+ _, ok = verifyMapWebSocket[key]
+ if !ok {
+ err = errors.New("验证器不存在:" + key)
+ return
+ }
+ }
+ if timeout == 0 {
+ timeout = 30 * time.Second
+ }
+ request = &Request{
+ URL: url,
+ Form: form,
+ Method: strings.ToUpper(method),
+ Headers: headers,
+ Body: body,
+ Verify: verify,
+ Timeout: timeout,
+ Debug: debug,
+ MaxCon: maxCon,
+ HTTP2: http2,
+ Keepalive: keepalive,
+ Code: code,
+ }
+ return
+}
+
+// getHeaderValue 获取 header
+func getHeaderValue(v string, headers map[string]string) {
+ index := strings.Index(v, ":")
+ if index < 0 {
+ return
+ }
+ vIndex := index + 1
+ if len(v) >= vIndex {
+ value := strings.TrimPrefix(v[vIndex:], " ")
+ if _, ok := headers[v[:index]]; ok {
+ headers[v[:index]] = fmt.Sprintf("%s; %s", headers[v[:index]], value)
+ } else {
+ headers[v[:index]] = value
+ }
+ }
+}
+
+// Print 格式化打印
+func (r *Request) Print() {
+ if r == nil {
+ return
+ }
+ result := fmt.Sprintf("request:\n form:%s \n url:%s \n method:%s \n headers:%v \n", r.Form, r.URL, r.Method,
+ r.Headers)
+ result = fmt.Sprintf("%s data:%v \n", result, r.Body)
+ result = fmt.Sprintf("%s verify:%s \n timeout:%s \n debug:%v \n", result, r.Verify, r.Timeout, r.Debug)
+ result = fmt.Sprintf("%s http2.0：%v \n keepalive：%v \n maxCon:%v ", result, r.HTTP2, r.Keepalive, r.MaxCon)
+ fmt.Println(result)
+ return
+}
+
+// GetDebug 获取 debug 参数
+func (r *Request) GetDebug() bool {
+ return r.Debug
+}
+
+// IsParameterLegal 参数是否合法
+func (r *Request) IsParameterLegal() (err error) {
+ r.Form = "http"
+ // statusCode json
+ r.Verify = "json"
+ key := fmt.Sprintf("%s.%s", r.Form, r.Verify)
+ _, ok := verifyMapHTTP[key]
+ if !ok {
+ return errors.New("验证器不存在:" + key)
+ }
+ return
+}
+
+// RequestResults 请求结果
+type RequestResults struct {
+ ID string // 消息ID
+ ChanID uint64 // 消息ID
+ Time uint64 // 请求时间 纳秒
+ IsSucceed bool // 是否请求成功
+ ErrCode int // 错误码
+ ReceivedBytes int64
+}
+
+// SetID 设置请求唯一ID
+func (r *RequestResults) SetID(chanID uint64, number uint64) {
+ id := fmt.Sprintf("%d_%d", chanID, number)
+ r.ID = id
+ r.ChanID = chanID
+}
diff --git a/stress/proto/pb.pb.go b/stress/proto/pb.pb.go
new file mode 100644
index 000000000..bc5428532
--- /dev/null
+++ b/stress/proto/pb.pb.go
@@ -0,0 +1,228 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: pb.proto
+package protobuf
+
+import (
+ context "context"
+ fmt "fmt"
+ proto "github.com/golang/protobuf/proto"
+ grpc "google.golang.org/grpc"
+ codes "google.golang.org/grpc/codes"
+ status "google.golang.org/grpc/status"
+ math "math"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+// 请求
+type Request struct {
+ // UserName 用户昵称
+ UserName string `protobuf:"bytes,1,opt,name=userName,proto3" json:"userName,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
+}
+
+func (m *Request) Reset() { *m = Request{} }
+func (m *Request) String() string { return proto.CompactTextString(m) }
+func (*Request) ProtoMessage() {}
+func (*Request) Descriptor() ([]byte, []int) {
+ return fileDescriptor_f80abaa17e25ccc8, []int{0}
+}
+
+func (m *Request) XXX_Unmarshal(b []byte) error {
+ return xxx_messageInfo_Request.Unmarshal(m, b)
+}
+func (m *Request) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+ return xxx_messageInfo_Request.Marshal(b, m, deterministic)
+}
+func (m *Request) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_Request.Merge(m, src)
+}
+func (m *Request) XXX_Size() int {
+ return xxx_messageInfo_Request.Size(m)
+}
+func (m *Request) XXX_DiscardUnknown() {
+ xxx_messageInfo_Request.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Request proto.InternalMessageInfo
+
+func (m *Request) GetUserName() string {
+ if m != nil {
+ return m.UserName
+ }
+ return ""
+}
+
+// 响应
+type Response struct {
+ // 状态码
+ Code int32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"`
+ // 状态码说明
+ Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg,omitempty"`
+ // Data 返回数据
+ Data string `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
+}
+
+func (m *Response) Reset() { *m = Response{} }
+func (m *Response) String() string { return proto.CompactTextString(m) }
+func (*Response) ProtoMessage() {}
+func (*Response) Descriptor() ([]byte, []int) {
+ return fileDescriptor_f80abaa17e25ccc8, []int{1}
+}
+
+func (m *Response) XXX_Unmarshal(b []byte) error {
+ return xxx_messageInfo_Response.Unmarshal(m, b)
+}
+func (m *Response) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+ return xxx_messageInfo_Response.Marshal(b, m, deterministic)
+}
+func (m *Response) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_Response.Merge(m, src)
+}
+func (m *Response) XXX_Size() int {
+ return xxx_messageInfo_Response.Size(m)
+}
+func (m *Response) XXX_DiscardUnknown() {
+ xxx_messageInfo_Response.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Response proto.InternalMessageInfo
+
+func (m *Response) GetCode() int32 {
+ if m != nil {
+ return m.Code
+ }
+ return 0
+}
+
+func (m *Response) GetMsg() string {
+ if m != nil {
+ return m.Msg
+ }
+ return ""
+}
+
+func (m *Response) GetData() string {
+ if m != nil {
+ return m.Data
+ }
+ return ""
+}
+
+func init() {
+ proto.RegisterType((*Request)(nil), "protobuf.Request")
+ proto.RegisterType((*Response)(nil), "protobuf.Response")
+}
+
+func init() { proto.RegisterFile("pb.proto", fileDescriptor_f80abaa17e25ccc8) }
+
+var fileDescriptor_f80abaa17e25ccc8 = []byte{
+ // 170 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x28, 0x48, 0xd2, 0x2b,
+ 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x00, 0x53, 0x49, 0xa5, 0x69, 0x4a, 0xaa, 0x5c, 0xec, 0x41,
+ 0xa9, 0x85, 0xa5, 0xa9, 0xc5, 0x25, 0x42, 0x52, 0x5c, 0x1c, 0xa5, 0xc5, 0xa9, 0x45, 0x7e, 0x89,
+ 0xb9, 0xa9, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x41, 0x70, 0xbe, 0x92, 0x0b, 0x17, 0x47, 0x50,
+ 0x6a, 0x71, 0x41, 0x7e, 0x5e, 0x71, 0xaa, 0x90, 0x10, 0x17, 0x4b, 0x72, 0x7e, 0x0a, 0x44, 0x0d,
+ 0x6b, 0x10, 0x98, 0x2d, 0x24, 0xc0, 0xc5, 0x9c, 0x5b, 0x9c, 0x2e, 0xc1, 0x04, 0xd6, 0x06, 0x62,
+ 0x82, 0x54, 0xa5, 0x24, 0x96, 0x24, 0x4a, 0x30, 0x83, 0x85, 0xc0, 0x6c, 0x23, 0x27, 0x2e, 0x4e,
+ 0xc7, 0x82, 0xcc, 0xe0, 0xd4, 0xa2, 0xb2, 0xd4, 0x22, 0x21, 0x53, 0x2e, 0x2e, 0x8f, 0xd4, 0x9c,
+ 0x9c, 0xfc, 0xf0, 0xfc, 0xa2, 0x9c, 0x14, 0x21, 0x41, 0x3d, 0x98, 0x93, 0xf4, 0xa0, 0xee, 0x91,
+ 0x12, 0x42, 0x16, 0x82, 0xd8, 0xad, 0xc4, 0x90, 0xc4, 0x06, 0x16, 0x34, 0x06, 0x04, 0x00, 0x00,
+ 0xff, 0xff, 0x72, 0xb6, 0x62, 0x67, 0xcd, 0x00, 0x00, 0x00,
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// ApiServerClient is the client API for ApiServer service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type ApiServerClient interface {
+ // 接口
+ HelloWorld(ctx context.Context, in *Request, opts ...grpc.CallOption) (*Response, error)
+}
+
+type apiServerClient struct {
+ cc *grpc.ClientConn
+}
+
+func NewApiServerClient(cc *grpc.ClientConn) ApiServerClient {
+ return &apiServerClient{cc}
+}
+
+func (c *apiServerClient) HelloWorld(ctx context.Context, in *Request, opts ...grpc.CallOption) (*Response, error) {
+ out := new(Response)
+ err := c.cc.Invoke(ctx, "/protobuf.ApiServer/HelloWorld", in, out, opts...)
+ if err != nil {
+ return nil, err
+ }
+ return out, nil
+}
+
+// ApiServerServer is the server API for ApiServer service.
+type ApiServerServer interface {
+ // 接口
+ HelloWorld(context.Context, *Request) (*Response, error)
+}
+
+// UnimplementedApiServerServer can be embedded to have forward compatible implementations.
+type UnimplementedApiServerServer struct {
+}
+
+func (*UnimplementedApiServerServer) HelloWorld(ctx context.Context, req *Request) (*Response, error) {
+ return nil, status.Errorf(codes.Unimplemented, "method HelloWorld not implemented")
+}
+
+func RegisterApiServerServer(s *grpc.Server, srv ApiServerServer) {
+ s.RegisterService(&_ApiServer_serviceDesc, srv)
+}
+
+func _ApiServer_HelloWorld_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+ in := new(Request)
+ if err := dec(in); err != nil {
+ return nil, err
+ }
+ if interceptor == nil {
+ return srv.(ApiServerServer).HelloWorld(ctx, in)
+ }
+ info := &grpc.UnaryServerInfo{
+ Server: srv,
+ FullMethod: "/protobuf.ApiServer/HelloWorld",
+ }
+ handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+ return srv.(ApiServerServer).HelloWorld(ctx, req.(*Request))
+ }
+ return interceptor(ctx, in, info, handler)
+}
+
+var _ApiServer_serviceDesc = grpc.ServiceDesc{
+ ServiceName: "protobuf.ApiServer",
+ HandlerType: (*ApiServerServer)(nil),
+ Methods: []grpc.MethodDesc{
+ {
+ MethodName: "HelloWorld",
+ Handler: _ApiServer_HelloWorld_Handler,
+ },
+ },
+ Streams: []grpc.StreamDesc{},
+ Metadata: "pb.proto",
+}
diff --git a/stress/proto/pb.proto b/stress/proto/pb.proto
new file mode 100644
index 000000000..078979277
--- /dev/null
+++ b/stress/proto/pb.proto
@@ -0,0 +1,25 @@
+syntax = "proto3";
+package protobuf;
+
+// ApiServer api 接口
+service ApiServer {
+ // HelloWorld 接口
+ rpc HelloWorld (Request) returns (Response) {
+ }
+}
+
+// 请求
+message Request {
+ // UserName 用户昵称
+ string userName = 1;
+}
+
+// 响应
+message Response {
+ // 状态码
+ int32 code = 1;
+ // 状态码说明
+ string msg = 2;
+ // Data 返回数据
+ string data = 3;
+}
\ No newline at end of file
diff --git a/stress/server/client/clienter.go b/stress/server/client/clienter.go
new file mode 100644
index 000000000..533fd002d
--- /dev/null
+++ b/stress/server/client/clienter.go
@@ -0,0 +1,9 @@
+// Package client clientpackage client
+package client
+
+// Clienter 接口 注册、连接、发送 等
+type Clienter interface {
+ GetConn() (err error)
+ Close() (err error)
+ Send()
+}
diff --git a/stress/server/client/grpc_client.go b/stress/server/client/grpc_client.go
new file mode 100644
index 000000000..0bf7e0daf
--- /dev/null
+++ b/stress/server/client/grpc_client.go
@@ -0,0 +1,63 @@
+// Package client grpc 客户端
+package client
+
+import (
+ "context"
+ "fmt"
+ "strings"
+ "time"
+
+ "google.golang.org/grpc"
+)
+
+// GrpcSocket grpc
+type GrpcSocket struct {
+ conn *grpc.ClientConn
+ address string
+}
+
+// NewGrpcSocket new
+func NewGrpcSocket(address string) (s *GrpcSocket) {
+ var newAddr string
+ arr := strings.Split(address, "//")
+ if len(arr) >= 2 {
+ newAddr = arr[1]
+ }
+ s = &GrpcSocket{
+ address: newAddr,
+ }
+ return
+}
+
+// getAddress 获取地址
+func (g *GrpcSocket) getAddress() (address string) {
+ return g.address
+}
+
+// Close 关闭
+func (g *GrpcSocket) Close() (err error) {
+ if g == nil {
+ return
+ }
+ if g.conn == nil {
+ return
+ }
+ return g.conn.Close()
+}
+
+// Link 建立连接
+func (g *GrpcSocket) Link() (err error) {
+ ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+ defer cancel()
+ conn, err := grpc.DialContext(ctx, g.address, grpc.WithInsecure(), grpc.WithBlock())
+ if err != nil {
+ return fmt.Errorf("getConn: 连接失败 address:%s %w", g.address, err)
+ }
+ g.conn = conn
+ return
+}
+
+// GetConn 获取连接
+func (g *GrpcSocket) GetConn() (conn *grpc.ClientConn) {
+ return g.conn
+}
diff --git a/stress/server/client/http_client.go b/stress/server/client/http_client.go
new file mode 100644
index 000000000..715d1f0a3
--- /dev/null
+++ b/stress/server/client/http_client.go
@@ -0,0 +1,99 @@
+// Package client http 客户端
+package client
+
+import (
+ "crypto/tls"
+ "log"
+ "net/http"
+ "os"
+ "time"
+
+ "go_dreamfactory/stress/model"
+ httplongclinet "go_dreamfactory/stress/server/client/http_longclinet"
+
+ "golang.org/x/net/http2"
+
+ "go_dreamfactory/stress/helper"
+)
+
+// logErr err
+var logErr = log.New(os.Stderr, "", 0)
+
+// HTTPRequest HTTP 请求
+// method 方法 GET POST
+// url 请求的url
+// body 请求的body
+// headers 请求头信息
+// timeout 请求超时时间
+func HTTPRequest(chanID uint64, request *model.Request) (resp *http.Response, requestTime uint64, err error) {
+ method := request.Method
+ url := request.URL
+ body := request.GetBody()
+ timeout := request.Timeout
+ headers := request.Headers
+
+ req, err := http.NewRequest(method, url, body)
+ if err != nil {
+ return
+ }
+
+ // 在req中设置Host，解决在header中设置Host不生效问题
+ if _, ok := headers["Host"]; ok {
+ req.Host = headers["Host"]
+ }
+ // 设置默认为utf-8编码
+ if _, ok := headers["Content-Type"]; !ok {
+ if headers == nil {
+ headers = make(map[string]string)
+ }
+ headers["Content-Type"] = "application/x-www-form-urlencoded; charset=utf-8"
+ }
+ for key, value := range headers {
+ req.Header.Set(key, value)
+ }
+ var client *http.Client
+ if request.Keepalive {
+ client = httplongclinet.NewClient(chanID, request)
+ startTime := time.Now()
+ resp, err = client.Do(req)
+ requestTime = uint64(helper.DiffNano(startTime))
+ if err != nil {
+ logErr.Println("请求失败:", err)
+
+ return
+ }
+ return
+ } else {
+ req.Close = true
+ tr := &http.Transport{}
+ if request.HTTP2 {
+ // 使用真实证书 验证证书 模拟真实请求
+ tr = &http.Transport{
+ TLSClientConfig: &tls.Config{InsecureSkipVerify: false},
+ }
+ if err = http2.ConfigureTransport(tr); err != nil {
+ return
+ }
+ } else {
+ // 跳过证书验证
+ tr = &http.Transport{
+ TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+ }
+ }
+
+ client = &http.Client{
+ Transport: tr,
+ Timeout: timeout,
+ }
+ }
+
+ startTime := time.Now()
+ resp, err = client.Do(req)
+ requestTime = uint64(helper.DiffNano(startTime))
+ if err != nil {
+ logErr.Println("请求失败:", err)
+
+ return
+ }
+ return
+}
diff --git a/stress/server/client/http_longclinet/long_clinet.go b/stress/server/client/http_longclinet/long_clinet.go
new file mode 100644
index 000000000..ac76d283f
--- /dev/null
+++ b/stress/server/client/http_longclinet/long_clinet.go
@@ -0,0 +1,75 @@
+package httplongclinet
+
+import (
+ "crypto/tls"
+ "net"
+ "net/http"
+ "sync"
+ "time"
+
+ "go_dreamfactory/stress/model"
+
+ "golang.org/x/net/http2"
+)
+
+var (
+ mutex sync.RWMutex
+ clients = make(map[uint64]*http.Client, 0)
+)
+
+// NewClient new
+func NewClient(i uint64, request *model.Request) *http.Client {
+ client := getClient(i)
+ if client != nil {
+ return client
+ }
+ return setClient(i, request)
+}
+
+func getClient(i uint64) *http.Client {
+ mutex.RLock()
+ defer mutex.RUnlock()
+ return clients[i]
+}
+
+func setClient(i uint64, request *model.Request) *http.Client {
+ mutex.Lock()
+ defer mutex.Unlock()
+ client := createLangHttpClient(request)
+ clients[i] = client
+ return client
+}
+
+// createLangHttpClient 初始化长连接客户端参数
+func createLangHttpClient(request *model.Request) *http.Client {
+ tr := &http.Transport{}
+ if request.HTTP2 {
+ // 使用真实证书 验证证书 模拟真实请求
+ tr = &http.Transport{
+ DialContext: (&net.Dialer{
+ Timeout: 30 * time.Second,
+ KeepAlive: 30 * time.Second,
+ }).DialContext,
+ MaxIdleConns: 0, // 最大连接数,默认0无穷大
+ MaxIdleConnsPerHost: request.MaxCon, // 对每个host的最大连接数量(MaxIdleConnsPerHost<=MaxIdleConns)
+ IdleConnTimeout: 90 * time.Second, // 多长时间未使用自动关闭连接
+ TLSClientConfig: &tls.Config{InsecureSkipVerify: false},
+ }
+ _ = http2.ConfigureTransport(tr)
+ } else {
+ // 跳过证书验证
+ tr = &http.Transport{
+ DialContext: (&net.Dialer{
+ Timeout: 30 * time.Second,
+ KeepAlive: 30 * time.Second,
+ }).DialContext,
+ MaxIdleConns: 0, // 最大连接数,默认0无穷大
+ MaxIdleConnsPerHost: request.MaxCon, // 对每个host的最大连接数量(MaxIdleConnsPerHost<=MaxIdleConns)
+ IdleConnTimeout: 90 * time.Second, // 多长时间未使用自动关闭连接
+ TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+ }
+ }
+ return &http.Client{
+ Transport: tr,
+ }
+}
diff --git a/stress/server/client/websocket_client.go b/stress/server/client/websocket_client.go
new file mode 100644
index 000000000..7e6454b0d
--- /dev/null
+++ b/stress/server/client/websocket_client.go
@@ -0,0 +1,118 @@
+// Package client webSocket 客户端
+package client
+
+import (
+ "errors"
+ "fmt"
+ "net/url"
+ "strings"
+
+ "golang.org/x/net/websocket"
+)
+
+const (
+ connRetry = 3 // 建立连接重试次数
+)
+
+// WebSocket webSocket
+type WebSocket struct {
+ conn *websocket.Conn
+ URLLink string
+ URL *url.URL
+ IsSsl bool
+}
+
+// NewWebSocket new
+func NewWebSocket(urlLink string) (ws *WebSocket) {
+ var isSsl bool
+ if strings.HasPrefix(urlLink, "wss://") {
+ isSsl = true
+ }
+ u, err := url.Parse(urlLink)
+ // 解析失败
+ if err != nil {
+ panic(err)
+ }
+ ws = &WebSocket{
+ URLLink: urlLink,
+ URL: u,
+ IsSsl: isSsl,
+ }
+ return
+}
+
+// getLink 获取连接
+func (w *WebSocket) getLink() (link string) {
+ return w.URLLink
+}
+
+// getOrigin 获取源连接
+func (w *WebSocket) getOrigin() (origin string) {
+ origin = "http://"
+ if w.IsSsl {
+ origin = "https://"
+ }
+ origin = fmt.Sprintf("%s%s/", origin, w.URL.Host)
+ return
+}
+
+// Close 关闭
+func (w *WebSocket) Close() (err error) {
+ if w == nil {
+ return
+ }
+ if w.conn == nil {
+ return
+ }
+ return w.conn.Close()
+}
+
+// GetConn 获取连接
+func (w *WebSocket) GetConn() (err error) {
+ var (
+ conn *websocket.Conn
+ i int
+ )
+ for i = 0; i < connRetry; i++ {
+ conn, err = websocket.Dial(w.getLink(), "", w.getOrigin())
+ if err != nil {
+ fmt.Println("GetConn 建立连接失败 in...", i, err)
+ continue
+ }
+ w.conn = conn
+ return
+ }
+ if err != nil {
+ fmt.Println("GetConn 建立连接失败", i, err)
+ }
+ return
+}
+
+// Write 发送数据
+func (w *WebSocket) Write(body []byte) (err error) {
+ if w.conn == nil {
+ err = errors.New("未建立连接")
+ return
+ }
+ _, err = w.conn.Write(body)
+ if err != nil {
+ fmt.Println("发送数据失败:", err)
+ return
+ }
+ return
+}
+
+// Read 接收数据
+func (w *WebSocket) Read() (msg []byte, err error) {
+ if w.conn == nil {
+ err = errors.New("未建立连接")
+ return
+ }
+ msg = make([]byte, 512)
+ n, err := w.conn.Read(msg)
+ if err != nil {
+ fmt.Println("接收数据失败:", err)
+ return nil, err
+ }
+ return msg[:n], nil
+}
diff --git a/stress/server/dispose.go b/stress/server/dispose.go
new file mode 100644
index 000000000..6f7d50d76
--- /dev/null
+++ b/stress/server/dispose.go
@@ -0,0 +1,104 @@
+// Package server 压测启动
+package server
+
+import (
+ "context"
+ "fmt"
+ "go_dreamfactory/stress/model"
+
+ "sync"
+ "time"
+
+ "go_dreamfactory/stress/server/client"
+ "go_dreamfactory/stress/server/golink"
+ "go_dreamfactory/stress/server/statistics"
+ "go_dreamfactory/stress/server/verify"
+)
+
+const (
+ connectionMode = 1 // 1:顺序建立长链接 2:并发建立长链接
+)
+
+// init 注册验证器
+func init() {
+
+ // http
+ model.RegisterVerifyHTTP("statusCode", verify.HTTPStatusCode)
+ model.RegisterVerifyHTTP("json", verify.HTTPJson)
+
+ // webSocket
+ model.RegisterVerifyWebSocket("json", verify.WebSocketJSON)
+}
+
+// Dispose 处理函数
+func Dispose(ctx context.Context, concurrency, totalNumber uint64, request *model.Request) {
+ // 设置接收数据缓存
+ ch := make(chan *model.RequestResults, 1000)
+ var (
+ wg sync.WaitGroup // 发送数据完成
+ wgReceiving sync.WaitGroup // 数据处理完成
+ )
+ wgReceiving.Add(1)
+ go statistics.ReceivingResults(concurrency, ch, &wgReceiving)
+
+ for i := uint64(0); i < concurrency; i++ {
+ wg.Add(1)
+ switch request.Form {
+ case model.FormTypeHTTP:
+ go golink.HTTP(ctx, i, ch, totalNumber, &wg, request)
+ case model.FormTypeWebSocket:
+ switch connectionMode {
+ case 1:
+ // 连接以后再启动协程
+ ws := client.NewWebSocket(request.URL)
+ err := ws.GetConn()
+ if err != nil {
+ fmt.Println("连接失败:", i, err)
+ continue
+ }
+ go golink.WebSocket(ctx, i, ch, totalNumber, &wg, request, ws)
+ case 2:
+ // 并发建立长链接
+ go func(i uint64) {
+ // 连接以后再启动协程
+ ws := client.NewWebSocket(request.URL)
+ err := ws.GetConn()
+ if err != nil {
+ fmt.Println("连接失败:", i, err)
+ return
+ }
+ golink.WebSocket(ctx, i, ch, totalNumber, &wg, request, ws)
+ }(i)
+ // 注意:时间间隔太短会出现连接失败的报错 默认连接时长:20毫秒(公网连接)
+ time.Sleep(5 * time.Millisecond)
+ default:
+ data := fmt.Sprintf("不支持的类型:%d", connectionMode)
+ panic(data)
+ }
+ case model.FormTypeGRPC:
+ // 连接以后再启动协程
+ ws := client.NewGrpcSocket(request.URL)
+ err := ws.Link()
+ if err != nil {
+ fmt.Println("连接失败:", i, err)
+ continue
+ }
+ go golink.Grpc(ctx, i, ch, totalNumber, &wg, request, ws)
+ case model.FormTypeRadius:
+ // Radius use udp, does not a connection
+ go golink.Radius(ctx, i, ch, totalNumber, &wg, request)
+
+ default:
+ // 类型不支持
+ wg.Done()
+ }
+ }
+ // 等待所有的数据都发送完成
+ wg.Wait()
+ // 延时1毫秒 确保数据都处理完成了
+ time.Sleep(1 * time.Millisecond)
+ close(ch)
+ // 数据全部处理完成了
+ wgReceiving.Wait()
+ return
+}
diff --git a/stress/server/golink/grpc_link.go b/stress/server/golink/grpc_link.go
new file mode 100644
index 000000000..50db143b7
--- /dev/null
+++ b/stress/server/golink/grpc_link.go
@@ -0,0 +1,73 @@
+// Package golink 连接
+package golink
+
+import (
+ "context"
+ "sync"
+ "time"
+
+ "go_dreamfactory/stress/helper"
+ pb "go_dreamfactory/stress/proto"
+
+ "go_dreamfactory/stress/model"
+ "go_dreamfactory/stress/server/client"
+)
+
+// Grpc grpc 接口请求
+func Grpc(ctx context.Context, chanID uint64, ch chan<- *model.RequestResults, totalNumber uint64, wg *sync.WaitGroup,
+ request *model.Request, ws *client.GrpcSocket) {
+ defer func() {
+ wg.Done()
+ }()
+ defer func() {
+ _ = ws.Close()
+ }()
+ for i := uint64(0); i < totalNumber; i++ {
+ grpcRequest(chanID, ch, i, request, ws)
+ }
+ return
+}
+
+// grpcRequest 请求
+func grpcRequest(chanID uint64, ch chan<- *model.RequestResults, i uint64, request *model.Request,
+ ws *client.GrpcSocket) {
+ var (
+ startTime = time.Now()
+ isSucceed = false
+ errCode = model.HTTPOk
+ )
+ // 需要发送的数据
+ conn := ws.GetConn()
+ if conn == nil {
+ errCode = model.RequestErr
+ } else {
+ // TODO::请求接口示例
+ c := pb.NewApiServerClient(conn)
+ var (
+ ctx = context.Background()
+ req = &pb.Request{
+ UserName: request.Body,
+ }
+ )
+ rsp, err := c.HelloWorld(ctx, req)
+ // fmt.Printf("rsp:%+v", rsp)
+ if err != nil {
+ errCode = model.RequestErr
+ } else {
+ // 200 为成功
+ if rsp.Code != 200 {
+ errCode = model.RequestErr
+ } else {
+ isSucceed = true
+ }
+ }
+ }
+ requestTime := uint64(helper.DiffNano(startTime))
+ requestResults := &model.RequestResults{
+ Time: requestTime,
+ IsSucceed: isSucceed,
+ ErrCode: errCode,
+ }
+ requestResults.SetID(chanID, i)
+ ch <- requestResults
+}
diff --git a/stress/server/golink/http_link.go b/stress/server/golink/http_link.go
new file mode 100644
index 000000000..98d923e90
--- /dev/null
+++ b/stress/server/golink/http_link.go
@@ -0,0 +1,105 @@
+// Package golink 连接
+package golink
+
+import (
+ "compress/gzip"
+ "context"
+ "fmt"
+ "io"
+ "io/ioutil"
+ "net/http"
+ "sync"
+
+ "go_dreamfactory/stress/model"
+ "go_dreamfactory/stress/server/client"
+)
+
+// HTTP 请求
+func HTTP(ctx context.Context, chanID uint64, ch chan<- *model.RequestResults, totalNumber uint64, wg *sync.WaitGroup,
+ request *model.Request) {
+ defer func() {
+ wg.Done()
+ }()
+ // fmt.Printf("启动协程 编号:%05d \n", chanID)
+ for i := uint64(0); i < totalNumber; i++ {
+ if ctx.Err() != nil {
+ fmt.Printf("ctx.Err err: %v \n", ctx.Err())
+ break
+ }
+
+ list := getRequestList(request)
+ isSucceed, errCode, requestTime, contentLength := sendList(chanID, list)
+ requestResults := &model.RequestResults{
+ Time: requestTime,
+ IsSucceed: isSucceed,
+ ErrCode: errCode,
+ ReceivedBytes: contentLength,
+ }
+ requestResults.SetID(chanID, i)
+ ch <- requestResults
+ }
+
+ return
+}
+
+// sendList 多个接口分步压测
+func sendList(chanID uint64, requestList []*model.Request) (isSucceed bool, errCode int, requestTime uint64,
+ contentLength int64) {
+ errCode = model.HTTPOk
+ for _, request := range requestList {
+ succeed, code, u, length := send(chanID, request)
+ isSucceed = succeed
+ errCode = code
+ requestTime = requestTime + u
+ contentLength = contentLength + length
+ if succeed == false {
+ break
+ }
+ }
+ return
+}
+
+// send 发送一次请求
+func send(chanID uint64, request *model.Request) (bool, int, uint64, int64) {
+ var (
+ // startTime = time.Now()
+ isSucceed = false
+ errCode = model.HTTPOk
+ contentLength = int64(0)
+ err error
+ resp *http.Response
+ requestTime uint64
+ )
+ newRequest := getRequest(request)
+
+ resp, requestTime, err = client.HTTPRequest(chanID, newRequest)
+
+ if err != nil {
+ errCode = model.RequestErr // 请求错误
+ } else {
+ // 此处原方式获取的数据长度可能是 -1，换成如下方式获取可获取到正确的长度
+ contentLength, err = getBodyLength(resp)
+ if err != nil {
+ contentLength = resp.ContentLength
+ }
+ // 验证请求是否成功
+ errCode, isSucceed = newRequest.GetVerifyHTTP()(newRequest, resp)
+ }
+ return isSucceed, errCode, requestTime, contentLength
+}
+
+// getBodyLength 获取响应数据长度
+func getBodyLength(response *http.Response) (length int64, err error) {
+ var reader io.ReadCloser
+ switch response.Header.Get("Content-Encoding") {
+ case "gzip":
+ reader, err = gzip.NewReader(response.Body)
+ defer func() {
+ _ = reader.Close()
+ }()
+ default:
+ reader = response.Body
+ }
+ body, err := ioutil.ReadAll(reader)
+ return int64(len(body)), err
+}
diff --git a/stress/server/golink/http_link_many.go b/stress/server/golink/http_link_many.go
new file mode 100644
index 000000000..92ae0015d
--- /dev/null
+++ b/stress/server/golink/http_link_many.go
@@ -0,0 +1,71 @@
+// Package golink 连接
+package golink
+
+import (
+ "time"
+
+ "go_dreamfactory/stress/model"
+)
+
+// ReqListMany 接口分步压测
+type ReqListMany struct {
+ list []*model.Request
+}
+
+// getCount 获取连接
+func (r *ReqListMany) getCount() int {
+ return len(r.list)
+}
+
+var (
+ clientList *ReqListMany
+)
+
+// init 接口分步压测示例
+func init() {
+ clientList = &ReqListMany{}
+ // TODO::接口分步压测示例
+ // 需要压测的接口参数
+ clients := make([]*model.Request, 0)
+
+ // 压测第一步
+ clients = append(clients, &model.Request{
+ URL: "https://page.aliyun.com/delivery/plan/list", // 请求url
+ Form: "http", // 请求方式 示例参数:http/webSocket/tcp
+ Method: "POST", // 请求方法 示例参数:GET/POST/PUT
+ Headers: map[string]string{
+ "referer": "https://cn.aliyun.com/",
+ "cookie": "aliyun_choice=CN; JSESSIONID=J8866281-CKCFJ4BUZ7GDO9V89YBW1-KJ3J5V9K-GYUW7; maliyun_temporary_console0=1AbLByOMHeZe3G41KYd5WWZvrM%2BGErkaLcWfBbgveKA9ifboArprPASvFUUfhwHtt44qsDwVqMk8Wkdr1F5LccYk2mPCZJiXb0q%2Bllj5u3SQGQurtyPqnG489y%2FkoA%2FEvOwsXJTvXTFQPK%2BGJD4FJg%3D%3D; cna=L3Q5F8cHDGgCAXL3r8fEZtdU; isg=BFNThsmSCcgX-sUcc5Jo2s2T4tF9COfKYi8g9wVwr3KphHMmjdh3GrHFvPTqJD_C; l=eBaceXLnQGBjstRJBOfwPurza77OSIRAguPzaNbMiT5POw1B5WAlWZbqyNY6C3GVh6lwR37EODnaBeYBc3K-nxvOu9eFfGMmn",
+ }, // headers 头信息
+ Body: "adPlanQueryParam=%7B%22adZone%22%3A%7B%22positionList%22%3A%5B%7B%22positionId%22%3A83%7D%5D%7D%2C%22requestId%22%3A%2217958651-f205-44c7-ad5d-f8af92a6217a%22%7D", // 消息体
+ Verify: "statusCode", // 验证的方法 示例参数:statusCode、json
+ Timeout: 30 * time.Second, // 是否开启Debug模式
+ Debug: false, // 是否开启Debug模式
+ })
+
+ // 压测第二步
+ clients = append(clients, &model.Request{
+ URL: "https://page.aliyun.com/delivery/plan/list", // 请求url
+ Form: "http", // 请求方式 示例参数:http/webSocket/tcp
+ Method: "POST", // 请求方法 示例参数:GET/POST/PUT
+ Headers: map[string]string{
+ "referer": "https://cn.aliyun.com/",
+ "cookie": "aliyun_choice=CN; JSESSIONID=J8866281-CKCFJ4BUZ7GDO9V89YBW1-KJ3J5V9K-GYUW7; maliyun_temporary_console0=1AbLByOMHeZe3G41KYd5WWZvrM%2BGErkaLcWfBbgveKA9ifboArprPASvFUUfhwHtt44qsDwVqMk8Wkdr1F5LccYk2mPCZJiXb0q%2Bllj5u3SQGQurtyPqnG489y%2FkoA%2FEvOwsXJTvXTFQPK%2BGJD4FJg%3D%3D; cna=L3Q5F8cHDGgCAXL3r8fEZtdU; isg=BFNThsmSCcgX-sUcc5Jo2s2T4tF9COfKYi8g9wVwr3KphHMmjdh3GrHFvPTqJD_C; l=eBaceXLnQGBjstRJBOfwPurza77OSIRAguPzaNbMiT5POw1B5WAlWZbqyNY6C3GVh6lwR37EODnaBeYBc3K-nxvOu9eFfGMmn",
+ }, // headers 头信息
+ Body: "adPlanQueryParam=%7B%22adZone%22%3A%7B%22positionList%22%3A%5B%7B%22positionId%22%3A83%7D%5D%7D%2C%22requestId%22%3A%2217958651-f205-44c7-ad5d-f8af92a6217a%22%7D", // 消息体
+ Verify: "statusCode", // 验证的方法 示例参数:statusCode、json
+ Timeout: 30 * time.Second, // 是否开启Debug模式
+ Debug: false, // 是否开启Debug模式
+ })
+ clientList.list = clients
+ // TODO::分步压测时，注释下面一行代码
+ clientList.list = nil
+}
+
+// getRequestList 获取请求列表
+func getRequestList(request *model.Request) []*model.Request {
+ if len(clientList.list) <= 0 {
+ return []*model.Request{request}
+ }
+ return clientList.list
+}
diff --git a/stress/server/golink/http_link_weigh.go b/stress/server/golink/http_link_weigh.go
new file mode 100644
index 000000000..840d95472
--- /dev/null
+++ b/stress/server/golink/http_link_weigh.go
@@ -0,0 +1,97 @@
+// Package golink 连接
+package golink
+
+import (
+ "math/rand"
+ "time"
+
+ "go_dreamfactory/stress/model"
+)
+
+// ReqListWeigh 接口加权压测
+type ReqListWeigh struct {
+ list []Req
+ weighCount uint32 // 总权重
+}
+
+// Req req
+type Req struct {
+ req *model.Request // 请求信息
+ weights uint32 // 权重，数字越大访问频率越高
+}
+
+// setWeighCount 设置权重
+func (r *ReqListWeigh) setWeighCount() {
+ r.weighCount = 0
+ for _, value := range r.list {
+ r.weighCount = r.weighCount + value.weights
+ }
+}
+
+var (
+ clientWeigh *ReqListWeigh
+ r *rand.Rand
+)
+
+// 多接口压测示例
+func init() {
+ // TODO::压测多个接口示例
+ // 需要压测的接口参数
+ clients := make([]Req, 0)
+ clients = append(clients, Req{req: &model.Request{
+ URL: "https://page.aliyun.com/delivery/plan/list", // 请求url
+ Form: "http", // 请求方式 示例参数:http/webSocket/tcp
+ Method: "POST", // 请求方法 示例参数:GET/POST/PUT
+ Headers: map[string]string{
+ "referer": "https://cn.aliyun.com/",
+ "cookie": "aliyun_choice=CN; JSESSIONID=J8866281-CKCFJ4BUZ7GDO9V89YBW1-KJ3J5V9K-GYUW7; maliyun_temporary_console0=1AbLByOMHeZe3G41KYd5WWZvrM%2BGErkaLcWfBbgveKA9ifboArprPASvFUUfhwHtt44qsDwVqMk8Wkdr1F5LccYk2mPCZJiXb0q%2Bllj5u3SQGQurtyPqnG489y%2FkoA%2FEvOwsXJTvXTFQPK%2BGJD4FJg%3D%3D; cna=L3Q5F8cHDGgCAXL3r8fEZtdU; isg=BFNThsmSCcgX-sUcc5Jo2s2T4tF9COfKYi8g9wVwr3KphHMmjdh3GrHFvPTqJD_C; l=eBaceXLnQGBjstRJBOfwPurza77OSIRAguPzaNbMiT5POw1B5WAlWZbqyNY6C3GVh6lwR37EODnaBeYBc3K-nxvOu9eFfGMmn",
+ }, // headers 头信息
+ Body: "adPlanQueryParam=%7B%22adZone%22%3A%7B%22positionList%22%3A%5B%7B%22positionId%22%3A83%7D%5D%7D%2C%22requestId%22%3A%2217958651-f205-44c7-ad5d-f8af92a6217a%22%7D", // 消息体
+ Verify: "statusCode", // 验证的方法 示例参数:statusCode、json
+ Timeout: 30 * time.Second, // 是否开启Debug模式
+ Debug: false, // 是否开启Debug模式
+ }, weights: 2})
+
+ clients = append(clients, Req{req: &model.Request{
+ URL: "https://page.aliyun.com/delivery/plan/list", // 请求url
+ Form: "http", // 请求方式 示例参数:http/webSocket/tcp
+ Method: "POST", // 请求方法 示例参数:GET/POST/PUT
+ Headers: map[string]string{
+ "referer": "https://cn.aliyun.com/",
+ "cookie": "aliyun_choice=CN; JSESSIONID=J8866281-CKCFJ4BUZ7GDO9V89YBW1-KJ3J5V9K-GYUW7; maliyun_temporary_console0=1AbLByOMHeZe3G41KYd5WWZvrM%2BGErkaLcWfBbgveKA9ifboArprPASvFUUfhwHtt44qsDwVqMk8Wkdr1F5LccYk2mPCZJiXb0q%2Bllj5u3SQGQurtyPqnG489y%2FkoA%2FEvOwsXJTvXTFQPK%2BGJD4FJg%3D%3D; cna=L3Q5F8cHDGgCAXL3r8fEZtdU; isg=BFNThsmSCcgX-sUcc5Jo2s2T4tF9COfKYi8g9wVwr3KphHMmjdh3GrHFvPTqJD_C; l=eBaceXLnQGBjstRJBOfwPurza77OSIRAguPzaNbMiT5POw1B5WAlWZbqyNY6C3GVh6lwR37EODnaBeYBc3K-nxvOu9eFfGMmn",
+ }, // headers 头信息
+ Body: "adPlanQueryParam=%7B%22adZone%22%3A%7B%22positionList%22%3A%5B%7B%22positionId%22%3A83%7D%5D%7D%2C%22requestId%22%3A%2217958651-f205-44c7-ad5d-f8af92a6217a%22%7D", // 消息体
+ Verify: "statusCode", // 验证的方法 示例参数:statusCode、json
+ Timeout: 30 * time.Second, // 是否开启Debug模式
+ Debug: false, // 是否开启Debug模式
+ }, weights: 1})
+
+ r = rand.New(rand.NewSource(time.Now().Unix()))
+ clientWeigh = &ReqListWeigh{
+ list: clients,
+ }
+
+ // TODO::注释下面一行代码
+ clientWeigh.list = nil
+
+ clientWeigh.setWeighCount()
+}
+
+// getRequest 获取请求
+func getRequest(request *model.Request) *model.Request {
+ if clientWeigh == nil || clientWeigh.weighCount <= 0 {
+ return request
+ }
+ n := uint32(r.Int31n(int32(clientWeigh.weighCount)))
+ var (
+ count uint32
+ )
+ for _, value := range clientWeigh.list {
+ if count >= n {
+ // value.req.Print()
+ return value.req
+ }
+ count = count + value.weights
+ }
+ panic("getRequest err")
+}
diff --git a/stress/server/golink/radius_link.go b/stress/server/golink/radius_link.go
new file mode 100644
index 000000000..2d5a4bb34
--- /dev/null
+++ b/stress/server/golink/radius_link.go
@@ -0,0 +1,69 @@
+package golink
+
+import (
+ "context"
+ "strings"
+ "sync"
+ "time"
+
+ "go_dreamfactory/stress/helper"
+
+ "layeh.com/radius"
+ "layeh.com/radius/rfc2865"
+
+ "go_dreamfactory/stress/model"
+)
+
+// Grpc grpc 接口请求
+func Radius(ctx context.Context, chanID uint64, ch chan<- *model.RequestResults, totalNumber uint64, wg *sync.WaitGroup,
+ request *model.Request) {
+ defer func() {
+ wg.Done()
+ }()
+ for i := uint64(0); i < totalNumber; i++ {
+ authRequest(chanID, ch, i, request)
+ }
+ return
+}
+
+// grpcRequest 请求
+func authRequest(chanID uint64, ch chan<- *model.RequestResults, i uint64, request *model.Request) {
+ var (
+ startTime = time.Now()
+ isSucceed = false
+ errCode = int(radius.CodeAccessAccept)
+ )
+ // 需要发送的数据
+ // fmt.Printf("rsp:%+v", rsp)
+ packet := radius.New(radius.CodeAccessRequest, []byte(`cisco`))
+ index := strings.Index(request.URL, "@")
+ username := "tim"
+ host := request.URL
+ if index != -1 {
+ username = username + "@" + request.URL[index+1:]
+ host = request.URL[:index]
+ }
+ rfc2865.UserName_SetString(packet, username)
+ rfc2865.UserPassword_SetString(packet, "12345678")
+ rfc2865.NASPortType_Set(packet, rfc2865.NASPortType_Value_Ethernet)
+ rfc2865.ServiceType_Set(packet, rfc2865.ServiceType_Value_FramedUser)
+ rfc2865.NASIdentifier_Set(packet, []byte(`benchmark`))
+ rsp, err := radius.Exchange(context.Background(), packet, host)
+ if err != nil {
+ errCode = model.RequestErr
+ } else {
+ if rsp.Code != radius.CodeAccessAccept {
+ errCode = int(rsp.Code)
+ } else {
+ isSucceed = true
+ }
+ }
+ requestTime := uint64(helper.DiffNano(startTime))
+ requestResults := &model.RequestResults{
+ Time: requestTime,
+ IsSucceed: isSucceed,
+ ErrCode: errCode,
+ }
+ requestResults.SetID(chanID, i)
+ ch <- requestResults
+}
diff --git a/stress/server/golink/websocket_link.go b/stress/server/golink/websocket_link.go
new file mode 100644
index 000000000..dc7557f3d
--- /dev/null
+++ b/stress/server/golink/websocket_link.go
@@ -0,0 +1,99 @@
+// Package golink 连接
+package golink
+
+import (
+ "context"
+ "fmt"
+ "sync"
+ "time"
+
+ "go_dreamfactory/stress/helper"
+ "go_dreamfactory/stress/model"
+ "go_dreamfactory/stress/server/client"
+)
+
+const (
+ firstTime = 1 * time.Second // 连接以后首次请求数据的时间
+ intervalTime = 1 * time.Second // 发送数据的时间间隔
+)
+
+var (
+ // 请求完成以后是否保持连接
+ keepAlive bool
+)
+
+func init() {
+ keepAlive = true
+}
+
+// WebSocket webSocket go link
+func WebSocket(ctx context.Context, chanID uint64, ch chan<- *model.RequestResults, totalNumber uint64,
+ wg *sync.WaitGroup, request *model.Request, ws *client.WebSocket) {
+ defer func() {
+ wg.Done()
+ }()
+ defer func() {
+ _ = ws.Close()
+ }()
+
+ var (
+ i uint64
+ )
+ // 暂停60秒
+ t := time.NewTimer(firstTime)
+ for {
+ select {
+ case <-t.C:
+ t.Reset(intervalTime)
+ // 请求
+ webSocketRequest(chanID, ch, i, request, ws)
+ // 结束条件
+ i = i + 1
+ if i >= totalNumber {
+ goto end
+ }
+ }
+ }
+end:
+ t.Stop()
+
+ if keepAlive {
+ // 保持连接
+ chWaitFor := make(chan int, 0)
+ <-chWaitFor
+ }
+ return
+}
+
+// webSocketRequest 请求
+func webSocketRequest(chanID uint64, ch chan<- *model.RequestResults, i uint64, request *model.Request,
+ ws *client.WebSocket) {
+ var (
+ startTime = time.Now()
+ isSucceed = false
+ errCode = model.HTTPOk
+ msg []byte
+ )
+ // 需要发送的数据
+ seq := fmt.Sprintf("%d_%d", chanID, i)
+ err := ws.Write([]byte(`{"seq":"` + seq + `","cmd":"ping","data":{}}`))
+ if err != nil {
+ errCode = model.RequestErr // 请求错误
+ } else {
+ msg, err = ws.Read()
+ if err != nil {
+ errCode = model.ParseError
+ fmt.Println("读取数据 失败~")
+ } else {
+ errCode, isSucceed = request.GetVerifyWebSocket()(request, seq, msg)
+ }
+ }
+ requestTime := uint64(helper.DiffNano(startTime))
+ requestResults := &model.RequestResults{
+ Time: requestTime,
+ IsSucceed: isSucceed,
+ ErrCode: errCode,
+ }
+ requestResults.SetID(chanID, i)
+ ch <- requestResults
+}
diff --git a/stress/server/statistics/statistics.go b/stress/server/statistics/statistics.go
new file mode 100644
index 000000000..c38daccdd
--- /dev/null
+++ b/stress/server/statistics/statistics.go
@@ -0,0 +1,217 @@
+// Package statistics 统计数据
+package statistics
+
+import (
+ "fmt"
+ "sort"
+ "strings"
+ "sync"
+ "time"
+
+ "go_dreamfactory/stress/tools"
+
+ "golang.org/x/text/language"
+ "golang.org/x/text/message"
+
+ "go_dreamfactory/stress/model"
+)
+
+var (
+ // 输出统计数据的时间
+ exportStatisticsTime = 1 * time.Second
+ p = message.NewPrinter(language.English)
+ requestTimeList []uint64 // 所有请求响应时间
+)
+
+// ReceivingResults 接收结果并处理
+// 统计的时间都是纳秒，显示的时间 都是毫秒
+// concurrent 并发数
+func ReceivingResults(concurrent uint64, ch <-chan *model.RequestResults, wg *sync.WaitGroup) {
+ defer func() {
+ wg.Done()
+ }()
+ var stopChan = make(chan bool)
+ // 时间
+ var (
+ processingTime uint64 // 处理总时间
+ requestTime uint64 // 请求总时间
+ maxTime uint64 // 最大时长
+ minTime uint64 // 最小时长
+ successNum uint64 // 成功处理数，code为0
+ failureNum uint64 // 处理失败数，code不为0
+ chanIDLen int // 并发数
+ chanIDs = make(map[uint64]bool)
+ receivedBytes int64
+ mutex = sync.RWMutex{}
+ )
+ statTime := uint64(time.Now().UnixNano())
+ // 错误码/错误个数
+ var errCode = &sync.Map{}
+ // 定时输出一次计算结果
+ ticker := time.NewTicker(exportStatisticsTime)
+ go func() {
+ for {
+ select {
+ case <-ticker.C:
+ endTime := uint64(time.Now().UnixNano())
+ mutex.Lock()
+ go calculateData(concurrent, processingTime, endTime-statTime, maxTime, minTime, successNum, failureNum,
+ chanIDLen, errCode, receivedBytes)
+ mutex.Unlock()
+ case <-stopChan:
+ // 处理完成
+ return
+ }
+ }
+ }()
+ header()
+ for data := range ch {
+ mutex.Lock()
+ // fmt.Println("处理一条数据", data.ID, data.Time, data.IsSucceed, data.ErrCode)
+ processingTime = processingTime + data.Time
+ if maxTime <= data.Time {
+ maxTime = data.Time
+ }
+ if minTime == 0 {
+ minTime = data.Time
+ } else if minTime > data.Time {
+ minTime = data.Time
+ }
+ // 是否请求成功
+ if data.IsSucceed == true {
+ successNum = successNum + 1
+ } else {
+ failureNum = failureNum + 1
+ }
+ // 统计错误码
+ if value, ok := errCode.Load(data.ErrCode); ok {
+ valueInt, _ := value.(int)
+ errCode.Store(data.ErrCode, valueInt+1)
+ } else {
+ errCode.Store(data.ErrCode, 1)
+ }
+ receivedBytes += data.ReceivedBytes
+ if _, ok := chanIDs[data.ChanID]; !ok {
+ chanIDs[data.ChanID] = true
+ chanIDLen = len(chanIDs)
+ }
+ requestTimeList = append(requestTimeList, data.Time)
+ mutex.Unlock()
+ }
+ // 数据全部接受完成，停止定时输出统计数据
+ stopChan <- true
+ endTime := uint64(time.Now().UnixNano())
+ requestTime = endTime - statTime
+ calculateData(concurrent, processingTime, requestTime, maxTime, minTime, successNum, failureNum, chanIDLen, errCode,
+ receivedBytes)
+
+ fmt.Printf("\n\n")
+ fmt.Println("************************* 结果 stat ****************************")
+ fmt.Println("处理协程数量:", concurrent)
+ // fmt.Println("处理协程数量:", concurrent, "程序处理总时长:", fmt.Sprintf("%.3f", float64(processingTime/concurrent)/1e9), "秒")
+ fmt.Println("请求总数（并发数*请求数 -c * -n）:", successNum+failureNum, "总请求时间:",
+ fmt.Sprintf("%.3f", float64(requestTime)/1e9),
+ "秒", "successNum:", successNum, "failureNum:", failureNum)
+ printTop(requestTimeList)
+ fmt.Println("************************* 结果 end ****************************")
+ fmt.Printf("\n\n")
+}
+
+// printTop 排序后计算 top 90 95 99
+func printTop(requestTimeList []uint64) {
+ if requestTimeList == nil {
+ return
+ }
+ all := tools.MyUint64List{}
+ all = requestTimeList
+ sort.Sort(all)
+ fmt.Println("tp90:", fmt.Sprintf("%.3f", float64(all[int(float64(len(all))*0.90)]/1e6)))
+ fmt.Println("tp95:", fmt.Sprintf("%.3f", float64(all[int(float64(len(all))*0.95)]/1e6)))
+ fmt.Println("tp99:", fmt.Sprintf("%.3f", float64(all[int(float64(len(all))*0.99)]/1e6)))
+}
+
+// calculateData 计算数据
+func calculateData(concurrent, processingTime, requestTime, maxTime, minTime, successNum, failureNum uint64,
+ chanIDLen int, errCode *sync.Map, receivedBytes int64) {
+ if processingTime == 0 {
+ processingTime = 1
+ }
+ var (
+ qps float64
+ averageTime float64
+ maxTimeFloat float64
+ minTimeFloat float64
+ requestTimeFloat float64
+ )
+ // 平均 QPS 成功数*总协程数/总耗时 (每秒)
+ if processingTime != 0 {
+ qps = float64(successNum*1e9*concurrent) / float64(processingTime)
+ }
+ // 平均时长 总耗时/总请求数/并发数 纳秒=>毫秒
+ if successNum != 0 && concurrent != 0 {
+ averageTime = float64(processingTime) / float64(successNum*1e6)
+ }
+ // 纳秒=>毫秒
+ maxTimeFloat = float64(maxTime) / 1e6
+ minTimeFloat = float64(minTime) / 1e6
+ requestTimeFloat = float64(requestTime) / 1e9
+ // 打印的时长都为毫秒
+ table(successNum, failureNum, errCode, qps, averageTime, maxTimeFloat, minTimeFloat, requestTimeFloat, chanIDLen,
+ receivedBytes)
+}
+
+// header 打印表头信息
+func header() {
+ fmt.Printf("\n\n")
+ // 打印的时长都为毫秒 总请数
+ fmt.Println("─────┬───────┬───────┬───────┬────────┬────────┬────────┬────────┬────────┬────────┬────────")
+ fmt.Println(" 耗时│ 并发数│ 成功数│ 失败数│ qps │最长耗时│最短耗时│平均耗时│下载字节│字节每秒│ 状态码")
+ fmt.Println("─────┼───────┼───────┼───────┼────────┼────────┼────────┼────────┼────────┼────────┼────────")
+ return
+}
+
+// table 打印表格
+func table(successNum, failureNum uint64, errCode *sync.Map,
+ qps, averageTime, maxTimeFloat, minTimeFloat, requestTimeFloat float64, chanIDLen int, receivedBytes int64) {
+ var (
+ speed int64
+ )
+ if requestTimeFloat > 0 {
+ speed = int64(float64(receivedBytes) / requestTimeFloat)
+ } else {
+ speed = 0
+ }
+ var (
+ receivedBytesStr string
+ speedStr string
+ )
+ // 判断获取下载字节长度是否是未知
+ if receivedBytes <= 0 {
+ receivedBytesStr = ""
+ speedStr = ""
+ } else {
+ receivedBytesStr = p.Sprintf("%d", receivedBytes)
+ speedStr = p.Sprintf("%d", speed)
+ }
+ // 打印的时长都为毫秒
+ result := fmt.Sprintf("%4.0fs│%7d│%7d│%7d│%8.2f│%8.2f│%8.2f│%8.2f│%8s│%8s│%v",
+ requestTimeFloat, chanIDLen, successNum, failureNum, qps, maxTimeFloat, minTimeFloat, averageTime,
+ receivedBytesStr, speedStr,
+ printMap(errCode))
+ fmt.Println(result)
+ return
+}
+
+// printMap 输出错误码、次数 节约字符(终端一行字符大小有限)
+func printMap(errCode *sync.Map) (mapStr string) {
+ var (
+ mapArr []string
+ )
+ errCode.Range(func(key, value interface{}) bool {
+ mapArr = append(mapArr, fmt.Sprintf("%v:%v", key, value))
+ return true
+ })
+ sort.Strings(mapArr)
+ mapStr = strings.Join(mapArr, ";")
+ return
+}
diff --git a/stress/server/statistics/statistics_test.go b/stress/server/statistics/statistics_test.go
new file mode 100644
index 000000000..f74f32039
--- /dev/null
+++ b/stress/server/statistics/statistics_test.go
@@ -0,0 +1,65 @@
+/**
+* Package statistics
+*
+* User: link1st
+* Date: 2020/9/28
+* Time: 14:02
+ */
+package statistics
+
+import (
+ "reflect"
+ "sync"
+ "testing"
+)
+
+// TestPrintMap
+func TestPrintMap(t *testing.T) {
+
+ a := &sync.Map{}
+ a.Store(200, 50)
+ a.Store(100, 20)
+ a.Store(500, 10)
+
+ tt := map[string]struct {
+ a *sync.Map
+ result string
+ }{
+ "test1": {a: a, result: "100:20;200:50;500:10"},
+ }
+
+ for _, value := range tt {
+ str := printMap(value.a)
+ if !reflect.DeepEqual(value.result, str) {
+ t.Errorf("数据不一致 预期:%v 实际:%v", value.result, str)
+ }
+ }
+}
+
+func Test_printTop(t *testing.T) {
+ type args struct {
+ requestTimeList []uint64
+ }
+ tests := []struct {
+ name string
+ args args
+ }{
+ {
+ name: "nil",
+ args: args{
+ requestTimeList: nil,
+ },
+ },
+ {
+ name: "one data",
+ args: args{
+ requestTimeList: []uint64{1 * 1e6},
+ },
+ },
+ }
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ printTop(tt.args.requestTimeList)
+ })
+ }
+}
diff --git a/stress/server/verify/http_verify.go b/stress/server/verify/http_verify.go
new file mode 100644
index 000000000..5cd554542
--- /dev/null
+++ b/stress/server/verify/http_verify.go
@@ -0,0 +1,94 @@
+// Package verify 校验
+package verify
+
+import (
+ "bytes"
+ "compress/gzip"
+ "encoding/json"
+ "fmt"
+ "io"
+ "io/ioutil"
+ "net/http"
+
+ "go_dreamfactory/stress/model"
+)
+
+// getZipData 处理gzip压缩
+func getZipData(response *http.Response) (body []byte, err error) {
+ var reader io.ReadCloser
+ switch response.Header.Get("Content-Encoding") {
+ case "gzip":
+ reader, err = gzip.NewReader(response.Body)
+ defer func() {
+ _ = reader.Close()
+ }()
+ default:
+ reader = response.Body
+ }
+ body, err = ioutil.ReadAll(reader)
+ response.Body = ioutil.NopCloser(bytes.NewReader(body))
+ return
+}
+
+// HTTPStatusCode 通过 HTTP 状态码判断是否请求成功
+func HTTPStatusCode(request *model.Request, response *http.Response) (code int, isSucceed bool) {
+ defer func() {
+ _ = response.Body.Close()
+ }()
+ code = response.StatusCode
+ if code == request.Code {
+ isSucceed = true
+ }
+ // 开启调试模式
+ if request.GetDebug() {
+ body, err := getZipData(response)
+ fmt.Printf("请求结果 httpCode:%d body:%s err:%v \n", response.StatusCode, string(body), err)
+ }
+ io.Copy(ioutil.Discard, response.Body)
+ return
+}
+
+/*************************** 返回值为json ********************************/
+
+// ResponseJSON 返回数据结构体
+type ResponseJSON struct {
+ Code int `json:"code"`
+ Msg string `json:"msg"`
+ Data interface{} `json:"data"`
+}
+
+// HTTPJson 通过返回的Body 判断
+// 返回示例: {"code":200,"msg":"Success","data":{}}
+// code 默认将http code作为返回码，http code 为200时 取body中的返回code
+func HTTPJson(request *model.Request, response *http.Response) (code int, isSucceed bool) {
+ defer func() {
+ _ = response.Body.Close()
+ }()
+ code = response.StatusCode
+ if code == http.StatusOK {
+ body, err := getZipData(response)
+ if err != nil {
+ code = model.ParseError
+ fmt.Printf("请求结果 ioutil.ReadAll err:%v", err)
+ } else {
+ responseJSON := &ResponseJSON{}
+ err = json.Unmarshal(body, responseJSON)
+ if err != nil {
+ code = model.ParseError
+ fmt.Printf("请求结果 json.Unmarshal err:%v", err)
+ } else {
+ code = responseJSON.Code
+ // body 中code返回200为返回数据成功
+ if responseJSON.Code == request.Code {
+ isSucceed = true
+ }
+ }
+ }
+ // 开启调试模式
+ if request.GetDebug() {
+ fmt.Printf("请求结果 httpCode:%d body:%s err:%v \n", response.StatusCode, string(body), err)
+ }
+ }
+ io.Copy(ioutil.Discard, response.Body)
+ return
+}
diff --git a/stress/server/verify/websokcet_verify.go b/stress/server/verify/websokcet_verify.go
new file mode 100644
index 000000000..0427b2751
--- /dev/null
+++ b/stress/server/verify/websokcet_verify.go
@@ -0,0 +1,49 @@
+// Package verify 校验
+package verify
+
+import (
+ "encoding/json"
+ "fmt"
+
+ "go_dreamfactory/stress/model"
+)
+
+// WebSocketResponseJSON 返回数据结构体，返回值为json
+type WebSocketResponseJSON struct {
+ Seq string `json:"seq"`
+ Cmd string `json:"cmd"`
+ Response struct {
+ Code int `json:"code"`
+ CodeMsg string `json:"codeMsg"`
+ Data interface{} `json:"data"`
+ } `json:"response"`
+}
+
+// WebSocketJSON 通过返回的Body 判断
+// 返回示例: {"seq":"1566276523281-585638","cmd":"heartbeat","response":{"code":200,"codeMsg":"Success","data":null}}
+// code 取body中的返回code
+func WebSocketJSON(request *model.Request, seq string, msg []byte) (code int, isSucceed bool) {
+ responseJSON := &WebSocketResponseJSON{}
+ err := json.Unmarshal(msg, responseJSON)
+ if err != nil {
+ code = model.ParseError
+ fmt.Printf("请求结果 json.Unmarshal msg:%s err:%v", string(msg), err)
+ } else {
+
+ if seq != responseJSON.Seq {
+ code = model.ParseError
+ fmt.Println("请求和返回seq不一致 ~请求:", seq, responseJSON.Seq, string(msg))
+ } else {
+ code = responseJSON.Response.Code
+ // body 中code返回200为返回数据成功
+ if code == 200 {
+ isSucceed = true
+ }
+ }
+ }
+ // 开启调试模式
+ if request.GetDebug() {
+ fmt.Printf("请求结果 seq:%s body:%s \n", seq, string(msg))
+ }
+ return
+}
diff --git a/stress/stress.go b/stress/stress.go
new file mode 100644
index 000000000..dcd64391d
--- /dev/null
+++ b/stress/stress.go
@@ -0,0 +1,106 @@
+// Package main go 实现的压测工具
+package main
+
+import (
+ "context"
+ "flag"
+ "fmt"
+ "go_dreamfactory/stress/model"
+ "go_dreamfactory/stress/server"
+ "runtime"
+ "strings"
+ "time"
+)
+
+// array 自定义数组参数
+type array []string
+
+// String string
+func (a *array) String() string {
+ return fmt.Sprint(*a)
+}
+
+// Set set
+func (a *array) Set(s string) error {
+ *a = append(*a, s)
+
+ return nil
+}
+
+var (
+ concurrency uint64 = 1 // 并发数
+ totalNumber uint64 = 1 // 请求数(单个并发/协程)
+ debugStr = "false" // 是否是debug
+ requestURL = "" // 压测的url 目前支持，http/https ws/wss
+ path = "" // curl文件路径 http接口压测，自定义参数设置
+ verify = "" // verify 验证方法 在server/verify中 http 支持:statusCode、json webSocket支持:json
+ headers array // 自定义头信息传递给服务器
+ body = "" // HTTP POST方式传送数据
+ maxCon = 1 // 单个连接最大请求数
+ code = 200 // 成功状态码
+ http2 = false // 是否开http2.0
+ keepalive = false // 是否开启长连接
+ cpuNumber = 1 // CUP 核数，默认为一核，一般场景下单核已经够用了
+ timeout int64 = 0 // 超时时间，默认不设置
+)
+
+func init() {
+ flag.Uint64Var(&concurrency, "c", concurrency, "并发数")
+ flag.Uint64Var(&totalNumber, "n", totalNumber, "请求数(单个并发/协程)")
+ flag.StringVar(&debugStr, "d", debugStr, "调试模式")
+ flag.StringVar(&requestURL, "u", requestURL, "压测地址")
+ flag.StringVar(&path, "p", path, "curl文件路径")
+ flag.StringVar(&verify, "v", verify, "验证方法 http 支持:statusCode、json webSocket支持:json")
+ flag.Var(&headers, "H", "自定义头信息传递给服务器 示例:-H 'Content-Type: application/json'")
+ flag.StringVar(&body, "data", body, "HTTP POST方式传送数据")
+ flag.IntVar(&maxCon, "m", maxCon, "单个host最大连接数")
+ flag.IntVar(&code, "code", code, "请求成功的状态码")
+ flag.BoolVar(&http2, "http2", http2, "是否开http2.0")
+ flag.BoolVar(&keepalive, "k", keepalive, "是否开启长连接")
+ flag.IntVar(&cpuNumber, "cpuNumber", cpuNumber, "CUP 核数，默认为一核")
+ flag.Int64Var(&timeout, "timeout", timeout, "超时时间 单位 秒,默认不设置")
+ // 解析参数
+ flag.Parse()
+}
+
+// main go 实现的压测工具
+// 编译可执行文件
+//
+//go:generate go build main.go
+func main() {
+ runtime.GOMAXPROCS(cpuNumber)
+ //go run .\main.go -c 10 -n 10 -u ws://10.0.5.101:7891/gateway
+ concurrency = 10
+ totalNumber = 10
+ debugStr = "true"
+ requestURL = "ws://10.0.5.101:7891/gateway"
+ if concurrency == 0 || totalNumber == 0 || (requestURL == "" && path == "") {
+ fmt.Printf("示例: go run main.go -c 1 -n 1 -u https://www.baidu.com/ \n")
+ fmt.Printf("压测地址或curl路径必填 \n")
+ fmt.Printf("当前请求参数: -c %d -n %d -d %v -u %s \n", concurrency, totalNumber, debugStr, requestURL)
+ flag.Usage()
+ return
+ }
+ debug := strings.ToLower(debugStr) == "true"
+ request, err := model.NewRequest(requestURL, verify, code, 0, debug, path, headers, body, maxCon, http2, keepalive)
+ if err != nil {
+ fmt.Printf("参数不合法 %v \n", err)
+ return
+ }
+ fmt.Printf("\n 开始启动 并发数:%d 请求数:%d 请求参数: \n", concurrency, totalNumber)
+ request.Print()
+
+ // 开始处理
+ ctx := context.Background()
+ if timeout > 0 {
+ var cancel context.CancelFunc
+ ctx, cancel = context.WithTimeout(ctx, time.Duration(timeout)*time.Second)
+ defer cancel()
+ deadline, ok := ctx.Deadline()
+ if ok {
+ fmt.Printf(" deadline %s", deadline)
+ }
+ }
+ server.Dispose(ctx, concurrency, totalNumber, request)
+ return
+}
diff --git a/stress/tests/grpc/main.go b/stress/tests/grpc/main.go
new file mode 100644
index 000000000..323337026
--- /dev/null
+++ b/stress/tests/grpc/main.go
@@ -0,0 +1,47 @@
+// Package main grpc server
+package main
+
+import (
+ "context"
+ "fmt"
+ "log"
+ "net"
+
+ "google.golang.org/grpc"
+
+ pb "go_dreamfactory/stress/proto"
+)
+
+const (
+ // port 监听端口
+ port = ":8099"
+)
+
+// server is used to implement helloWorld.GreeterServer.
+type server struct {
+ pb.UnimplementedApiServerServer
+}
+
+// HelloWorld hello world 接口
+func (s *server) HelloWorld(_ context.Context, req *pb.Request) (rsp *pb.Response, err error) {
+ rsp = &pb.Response{
+ Code: 200,
+ Msg: "success",
+ Data: fmt.Sprintf("hello %s !", req.UserName),
+ }
+ return
+}
+
+// main 主函数
+func main() {
+ fmt.Println("trpc server 启动中...")
+ lis, err := net.Listen("tcp", port)
+ if err != nil {
+ log.Fatalf("failed to listen: %v", err)
+ }
+ s := grpc.NewServer()
+ pb.RegisterApiServerServer(s, &server{})
+ if err := s.Serve(lis); err != nil {
+ log.Fatalf("failed to serve: %v", err)
+ }
+}
diff --git a/stress/tests/servers.go b/stress/tests/servers.go
new file mode 100644
index 000000000..15b2f028f
--- /dev/null
+++ b/stress/tests/servers.go
@@ -0,0 +1,28 @@
+// Package main 测试用例package main
+package main
+
+import (
+ "log"
+ "net/http"
+ "runtime"
+)
+
+const (
+ httpPort = "8088"
+)
+
+func main() {
+ runtime.GOMAXPROCS(runtime.NumCPU() - 1)
+ hello := func(w http.ResponseWriter, req *http.Request) {
+ data := "Hello, go-stress-testing! \n"
+ w.Header().Add("Server", "golang")
+ _, _ = w.Write([]byte(data))
+ return
+ }
+
+ http.HandleFunc("/", hello)
+ err := http.ListenAndServe(":"+httpPort, nil)
+ if err != nil {
+ log.Fatal("ListenAndServe: ", err)
+ }
+}
diff --git a/stress/tools/sort.go b/stress/tools/sort.go
new file mode 100644
index 000000000..9e2bd2ff6
--- /dev/null
+++ b/stress/tools/sort.go
@@ -0,0 +1,7 @@
+package tools
+
+type MyUint64List []uint64
+
+func (my64 MyUint64List) Len() int { return len(my64) }
+func (my64 MyUint64List) Swap(i, j int) { my64[i], my64[j] = my64[j], my64[i] }
+func (my64 MyUint64List) Less(i, j int) bool { return my64[i] < my64[j] }
diff --git a/stress/目录.md b/stress/目录.md
new file mode 100644
index 000000000..b3d5bac96
--- /dev/null
+++ b/stress/目录.md
@@ -0,0 +1,37 @@
+## 目录
+- 1、项目说明
+ - 1.1 go-stress-testing
+ - 1.2 项目体验
+- 2、压测
+ - 2.1 压测是什么
+ - 2.2 为什么要压测
+ - 2.3 压测名词解释
+ - 2.3.1 压测类型解释
+ - 2.3.2 压测名词解释
+ - 2.3.3 机器性能指标解释
+ - 2.3.4 访问指标解释
+ - 3.4 如何计算压测指标
+- 3、常见的压测工具
+ - 3.1 ab
+ - 3.2 locust
+ - 3.3 Jmeter
+ - 3.4 云压测
+ - 3.4.1 云压测介绍
+ - 3.4.2 阿里云 性能测试 PTS
+ - 3.4.3 腾讯云 压测大师 LM
+- 4、go-stress-testing go语言实现的压测工具
+ - 4.1 介绍
+ - 4.2 用法
+ - 4.3 实现
+ - 4.4 go-stress-testing 对 Golang web 压测
+- 5、压测工具的比较
+ - 5.1 比较
+ - 5.2 如何选择压测工具
+- 6、单台机器100w连接压测实战
+ - 6.1 说明
+ - 6.2 内核优化
+ - 6.3 客户端配置
+ - 6.4 准备
+ - 6.5 压测数据
+- 7、总结
+- 8、参考文献
\ No newline at end of file
diff --git a/sys/configure/structs/Game.CombatLevelData.go b/sys/configure/structs/Game.CombatLevelData.go
index 532ddd9fd..944fa2a35 100644
--- a/sys/configure/structs/Game.CombatLevelData.go
+++ b/sys/configure/structs/Game.CombatLevelData.go
@@ -12,6 +12,7 @@ import "errors"
type GameCombatLevelData struct {
Id int32
+ Scene string
FormatList []int32
Droplist []int32
PassformatList []int32
@@ -27,6 +28,7 @@ func (*GameCombatLevelData) GetTypeId() int32 {
func (_v *GameCombatLevelData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
+ { var _ok_ bool; if _v.Scene, _ok_ = _buf["scene"].(string); !_ok_ { err = errors.New("scene error"); return } }
{
var _arr_ []interface{}
var _ok_ bool
diff --git a/sys/configure/structs/Game.CombatMansterData.go b/sys/configure/structs/Game.CombatMansterData.go
index f059cb9c5..acf8c9548 100644
--- a/sys/configure/structs/Game.CombatMansterData.go
+++ b/sys/configure/structs/Game.CombatMansterData.go
@@ -12,6 +12,10 @@ import "errors"
type GameCombatMansterData struct {
Id int32
+ Type int32
+ Sencenstory []int32
+ Time int32
+ Clickstory int32
FormatList []int32
Award []*Gameatn
}
@@ -24,6 +28,23 @@ func (*GameCombatMansterData) GetTypeId() int32 {
func (_v *GameCombatMansterData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["sencenstory"].([]interface{}); !_ok_ { err = errors.New("sencenstory error"); return }
+
+ _v.Sencenstory = 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.Sencenstory = append(_v.Sencenstory, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time"].(float64); !_ok_ { err = errors.New("time error"); return }; _v.Time = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["clickstory"].(float64); !_ok_ { err = errors.New("clickstory error"); return }; _v.Clickstory = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
diff --git a/sys/configure/structs/Game.WorldTaskData.go b/sys/configure/structs/Game.WorldTaskData.go
index 30ab22698..e92b469cb 100644
--- a/sys/configure/structs/Game.WorldTaskData.go
+++ b/sys/configure/structs/Game.WorldTaskData.go
@@ -26,8 +26,6 @@ type GameWorldTaskData struct {
AutoAccept int32
Overtips int32
Reword []*Gameatn
- Day string
- Weather int32
}
const TypeId_GameWorldTaskData = -1059668091
@@ -91,8 +89,6 @@ func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error)
}
}
- { var _ok_ bool; if _v.Day, _ok_ = _buf["day"].(string); !_ok_ { err = errors.New("day error"); return } }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["weather"].(float64); !_ok_ { err = errors.New("weather error"); return }; _v.Weather = int32(_tempNum_) }
return
}
diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go
index c98bea8e5..741357753 100644
--- a/sys/configure/structs/game.globalData.go
+++ b/sys/configure/structs/game.globalData.go
@@ -138,6 +138,9 @@ type GameGlobalData struct {
DrawCardRegressionReward []int32
DrawCardContinuousRestrictionStar5 int32
DrawCardContinuousRestrictionCamp int32
+ EquipmentConsumption []int32
+ DrawCardSupplement1 int32
+ DrawCardSupplement10 int32
}
const TypeId_GameGlobalData = 477542761
@@ -560,6 +563,22 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DrawCard_ContinuousRestriction_Star5"].(float64); !_ok_ { err = errors.New("DrawCard_ContinuousRestriction_Star5 error"); return }; _v.DrawCardContinuousRestrictionStar5 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DrawCard_ContinuousRestriction_Camp"].(float64); !_ok_ { err = errors.New("DrawCard_ContinuousRestriction_Camp error"); return }; _v.DrawCardContinuousRestrictionCamp = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["EquipmentConsumption"].([]interface{}); !_ok_ { err = errors.New("EquipmentConsumption error"); return }
+
+ _v.EquipmentConsumption = 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.EquipmentConsumption = append(_v.EquipmentConsumption, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DrawCard_supplement1"].(float64); !_ok_ { err = errors.New("DrawCard_supplement1 error"); return }; _v.DrawCardSupplement1 = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DrawCard_supplement10"].(float64); !_ok_ { err = errors.New("DrawCard_supplement10 error"); return }; _v.DrawCardSupplement10 = int32(_tempNum_) }
return
}