diff --git a/bin/json/game_buzkashimount.json b/bin/json/game_buzkashimount.json
index 61335d960..00efd8d35 100644
--- a/bin/json/game_buzkashimount.json
+++ b/bin/json/game_buzkashimount.json
@@ -1,77 +1,263 @@
[
{
"id": "20030001",
+ "type": 1,
"name": {
- "key": "",
- "text": ""
+ "key": "buzkashi_Mount_name_1",
+ "text": "测试名称1"
},
"intr": {
- "key": "",
- "text": ""
+ "key": "buzkashi_Mount_intr_1",
+ "text": "测试描述1"
},
"Color": 1,
- "Img": "",
+ "Img": "by_img_tx",
"access": [
107
],
- "model": "",
+ "model": "20030001_3",
"point": "",
"stime": 20,
- "etime": 80,
+ "etime": 0,
"hp": 7,
"moderate": 10,
"sprint": 200,
"acceleration": 100,
- "deceleration": 100
+ "deceleration": 100,
+ "itemsprint": 100,
+ "caddtime": 0,
+ "csubtime": 0
+ },
+ {
+ "id": "20030001",
+ "type": 2,
+ "name": {
+ "key": "buzkashi_Mount_name_2",
+ "text": "测试名称2"
+ },
+ "intr": {
+ "key": "buzkashi_Mount_intr_2",
+ "text": "测试描述2"
+ },
+ "Color": 1,
+ "Img": "by_img_tx",
+ "access": [
+ 107
+ ],
+ "model": "20030001_3",
+ "point": "",
+ "stime": 20,
+ "etime": 0,
+ "hp": 7,
+ "moderate": 10,
+ "sprint": 200,
+ "acceleration": 100,
+ "deceleration": 100,
+ "itemsprint": 100,
+ "caddtime": 0,
+ "csubtime": 0
+ },
+ {
+ "id": "20030001",
+ "type": 3,
+ "name": {
+ "key": "buzkashi_Mount_name_3",
+ "text": "测试名称3"
+ },
+ "intr": {
+ "key": "buzkashi_Mount_intr_3",
+ "text": "测试描述3"
+ },
+ "Color": 1,
+ "Img": "by_img_tx",
+ "access": [
+ 107
+ ],
+ "model": "20030001_3",
+ "point": "",
+ "stime": 20,
+ "etime": 40,
+ "hp": 7,
+ "moderate": 10,
+ "sprint": 200,
+ "acceleration": 100,
+ "deceleration": 100,
+ "itemsprint": 100,
+ "caddtime": 10,
+ "csubtime": 10
},
{
"id": "20030002",
+ "type": 1,
"name": {
- "key": "",
- "text": ""
+ "key": "buzkashi_Mount_name_4",
+ "text": "测试名称4"
},
"intr": {
- "key": "",
- "text": ""
+ "key": "buzkashi_Mount_intr_4",
+ "text": "测试描述4"
},
"Color": 1,
- "Img": "",
+ "Img": "by_img_tx2",
"access": [
107
],
- "model": "",
+ "model": "20030001_3",
"point": "",
"stime": 20,
- "etime": 80,
+ "etime": 0,
"hp": 7,
"moderate": 10,
"sprint": 200,
"acceleration": 100,
- "deceleration": 100
+ "deceleration": 100,
+ "itemsprint": 100,
+ "caddtime": 0,
+ "csubtime": 0
+ },
+ {
+ "id": "20030002",
+ "type": 2,
+ "name": {
+ "key": "buzkashi_Mount_name_5",
+ "text": "测试名称5"
+ },
+ "intr": {
+ "key": "buzkashi_Mount_intr_5",
+ "text": "测试描述5"
+ },
+ "Color": 1,
+ "Img": "by_img_tx2",
+ "access": [
+ 107
+ ],
+ "model": "20030001_3",
+ "point": "",
+ "stime": 20,
+ "etime": 0,
+ "hp": 7,
+ "moderate": 10,
+ "sprint": 200,
+ "acceleration": 100,
+ "deceleration": 100,
+ "itemsprint": 100,
+ "caddtime": 0,
+ "csubtime": 0
+ },
+ {
+ "id": "20030002",
+ "type": 3,
+ "name": {
+ "key": "buzkashi_Mount_name_6",
+ "text": "测试名称6"
+ },
+ "intr": {
+ "key": "buzkashi_Mount_intr_6",
+ "text": "测试描述6"
+ },
+ "Color": 1,
+ "Img": "by_img_tx2",
+ "access": [
+ 107
+ ],
+ "model": "20030001_3",
+ "point": "",
+ "stime": 20,
+ "etime": 0,
+ "hp": 7,
+ "moderate": 10,
+ "sprint": 200,
+ "acceleration": 100,
+ "deceleration": 100,
+ "itemsprint": 100,
+ "caddtime": 0,
+ "csubtime": 0
},
{
"id": "20030003",
+ "type": 1,
"name": {
- "key": "",
- "text": ""
+ "key": "buzkashi_Mount_name_7",
+ "text": "测试名称7"
},
"intr": {
- "key": "",
- "text": ""
+ "key": "buzkashi_Mount_intr_7",
+ "text": "测试描述7"
},
"Color": 1,
- "Img": "",
+ "Img": "by_img_tx3",
"access": [
107
],
- "model": "",
+ "model": "20030001_3",
"point": "",
"stime": 20,
- "etime": 80,
+ "etime": 0,
"hp": 7,
"moderate": 10,
"sprint": 200,
"acceleration": 100,
- "deceleration": 100
+ "deceleration": 100,
+ "itemsprint": 100,
+ "caddtime": 0,
+ "csubtime": 0
+ },
+ {
+ "id": "20030003",
+ "type": 2,
+ "name": {
+ "key": "buzkashi_Mount_name_8",
+ "text": "测试名称8"
+ },
+ "intr": {
+ "key": "buzkashi_Mount_intr_8",
+ "text": "测试描述8"
+ },
+ "Color": 1,
+ "Img": "by_img_tx3",
+ "access": [
+ 107
+ ],
+ "model": "20030001_3",
+ "point": "",
+ "stime": 20,
+ "etime": 0,
+ "hp": 7,
+ "moderate": 10,
+ "sprint": 200,
+ "acceleration": 100,
+ "deceleration": 100,
+ "itemsprint": 100,
+ "caddtime": 0,
+ "csubtime": 0
+ },
+ {
+ "id": "20030003",
+ "type": 3,
+ "name": {
+ "key": "buzkashi_Mount_name_9",
+ "text": "测试名称9"
+ },
+ "intr": {
+ "key": "buzkashi_Mount_intr_9",
+ "text": "测试描述9"
+ },
+ "Color": 1,
+ "Img": "by_img_tx3",
+ "access": [
+ 107
+ ],
+ "model": "20030001_3",
+ "point": "",
+ "stime": 20,
+ "etime": 0,
+ "hp": 7,
+ "moderate": 10,
+ "sprint": 200,
+ "acceleration": 100,
+ "deceleration": 100,
+ "itemsprint": 100,
+ "caddtime": 0,
+ "csubtime": 0
}
]
\ No newline at end of file
diff --git a/bin/json/game_mainboss.json b/bin/json/game_mainboss.json
new file mode 100644
index 000000000..e3a3f1f3b
--- /dev/null
+++ b/bin/json/game_mainboss.json
@@ -0,0 +1,2642 @@
+[
+ {
+ "id": 1100101,
+ "monster_chapter": 11001,
+ "MonsterDisplay_Ip": 1,
+ "monster_strength": 1,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100102,
+ "monster_chapter": 11001,
+ "MonsterDisplay_Ip": 1,
+ "monster_strength": 2,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100103,
+ "monster_chapter": 11001,
+ "MonsterDisplay_Ip": 1,
+ "monster_strength": 3,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100104,
+ "monster_chapter": 11001,
+ "MonsterDisplay_Ip": 1,
+ "monster_strength": 4,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100105,
+ "monster_chapter": 11001,
+ "MonsterDisplay_Ip": 1,
+ "monster_strength": 5,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100106,
+ "monster_chapter": 11001,
+ "MonsterDisplay_Ip": 1,
+ "monster_strength": 6,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100107,
+ "monster_chapter": 11001,
+ "MonsterDisplay_Ip": 1,
+ "monster_strength": 7,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100108,
+ "monster_chapter": 11001,
+ "MonsterDisplay_Ip": 1,
+ "monster_strength": 8,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100109,
+ "monster_chapter": 11001,
+ "MonsterDisplay_Ip": 1,
+ "monster_strength": 9,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100110,
+ "monster_chapter": 11001,
+ "MonsterDisplay_Ip": 1,
+ "monster_strength": 10,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100201,
+ "monster_chapter": 11002,
+ "MonsterDisplay_Ip": 2,
+ "monster_strength": 1,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100202,
+ "monster_chapter": 11002,
+ "MonsterDisplay_Ip": 2,
+ "monster_strength": 2,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100203,
+ "monster_chapter": 11002,
+ "MonsterDisplay_Ip": 2,
+ "monster_strength": 3,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100204,
+ "monster_chapter": 11002,
+ "MonsterDisplay_Ip": 2,
+ "monster_strength": 4,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100205,
+ "monster_chapter": 11002,
+ "MonsterDisplay_Ip": 2,
+ "monster_strength": 5,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100206,
+ "monster_chapter": 11002,
+ "MonsterDisplay_Ip": 2,
+ "monster_strength": 6,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100207,
+ "monster_chapter": 11002,
+ "MonsterDisplay_Ip": 2,
+ "monster_strength": 7,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100208,
+ "monster_chapter": 11002,
+ "MonsterDisplay_Ip": 2,
+ "monster_strength": 8,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100209,
+ "monster_chapter": 11002,
+ "MonsterDisplay_Ip": 2,
+ "monster_strength": 9,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100210,
+ "monster_chapter": 11002,
+ "MonsterDisplay_Ip": 2,
+ "monster_strength": 10,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100301,
+ "monster_chapter": 11003,
+ "MonsterDisplay_Ip": 3,
+ "monster_strength": 1,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100302,
+ "monster_chapter": 11003,
+ "MonsterDisplay_Ip": 3,
+ "monster_strength": 2,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100303,
+ "monster_chapter": 11003,
+ "MonsterDisplay_Ip": 3,
+ "monster_strength": 3,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100304,
+ "monster_chapter": 11003,
+ "MonsterDisplay_Ip": 3,
+ "monster_strength": 4,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100305,
+ "monster_chapter": 11003,
+ "MonsterDisplay_Ip": 3,
+ "monster_strength": 5,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100306,
+ "monster_chapter": 11003,
+ "MonsterDisplay_Ip": 3,
+ "monster_strength": 6,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100307,
+ "monster_chapter": 11003,
+ "MonsterDisplay_Ip": 3,
+ "monster_strength": 7,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100308,
+ "monster_chapter": 11003,
+ "MonsterDisplay_Ip": 3,
+ "monster_strength": 8,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100309,
+ "monster_chapter": 11003,
+ "MonsterDisplay_Ip": 3,
+ "monster_strength": 9,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100310,
+ "monster_chapter": 11003,
+ "MonsterDisplay_Ip": 3,
+ "monster_strength": 10,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100401,
+ "monster_chapter": 11004,
+ "MonsterDisplay_Ip": 4,
+ "monster_strength": 1,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100402,
+ "monster_chapter": 11004,
+ "MonsterDisplay_Ip": 4,
+ "monster_strength": 2,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100403,
+ "monster_chapter": 11004,
+ "MonsterDisplay_Ip": 4,
+ "monster_strength": 3,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100404,
+ "monster_chapter": 11004,
+ "MonsterDisplay_Ip": 4,
+ "monster_strength": 4,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100405,
+ "monster_chapter": 11004,
+ "MonsterDisplay_Ip": 4,
+ "monster_strength": 5,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100406,
+ "monster_chapter": 11004,
+ "MonsterDisplay_Ip": 4,
+ "monster_strength": 6,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100407,
+ "monster_chapter": 11004,
+ "MonsterDisplay_Ip": 4,
+ "monster_strength": 7,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100408,
+ "monster_chapter": 11004,
+ "MonsterDisplay_Ip": 4,
+ "monster_strength": 8,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100409,
+ "monster_chapter": 11004,
+ "MonsterDisplay_Ip": 4,
+ "monster_strength": 9,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100410,
+ "monster_chapter": 11004,
+ "MonsterDisplay_Ip": 4,
+ "monster_strength": 10,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100501,
+ "monster_chapter": 11005,
+ "MonsterDisplay_Ip": 5,
+ "monster_strength": 1,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100502,
+ "monster_chapter": 11005,
+ "MonsterDisplay_Ip": 5,
+ "monster_strength": 2,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100503,
+ "monster_chapter": 11005,
+ "MonsterDisplay_Ip": 5,
+ "monster_strength": 3,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100504,
+ "monster_chapter": 11005,
+ "MonsterDisplay_Ip": 5,
+ "monster_strength": 4,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100505,
+ "monster_chapter": 11005,
+ "MonsterDisplay_Ip": 5,
+ "monster_strength": 5,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100506,
+ "monster_chapter": 11005,
+ "MonsterDisplay_Ip": 5,
+ "monster_strength": 6,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100507,
+ "monster_chapter": 11005,
+ "MonsterDisplay_Ip": 5,
+ "monster_strength": 7,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100508,
+ "monster_chapter": 11005,
+ "MonsterDisplay_Ip": 5,
+ "monster_strength": 8,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100509,
+ "monster_chapter": 11005,
+ "MonsterDisplay_Ip": 5,
+ "monster_strength": 9,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100510,
+ "monster_chapter": 11005,
+ "MonsterDisplay_Ip": 5,
+ "monster_strength": 10,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100601,
+ "monster_chapter": 11006,
+ "MonsterDisplay_Ip": 6,
+ "monster_strength": 1,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100602,
+ "monster_chapter": 11006,
+ "MonsterDisplay_Ip": 6,
+ "monster_strength": 2,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100603,
+ "monster_chapter": 11006,
+ "MonsterDisplay_Ip": 6,
+ "monster_strength": 3,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100604,
+ "monster_chapter": 11006,
+ "MonsterDisplay_Ip": 6,
+ "monster_strength": 4,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100605,
+ "monster_chapter": 11006,
+ "MonsterDisplay_Ip": 6,
+ "monster_strength": 5,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100606,
+ "monster_chapter": 11006,
+ "MonsterDisplay_Ip": 6,
+ "monster_strength": 6,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100607,
+ "monster_chapter": 11006,
+ "MonsterDisplay_Ip": 6,
+ "monster_strength": 7,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100608,
+ "monster_chapter": 11006,
+ "MonsterDisplay_Ip": 6,
+ "monster_strength": 8,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100609,
+ "monster_chapter": 11006,
+ "MonsterDisplay_Ip": 6,
+ "monster_strength": 9,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100610,
+ "monster_chapter": 11006,
+ "MonsterDisplay_Ip": 6,
+ "monster_strength": 10,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100701,
+ "monster_chapter": 11007,
+ "MonsterDisplay_Ip": 7,
+ "monster_strength": 1,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100702,
+ "monster_chapter": 11007,
+ "MonsterDisplay_Ip": 7,
+ "monster_strength": 2,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100703,
+ "monster_chapter": 11007,
+ "MonsterDisplay_Ip": 7,
+ "monster_strength": 3,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100704,
+ "monster_chapter": 11007,
+ "MonsterDisplay_Ip": 7,
+ "monster_strength": 4,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100705,
+ "monster_chapter": 11007,
+ "MonsterDisplay_Ip": 7,
+ "monster_strength": 5,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100706,
+ "monster_chapter": 11007,
+ "MonsterDisplay_Ip": 7,
+ "monster_strength": 6,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100707,
+ "monster_chapter": 11007,
+ "MonsterDisplay_Ip": 7,
+ "monster_strength": 7,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100708,
+ "monster_chapter": 11007,
+ "MonsterDisplay_Ip": 7,
+ "monster_strength": 8,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100709,
+ "monster_chapter": 11007,
+ "MonsterDisplay_Ip": 7,
+ "monster_strength": 9,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100710,
+ "monster_chapter": 11007,
+ "MonsterDisplay_Ip": 7,
+ "monster_strength": 10,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100801,
+ "monster_chapter": 11008,
+ "MonsterDisplay_Ip": 8,
+ "monster_strength": 1,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100802,
+ "monster_chapter": 11008,
+ "MonsterDisplay_Ip": 8,
+ "monster_strength": 2,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100803,
+ "monster_chapter": 11008,
+ "MonsterDisplay_Ip": 8,
+ "monster_strength": 3,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100804,
+ "monster_chapter": 11008,
+ "MonsterDisplay_Ip": 8,
+ "monster_strength": 4,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100805,
+ "monster_chapter": 11008,
+ "MonsterDisplay_Ip": 8,
+ "monster_strength": 5,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100806,
+ "monster_chapter": 11008,
+ "MonsterDisplay_Ip": 8,
+ "monster_strength": 6,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100807,
+ "monster_chapter": 11008,
+ "MonsterDisplay_Ip": 8,
+ "monster_strength": 7,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100808,
+ "monster_chapter": 11008,
+ "MonsterDisplay_Ip": 8,
+ "monster_strength": 8,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100809,
+ "monster_chapter": 11008,
+ "MonsterDisplay_Ip": 8,
+ "monster_strength": 9,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100810,
+ "monster_chapter": 11008,
+ "MonsterDisplay_Ip": 8,
+ "monster_strength": 10,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100901,
+ "monster_chapter": 11009,
+ "MonsterDisplay_Ip": 9,
+ "monster_strength": 1,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100902,
+ "monster_chapter": 11009,
+ "MonsterDisplay_Ip": 9,
+ "monster_strength": 2,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100903,
+ "monster_chapter": 11009,
+ "MonsterDisplay_Ip": 9,
+ "monster_strength": 3,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100904,
+ "monster_chapter": 11009,
+ "MonsterDisplay_Ip": 9,
+ "monster_strength": 4,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100905,
+ "monster_chapter": 11009,
+ "MonsterDisplay_Ip": 9,
+ "monster_strength": 5,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100906,
+ "monster_chapter": 11009,
+ "MonsterDisplay_Ip": 9,
+ "monster_strength": 6,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100907,
+ "monster_chapter": 11009,
+ "MonsterDisplay_Ip": 9,
+ "monster_strength": 7,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100908,
+ "monster_chapter": 11009,
+ "MonsterDisplay_Ip": 9,
+ "monster_strength": 8,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100909,
+ "monster_chapter": 11009,
+ "MonsterDisplay_Ip": 9,
+ "monster_strength": 9,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1100910,
+ "monster_chapter": 11009,
+ "MonsterDisplay_Ip": 9,
+ "monster_strength": 10,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101001,
+ "monster_chapter": 11010,
+ "MonsterDisplay_Ip": 10,
+ "monster_strength": 1,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101002,
+ "monster_chapter": 11010,
+ "MonsterDisplay_Ip": 10,
+ "monster_strength": 2,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101003,
+ "monster_chapter": 11010,
+ "MonsterDisplay_Ip": 10,
+ "monster_strength": 3,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101004,
+ "monster_chapter": 11010,
+ "MonsterDisplay_Ip": 10,
+ "monster_strength": 4,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101005,
+ "monster_chapter": 11010,
+ "MonsterDisplay_Ip": 10,
+ "monster_strength": 5,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101006,
+ "monster_chapter": 11010,
+ "MonsterDisplay_Ip": 10,
+ "monster_strength": 6,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101007,
+ "monster_chapter": 11010,
+ "MonsterDisplay_Ip": 10,
+ "monster_strength": 7,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101008,
+ "monster_chapter": 11010,
+ "MonsterDisplay_Ip": 10,
+ "monster_strength": 8,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101009,
+ "monster_chapter": 11010,
+ "MonsterDisplay_Ip": 10,
+ "monster_strength": 9,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101010,
+ "monster_chapter": 11010,
+ "MonsterDisplay_Ip": 10,
+ "monster_strength": 10,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101101,
+ "monster_chapter": 11011,
+ "MonsterDisplay_Ip": 11,
+ "monster_strength": 1,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101102,
+ "monster_chapter": 11011,
+ "MonsterDisplay_Ip": 11,
+ "monster_strength": 2,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101103,
+ "monster_chapter": 11011,
+ "MonsterDisplay_Ip": 11,
+ "monster_strength": 3,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101104,
+ "monster_chapter": 11011,
+ "MonsterDisplay_Ip": 11,
+ "monster_strength": 4,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101105,
+ "monster_chapter": 11011,
+ "MonsterDisplay_Ip": 11,
+ "monster_strength": 5,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101106,
+ "monster_chapter": 11011,
+ "MonsterDisplay_Ip": 11,
+ "monster_strength": 6,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101107,
+ "monster_chapter": 11011,
+ "MonsterDisplay_Ip": 11,
+ "monster_strength": 7,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101108,
+ "monster_chapter": 11011,
+ "MonsterDisplay_Ip": 11,
+ "monster_strength": 8,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101109,
+ "monster_chapter": 11011,
+ "MonsterDisplay_Ip": 11,
+ "monster_strength": 9,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101110,
+ "monster_chapter": 11011,
+ "MonsterDisplay_Ip": 11,
+ "monster_strength": 10,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101201,
+ "monster_chapter": 11012,
+ "MonsterDisplay_Ip": 12,
+ "monster_strength": 1,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101202,
+ "monster_chapter": 11012,
+ "MonsterDisplay_Ip": 12,
+ "monster_strength": 2,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101203,
+ "monster_chapter": 11012,
+ "MonsterDisplay_Ip": 12,
+ "monster_strength": 3,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101204,
+ "monster_chapter": 11012,
+ "MonsterDisplay_Ip": 12,
+ "monster_strength": 4,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101205,
+ "monster_chapter": 11012,
+ "MonsterDisplay_Ip": 12,
+ "monster_strength": 5,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101206,
+ "monster_chapter": 11012,
+ "MonsterDisplay_Ip": 12,
+ "monster_strength": 6,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101207,
+ "monster_chapter": 11012,
+ "MonsterDisplay_Ip": 12,
+ "monster_strength": 7,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101208,
+ "monster_chapter": 11012,
+ "MonsterDisplay_Ip": 12,
+ "monster_strength": 8,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101209,
+ "monster_chapter": 11012,
+ "MonsterDisplay_Ip": 12,
+ "monster_strength": 9,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": 1101210,
+ "monster_chapter": 11012,
+ "MonsterDisplay_Ip": 12,
+ "monster_strength": 10,
+ "battlereadyid": 0,
+ "formatList": [
+ 101011
+ ],
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10000003",
+ "n": 1
+ }
+ ]
+ }
+]
\ No newline at end of file
diff --git a/modules/mainline/api_booschallenge.go b/modules/mainline/api_booschallenge.go
new file mode 100644
index 000000000..36e86b0ea
--- /dev/null
+++ b/modules/mainline/api_booschallenge.go
@@ -0,0 +1,94 @@
+package mainline
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+ cfg "go_dreamfactory/sys/configure/structs"
+)
+
+// 参数校验
+func (this *apiComp) BoosChallengeCheck(session comm.IUserSession, req *pb.MainlineBoosChallengeReq) (errdata *pb.ErrorData) {
+ if req.Boosid == 0 {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ReqParameterError,
+ Title: pb.ErrorCode_ReqParameterError.ToString(),
+ }
+ }
+ return
+}
+
+// /挑战主线关卡
+func (this *apiComp) BoosChallenge(session comm.IUserSession, req *pb.MainlineBoosChallengeReq) (errdata *pb.ErrorData) {
+ var (
+ info *pb.DBMainline // 当前章节信息
+ conf *cfg.GameMainBossData // 当前章节数据
+ err error
+ )
+
+ if errdata = this.BoosChallengeCheck(session, req); errdata != nil {
+ return // 参数校验失败直接返回
+ }
+
+ if conf, err = this.module.configure.getGameMainBossData(req.Boosid); err != nil { // 配置文件校验
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_MainlineNotFindChapter,
+ Title: pb.ErrorCode_MainlineNotFindChapter.ToString(),
+ Message: err.Error(),
+ }
+ return
+ }
+ if info, err = this.module.modelMline.getMainlineData(session.GetUserId()); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.ToString(),
+ Message: err.Error(),
+ }
+ return
+ }
+ //不是当前章节
+ if conf.MonsterChapter != info.Currbooschapter {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ReqParameterError,
+ Title: pb.ErrorCode_ReqParameterError.ToString(),
+ Message: "boos is no Currbooschapter",
+ }
+ return
+ }
+
+ //未解锁
+ if info.Chapterboos[conf.MonsterChapter]+1 < conf.MonsterStrength {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ReqParameterError,
+ Title: pb.ErrorCode_ReqParameterError.ToString(),
+ Message: "boos is unlock",
+ }
+ return
+ }
+
+ errdata, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
+ Rulesid: conf.Battlereadyid,
+ Ptype: pb.PlayType_mainline,
+ Title: "",
+ Format: req.Battle,
+ Mformat: conf.FormatList,
+ })
+ if errdata != nil {
+ return
+ }
+ session.SendMsg(string(this.module.GetType()), "challenge", &pb.MainlineBoosChallengeResp{
+ Info: &pb.BattleInfo{
+ Id: record.Id,
+ Title: record.Title,
+ Rulesid: conf.Battlereadyid,
+ Btype: record.Btype,
+ Ptype: record.Ptype,
+ RedCompId: record.RedCompId,
+ Redflist: record.Redflist,
+ BlueCompId: record.BlueCompId,
+ Buleflist: record.Buleflist,
+ Tasks: record.Tasks,
+ },
+ Boosid: req.Boosid,
+ })
+ return
+}
diff --git a/modules/mainline/api_booschallengeover.go b/modules/mainline/api_booschallengeover.go
new file mode 100644
index 000000000..4e50ab3d9
--- /dev/null
+++ b/modules/mainline/api_booschallengeover.go
@@ -0,0 +1,90 @@
+package mainline
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+
+ cfg "go_dreamfactory/sys/configure/structs"
+)
+
+// 参数校验
+func (this *apiComp) BoosChallengeOverCheck(session comm.IUserSession, req *pb.MainlineBoosChallengeOverReq) (errdata *pb.ErrorData) {
+ if req.Boosid == 0 {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ReqParameterError,
+ Title: pb.ErrorCode_ReqParameterError.ToString(),
+ }
+ return
+ }
+ return
+}
+
+// /挑战主线关卡
+func (this *apiComp) BoosChallengeOver(session comm.IUserSession, req *pb.MainlineBoosChallengeOverReq) (errdata *pb.ErrorData) {
+ var (
+ conf *cfg.GameMainBossData
+ info *pb.DBMainline
+ aeward []*pb.UserAtno = make([]*pb.UserAtno, 0)
+ isWin bool
+ err error
+ )
+ if errdata = this.BoosChallengeOverCheck(session, req); errdata != nil {
+ return // 参数校验失败直接返回
+ }
+ if conf, err = this.module.configure.getGameMainBossData(req.Boosid); err != nil { // 配置文件校验
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_MainlineNotFindChapter,
+ Title: pb.ErrorCode_MainlineNotFindChapter.ToString(),
+ Message: err.Error(),
+ }
+ return
+ }
+
+ if info, err = this.module.modelMline.getMainlineData(session.GetUserId()); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.ToString(),
+ Message: err.Error(),
+ }
+ return
+ }
+
+ // 校验通过
+ errdata, isWin = this.module.battle.CheckBattleReport(session, req.Report)
+ if errdata != nil {
+ return
+ }
+ if !isWin { // 战斗失败返还扣除的体力
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_BattleValidationFailed,
+ Title: pb.ErrorCode_BattleValidationFailed.ToString(),
+ Message: "battle is defeated",
+ }
+ return
+ }
+
+ if errdata, aeward = this.module.DispenseAtno(session, conf.Reward, true); errdata != nil {
+ this.module.Debugf("Mline Boos DispenseRes err:+%v", conf.Reward)
+ return
+ }
+
+ info.Chapterboos[conf.MonsterChapter] = conf.MonsterStrength
+ info.Currbooschallengenum++
+ if err = this.module.modelMline.Change(session.GetUserId(), map[string]interface{}{
+ "chapterboos": info.Chapterboos,
+ "currbooschallengenum": info.Currbooschallengenum,
+ }); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.ToString(),
+ Message: err.Error(),
+ }
+ return
+ }
+ session.SendMsg(string(this.module.GetType()), "booschallengeover", &pb.MainlineBoosChallengeOverResp{
+ Boosid: req.Boosid,
+ Reward: aeward,
+ })
+
+ return
+}
diff --git a/modules/mainline/api_challengeover.go b/modules/mainline/api_challengeover.go
index 0f78429a5..74b2776c8 100644
--- a/modules/mainline/api_challengeover.go
+++ b/modules/mainline/api_challengeover.go
@@ -117,32 +117,22 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh
if first { // 发奖
if errdata, atno = this.module.DispenseAtno(session, conf.Firstaward, true); errdata != nil {
this.module.Debugf("Mline first DispenseRes err:+%v", conf.Firstaward)
+ return
}
aeward = append(aeward, atno...)
- // for _, v := range conf.Firstaward {
- // aeward = append(aeward, &pb.UserAssets{
- // A: v.A,
- // T: v.T,
- // N: v.N,
- // })
- // }
} else {
if errdata, atno = this.module.DispenseAtno(session, conf.Commonaward, true); errdata != nil {
this.module.Debugf("Mline Commonaward DispenseRes err:+%v", conf.Commonaward)
+ return
}
aeward = append(aeward, atno...)
- // for _, v := range conf.Commonaward {
- // aeward = append(aeward, &pb.UserAssets{
- // A: v.A,
- // T: v.T,
- // N: v.N,
- // })
- // }
+
}
user := this.module.ModuleUser.GetUser(session.GetUserId())
if lotteryward := this.module.ModuleTools.GetGroupDataByLottery(conf.Lotteryward, user.Vip, user.Lv); len(lotteryward) > 0 {
if errdata, atno = this.module.DispenseAtno(session, lotteryward, true); errdata != nil {
this.module.Debugf("Mline lotteryward DispenseRes err:+%v", lotteryward)
+ return
}
aeward = append(aeward, atno...)
}
diff --git a/modules/mainline/api_info.go b/modules/mainline/api_info.go
index 14fc4e0ac..5ca84f866 100644
--- a/modules/mainline/api_info.go
+++ b/modules/mainline/api_info.go
@@ -3,6 +3,7 @@ package mainline
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
+ "go_dreamfactory/utils"
)
// 参数校验
@@ -34,6 +35,26 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.MainlineInfoReq) (e
}
return
}
+ if !utils.IsToday(info.Lastboosrefresh) { //不是同一天
+ if err = this.module.modelMline.randomboos(info); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ConfigNoFound,
+ Title: pb.ErrorCode_ConfigNoFound.ToString(),
+ Message: err.Error(),
+ }
+ return
+ }
+ if err = this.module.modelMline.Change(session.GetUserId(), map[string]interface{}{
+ "currbooschapter": info.Currbooschapter,
+ "lastboosrefresh": info.Lastboosrefresh,
+ }); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.ToString(),
+ Message: err.Error(),
+ }
+ }
+ }
tasks = this.module.configure.getChapteTasks()
condiIds = make([]int32, 0, len(tasks))
diff --git a/modules/mainline/comp_configure.go b/modules/mainline/comp_configure.go
index 8ea359c17..e919f1089 100644
--- a/modules/mainline/comp_configure.go
+++ b/modules/mainline/comp_configure.go
@@ -9,13 +9,13 @@ import (
"sync"
)
-const moduleName = "mline"
const (
game_mainchapter = "game_mainchapter.json"
game_mainstage = "game_mainstage.json"
game_mainstarreward = "game_mainstarreward.json"
game_mainshopitem = "game_mainshopitem.json"
game_mainachievement = "game_mainachievement.json"
+ game_mainboos = "game_mainboss.json"
)
// /配置管理基础组件
@@ -39,6 +39,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
err = this.LoadMultiConfigure(map[string]interface{}{
game_mainchapter: cfg.NewGameMainChapter,
game_mainshopitem: cfg.NewGameMainShopItem,
+ game_mainboos: cfg.NewGameMainBoss,
})
this.chapterMap = make(map[int32][]*cfg.GameMainStageData)
configure.RegisterConfigure(game_mainstage, cfg.NewGameMainStage, this.updateMlineStage)
@@ -156,7 +157,7 @@ func (this *configureComp) GetMainStageConf(id int32) (data *cfg.GameMainStageDa
}
}
}
- err = comm.NewNotFoundConfErr(moduleName, game_mainstage, id)
+ err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_mainstage, id)
return
}
@@ -183,7 +184,7 @@ func (this *configureComp) GetMlineShopConfById(cid int32) (conf *cfg.GameMainSh
}
}
}
- err = comm.NewNotFoundConfErr(moduleName, game_mainstage, cid)
+ err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_mainstage, cid)
return
}
@@ -284,3 +285,20 @@ func (this *configureComp) updateGameMainChapter() {
this.lock.Unlock()
return
}
+
+// 获取主线boos
+func (this *configureComp) getGameMainBossData(id int32) (conf *cfg.GameMainBossData, err error) {
+ var (
+ v interface{}
+ ok bool
+ )
+ if v, err = this.GetConfigure(game_mainboos); err != nil {
+ return
+ }
+ if conf, ok = v.(*cfg.GameMainBoss).GetDataMap()[id]; !ok {
+ err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_mainboos, id)
+ this.module.Errorln(err)
+ return
+ }
+ return
+}
diff --git a/modules/mainline/model_mainline.go b/modules/mainline/model_mainline.go
index 7a57819da..24e9dce34 100644
--- a/modules/mainline/model_mainline.go
+++ b/modules/mainline/model_mainline.go
@@ -8,6 +8,7 @@ import (
"go_dreamfactory/lego/sys/mgo"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
+ "go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs"
"go.mongodb.org/mongo-driver/bson/primitive"
@@ -31,7 +32,6 @@ func (this *ModelMline) Init(service core.IService, module core.IModule, comp co
return
}
-// 获取用户全部的埋点数据
func (this *ModelMline) getMainlineData(uid string) (results *pb.DBMainline, err error) {
results = &pb.DBMainline{}
if err = this.Get(uid, results); err != nil && err != mgo.MongodbNil {
@@ -158,3 +158,27 @@ func (this *ModelMline) checklevel(level int32, data *pb.DBMainline) (err error)
}
return
}
+
+// 随机boos
+func (this *ModelMline) randomboos(data *pb.DBMainline) (err error) {
+ var (
+ chapters []int32 = make([]int32, 0)
+ weight []int32 = make([]int32, 0)
+ conf *cfg.GameMainChapterData
+ index int32
+ )
+ for k, _ := range data.Chapteraward {
+ chapters = append(chapters, k)
+ }
+ for _, v := range chapters {
+ if conf, err = this.module.configure.GetMainChapterConf(v); err != nil {
+ return
+ }
+ weight = append(weight, conf.Bosspro)
+ }
+
+ index = comm.GetRandW(weight)
+ data.Currbooschapter = chapters[index]
+ data.Lastboosrefresh = configure.Now().Unix()
+ return
+}
diff --git a/modules/parkour/api_changemts.go b/modules/parkour/api_changemts.go
index b45f82c7e..59003ed94 100644
--- a/modules/parkour/api_changemts.go
+++ b/modules/parkour/api_changemts.go
@@ -3,7 +3,6 @@ package parkour
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
- cfg "go_dreamfactory/sys/configure/structs"
)
//参数校验
@@ -14,10 +13,9 @@ func (this *apiComp) ChangeMtsCheck(session comm.IUserSession, req *pb.ParkourCh
///游戏
func (this *apiComp) ChangeMts(session comm.IUserSession, req *pb.ParkourChangeMtsReq) (errdata *pb.ErrorData) {
var (
- info *pb.DBParkour
- team *pb.DBParkour
- mount *cfg.GameBuzkashiMountData
- err error
+ info *pb.DBParkour
+ team *pb.DBParkour
+ err error
)
if errdata = this.ChangeMtsCheck(session, req); errdata != nil {
return
@@ -39,19 +37,11 @@ func (this *apiComp) ChangeMts(session comm.IUserSession, req *pb.ParkourChangeM
}
info.Dfmount = req.Mtsid
if info.Captainid != "" {
- if mount, err = this.module.configure.getGameBuzkashiMount(info.Dfmount); err != nil {
- errdata = &pb.ErrorData{
- Code: pb.ErrorCode_ConfigNoFound,
- Title: pb.ErrorCode_ConfigNoFound.ToString(),
- Message: err.Error(),
- }
- return
- }
if info.Captainid == session.GetUserId() {
for _, v := range info.Member {
if v.Uid == session.GetUserId() {
v.Mount = info.Dfmount
- v.Maxhp = mount.Hp
+ v.Maxhp = 10
}
}
if err = this.module.parkourComp.Change(session.GetUserId(), map[string]interface{}{
@@ -77,7 +67,7 @@ func (this *apiComp) ChangeMts(session comm.IUserSession, req *pb.ParkourChangeM
for _, v := range team.Member {
if v.Uid == session.GetUserId() {
v.Mount = info.Dfmount
- v.Maxhp = mount.Hp
+ v.Maxhp = 10
}
}
if err = this.module.parkourComp.Change(team.Captainid, map[string]interface{}{
diff --git a/modules/parkour/api_invite.go b/modules/parkour/api_invite.go
index 23a83b6bc..9f828c944 100644
--- a/modules/parkour/api_invite.go
+++ b/modules/parkour/api_invite.go
@@ -4,7 +4,6 @@ import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
- cfg "go_dreamfactory/sys/configure/structs"
"time"
)
@@ -25,7 +24,6 @@ func (this *apiComp) Invite(session comm.IUserSession, req *pb.ParkourInviteReq)
info *pb.DBParkour
tinfo *pb.DBParkour
tuser *pb.DBUser
- mount *cfg.GameBuzkashiMountData
member *pb.DBRaceMember
users []string
ok bool
@@ -64,14 +62,6 @@ func (this *apiComp) Invite(session comm.IUserSession, req *pb.ParkourInviteReq)
}
return
}
- if mount, err = this.module.configure.getGameBuzkashiMount(info.Dfmount); err != nil {
- errdata = &pb.ErrorData{
- Code: pb.ErrorCode_ConfigNoFound,
- Title: pb.ErrorCode_ConfigNoFound.ToString(),
- Message: err.Error(),
- }
- return
- }
ok = false
for _, v := range info.Member {
@@ -80,7 +70,7 @@ func (this *apiComp) Invite(session comm.IUserSession, req *pb.ParkourInviteReq)
}
}
if !ok {
- info.Member = append(info.Member, &pb.DBRaceMember{Uid: tuser.Uid, Name: tuser.Name, Avatar: tuser.Avatar, Lv: tuser.Lv, Mount: info.Dfmount, Maxhp: mount.Hp})
+ info.Member = append(info.Member, &pb.DBRaceMember{Uid: tuser.Uid, Name: tuser.Name, Avatar: tuser.Avatar, Lv: tuser.Lv, Mount: info.Dfmount, Maxhp: 10})
}
if tinfo, err = this.module.parkourComp.queryinfo(req.Uid); err != nil {
@@ -98,18 +88,10 @@ func (this *apiComp) Invite(session comm.IUserSession, req *pb.ParkourInviteReq)
}
return
}
- if mount, err = this.module.configure.getGameBuzkashiMount(tinfo.Dfmount); err != nil {
- errdata = &pb.ErrorData{
- Code: pb.ErrorCode_ConfigNoFound,
- Title: pb.ErrorCode_ConfigNoFound.ToString(),
- Message: err.Error(),
- }
- return
- }
//目标是否在线
if !this.module.ModuleUser.IsOnline(req.Uid) {
- member = &pb.DBRaceMember{Uid: tuser.Uid, Name: tuser.Name, Avatar: tuser.Avatar, Lv: tuser.Lv, Mount: tinfo.Dfmount, Maxhp: mount.Hp, Isai: true}
+ member = &pb.DBRaceMember{Uid: tuser.Uid, Name: tuser.Name, Avatar: tuser.Avatar, Lv: tuser.Lv, Mount: tinfo.Dfmount, Maxhp: 10, Isai: true}
info.Captainid = session.GetUserId()
info.Member = append(info.Member, member)
users = make([]string, len(info.Member))
diff --git a/modules/parkour/api_invitehandle.go b/modules/parkour/api_invitehandle.go
index e334d3db7..29a5f0211 100644
--- a/modules/parkour/api_invitehandle.go
+++ b/modules/parkour/api_invitehandle.go
@@ -4,7 +4,6 @@ import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
- cfg "go_dreamfactory/sys/configure/structs"
"time"
)
@@ -20,7 +19,6 @@ func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInvi
tean *pb.DBParkour
invite *pb.DBRaceInvite
member *pb.DBRaceMember
- mount *cfg.GameBuzkashiMountData
users []string
ok bool
index int32
@@ -48,8 +46,8 @@ func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInvi
}
if len(tean.Member) >= 3 {
errdata = &pb.ErrorData{
- Code: pb.ErrorCode_ParkourMemberFull,
- Title: pb.ErrorCode_ParkourMemberFull.ToString(),
+ Code: pb.ErrorCode_ParkourMemberFull,
+ Title: pb.ErrorCode_ParkourMemberFull.ToString(),
}
return
}
@@ -64,8 +62,8 @@ func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInvi
}
if !ok {
errdata = &pb.ErrorData{
- Code: pb.ErrorCode_ParkourInviteOverdue,
- Title: pb.ErrorCode_ParkourInviteOverdue.ToString(),
+ Code: pb.ErrorCode_ParkourInviteOverdue,
+ Title: pb.ErrorCode_ParkourInviteOverdue.ToString(),
}
return
}
@@ -74,16 +72,8 @@ func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInvi
for i, v := range tean.Member {
users[i] = v.Uid
}
- if mount, err = this.module.configure.getGameBuzkashiMount(info.Dfmount); err != nil {
- errdata = &pb.ErrorData{
- Code: pb.ErrorCode_ConfigNoFound,
- Title: pb.ErrorCode_ConfigNoFound.ToString(),
- Message: err.Error(),
- }
- return
- }
users = append(users, invite.Uid)
- member = &pb.DBRaceMember{Uid: invite.Uid, Name: invite.Name, Avatar: invite.Avatar, Lv: invite.Lv, Mount: info.Dfmount, Maxhp: mount.Hp}
+ member = &pb.DBRaceMember{Uid: invite.Uid, Name: invite.Name, Avatar: invite.Avatar, Lv: invite.Lv, Mount: info.Dfmount, Maxhp: 10}
tean.Captainid = tean.Uid
tean.State = pb.RaceTeamState_teaming
tean.Member = append(tean.Member, member)
diff --git a/modules/parkour/api_jointeam.go b/modules/parkour/api_jointeam.go
index a6dc7ba06..a5d4f516c 100644
--- a/modules/parkour/api_jointeam.go
+++ b/modules/parkour/api_jointeam.go
@@ -3,7 +3,6 @@ package parkour
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
- cfg "go_dreamfactory/sys/configure/structs"
)
//参数校验
@@ -23,7 +22,6 @@ func (this *apiComp) JoinTeam(session comm.IUserSession, req *pb.ParkourJoinTeam
var (
info *pb.DBParkour
tean *pb.DBParkour
- mount *cfg.GameBuzkashiMountData
member *pb.DBRaceMember
users []string
@@ -82,15 +80,8 @@ func (this *apiComp) JoinTeam(session comm.IUserSession, req *pb.ParkourJoinTeam
}
if tean.Captainid == "" {
user := this.module.ModuleUser.GetUser(tean.Uid)
- if mount, err = this.module.configure.getGameBuzkashiMount(tean.Dfmount); err != nil {
- errdata = &pb.ErrorData{
- Code: pb.ErrorCode_ConfigNoFound,
- Title: pb.ErrorCode_ConfigNoFound.ToString(),
- Message: err.Error(),
- }
- return
- }
- member = &pb.DBRaceMember{Uid: user.Uid, Name: user.Name, Avatar: user.Avatar, Lv: user.Lv, Mount: tean.Dfmount, Maxhp: mount.Hp}
+
+ member = &pb.DBRaceMember{Uid: user.Uid, Name: user.Name, Avatar: user.Avatar, Lv: user.Lv, Mount: tean.Dfmount, Maxhp: 10}
tean.Captainid = tean.Uid
tean.State = pb.RaceTeamState_teaming
tean.Member = append(tean.Member, member)
@@ -98,16 +89,9 @@ func (this *apiComp) JoinTeam(session comm.IUserSession, req *pb.ParkourJoinTeam
}
users = append(users, session.GetUserId())
- if mount, err = this.module.configure.getGameBuzkashiMount(info.Dfmount); err != nil {
- errdata = &pb.ErrorData{
- Code: pb.ErrorCode_ConfigNoFound,
- Title: pb.ErrorCode_ConfigNoFound.ToString(),
- Message: err.Error(),
- }
- return
- }
+
user := this.module.ModuleUser.GetUser(session.GetUserId())
- member = &pb.DBRaceMember{Uid: user.Uid, Name: user.Name, Avatar: user.Avatar, Lv: user.Lv, Mount: info.Dfmount, Maxhp: mount.Hp}
+ member = &pb.DBRaceMember{Uid: user.Uid, Name: user.Name, Avatar: user.Avatar, Lv: user.Lv, Mount: info.Dfmount, Maxhp: 10}
tean.Member = append(tean.Member, member)
if err = this.module.parkourComp.Change(session.GetUserId(), map[string]interface{}{
"state": tean.State,
diff --git a/modules/parkour/api_racematch.go b/modules/parkour/api_racematch.go
index 9a692f22c..da3ca3b8b 100644
--- a/modules/parkour/api_racematch.go
+++ b/modules/parkour/api_racematch.go
@@ -3,7 +3,6 @@ package parkour
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
- cfg "go_dreamfactory/sys/configure/structs"
)
//参数校验
@@ -22,7 +21,6 @@ func (this *apiComp) RaceMatch(session comm.IUserSession, req *pb.ParkourRaceMat
var (
team *pb.DBParkour
tuser *pb.DBUser
- mount *cfg.GameBuzkashiMountData
users []string
err error
)
@@ -54,15 +52,8 @@ func (this *apiComp) RaceMatch(session comm.IUserSession, req *pb.ParkourRaceMat
}
return
}
- if mount, err = this.module.configure.getGameBuzkashiMount(team.Dfmount); err != nil {
- errdata = &pb.ErrorData{
- Code: pb.ErrorCode_ConfigNoFound,
- Title: pb.ErrorCode_ConfigNoFound.ToString(),
- Message: err.Error(),
- }
- return
- }
- team.Member = append(team.Member, &pb.DBRaceMember{Uid: tuser.Uid, Name: tuser.Name, Avatar: tuser.Avatar, Lv: tuser.Lv, Mount: team.Dfmount, Maxhp: mount.Hp})
+
+ team.Member = append(team.Member, &pb.DBRaceMember{Uid: tuser.Uid, Name: tuser.Name, Avatar: tuser.Avatar, Lv: tuser.Lv, Mount: team.Dfmount, Maxhp: 10})
if err = this.module.parkourComp.Change(team.Captainid, map[string]interface{}{
"state": team.State,
"captainid": team.Captainid,
diff --git a/modules/parkour/configure.go b/modules/parkour/configure.go
index 35c83663d..427e5cbf6 100644
--- a/modules/parkour/configure.go
+++ b/modules/parkour/configure.go
@@ -2,7 +2,6 @@ package parkour
import (
"fmt"
- "go_dreamfactory/comm"
"go_dreamfactory/lego/core"
"go_dreamfactory/modules"
"go_dreamfactory/sys/configure"
@@ -63,25 +62,6 @@ func (this *configureComp) isopen() (open bool) {
return
}
-// 查询坐骑表
-func (this *configureComp) getGameBuzkashiMount(id string) (configure *cfg.GameBuzkashiMountData, err error) {
- var (
- v interface{}
- ok bool
- )
- if v, err = this.GetConfigure(game_buzkashimount); err != nil {
- this.module.Errorln(err)
- return
- } else {
- if configure, ok = v.(*cfg.GameBuzkashiMount).GetDataMap()[id]; !ok {
- err = comm.NewNotFoundConfErr(moduleName, game_buzkashimount, id)
- this.module.Errorln(err)
- return
- }
- }
- return
-}
-
func (this *configureComp) getGameBuzkashiReward(id int32) (configure *cfg.GameBuzkashiRewardData) {
if v, err := this.GetConfigure(game_buzkashireward); err == nil {
var ok bool
diff --git a/modules/parkour/model_parkour.go b/modules/parkour/model_parkour.go
index 4d4277696..7351055c5 100644
--- a/modules/parkour/model_parkour.go
+++ b/modules/parkour/model_parkour.go
@@ -10,7 +10,6 @@ import (
"go_dreamfactory/modules"
"go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
- cfg "go_dreamfactory/sys/configure/structs"
"go_dreamfactory/sys/db"
"math/rand"
"sync"
@@ -54,7 +53,6 @@ func (this *ModelParkourComp) Start() (err error) {
func (this *ModelParkourComp) getrusers(uid string) (recommend []*pb.DBRaceMember, err error) {
var (
users []*Recommend
- mount *cfg.GameBuzkashiMountData
ondata bool
)
this.lock.RLock()
@@ -84,18 +82,14 @@ func (this *ModelParkourComp) getrusers(uid string) (recommend []*pb.DBRaceMembe
if users[v].user = this.module.ModuleUser.GetUser(users[v].parkour.Uid); users[v].user == nil {
continue
}
- if mount, err = this.module.configure.getGameBuzkashiMount(users[v].parkour.Dfmount); err != nil {
- err = nil
- continue
- }
users[v].member = &pb.DBRaceMember{
Uid: users[v].user.Uid,
Name: users[v].user.Name,
Avatar: users[v].user.Avatar,
Lv: users[v].user.Lv,
Mount: users[v].parkour.Dfmount,
- Maxhp: mount.Hp,
- Currhp: mount.Hp,
+ Maxhp: 10,
+ Currhp: 10,
}
}
recommend[i] = users[v].member
diff --git a/pb/mainline_db.pb.go b/pb/mainline_db.pb.go
index 494316fac..dc8aa9188 100644
--- a/pb/mainline_db.pb.go
+++ b/pb/mainline_db.pb.go
@@ -25,14 +25,18 @@ type DBMainline struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
- Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`
- Lastlevel map[int32]int32 `protobuf:"bytes,3,rep,name=lastlevel,proto3" json:"lastlevel" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //最后一次通关管卡
- Level map[int32]int32 `protobuf:"bytes,4,rep,name=level,proto3" json:"level" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //已通关管卡的星级
- Chapteraward map[int32]*DBMainlineAward `protobuf:"bytes,5,rep,name=chapteraward,proto3" json:"chapteraward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //章节进度奖励
- Exploreaward map[int32]*DBMainlineAward `protobuf:"bytes,6,rep,name=exploreaward,proto3" json:"exploreaward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //章节探索奖励
- Groupaward map[int32]*DBMainlineAward `protobuf:"bytes,7,rep,name=groupaward,proto3" json:"groupaward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //章节探索奖励
- Ps map[int32]int32 `protobuf:"bytes,8,rep,name=ps,proto3" json:"ps" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 预扣的体力
+ Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
+ Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`
+ Lastlevel map[int32]int32 `protobuf:"bytes,3,rep,name=lastlevel,proto3" json:"lastlevel" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //最后一次通关管卡
+ Level map[int32]int32 `protobuf:"bytes,4,rep,name=level,proto3" json:"level" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //已通关管卡的星级
+ Chapteraward map[int32]*DBMainlineAward `protobuf:"bytes,5,rep,name=chapteraward,proto3" json:"chapteraward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //章节进度奖励
+ Exploreaward map[int32]*DBMainlineAward `protobuf:"bytes,6,rep,name=exploreaward,proto3" json:"exploreaward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //章节探索奖励
+ Groupaward map[int32]*DBMainlineAward `protobuf:"bytes,7,rep,name=groupaward,proto3" json:"groupaward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //章节探索奖励
+ Ps map[int32]int32 `protobuf:"bytes,8,rep,name=ps,proto3" json:"ps" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 预扣的体力
+ Chapterboos map[int32]int32 `protobuf:"bytes,9,rep,name=chapterboos,proto3" json:"chapterboos" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //章节boos
+ Currbooschapter int32 `protobuf:"varint,10,opt,name=currbooschapter,proto3" json:"currbooschapter"` //当前boos章节
+ Currbooschallengenum int32 `protobuf:"varint,11,opt,name=currbooschallengenum,proto3" json:"currbooschallengenum"` //当日boos挑战次数
+ Lastboosrefresh int64 `protobuf:"varint,12,opt,name=lastboosrefresh,proto3" json:"lastboosrefresh"` //上一次boos刷新时间
}
func (x *DBMainline) Reset() {
@@ -123,6 +127,34 @@ func (x *DBMainline) GetPs() map[int32]int32 {
return nil
}
+func (x *DBMainline) GetChapterboos() map[int32]int32 {
+ if x != nil {
+ return x.Chapterboos
+ }
+ return nil
+}
+
+func (x *DBMainline) GetCurrbooschapter() int32 {
+ if x != nil {
+ return x.Currbooschapter
+ }
+ return 0
+}
+
+func (x *DBMainline) GetCurrbooschallengenum() int32 {
+ if x != nil {
+ return x.Currbooschallengenum
+ }
+ return 0
+}
+
+func (x *DBMainline) GetLastboosrefresh() int64 {
+ if x != nil {
+ return x.Lastboosrefresh
+ }
+ return 0
+}
+
type DBMainlineAward struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@@ -325,7 +357,7 @@ var File_mainline_mainline_db_proto protoreflect.FileDescriptor
var file_mainline_mainline_db_proto_rawDesc = []byte{
0x0a, 0x1a, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2f, 0x6d, 0x61, 0x69, 0x6e, 0x6c,
- 0x69, 0x6e, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa4, 0x06, 0x0a,
+ 0x69, 0x6e, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xac, 0x08, 0x0a,
0x0a, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 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, 0x38, 0x0a,
@@ -349,78 +381,94 @@ var file_mainline_mainline_db_proto_rawDesc = []byte{
0x75, 0x70, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x67, 0x72,
0x6f, 0x75, 0x70, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x23, 0x0a, 0x02, 0x70, 0x73, 0x18, 0x08,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e,
- 0x65, 0x2e, 0x50, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x02, 0x70, 0x73, 0x1a, 0x3c, 0x0a,
- 0x0e, 0x4c, 0x61, 0x73, 0x74, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
- 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65,
- 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x4c,
- 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
- 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
- 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
- 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x51, 0x0a, 0x11, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72,
- 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
- 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x05,
- 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42,
- 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x05, 0x76,
- 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x51, 0x0a, 0x11, 0x45, 0x78, 0x70, 0x6c,
- 0x6f, 0x72, 0x65, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
- 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
- 0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10,
- 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64,
- 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x4f, 0x0a, 0x0f, 0x47,
- 0x72, 0x6f, 0x75, 0x70, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
- 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79,
- 0x12, 0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
- 0x10, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72,
- 0x64, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x35, 0x0a, 0x07,
- 0x50, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
+ 0x65, 0x2e, 0x50, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x02, 0x70, 0x73, 0x12, 0x3e, 0x0a,
+ 0x0b, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x18, 0x09, 0x20, 0x03,
+ 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2e,
+ 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
+ 0x52, 0x0b, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x12, 0x28, 0x0a,
+ 0x0f, 0x63, 0x75, 0x72, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72,
+ 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x63, 0x75, 0x72, 0x72, 0x62, 0x6f, 0x6f, 0x73,
+ 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x12, 0x32, 0x0a, 0x14, 0x63, 0x75, 0x72, 0x72, 0x62,
+ 0x6f, 0x6f, 0x73, 0x63, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x6e, 0x75, 0x6d, 0x18,
+ 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x14, 0x63, 0x75, 0x72, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x63,
+ 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x6e, 0x75, 0x6d, 0x12, 0x28, 0x0a, 0x0f, 0x6c,
+ 0x61, 0x73, 0x74, 0x62, 0x6f, 0x6f, 0x73, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x0c,
+ 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x62, 0x6f, 0x6f, 0x73, 0x72, 0x65,
+ 0x66, 0x72, 0x65, 0x73, 0x68, 0x1a, 0x3c, 0x0a, 0x0e, 0x4c, 0x61, 0x73, 0x74, 0x6c, 0x65, 0x76,
+ 0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
- 0x02, 0x38, 0x01, 0x22, 0x94, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69,
- 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x31, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64,
- 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c,
- 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e,
- 0x74, 0x72, 0x79, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74,
- 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65,
- 0x1a, 0x38, 0x0a, 0x0a, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
- 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79,
- 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
- 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x96, 0x02, 0x0a, 0x0e, 0x44,
- 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 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,
- 0x36, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
- 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f,
- 0x70, 0x2e, 0x42, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07,
- 0x62, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x33, 0x0a, 0x06, 0x75, 0x6e, 0x6c, 0x6f, 0x63,
- 0x6b, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e,
- 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x2e, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x45,
- 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x1a, 0x3a, 0x0a, 0x0c,
- 0x42, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
- 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
- 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76,
- 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x55, 0x6e, 0x6c, 0x6f,
- 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
- 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
- 0x02, 0x38, 0x01, 0x22, 0x82, 0x02, 0x0a, 0x0a, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61,
- 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
- 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
- 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x03, 0x20,
- 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b,
- 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x74, 0x61, 0x73,
- 0x6b, 0x73, 0x12, 0x2f, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03,
- 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x2e,
- 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x77,
- 0x61, 0x72, 0x64, 0x1a, 0x38, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72,
+ 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72,
0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a,
- 0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
- 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
- 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76,
- 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
- 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x51, 0x0a,
+ 0x11, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74,
+ 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
+ 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
+ 0x1a, 0x51, 0x0a, 0x11, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x61, 0x77, 0x61, 0x72, 0x64,
+ 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+ 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c,
+ 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
+ 0x02, 0x38, 0x01, 0x1a, 0x4f, 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x61, 0x77, 0x61, 0x72,
+ 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
+ 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e,
+ 0x6c, 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+ 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x35, 0x0a, 0x07, 0x50, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
+ 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65,
+ 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a, 0x10, 0x43,
+ 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
+ 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65,
+ 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x94, 0x01, 0x0a, 0x0f,
+ 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12,
+ 0x31, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b,
+ 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64,
+ 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x61, 0x77, 0x61,
+ 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x41, 0x77, 0x61, 0x72,
+ 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
+ 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
+ 0x38, 0x01, 0x22, 0x96, 0x02, 0x0a, 0x0e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e,
+ 0x65, 0x53, 0x68, 0x6f, 0x70, 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, 0x36, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x74, 0x69,
+ 0x6d, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69,
+ 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x2e, 0x42, 0x75, 0x79, 0x74, 0x69, 0x6d,
+ 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x62, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, 0x12,
+ 0x33, 0x0a, 0x06, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32,
+ 0x1b, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70,
+ 0x2e, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x75, 0x6e,
+ 0x6c, 0x6f, 0x63, 0x6b, 0x1a, 0x3a, 0x0a, 0x0c, 0x42, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, 0x45,
+ 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
+ 0x1a, 0x39, 0x0a, 0x0b, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
+ 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65,
+ 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x82, 0x02, 0x0a, 0x0a,
+ 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
+ 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x05,
+ 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42,
+ 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e,
+ 0x74, 0x72, 0x79, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x2f, 0x0a, 0x06, 0x72, 0x65,
+ 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x4d,
+ 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e,
+ 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x38, 0x0a, 0x0a, 0x54,
+ 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
+ 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
+ 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45,
+ 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
+ 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -435,7 +483,7 @@ func file_mainline_mainline_db_proto_rawDescGZIP() []byte {
return file_mainline_mainline_db_proto_rawDescData
}
-var file_mainline_mainline_db_proto_msgTypes = make([]protoimpl.MessageInfo, 15)
+var file_mainline_mainline_db_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
var file_mainline_mainline_db_proto_goTypes = []interface{}{
(*DBMainline)(nil), // 0: DBMainline
(*DBMainlineAward)(nil), // 1: DBMainlineAward
@@ -447,11 +495,12 @@ var file_mainline_mainline_db_proto_goTypes = []interface{}{
nil, // 7: DBMainline.ExploreawardEntry
nil, // 8: DBMainline.GroupawardEntry
nil, // 9: DBMainline.PsEntry
- nil, // 10: DBMainlineAward.AwardEntry
- nil, // 11: DBMainlineShop.BuytimeEntry
- nil, // 12: DBMainlineShop.UnlockEntry
- nil, // 13: DBMainTask.TasksEntry
- nil, // 14: DBMainTask.RewardEntry
+ nil, // 10: DBMainline.ChapterboosEntry
+ nil, // 11: DBMainlineAward.AwardEntry
+ nil, // 12: DBMainlineShop.BuytimeEntry
+ nil, // 13: DBMainlineShop.UnlockEntry
+ nil, // 14: DBMainTask.TasksEntry
+ nil, // 15: DBMainTask.RewardEntry
}
var file_mainline_mainline_db_proto_depIdxs = []int32{
4, // 0: DBMainline.lastlevel:type_name -> DBMainline.LastlevelEntry
@@ -460,19 +509,20 @@ var file_mainline_mainline_db_proto_depIdxs = []int32{
7, // 3: DBMainline.exploreaward:type_name -> DBMainline.ExploreawardEntry
8, // 4: DBMainline.groupaward:type_name -> DBMainline.GroupawardEntry
9, // 5: DBMainline.ps:type_name -> DBMainline.PsEntry
- 10, // 6: DBMainlineAward.award:type_name -> DBMainlineAward.AwardEntry
- 11, // 7: DBMainlineShop.buytime:type_name -> DBMainlineShop.BuytimeEntry
- 12, // 8: DBMainlineShop.unlock:type_name -> DBMainlineShop.UnlockEntry
- 13, // 9: DBMainTask.tasks:type_name -> DBMainTask.TasksEntry
- 14, // 10: DBMainTask.reward:type_name -> DBMainTask.RewardEntry
- 1, // 11: DBMainline.ChapterawardEntry.value:type_name -> DBMainlineAward
- 1, // 12: DBMainline.ExploreawardEntry.value:type_name -> DBMainlineAward
- 1, // 13: DBMainline.GroupawardEntry.value:type_name -> DBMainlineAward
- 14, // [14:14] is the sub-list for method output_type
- 14, // [14:14] is the sub-list for method input_type
- 14, // [14:14] is the sub-list for extension type_name
- 14, // [14:14] is the sub-list for extension extendee
- 0, // [0:14] is the sub-list for field type_name
+ 10, // 6: DBMainline.chapterboos:type_name -> DBMainline.ChapterboosEntry
+ 11, // 7: DBMainlineAward.award:type_name -> DBMainlineAward.AwardEntry
+ 12, // 8: DBMainlineShop.buytime:type_name -> DBMainlineShop.BuytimeEntry
+ 13, // 9: DBMainlineShop.unlock:type_name -> DBMainlineShop.UnlockEntry
+ 14, // 10: DBMainTask.tasks:type_name -> DBMainTask.TasksEntry
+ 15, // 11: DBMainTask.reward:type_name -> DBMainTask.RewardEntry
+ 1, // 12: DBMainline.ChapterawardEntry.value:type_name -> DBMainlineAward
+ 1, // 13: DBMainline.ExploreawardEntry.value:type_name -> DBMainlineAward
+ 1, // 14: DBMainline.GroupawardEntry.value:type_name -> DBMainlineAward
+ 15, // [15:15] is the sub-list for method output_type
+ 15, // [15:15] is the sub-list for method input_type
+ 15, // [15:15] is the sub-list for extension type_name
+ 15, // [15:15] is the sub-list for extension extendee
+ 0, // [0:15] is the sub-list for field type_name
}
func init() { file_mainline_mainline_db_proto_init() }
@@ -536,7 +586,7 @@ func file_mainline_mainline_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_mainline_mainline_db_proto_rawDesc,
NumEnums: 0,
- NumMessages: 15,
+ NumMessages: 16,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/pb/mainline_msg.pb.go b/pb/mainline_msg.pb.go
index d39bf48f6..842000cb5 100644
--- a/pb/mainline_msg.pb.go
+++ b/pb/mainline_msg.pb.go
@@ -1176,6 +1176,229 @@ func (x *MainlineTaskChapteRewardResp) GetAward() []*UserAtno {
return nil
}
+//boos 挑战
+type MainlineBoosChallengeReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Boosid int32 `protobuf:"varint,1,opt,name=boosid,proto3" json:"boosid"`
+ Battle *BattleFormation `protobuf:"bytes,2,opt,name=battle,proto3" json:"battle"`
+}
+
+func (x *MainlineBoosChallengeReq) Reset() {
+ *x = MainlineBoosChallengeReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_mainline_mainline_msg_proto_msgTypes[21]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *MainlineBoosChallengeReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MainlineBoosChallengeReq) ProtoMessage() {}
+
+func (x *MainlineBoosChallengeReq) ProtoReflect() protoreflect.Message {
+ mi := &file_mainline_mainline_msg_proto_msgTypes[21]
+ 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 MainlineBoosChallengeReq.ProtoReflect.Descriptor instead.
+func (*MainlineBoosChallengeReq) Descriptor() ([]byte, []int) {
+ return file_mainline_mainline_msg_proto_rawDescGZIP(), []int{21}
+}
+
+func (x *MainlineBoosChallengeReq) GetBoosid() int32 {
+ if x != nil {
+ return x.Boosid
+ }
+ return 0
+}
+
+func (x *MainlineBoosChallengeReq) GetBattle() *BattleFormation {
+ if x != nil {
+ return x.Battle
+ }
+ return nil
+}
+
+//boos 挑战回应
+type MainlineBoosChallengeResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Info *BattleInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
+ Boosid int32 `protobuf:"varint,2,opt,name=boosid,proto3" json:"boosid"`
+}
+
+func (x *MainlineBoosChallengeResp) Reset() {
+ *x = MainlineBoosChallengeResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_mainline_mainline_msg_proto_msgTypes[22]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *MainlineBoosChallengeResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MainlineBoosChallengeResp) ProtoMessage() {}
+
+func (x *MainlineBoosChallengeResp) ProtoReflect() protoreflect.Message {
+ mi := &file_mainline_mainline_msg_proto_msgTypes[22]
+ 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 MainlineBoosChallengeResp.ProtoReflect.Descriptor instead.
+func (*MainlineBoosChallengeResp) Descriptor() ([]byte, []int) {
+ return file_mainline_mainline_msg_proto_rawDescGZIP(), []int{22}
+}
+
+func (x *MainlineBoosChallengeResp) GetInfo() *BattleInfo {
+ if x != nil {
+ return x.Info
+ }
+ return nil
+}
+
+func (x *MainlineBoosChallengeResp) GetBoosid() int32 {
+ if x != nil {
+ return x.Boosid
+ }
+ return 0
+}
+
+//关卡战斗结束请求
+type MainlineBoosChallengeOverReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Boosid int32 `protobuf:"varint,1,opt,name=boosid,proto3" json:"boosid"`
+ Report *BattleReport `protobuf:"bytes,2,opt,name=report,proto3" json:"report"` //战报
+}
+
+func (x *MainlineBoosChallengeOverReq) Reset() {
+ *x = MainlineBoosChallengeOverReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_mainline_mainline_msg_proto_msgTypes[23]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *MainlineBoosChallengeOverReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MainlineBoosChallengeOverReq) ProtoMessage() {}
+
+func (x *MainlineBoosChallengeOverReq) ProtoReflect() protoreflect.Message {
+ mi := &file_mainline_mainline_msg_proto_msgTypes[23]
+ 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 MainlineBoosChallengeOverReq.ProtoReflect.Descriptor instead.
+func (*MainlineBoosChallengeOverReq) Descriptor() ([]byte, []int) {
+ return file_mainline_mainline_msg_proto_rawDescGZIP(), []int{23}
+}
+
+func (x *MainlineBoosChallengeOverReq) GetBoosid() int32 {
+ if x != nil {
+ return x.Boosid
+ }
+ return 0
+}
+
+func (x *MainlineBoosChallengeOverReq) GetReport() *BattleReport {
+ if x != nil {
+ return x.Report
+ }
+ return nil
+}
+
+type MainlineBoosChallengeOverResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Boosid int32 `protobuf:"varint,1,opt,name=boosid,proto3" json:"boosid"`
+ Reward []*UserAtno `protobuf:"bytes,2,rep,name=reward,proto3" json:"reward"` //奖励
+}
+
+func (x *MainlineBoosChallengeOverResp) Reset() {
+ *x = MainlineBoosChallengeOverResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_mainline_mainline_msg_proto_msgTypes[24]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *MainlineBoosChallengeOverResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MainlineBoosChallengeOverResp) ProtoMessage() {}
+
+func (x *MainlineBoosChallengeOverResp) ProtoReflect() protoreflect.Message {
+ mi := &file_mainline_mainline_msg_proto_msgTypes[24]
+ 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 MainlineBoosChallengeOverResp.ProtoReflect.Descriptor instead.
+func (*MainlineBoosChallengeOverResp) Descriptor() ([]byte, []int) {
+ return file_mainline_mainline_msg_proto_rawDescGZIP(), []int{24}
+}
+
+func (x *MainlineBoosChallengeOverResp) GetBoosid() int32 {
+ if x != nil {
+ return x.Boosid
+ }
+ return 0
+}
+
+func (x *MainlineBoosChallengeOverResp) GetReward() []*UserAtno {
+ if x != nil {
+ return x.Reward
+ }
+ return nil
+}
+
var File_mainline_mainline_msg_proto protoreflect.FileDescriptor
var file_mainline_mainline_msg_proto_rawDesc = []byte{
@@ -1289,8 +1512,31 @@ var file_mainline_mainline_msg_proto_rawDesc = []byte{
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73,
0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64,
0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e,
- 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
- 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x5c, 0x0a, 0x18, 0x4d, 0x61, 0x69, 0x6e,
+ 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
+ 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06,
+ 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42,
+ 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06,
+ 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x54, 0x0a, 0x19, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69,
+ 0x6e, 0x65, 0x42, 0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52,
+ 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04,
+ 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x22, 0x5d, 0x0a, 0x1c,
+ 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6c,
+ 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06,
+ 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f,
+ 0x6f, 0x73, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70,
+ 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x5a, 0x0a, 0x1d, 0x4d,
+ 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6c, 0x6c,
+ 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06,
+ 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f,
+ 0x6f, 0x73, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02,
+ 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52,
+ 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
+ 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -1305,60 +1551,68 @@ func file_mainline_mainline_msg_proto_rawDescGZIP() []byte {
return file_mainline_mainline_msg_proto_rawDescData
}
-var file_mainline_mainline_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 21)
+var file_mainline_mainline_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 25)
var file_mainline_mainline_msg_proto_goTypes = []interface{}{
- (*MainlineInfoReq)(nil), // 0: MainlineInfoReq
- (*MainlineInfoResp)(nil), // 1: MainlineInfoResp
- (*MainlineChallengeReq)(nil), // 2: MainlineChallengeReq
- (*MainlineChallengeResp)(nil), // 3: MainlineChallengeResp
- (*MainlineChallengeOverReq)(nil), // 4: MainlineChallengeOverReq
- (*MainlineChallengeOverResp)(nil), // 5: MainlineChallengeOverResp
- (*MainlineLevelPassReq)(nil), // 6: MainlineLevelPassReq
- (*MainlineLevelPassResp)(nil), // 7: MainlineLevelPassResp
- (*MainlineReceiveAwardReq)(nil), // 8: MainlineReceiveAwardReq
- (*MainlineReceiveAwardResp)(nil), // 9: MainlineReceiveAwardResp
- (*MainlineShopReq)(nil), // 10: MainlineShopReq
- (*MainlineShopResp)(nil), // 11: MainlineShopResp
- (*MainlineShopBuyReq)(nil), // 12: MainlineShopBuyReq
- (*MainlineShopBuyResp)(nil), // 13: MainlineShopBuyResp
- (*MainlineShopChangePush)(nil), // 14: MainlineShopChangePush
- (*MainlineTaskInfoReq)(nil), // 15: MainlineTaskInfoReq
- (*MainlineTaskInfoResp)(nil), // 16: MainlineTaskInfoResp
- (*MainlineTaskReceiveReq)(nil), // 17: MainlineTaskReceiveReq
- (*MainlineTaskReceiveResp)(nil), // 18: MainlineTaskReceiveResp
- (*MainlineTaskChapteRewardReq)(nil), // 19: MainlineTaskChapteRewardReq
- (*MainlineTaskChapteRewardResp)(nil), // 20: MainlineTaskChapteRewardResp
- (*DBMainline)(nil), // 21: DBMainline
- (*ConIProgress)(nil), // 22: ConIProgress
- (*BattleFormation)(nil), // 23: BattleFormation
- (*BattleInfo)(nil), // 24: BattleInfo
- (*BattleReport)(nil), // 25: BattleReport
- (*UserAtno)(nil), // 26: UserAtno
- (*DBMainlineShop)(nil), // 27: DBMainlineShop
- (*DBMainTask)(nil), // 28: DBMainTask
+ (*MainlineInfoReq)(nil), // 0: MainlineInfoReq
+ (*MainlineInfoResp)(nil), // 1: MainlineInfoResp
+ (*MainlineChallengeReq)(nil), // 2: MainlineChallengeReq
+ (*MainlineChallengeResp)(nil), // 3: MainlineChallengeResp
+ (*MainlineChallengeOverReq)(nil), // 4: MainlineChallengeOverReq
+ (*MainlineChallengeOverResp)(nil), // 5: MainlineChallengeOverResp
+ (*MainlineLevelPassReq)(nil), // 6: MainlineLevelPassReq
+ (*MainlineLevelPassResp)(nil), // 7: MainlineLevelPassResp
+ (*MainlineReceiveAwardReq)(nil), // 8: MainlineReceiveAwardReq
+ (*MainlineReceiveAwardResp)(nil), // 9: MainlineReceiveAwardResp
+ (*MainlineShopReq)(nil), // 10: MainlineShopReq
+ (*MainlineShopResp)(nil), // 11: MainlineShopResp
+ (*MainlineShopBuyReq)(nil), // 12: MainlineShopBuyReq
+ (*MainlineShopBuyResp)(nil), // 13: MainlineShopBuyResp
+ (*MainlineShopChangePush)(nil), // 14: MainlineShopChangePush
+ (*MainlineTaskInfoReq)(nil), // 15: MainlineTaskInfoReq
+ (*MainlineTaskInfoResp)(nil), // 16: MainlineTaskInfoResp
+ (*MainlineTaskReceiveReq)(nil), // 17: MainlineTaskReceiveReq
+ (*MainlineTaskReceiveResp)(nil), // 18: MainlineTaskReceiveResp
+ (*MainlineTaskChapteRewardReq)(nil), // 19: MainlineTaskChapteRewardReq
+ (*MainlineTaskChapteRewardResp)(nil), // 20: MainlineTaskChapteRewardResp
+ (*MainlineBoosChallengeReq)(nil), // 21: MainlineBoosChallengeReq
+ (*MainlineBoosChallengeResp)(nil), // 22: MainlineBoosChallengeResp
+ (*MainlineBoosChallengeOverReq)(nil), // 23: MainlineBoosChallengeOverReq
+ (*MainlineBoosChallengeOverResp)(nil), // 24: MainlineBoosChallengeOverResp
+ (*DBMainline)(nil), // 25: DBMainline
+ (*ConIProgress)(nil), // 26: ConIProgress
+ (*BattleFormation)(nil), // 27: BattleFormation
+ (*BattleInfo)(nil), // 28: BattleInfo
+ (*BattleReport)(nil), // 29: BattleReport
+ (*UserAtno)(nil), // 30: UserAtno
+ (*DBMainlineShop)(nil), // 31: DBMainlineShop
+ (*DBMainTask)(nil), // 32: DBMainTask
}
var file_mainline_mainline_msg_proto_depIdxs = []int32{
- 21, // 0: MainlineInfoResp.info:type_name -> DBMainline
- 22, // 1: MainlineInfoResp.conlds:type_name -> ConIProgress
- 23, // 2: MainlineChallengeReq.battle:type_name -> BattleFormation
- 24, // 3: MainlineChallengeResp.info:type_name -> BattleInfo
- 25, // 4: MainlineChallengeOverReq.report:type_name -> BattleReport
- 26, // 5: MainlineChallengeOverResp.reward:type_name -> UserAtno
- 26, // 6: MainlineLevelPassResp.reward:type_name -> UserAtno
- 26, // 7: MainlineReceiveAwardResp.reward:type_name -> UserAtno
- 27, // 8: MainlineShopResp.info:type_name -> DBMainlineShop
- 27, // 9: MainlineShopBuyResp.info:type_name -> DBMainlineShop
- 26, // 10: MainlineShopBuyResp.item:type_name -> UserAtno
- 22, // 11: MainlineTaskInfoResp.conlds:type_name -> ConIProgress
- 28, // 12: MainlineTaskInfoResp.tasks:type_name -> DBMainTask
- 26, // 13: MainlineTaskReceiveResp.award:type_name -> UserAtno
- 28, // 14: MainlineTaskChapteRewardResp.task:type_name -> DBMainTask
- 26, // 15: MainlineTaskChapteRewardResp.award:type_name -> UserAtno
- 16, // [16:16] is the sub-list for method output_type
- 16, // [16:16] is the sub-list for method input_type
- 16, // [16:16] is the sub-list for extension type_name
- 16, // [16:16] is the sub-list for extension extendee
- 0, // [0:16] is the sub-list for field type_name
+ 25, // 0: MainlineInfoResp.info:type_name -> DBMainline
+ 26, // 1: MainlineInfoResp.conlds:type_name -> ConIProgress
+ 27, // 2: MainlineChallengeReq.battle:type_name -> BattleFormation
+ 28, // 3: MainlineChallengeResp.info:type_name -> BattleInfo
+ 29, // 4: MainlineChallengeOverReq.report:type_name -> BattleReport
+ 30, // 5: MainlineChallengeOverResp.reward:type_name -> UserAtno
+ 30, // 6: MainlineLevelPassResp.reward:type_name -> UserAtno
+ 30, // 7: MainlineReceiveAwardResp.reward:type_name -> UserAtno
+ 31, // 8: MainlineShopResp.info:type_name -> DBMainlineShop
+ 31, // 9: MainlineShopBuyResp.info:type_name -> DBMainlineShop
+ 30, // 10: MainlineShopBuyResp.item:type_name -> UserAtno
+ 26, // 11: MainlineTaskInfoResp.conlds:type_name -> ConIProgress
+ 32, // 12: MainlineTaskInfoResp.tasks:type_name -> DBMainTask
+ 30, // 13: MainlineTaskReceiveResp.award:type_name -> UserAtno
+ 32, // 14: MainlineTaskChapteRewardResp.task:type_name -> DBMainTask
+ 30, // 15: MainlineTaskChapteRewardResp.award:type_name -> UserAtno
+ 27, // 16: MainlineBoosChallengeReq.battle:type_name -> BattleFormation
+ 28, // 17: MainlineBoosChallengeResp.info:type_name -> BattleInfo
+ 29, // 18: MainlineBoosChallengeOverReq.report:type_name -> BattleReport
+ 30, // 19: MainlineBoosChallengeOverResp.reward:type_name -> UserAtno
+ 20, // [20:20] is the sub-list for method output_type
+ 20, // [20:20] is the sub-list for method input_type
+ 20, // [20:20] is the sub-list for extension type_name
+ 20, // [20:20] is the sub-list for extension extendee
+ 0, // [0:20] is the sub-list for field type_name
}
func init() { file_mainline_mainline_msg_proto_init() }
@@ -1623,6 +1877,54 @@ func file_mainline_mainline_msg_proto_init() {
return nil
}
}
+ file_mainline_mainline_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*MainlineBoosChallengeReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_mainline_mainline_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*MainlineBoosChallengeResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_mainline_mainline_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*MainlineBoosChallengeOverReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_mainline_mainline_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*MainlineBoosChallengeOverResp); 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{
@@ -1630,7 +1932,7 @@ func file_mainline_mainline_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_mainline_mainline_msg_proto_rawDesc,
NumEnums: 0,
- NumMessages: 21,
+ NumMessages: 25,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/sys/configure/structs/Game.BuzkashiMount.go b/sys/configure/structs/Game.BuzkashiMount.go
index 3617f9d71..9a4bd87b6 100644
--- a/sys/configure/structs/Game.BuzkashiMount.go
+++ b/sys/configure/structs/Game.BuzkashiMount.go
@@ -9,34 +9,26 @@
package cfg
type GameBuzkashiMount struct {
- _dataMap map[string]*GameBuzkashiMountData
_dataList []*GameBuzkashiMountData
}
func NewGameBuzkashiMount(_buf []map[string]interface{}) (*GameBuzkashiMount, error) {
_dataList := make([]*GameBuzkashiMountData, 0, len(_buf))
- dataMap := make(map[string]*GameBuzkashiMountData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameBuzkashiMountData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
- dataMap[_v.Id] = _v
}
}
- return &GameBuzkashiMount{_dataList:_dataList, _dataMap:dataMap}, nil
-}
-
-func (table *GameBuzkashiMount) GetDataMap() map[string]*GameBuzkashiMountData {
- return table._dataMap
+ return &GameBuzkashiMount{_dataList:_dataList}, nil
}
func (table *GameBuzkashiMount) GetDataList() []*GameBuzkashiMountData {
return table._dataList
}
-func (table *GameBuzkashiMount) Get(key string) *GameBuzkashiMountData {
- return table._dataMap[key]
+func (table *GameBuzkashiMount) Get(index int) *GameBuzkashiMountData {
+ return table._dataList[index]
}
-
diff --git a/sys/configure/structs/Game.BuzkashiMountData.go b/sys/configure/structs/Game.BuzkashiMountData.go
index 140ac2f86..6552486c1 100644
--- a/sys/configure/structs/Game.BuzkashiMountData.go
+++ b/sys/configure/structs/Game.BuzkashiMountData.go
@@ -12,6 +12,7 @@ import "errors"
type GameBuzkashiMountData struct {
Id string
+ Type int32
Name string
Intr string
Color int32
@@ -26,6 +27,9 @@ type GameBuzkashiMountData struct {
Sprint int32
Acceleration int32
Deceleration int32
+ Itemsprint int32
+ Caddtime int32
+ Csubtime int32
}
const TypeId_GameBuzkashiMountData = 1598069936
@@ -36,6 +40,7 @@ func (*GameBuzkashiMountData) GetTypeId() int32 {
func (_v *GameBuzkashiMountData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["intr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Intr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Intr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Color"].(float64); !_ok_ { err = errors.New("Color error"); return }; _v.Color = int32(_tempNum_) }
@@ -63,6 +68,9 @@ func (_v *GameBuzkashiMountData)Deserialize(_buf map[string]interface{}) (err er
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sprint"].(float64); !_ok_ { err = errors.New("sprint error"); return }; _v.Sprint = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["acceleration"].(float64); !_ok_ { err = errors.New("acceleration error"); return }; _v.Acceleration = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["deceleration"].(float64); !_ok_ { err = errors.New("deceleration error"); return }; _v.Deceleration = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["itemsprint"].(float64); !_ok_ { err = errors.New("itemsprint error"); return }; _v.Itemsprint = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["caddtime"].(float64); !_ok_ { err = errors.New("caddtime error"); return }; _v.Caddtime = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["csubtime"].(float64); !_ok_ { err = errors.New("csubtime error"); return }; _v.Csubtime = int32(_tempNum_) }
return
}
diff --git a/sys/configure/structs/Game.MainBoss.go b/sys/configure/structs/Game.MainBoss.go
new file mode 100644
index 000000000..292ee1c7a
--- /dev/null
+++ b/sys/configure/structs/Game.MainBoss.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameMainBoss struct {
+ _dataMap map[int32]*GameMainBossData
+ _dataList []*GameMainBossData
+}
+
+func NewGameMainBoss(_buf []map[string]interface{}) (*GameMainBoss, error) {
+ _dataList := make([]*GameMainBossData, 0, len(_buf))
+ dataMap := make(map[int32]*GameMainBossData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameMainBossData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameMainBoss{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameMainBoss) GetDataMap() map[int32]*GameMainBossData {
+ return table._dataMap
+}
+
+func (table *GameMainBoss) GetDataList() []*GameMainBossData {
+ return table._dataList
+}
+
+func (table *GameMainBoss) Get(key int32) *GameMainBossData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.MainBossData.go b/sys/configure/structs/Game.MainBossData.go
new file mode 100644
index 000000000..3bd40fa20
--- /dev/null
+++ b/sys/configure/structs/Game.MainBossData.go
@@ -0,0 +1,73 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameMainBossData struct {
+ Id int32
+ MonsterChapter int32
+ MonsterDisplayIp int32
+ MonsterStrength int32
+ Battlereadyid int32
+ FormatList []int32
+ Reward []*Gameatn
+}
+
+const TypeId_GameMainBossData = 923446796
+
+func (*GameMainBossData) GetTypeId() int32 {
+ return 923446796
+}
+
+func (_v *GameMainBossData)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["monster_chapter"].(float64); !_ok_ { err = errors.New("monster_chapter error"); return }; _v.MonsterChapter = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MonsterDisplay_Ip"].(float64); !_ok_ { err = errors.New("MonsterDisplay_Ip error"); return }; _v.MonsterDisplayIp = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["monster_strength"].(float64); !_ok_ { err = errors.New("monster_strength error"); return }; _v.MonsterStrength = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["battlereadyid"].(float64); !_ok_ { err = errors.New("battlereadyid error"); return }; _v.Battlereadyid = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["formatList"].([]interface{}); !_ok_ { err = errors.New("formatList error"); return }
+
+ _v.FormatList = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.FormatList = append(_v.FormatList, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["reward"].([]interface{}); !_ok_ { err = errors.New("reward error"); return }
+
+ _v.Reward = make([]*Gameatn, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+ _v.Reward = append(_v.Reward, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameMainBossData(_buf map[string]interface{}) (*GameMainBossData, error) {
+ v := &GameMainBossData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index 141f8ca94..1fc361824 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -253,6 +253,7 @@ type Tables struct {
TopUIConfig *GameTopUIConfig
MainShopItem *GameMainShopItem
MainAchievement *GameMainAchievement
+ MainBoss *GameMainBoss
Trainlv *GameTrainlv
DragonPlay *GameDragonPlay
DragonPlot *GameDragonPlot
@@ -1715,6 +1716,12 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.MainAchievement, err = NewGameMainAchievement(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_mainboss") ; err != nil {
+ return nil, err
+ }
+ if tables.MainBoss, err = NewGameMainBoss(buf) ; err != nil {
+ return nil, err
+ }
if buf, err = loader("game_trainlv") ; err != nil {
return nil, err
}