liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
liwei1dao 2023-12-20 10:20:43 +08:00
commit 6413ad7375
55 changed files with 4850 additions and 1158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bin/json/game_catchbuglllustrated.json
View File

@ -136,7 +136,7 @@
"key": "catchbugs_Illustrated_carddescribe_10",
"text": "11"
},
"pic": "bug_100010",
"pic": "bug_10010",
"weights": 1000
},
{
@ -150,7 +150,7 @@
"key": "catchbugs_Illustrated_carddescribe_11",
"text": "12"
},
"pic": "bug_100011",
"pic": "bug_10011",
"weights": 500
},
{
@ -164,7 +164,7 @@
"key": "catchbugs_Illustrated_carddescribe_12",
"text": "13"
},
"pic": "bug_100012",
"pic": "bug_10012",
"weights": 500
},
{
@ -178,7 +178,7 @@
"key": "catchbugs_Illustrated_carddescribe_13",
"text": "14"
},
"pic": "bug_100013",
"pic": "bug_10013",
"weights": 500
},
{
@ -192,7 +192,7 @@
"key": "catchbugs_Illustrated_carddescribe_14",
"text": "15"
},
"pic": "bug_100014",
"pic": "bug_10014",
"weights": 500
},
{
@ -206,7 +206,7 @@
"key": "catchbugs_Illustrated_carddescribe_15",
"text": "16"
},
"pic": "bug_100015",
"pic": "bug_10015",
"weights": 500
},
{
@ -220,7 +220,7 @@
"key": "catchbugs_Illustrated_carddescribe_16",
"text": "17"
},
"pic": "bug_100016",
"pic": "bug_10016",
"weights": 500
},
{
@ -234,7 +234,7 @@
"key": "catchbugs_Illustrated_carddescribe_17",
"text": "18"
},
"pic": "bug_100017",
"pic": "bug_10017",
"weights": 500
},
{
@ -248,7 +248,7 @@
"key": "catchbugs_Illustrated_carddescribe_18",
"text": "19"
},
"pic": "bug_100018",
"pic": "bug_10018",
"weights": 500
},
{
@ -262,7 +262,7 @@
"key": "catchbugs_Illustrated_carddescribe_19",
"text": "20"
},
"pic": "bug_100019",
"pic": "bug_10019",
"weights": 500
},
{
@ -276,7 +276,7 @@
"key": "catchbugs_Illustrated_carddescribe_20",
"text": "21"
},
"pic": "bug_100020",
"pic": "bug_10020",
"weights": 500
},
{
@ -290,7 +290,7 @@
"key": "catchbugs_Illustrated_carddescribe_21",
"text": "22"
},
"pic": "bug_100021",
"pic": "bug_10021",
"weights": 500
},
{
@ -304,7 +304,7 @@
"key": "catchbugs_Illustrated_carddescribe_22",
"text": "23"
},
"pic": "bug_100022",
"pic": "bug_10022",
"weights": 100
},
{
@ -318,7 +318,7 @@
"key": "catchbugs_Illustrated_carddescribe_23",
"text": "24"
},
"pic": "bug_100023",
"pic": "bug_10023",
"weights": 100
},
{
@ -332,7 +332,7 @@
"key": "catchbugs_Illustrated_carddescribe_24",
"text": "25"
},
"pic": "bug_100024",
"pic": "bug_10024",
"weights": 100
}
]

416
bin/json/game_consumegiftpack.json Normal file
View File

@ -0,0 +1,416 @@
[
{
"lv": 1,
"integral": 0,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 1
}
],
"exreward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"lv": 2,
"integral": 1000,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 2
}
],
"exreward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"lv": 3,
"integral": 2000,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 3
}
],
"exreward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"lv": 4,
"integral": 3000,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 4
}
],
"exreward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"lv": 5,
"integral": 4000,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 5
}
],
"exreward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"lv": 6,
"integral": 5000,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 6
}
],
"exreward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"lv": 7,
"integral": 6000,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 7
}
],
"exreward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"lv": 8,
"integral": 7000,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 8
}
],
"exreward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"lv": 9,
"integral": 8000,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 9
}
],
"exreward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"lv": 10,
"integral": 9000,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 10
}
],
"exreward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"lv": 11,
"integral": 10000,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 11
}
],
"exreward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"lv": 12,
"integral": 11000,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 12
}
],
"exreward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"lv": 13,
"integral": 12000,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 13
}
],
"exreward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"lv": 14,
"integral": 13000,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 14
}
],
"exreward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"lv": 15,
"integral": 14000,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 15
}
],
"exreward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"lv": 16,
"integral": 15000,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 16
}
],
"exreward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"lv": 17,
"integral": 16000,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 17
}
],
"exreward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"lv": 18,
"integral": 17000,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 18
}
],
"exreward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"lv": 19,
"integral": 18000,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 19
}
],
"exreward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"lv": 20,
"integral": 19000,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 20
}
],
"exreward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"lv": 21,
"integral": 20000,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 21
}
],
"exreward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"lv": 22,
"integral": 21000,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 22
}
],
"exreward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"lv": 23,
"integral": 22000,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 23
}
],
"exreward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
}
]

882
bin/json/game_consumerank.json Normal file
View File

@ -0,0 +1,882 @@
[
{
"id": 1,
"group": 1,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 1000000
},
{
"a": "attr",
"t": "diamond",
"n": 300
}
]
},
{
"id": 2,
"group": 2,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 800000
},
{
"a": "attr",
"t": "diamond",
"n": 250
}
]
},
{
"id": 3,
"group": 2,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 800000
},
{
"a": "attr",
"t": "diamond",
"n": 250
}
]
},
{
"id": 4,
"group": 4,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 600000
},
{
"a": "attr",
"t": "diamond",
"n": 200
}
]
},
{
"id": 5,
"group": 4,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 600000
},
{
"a": "attr",
"t": "diamond",
"n": 200
}
]
},
{
"id": 6,
"group": 4,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 600000
},
{
"a": "attr",
"t": "diamond",
"n": 200
}
]
},
{
"id": 7,
"group": 4,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 600000
},
{
"a": "attr",
"t": "diamond",
"n": 200
}
]
},
{
"id": 8,
"group": 4,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 600000
},
{
"a": "attr",
"t": "diamond",
"n": 200
}
]
},
{
"id": 9,
"group": 4,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 600000
},
{
"a": "attr",
"t": "diamond",
"n": 200
}
]
},
{
"id": 10,
"group": 4,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 600000
},
{
"a": "attr",
"t": "diamond",
"n": 200
}
]
},
{
"id": 11,
"group": 11,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 500000
},
{
"a": "attr",
"t": "diamond",
"n": 180
}
]
},
{
"id": 12,
"group": 11,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 500000
},
{
"a": "attr",
"t": "diamond",
"n": 180
}
]
},
{
"id": 13,
"group": 11,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 500000
},
{
"a": "attr",
"t": "diamond",
"n": 180
}
]
},
{
"id": 14,
"group": 11,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 500000
},
{
"a": "attr",
"t": "diamond",
"n": 180
}
]
},
{
"id": 15,
"group": 11,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 500000
},
{
"a": "attr",
"t": "diamond",
"n": 180
}
]
},
{
"id": 16,
"group": 11,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 500000
},
{
"a": "attr",
"t": "diamond",
"n": 180
}
]
},
{
"id": 17,
"group": 11,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 500000
},
{
"a": "attr",
"t": "diamond",
"n": 180
}
]
},
{
"id": 18,
"group": 11,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 500000
},
{
"a": "attr",
"t": "diamond",
"n": 180
}
]
},
{
"id": 19,
"group": 11,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 500000
},
{
"a": "attr",
"t": "diamond",
"n": 180
}
]
},
{
"id": 20,
"group": 11,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 500000
},
{
"a": "attr",
"t": "diamond",
"n": 180
}
]
},
{
"id": 21,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 22,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 23,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 24,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 25,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 26,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 27,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 28,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 29,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 30,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 31,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 32,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 33,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 34,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 35,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 36,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 37,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 38,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 39,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 40,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 41,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 42,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 43,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 44,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 45,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 46,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 47,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 48,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 49,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 50,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 51,
"group": 31,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 300000
},
{
"a": "attr",
"t": "diamond",
"n": 140
}
]
},
{
"id": 200,
"group": 31,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 300000
},
{
"a": "attr",
"t": "diamond",
"n": 140
}
]
},
{
"id": 201,
"group": 41,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 200000
},
{
"a": "attr",
"t": "diamond",
"n": 120
}
]
},
{
"id": 500,
"group": 41,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 200000
},
{
"a": "attr",
"t": "diamond",
"n": 120
}
]
},
{
"id": 501,
"group": 0,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 100000
},
{
"a": "attr",
"t": "diamond",
"n": 100
}
]
}
]

107
bin/json/game_consumetask.json Normal file
View File

@ -0,0 +1,107 @@
[
{
"key": 1,
"task_integral": {
"a": "attr",
"t": "consumeexp",
"n": 100
},
"reward": [
{
"a": "attr",
"t": "diamond",
"n": 980
}
]
},
{
"key": 2,
"task_integral": {
"a": "attr",
"t": "consumeexp",
"n": 200
},
"reward": [
{
"a": "attr",
"t": "diamond",
"n": 980
}
]
},
{
"key": 3,
"task_integral": {
"a": "attr",
"t": "consumeexp",
"n": 300
},
"reward": [
{
"a": "attr",
"t": "diamond",
"n": 980
}
]
},
{
"key": 4,
"task_integral": {
"a": "attr",
"t": "consumeexp",
"n": 400
},
"reward": [
{
"a": "attr",
"t": "diamond",
"n": 980
}
]
},
{
"key": 5,
"task_integral": {
"a": "attr",
"t": "consumeexp",
"n": 500
},
"reward": [
{
"a": "attr",
"t": "diamond",
"n": 980
}
]
},
{
"key": 6,
"task_integral": {
"a": "attr",
"t": "consumeexp",
"n": 600
},
"reward": [
{
"a": "attr",
"t": "diamond",
"n": 980
}
]
},
{
"key": 7,
"task_integral": {
"a": "attr",
"t": "consumeexp",
"n": 700
},
"reward": [
{
"a": "attr",
"t": "diamond",
"n": 980
}
]
}
]

57
bin/json/game_consumetxt.json Normal file
View File

@ -0,0 +1,57 @@
[
{
"id": 1,
"name": {
"key": "consume_consume_txt_name_01",
"text": "3连胜"
},
"txt": {
"key": "consume_consume_txt_txt_01",
"text": "2"
}
},
{
"id": 2,
"name": {
"key": "consume_consume_txt_name_02",
"text": "5连胜"
},
"txt": {
"key": "consume_consume_txt_txt_02",
"text": "2.5"
}
},
{
"id": 3,
"name": {
"key": "consume_consume_txt_name_03",
"text": "8连胜"
},
"txt": {
"key": "consume_consume_txt_txt_03",
"text": "3"
}
},
{
"id": 4,
"name": {
"key": "consume_consume_txt_name_04",
"text": "10连胜"
},
"txt": {
"key": "consume_consume_txt_txt_04",
"text": "3.5"
}
},
{
"id": 5,
"name": {
"key": "consume_consume_txt_name_05",
"text": "20连胜"
},
"txt": {
"key": "consume_consume_txt_txt_05",
"text": "5"
}
}
]

2
bin/json/game_fightglobalevent.json
View File

@ -296,6 +296,7 @@
"1",
"0",
"200004001",
"FriendPos/Middle",
"effect_zhiliao_huan"
]
},
@ -1168,6 +1169,7 @@
"2",
"0",
"255002611",
"EffectPos",
"effect_zhiliao_huan"
]
}

12
bin/json/game_gamesummary.json
View File

@ -7,8 +7,8 @@
},
"tabId": 11001,
"type": 0,
"jumpId": 10042,
"icon": "ty_qp_by",
"jumpId": 10045,
"icon": "ty_icon_xlyc",
"mapPos": {
"x": 4195,
"y": 2042
@ -40,8 +40,8 @@
},
"tabId": 11001,
"type": 1,
"jumpId": 10045,
"icon": "ty_icon_xlyc",
"jumpId": 10042,
"icon": "ty_qp_by",
"mapPos": {
"x": 5173,
"y": 1748
@ -69,7 +69,7 @@
"tabId": 11002,
"type": 2,
"jumpId": 10027,
"icon": "ty_icon_wjt",
"icon": "ty_icon_szmj",
"mapPos": {
"x": 2711,
"y": 2111
@ -107,7 +107,7 @@
"tabId": 11002,
"type": 3,
"jumpId": 10068,
"icon": "ty_icon_zc",
"icon": "ty_icon_zcz",
"mapPos": {
"x": 2030,
"y": 980

3
bin/json/game_global.json
View File

@ -770,6 +770,7 @@
"catchbugturn": 6,
"NewDrawcardAttempts_Nums": 30,
"stonehenge_guideStage": 88,
"story_waittime": 0.8
"story_waittime": 0.8,
"sx_ranknum": 200
}
]

132
bin/json/game_lottery.json
View File

@ -23310,7 +23310,7 @@
"type": 3,
"groupwt": 0,
"groupid": 0,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "hero",
@ -23334,7 +23334,7 @@
"type": 3,
"groupwt": 0,
"groupid": 0,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "hero",
@ -23358,7 +23358,7 @@
"type": 3,
"groupwt": 0,
"groupid": 0,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "hero",
@ -23382,7 +23382,7 @@
"type": 3,
"groupwt": 0,
"groupid": 0,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "hero",
@ -23406,7 +23406,7 @@
"type": 3,
"groupwt": 0,
"groupid": 0,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "hero",
@ -23430,7 +23430,7 @@
"type": 3,
"groupwt": 0,
"groupid": 0,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "hero",
@ -23454,7 +23454,7 @@
"type": 3,
"groupwt": 0,
"groupid": 0,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "hero",
@ -23478,7 +23478,7 @@
"type": 3,
"groupwt": 0,
"groupid": 0,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "hero",
@ -23502,7 +23502,7 @@
"type": 3,
"groupwt": 0,
"groupid": 0,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "hero",
@ -23526,7 +23526,7 @@
"type": 3,
"groupwt": 0,
"groupid": 0,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "hero",
@ -23550,7 +23550,7 @@
"type": 3,
"groupwt": 0,
"groupid": 0,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "hero",
@ -23574,7 +23574,7 @@
"type": 3,
"groupwt": 0,
"groupid": 0,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "hero",
@ -23596,9 +23596,9 @@
"lotteryid": 17050002,
"description": "5星热情之火自选宝箱",
"type": 3,
"groupwt": 0,
"groupwt": 1,
"groupid": 1,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "hero",
@ -23620,9 +23620,9 @@
"lotteryid": 17050002,
"description": "5星热情之火自选宝箱",
"type": 3,
"groupwt": 0,
"groupwt": 1,
"groupid": 1,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "hero",
@ -23644,9 +23644,9 @@
"lotteryid": 17050002,
"description": "5星热情之火自选宝箱",
"type": 3,
"groupwt": 0,
"groupwt": 1,
"groupid": 1,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "hero",
@ -23668,9 +23668,9 @@
"lotteryid": 17050003,
"description": "5星感观之林自选宝箱",
"type": 3,
"groupwt": 0,
"groupwt": 1,
"groupid": 3,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "hero",
@ -23692,9 +23692,9 @@
"lotteryid": 17050004,
"description": "5星包容之水自选宝箱",
"type": 3,
"groupwt": 0,
"groupwt": 1,
"groupid": 2,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "hero",
@ -23716,9 +23716,9 @@
"lotteryid": 17050004,
"description": "5星包容之水自选宝箱",
"type": 3,
"groupwt": 0,
"groupwt": 1,
"groupid": 2,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "hero",
@ -23740,9 +23740,9 @@
"lotteryid": 17050004,
"description": "5星包容之水自选宝箱",
"type": 3,
"groupwt": 0,
"groupwt": 1,
"groupid": 2,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "hero",
@ -23764,9 +23764,9 @@
"lotteryid": 17050004,
"description": "5星包容之水自选宝箱",
"type": 3,
"groupwt": 0,
"groupwt": 1,
"groupid": 2,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "hero",
@ -23788,9 +23788,9 @@
"lotteryid": 17050004,
"description": "5星包容之水自选宝箱",
"type": 3,
"groupwt": 0,
"groupwt": 1,
"groupid": 2,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "hero",
@ -23812,9 +23812,9 @@
"lotteryid": 17050005,
"description": "5星荣耀之光自选宝箱",
"type": 3,
"groupwt": 0,
"groupwt": 1,
"groupid": 4,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "hero",
@ -23836,9 +23836,9 @@
"lotteryid": 17050005,
"description": "5星荣耀之光自选宝箱",
"type": 3,
"groupwt": 0,
"groupwt": 1,
"groupid": 4,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "hero",
@ -23860,9 +23860,9 @@
"lotteryid": 17050005,
"description": "5星荣耀之光自选宝箱",
"type": 3,
"groupwt": 0,
"groupwt": 1,
"groupid": 4,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "hero",
@ -46325,7 +46325,7 @@
"description": "热情之火回响材料宝箱",
"type": 3,
"groupwt": 1,
"groupid": 1,
"groupid": 3,
"subtype": 1,
"groupnum": 1,
"itemid": {
@ -46349,7 +46349,7 @@
"description": "感观之林回响材料宝箱",
"type": 3,
"groupwt": 1,
"groupid": 1,
"groupid": 3,
"subtype": 1,
"groupnum": 1,
"itemid": {
@ -46397,7 +46397,7 @@
"description": "感观之林回响材料宝箱",
"type": 3,
"groupwt": 1,
"groupid": 1,
"groupid": 3,
"subtype": 1,
"groupnum": 1,
"itemid": {
@ -46421,7 +46421,7 @@
"description": "包容之水回响材料宝箱",
"type": 3,
"groupwt": 1,
"groupid": 1,
"groupid": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
@ -46445,7 +46445,7 @@
"description": "包容之水回响材料宝箱",
"type": 3,
"groupwt": 1,
"groupid": 1,
"groupid": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
@ -46469,7 +46469,7 @@
"description": "包容之水回响材料宝箱",
"type": 3,
"groupwt": 1,
"groupid": 1,
"groupid": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
@ -46493,7 +46493,7 @@
"description": "荣耀之光回响材料宝箱",
"type": 3,
"groupwt": 1,
"groupid": 1,
"groupid": 4,
"subtype": 1,
"groupnum": 1,
"itemid": {
@ -46517,7 +46517,7 @@
"description": "荣耀之光回响材料宝箱",
"type": 3,
"groupwt": 1,
"groupid": 1,
"groupid": 4,
"subtype": 1,
"groupnum": 1,
"itemid": {
@ -46541,7 +46541,7 @@
"description": "荣耀之光回响材料宝箱",
"type": 3,
"groupwt": 1,
"groupid": 1,
"groupid": 4,
"subtype": 1,
"groupnum": 1,
"itemid": {
@ -46685,7 +46685,7 @@
"description": "4星直觉守护者自选箱",
"type": 3,
"groupwt": 1,
"groupid": 1,
"groupid": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
@ -46709,7 +46709,7 @@
"description": "4星直觉守护者自选箱",
"type": 3,
"groupwt": 1,
"groupid": 1,
"groupid": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
@ -46733,7 +46733,7 @@
"description": "4星直觉守护者自选箱",
"type": 3,
"groupwt": 1,
"groupid": 1,
"groupid": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
@ -46757,7 +46757,7 @@
"description": "4星直觉守护者自选箱",
"type": 3,
"groupwt": 1,
"groupid": 1,
"groupid": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
@ -46781,7 +46781,7 @@
"description": "4星直觉守护者自选箱",
"type": 3,
"groupwt": 1,
"groupid": 1,
"groupid": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
@ -46901,7 +46901,7 @@
"description": "4星共情守护者自选箱",
"type": 3,
"groupwt": 1,
"groupid": 1,
"groupid": 3,
"subtype": 1,
"groupnum": 1,
"itemid": {
@ -46925,7 +46925,7 @@
"description": "4星共情守护者自选箱",
"type": 3,
"groupwt": 1,
"groupid": 1,
"groupid": 3,
"subtype": 1,
"groupnum": 1,
"itemid": {
@ -46949,7 +46949,7 @@
"description": "4星共情守护者自选箱",
"type": 3,
"groupwt": 1,
"groupid": 1,
"groupid": 3,
"subtype": 1,
"groupnum": 1,
"itemid": {
@ -46973,7 +46973,7 @@
"description": "4星共情守护者自选箱",
"type": 3,
"groupwt": 1,
"groupid": 1,
"groupid": 3,
"subtype": 1,
"groupnum": 1,
"itemid": {
@ -46997,7 +46997,7 @@
"description": "4星共情守护者自选箱",
"type": 3,
"groupwt": 1,
"groupid": 1,
"groupid": 3,
"subtype": 1,
"groupnum": 1,
"itemid": {
@ -47021,7 +47021,7 @@
"description": "4星共情守护者自选箱",
"type": 3,
"groupwt": 1,
"groupid": 1,
"groupid": 3,
"subtype": 1,
"groupnum": 1,
"itemid": {
@ -98357,11 +98357,11 @@
"description": "三种族招募卡自选箱",
"type": 3,
"groupwt": 1000,
"groupid": 11050,
"groupid": 1,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "iiem",
"a": "item",
"t": "10000021",
"n": 1
},
@ -98381,11 +98381,11 @@
"description": "三种族招募卡自选箱",
"type": 3,
"groupwt": 1000,
"groupid": 11050,
"groupid": 1,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "iiem",
"a": "item",
"t": "10000022",
"n": 1
},
@ -98405,11 +98405,11 @@
"description": "三种族招募卡自选箱",
"type": 3,
"groupwt": 1000,
"groupid": 11050,
"groupid": 1,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "iiem",
"a": "item",
"t": "10000023",
"n": 1
},
@ -98430,7 +98430,7 @@
"type": 2,
"groupwt": 1000,
"groupid": 11001,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "equi",
@ -98454,7 +98454,7 @@
"type": 2,
"groupwt": 1000,
"groupid": 11001,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "equi",
@ -98478,7 +98478,7 @@
"type": 2,
"groupwt": 1000,
"groupid": 11001,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "equi",
@ -98502,7 +98502,7 @@
"type": 2,
"groupwt": 1000,
"groupid": 11001,
"subtype": 2,
"subtype": 1,
"groupnum": 1,
"itemid": {
"a": "equi",

70
bin/json/game_mainstage.json
View File

@ -9769,8 +9769,8 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
"key": "main_stage_bubbletext_84",
"text": "来吧朋友，找点能吃的东西并不困难。"
},
"animation": [],
"prewarbubbletext": {
@ -9850,7 +9850,7 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"key": "main_stage_bubbletext_85",
"text": ""
},
"animation": [],
@ -9931,8 +9931,8 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
"key": "main_stage_bubbletext_86",
"text": "这么多东西！你们累坏了吧？"
},
"animation": [],
"prewarbubbletext": {
@ -10052,8 +10052,8 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
"key": "main_stage_bubbletext_87",
"text": "你们哪儿都不许去！"
},
"animation": [],
"prewarbubbletext": {
@ -10173,8 +10173,8 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
"key": "main_stage_bubbletext_88",
"text": "多亏了本大爷！"
},
"animation": [],
"prewarbubbletext": {
@ -10254,8 +10254,8 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
"key": "main_stage_bubbletext_89",
"text": "前面就是拳猴的领地。"
},
"animation": [],
"prewarbubbletext": {
@ -10375,7 +10375,7 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"key": "main_stage_bubbletext_90",
"text": ""
},
"animation": [],
@ -10454,7 +10454,7 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"key": "main_stage_bubbletext_91",
"text": ""
},
"animation": [],
@ -10533,7 +10533,7 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"key": "main_stage_bubbletext_92",
"text": ""
},
"animation": [],
@ -10590,7 +10590,7 @@
"buried_type": 0,
"buried": 0,
"grouptype": [],
"Episodetype": 7,
"Episodetype": 3,
"stage_param": 0,
"inherit": 0,
"battle_fail": 0,
@ -10612,7 +10612,7 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"key": "main_stage_bubbletext_93",
"text": ""
},
"animation": [],
@ -10669,7 +10669,7 @@
"buried_type": 0,
"buried": 0,
"grouptype": [],
"Episodetype": 7,
"Episodetype": 3,
"stage_param": 0,
"inherit": 0,
"battle_fail": 0,
@ -10691,7 +10691,7 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"key": "main_stage_bubbletext_94",
"text": ""
},
"animation": [],
@ -10770,8 +10770,8 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
"key": "main_stage_bubbletext_95",
"text": "哼……传承者……"
},
"animation": [],
"prewarbubbletext": {
@ -10849,8 +10849,8 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
"key": "main_stage_bubbletext_96",
"text": "前面好像有一片石林……"
},
"animation": [],
"prewarbubbletext": {
@ -10928,7 +10928,7 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"key": "main_stage_bubbletext_97",
"text": ""
},
"animation": [],
@ -11007,8 +11007,8 @@
"herocolor": 2,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
"key": "main_stage_bubbletext_98",
"text": "总算出来了……"
},
"animation": [],
"prewarbubbletext": {
@ -11086,8 +11086,8 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
"key": "main_stage_bubbletext_99",
"text": "离目的地不远了。"
},
"animation": [],
"prewarbubbletext": {
@ -11165,7 +11165,7 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"key": "main_stage_bubbletext_100",
"text": ""
},
"animation": [],
@ -11286,7 +11286,7 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"key": "main_stage_bubbletext_101",
"text": ""
},
"animation": [],
@ -11365,8 +11365,8 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
"key": "main_stage_bubbletext_102",
"text": "哈哈哈哈……看看！这是谁来了！"
},
"animation": [],
"prewarbubbletext": {
@ -11482,8 +11482,8 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
"key": "main_stage_bubbletext_103",
"text": "你们……你们竟敢！"
},
"animation": [],
"prewarbubbletext": {
@ -11561,8 +11561,8 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
"key": "main_stage_bubbletext_104",
"text": "大家小心！"
},
"animation": [],
"prewarbubbletext": {

10
bin/json/game_opencond.json
View File

@ -1156,7 +1156,7 @@
"main": [
{
"key": 3,
"param": 20130
"param": 20128
}
],
"wkqbx": 0,
@ -3002,7 +3002,7 @@
"main": [
{
"key": 1,
"param": 42
"param": 70
}
],
"wkqbx": 2,
@ -3030,7 +3030,7 @@
"main": [
{
"key": 1,
"param": 43
"param": 71
}
],
"wkqbx": 2,
@ -3058,7 +3058,7 @@
"main": [
{
"key": 1,
"param": 44
"param": 72
}
],
"wkqbx": 2,
@ -3086,7 +3086,7 @@
"main": [
{
"key": 1,
"param": 45
"param": 73
}
],
"wkqbx": 2,

529
bin/json/game_passcheck.json
View File

@ -1999,5 +1999,534 @@
"n": 300
}
]
},
{
"id": 60001,
"passcheck_type": 6,
"parameter": 500,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_60001",
"text": "{0}级"
},
"free_reward": [
{
"a": "attr",
"t": "gold",
"n": 1
}
],
"pay_reward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"id": 60002,
"passcheck_type": 6,
"parameter": 1000,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_60002",
"text": "{0}级"
},
"free_reward": [
{
"a": "attr",
"t": "gold",
"n": 2
}
],
"pay_reward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"id": 60003,
"passcheck_type": 6,
"parameter": 2000,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_60003",
"text": "{0}级"
},
"free_reward": [
{
"a": "attr",
"t": "gold",
"n": 3
}
],
"pay_reward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"id": 60004,
"passcheck_type": 6,
"parameter": 3000,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_60004",
"text": "{0}级"
},
"free_reward": [
{
"a": "attr",
"t": "gold",
"n": 4
}
],
"pay_reward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"id": 60005,
"passcheck_type": 6,
"parameter": 4000,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_60005",
"text": "{0}级"
},
"free_reward": [
{
"a": "attr",
"t": "gold",
"n": 5
}
],
"pay_reward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"id": 60006,
"passcheck_type": 6,
"parameter": 5000,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_60006",
"text": "{0}级"
},
"free_reward": [
{
"a": "attr",
"t": "gold",
"n": 6
}
],
"pay_reward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"id": 60007,
"passcheck_type": 6,
"parameter": 6000,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_60007",
"text": "{0}级"
},
"free_reward": [
{
"a": "attr",
"t": "gold",
"n": 7
}
],
"pay_reward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"id": 60008,
"passcheck_type": 6,
"parameter": 7000,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_60008",
"text": "{0}级"
},
"free_reward": [
{
"a": "attr",
"t": "gold",
"n": 8
}
],
"pay_reward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"id": 60009,
"passcheck_type": 6,
"parameter": 8000,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_60009",
"text": "{0}级"
},
"free_reward": [
{
"a": "attr",
"t": "gold",
"n": 9
}
],
"pay_reward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"id": 60010,
"passcheck_type": 6,
"parameter": 9000,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_60010",
"text": "{0}级"
},
"free_reward": [
{
"a": "attr",
"t": "gold",
"n": 10
}
],
"pay_reward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"id": 60011,
"passcheck_type": 6,
"parameter": 10000,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_60011",
"text": "{0}级"
},
"free_reward": [
{
"a": "attr",
"t": "gold",
"n": 11
}
],
"pay_reward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"id": 60012,
"passcheck_type": 6,
"parameter": 11000,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_60012",
"text": "{0}级"
},
"free_reward": [
{
"a": "attr",
"t": "gold",
"n": 12
}
],
"pay_reward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"id": 60013,
"passcheck_type": 6,
"parameter": 12000,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_60013",
"text": "{0}级"
},
"free_reward": [
{
"a": "attr",
"t": "gold",
"n": 13
}
],
"pay_reward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"id": 60014,
"passcheck_type": 6,
"parameter": 13000,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_60014",
"text": "{0}级"
},
"free_reward": [
{
"a": "attr",
"t": "gold",
"n": 14
}
],
"pay_reward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"id": 60015,
"passcheck_type": 6,
"parameter": 14000,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_60015",
"text": "{0}级"
},
"free_reward": [
{
"a": "attr",
"t": "gold",
"n": 15
}
],
"pay_reward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"id": 60016,
"passcheck_type": 6,
"parameter": 15000,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_60016",
"text": "{0}级"
},
"free_reward": [
{
"a": "attr",
"t": "gold",
"n": 16
}
],
"pay_reward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"id": 60017,
"passcheck_type": 6,
"parameter": 16000,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_60017",
"text": "{0}级"
},
"free_reward": [
{
"a": "attr",
"t": "gold",
"n": 17
}
],
"pay_reward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"id": 60018,
"passcheck_type": 6,
"parameter": 17000,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_60018",
"text": "{0}级"
},
"free_reward": [
{
"a": "attr",
"t": "gold",
"n": 18
}
],
"pay_reward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"id": 60019,
"passcheck_type": 6,
"parameter": 18000,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_60019",
"text": "{0}级"
},
"free_reward": [
{
"a": "attr",
"t": "gold",
"n": 19
}
],
"pay_reward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"id": 60020,
"passcheck_type": 6,
"parameter": 19000,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_60020",
"text": "{0}级"
},
"free_reward": [
{
"a": "attr",
"t": "gold",
"n": 20
}
],
"pay_reward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"id": 60021,
"passcheck_type": 6,
"parameter": 20000,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_60021",
"text": "{0}级"
},
"free_reward": [
{
"a": "attr",
"t": "gold",
"n": 21
}
],
"pay_reward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"id": 60022,
"passcheck_type": 6,
"parameter": 21000,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_60022",
"text": "{0}级"
},
"free_reward": [
{
"a": "attr",
"t": "gold",
"n": 22
}
],
"pay_reward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
},
{
"id": 60023,
"passcheck_type": 6,
"parameter": 22000,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_60023",
"text": "{0}级"
},
"free_reward": [
{
"a": "attr",
"t": "gold",
"n": 23
}
],
"pay_reward": [
{
"a": "attr",
"t": "diamond",
"n": 20
}
]
}
]

6
bin/json/game_passcheckprice.json
View File

@ -28,5 +28,11 @@
"pay_id": "passcheck_4",
"paypro_id": "passcheckPro_4",
"paymid_id": ""
},
{
"passcheck_type": 6,
"pay_id": "sx_gift_01",
"paypro_id": "",
"paymid_id": ""
}
]

146
bin/json/game_recharge.json
View File

@ -11,7 +11,7 @@
"text": "0",
"show": "6元",
"image": "cz_zs_01",
"integral": 600
"integral": 0
},
{
"id": "gold30",
@ -25,7 +25,7 @@
"text": "0",
"show": "30元",
"image": "cz_zs_02",
"integral": 3000
"integral": 0
},
{
"id": "gold68",
@ -39,10 +39,10 @@
"text": "0",
"show": "68元",
"image": "cz_zs_02",
"integral": 6800
"integral": 0
},
{
"id": "gold128",
"id": "gold98",
"pid": 4,
"editionid": "debug",
"monetaryunit": "￥",
@ -53,10 +53,10 @@
"text": "0",
"show": "98元",
"image": "cz_zs_02",
"integral": 9800
"integral": 0
},
{
"id": "gold198",
"id": "gold128",
"pid": 5,
"editionid": "debug",
"monetaryunit": "￥",
@ -67,10 +67,10 @@
"text": "0",
"show": "128元",
"image": "cz_zs_03",
"integral": 12800
"integral": 0
},
{
"id": "gold328",
"id": "gold198",
"pid": 6,
"editionid": "debug",
"monetaryunit": "￥",
@ -81,10 +81,10 @@
"text": "0",
"show": "198元",
"image": "cz_zs_03",
"integral": 19800
"integral": 0
},
{
"id": "gold448",
"id": "gold328",
"pid": 7,
"editionid": "debug",
"monetaryunit": "￥",
@ -95,7 +95,7 @@
"text": "0",
"show": "328元",
"image": "cz_zs_03",
"integral": 32800
"integral": 0
},
{
"id": "gold648",
@ -109,7 +109,7 @@
"text": "0",
"show": "648元",
"image": "cz_zs_03",
"integral": 64800
"integral": 0
},
{
"id": "lb6_1",
@ -123,7 +123,7 @@
"text": "0",
"show": "6元",
"image": "",
"integral": 600
"integral": 0
},
{
"id": "day_1",
@ -137,7 +137,7 @@
"text": "0",
"show": "6元",
"image": "",
"integral": 600
"integral": 0
},
{
"id": "day_2",
@ -151,7 +151,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "day_3",
@ -165,7 +165,7 @@
"text": "0",
"show": "68元",
"image": "",
"integral": 6800
"integral": 0
},
{
"id": "day_4",
@ -179,7 +179,7 @@
"text": "0",
"show": "128元",
"image": "",
"integral": 12800
"integral": 0
},
{
"id": "week_1",
@ -193,7 +193,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "week_2",
@ -207,7 +207,7 @@
"text": "0",
"show": "98元",
"image": "",
"integral": 9800
"integral": 0
},
{
"id": "week_3",
@ -221,7 +221,7 @@
"text": "0",
"show": "198元",
"image": "",
"integral": 19800
"integral": 0
},
{
"id": "week_4",
@ -235,7 +235,7 @@
"text": "0",
"show": "328元",
"image": "",
"integral": 32800
"integral": 0
},
{
"id": "week_5",
@ -249,7 +249,7 @@
"text": "0",
"show": "448元",
"image": "",
"integral": 44800
"integral": 0
},
{
"id": "week_6",
@ -263,7 +263,7 @@
"text": "0",
"show": "648元",
"image": "",
"integral": 64800
"integral": 0
},
{
"id": "month_1",
@ -277,7 +277,7 @@
"text": "0",
"show": "128元",
"image": "",
"integral": 12800
"integral": 0
},
{
"id": "month_2",
@ -291,7 +291,7 @@
"text": "0",
"show": "198元",
"image": "",
"integral": 19800
"integral": 0
},
{
"id": "month_3",
@ -305,7 +305,7 @@
"text": "0",
"show": "328元",
"image": "",
"integral": 32800
"integral": 0
},
{
"id": "yueka_lv1",
@ -325,7 +325,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "yueka_lv2",
@ -345,7 +345,7 @@
"text": "0",
"show": "98元",
"image": "",
"integral": 9800
"integral": 0
},
{
"id": "passcheck_1",
@ -359,7 +359,7 @@
"text": "0",
"show": "98元",
"image": "",
"integral": 9800
"integral": 0
},
{
"id": "passcheck_2",
@ -373,7 +373,7 @@
"text": "0",
"show": "98元",
"image": "",
"integral": 9800
"integral": 0
},
{
"id": "drawcard_pack1",
@ -387,7 +387,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "passcheck_3",
@ -401,7 +401,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "passcheck_4",
@ -415,7 +415,7 @@
"text": "0",
"show": "68元",
"image": "",
"integral": 6800
"integral": 0
},
{
"id": "fund_1",
@ -429,7 +429,7 @@
"text": "0",
"show": "128元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "fund_2",
@ -443,7 +443,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "fund_3",
@ -457,7 +457,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "fund_4",
@ -471,7 +471,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "fund_5",
@ -485,7 +485,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "fund_6",
@ -499,7 +499,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "fund_7",
@ -513,7 +513,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "fund_8",
@ -527,7 +527,7 @@
"text": "0",
"show": "6元",
"image": "",
"integral": 6000
"integral": 0
},
{
"id": "fund_9",
@ -541,7 +541,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "fund_10",
@ -555,7 +555,7 @@
"text": "0",
"show": "68元",
"image": "",
"integral": 6800
"integral": 0
},
{
"id": "drawcard_pack2",
@ -569,7 +569,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "drawcard_pack3",
@ -583,7 +583,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "drawcard_pack4",
@ -597,7 +597,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "passcheckPro_4",
@ -623,7 +623,7 @@
"text": "0",
"show": "98元",
"image": "",
"integral": 9800
"integral": 0
},
{
"id": "passcheckMid_4",
@ -649,7 +649,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "push_gift_1",
@ -663,7 +663,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "push_gift_2",
@ -677,7 +677,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "push_gift_3",
@ -691,7 +691,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "push_gift_4",
@ -705,7 +705,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "push_gift_5",
@ -719,7 +719,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "push_gift_6",
@ -733,7 +733,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "push_gift_7",
@ -747,7 +747,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "push_gift_8",
@ -761,7 +761,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "push_gift_9",
@ -775,7 +775,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "push_gift_10",
@ -789,7 +789,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "push_gift_11",
@ -803,7 +803,7 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "push_gift_12",
@ -817,6 +817,32 @@
"text": "0",
"show": "30元",
"image": "",
"integral": 3000
"integral": 0
},
{
"id": "sx_gift_01",
"pid": 57,
"editionid": "debug",
"monetaryunit": "￥",
"amount": 32800,
"vipexp": [
{
"a": "attr",
"t": "diamond",
"n": 980
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "diamond",
"n": 980
}
],
"channel": "0",
"text": "0",
"show": "328元",
"image": "",
"integral": 0
}
]

8
bin/json/game_rechargediamond.json
View File

@ -73,7 +73,7 @@
}
],
"image": "cz_zs_02",
"bpoint": "gold128"
"bpoint": "gold98"
},
{
"id": 5,
@ -92,7 +92,7 @@
}
],
"image": "cz_zs_03",
"bpoint": "gold198"
"bpoint": "gold128"
},
{
"id": 6,
@ -111,7 +111,7 @@
}
],
"image": "cz_zs_03",
"bpoint": "gold328"
"bpoint": "gold198"
},
{
"id": 7,
@ -130,7 +130,7 @@
}
],
"image": "cz_zs_03",
"bpoint": "gold448"
"bpoint": "gold328"
},
{
"id": 8,

11
bin/json/game_ruledesc.json
View File

@ -504,5 +504,16 @@
"key": "ruledesc_ruledesc_content_46",
"text": "这里可以使用传承者月光与水晶的力量，迅速提升守护者的等级。<br>水晶会挑选你等级最高的5位守护者为核心，在右侧上阵守护者将会把等级提升至五位最高的守护者中等级最低的那一位。<br>上阵守护者槽位由传承者等级解锁，每一个槽位只能上阵相应品质的守护者。<br>卸下守护者后槽位会进入不稳定状态，稳定槽位需要等待24小时或者200月光原石迅速稳定。"
}
},
{
"id": 10047,
"title": {
"key": "ruledesc_ruledesc_title_47",
"text": "商店说明"
},
"content": {
"key": "ruledesc_ruledesc_content_47",
"text": "金币商店<br>在金币商店内，可以使用金币购买所需物资。<br>金币商店每隔8小时刷新，也可以手动刷新，手动刷新需要消耗钻石，每天最多可以刷新8次。<br>等级越高，金币商店中刷出高品质装备的概率越大。<br>月光商店<br>在月光商店内，可以使用月光原石购买所需物资。<br>月光商店每天刷新一次，不可手动刷新。<br>友情专柜<br>在友情专柜内，可以使用友情点购买所需物资。<br>竞技专柜每天刷新一次，不可手动刷新。<br>竞技专柜<br>在竞技专柜内，可以使用竞技币购买所需物资。<br>竞技专柜每七天刷新一次，不可手动刷新。<br>聚乐专柜<br>在聚乐专柜内，可以使用月光原石购买所需物资。<br>聚乐专柜每七天刷新一次，不可手动刷新。<br>守护专柜<br>在守护专柜内，可以使用幸运星购买所需物资。<br>守护专柜每二十一天刷新一次，不可手动刷新。<br>冒险商店<br>这里面是通关冒险之旅章节后解锁的商店。<br>内部的商品是一次性的，通过冒险之旅获得相应的货币购买。"
}
}
]

28
bin/json/game_skillafteratk.json
View File

@ -29459,7 +29459,9 @@
800
],
"FollowSK": [],
"SucFollowSK": [],
"SucFollowSK": [
255007215
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
@ -29514,6 +29516,30 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 255007215,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001415,
1000,
5,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 255007311,
"EmitPR": 1000,

20
bin/json/game_skillatk.json
View File

@ -6859,9 +6859,9 @@
"level": 1,
"MaxLV": 1,
"UnavailablePlayTypes": [
7,
17,
4,
17
5
],
"SkillFlag": 0,
"EffectFlag": 0,
@ -14972,7 +14972,7 @@
"level": 1,
"MaxLV": 1,
"UnavailablePlayTypes": [
7,
5,
4,
17
],
@ -16929,7 +16929,7 @@
"level": 1,
"MaxLV": 1,
"UnavailablePlayTypes": [
7,
5,
4,
17
],
@ -23845,7 +23845,7 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_155007311_1",
"text": "冰霜泰坦拥有多层生命值，且免疫速度下降类效果，自身每次受到的伤害不会超过自身最大生命值的25%。"
"text": "冰霜泰坦拥有多层生命值，且免疫速度下降类效果，自身每次受到的伤害不会超过自身最大生命值的25%。冰霜泰坦损失一层生命值时，会获得[color=#37d8a9]霜盾冰晶[/color]，同时锁定最后一次对自身造成伤害的目标，对其施加[color=#e5621b]急冻深寒[/color]。"
},
"buffid": [],
"map": ""
@ -23864,7 +23864,7 @@
"ico": "jn_55007_3",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_1",
"act": "Skill_3",
"Type": 0,
"CD": 0,
"Where": [],
@ -23877,7 +23877,7 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_155007312_1",
"text": "冰霜泰坦拥有多层生命值，且免疫速度下降类效果，自身每次受到的伤害不会超过自身最大生命值的25%。"
"text": "冰霜泰坦拥有多层生命值，且免疫速度下降类效果，自身每次受到的伤害不会超过自身最大生命值的25%。冰霜泰坦损失一层生命值时，会获得[color=#37d8a9]霜盾冰晶[/color]，同时锁定最后一次对自身造成伤害的目标，对其施加[color=#e5621b]急冻深寒[/color]。"
},
"buffid": [],
"map": ""
@ -25412,7 +25412,7 @@
"level": 1,
"MaxLV": 1,
"UnavailablePlayTypes": [
7,
5,
4,
17
],
@ -30408,7 +30408,7 @@
"level": 1,
"MaxLV": 1,
"UnavailablePlayTypes": [
7,
5,
4,
17
],
@ -31701,7 +31701,7 @@
"level": 1,
"MaxLV": 1,
"UnavailablePlayTypes": [
7,
5,
4,
17
],

58
bin/json/game_tdlv.json
View File

@ -5,118 +5,118 @@
},
{
"td_lv": 2,
"exp": 2
"exp": 1000
},
{
"td_lv": 3,
"exp": 8
"exp": 1006
},
{
"td_lv": 4,
"exp": 16
"exp": 1014
},
{
"td_lv": 5,
"exp": 26
"exp": 1024
},
{
"td_lv": 6,
"exp": 38
"exp": 1036
},
{
"td_lv": 7,
"exp": 52
"exp": 1050
},
{
"td_lv": 8,
"exp": 68
"exp": 1066
},
{
"td_lv": 9,
"exp": 86
"exp": 1084
},
{
"td_lv": 10,
"exp": 106
"exp": 1104
},
{
"td_lv": 11,
"exp": 128
"exp": 1126
},
{
"td_lv": 12,
"exp": 152
"exp": 1150
},
{
"td_lv": 13,
"exp": 178
"exp": 1176
},
{
"td_lv": 14,
"exp": 206
"exp": 1204
},
{
"td_lv": 15,
"exp": 236
"exp": 1234
},
{
"td_lv": 16,
"exp": 268
"exp": 1266
},
{
"td_lv": 17,
"exp": 302
"exp": 1300
},
{
"td_lv": 18,
"exp": 338
"exp": 1336
},
{
"td_lv": 19,
"exp": 376
"exp": 1374
},
{
"td_lv": 20,
"exp": 416
"exp": 1414
},
{
"td_lv": 21,
"exp": 458
"exp": 1456
},
{
"td_lv": 22,
"exp": 502
"exp": 1500
},
{
"td_lv": 23,
"exp": 548
"exp": 1546
},
{
"td_lv": 24,
"exp": 596
"exp": 1594
},
{
"td_lv": 25,
"exp": 646
"exp": 1644
},
{
"td_lv": 26,
"exp": 698
"exp": 1696
},
{
"td_lv": 27,
"exp": 752
"exp": 1750
},
{
"td_lv": 28,
"exp": 808
"exp": 1806
},
{
"td_lv": 29,
"exp": 866
"exp": 1864
},
{
"td_lv": 30,
"exp": 926
"exp": 1924
}
]

1215
bin/json/game_worldtask.json
View File

File diff suppressed because it is too large Load Diff

1
comm/core.go
View File

@ -45,6 +45,7 @@ const (
MountsType = "mts" //捕羊大赛坐骑资源
TitleType = "title" //称号资源
XxlType = "xxl" //三消卡片资源
XxlSkill = "xxlskill" //三消技能资源
)
type Autogenerated struct {

3
comm/imodule.go
View File

@ -688,12 +688,15 @@ type (
IEntertainment interface {
// 添加三消卡片资源
AddXxlCard(session IUserSession, cards map[string]int32, bPush bool) (errdata *pb.ErrorData)
AddXxlSkillCard(session IUserSession, skill map[string]int32, bPush bool) (errdata *pb.ErrorData)
CreateRoom(sessions []IUserSession, rulesStr string) (roomid string, err error)
//用户离线
UserOffline(roomid string, uid string) (err error)
//主动认输
AdmitDefeat(roomid string, uid string) (err error)
IPayDelivery
}
IMoonlv interface {
IBuriedUpdateNotify

2
modules/activity/api_getreward.go
View File

@ -41,7 +41,7 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.ActivityGetRew
// 接口需要修改
if activity, err = this.module.modelhdList.getHdListByHdId(req.Oid); err == nil {
curTime := configure.Now().Unix()
if activity.Stime > curTime || curTime > activity.Etime { //不在活动时间范围内
if activity.Stime > curTime && curTime > activity.Etime { //不在活动时间范围内
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ActivityNotIntime,
Title: pb.ErrorCode_ActivityNotIntime.ToString(),

2
modules/entertainment/api_getlist.go
View File

@ -34,6 +34,8 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.EntertainGetList
for _, v := range this.module.configure.GetGameConsumeIntegral() {
list.Playtype = append(list.Playtype, v.Key) // 配置读取一个玩法
}
list.Touxiang = 3 // 需求 默认3 后面可能走配置
update["touxiang"] = list.Touxiang // 每天投降次数清0
update["rtime"] = list.Rtime
update["playtype"] = list.Playtype
_, endSeasonTime := utils.GetMonthStartEnd()

33
modules/entertainment/api_match.go
View File

@ -23,6 +23,7 @@ func (this *apiComp) Match(session comm.IUserSession, req *pb.EntertainMatchReq)
user *pb.DBUser
err error
conf *cfg.GameConsumeHeroData
list *pb.DBXXLData
)
user, err = this.module.ModuleUser.GetUser(session.GetUserId())
if err != nil {
@ -36,15 +37,33 @@ func (this *apiComp) Match(session comm.IUserSession, req *pb.EntertainMatchReq)
}
return
}
if conf.Type != 1 { // 校验数量够不够
if list, err := this.module.model.getEntertainmList(session.GetUserId()); err != nil {
if list, err = this.module.model.getEntertainmList(session.GetUserId()); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
} else {
}
for _, v := range req.Skillcard {
if _, err = this.module.configure.GetGamePlaySkill(v); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
if list.Skill[v] <= 0 { // 道具数量不足
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ItemsNoEnough,
Title: pb.ErrorCode_ItemsNoEnough.ToString(),
}
return
}
}
if conf.Type != 1 { // 校验数量够不够
if list.Card[req.Idcard] <= 0 { // 需要购买
if errdata = this.module.ConsumeRes(session, conf.Consume, true); errdata != nil {
return
@ -57,13 +76,17 @@ func (this *apiComp) Match(session comm.IUserSession, req *pb.EntertainMatchReq)
"card": list.Card,
})
}
}
}
}
mySkill := make(map[int32]int32, 0)
for _, v := range req.Skillcard {
mySkill[v] = 1
}
this.module.match.MatchReq(&pb.DBXXLMatch{
Userinfo: comm.GetUserBaseInfo(user),
Cardid: req.Idcard,
Consumeexp: user.Consumeexp,
Skill: mySkill,
})
session.SendMsg(string(this.module.GetType()), "match", &pb.EntertainMatchResp{

82
modules/entertainment/api_receive.go Normal file
View File

@ -0,0 +1,82 @@
package entertainment
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
)
// 参数校验
func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.EntertainReceiveReq) (errdata *pb.ErrorData) {
return
}
// /获取系统公告
func (this *apiComp) Receive(session comm.IUserSession, req *pb.EntertainReceiveReq) (errdata *pb.ErrorData) {
var (
info *pb.DBXXLData
warorder *pb.Warorder
confs []*cfg.GamePassCheckData
awards []*cfg.Gameatn
award []*pb.UserAtno
err error
progress int32
)
if errdata = this.ReceiveCheck(session, req); errdata != nil {
return
}
if info, err = this.module.model.getEntertainmList(session.GetUserId()); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
if confs, err = this.module.configure.getorder(req.Rtype); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
progress = int32(this.module.ModuleUser.QueryAttributeValue(session.GetUserId(), comm.Consumeexp))
awards = make([]*cfg.Gameatn, 0)
for _, v := range confs {
if v.Parameter <= progress {
if warorder.Freeprogress < v.Parameter {
awards = append(awards, v.FreeReward...)
}
if warorder.Vip {
if warorder.Payprogress < v.Parameter {
awards = append(awards, v.PayReward...)
}
}
}
}
warorder.Freeprogress = progress
if warorder.Vip {
warorder.Payprogress = progress
}
warorder.Freeprogress = 1
if warorder.Vip {
warorder.Payprogress = 1
}
if errdata, award = this.module.DispenseAtno(session, awards, true); errdata != nil {
return
}
this.module.model.Change(session.GetUserId(), map[string]interface{}{
"freeprogress": info.Freeprogress,
"payprogress": info.Payprogress,
})
session.SendMsg(string(this.module.GetType()), "receive", &pb.EntertainReceiveResp{Info: info, Award: award})
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "EntertainReceiveReq", award)
})
return
}

50
modules/entertainment/api_surrender.go Normal file
View File

@ -0,0 +1,50 @@
package entertainment
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
)
//参数校验
func (this *apiComp) SurrenderCheck(session comm.IUserSession, req *pb.EntertainSurrenderReq) (errdata *pb.ErrorData) {
if req.Roomid == "" {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
}
}
return
}
func (this *apiComp) Surrender(session comm.IUserSession, req *pb.EntertainSurrenderReq) (errdata *pb.ErrorData) {
var (
list *pb.DBXXLData
err error
)
if list, err = this.module.model.getEntertainmList(session.GetUserId()); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
// 操作消息返回
if list.Touxiang <= 0 {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EntertainMaxTouxiangCount,
Title: pb.ErrorCode_EntertainMaxTouxiangCount.ToString(),
}
}
if errdata = this.module.gameMgr.RoomDistribute(req.Roomid, session, "surrender", req); errdata == nil {
list.Touxiang -= 1
this.module.model.modifyEntertainmList(session.GetUserId(), map[string]interface{}{
"touxiang": list.Touxiang,
})
session.SendMsg(string(this.module.GetType()), "surrender", &pb.EntertainSurrenderResp{
Leftcount: list.Touxiang,
})
}
return
}

68
modules/entertainment/configure.go
View File

@ -18,6 +18,8 @@ const (
game_consumeIntegral = "game_consumeintegral.json"
game_playingmethod = "game_playingmethod.json"
consume_box = "game_consumebox.json"
game_playerskill = "game_playerskill.json"
game_passcheck = "game_passcheck.json"
)
// /配置管理组件
@ -26,6 +28,7 @@ type configureComp struct {
module *Entertainment
lock sync.RWMutex
block map[int32]*cfg.GameBlockData
order map[int32][]*cfg.GamePassCheckData //战令
}
const moduleName = "entertainment"
@ -39,9 +42,10 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
game_consumeIntegral: cfg.NewGameConsumeIntegral,
game_playingmethod: cfg.NewGamePlayingMethod,
consume_box: cfg.NewGameConsumeBox,
game_playerskill: cfg.NewGamePlayerSkill,
})
configure.RegisterConfigure(game_block, cfg.NewGameBlock, this.LoadGameBlock)
configure.RegisterConfigure(game_passcheck, cfg.NewGamePassCheck, this.updatePassCheck)
return
}
@ -272,3 +276,65 @@ func (this *configureComp) GetGameNormalElem() (rd int32) {
rd = comm.GetRandW(szWeight) + 1
return
}
func (this *configureComp) GetGamePlaySkill(skillid int32) (conf *cfg.GamePlayerSkillData, err error) {
var (
v interface{}
)
if v, err = this.GetConfigure(game_playerskill); err == nil {
if configure, ok := v.(*cfg.GamePlayerSkill); ok {
if conf = configure.Get(skillid); conf != nil {
return
}
}
}
err = comm.NewNotFoundConfErr(moduleName, game_playerskill, skillid)
return
}
// 更新任务配置表
func (this *configureComp) updatePassCheck() {
gwt, err := this.getPassCheckCfg()
if err != nil {
this.module.Error("世界任务配置表异常!")
return
}
orderConf := make(map[int32][]*cfg.GamePassCheckData)
for _, v := range gwt.GetDataList() {
if _, ok := orderConf[v.PasscheckType]; !ok {
orderConf[v.PasscheckType] = make([]*cfg.GamePassCheckData, 0)
}
orderConf[v.PasscheckType] = append(orderConf[v.PasscheckType], v)
}
this.lock.Lock()
this.order = orderConf
this.lock.Unlock()
}
func (this *configureComp) getorder(wtype int32) (results []*cfg.GamePassCheckData, err error) {
this.lock.RLock()
defer this.lock.RUnlock()
var ok bool
if results, ok = this.order[wtype]; !ok {
err = fmt.Errorf("no found wtype:%d", wtype)
}
return
}
// 读取任务配置表
func (this *configureComp) getPassCheckCfg() (data *cfg.GamePassCheck, err error) {
var (
v interface{}
ok bool
)
if v, err = this.GetConfigure(game_passcheck); err != nil {
return
} else {
if data, ok = v.(*cfg.GamePassCheck); !ok {
err = fmt.Errorf("%T is *cfg.GameWorldTask", v)
return
}
}
return
}

3
modules/entertainment/match.go
View File

@ -68,17 +68,20 @@ func (this *matchComp) MatchNotic(players map[string]interface{}) (err error) {
playerSlice = append(playerSlice, v.(*pb.DBXXLMatch))
}
for pos, v := range playerSlice {
if pos == 0 {
p1 = &pb.PlayerData{
Userinfo: v.Userinfo,
Cardid: v.Cardid,
Consumeexp: v.Consumeexp,
Skill: v.Skill,
}
} else if pos == 1 {
p2 = &pb.PlayerData{
Userinfo: v.Userinfo,
Cardid: v.Cardid,
Consumeexp: v.Consumeexp,
Skill: v.Skill,
}
} else {
break

1
modules/entertainment/model.go
View File

@ -39,6 +39,7 @@ func (this *modelComp) getEntertainmList(uid string) (result *pb.DBXXLData, err
Reward: map[int32]int32{},
Card: map[string]int32{},
Skill: map[int32]int32{},
}
if db.IsCross() {
if tag, _, b := utils.UIdSplit(uid); b {

110
modules/entertainment/module.go
View File

@ -10,6 +10,7 @@ import (
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
"strconv"
)
func NewModule() core.IModule {
@ -118,9 +119,13 @@ func (this *Entertainment) ConsumXxlCard(session comm.IUserSession, card string)
})
}
session.SendMsg(string(this.GetType()), "titlelist", &pb.EntertainChangePush{
session.SendMsg(string(this.GetType()), "change", &pb.EntertainChangePush{
Card: result.Card,
})
// 写数据统计
go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
this.WriteUserLog(session.GetUserId(), "", comm.GMResDelType, "ConsumXxlCard", result.Card[card])
})
return
}
@ -168,7 +173,13 @@ func (this *Entertainment) useroffline(ctx context.Context, req *pb.RPCGeneralRe
func (this *Entertainment) CreateRoom(sessions []comm.IUserSession, rulesStr string) (roomid string, err error) {
var (
rules *pb.DBXxlRules = &pb.DBXxlRules{}
rules *pb.DBXxlRules = &pb.DBXxlRules{
RoomType: 0,
Card1: "",
Card2: "",
Skill1: make(map[int32]int32),
Skill2: make(map[int32]int32),
}
red *pb.DBUser
blue *pb.DBUser
p1 *pb.PlayerData
@ -240,3 +251,98 @@ func (this *Entertainment) UserOffline(roomid string, uid string) (err error) {
func (this *Entertainment) AdmitDefeat(roomid string, uid string) (err error) {
return
}
func (this *Entertainment) AddXxlSkillCard(session comm.IUserSession, skill map[string]int32, bPush bool) (errdata *pb.ErrorData) {
var (
result *pb.DBXXLData
err error
)
// for k := range skill {
// if _, err := this.model.module.configure.GetGameConsumeHero(k); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ReqParameterError,
// Title: pb.ErrorCode_ReqParameterError.ToString(),
// Message: err.Error(),
// }
// return
// }
// }
if result, err = this.model.getEntertainmList(session.GetUserId()); err != nil {
return
}
for k, v := range skill {
if iKey, err := strconv.Atoi(k); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
Message: err.Error(),
}
return
} else {
result.Skill[int32(iKey)] += v
}
}
this.model.modifyEntertainmList(session.GetUserId(), map[string]interface{}{
"skill": result.Skill,
})
if bPush {
session.SendMsg(string(this.GetType()), "change", &pb.EntertainChangePush{
Skill: result.Skill,
})
}
return
}
// 消耗一张技能卡
func (this *Entertainment) ConsumXxlSkillCard(session comm.IUserSession, skillCard int32) (errdata *pb.ErrorData) {
var (
result *pb.DBXXLData
err error
)
if result, err = this.model.getEntertainmList(session.GetUserId()); err != nil {
return
}
if _, ok := result.Skill[skillCard]; ok {
if result.Skill[skillCard] <= 0 {
return
}
result.Skill[skillCard] -= 1
this.model.modifyEntertainmList(session.GetUserId(), map[string]interface{}{
"skill": result.Skill,
})
}
session.SendMsg(string(this.GetType()), "change", &pb.EntertainChangePush{
Skill: result.Skill,
})
// 写数据统计
go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
this.WriteUserLog(session.GetUserId(), "", comm.GMResDelType, "ConsumXxlSkillCard", result.Skill[skillCard])
})
return
}
func (this *Entertainment) Delivery(session comm.IUserSession, pId int32) (errdata *pb.ErrorData, items []*pb.UserAtno) {
var (
result *pb.DBXXLData
err error
)
if result, err = this.model.getEntertainmList(session.GetUserId()); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Message: err.Error(),
}
return
}
result.Vip = true
this.model.Change(session.GetUserId(), map[string]interface{}{
"vip": result.Vip,
})
return
}

157
modules/entertainment/room.go
View File

@ -181,7 +181,7 @@ func (this *Room) AiOperator() {
if this.player1.Score == this.player2.Score {
this.MaxRound += 1 // 增加一回合
} else {
this.GameOver()
this.GameOver(nil)
}
return
}
@ -201,6 +201,7 @@ func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg pr
oid2 int32
color int32 // 校验消除的颜色
bAddPs bool
curPlayer *pb.PlayerData
)
var szMap []*pb.MapData
req := msg.(*pb.EntertainOperatorReq)
@ -213,14 +214,49 @@ func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg pr
}
if this.curPower == this.player1.Userinfo.Uid {
color = 1
curPlayer = this.player1
} else {
color = 2
curPlayer = this.player2
}
if req.Itype == 1 { //释放技能
if errdata = this.UserSkillUp(color, req.Curid); errdata != nil {
return
}
return
} else if req.Itype > 0 { //玩家卡牌技能
var (
conf *cfg.GamePlayerSkillData
err error
list *pb.DBXXLData
)
if conf, err = this.module.configure.GetGamePlaySkill(req.Itype); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound, // 配置校验
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
if list, err = this.module.model.getEntertainmList(session.GetUserId()); err == nil {
this.module.Debugf("%v,%v", conf, list)
}
if curPlayer.Skill[req.Itype] <= 0 {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EntertainNoSkillCard, // 技能卡不足
Title: pb.ErrorCode_EntertainNoSkillCard.ToString(),
}
return
}
curPlayer.Skill[req.Itype] -= 1
if errdata = this.UserCardSkill(curPlayer, req.Curid); errdata != nil {
return
}
this.module.model.modifyEntertainmList(session.GetUserId(), map[string]interface{}{
"skill": curPlayer.Skill,
})
return
}
if req.Itype == 0 && req.Curid == 0 && req.Targetid == 0 {
if this.curPower == this.player1.Userinfo.Uid {
@ -339,7 +375,7 @@ func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg pr
if this.player1.Score == this.player2.Score {
this.MaxRound += 1 // 增加一回合
} else {
this.GameOver()
this.GameOver(nil)
}
return
}
@ -476,6 +512,7 @@ func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg pr
}
//this.operatetimer = timewheel.Add(time.Second*time.Duration(this.MaxTime), this.operateTimeOut)
case "offline":
req := msg.(*pb.RPCGeneralReqA2)
fmt.Printf("useroffline: %v\n", req)
@ -496,35 +533,52 @@ func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg pr
this.ModifyUserRoomInfoData()
}
}
case "surrender":
if this.Status != 1 { // 不是游戏中 直接返回
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EntertainNoGamePlayering,
Title: pb.ErrorCode_EntertainNoGamePlayering.ToString(),
}
return
}
var winner *pb.PlayerData
if this.player1.Userinfo.Uid == session.GetUserId() {
winner = this.player2
} else {
winner = this.player1
}
this.GameOver(winner)
}
return
}
// 游戏结束
func (this *Room) GameOver() (errdata *pb.ErrorData) {
func (this *Room) GameOver(winner *pb.PlayerData) (errdata *pb.ErrorData) {
var (
atno []*pb.UserAtno
winindex int32
bReward bool
res []*cfg.Gameatn
winner *pb.PlayerData
lostPlayer *pb.PlayerData // 输的玩家
box *pb.BoxData // 是否可以获得宝箱奖励
)
winner = this.player1
bReward = true
if winner == nil {
if this.player1.Score < this.player2.Score {
winner = this.player2
winindex = 1
if this.RoomType == 2 { // 赢家是AI 的话不发奖
bReward = false
}
} else {
winner = this.player1
}
}
if bReward { // 发奖
if user, err := this.module.ModuleUser.GetUser(winner.Userinfo.Uid); err == nil {
if conf, err := this.module.configure.GetGameConsumeintegral(user.Consumeexp); err == nil {
//res = append(res, conf.Onereward...) 这奖励手动领取
res = append(res, conf.Rewards...)
for _, v := range res {
if v.A == "attr" && v.T == "consumeexp" {
@ -538,7 +592,7 @@ func (this *Room) GameOver() (errdata *pb.ErrorData) {
if errdata, atno = this.module.DispenseAtno(this.szSession[winindex], res, true); errdata != nil {
return
}
go this.module.WriteUserLog(winner.Userinfo.Uid, "GameOver", comm.GMResAddType, "xxlGameReward", atno)
go this.module.WriteUserLog(winner.Userinfo.Uid, "gameover", comm.GMResAddType, "xxlGameReward", atno)
this.szSession[winindex].Push()
}
@ -553,20 +607,32 @@ func (this *Room) GameOver() (errdata *pb.ErrorData) {
}
// 失败卡类型
if conf, err := this.module.configure.GetGameConsumeHero(lostPlayer.Cardid); err == nil && lostPlayer.Userinfo.Uid != "999" {
if conf.Type != 1 { //卡片类型不为1
if list, err := this.module.model.getEntertainmList(lostPlayer.Userinfo.Uid); err == nil {
if list.Card[lostPlayer.Cardid] >= 1 {
list.Card[lostPlayer.Cardid] -= 1
this.module.model.modifyEntertainmList(lostPlayer.Userinfo.Uid, map[string]interface{}{
"card": list.Card,
})
update := map[string]interface{}{}
if list.Liansheng != 0 {
list.Liansheng = 0 // 修改连胜
update["liansheng"] = list.Liansheng
}
if conf.Type != 1 { //卡片类型不为1
if list.Card[lostPlayer.Cardid] >= 1 { //删除卡片
list.Card[lostPlayer.Cardid] -= 1
update["card"] = list.Card
}
}
if len(update) > 0 {
this.module.model.modifyEntertainmList(lostPlayer.Userinfo.Uid, update)
}
}
}
// 查看能不能获得箱子
if winner.Userinfo.Uid != "999" {
if list, err := this.module.model.getEntertainmList(winner.Userinfo.Uid); err == nil {
update := map[string]interface{}{}
// 修改连胜
list.Liansheng += 1
update["liansheng"] = list.Liansheng
if len(list.Box) < 3 { // 可以获得一个宝箱
if c, err := this.module.configure.GetGameRandomConsumeBoxConf(); err == nil {
if c.Color != 0 {
@ -575,13 +641,12 @@ func (this *Room) GameOver() (errdata *pb.ErrorData) {
Opentime: int64(c.Cd) + configure.Now().Unix(),
}
list.Box = append(list.Box, box)
update["box"] = list.Box
this.module.model.modifyEntertainmList(winner.Userinfo.Uid, map[string]interface{}{
"box": list.Box,
})
}
}
}
this.module.model.modifyEntertainmList(winner.Userinfo.Uid, update)
}
}
@ -748,7 +813,7 @@ func (this *Room) AutoOperator(uid string) {
if this.player1.Score == this.player2.Score {
this.MaxRound += 1 // 增加一回合
} else {
this.GameOver()
this.GameOver(nil)
}
return
}
@ -862,3 +927,61 @@ func (this *Room) ChangePower() {
this.player2.Ps = 0
}
}
// 玩家释放技能
func (this *Room) UserCardSkill(curPlayer *pb.PlayerData, curid int32) (errdata *pb.ErrorData) {
var (
curScore int32 // 该次操作的得分
oid1 int32 // 唯一id
oid2 int32
)
var szMap []*pb.MapData
conf, err := this.module.configure.GetGameConsumeHero(curPlayer.Cardid)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EntertainNoHeroSkill,
Title: pb.ErrorCode_EntertainNoHeroSkill.ToString(),
}
return
}
if curPlayer.Energy >= conf.Skillload {
curPlayer.Energy = 0 // 清零
if _, m := this.chessboard.SkillUp(curid, 1, conf.Skilleffect, conf.Skillvalue, true); len(m) > 0 {
szMap = append(szMap, m...)
} else {
szMap = append(szMap, &pb.MapData{
Data: this.chessboard.GetPalatData(),
})
}
for _, v := range szMap {
curScore += v.CurSocre
curPlayer.Score += v.CurSocre
v.CurSocre = curPlayer.Score
}
} else {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EntertainNoEnergy,
Title: pb.ErrorCode_EntertainNoEnergy.ToString(),
}
return
}
this.NexPower = this.curPower
if err := this.module.SendMsgSyncToSession(string(this.module.GetType()), "operatorrst", &pb.EntertainOperatorRstPush{
Mpadata: szMap,
Power: this.NexPower,
Curpower: this.curPower,
Score: curScore,
Round: this.round,
User1: this.player1,
User2: this.player2,
Itype: 1,
Curid: oid1,
Targetid: oid2,
}, this.szSession...); err != nil {
this.module.Errorln(err)
}
return
}

51
modules/entertainment/xxlPlat.go
View File

@ -284,6 +284,57 @@ func (this *MapData) Check5X() (bEliminate bool, xiaochu []int, s map[int]int) {
}
}
// 校验上下左右
for j := 0; j < Width; j++ {
for k := 0; k < Height; k++ {
pos := j*Width + k
if pos+2 < Height {
k1 := this.Plat[pos].Color
k2 := this.Plat[pos+1].Color
k3 := this.Plat[pos+2].Color
var k4 int32
var k5 int32
if k1 == k2 && k3 == k1 { // 三个颜色相等
tmp := pos
index := 0
for {
index++
if tmp/Width-2 >= 0 { // k1 的左右
k4 = this.Plat[tmp/Width-1].Color
k5 = this.Plat[tmp/Width-2].Color
if k1 == k4 && k1 == k5 {
bEliminate = true
s[tmp] = FiveType
this.Plat[pos].Cid = 0
this.Plat[pos+1].Cid = 0
this.Plat[pos+2].Cid = 0
this.Plat[tmp/Width-1].Cid = 0
this.Plat[tmp/Width-2].Cid = 0
}
}
if tmp/Width+2 < Width {
k4 = this.Plat[tmp/Width+1].Color
k5 = this.Plat[tmp/Width+2].Color
if k1 == k4 && k1 == k5 {
bEliminate = true
s[tmp] = FiveType
this.Plat[pos].Cid = 0
this.Plat[pos+1].Cid = 0
this.Plat[pos+2].Cid = 0
this.Plat[tmp/Width+1].Cid = 0
this.Plat[tmp/Width+2].Cid = 0
}
}
tmp = pos + 2
if index == 2 {
break
}
}
}
}
}
}
return
}

1
modules/equipment/module.go
View File

@ -457,6 +457,7 @@ func (this *Equipment) RecycleEquipments(session comm.IUserSession, equs []strin
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}

2
modules/gm/module.go
View File

@ -77,7 +77,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er
datas := strings.Split(keys[1], ",")
if len(datas) == 3 && (comm.TitleType == datas[0] || comm.PerType == datas[0] || datas[0] == comm.AttrType || datas[0] == comm.ItemType ||
datas[0] == comm.HeroType || datas[0] == comm.EquipmentType || datas[0] == comm.VipType ||
datas[0] == comm.AtlasType || datas[0] == comm.PandaType || datas[0] == comm.MountsType || datas[0] == comm.XxlType) {
datas[0] == comm.AtlasType || datas[0] == comm.PandaType || datas[0] == comm.MountsType || datas[0] == comm.XxlSkill || datas[0] == comm.XxlType) {
num, err := strconv.Atoi(datas[2])
if err != nil {
errdata = &pb.ErrorData{

5
modules/hero/api_drawCard.go
View File

@ -247,7 +247,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
tmp4 = this.module.ModuleTools.GetGlobalConf().RewardStar4
var tmp5 *cfg.Gameatn
tmp5 = this.module.ModuleTools.GetGlobalConf().RewardStar5
for _, heroId := range szCards {
for i, heroId := range szCards {
HeroConf, _ := this.module.configure.GetHeroConfig(heroId)
szStar = append(szStar, HeroConf.Star) // 获得许愿石
if HeroConf.Star == 4 {
@ -272,6 +272,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
}
}
heroId = heroRecord.LimitHero // 替换成心愿英雄
szCards[i] = heroId
}
}
}
@ -349,7 +350,7 @@ func (this *apiComp) wishDrawCard(session comm.IUserSession, heroRecord *pb.DBHe
update map[string]interface{}
rsp *pb.HeroDrawCardResp
)
rsp = &pb.HeroDrawCardResp{}
update = make(map[string]interface{})
if conf := this.module.configure.GetWishHeroReplaceConfig(); conf != nil {
if heroRecord.WishHero == "" { // 如果当前许愿英雄是空 则读取 默认许愿英雄

4
modules/hero/api_peachreward.go
View File

@ -52,8 +52,8 @@ func (this *apiComp) PeachReward(session comm.IUserSession, req *pb.HeroPeachRew
for k, v := range allreawd {
if _, ok := heroRecord.Peach[k]; !ok {
if v1, ok := heroRecord.Race[2]; ok {
if v1 > v.Num { //可以领取
if v1, ok := heroRecord.Race[comm.DrawCardType0]; ok {
if v1 >= v.Num { //可以领取
heroRecord.Peach[k] = true
bchange = true
reward = append(reward, v.Reward)

25
modules/modulebase.go
View File

@ -483,6 +483,7 @@ func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Gameat
per map[string]int32 // 捕羊大赛资源
title map[string]int32 // 称号资源
xxl map[string]int32 // 三消卡片资源
xxlSkill map[string]int32 // 三消技能
)
items = make(map[string]int32, 0)
heros = make(map[string]int32, 0)
@ -495,6 +496,7 @@ func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Gameat
per = make(map[string]int32, 0)
title = make(map[string]int32, 0)
xxl = make(map[string]int32, 0)
xxlSkill = make(map[string]int32, 0)
for _, v := range res {
switch v.A {
@ -524,6 +526,8 @@ func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Gameat
title[v.T] = 1
case comm.XxlType:
xxl[v.T] += v.N
case comm.XxlSkill:
xxlSkill[v.T] += v.N
default:
this.Error("not found res type", log.Field{Key: "Type", Value: v.A}) // 找不到资源类型
}
@ -580,6 +584,10 @@ func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Gameat
errdata = this.ModuleEntertain.AddXxlCard(session, xxl, bPush)
this.Debugf("发放三消卡片资源资源: %v errdata: %v", mts, errdata)
}
if len(xxlSkill) > 0 {
errdata = this.ModuleEntertain.AddXxlSkillCard(session, xxlSkill, bPush)
this.Debugf("发放三消技能资源资源: %v errdata: %v", mts, errdata)
}
return
}
@ -720,6 +728,7 @@ func (this *ModuleBase) DispenseAtno(session comm.IUserSession, res []*cfg.Gamea
per map[string]int32 // 捕羊大赛资源
title map[string]int32 // 称号资源
xxl map[string]int32 // 三消资源
xxlSkill map[string]int32 // 三消资源
equipschange []*pb.DB_Equipment
heroschange []*pb.UserAtno
itemschange []*pb.UserAtno
@ -735,6 +744,7 @@ func (this *ModuleBase) DispenseAtno(session comm.IUserSession, res []*cfg.Gamea
per = make(map[string]int32, 0)
title = make(map[string]int32, 0)
xxl = make(map[string]int32, 0)
xxlSkill = make(map[string]int32, 0)
for _, v := range res {
switch v.A {
@ -764,6 +774,8 @@ func (this *ModuleBase) DispenseAtno(session comm.IUserSession, res []*cfg.Gamea
title[v.T] = 1
case comm.XxlType:
xxl[v.T] += v.N
case comm.XxlSkill:
xxlSkill[v.T] += v.N
default:
this.Error("not found res type", log.Field{Key: "Type", Value: v.A}) // 找不到资源类型
}
@ -905,6 +917,19 @@ func (this *ModuleBase) DispenseAtno(session comm.IUserSession, res []*cfg.Gamea
}
this.Debugf("发放三消卡片资源资源: %v errdata: %v", xxl, errdata)
}
if len(xxlSkill) > 0 {
if errdata = this.ModuleEntertain.AddXxlSkillCard(session, xxlSkill, bPush); errdata != nil {
return
}
for k, v := range xxl {
atno = append(atno, &pb.UserAtno{
A: comm.TitleType,
T: k,
N: v,
})
}
this.Debugf("发放三消卡片资源资源: %v errdata: %v", xxl, errdata)
}
return
}

11
modules/pay/module.go
View File

@ -36,6 +36,7 @@ type Pay struct {
addrecharge comm.IAddrecharge //累充系统
pushgiftbag comm.IPushgiftbag //推送礼包
island comm.IIsland //海岛战令
xxlPass comm.IEntertainment //三消战令
configure *configureComp
}
@ -81,6 +82,10 @@ func (this *Pay) Start() (err error) {
return
}
this.island = module.(comm.IIsland)
if module, err = this.service.GetModule(comm.ModuleEntertainment); err != nil {
return
}
this.xxlPass = module.(comm.IEntertainment)
this.service.RegisterFunctionName(string(comm.Rpc_ModulePayDelivery), this.Rpc_ModulePayDelivery)
return
}
@ -205,6 +210,12 @@ func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.HttpPayDeli
return
}
break
case pb.DBPayType_XxlPass:
if errdata, items = this.xxlPass.Delivery(session, order.Pid); errdata != nil {
reply.Code = errdata.Code
return
}
break
}
this.addrecharge.RechargeIntegral(session, conf.Integral) //记录累充积分
for _, v := range res {

2
modules/uigame/api_getlattice.go
View File

@ -33,7 +33,7 @@ func (this *apiComp) GetLattice(session comm.IUserSession, req *pb.UiGameGetLatt
}
return
}
if activity.Stime > curTime || curTime > activity.Etime { // 不在活动范围内数据不给活动记录数据
if activity.Stime > curTime && curTime > activity.Etime { // 不在活动范围内数据不给活动记录数据
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ActivityNotIntime,
Title: pb.ErrorCode_ActivityNotIntime.ToString(),

2
modules/uigame/api_getminer.go
View File

@ -32,7 +32,7 @@ func (this *apiComp) GetMiner(session comm.IUserSession, req *pb.UiGameGetMinerR
}
return
}
if activity.Stime > curTime || curTime > activity.Etime { // 不在活动范围内数据不给活动记录数据
if activity.Stime > curTime && curTime > activity.Etime { // 不在活动范围内数据不给活动记录数据
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ActivityNotIntime,
Title: pb.ErrorCode_ActivityNotIntime.ToString(),

2
modules/uigame/api_getpuzzle.go
View File

@ -32,7 +32,7 @@ func (this *apiComp) GetPuzzle(session comm.IUserSession, req *pb.UiGameGetPuzzl
}
return
}
if activity.Stime > curTime || curTime > activity.Etime { // 不在活动范围内数据不给活动记录数据
if activity.Stime > curTime && curTime > activity.Etime { // 不在活动范围内数据不给活动记录数据
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ActivityNotIntime,
Title: pb.ErrorCode_ActivityNotIntime.ToString(),

303
pb/entertain_db.pb.go
View File

@ -183,6 +183,7 @@ type PlayerData struct {
Cardid string `protobuf:"bytes,4,opt,name=cardid,proto3" json:"cardid"` // 出战的英雄卡
Energy int32 `protobuf:"varint,5,opt,name=energy,proto3" json:"energy"` // 能量进度
Consumeexp int32 `protobuf:"varint,6,opt,name=consumeexp,proto3" json:"consumeexp"` // 消消乐积分
Skill map[int32]int32 `protobuf:"bytes,7,rep,name=skill,proto3" json:"skill" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 出战的技能卡 key consume_playerskill表中cid value 数量
}
func (x *PlayerData) Reset() {
@ -259,6 +260,52 @@ func (x *PlayerData) GetConsumeexp() int32 {
return 0
}
func (x *PlayerData) GetSkill() map[int32]int32 {
if x != nil {
return x.Skill
}
return nil
}
//战令
type XxlWarorder struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
}
func (x *XxlWarorder) Reset() {
*x = XxlWarorder{}
if protoimpl.UnsafeEnabled {
mi := &file_entertain_entertain_db_proto_msgTypes[3]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *XxlWarorder) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*XxlWarorder) ProtoMessage() {}
func (x *XxlWarorder) ProtoReflect() protoreflect.Message {
mi := &file_entertain_entertain_db_proto_msgTypes[3]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use XxlWarorder.ProtoReflect.Descriptor instead.
func (*XxlWarorder) Descriptor() ([]byte, []int) {
return file_entertain_entertain_db_proto_rawDescGZIP(), []int{3}
}
// 消消乐匹配数据
type DBXXLMatch struct {
state protoimpl.MessageState
@ -268,12 +315,13 @@ type DBXXLMatch struct {
Userinfo *BaseUserInfo `protobuf:"bytes,1,opt,name=userinfo,proto3" json:"userinfo"`
Cardid string `protobuf:"bytes,2,opt,name=cardid,proto3" json:"cardid"` // 选择的卡片ID
Consumeexp int32 `protobuf:"varint,3,opt,name=consumeexp,proto3" json:"consumeexp"` // 消消乐积分
Skill map[int32]int32 `protobuf:"bytes,4,rep,name=skill,proto3" json:"skill" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //
}
func (x *DBXXLMatch) Reset() {
*x = DBXXLMatch{}
if protoimpl.UnsafeEnabled {
mi := &file_entertain_entertain_db_proto_msgTypes[3]
mi := &file_entertain_entertain_db_proto_msgTypes[4]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -286,7 +334,7 @@ func (x *DBXXLMatch) String() string {
func (*DBXXLMatch) ProtoMessage() {}
func (x *DBXXLMatch) ProtoReflect() protoreflect.Message {
mi := &file_entertain_entertain_db_proto_msgTypes[3]
mi := &file_entertain_entertain_db_proto_msgTypes[4]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -299,7 +347,7 @@ func (x *DBXXLMatch) ProtoReflect() protoreflect.Message {
// Deprecated: Use DBXXLMatch.ProtoReflect.Descriptor instead.
func (*DBXXLMatch) Descriptor() ([]byte, []int) {
return file_entertain_entertain_db_proto_rawDescGZIP(), []int{3}
return file_entertain_entertain_db_proto_rawDescGZIP(), []int{4}
}
func (x *DBXXLMatch) GetUserinfo() *BaseUserInfo {
@ -323,6 +371,13 @@ func (x *DBXXLMatch) GetConsumeexp() int32 {
return 0
}
func (x *DBXXLMatch) GetSkill() map[int32]int32 {
if x != nil {
return x.Skill
}
return nil
}
type BoxData struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -335,7 +390,7 @@ type BoxData struct {
func (x *BoxData) Reset() {
*x = BoxData{}
if protoimpl.UnsafeEnabled {
mi := &file_entertain_entertain_db_proto_msgTypes[4]
mi := &file_entertain_entertain_db_proto_msgTypes[5]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -348,7 +403,7 @@ func (x *BoxData) String() string {
func (*BoxData) ProtoMessage() {}
func (x *BoxData) ProtoReflect() protoreflect.Message {
mi := &file_entertain_entertain_db_proto_msgTypes[4]
mi := &file_entertain_entertain_db_proto_msgTypes[5]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -361,7 +416,7 @@ func (x *BoxData) ProtoReflect() protoreflect.Message {
// Deprecated: Use BoxData.ProtoReflect.Descriptor instead.
func (*BoxData) Descriptor() ([]byte, []int) {
return file_entertain_entertain_db_proto_rawDescGZIP(), []int{4}
return file_entertain_entertain_db_proto_rawDescGZIP(), []int{5}
}
func (x *BoxData) GetBoxid() int32 {
@ -394,12 +449,18 @@ type DBXXLData struct {
Roomid string `protobuf:"bytes,8,opt,name=roomid,proto3" json:"roomid"` // 房间id 重连用
ServicePath string `protobuf:"bytes,9,opt,name=servicePath,proto3" json:"servicePath"` // 目标服务节点 重连RPC用
Etime int64 `protobuf:"varint,10,opt,name=etime,proto3" json:"etime"` // 赛季结束时间
Touxiang int32 `protobuf:"varint,11,opt,name=touxiang,proto3" json:"touxiang"` // 今天投降的次数
Skill map[int32]int32 `protobuf:"bytes,12,rep,name=skill,proto3" json:"skill" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 技能id value 数量(可为0)
Liansheng int32 `protobuf:"varint,13,opt,name=liansheng,proto3" json:"liansheng"` // 连胜
Freeprogress int32 `protobuf:"varint,14,opt,name=freeprogress,proto3" json:"freeprogress"` //已领取进度
Payprogress int32 `protobuf:"varint,15,opt,name=payprogress,proto3" json:"payprogress"`
Vip bool `protobuf:"varint,16,opt,name=vip,proto3" json:"vip"` // 是否购买
}
func (x *DBXXLData) Reset() {
*x = DBXXLData{}
if protoimpl.UnsafeEnabled {
mi := &file_entertain_entertain_db_proto_msgTypes[5]
mi := &file_entertain_entertain_db_proto_msgTypes[6]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -412,7 +473,7 @@ func (x *DBXXLData) String() string {
func (*DBXXLData) ProtoMessage() {}
func (x *DBXXLData) ProtoReflect() protoreflect.Message {
mi := &file_entertain_entertain_db_proto_msgTypes[5]
mi := &file_entertain_entertain_db_proto_msgTypes[6]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -425,7 +486,7 @@ func (x *DBXXLData) ProtoReflect() protoreflect.Message {
// Deprecated: Use DBXXLData.ProtoReflect.Descriptor instead.
func (*DBXXLData) Descriptor() ([]byte, []int) {
return file_entertain_entertain_db_proto_rawDescGZIP(), []int{5}
return file_entertain_entertain_db_proto_rawDescGZIP(), []int{6}
}
func (x *DBXXLData) GetId() string {
@ -498,6 +559,48 @@ func (x *DBXXLData) GetEtime() int64 {
return 0
}
func (x *DBXXLData) GetTouxiang() int32 {
if x != nil {
return x.Touxiang
}
return 0
}
func (x *DBXXLData) GetSkill() map[int32]int32 {
if x != nil {
return x.Skill
}
return nil
}
func (x *DBXXLData) GetLiansheng() int32 {
if x != nil {
return x.Liansheng
}
return 0
}
func (x *DBXXLData) GetFreeprogress() int32 {
if x != nil {
return x.Freeprogress
}
return 0
}
func (x *DBXXLData) GetPayprogress() int32 {
if x != nil {
return x.Payprogress
}
return 0
}
func (x *DBXXLData) GetVip() bool {
if x != nil {
return x.Vip
}
return false
}
// 三消游戏规则
type DBXxlRules struct {
state protoimpl.MessageState
@ -507,12 +610,14 @@ type DBXxlRules struct {
RoomType int32 `protobuf:"varint,1,opt,name=RoomType,proto3" json:"RoomType"` // 房间类型
Card1 string `protobuf:"bytes,2,opt,name=card1,proto3" json:"card1"` // player1 卡
Card2 string `protobuf:"bytes,3,opt,name=card2,proto3" json:"card2"` // player2 卡
Skill1 map[int32]int32 `protobuf:"bytes,4,rep,name=skill1,proto3" json:"skill1" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 玩家1携带的技能
Skill2 map[int32]int32 `protobuf:"bytes,5,rep,name=skill2,proto3" json:"skill2" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 玩家2携带的技能
}
func (x *DBXxlRules) Reset() {
*x = DBXxlRules{}
if protoimpl.UnsafeEnabled {
mi := &file_entertain_entertain_db_proto_msgTypes[6]
mi := &file_entertain_entertain_db_proto_msgTypes[7]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -525,7 +630,7 @@ func (x *DBXxlRules) String() string {
func (*DBXxlRules) ProtoMessage() {}
func (x *DBXxlRules) ProtoReflect() protoreflect.Message {
mi := &file_entertain_entertain_db_proto_msgTypes[6]
mi := &file_entertain_entertain_db_proto_msgTypes[7]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -538,7 +643,7 @@ func (x *DBXxlRules) ProtoReflect() protoreflect.Message {
// Deprecated: Use DBXxlRules.ProtoReflect.Descriptor instead.
func (*DBXxlRules) Descriptor() ([]byte, []int) {
return file_entertain_entertain_db_proto_rawDescGZIP(), []int{6}
return file_entertain_entertain_db_proto_rawDescGZIP(), []int{7}
}
func (x *DBXxlRules) GetRoomType() int32 {
@ -562,6 +667,20 @@ func (x *DBXxlRules) GetCard2() string {
return ""
}
func (x *DBXxlRules) GetSkill1() map[int32]int32 {
if x != nil {
return x.Skill1
}
return nil
}
func (x *DBXxlRules) GetSkill2() map[int32]int32 {
if x != nil {
return x.Skill2
}
return nil
}
var File_entertain_entertain_db_proto protoreflect.FileDescriptor
var file_entertain_entertain_db_proto_rawDesc = []byte{
@ -583,7 +702,7 @@ var file_entertain_entertain_db_proto_rawDesc = []byte{
0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65,
0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x18, 0x0a,
0x07, 0x73, 0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
0x73, 0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x22, 0xad, 0x01, 0x0a, 0x0a, 0x50, 0x6c, 0x61, 0x79,
0x73, 0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x22, 0x95, 0x02, 0x0a, 0x0a, 0x50, 0x6c, 0x61, 0x79,
0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x12, 0x29, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x69, 0x6e,
0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55,
0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x69, 0x6e, 0x66,
@ -594,18 +713,32 @@ var file_entertain_entertain_db_proto_rawDesc = []byte{
0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52,
0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75,
0x6d, 0x65, 0x65, 0x78, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x6f, 0x6e,
0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, 0x22, 0x6f, 0x0a, 0x0a, 0x44, 0x42, 0x58, 0x58, 0x4c,
0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x29, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x69, 0x6e, 0x66,
0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73,
0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x69, 0x6e, 0x66, 0x6f,
0x12, 0x16, 0x0a, 0x06, 0x63, 0x61, 0x72, 0x64, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
0x52, 0x06, 0x63, 0x61, 0x72, 0x64, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73,
0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x6f,
0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, 0x22, 0x3b, 0x0a, 0x07, 0x42, 0x6f, 0x78, 0x44,
0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, 0x12, 0x2c, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c,
0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44,
0x61, 0x74, 0x61, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05,
0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e,
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
0x0d, 0x0a, 0x0b, 0x58, 0x78, 0x6c, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0xd7,
0x01, 0x0a, 0x0a, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x29, 0x0a,
0x08, 0x75, 0x73, 0x65, 0x72, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08,
0x75, 0x73, 0x65, 0x72, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x61, 0x72, 0x64,
0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x63, 0x61, 0x72, 0x64, 0x69, 0x64,
0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, 0x18, 0x03,
0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70,
0x12, 0x2c, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x16, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x53, 0x6b, 0x69,
0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x1a, 0x38,
0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76,
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3b, 0x0a, 0x07, 0x42, 0x6f, 0x78, 0x44,
0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
0x28, 0x05, 0x52, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65,
0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, 0x65,
0x6e, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x99, 0x03, 0x0a, 0x09, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44,
0x6e, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x92, 0x05, 0x0a, 0x09, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44,
0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18,
@ -623,21 +756,50 @@ var file_entertain_entertain_db_proto_rawDesc = []byte{
0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
0x50, 0x61, 0x74, 0x68, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76,
0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65,
0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 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, 0x05, 0x52, 0x05, 0x76,
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, 0x43, 0x61, 0x72, 0x64,
0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
0x01, 0x22, 0x54, 0x0a, 0x0a, 0x44, 0x42, 0x58, 0x78, 0x6c, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12,
0x1a, 0x0a, 0x08, 0x52, 0x6f, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
0x05, 0x52, 0x08, 0x52, 0x6f, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63,
0x61, 0x72, 0x64, 0x31, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x61, 0x72, 0x64,
0x31, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x61, 0x72, 0x64, 0x32, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
0x52, 0x05, 0x63, 0x61, 0x72, 0x64, 0x32, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a,
0x08, 0x74, 0x6f, 0x75, 0x78, 0x69, 0x61, 0x6e, 0x67, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52,
0x08, 0x74, 0x6f, 0x75, 0x78, 0x69, 0x61, 0x6e, 0x67, 0x12, 0x2b, 0x0a, 0x05, 0x73, 0x6b, 0x69,
0x6c, 0x6c, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c,
0x44, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x6c, 0x69, 0x61, 0x6e, 0x73, 0x68,
0x65, 0x6e, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6c, 0x69, 0x61, 0x6e, 0x73,
0x68, 0x65, 0x6e, 0x67, 0x12, 0x22, 0x0a, 0x0c, 0x66, 0x72, 0x65, 0x65, 0x70, 0x72, 0x6f, 0x67,
0x72, 0x65, 0x73, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x66, 0x72, 0x65, 0x65,
0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x61, 0x79, 0x70,
0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x70,
0x61, 0x79, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x69,
0x70, 0x18, 0x10, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x76, 0x69, 0x70, 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, 0x05, 0x52, 0x05, 0x76, 0x61,
0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, 0x43, 0x61, 0x72, 0x64, 0x45,
0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79,
0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xac, 0x02, 0x0a, 0x0a, 0x44,
0x42, 0x58, 0x78, 0x6c, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x6f, 0x6f,
0x6d, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x52, 0x6f, 0x6f,
0x6d, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x61, 0x72, 0x64, 0x31, 0x18, 0x02,
0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x61, 0x72, 0x64, 0x31, 0x12, 0x14, 0x0a, 0x05, 0x63,
0x61, 0x72, 0x64, 0x32, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x61, 0x72, 0x64,
0x32, 0x12, 0x2f, 0x0a, 0x06, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x31, 0x18, 0x04, 0x20, 0x03, 0x28,
0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x58, 0x78, 0x6c, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x2e, 0x53,
0x6b, 0x69, 0x6c, 0x6c, 0x31, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x73, 0x6b, 0x69, 0x6c,
0x6c, 0x31, 0x12, 0x2f, 0x0a, 0x06, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x32, 0x18, 0x05, 0x20, 0x03,
0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x58, 0x78, 0x6c, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x2e,
0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x32, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x73, 0x6b, 0x69,
0x6c, 0x6c, 0x32, 0x1a, 0x39, 0x0a, 0x0b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x31, 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, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x32, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -652,31 +814,42 @@ func file_entertain_entertain_db_proto_rawDescGZIP() []byte {
return file_entertain_entertain_db_proto_rawDescData
}
var file_entertain_entertain_db_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
var file_entertain_entertain_db_proto_msgTypes = make([]protoimpl.MessageInfo, 15)
var file_entertain_entertain_db_proto_goTypes = []interface{}{
(*MapData)(nil), // 0: MapData
(*GirdeData)(nil), // 1: GirdeData
(*PlayerData)(nil), // 2: PlayerData
(*DBXXLMatch)(nil), // 3: DBXXLMatch
(*BoxData)(nil), // 4: BoxData
(*DBXXLData)(nil), // 5: DBXXLData
(*DBXxlRules)(nil), // 6: DBXxlRules
nil, // 7: DBXXLData.RewardEntry
nil, // 8: DBXXLData.CardEntry
(*BaseUserInfo)(nil), // 9: BaseUserInfo
(*XxlWarorder)(nil), // 3: XxlWarorder
(*DBXXLMatch)(nil), // 4: DBXXLMatch
(*BoxData)(nil), // 5: BoxData
(*DBXXLData)(nil), // 6: DBXXLData
(*DBXxlRules)(nil), // 7: DBXxlRules
nil, // 8: PlayerData.SkillEntry
nil, // 9: DBXXLMatch.SkillEntry
nil, // 10: DBXXLData.RewardEntry
nil, // 11: DBXXLData.CardEntry
nil, // 12: DBXXLData.SkillEntry
nil, // 13: DBXxlRules.Skill1Entry
nil, // 14: DBXxlRules.Skill2Entry
(*BaseUserInfo)(nil), // 15: BaseUserInfo
}
var file_entertain_entertain_db_proto_depIdxs = []int32{
1, // 0: MapData.data:type_name -> GirdeData
9, // 1: PlayerData.userinfo:type_name -> BaseUserInfo
9, // 2: DBXXLMatch.userinfo:type_name -> BaseUserInfo
7, // 3: DBXXLData.reward:type_name -> DBXXLData.RewardEntry
8, // 4: DBXXLData.card:type_name -> DBXXLData.CardEntry
4, // 5: DBXXLData.box:type_name -> BoxData
6, // [6:6] is the sub-list for method output_type
6, // [6:6] is the sub-list for method input_type
6, // [6:6] is the sub-list for extension type_name
6, // [6:6] is the sub-list for extension extendee
0, // [0:6] is the sub-list for field type_name
15, // 1: PlayerData.userinfo:type_name -> BaseUserInfo
8, // 2: PlayerData.skill:type_name -> PlayerData.SkillEntry
15, // 3: DBXXLMatch.userinfo:type_name -> BaseUserInfo
9, // 4: DBXXLMatch.skill:type_name -> DBXXLMatch.SkillEntry
10, // 5: DBXXLData.reward:type_name -> DBXXLData.RewardEntry
11, // 6: DBXXLData.card:type_name -> DBXXLData.CardEntry
5, // 7: DBXXLData.box:type_name -> BoxData
12, // 8: DBXXLData.skill:type_name -> DBXXLData.SkillEntry
13, // 9: DBXxlRules.skill1:type_name -> DBXxlRules.Skill1Entry
14, // 10: DBXxlRules.skill2:type_name -> DBXxlRules.Skill2Entry
11, // [11:11] is the sub-list for method output_type
11, // [11:11] is the sub-list for method input_type
11, // [11:11] is the sub-list for extension type_name
11, // [11:11] is the sub-list for extension extendee
0, // [0:11] is the sub-list for field type_name
}
func init() { file_entertain_entertain_db_proto_init() }
@ -723,7 +896,7 @@ func file_entertain_entertain_db_proto_init() {
}
}
file_entertain_entertain_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBXXLMatch); i {
switch v := v.(*XxlWarorder); i {
case 0:
return &v.state
case 1:
@ -735,7 +908,7 @@ func file_entertain_entertain_db_proto_init() {
}
}
file_entertain_entertain_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*BoxData); i {
switch v := v.(*DBXXLMatch); i {
case 0:
return &v.state
case 1:
@ -747,7 +920,7 @@ func file_entertain_entertain_db_proto_init() {
}
}
file_entertain_entertain_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBXXLData); i {
switch v := v.(*BoxData); i {
case 0:
return &v.state
case 1:
@ -759,6 +932,18 @@ func file_entertain_entertain_db_proto_init() {
}
}
file_entertain_entertain_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBXXLData); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_entertain_entertain_db_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBXxlRules); i {
case 0:
return &v.state
@ -777,7 +962,7 @@ func file_entertain_entertain_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_entertain_entertain_db_proto_rawDesc,
NumEnums: 0,
NumMessages: 9,
NumMessages: 15,
NumExtensions: 0,
NumServices: 0,
},

754
pb/entertain_msg.pb.go
View File

@ -27,6 +27,7 @@ type EntertainMatchReq struct {
unknownFields protoimpl.UnknownFields
Idcard string `protobuf:"bytes,1,opt,name=idcard,proto3" json:"idcard"` //出战的英雄卡
Skillcard []int32 `protobuf:"varint,2,rep,packed,name=skillcard,proto3" json:"skillcard"`
}
func (x *EntertainMatchReq) Reset() {
@ -68,6 +69,13 @@ func (x *EntertainMatchReq) GetIdcard() string {
return ""
}
func (x *EntertainMatchReq) GetSkillcard() []int32 {
if x != nil {
return x.Skillcard
}
return nil
}
// 匹配结果
type EntertainMatchResp struct {
state protoimpl.MessageState
@ -401,7 +409,7 @@ type EntertainOperatorReq struct {
unknownFields protoimpl.UnknownFields
Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"` // 房间id
Itype int32 `protobuf:"varint,2,opt,name=itype,proto3" json:"itype"` // 操作类型 0 默认交换元素 1 技能
Itype int32 `protobuf:"varint,2,opt,name=itype,proto3" json:"itype"` // 操作类型 0 默认交换元素 999 技能
Curid int32 `protobuf:"varint,3,opt,name=curid,proto3" json:"curid"` // 当前key
Targetid int32 `protobuf:"varint,4,opt,name=targetid,proto3" json:"targetid"` // 目标key
}
@ -1306,6 +1314,7 @@ type EntertainChangePush struct {
unknownFields protoimpl.UnknownFields
Card map[string]int32 `protobuf:"bytes,1,rep,name=card,proto3" json:"card" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 卡id value 数量(可为0)
Skill map[int32]int32 `protobuf:"bytes,2,rep,name=skill,proto3" json:"skill" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //
}
func (x *EntertainChangePush) Reset() {
@ -1347,6 +1356,13 @@ func (x *EntertainChangePush) GetCard() map[string]int32 {
return nil
}
func (x *EntertainChangePush) GetSkill() map[int32]int32 {
if x != nil {
return x.Skill
}
return nil
}
// 创建一个房间
type EntertainCreateRoomReq struct {
state protoimpl.MessageState
@ -2140,6 +2156,204 @@ func (x *EntertainStarTimerPush) GetPower() string {
return ""
}
// 申请投降 surrender
type EntertainSurrenderReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"` //房间号
}
func (x *EntertainSurrenderReq) Reset() {
*x = EntertainSurrenderReq{}
if protoimpl.UnsafeEnabled {
mi := &file_entertain_entertain_msg_proto_msgTypes[38]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *EntertainSurrenderReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*EntertainSurrenderReq) ProtoMessage() {}
func (x *EntertainSurrenderReq) ProtoReflect() protoreflect.Message {
mi := &file_entertain_entertain_msg_proto_msgTypes[38]
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 EntertainSurrenderReq.ProtoReflect.Descriptor instead.
func (*EntertainSurrenderReq) Descriptor() ([]byte, []int) {
return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{38}
}
func (x *EntertainSurrenderReq) GetRoomid() string {
if x != nil {
return x.Roomid
}
return ""
}
type EntertainSurrenderResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Leftcount int32 `protobuf:"varint,1,opt,name=leftcount,proto3" json:"leftcount"` // 投降剩余次数
}
func (x *EntertainSurrenderResp) Reset() {
*x = EntertainSurrenderResp{}
if protoimpl.UnsafeEnabled {
mi := &file_entertain_entertain_msg_proto_msgTypes[39]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *EntertainSurrenderResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*EntertainSurrenderResp) ProtoMessage() {}
func (x *EntertainSurrenderResp) ProtoReflect() protoreflect.Message {
mi := &file_entertain_entertain_msg_proto_msgTypes[39]
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 EntertainSurrenderResp.ProtoReflect.Descriptor instead.
func (*EntertainSurrenderResp) Descriptor() ([]byte, []int) {
return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{39}
}
func (x *EntertainSurrenderResp) GetLeftcount() int32 {
if x != nil {
return x.Leftcount
}
return 0
}
// 战令奖励领取
type EntertainReceiveReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Rtype int32 `protobuf:"varint,1,opt,name=Rtype,proto3" json:"Rtype"`
}
func (x *EntertainReceiveReq) Reset() {
*x = EntertainReceiveReq{}
if protoimpl.UnsafeEnabled {
mi := &file_entertain_entertain_msg_proto_msgTypes[40]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *EntertainReceiveReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*EntertainReceiveReq) ProtoMessage() {}
func (x *EntertainReceiveReq) ProtoReflect() protoreflect.Message {
mi := &file_entertain_entertain_msg_proto_msgTypes[40]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use EntertainReceiveReq.ProtoReflect.Descriptor instead.
func (*EntertainReceiveReq) Descriptor() ([]byte, []int) {
return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{40}
}
func (x *EntertainReceiveReq) GetRtype() int32 {
if x != nil {
return x.Rtype
}
return 0
}
type EntertainReceiveResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Info *DBXXLData `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
Award []*UserAtno `protobuf:"bytes,4,rep,name=award,proto3" json:"award"` //奖励
}
func (x *EntertainReceiveResp) Reset() {
*x = EntertainReceiveResp{}
if protoimpl.UnsafeEnabled {
mi := &file_entertain_entertain_msg_proto_msgTypes[41]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *EntertainReceiveResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*EntertainReceiveResp) ProtoMessage() {}
func (x *EntertainReceiveResp) ProtoReflect() protoreflect.Message {
mi := &file_entertain_entertain_msg_proto_msgTypes[41]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use EntertainReceiveResp.ProtoReflect.Descriptor instead.
func (*EntertainReceiveResp) Descriptor() ([]byte, []int) {
return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{41}
}
func (x *EntertainReceiveResp) GetInfo() *DBXXLData {
if x != nil {
return x.Info
}
return nil
}
func (x *EntertainReceiveResp) GetAward() []*UserAtno {
if x != nil {
return x.Award
}
return nil
}
var File_entertain_entertain_msg_proto protoreflect.FileDescriptor
var file_entertain_entertain_msg_proto_rawDesc = []byte{
@ -2147,205 +2361,229 @@ var file_entertain_entertain_msg_proto_rawDesc = []byte{
0x72, 0x74, 0x61, 0x69, 0x6e, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
0x1c, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x2f, 0x65, 0x6e, 0x74, 0x65, 0x72,
0x74, 0x61, 0x69, 0x6e, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63,
0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x2b, 0x0a, 0x11, 0x45, 0x6e, 0x74,
0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x49, 0x0a, 0x11, 0x45, 0x6e, 0x74,
0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x16,
0x0a, 0x06, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x22, 0x2a, 0x0a, 0x12, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74,
0x61, 0x69, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05,
0x6d, 0x61, 0x79, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6d, 0x61, 0x79,
0x63, 0x68, 0x22, 0x19, 0x0a, 0x17, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43,
0x61, 0x6e, 0x63, 0x65, 0x6c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x71, 0x22, 0x30, 0x0a,
0x18, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c,
0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61, 0x79,
0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6d, 0x61, 0x79, 0x63, 0x68, 0x22,
0x2b, 0x0a, 0x11, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x61, 0x64,
0x79, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01,
0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x2a, 0x0a, 0x12,
0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52, 0x65,
0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, 0x61, 0x64, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
0x08, 0x52, 0x05, 0x72, 0x65, 0x61, 0x64, 0x79, 0x22, 0xe2, 0x01, 0x0a, 0x16, 0x45, 0x6e, 0x74,
0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x53, 0x74, 0x61, 0x72, 0x74, 0x47, 0x61, 0x6d, 0x65, 0x50,
0x75, 0x73, 0x68, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x18, 0x01, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52,
0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x18,
0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61,
0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x12, 0x22, 0x0a, 0x07, 0x6d, 0x70, 0x61,
0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61, 0x70,
0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a,
0x05, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x6f,
0x77, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01,
0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f,
0x6d, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69,
0x64, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x74, 0x79, 0x70, 0x65, 0x18, 0x07, 0x20,
0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x74, 0x79, 0x70, 0x65, 0x22, 0x76, 0x0a,
0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74,
0x6f, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18,
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x14, 0x0a,
0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x74,
0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x75, 0x72, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01,
0x28, 0x05, 0x52, 0x05, 0x63, 0x75, 0x72, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72,
0x67, 0x65, 0x74, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x72,
0x67, 0x65, 0x74, 0x69, 0x64, 0x22, 0x31, 0x0a, 0x15, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61,
0x69, 0x6e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18,
0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52,
0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x22, 0xaa, 0x02, 0x0a, 0x18, 0x45, 0x6e, 0x74,
0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x73,
0x74, 0x50, 0x75, 0x73, 0x68, 0x12, 0x22, 0x0a, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61,
0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61, 0x70, 0x44, 0x61, 0x74, 0x61,
0x52, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x6f, 0x77,
0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x12,
0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28,
0x09, 0x52, 0x08, 0x63, 0x75, 0x72, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x73,
0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72,
0x65, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05,
0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31,
0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44,
0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73,
0x65, 0x72, 0x32, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79,
0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x12, 0x14, 0x0a,
0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x74,
0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x75, 0x72, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01,
0x28, 0x05, 0x52, 0x05, 0x63, 0x75, 0x72, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72,
0x67, 0x65, 0x74, 0x69, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x72,
0x67, 0x65, 0x74, 0x69, 0x64, 0x22, 0xfe, 0x01, 0x0a, 0x15, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74,
0x61, 0x69, 0x6e, 0x47, 0x61, 0x6d, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x50, 0x75, 0x73, 0x68, 0x12,
0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b,
0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65,
0x72, 0x31, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28,
0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05,
0x75, 0x73, 0x65, 0x72, 0x32, 0x12, 0x22, 0x0a, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61,
0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61, 0x70, 0x44, 0x61, 0x74, 0x61,
0x52, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x6f, 0x77,
0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x12,
0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x63,
0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c,
0x63, 0x61, 0x72, 0x64, 0x22, 0x2a, 0x0a, 0x12, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69,
0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61,
0x79, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6d, 0x61, 0x79, 0x63, 0x68,
0x22, 0x19, 0x0a, 0x17, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x61, 0x6e,
0x63, 0x65, 0x6c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x71, 0x22, 0x30, 0x0a, 0x18, 0x45,
0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x4d, 0x61,
0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61, 0x79, 0x63, 0x68,
0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6d, 0x61, 0x79, 0x63, 0x68, 0x22, 0x2b, 0x0a,
0x11, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52,
0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x2a, 0x0a, 0x12, 0x45, 0x6e,
0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52, 0x65, 0x73, 0x70,
0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, 0x61, 0x64, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52,
0x05, 0x72, 0x65, 0x61, 0x64, 0x79, 0x22, 0xe2, 0x01, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72,
0x74, 0x61, 0x69, 0x6e, 0x53, 0x74, 0x61, 0x72, 0x74, 0x47, 0x61, 0x6d, 0x65, 0x50, 0x75, 0x73,
0x68, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75,
0x73, 0x65, 0x72, 0x31, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x18, 0x02, 0x20,
0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61,
0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x12, 0x22, 0x0a, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61,
0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61, 0x70, 0x44, 0x61,
0x74, 0x61, 0x52, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x70,
0x6f, 0x77, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x6f, 0x77, 0x65,
0x72, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05,
0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69,
0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12,
0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x74, 0x79, 0x70, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28,
0x05, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x74, 0x79, 0x70, 0x65, 0x22, 0x76, 0x0a, 0x14, 0x45,
0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72,
0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20,
0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69,
0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70,
0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x75, 0x72, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
0x52, 0x05, 0x63, 0x75, 0x72, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65,
0x74, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65,
0x74, 0x69, 0x64, 0x22, 0x31, 0x0a, 0x15, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e,
0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07,
0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x73,
0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x22, 0xaa, 0x02, 0x0a, 0x18, 0x45, 0x6e, 0x74, 0x65, 0x72,
0x74, 0x61, 0x69, 0x6e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x73, 0x74, 0x50,
0x75, 0x73, 0x68, 0x12, 0x22, 0x0a, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07,
0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72,
0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x12, 0x1a, 0x0a,
0x08, 0x63, 0x75, 0x72, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
0x08, 0x63, 0x75, 0x72, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f,
0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12,
0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x77, 0x69, 0x6e, 0x18, 0x06, 0x20, 0x01,
0x28, 0x09, 0x52, 0x03, 0x77, 0x69, 0x6e, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72,
0x64, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74,
0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1a, 0x0a, 0x03, 0x62, 0x6f,
0x78, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x42, 0x6f, 0x78, 0x44, 0x61, 0x74,
0x61, 0x52, 0x03, 0x62, 0x6f, 0x78, 0x22, 0xa8, 0x01, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72,
0x74, 0x61, 0x69, 0x6e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x52, 0x6f, 0x6f, 0x6d, 0x50, 0x75, 0x73,
0x68, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x52, 0x05, 0x72, 0x6f, 0x6f, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x65, 0x72, 0x76, 0x65,
0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x65, 0x72, 0x76,
0x65, 0x70, 0x61, 0x74, 0x68, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x18, 0x03,
0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x18, 0x06,
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74,
0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72,
0x32, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72,
0x32, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72,
0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x12, 0x14, 0x0a, 0x05, 0x69,
0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70,
0x65, 0x22, 0x2f, 0x0a, 0x15, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65,
0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f,
0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d,
0x69, 0x64, 0x22, 0xf8, 0x01, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e,
0x52, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a,
0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72,
0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x22, 0x0a, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61,
0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61, 0x70, 0x44, 0x61, 0x74, 0x61,
0x52, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x6f, 0x77,
0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x12,
0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28,
0x09, 0x52, 0x08, 0x63, 0x75, 0x72, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x73,
0x63, 0x6f, 0x72, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72,
0x65, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05,
0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31,
0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44,
0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73,
0x65, 0x72, 0x32, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79,
0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x22, 0x31, 0x0a,
0x17, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73,
0x68, 0x50, 0x6c, 0x61, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d,
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64,
0x22, 0x3e, 0x0a, 0x18, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x66,
0x72, 0x65, 0x73, 0x68, 0x50, 0x6c, 0x61, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x07,
0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e,
0x4d, 0x61, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61,
0x22, 0x3a, 0x0a, 0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x66,
0x72, 0x65, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x22, 0x0a, 0x07, 0x6d, 0x70, 0x61, 0x64,
0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61, 0x70, 0x44,
0x61, 0x74, 0x61, 0x52, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x22, 0x15, 0x0a, 0x13,
0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74,
0x52, 0x65, 0x71, 0x22, 0x36, 0x0a, 0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e,
0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64,
0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x58, 0x58,
0x4c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x26, 0x0a, 0x12, 0x45,
0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65,
0x71, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
0x6b, 0x65, 0x79, 0x22, 0x58, 0x0a, 0x13, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e,
0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61,
0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c,
0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 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, 0x22, 0x82, 0x01,
0x0a, 0x13, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x67,
0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x32, 0x0a, 0x04, 0x63, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20,
0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43,
0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x43, 0x61, 0x72, 0x64, 0x45, 0x6e,
0x74, 0x72, 0x79, 0x52, 0x04, 0x63, 0x61, 0x72, 0x64, 0x1a, 0x37, 0x0a, 0x09, 0x43, 0x61, 0x72,
0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
0x38, 0x01, 0x22, 0x30, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43,
0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06,
0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x64,
0x63, 0x61, 0x72, 0x64, 0x22, 0x4f, 0x0a, 0x17, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69,
0x6e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12,
0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x65, 0x72, 0x76, 0x65,
0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x65, 0x72, 0x76,
0x65, 0x70, 0x61, 0x74, 0x68, 0x22, 0x46, 0x0a, 0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61,
0x69, 0x6e, 0x4a, 0x6f, 0x69, 0x6e, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a,
0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72,
0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x18,
0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x22, 0x2d, 0x0a,
0x15, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4a, 0x6f, 0x69, 0x6e, 0x52, 0x6f,
0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x4a, 0x6f, 0x69, 0x6e, 0x18,
0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x62, 0x4a, 0x6f, 0x69, 0x6e, 0x22, 0x7b, 0x0a, 0x1b,
0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4a, 0x6f, 0x69, 0x6e, 0x43, 0x72, 0x65,
0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72,
0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f,
0x6d, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x18, 0x02, 0x20, 0x01,
0x74, 0x79, 0x70, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70,
0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x75, 0x72, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05,
0x52, 0x05, 0x63, 0x75, 0x72, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65,
0x74, 0x69, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65,
0x74, 0x69, 0x64, 0x22, 0xfe, 0x01, 0x0a, 0x15, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69,
0x6e, 0x47, 0x61, 0x6d, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x50, 0x75, 0x73, 0x68, 0x12, 0x21, 0x0a,
0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50,
0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31,
0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73,
0x65, 0x72, 0x32, 0x12, 0x22, 0x0a, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03,
0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07,
0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72,
0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x12, 0x14, 0x0a,
0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f,
0x75, 0x6e, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x77, 0x69, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09,
0x52, 0x03, 0x77, 0x69, 0x6e, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18,
0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f,
0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1a, 0x0a, 0x03, 0x62, 0x6f, 0x78, 0x18,
0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x42, 0x6f, 0x78, 0x44, 0x61, 0x74, 0x61, 0x52,
0x03, 0x62, 0x6f, 0x78, 0x22, 0xa8, 0x01, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61,
0x69, 0x6e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x52, 0x6f, 0x6f, 0x6d, 0x50, 0x75, 0x73, 0x68, 0x12,
0x14, 0x0a, 0x05, 0x72, 0x6f, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
0x72, 0x6f, 0x6f, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x65, 0x72, 0x76, 0x65, 0x70, 0x61,
0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x65, 0x72, 0x76, 0x65, 0x70,
0x61, 0x74, 0x68, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x18, 0x03, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52,
0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x18,
0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61,
0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x22, 0x31, 0x0a, 0x17, 0x45, 0x6e, 0x74,
0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x72,
0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01,
0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x1a, 0x0a, 0x18,
0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x53,
0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x32, 0x0a, 0x18, 0x45, 0x6e, 0x74, 0x65,
0x72, 0x74, 0x61, 0x69, 0x6e, 0x44, 0x69, 0x73, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x52, 0x6f, 0x6f,
0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01,
0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x1b, 0x0a, 0x19,
0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x44, 0x69, 0x73, 0x73, 0x6f, 0x6c, 0x76,
0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x22, 0x39, 0x0a, 0x1f, 0x45, 0x6e, 0x74,
0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x44, 0x69, 0x73, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x4d, 0x61,
0x73, 0x74, 0x65, 0x72, 0x52, 0x6f, 0x6f, 0x6d, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06,
0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61,
0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x79,
0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x22,
0x2f, 0x0a, 0x15, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x63, 0x6f,
0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d,
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64,
0x22, 0xf8, 0x01, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65,
0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x72,
0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f,
0x6d, 0x69, 0x64, 0x12, 0x22, 0x0a, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02,
0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07,
0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72,
0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x12, 0x1a, 0x0a,
0x08, 0x63, 0x75, 0x72, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
0x08, 0x63, 0x75, 0x72, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f,
0x72, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12,
0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x18, 0x07,
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74,
0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72,
0x32, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72,
0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x22, 0x31, 0x0a, 0x17, 0x45,
0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x50,
0x6c, 0x61, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x3e,
0x0a, 0x18, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x66, 0x72, 0x65,
0x73, 0x68, 0x50, 0x6c, 0x61, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x07, 0x6d, 0x70,
0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61,
0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x22, 0x3a,
0x0a, 0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x66, 0x72, 0x65,
0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x22, 0x0a, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74,
0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61, 0x70, 0x44, 0x61, 0x74,
0x61, 0x52, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x22, 0x15, 0x0a, 0x13, 0x45, 0x6e,
0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
0x71, 0x22, 0x36, 0x0a, 0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x47, 0x65,
0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74,
0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44,
0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x26, 0x0a, 0x12, 0x45, 0x6e, 0x74,
0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12,
0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65,
0x79, 0x22, 0x58, 0x0a, 0x13, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65,
0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44, 0x61,
0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 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, 0x22, 0xf3, 0x01, 0x0a, 0x13,
0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50,
0x75, 0x73, 0x68, 0x12, 0x32, 0x0a, 0x04, 0x63, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28,
0x0b, 0x32, 0x1e, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x68, 0x61,
0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x43, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72,
0x79, 0x52, 0x04, 0x63, 0x61, 0x72, 0x64, 0x12, 0x35, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c,
0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61,
0x69, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x53, 0x6b, 0x69,
0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x1a, 0x37,
0x0a, 0x09, 0x43, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61,
0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c,
0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
0x01, 0x22, 0x30, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x72,
0x65, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x69,
0x64, 0x63, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x64, 0x63,
0x61, 0x72, 0x64, 0x22, 0x4f, 0x0a, 0x17, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e,
0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16,
0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x65, 0x72, 0x76, 0x65, 0x70,
0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x65, 0x72, 0x76, 0x65,
0x70, 0x61, 0x74, 0x68, 0x22, 0x46, 0x0a, 0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69,
0x6e, 0x4a, 0x6f, 0x69, 0x6e, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06,
0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f,
0x6f, 0x6d, 0x69, 0x64, 0x22, 0x4c, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69,
0x6e, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x61, 0x64, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18,
0x0a, 0x07, 0x70, 0x31, 0x72, 0x65, 0x61, 0x64, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52,
0x07, 0x70, 0x31, 0x72, 0x65, 0x61, 0x64, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x32, 0x72, 0x65,
0x61, 0x64, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x70, 0x32, 0x72, 0x65, 0x61,
0x64, 0x79, 0x22, 0x2d, 0x0a, 0x15, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x42,
0x6f, 0x78, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69,
0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65,
0x78, 0x22, 0x57, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x42, 0x6f,
0x78, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x03, 0x62,
0x6f, 0x78, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x42, 0x6f, 0x78, 0x44, 0x61,
0x74, 0x61, 0x52, 0x03, 0x62, 0x6f, 0x78, 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, 0x22, 0x32, 0x0a, 0x18, 0x45, 0x6e,
0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x4f,
0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x1b,
0x0a, 0x19, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4f, 0x70, 0x65, 0x72, 0x61,
0x74, 0x6f, 0x72, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x22, 0x42, 0x0a, 0x16, 0x45,
0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x53, 0x74, 0x61, 0x72, 0x54, 0x69, 0x6d, 0x65,
0x72, 0x50, 0x75, 0x73, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20,
0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x6f, 0x77,
0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x42,
0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x6f, 0x6d, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x18, 0x02,
0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x22, 0x2d, 0x0a, 0x15,
0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4a, 0x6f, 0x69, 0x6e, 0x52, 0x6f, 0x6f,
0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x4a, 0x6f, 0x69, 0x6e, 0x18, 0x01,
0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x62, 0x4a, 0x6f, 0x69, 0x6e, 0x22, 0x7b, 0x0a, 0x1b, 0x45,
0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4a, 0x6f, 0x69, 0x6e, 0x43, 0x72, 0x65, 0x61,
0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f,
0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d,
0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x18, 0x02, 0x20, 0x01, 0x28,
0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05,
0x75, 0x73, 0x65, 0x72, 0x31, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x18, 0x03,
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74,
0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x22, 0x31, 0x0a, 0x17, 0x45, 0x6e, 0x74, 0x65,
0x72, 0x74, 0x61, 0x69, 0x6e, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x72, 0x74,
0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20,
0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x1a, 0x0a, 0x18, 0x45,
0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x53, 0x74,
0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x32, 0x0a, 0x18, 0x45, 0x6e, 0x74, 0x65, 0x72,
0x74, 0x61, 0x69, 0x6e, 0x44, 0x69, 0x73, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x52, 0x6f, 0x6f, 0x6d,
0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20,
0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x1b, 0x0a, 0x19, 0x45,
0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x44, 0x69, 0x73, 0x73, 0x6f, 0x6c, 0x76, 0x65,
0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x22, 0x39, 0x0a, 0x1f, 0x45, 0x6e, 0x74, 0x65,
0x72, 0x74, 0x61, 0x69, 0x6e, 0x44, 0x69, 0x73, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x4d, 0x61, 0x73,
0x74, 0x65, 0x72, 0x52, 0x6f, 0x6f, 0x6d, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72,
0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f,
0x6d, 0x69, 0x64, 0x22, 0x4c, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e,
0x47, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x61, 0x64, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18, 0x0a,
0x07, 0x70, 0x31, 0x72, 0x65, 0x61, 0x64, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07,
0x70, 0x31, 0x72, 0x65, 0x61, 0x64, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x32, 0x72, 0x65, 0x61,
0x64, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x70, 0x32, 0x72, 0x65, 0x61, 0x64,
0x79, 0x22, 0x2d, 0x0a, 0x15, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x42, 0x6f,
0x78, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e,
0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78,
0x22, 0x57, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x42, 0x6f, 0x78,
0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x03, 0x62, 0x6f,
0x78, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x42, 0x6f, 0x78, 0x44, 0x61, 0x74,
0x61, 0x52, 0x03, 0x62, 0x6f, 0x78, 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, 0x22, 0x32, 0x0a, 0x18, 0x45, 0x6e, 0x74,
0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x4f, 0x76,
0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18,
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x1b, 0x0a,
0x19, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74,
0x6f, 0x72, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x22, 0x42, 0x0a, 0x16, 0x45, 0x6e,
0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x53, 0x74, 0x61, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x72,
0x50, 0x75, 0x73, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
0x28, 0x05, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x6f, 0x77, 0x65,
0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x22, 0x2f,
0x0a, 0x15, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x53, 0x75, 0x72, 0x72, 0x65,
0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69,
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22,
0x36, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x53, 0x75, 0x72, 0x72,
0x65, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x6c, 0x65, 0x66,
0x74, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6c, 0x65,
0x66, 0x74, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2b, 0x0a, 0x13, 0x45, 0x6e, 0x74, 0x65, 0x72,
0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14,
0x0a, 0x05, 0x52, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x52,
0x74, 0x79, 0x70, 0x65, 0x22, 0x57, 0x0a, 0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69,
0x6e, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04,
0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x58,
0x58, 0x4c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x05,
0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 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,
}
var (
@ -2360,7 +2598,7 @@ func file_entertain_entertain_msg_proto_rawDescGZIP() []byte {
return file_entertain_entertain_msg_proto_rawDescData
}
var file_entertain_entertain_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 39)
var file_entertain_entertain_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 44)
var file_entertain_entertain_msg_proto_goTypes = []interface{}{
(*EntertainMatchReq)(nil), // 0: EntertainMatchReq
(*EntertainMatchResp)(nil), // 1: EntertainMatchResp
@ -2400,45 +2638,53 @@ var file_entertain_entertain_msg_proto_goTypes = []interface{}{
(*EntertainOperatorOverReq)(nil), // 35: EntertainOperatorOverReq
(*EntertainOperatorOverResp)(nil), // 36: EntertainOperatorOverResp
(*EntertainStarTimerPush)(nil), // 37: EntertainStarTimerPush
nil, // 38: EntertainChangePush.CardEntry
(*PlayerData)(nil), // 39: PlayerData
(*MapData)(nil), // 40: MapData
(*UserAtno)(nil), // 41: UserAtno
(*BoxData)(nil), // 42: BoxData
(*DBXXLData)(nil), // 43: DBXXLData
(*EntertainSurrenderReq)(nil), // 38: EntertainSurrenderReq
(*EntertainSurrenderResp)(nil), // 39: EntertainSurrenderResp
(*EntertainReceiveReq)(nil), // 40: EntertainReceiveReq
(*EntertainReceiveResp)(nil), // 41: EntertainReceiveResp
nil, // 42: EntertainChangePush.CardEntry
nil, // 43: EntertainChangePush.SkillEntry
(*PlayerData)(nil), // 44: PlayerData
(*MapData)(nil), // 45: MapData
(*UserAtno)(nil), // 46: UserAtno
(*BoxData)(nil), // 47: BoxData
(*DBXXLData)(nil), // 48: DBXXLData
}
var file_entertain_entertain_msg_proto_depIdxs = []int32{
39, // 0: EntertainStartGamePush.user1:type_name -> PlayerData
39, // 1: EntertainStartGamePush.user2:type_name -> PlayerData
40, // 2: EntertainStartGamePush.mpadata:type_name -> MapData
40, // 3: EntertainOperatorRstPush.mpadata:type_name -> MapData
39, // 4: EntertainOperatorRstPush.user1:type_name -> PlayerData
39, // 5: EntertainOperatorRstPush.user2:type_name -> PlayerData
39, // 6: EntertainGameOverPush.user1:type_name -> PlayerData
39, // 7: EntertainGameOverPush.user2:type_name -> PlayerData
40, // 8: EntertainGameOverPush.mpadata:type_name -> MapData
41, // 9: EntertainGameOverPush.reward:type_name -> UserAtno
42, // 10: EntertainGameOverPush.box:type_name -> BoxData
39, // 11: EntertainEnterRoomPush.user1:type_name -> PlayerData
39, // 12: EntertainEnterRoomPush.user2:type_name -> PlayerData
40, // 13: EntertainReconnectResp.mpadata:type_name -> MapData
39, // 14: EntertainReconnectResp.user1:type_name -> PlayerData
39, // 15: EntertainReconnectResp.user2:type_name -> PlayerData
40, // 16: EntertainRefreshPlatResp.mpadata:type_name -> MapData
40, // 17: EntertainRefreshPush.mpadata:type_name -> MapData
43, // 18: EntertainGetListResp.data:type_name -> DBXXLData
43, // 19: EntertainRewardResp.data:type_name -> DBXXLData
41, // 20: EntertainRewardResp.reward:type_name -> UserAtno
38, // 21: EntertainChangePush.card:type_name -> EntertainChangePush.CardEntry
39, // 22: EntertainJoinCreateRoomPush.user1:type_name -> PlayerData
39, // 23: EntertainJoinCreateRoomPush.user2:type_name -> PlayerData
42, // 24: EntertainBoxRewardResp.box:type_name -> BoxData
41, // 25: EntertainBoxRewardResp.reward:type_name -> UserAtno
26, // [26:26] is the sub-list for method output_type
26, // [26:26] is the sub-list for method input_type
26, // [26:26] is the sub-list for extension type_name
26, // [26:26] is the sub-list for extension extendee
0, // [0:26] is the sub-list for field type_name
44, // 0: EntertainStartGamePush.user1:type_name -> PlayerData
44, // 1: EntertainStartGamePush.user2:type_name -> PlayerData
45, // 2: EntertainStartGamePush.mpadata:type_name -> MapData
45, // 3: EntertainOperatorRstPush.mpadata:type_name -> MapData
44, // 4: EntertainOperatorRstPush.user1:type_name -> PlayerData
44, // 5: EntertainOperatorRstPush.user2:type_name -> PlayerData
44, // 6: EntertainGameOverPush.user1:type_name -> PlayerData
44, // 7: EntertainGameOverPush.user2:type_name -> PlayerData
45, // 8: EntertainGameOverPush.mpadata:type_name -> MapData
46, // 9: EntertainGameOverPush.reward:type_name -> UserAtno
47, // 10: EntertainGameOverPush.box:type_name -> BoxData
44, // 11: EntertainEnterRoomPush.user1:type_name -> PlayerData
44, // 12: EntertainEnterRoomPush.user2:type_name -> PlayerData
45, // 13: EntertainReconnectResp.mpadata:type_name -> MapData
44, // 14: EntertainReconnectResp.user1:type_name -> PlayerData
44, // 15: EntertainReconnectResp.user2:type_name -> PlayerData
45, // 16: EntertainRefreshPlatResp.mpadata:type_name -> MapData
45, // 17: EntertainRefreshPush.mpadata:type_name -> MapData
48, // 18: EntertainGetListResp.data:type_name -> DBXXLData
48, // 19: EntertainRewardResp.data:type_name -> DBXXLData
46, // 20: EntertainRewardResp.reward:type_name -> UserAtno
42, // 21: EntertainChangePush.card:type_name -> EntertainChangePush.CardEntry
43, // 22: EntertainChangePush.skill:type_name -> EntertainChangePush.SkillEntry
44, // 23: EntertainJoinCreateRoomPush.user1:type_name -> PlayerData
44, // 24: EntertainJoinCreateRoomPush.user2:type_name -> PlayerData
47, // 25: EntertainBoxRewardResp.box:type_name -> BoxData
46, // 26: EntertainBoxRewardResp.reward:type_name -> UserAtno
48, // 27: EntertainReceiveResp.info:type_name -> DBXXLData
46, // 28: EntertainReceiveResp.award:type_name -> UserAtno
29, // [29:29] is the sub-list for method output_type
29, // [29:29] is the sub-list for method input_type
29, // [29:29] is the sub-list for extension type_name
29, // [29:29] is the sub-list for extension extendee
0, // [0:29] is the sub-list for field type_name
}
func init() { file_entertain_entertain_msg_proto_init() }
@ -2905,6 +3151,54 @@ func file_entertain_entertain_msg_proto_init() {
return nil
}
}
file_entertain_entertain_msg_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*EntertainSurrenderReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_entertain_entertain_msg_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*EntertainSurrenderResp); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_entertain_entertain_msg_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*EntertainReceiveReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_entertain_entertain_msg_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*EntertainReceiveResp); 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{
@ -2912,7 +3206,7 @@ func file_entertain_entertain_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_entertain_entertain_msg_proto_rawDesc,
NumEnums: 0,
NumMessages: 39,
NumMessages: 44,
NumExtensions: 0,
NumServices: 0,
},

24
pb/pay_db.pb.go
View File

@ -32,6 +32,7 @@ const (
DBPayType_ActivityFunds DBPayType = 5 //6.活动基金
DBPayType_PushgiftBag DBPayType = 6 //7.推送礼包
DBPayType_IsLandBattlePass DBPayType = 7 //8.海岛战令
DBPayType_XxlPass DBPayType = 8 // 9 三消战令
)
// Enum value maps for DBPayType.
@ -45,6 +46,7 @@ var (
5: "ActivityFunds",
6: "PushgiftBag",
7: "IsLandBattlePass",
8: "XxlPass",
}
DBPayType_value = map[string]int32{
"DiamondShop": 0,
@ -55,6 +57,7 @@ var (
"ActivityFunds": 5,
"PushgiftBag": 6,
"IsLandBattlePass": 7,
"XxlPass": 8,
}
)
@ -789,7 +792,7 @@ var file_pay_pay_db_proto_rawDesc = []byte{
0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x62,
0x75, 0x79, 0x6e, 0x75, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66,
0x72, 0x65, 0x73, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74,
0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x2a, 0x9a, 0x01, 0x0a, 0x09, 0x44, 0x42, 0x50, 0x61,
0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x2a, 0xa7, 0x01, 0x0a, 0x09, 0x44, 0x42, 0x50, 0x61,
0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64,
0x53, 0x68, 0x6f, 0x70, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x50, 0x61, 0x63, 0x6b, 0x73, 0x10,
0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x4d, 0x6f, 0x6e, 0x74, 0x68, 0x6c, 0x79, 0x50, 0x61, 0x73, 0x73,
@ -799,15 +802,16 @@ var file_pay_pay_db_proto_rawDesc = []byte{
0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x46, 0x75, 0x6e, 0x64, 0x73, 0x10, 0x05, 0x12, 0x0f, 0x0a,
0x0b, 0x50, 0x75, 0x73, 0x68, 0x67, 0x69, 0x66, 0x74, 0x42, 0x61, 0x67, 0x10, 0x06, 0x12, 0x14,
0x0a, 0x10, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x50, 0x61,
0x73, 0x73, 0x10, 0x07, 0x2a, 0x76, 0x0a, 0x0f, 0x44, 0x42, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64,
0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x4f, 0x72,
0x64, 0x65, 0x72, 0x5f, 0x55, 0x6e, 0x70, 0x61, 0x69, 0x64, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d,
0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x50, 0x61, 0x69, 0x64, 0x10, 0x01, 0x12,
0x13, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x46, 0x69, 0x6e, 0x69,
0x73, 0x68, 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72,
0x5f, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x10, 0x03, 0x12, 0x11, 0x0a, 0x0d, 0x50, 0x61, 0x79,
0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x46, 0x61, 0x69, 0x6c, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04,
0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x73, 0x73, 0x10, 0x07, 0x12, 0x0b, 0x0a, 0x07, 0x58, 0x78, 0x6c, 0x50, 0x61, 0x73, 0x73, 0x10,
0x08, 0x2a, 0x76, 0x0a, 0x0f, 0x44, 0x42, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53,
0x74, 0x61, 0x74, 0x65, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72,
0x5f, 0x55, 0x6e, 0x70, 0x61, 0x69, 0x64, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x50, 0x61, 0x79,
0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x50, 0x61, 0x69, 0x64, 0x10, 0x01, 0x12, 0x13, 0x0a, 0x0f,
0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10,
0x02, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x43, 0x61,
0x6e, 0x63, 0x65, 0x6c, 0x10, 0x03, 0x12, 0x11, 0x0a, 0x0d, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64,
0x65, 0x72, 0x5f, 0x46, 0x61, 0x69, 0x6c, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (

42
sys/configure/structs/Game.ConsumeGiftpack.go Normal file
View File

@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GameConsumeGiftpack struct {
_dataMap map[int32]*GameConsumeGiftpackData
_dataList []*GameConsumeGiftpackData
}
func NewGameConsumeGiftpack(_buf []map[string]interface{}) (*GameConsumeGiftpack, error) {
_dataList := make([]*GameConsumeGiftpackData, 0, len(_buf))
dataMap := make(map[int32]*GameConsumeGiftpackData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameConsumeGiftpackData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Lv] = _v
}
}
return &GameConsumeGiftpack{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GameConsumeGiftpack) GetDataMap() map[int32]*GameConsumeGiftpackData {
return table._dataMap
}
func (table *GameConsumeGiftpack) GetDataList() []*GameConsumeGiftpackData {
return table._dataList
}
func (table *GameConsumeGiftpack) Get(key int32) *GameConsumeGiftpackData {
return table._dataMap[key]
}

67
sys/configure/structs/Game.ConsumeGiftpackData.go Normal file
View File

@ -0,0 +1,67 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GameConsumeGiftpackData struct {
Lv int32
Integral int32
Reward []*Gameatn
Exreward []*Gameatn
}
const TypeId_GameConsumeGiftpackData = 661115059
func (*GameConsumeGiftpackData) GetTypeId() int32 {
return 661115059
}
func (_v *GameConsumeGiftpackData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lv"].(float64); !_ok_ { err = errors.New("lv error"); return }; _v.Lv = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["integral"].(float64); !_ok_ { err = errors.New("integral error"); return }; _v.Integral = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["reward"].([]interface{}); !_ok_ { err = errors.New("reward error"); return }
_v.Reward = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Reward = append(_v.Reward, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["exreward"].([]interface{}); !_ok_ { err = errors.New("exreward error"); return }
_v.Exreward = 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.Exreward = append(_v.Exreward, _list_v_)
}
}
return
}
func DeserializeGameConsumeGiftpackData(_buf map[string]interface{}) (*GameConsumeGiftpackData, error) {
v := &GameConsumeGiftpackData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

42
sys/configure/structs/Game.ConsumeRank.go Normal file
View File

@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GameConsumeRank struct {
_dataMap map[int32]*GameConsumeRankData
_dataList []*GameConsumeRankData
}
func NewGameConsumeRank(_buf []map[string]interface{}) (*GameConsumeRank, error) {
_dataList := make([]*GameConsumeRankData, 0, len(_buf))
dataMap := make(map[int32]*GameConsumeRankData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameConsumeRankData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
return &GameConsumeRank{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GameConsumeRank) GetDataMap() map[int32]*GameConsumeRankData {
return table._dataMap
}
func (table *GameConsumeRank) GetDataList() []*GameConsumeRankData {
return table._dataList
}
func (table *GameConsumeRank) Get(key int32) *GameConsumeRankData {
return table._dataMap[key]
}

52
sys/configure/structs/Game.ConsumeRankData.go Normal file
View File

@ -0,0 +1,52 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GameConsumeRankData struct {
Id int32
Group int32
Reward []*Gameatn
}
const TypeId_GameConsumeRankData = 1062948886
func (*GameConsumeRankData) GetTypeId() int32 {
return 1062948886
}
func (_v *GameConsumeRankData)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["group"].(float64); !_ok_ { err = errors.New("group error"); return }; _v.Group = int32(_tempNum_) }
{
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 DeserializeGameConsumeRankData(_buf map[string]interface{}) (*GameConsumeRankData, error) {
v := &GameConsumeRankData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

42
sys/configure/structs/Game.ConsumeTask.go Normal file
View File

@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GameConsumeTask struct {
_dataMap map[int32]*GameConsumeTaskData
_dataList []*GameConsumeTaskData
}
func NewGameConsumeTask(_buf []map[string]interface{}) (*GameConsumeTask, error) {
_dataList := make([]*GameConsumeTaskData, 0, len(_buf))
dataMap := make(map[int32]*GameConsumeTaskData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameConsumeTaskData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Key] = _v
}
}
return &GameConsumeTask{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GameConsumeTask) GetDataMap() map[int32]*GameConsumeTaskData {
return table._dataMap
}
func (table *GameConsumeTask) GetDataList() []*GameConsumeTaskData {
return table._dataList
}
func (table *GameConsumeTask) Get(key int32) *GameConsumeTaskData {
return table._dataMap[key]
}

52
sys/configure/structs/Game.ConsumeTaskData.go Normal file
View File

@ -0,0 +1,52 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GameConsumeTaskData struct {
Key int32
TaskIntegral *Gameatn
Reward []*Gameatn
}
const TypeId_GameConsumeTaskData = 396748015
func (*GameConsumeTaskData) GetTypeId() int32 {
return 396748015
}
func (_v *GameConsumeTaskData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["task_integral"].(map[string]interface{}); !_ok_ { err = errors.New("task_integral error"); return }; if _v.TaskIntegral, err = DeserializeGameatn(_x_); err != nil { return } }
{
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 DeserializeGameConsumeTaskData(_buf map[string]interface{}) (*GameConsumeTaskData, error) {
v := &GameConsumeTaskData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

42
sys/configure/structs/Game.ConsumeTxt.go Normal file
View File

@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GameConsumeTxt struct {
_dataMap map[int32]*GameConsumeTxtData
_dataList []*GameConsumeTxtData
}
func NewGameConsumeTxt(_buf []map[string]interface{}) (*GameConsumeTxt, error) {
_dataList := make([]*GameConsumeTxtData, 0, len(_buf))
dataMap := make(map[int32]*GameConsumeTxtData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameConsumeTxtData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
return &GameConsumeTxt{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GameConsumeTxt) GetDataMap() map[int32]*GameConsumeTxtData {
return table._dataMap
}
func (table *GameConsumeTxt) GetDataList() []*GameConsumeTxtData {
return table._dataList
}
func (table *GameConsumeTxt) Get(key int32) *GameConsumeTxtData {
return table._dataMap[key]
}

39
sys/configure/structs/Game.ConsumeTxtData.go Normal file
View File

@ -0,0 +1,39 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GameConsumeTxtData struct {
Id int32
Name string
Txt string
}
const TypeId_GameConsumeTxtData = -1407151078
func (*GameConsumeTxtData) GetTypeId() int32 {
return -1407151078
}
func (_v *GameConsumeTxtData)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 __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["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return
}
func DeserializeGameConsumeTxtData(_buf map[string]interface{}) (*GameConsumeTxtData, error) {
v := &GameConsumeTxtData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

28
sys/configure/structs/Tables.go
View File

@ -275,6 +275,10 @@ type Tables struct {
ConsumeHero *GameConsumeHero
PlayerSkill *GamePlayerSkill
ConsumeBox *GameConsumeBox
ConsumeGiftpack *GameConsumeGiftpack
ConsumeTask *GameConsumeTask
ConsumeRank *GameConsumeRank
ConsumeTxt *GameConsumeTxt
BukashiAi *GameBukashiAi
GColorGetfraction *GameGColorGetfraction
GColorReward *GameGColorReward
@ -1911,6 +1915,30 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.ConsumeBox, err = NewGameConsumeBox(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_consumegiftpack") ; err != nil {
return nil, err
}
if tables.ConsumeGiftpack, err = NewGameConsumeGiftpack(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_consumetask") ; err != nil {
return nil, err
}
if tables.ConsumeTask, err = NewGameConsumeTask(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_consumerank") ; err != nil {
return nil, err
}
if tables.ConsumeRank, err = NewGameConsumeRank(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_consumetxt") ; err != nil {
return nil, err
}
if tables.ConsumeTxt, err = NewGameConsumeTxt(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_bukashiai") ; err != nil {
return nil, err
}

2
sys/configure/structs/game.globalData.go
View File

@ -268,6 +268,7 @@ type GameGlobalData struct {
NewDrawcardAttemptsNums int32
StonehengeGuideStage int32
StoryWaittime float32
SxRanknum int32
}
const TypeId_GameGlobalData = 477542761
@ -1067,6 +1068,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["NewDrawcardAttempts_Nums"].(float64); !_ok_ { err = errors.New("NewDrawcardAttempts_Nums error"); return }; _v.NewDrawcardAttemptsNums = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stonehenge_guideStage"].(float64); !_ok_ { err = errors.New("stonehenge_guideStage error"); return }; _v.StonehengeGuideStage = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["story_waittime"].(float64); !_ok_ { err = errors.New("story_waittime error"); return }; _v.StoryWaittime = float32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sx_ranknum"].(float64); !_ok_ { err = errors.New("sx_ranknum error"); return }; _v.SxRanknum = int32(_tempNum_) }
return
}