diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index b2fd45de1..25d9c74de 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -23381,7 +23381,7 @@
"NPC": 10334,
"value": 1,
"filter": [
- 1104013
+ 1103013
],
"filter2": [
"剧情ID",
diff --git a/bin/json/game_buzkashigrade.json b/bin/json/game_buzkashigrade.json
index 8d065b6e0..2e32b8067 100644
--- a/bin/json/game_buzkashigrade.json
+++ b/bin/json/game_buzkashigrade.json
@@ -4,34 +4,54 @@
"distance": 10,
"value": 8,
"energy": 20,
- "matchvalue": 5
+ "matchvalue": 5,
+ "scoreText": {
+ "key": "buzkashi_buzkashi_grade_scoreText_1",
+ "text": "完美闪避！"
+ }
},
{
"num": 2,
"distance": 15,
"value": 6,
"energy": 15,
- "matchvalue": 4
+ "matchvalue": 4,
+ "scoreText": {
+ "key": "buzkashi_buzkashi_grade_scoreText_2",
+ "text": "精彩绝伦！"
+ }
},
{
"num": 3,
"distance": 20,
"value": 4,
"energy": 10,
- "matchvalue": 3
+ "matchvalue": 3,
+ "scoreText": {
+ "key": "buzkashi_buzkashi_grade_scoreText_3",
+ "text": "太棒了！"
+ }
},
{
"num": 4,
"distance": 25,
"value": 2,
"energy": 5,
- "matchvalue": 2
+ "matchvalue": 2,
+ "scoreText": {
+ "key": "buzkashi_buzkashi_grade_scoreText_4",
+ "text": "还不错！"
+ }
},
{
"num": 5,
"distance": 30,
"value": 1,
"energy": 5,
- "matchvalue": 1
+ "matchvalue": 1,
+ "scoreText": {
+ "key": "buzkashi_buzkashi_grade_scoreText_5",
+ "text": "普通"
+ }
}
]
\ No newline at end of file
diff --git a/bin/json/game_buzkashiqtelv.json b/bin/json/game_buzkashiqtelv.json
index 00f0c8c14..a07eeb015 100644
--- a/bin/json/game_buzkashiqtelv.json
+++ b/bin/json/game_buzkashiqtelv.json
@@ -3,18 +3,30 @@
"num": 1,
"time": 1,
"value": 10,
- "matchvalue": 5
+ "matchvalue": 5,
+ "scoreText": {
+ "key": "buzkashi_buzkashi_qtelv_scoreText_1",
+ "text": "略微迟缓"
+ }
},
{
"num": 2,
"time": 2,
"value": 15,
- "matchvalue": 10
+ "matchvalue": 10,
+ "scoreText": {
+ "key": "buzkashi_buzkashi_qtelv_scoreText_2",
+ "text": "较为精准"
+ }
},
{
"num": 3,
"time": 3,
"value": 20,
- "matchvalue": 15
+ "matchvalue": 15,
+ "scoreText": {
+ "key": "buzkashi_buzkashi_qtelv_scoreText_3",
+ "text": "完美抓取"
+ }
}
]
\ No newline at end of file
diff --git a/bin/json/game_catchbuglllustrated.json b/bin/json/game_catchbuglllustrated.json
new file mode 100644
index 000000000..540012c3a
--- /dev/null
+++ b/bin/json/game_catchbuglllustrated.json
@@ -0,0 +1,408 @@
+[
+ {
+ "id": 100001,
+ "rarity": 1,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_1",
+ "text": "1"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_1",
+ "text": "2"
+ },
+ "pic": "item_10000001",
+ "weights": 1000
+ },
+ {
+ "id": 100002,
+ "rarity": 1,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_2",
+ "text": "2"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_2",
+ "text": "3"
+ },
+ "pic": "ytx_js_15005",
+ "weights": 1000
+ },
+ {
+ "id": 100003,
+ "rarity": 1,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_3",
+ "text": "3"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_3",
+ "text": "4"
+ },
+ "pic": "item_10000003",
+ "weights": 1000
+ },
+ {
+ "id": 100004,
+ "rarity": 1,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_4",
+ "text": "4"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_4",
+ "text": "5"
+ },
+ "pic": "item_10000004",
+ "weights": 1000
+ },
+ {
+ "id": 100005,
+ "rarity": 1,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_5",
+ "text": "5"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_5",
+ "text": "6"
+ },
+ "pic": "item_10000005",
+ "weights": 1000
+ },
+ {
+ "id": 100006,
+ "rarity": 1,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_6",
+ "text": "6"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_6",
+ "text": "7"
+ },
+ "pic": "item_10000006",
+ "weights": 1000
+ },
+ {
+ "id": 100007,
+ "rarity": 1,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_7",
+ "text": "7"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_7",
+ "text": "8"
+ },
+ "pic": "item_10000007",
+ "weights": 1000
+ },
+ {
+ "id": 100008,
+ "rarity": 1,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_8",
+ "text": "8"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_8",
+ "text": "9"
+ },
+ "pic": "item_10000008",
+ "weights": 1000
+ },
+ {
+ "id": 100009,
+ "rarity": 1,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_9",
+ "text": "9"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_9",
+ "text": "10"
+ },
+ "pic": "item_10000009",
+ "weights": 1000
+ },
+ {
+ "id": 100010,
+ "rarity": 1,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_10",
+ "text": "10"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_10",
+ "text": "11"
+ },
+ "pic": "item_10000010",
+ "weights": 1000
+ },
+ {
+ "id": 100011,
+ "rarity": 2,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_11",
+ "text": "11"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_11",
+ "text": "12"
+ },
+ "pic": "item_10000011",
+ "weights": 500
+ },
+ {
+ "id": 100012,
+ "rarity": 2,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_12",
+ "text": "12"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_12",
+ "text": "13"
+ },
+ "pic": "item_10000012",
+ "weights": 500
+ },
+ {
+ "id": 100013,
+ "rarity": 2,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_13",
+ "text": "13"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_13",
+ "text": "14"
+ },
+ "pic": "item_10000013",
+ "weights": 500
+ },
+ {
+ "id": 100014,
+ "rarity": 2,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_14",
+ "text": "14"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_14",
+ "text": "15"
+ },
+ "pic": "wp_icon_10020",
+ "weights": 500
+ },
+ {
+ "id": 100015,
+ "rarity": 2,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_15",
+ "text": "15"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_15",
+ "text": "16"
+ },
+ "pic": "item_10000022",
+ "weights": 500
+ },
+ {
+ "id": 100016,
+ "rarity": 2,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_16",
+ "text": "16"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_16",
+ "text": "17"
+ },
+ "pic": "wp_icon_10022",
+ "weights": 500
+ },
+ {
+ "id": 100017,
+ "rarity": 2,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_17",
+ "text": "17"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_17",
+ "text": "18"
+ },
+ "pic": "wp_icon_10024",
+ "weights": 500
+ },
+ {
+ "id": 100018,
+ "rarity": 2,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_18",
+ "text": "18"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_18",
+ "text": "19"
+ },
+ "pic": "wp_icon_10020",
+ "weights": 500
+ },
+ {
+ "id": 100019,
+ "rarity": 2,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_19",
+ "text": "19"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_19",
+ "text": "20"
+ },
+ "pic": "wp_icon_10021",
+ "weights": 500
+ },
+ {
+ "id": 100020,
+ "rarity": 2,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_20",
+ "text": "20"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_20",
+ "text": "21"
+ },
+ "pic": "wp_icon_10022",
+ "weights": 500
+ },
+ {
+ "id": 100021,
+ "rarity": 2,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_21",
+ "text": "21"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_21",
+ "text": "22"
+ },
+ "pic": "wp_icon_10024",
+ "weights": 500
+ },
+ {
+ "id": 100022,
+ "rarity": 3,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_22",
+ "text": "22"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_22",
+ "text": "23"
+ },
+ "pic": "wp_icon_10023",
+ "weights": 100
+ },
+ {
+ "id": 100023,
+ "rarity": 3,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_23",
+ "text": "23"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_23",
+ "text": "24"
+ },
+ "pic": "item_50013001",
+ "weights": 100
+ },
+ {
+ "id": 100024,
+ "rarity": 3,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_24",
+ "text": "24"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_24",
+ "text": "25"
+ },
+ "pic": "item_50013002",
+ "weights": 100
+ },
+ {
+ "id": 100025,
+ "rarity": 3,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_25",
+ "text": "25"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_25",
+ "text": "26"
+ },
+ "pic": "item_50013003",
+ "weights": 100
+ },
+ {
+ "id": 100026,
+ "rarity": 3,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_26",
+ "text": "26"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_26",
+ "text": "27"
+ },
+ "pic": "item_50013004",
+ "weights": 100
+ },
+ {
+ "id": 100027,
+ "rarity": 3,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_27",
+ "text": "27"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_27",
+ "text": "28"
+ },
+ "pic": "item_50013001",
+ "weights": 100
+ },
+ {
+ "id": 100028,
+ "rarity": 3,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_28",
+ "text": "28"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_28",
+ "text": "29"
+ },
+ "pic": "item_50013002",
+ "weights": 100
+ },
+ {
+ "id": 100029,
+ "rarity": 3,
+ "cardname": {
+ "key": "catchbugs_Illustrated_cardname_29",
+ "text": "29"
+ },
+ "carddescribe": {
+ "key": "catchbugs_Illustrated_carddescribe_29",
+ "text": "30"
+ },
+ "pic": "item_50013003",
+ "weights": 100
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_catchbugreward.json b/bin/json/game_catchbugreward.json
new file mode 100644
index 000000000..635973a01
--- /dev/null
+++ b/bin/json/game_catchbugreward.json
@@ -0,0 +1,130 @@
+[
+ {
+ "key": 1001,
+ "condition": 15,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 100000
+ }
+ ]
+ },
+ {
+ "key": 1002,
+ "condition": 20,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 100000
+ }
+ ]
+ },
+ {
+ "key": 1003,
+ "condition": 25,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 100000
+ }
+ ]
+ },
+ {
+ "key": 1004,
+ "condition": 30,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 100000
+ }
+ ]
+ },
+ {
+ "key": 1005,
+ "condition": 35,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 100000
+ }
+ ]
+ },
+ {
+ "key": 1006,
+ "condition": 40,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 100000
+ }
+ ]
+ },
+ {
+ "key": 1007,
+ "condition": 45,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 100000
+ }
+ ]
+ },
+ {
+ "key": 1008,
+ "condition": 50,
+ "reward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 100000
+ }
+ ]
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_catchbugskill.json b/bin/json/game_catchbugskill.json
new file mode 100644
index 000000000..dbbca96d0
--- /dev/null
+++ b/bin/json/game_catchbugskill.json
@@ -0,0 +1,34 @@
+[
+ {
+ "id": 1,
+ "skillname": {
+ "key": "catchbug_skill_skillname_1",
+ "text": "暗影作祟"
+ },
+ "round": 1
+ },
+ {
+ "id": 2,
+ "skillname": {
+ "key": "catchbug_skill_skillname_2",
+ "text": "乾坤旋转"
+ },
+ "round": 3
+ },
+ {
+ "id": 3,
+ "skillname": {
+ "key": "catchbug_skill_skillname_3",
+ "text": "地雷滚滚"
+ },
+ "round": 2
+ },
+ {
+ "id": 4,
+ "skillname": {
+ "key": "catchbug_skill_skillname_4",
+ "text": "电光火石"
+ },
+ "round": 1
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_catchbugsset.json b/bin/json/game_catchbugsset.json
new file mode 100644
index 000000000..c58fe42f1
--- /dev/null
+++ b/bin/json/game_catchbugsset.json
@@ -0,0 +1,92 @@
+[
+ {
+ "id": 1,
+ "round": 1,
+ "time": 30,
+ "deducttime": [
+ 1,
+ 2,
+ 3
+ ],
+ "rewardtime": [
+ 1,
+ 2,
+ 3
+ ]
+ },
+ {
+ "id": 2,
+ "round": 2,
+ "time": 20,
+ "deducttime": [
+ 1,
+ 2,
+ 3
+ ],
+ "rewardtime": [
+ 1,
+ 2,
+ 3
+ ]
+ },
+ {
+ "id": 3,
+ "round": 3,
+ "time": 15,
+ "deducttime": [
+ 1,
+ 2,
+ 3
+ ],
+ "rewardtime": [
+ 1,
+ 2,
+ 3
+ ]
+ },
+ {
+ "id": 4,
+ "round": 4,
+ "time": 30,
+ "deducttime": [
+ 1,
+ 2,
+ 3
+ ],
+ "rewardtime": [
+ 1,
+ 2,
+ 3
+ ]
+ },
+ {
+ "id": 5,
+ "round": 5,
+ "time": 20,
+ "deducttime": [
+ 1,
+ 2,
+ 3
+ ],
+ "rewardtime": [
+ 1,
+ 2,
+ 3
+ ]
+ },
+ {
+ "id": 6,
+ "round": 6,
+ "time": 15,
+ "deducttime": [
+ 1,
+ 2,
+ 3
+ ],
+ "rewardtime": [
+ 1,
+ 2,
+ 3
+ ]
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_catchbugstage.json b/bin/json/game_catchbugstage.json
new file mode 100644
index 000000000..582f65047
--- /dev/null
+++ b/bin/json/game_catchbugstage.json
@@ -0,0 +1,132 @@
+[
+ {
+ "id": 1001,
+ "cardnum": {
+ "k": 2,
+ "v": 2
+ },
+ "stagetime": 120,
+ "skill": [],
+ "skilltime": []
+ },
+ {
+ "id": 1002,
+ "cardnum": {
+ "k": 2,
+ "v": 4
+ },
+ "stagetime": 120,
+ "skill": [],
+ "skilltime": []
+ },
+ {
+ "id": 1003,
+ "cardnum": {
+ "k": 2,
+ "v": 4
+ },
+ "stagetime": 120,
+ "skill": [],
+ "skilltime": []
+ },
+ {
+ "id": 1004,
+ "cardnum": {
+ "k": 2,
+ "v": 4
+ },
+ "stagetime": 120,
+ "skill": [
+ 1
+ ],
+ "skilltime": [
+ 20
+ ]
+ },
+ {
+ "id": 1005,
+ "cardnum": {
+ "k": 2,
+ "v": 4
+ },
+ "stagetime": 120,
+ "skill": [
+ 2
+ ],
+ "skilltime": [
+ 20
+ ]
+ },
+ {
+ "id": 1006,
+ "cardnum": {
+ "k": 4,
+ "v": 4
+ },
+ "stagetime": 120,
+ "skill": [
+ 3
+ ],
+ "skilltime": [
+ 20
+ ]
+ },
+ {
+ "id": 1007,
+ "cardnum": {
+ "k": 4,
+ "v": 4
+ },
+ "stagetime": 120,
+ "skill": [
+ 4
+ ],
+ "skilltime": [
+ 20
+ ]
+ },
+ {
+ "id": 1008,
+ "cardnum": {
+ "k": 4,
+ "v": 4
+ },
+ "stagetime": 120,
+ "skill": [
+ 1
+ ],
+ "skilltime": [
+ 20
+ ]
+ },
+ {
+ "id": 1009,
+ "cardnum": {
+ "k": 4,
+ "v": 6
+ },
+ "stagetime": 120,
+ "skill": [
+ 2
+ ],
+ "skilltime": [
+ 20
+ ]
+ },
+ {
+ "id": 1010,
+ "cardnum": {
+ "k": 4,
+ "v": 6
+ },
+ "stagetime": 120,
+ "skill": [
+ 3,
+ 4
+ ],
+ "skilltime": [
+ 20,
+ 20
+ ]
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_gcolorgetfraction.json b/bin/json/game_gcolorgetfraction.json
index ee35d2a6b..69242e02a 100644
--- a/bin/json/game_gcolorgetfraction.json
+++ b/bin/json/game_gcolorgetfraction.json
@@ -3,378 +3,378 @@
"key": 1,
"difficulty": 1,
"repeat": 1,
- "fraction": 200,
+ "fraction": 600,
"fail": 0
},
{
"key": 2,
"difficulty": 1,
"repeat": 1,
- "fraction": 100,
+ "fraction": 300,
"fail": 0
},
{
"key": 3,
"difficulty": 1,
"repeat": 1,
- "fraction": 90,
+ "fraction": 270,
"fail": 0
},
{
"key": 4,
"difficulty": 1,
"repeat": 1,
- "fraction": 80,
+ "fraction": 240,
"fail": 0
},
{
"key": 5,
"difficulty": 1,
"repeat": 1,
- "fraction": 70,
+ "fraction": 210,
"fail": 0
},
{
"key": 6,
"difficulty": 1,
"repeat": 1,
- "fraction": 60,
+ "fraction": 180,
"fail": 0
},
{
"key": 7,
"difficulty": 1,
"repeat": 1,
- "fraction": 50,
+ "fraction": 150,
"fail": 0
},
{
"key": 8,
"difficulty": 1,
"repeat": 1,
- "fraction": 40,
+ "fraction": 120,
"fail": 0
},
{
"key": 9,
"difficulty": 1,
"repeat": 1,
- "fraction": 30,
- "fail": 10
+ "fraction": 90,
+ "fail": 30
},
{
"key": 10,
"difficulty": 2,
"repeat": 1,
- "fraction": 1000,
+ "fraction": 3000,
"fail": 0
},
{
"key": 11,
"difficulty": 2,
"repeat": 1,
- "fraction": 800,
+ "fraction": 2400,
"fail": 0
},
{
"key": 12,
"difficulty": 2,
"repeat": 1,
- "fraction": 750,
+ "fraction": 2250,
"fail": 0
},
{
"key": 13,
"difficulty": 2,
"repeat": 1,
- "fraction": 700,
+ "fraction": 2100,
"fail": 0
},
{
"key": 14,
"difficulty": 2,
"repeat": 1,
- "fraction": 650,
+ "fraction": 1950,
"fail": 0
},
{
"key": 15,
"difficulty": 2,
"repeat": 1,
- "fraction": 600,
+ "fraction": 1800,
"fail": 0
},
{
"key": 16,
"difficulty": 2,
"repeat": 1,
- "fraction": 550,
+ "fraction": 1650,
"fail": 0
},
{
"key": 17,
"difficulty": 2,
"repeat": 1,
- "fraction": 500,
+ "fraction": 1500,
"fail": 0
},
{
"key": 18,
"difficulty": 2,
"repeat": 1,
- "fraction": 450,
- "fail": 150
+ "fraction": 1350,
+ "fail": 200
},
{
"key": 19,
"difficulty": 3,
"repeat": 1,
- "fraction": 10000,
+ "fraction": 30000,
"fail": 0
},
{
"key": 20,
"difficulty": 3,
"repeat": 1,
- "fraction": 9000,
+ "fraction": 27000,
"fail": 0
},
{
"key": 21,
"difficulty": 3,
"repeat": 1,
- "fraction": 8500,
+ "fraction": 25500,
"fail": 0
},
{
"key": 22,
"difficulty": 3,
"repeat": 1,
- "fraction": 8000,
+ "fraction": 24000,
"fail": 0
},
{
"key": 23,
"difficulty": 3,
"repeat": 1,
- "fraction": 7500,
+ "fraction": 22500,
"fail": 0
},
{
"key": 24,
"difficulty": 3,
"repeat": 1,
- "fraction": 7000,
+ "fraction": 21000,
"fail": 0
},
{
"key": 25,
"difficulty": 3,
"repeat": 1,
- "fraction": 6500,
+ "fraction": 19500,
"fail": 0
},
{
"key": 26,
"difficulty": 3,
"repeat": 1,
- "fraction": 6000,
+ "fraction": 18000,
"fail": 0
},
{
"key": 27,
"difficulty": 3,
"repeat": 1,
- "fraction": 5500,
- "fail": 1000
+ "fraction": 16500,
+ "fail": 1500
},
{
"key": 28,
"difficulty": 1,
"repeat": 2,
- "fraction": 600,
+ "fraction": 200,
"fail": 0
},
{
"key": 29,
"difficulty": 1,
"repeat": 2,
- "fraction": 300,
+ "fraction": 100,
"fail": 0
},
{
"key": 30,
"difficulty": 1,
"repeat": 2,
- "fraction": 270,
+ "fraction": 90,
"fail": 0
},
{
"key": 31,
"difficulty": 1,
"repeat": 2,
- "fraction": 240,
+ "fraction": 80,
"fail": 0
},
{
"key": 32,
"difficulty": 1,
"repeat": 2,
- "fraction": 210,
+ "fraction": 70,
"fail": 0
},
{
"key": 33,
"difficulty": 1,
"repeat": 2,
- "fraction": 180,
+ "fraction": 60,
"fail": 0
},
{
"key": 34,
"difficulty": 1,
"repeat": 2,
- "fraction": 150,
+ "fraction": 50,
"fail": 0
},
{
"key": 35,
"difficulty": 1,
"repeat": 2,
- "fraction": 120,
+ "fraction": 40,
"fail": 0
},
{
"key": 36,
"difficulty": 1,
"repeat": 2,
- "fraction": 90,
- "fail": 30
+ "fraction": 30,
+ "fail": 10
},
{
"key": 37,
"difficulty": 2,
"repeat": 2,
- "fraction": 3000,
+ "fraction": 1000,
"fail": 0
},
{
"key": 38,
"difficulty": 2,
"repeat": 2,
- "fraction": 2400,
+ "fraction": 800,
"fail": 0
},
{
"key": 39,
"difficulty": 2,
"repeat": 2,
- "fraction": 2250,
+ "fraction": 750,
"fail": 0
},
{
"key": 40,
"difficulty": 2,
"repeat": 2,
- "fraction": 2100,
+ "fraction": 700,
"fail": 0
},
{
"key": 41,
"difficulty": 2,
"repeat": 2,
- "fraction": 1950,
+ "fraction": 650,
"fail": 0
},
{
"key": 42,
"difficulty": 2,
"repeat": 2,
- "fraction": 1800,
+ "fraction": 600,
"fail": 0
},
{
"key": 43,
"difficulty": 2,
"repeat": 2,
- "fraction": 1650,
+ "fraction": 550,
"fail": 0
},
{
"key": 44,
"difficulty": 2,
"repeat": 2,
- "fraction": 1500,
+ "fraction": 500,
"fail": 0
},
{
"key": 45,
"difficulty": 2,
"repeat": 2,
- "fraction": 1350,
- "fail": 200
+ "fraction": 450,
+ "fail": 150
},
{
"key": 46,
"difficulty": 3,
"repeat": 2,
- "fraction": 30000,
+ "fraction": 10000,
"fail": 0
},
{
"key": 47,
"difficulty": 3,
"repeat": 2,
- "fraction": 27000,
+ "fraction": 9000,
"fail": 0
},
{
"key": 48,
"difficulty": 3,
"repeat": 2,
- "fraction": 25500,
+ "fraction": 8500,
"fail": 0
},
{
"key": 49,
"difficulty": 3,
"repeat": 2,
- "fraction": 24000,
+ "fraction": 8000,
"fail": 0
},
{
"key": 50,
"difficulty": 3,
"repeat": 2,
- "fraction": 22500,
+ "fraction": 7500,
"fail": 0
},
{
"key": 51,
"difficulty": 3,
"repeat": 2,
- "fraction": 21000,
+ "fraction": 7000,
"fail": 0
},
{
"key": 52,
"difficulty": 3,
"repeat": 2,
- "fraction": 19500,
+ "fraction": 6500,
"fail": 0
},
{
"key": 53,
"difficulty": 3,
"repeat": 2,
- "fraction": 18000,
+ "fraction": 6000,
"fail": 0
},
{
"key": 54,
"difficulty": 3,
"repeat": 2,
- "fraction": 16500,
- "fail": 1500
+ "fraction": 5500,
+ "fail": 1000
}
]
\ No newline at end of file
diff --git a/bin/json/game_gm.json b/bin/json/game_gm.json
index 1c4a8c17c..7de9fb624 100644
--- a/bin/json/game_gm.json
+++ b/bin/json/game_gm.json
@@ -766,47 +766,7 @@
"key": "GM_GM_text_110",
"text": "前往石阵秘境"
},
- "data": "10026",
- "prefix": ""
- },
- {
- "id": 85,
- "type": 4,
- "text": {
- "key": "GM_GM_text_111",
- "text": "月卡"
- },
- "data": "10028",
- "prefix": ""
- },
- {
- "id": 86,
- "type": 4,
- "text": {
- "key": "GM_GM_text_112",
- "text": "礼包"
- },
- "data": "10029",
- "prefix": ""
- },
- {
- "id": 87,
- "type": 4,
- "text": {
- "key": "GM_GM_text_116",
- "text": "月梦战令"
- },
- "data": "10033",
- "prefix": ""
- },
- {
- "id": 88,
- "type": 4,
- "text": {
- "key": "GM_GM_text_117",
- "text": "补给战令"
- },
- "data": "10034",
+ "data": "10027",
"prefix": ""
},
{
diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json
index 0c057e30f..815c0740d 100644
--- a/bin/json/game_hero.json
+++ b/bin/json/game_hero.json
@@ -16,6 +16,11 @@
"prefab": "13001",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.9,
+ 0.9,
+ 0.9
+ ],
"icon": "13001",
"vocal": "13001",
"tujing": [
@@ -94,6 +99,11 @@
"prefab": "13002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1.2,
+ 1.2,
+ 1.2
+ ],
"icon": "13002",
"vocal": "13002",
"tujing": [
@@ -172,6 +182,11 @@
"prefab": "13003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "13003",
"vocal": "13003",
"tujing": [
@@ -250,6 +265,11 @@
"prefab": "13004",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "13004",
"vocal": "13004",
"tujing": [
@@ -328,6 +348,11 @@
"prefab": "13005",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "13005",
"vocal": "13005",
"tujing": [
@@ -406,6 +431,11 @@
"prefab": "14001",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.9,
+ 0.9,
+ 0.9
+ ],
"icon": "14001",
"vocal": "14001",
"tujing": [
@@ -484,6 +514,11 @@
"prefab": "14002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.9,
+ 0.9,
+ 0.9
+ ],
"icon": "14002",
"vocal": "14002",
"tujing": [
@@ -562,6 +597,11 @@
"prefab": "14003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "14003",
"vocal": "14003",
"tujing": [
@@ -640,6 +680,11 @@
"prefab": "14004",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "14004",
"vocal": "14004",
"tujing": [
@@ -718,6 +763,11 @@
"prefab": "14005",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.9,
+ 0.9,
+ 0.9
+ ],
"icon": "14005",
"vocal": "14005",
"tujing": [
@@ -796,6 +846,11 @@
"prefab": "14006",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "14006",
"vocal": "14006",
"tujing": [
@@ -874,6 +929,11 @@
"prefab": "14007",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "14007",
"vocal": "14007",
"tujing": [
@@ -952,6 +1012,11 @@
"prefab": "15001",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "15001",
"vocal": "15001",
"tujing": [
@@ -1030,6 +1095,11 @@
"prefab": "15002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1.2,
+ 1.2,
+ 1.2
+ ],
"icon": "15002",
"vocal": "15002",
"tujing": [
@@ -1108,6 +1178,11 @@
"prefab": "15003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "15003",
"vocal": "15003",
"tujing": [
@@ -1186,6 +1261,11 @@
"prefab": "15004",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "15004",
"vocal": "15004",
"tujing": [
@@ -1264,6 +1344,11 @@
"prefab": "23001",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "23001",
"vocal": "23001",
"tujing": [
@@ -1342,6 +1427,11 @@
"prefab": "23002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "23002",
"vocal": "23002",
"tujing": [
@@ -1420,6 +1510,11 @@
"prefab": "23003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.9,
+ 0.9,
+ 0.9
+ ],
"icon": "23003",
"vocal": "23003",
"tujing": [
@@ -1498,6 +1593,11 @@
"prefab": "23004",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "23004",
"vocal": "23004",
"tujing": [
@@ -1576,6 +1676,11 @@
"prefab": "24001",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.95,
+ 0.95,
+ 0.95
+ ],
"icon": "24001",
"vocal": "24001",
"tujing": [
@@ -1654,6 +1759,11 @@
"prefab": "24002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.95,
+ 0.95,
+ 0.95
+ ],
"icon": "24002",
"vocal": "24002",
"tujing": [
@@ -1732,6 +1842,11 @@
"prefab": "24003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1.1,
+ 1.1,
+ 1.1
+ ],
"icon": "24003",
"vocal": "24003",
"tujing": [
@@ -1810,6 +1925,11 @@
"prefab": "24004",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.85,
+ 0.85,
+ 0.85
+ ],
"icon": "24004",
"vocal": "24004",
"tujing": [
@@ -1888,6 +2008,11 @@
"prefab": "24005",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "24005",
"vocal": "24005",
"tujing": [
@@ -1966,6 +2091,11 @@
"prefab": "24006",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "24006",
"vocal": "24006",
"tujing": [
@@ -2044,6 +2174,11 @@
"prefab": "24007",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "24007",
"vocal": "24007",
"tujing": [
@@ -2122,6 +2257,11 @@
"prefab": "24008",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.95,
+ 0.95,
+ 0.95
+ ],
"icon": "24008",
"vocal": "24008",
"tujing": [
@@ -2200,6 +2340,11 @@
"prefab": "24009",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "24009",
"vocal": "24009",
"tujing": [
@@ -2278,6 +2423,11 @@
"prefab": "25001",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.95,
+ 0.95,
+ 0.95
+ ],
"icon": "25001",
"vocal": "25001",
"tujing": [
@@ -2356,6 +2506,11 @@
"prefab": "25002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "25002",
"vocal": "25002",
"tujing": [
@@ -2434,6 +2589,11 @@
"prefab": "25003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "25003",
"vocal": "25003",
"tujing": [
@@ -2512,6 +2672,11 @@
"prefab": "25004",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "25004",
"vocal": "25004",
"tujing": [
@@ -2590,6 +2755,11 @@
"prefab": "33001",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.95,
+ 0.95,
+ 0.95
+ ],
"icon": "33001",
"vocal": "33001",
"tujing": [
@@ -2668,6 +2838,11 @@
"prefab": "33002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.9,
+ 0.9,
+ 0.9
+ ],
"icon": "33002",
"vocal": "33002",
"tujing": [
@@ -2746,6 +2921,11 @@
"prefab": "33003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "33003",
"vocal": "33003",
"tujing": [
@@ -2824,6 +3004,11 @@
"prefab": "33004",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "33004",
"vocal": "33004",
"tujing": [
@@ -2902,6 +3087,11 @@
"prefab": "33005",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "33005",
"vocal": "33005",
"tujing": [
@@ -2980,6 +3170,11 @@
"prefab": "33006",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "33006",
"vocal": "33006",
"tujing": [
@@ -3058,6 +3253,11 @@
"prefab": "34001",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "34001",
"vocal": "34001",
"tujing": [
@@ -3136,6 +3336,11 @@
"prefab": "34002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "34002",
"vocal": "34002",
"tujing": [
@@ -3214,6 +3419,11 @@
"prefab": "34003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "34003",
"vocal": "34003",
"tujing": [
@@ -3292,6 +3502,11 @@
"prefab": "34004",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "34004",
"vocal": "34004",
"tujing": [
@@ -3370,6 +3585,11 @@
"prefab": "34005",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.95,
+ 0.95,
+ 0.95
+ ],
"icon": "34005",
"vocal": "34005",
"tujing": [
@@ -3448,6 +3668,11 @@
"prefab": "34006",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "34006",
"vocal": "34006",
"tujing": [
@@ -3526,6 +3751,11 @@
"prefab": "34007",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.95,
+ 0.95,
+ 0.95
+ ],
"icon": "34007",
"vocal": "34007",
"tujing": [
@@ -3604,6 +3834,11 @@
"prefab": "34008",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.95,
+ 0.95,
+ 0.95
+ ],
"icon": "34008",
"vocal": "34008",
"tujing": [
@@ -3682,6 +3917,11 @@
"prefab": "35001",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.9,
+ 0.9,
+ 0.9
+ ],
"icon": "35001",
"vocal": "35001",
"tujing": [
@@ -3760,6 +4000,11 @@
"prefab": "35002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "35002",
"vocal": "35002",
"tujing": [
@@ -3838,6 +4083,11 @@
"prefab": "35003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "35003",
"vocal": "35003",
"tujing": [
@@ -3916,6 +4166,11 @@
"prefab": "35004",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.9,
+ 0.9,
+ 0.9
+ ],
"icon": "35004",
"vocal": "35004",
"tujing": [
@@ -3994,6 +4249,11 @@
"prefab": "35005",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.9,
+ 0.9,
+ 0.9
+ ],
"icon": "35005",
"vocal": "35005",
"tujing": [
@@ -4072,6 +4332,11 @@
"prefab": "35006",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1.2,
+ 1.2,
+ 1.2
+ ],
"icon": "35006",
"vocal": "35006",
"tujing": [
@@ -4150,6 +4415,11 @@
"prefab": "43001",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.9,
+ 0.9,
+ 0.9
+ ],
"icon": "43001",
"vocal": "43001",
"tujing": [
@@ -4228,6 +4498,11 @@
"prefab": "43002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1.2,
+ 1.2,
+ 1.2
+ ],
"icon": "43002",
"vocal": "43002",
"tujing": [
@@ -4306,6 +4581,11 @@
"prefab": "43003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "43003",
"vocal": "43003",
"tujing": [
@@ -4384,6 +4664,11 @@
"prefab": "43004",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1.2,
+ 1.2,
+ 1.2
+ ],
"icon": "43004",
"vocal": "43004",
"tujing": [
@@ -4462,6 +4747,11 @@
"prefab": "43005",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "43005",
"vocal": "43005",
"tujing": [
@@ -4540,6 +4830,11 @@
"prefab": "43006",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "43006",
"vocal": "43006",
"tujing": [
@@ -4618,6 +4913,11 @@
"prefab": "43007",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "43007",
"vocal": "43007",
"tujing": [
@@ -4696,6 +4996,11 @@
"prefab": "44001",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.9,
+ 0.9,
+ 0.9
+ ],
"icon": "44001",
"vocal": "44001",
"tujing": [
@@ -4774,6 +5079,11 @@
"prefab": "44002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "44002",
"vocal": "44002",
"tujing": [
@@ -4852,6 +5162,11 @@
"prefab": "44003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1.2,
+ 1.2,
+ 1.2
+ ],
"icon": "44003",
"vocal": "44003",
"tujing": [
@@ -4930,6 +5245,11 @@
"prefab": "44004",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1.4,
+ 1.4,
+ 1.4
+ ],
"icon": "44004",
"vocal": "44004",
"tujing": [
@@ -5008,6 +5328,11 @@
"prefab": "44006",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.9,
+ 0.9,
+ 0.9
+ ],
"icon": "44006",
"vocal": "44006",
"tujing": [
@@ -5086,6 +5411,11 @@
"prefab": "45001",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "45001",
"vocal": "45001",
"tujing": [
@@ -5164,6 +5494,11 @@
"prefab": "45002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "45002",
"vocal": "45002",
"tujing": [
@@ -5242,6 +5577,11 @@
"prefab": "45003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.9,
+ 0.9,
+ 0.9
+ ],
"icon": "45003",
"vocal": "45003",
"tujing": [
@@ -5320,6 +5660,11 @@
"prefab": "45004",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "45004",
"vocal": "45004",
"tujing": [
@@ -5398,6 +5743,11 @@
"prefab": "44005",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.9,
+ 0.9,
+ 0.9
+ ],
"icon": "44005",
"vocal": "44005",
"tujing": [
@@ -5476,6 +5826,11 @@
"prefab": "15005",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.9,
+ 0.9,
+ 0.9
+ ],
"icon": "15005",
"vocal": "15005",
"tujing": [
@@ -5554,6 +5909,11 @@
"prefab": "51001",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1.1,
+ 1.1,
+ 1.1
+ ],
"icon": "51001",
"vocal": "51001",
"tujing": [
@@ -5632,6 +5992,11 @@
"prefab": "51002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51002",
"vocal": "51002",
"tujing": [
@@ -5710,6 +6075,11 @@
"prefab": "51003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51003",
"vocal": "51003",
"tujing": [
@@ -5788,6 +6158,11 @@
"prefab": "51004",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51004",
"vocal": "51004",
"tujing": [
@@ -5866,6 +6241,11 @@
"prefab": "51005",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51005",
"vocal": "51005",
"tujing": [
@@ -5944,6 +6324,11 @@
"prefab": "51006",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51006",
"vocal": "51006",
"tujing": [
@@ -6022,6 +6407,11 @@
"prefab": "51007",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51007",
"vocal": "51007",
"tujing": [
@@ -6100,6 +6490,11 @@
"prefab": "54005",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "54005",
"vocal": "54005",
"tujing": [
@@ -6178,6 +6573,11 @@
"prefab": "51010",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51010",
"vocal": "51010",
"tujing": [
@@ -6256,6 +6656,11 @@
"prefab": "51011",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51011",
"vocal": "51011",
"tujing": [
@@ -6334,6 +6739,11 @@
"prefab": "51012",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51012",
"vocal": "51012",
"tujing": [
@@ -6412,6 +6822,11 @@
"prefab": "51013",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51013",
"vocal": "51013",
"tujing": [
@@ -6490,6 +6905,11 @@
"prefab": "51014",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51014",
"vocal": "51014",
"tujing": [
@@ -6568,6 +6988,11 @@
"prefab": "54001",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "54001",
"vocal": "54001",
"tujing": [
@@ -6646,6 +7071,11 @@
"prefab": "53001",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "53001",
"vocal": "53001",
"tujing": [
@@ -6724,6 +7154,11 @@
"prefab": "53002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "53002",
"vocal": "53002",
"tujing": [
@@ -6802,6 +7237,11 @@
"prefab": "53003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "53003",
"vocal": "53003",
"tujing": [
@@ -6880,6 +7320,11 @@
"prefab": "54002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "54002",
"vocal": "54002",
"tujing": [
@@ -6958,6 +7403,11 @@
"prefab": "54003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "54003",
"vocal": "54003",
"tujing": [
@@ -7036,6 +7486,11 @@
"prefab": "53005",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "53005",
"vocal": "53005",
"tujing": [
@@ -7114,6 +7569,11 @@
"prefab": "53006",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "53006",
"vocal": "53006",
"tujing": [
@@ -7192,6 +7652,11 @@
"prefab": "55001",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "55001",
"vocal": "55001",
"tujing": [
@@ -7270,6 +7735,11 @@
"prefab": "55002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "55002",
"vocal": "55002",
"tujing": [
@@ -7348,6 +7818,11 @@
"prefab": "55003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "55003",
"vocal": "55003",
"tujing": [
@@ -7426,6 +7901,11 @@
"prefab": "55004",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "55004",
"vocal": "55004",
"tujing": [
@@ -7504,6 +7984,11 @@
"prefab": "55005",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "55005",
"vocal": "55005",
"tujing": [
@@ -7582,6 +8067,11 @@
"prefab": "55006",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "55006",
"vocal": "55006",
"tujing": [
@@ -7660,6 +8150,11 @@
"prefab": "55007",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "55007",
"vocal": "55007",
"tujing": [
@@ -7738,6 +8233,11 @@
"prefab": "11021",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "11021",
"vocal": "11021",
"tujing": [
@@ -7816,6 +8316,11 @@
"prefab": "24003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "12003",
"vocal": "12003",
"tujing": [
@@ -7896,6 +8401,11 @@
"prefab": "63002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "63002",
"vocal": "63002",
"tujing": [
@@ -7974,6 +8484,11 @@
"prefab": "63003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "63003",
"vocal": "63003",
"tujing": [
@@ -8052,6 +8567,11 @@
"prefab": "63004",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "63004",
"vocal": "63004",
"tujing": [
@@ -8130,6 +8650,11 @@
"prefab": "64003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "64003",
"vocal": "64003",
"tujing": [
@@ -8208,6 +8733,11 @@
"prefab": "74002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "74002",
"vocal": "74002",
"tujing": [
@@ -8286,6 +8816,11 @@
"prefab": "74003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "74003",
"vocal": "74003",
"tujing": [
@@ -8364,6 +8899,11 @@
"prefab": "74004",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "74004",
"vocal": "74004",
"tujing": [
@@ -8442,6 +8982,11 @@
"prefab": "83002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "83002",
"vocal": "83002",
"tujing": [
@@ -8520,6 +9065,11 @@
"prefab": "83006",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "83006",
"vocal": "83006",
"tujing": [
@@ -8598,6 +9148,11 @@
"prefab": "83007",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "83006",
"vocal": "83006",
"tujing": [
@@ -8676,6 +9231,11 @@
"prefab": "84002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "84002",
"vocal": "84002",
"tujing": [
@@ -8754,6 +9314,11 @@
"prefab": "94002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "94002",
"vocal": "94002",
"tujing": [
@@ -8832,6 +9397,11 @@
"prefab": "94005",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "94005",
"vocal": "94005",
"tujing": [
@@ -8910,6 +9480,11 @@
"prefab": "101004",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51004",
"vocal": "51004",
"tujing": [
@@ -8988,6 +9563,11 @@
"prefab": "13003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "13003",
"vocal": "13003",
"tujing": [
@@ -9066,6 +9646,11 @@
"prefab": "13003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "13003",
"vocal": "13003",
"tujing": [
@@ -9144,6 +9729,11 @@
"prefab": "51015",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51015",
"vocal": "51015",
"tujing": [
@@ -9222,6 +9812,11 @@
"prefab": "51016",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51016",
"vocal": "51016",
"tujing": [
@@ -9300,6 +9895,11 @@
"prefab": "51017",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51017",
"vocal": "51017",
"tujing": [
@@ -9378,6 +9978,11 @@
"prefab": "51018",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51018",
"vocal": "51018",
"tujing": [
@@ -9456,6 +10061,11 @@
"prefab": "51019",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51019",
"vocal": "51019",
"tujing": [
@@ -9534,6 +10144,11 @@
"prefab": "51020",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51020",
"vocal": "51020",
"tujing": [
@@ -9612,6 +10227,11 @@
"prefab": "51021",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51021",
"vocal": "51021",
"tujing": [
@@ -9690,6 +10310,11 @@
"prefab": "51022",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51022",
"vocal": "51022",
"tujing": [
@@ -9768,6 +10393,11 @@
"prefab": "51023",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51023",
"vocal": "51023",
"tujing": [
@@ -9846,6 +10476,11 @@
"prefab": "51024",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51024",
"vocal": "51024",
"tujing": [
@@ -9924,6 +10559,11 @@
"prefab": "51025",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51025",
"vocal": "51025",
"tujing": [
@@ -10002,6 +10642,11 @@
"prefab": "51026",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51026",
"vocal": "51026",
"tujing": [
@@ -10080,6 +10725,11 @@
"prefab": "51027",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51027",
"vocal": "51027",
"tujing": [
@@ -10158,6 +10808,11 @@
"prefab": "51028",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51028",
"vocal": "51028",
"tujing": [
@@ -10236,6 +10891,11 @@
"prefab": "53003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51023",
"vocal": "51023",
"tujing": [
@@ -10314,6 +10974,11 @@
"prefab": "53003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51024",
"vocal": "51024",
"tujing": [
@@ -10392,6 +11057,11 @@
"prefab": "53003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51025",
"vocal": "51025",
"tujing": [
@@ -10470,6 +11140,11 @@
"prefab": "53003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51026",
"vocal": "51026",
"tujing": [
@@ -10548,6 +11223,11 @@
"prefab": "53003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51027",
"vocal": "51027",
"tujing": [
@@ -10626,6 +11306,11 @@
"prefab": "54005",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "54005",
"vocal": "54005",
"tujing": [
@@ -10704,6 +11389,11 @@
"prefab": "54005",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "54005",
"vocal": "54005",
"tujing": [
@@ -10782,6 +11472,11 @@
"prefab": "54014",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "54005",
"vocal": "54005",
"tujing": [
@@ -10860,6 +11555,11 @@
"prefab": "54014",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "54005",
"vocal": "54005",
"tujing": [
@@ -10938,6 +11638,11 @@
"prefab": "54015",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "54015",
"vocal": "54015",
"tujing": [
@@ -11016,6 +11721,11 @@
"prefab": "54016",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "54016",
"vocal": "54016",
"tujing": [
@@ -11094,6 +11804,11 @@
"prefab": "54017",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "54017",
"vocal": "54017",
"tujing": [
@@ -11172,6 +11887,11 @@
"prefab": "54017",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "54017",
"vocal": "54017",
"tujing": [
@@ -11250,6 +11970,11 @@
"prefab": "54017",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "54017",
"vocal": "54017",
"tujing": [
@@ -11328,6 +12053,11 @@
"prefab": "54017",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "54017",
"vocal": "54017",
"tujing": [
@@ -11406,6 +12136,11 @@
"prefab": "51050",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51050",
"vocal": "51050",
"tujing": [
@@ -11484,6 +12219,11 @@
"prefab": "51051",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51051",
"vocal": "51051",
"tujing": [
@@ -11562,6 +12302,11 @@
"prefab": "51052",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51052",
"vocal": "51052",
"tujing": [
@@ -11640,6 +12385,11 @@
"prefab": "51053",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51053",
"vocal": "51053",
"tujing": [
@@ -11718,6 +12468,11 @@
"prefab": "51054",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51054",
"vocal": "51054",
"tujing": [
@@ -11796,6 +12551,11 @@
"prefab": "51055",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51055",
"vocal": "51055",
"tujing": [
@@ -11874,6 +12634,11 @@
"prefab": "51002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51002",
"vocal": "51002",
"tujing": [
@@ -11952,6 +12717,11 @@
"prefab": "51003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51003",
"vocal": "51003",
"tujing": [
@@ -12030,6 +12800,11 @@
"prefab": "51004",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51004",
"vocal": "51004",
"tujing": [
@@ -12108,6 +12883,11 @@
"prefab": "51005",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51005",
"vocal": "51005",
"tujing": [
@@ -12186,6 +12966,11 @@
"prefab": "51006",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51006",
"vocal": "51006",
"tujing": [
@@ -12264,6 +13049,11 @@
"prefab": "51010",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51010",
"vocal": "51010",
"tujing": [
@@ -12342,6 +13132,11 @@
"prefab": "51011",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51011",
"vocal": "51011",
"tujing": [
@@ -12420,6 +13215,11 @@
"prefab": "53001",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "53001",
"vocal": "53001",
"tujing": [
@@ -12498,6 +13298,11 @@
"prefab": "53002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "53002",
"vocal": "53002",
"tujing": [
@@ -12576,6 +13381,11 @@
"prefab": "53003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "53003",
"vocal": "53003",
"tujing": [
@@ -12654,6 +13464,11 @@
"prefab": "51012",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51012",
"vocal": "51012",
"tujing": [
@@ -12732,6 +13547,11 @@
"prefab": "51050",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51050",
"vocal": "51050",
"tujing": [
@@ -12810,6 +13630,11 @@
"prefab": "51051",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51051",
"vocal": "51051",
"tujing": [
@@ -12888,6 +13713,11 @@
"prefab": "51052",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51052",
"vocal": "51052",
"tujing": [
@@ -12966,6 +13796,11 @@
"prefab": "51053",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51053",
"vocal": "51053",
"tujing": [
@@ -13044,6 +13879,11 @@
"prefab": "51002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51002",
"vocal": "51002",
"tujing": [
@@ -13122,6 +13962,11 @@
"prefab": "51003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51003",
"vocal": "51003",
"tujing": [
@@ -13200,6 +14045,11 @@
"prefab": "51004",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51004",
"vocal": "51004",
"tujing": [
@@ -13278,6 +14128,11 @@
"prefab": "51005",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51005",
"vocal": "51005",
"tujing": [
@@ -13356,6 +14211,11 @@
"prefab": "51006",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51006",
"vocal": "51006",
"tujing": [
@@ -13434,6 +14294,11 @@
"prefab": "51010",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51010",
"vocal": "51010",
"tujing": [
@@ -13512,6 +14377,11 @@
"prefab": "51011",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51011",
"vocal": "51011",
"tujing": [
@@ -13590,6 +14460,11 @@
"prefab": "53001",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "53001",
"vocal": "53001",
"tujing": [
@@ -13668,6 +14543,11 @@
"prefab": "53002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "53002",
"vocal": "53002",
"tujing": [
@@ -13746,6 +14626,11 @@
"prefab": "53003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "53003",
"vocal": "53003",
"tujing": [
@@ -13824,6 +14709,11 @@
"prefab": "51012",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51012",
"vocal": "51012",
"tujing": [
@@ -13902,6 +14792,11 @@
"prefab": "51050",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51050",
"vocal": "51050",
"tujing": [
@@ -13980,6 +14875,11 @@
"prefab": "51051",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51051",
"vocal": "51051",
"tujing": [
@@ -14058,6 +14958,11 @@
"prefab": "51052",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51052",
"vocal": "51052",
"tujing": [
@@ -14136,6 +15041,11 @@
"prefab": "51053",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51053",
"vocal": "51053",
"tujing": [
@@ -14214,6 +15124,11 @@
"prefab": "51002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51002",
"vocal": "51002",
"tujing": [
@@ -14292,6 +15207,11 @@
"prefab": "51003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51003",
"vocal": "51003",
"tujing": [
@@ -14370,6 +15290,11 @@
"prefab": "51004",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51004",
"vocal": "51004",
"tujing": [
@@ -14448,6 +15373,11 @@
"prefab": "51005",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51005",
"vocal": "51005",
"tujing": [
@@ -14526,6 +15456,11 @@
"prefab": "51006",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51006",
"vocal": "51006",
"tujing": [
@@ -14604,6 +15539,11 @@
"prefab": "51010",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51010",
"vocal": "51010",
"tujing": [
@@ -14682,6 +15622,11 @@
"prefab": "51011",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51011",
"vocal": "51011",
"tujing": [
@@ -14760,6 +15705,11 @@
"prefab": "53001",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "53001",
"vocal": "53001",
"tujing": [
@@ -14838,6 +15788,11 @@
"prefab": "53002",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "53002",
"vocal": "53002",
"tujing": [
@@ -14916,6 +15871,11 @@
"prefab": "53003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "53003",
"vocal": "53003",
"tujing": [
@@ -14994,6 +15954,11 @@
"prefab": "51012",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51012",
"vocal": "51012",
"tujing": [
@@ -15072,6 +16037,11 @@
"prefab": "51050",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51050",
"vocal": "51050",
"tujing": [
@@ -15150,6 +16120,11 @@
"prefab": "51051",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51051",
"vocal": "51051",
"tujing": [
@@ -15228,6 +16203,11 @@
"prefab": "51052",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51052",
"vocal": "51052",
"tujing": [
@@ -15306,6 +16286,11 @@
"prefab": "51053",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51053",
"vocal": "51053",
"tujing": [
@@ -15384,6 +16369,11 @@
"prefab": "33003",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "33003",
"vocal": "33003",
"tujing": [
@@ -15462,6 +16452,11 @@
"prefab": "51005",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51005",
"vocal": "51005",
"tujing": [
@@ -15540,6 +16535,11 @@
"prefab": "23004",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "23004",
"vocal": "23004",
"tujing": [
@@ -15618,6 +16618,11 @@
"prefab": "53001",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "53001",
"vocal": "53001",
"tujing": [
@@ -15696,6 +16701,11 @@
"prefab": "14001",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 0.9,
+ 0.9,
+ 0.9
+ ],
"icon": "14001",
"vocal": "14001",
"tujing": [
@@ -15774,6 +16784,11 @@
"prefab": "51050",
"rotation": "0|0|0",
"revolve": 0,
+ "scale": [
+ 1,
+ 1,
+ 1
+ ],
"icon": "51050",
"vocal": "51050",
"tujing": [
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index 061138873..88ea1bbc5 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -89,7 +89,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "10000003",
@@ -346,7 +346,7 @@
"id": "10000008",
"name": {
"key": "item_item_name_8",
- "text": "守护者初级护身符"
+ "text": "初级护身符"
},
"usetype": 1,
"color": 2,
@@ -395,7 +395,7 @@
"id": "10000009",
"name": {
"key": "item_item_name_9",
- "text": "守护者中级护身符"
+ "text": "中级护身符"
},
"usetype": 1,
"color": 3,
@@ -444,7 +444,7 @@
"id": "10000010",
"name": {
"key": "item_item_name_10",
- "text": "守护者高级护身符"
+ "text": "高级护身符"
},
"usetype": 1,
"color": 4,
@@ -1150,7 +1150,7 @@
"text": "闪闪碎片"
},
"usetype": 7,
- "color": 4,
+ "color": 2,
"bagtype": 2,
"index": 2,
"special_type": 0,
@@ -1227,7 +1227,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50013002",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_24",
"text": "食人鱼先生碎片，集齐一定数量可以兑换相应的守护者。"
@@ -1247,7 +1247,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11013003",
@@ -1280,7 +1280,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50013003",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_25",
"text": "啊啊碎片，集齐一定数量可以兑换相应的守护者。"
@@ -1300,7 +1300,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11013004",
@@ -1333,7 +1333,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50013004",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_26",
"text": "法夸德勋爵碎片，集齐一定数量可以兑换相应的守护者。"
@@ -1353,7 +1353,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11013005",
@@ -1386,7 +1386,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50013005",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_27",
"text": "大大碎片，集齐一定数量可以兑换相应的守护者。"
@@ -1406,7 +1406,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11014001",
@@ -1439,7 +1439,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50014001",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_28",
"text": "史图依克碎片，集齐一定数量可以兑换相应的守护者。"
@@ -1459,7 +1459,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11014002",
@@ -1492,7 +1492,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50014002",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_29",
"text": "大龙碎片，集齐一定数量可以兑换相应的守护者。"
@@ -1512,7 +1512,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11014003",
@@ -1545,7 +1545,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50014003",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_30",
"text": "亚丝翠碎片，集齐一定数量可以兑换相应的守护者。"
@@ -1565,7 +1565,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11014004",
@@ -1598,7 +1598,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50014004",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_31",
"text": "克莱尔·努涅斯碎片，集齐一定数量可以兑换相应的守护者。"
@@ -1618,7 +1618,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11014005",
@@ -1651,7 +1651,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50014005",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_32",
"text": "鹤大师碎片，集齐一定数量可以兑换相应的守护者。"
@@ -1671,7 +1671,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11014006",
@@ -1704,7 +1704,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50014006",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_33",
"text": "布兰奇碎片，集齐一定数量可以兑换相应的守护者。"
@@ -1724,7 +1724,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11014007",
@@ -1757,7 +1757,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50014007",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_34",
"text": "格里斯特王子碎片，集齐一定数量可以兑换相应的守护者。"
@@ -1777,7 +1777,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11015001",
@@ -1810,7 +1810,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50015001",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_35",
"text": "吉姆·莱克碎片，集齐一定数量可以兑换相应的守护者。"
@@ -1830,7 +1830,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11015002",
@@ -1863,7 +1863,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50015002",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_36",
"text": "船长碎片，集齐一定数量可以兑换相应的守护者。"
@@ -1883,7 +1883,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11015003",
@@ -1916,7 +1916,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50015003",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_37",
"text": "希沙窦斯碎片，集齐一定数量可以兑换相应的守护者。"
@@ -1936,7 +1936,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11015004",
@@ -1969,7 +1969,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50015004",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_38",
"text": "小欧碎片，集齐一定数量可以兑换相应的守护者。"
@@ -1989,7 +1989,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11015005",
@@ -2022,7 +2022,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50023001",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_39",
"text": "亚力克斯碎片，集齐一定数量可以兑换相应的守护者。"
@@ -2042,7 +2042,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11023001",
@@ -2075,7 +2075,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50023002",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_40",
"text": "斯梅克船长碎片，集齐一定数量可以兑换相应的守护者。"
@@ -2095,7 +2095,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11023002",
@@ -2128,7 +2128,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50023003",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_41",
"text": "警卫队长碎片，集齐一定数量可以兑换相应的守护者。"
@@ -2148,7 +2148,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11023003",
@@ -2181,7 +2181,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50023004",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_42",
"text": "黛塔黛恩碎片，集齐一定数量可以兑换相应的守护者。"
@@ -2201,7 +2201,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11023004",
@@ -2234,7 +2234,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50024001",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_43",
"text": "吉姆·普雷斯科特碎片，集齐一定数量可以兑换相应的守护者。"
@@ -2254,7 +2254,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11024001",
@@ -2287,7 +2287,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50024002",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_44",
"text": "警长碎片，集齐一定数量可以兑换相应的守护者。"
@@ -2307,7 +2307,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11024002",
@@ -2340,7 +2340,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50024003",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_45",
"text": "牙仙碎片，集齐一定数量可以兑换相应的守护者。"
@@ -2360,7 +2360,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11024003",
@@ -2393,7 +2393,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50024004",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_46",
"text": "睡神沙人碎片，集齐一定数量可以兑换相应的守护者。"
@@ -2413,7 +2413,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11024004",
@@ -2446,7 +2446,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50024005",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_47",
"text": "邦尼兔碎片，集齐一定数量可以兑换相应的守护者。"
@@ -2466,7 +2466,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11024005",
@@ -2499,7 +2499,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50024006",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_48",
"text": "金猴碎片，集齐一定数量可以兑换相应的守护者。"
@@ -2519,7 +2519,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11024006",
@@ -2552,7 +2552,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50024007",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_49",
"text": "凯尔碎片，集齐一定数量可以兑换相应的守护者。"
@@ -2572,7 +2572,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11024007",
@@ -2605,7 +2605,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50024008",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_50",
"text": "小钱碎片，集齐一定数量可以兑换相应的守护者。"
@@ -2625,7 +2625,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11024008",
@@ -2658,7 +2658,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50024009",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_51",
"text": "暴芙那特碎片，集齐一定数量可以兑换相应的守护者。"
@@ -2678,7 +2678,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11024009",
@@ -2711,7 +2711,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50025001",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_52",
"text": "云朵先生碎片，集齐一定数量可以兑换相应的守护者。"
@@ -2731,7 +2731,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11025001",
@@ -2764,7 +2764,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50025002",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_53",
"text": "阿宝碎片，集齐一定数量可以兑换相应的守护者。"
@@ -2784,7 +2784,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11025002",
@@ -2817,7 +2817,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50025003",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_54",
"text": "沃尔夫先生碎片，集齐一定数量可以兑换相应的守护者。"
@@ -2837,7 +2837,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11025003",
@@ -2870,7 +2870,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50025004",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_55",
"text": "羊仙姑碎片，集齐一定数量可以兑换相应的守护者。"
@@ -2890,7 +2890,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11025004",
@@ -2923,7 +2923,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50033001",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_56",
"text": "波比碎片，集齐一定数量可以兑换相应的守护者。"
@@ -2943,7 +2943,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11033001",
@@ -2976,7 +2976,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50033002",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_57",
"text": "巫嘎碎片，集齐一定数量可以兑换相应的守护者。"
@@ -2996,7 +2996,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11033002",
@@ -3029,7 +3029,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50033003",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_58",
"text": "坦克碎片，集齐一定数量可以兑换相应的守护者。"
@@ -3049,7 +3049,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11033003",
@@ -3082,7 +3082,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50033004",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_59",
"text": "胡德先生碎片，集齐一定数量可以兑换相应的守护者。"
@@ -3102,7 +3102,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11033004",
@@ -3135,7 +3135,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50033005",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_60",
"text": "普鲁格兰杰碎片，集齐一定数量可以兑换相应的守护者。"
@@ -3155,7 +3155,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11033005",
@@ -3188,7 +3188,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50033006",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_61",
"text": "鼻涕粗碎片，集齐一定数量可以兑换相应的守护者。"
@@ -3208,7 +3208,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11033006",
@@ -3241,7 +3241,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50034001",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_62",
"text": "珍妮丝·邓普顿碎片，集齐一定数量可以兑换相应的守护者。"
@@ -3261,7 +3261,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11034001",
@@ -3294,7 +3294,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50034002",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_63",
"text": "贫嘴驴碎片，集齐一定数量可以兑换相应的守护者。"
@@ -3314,7 +3314,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11034002",
@@ -3347,7 +3347,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50034003",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_64",
"text": "蒂姆·邓普顿碎片，集齐一定数量可以兑换相应的守护者。"
@@ -3367,7 +3367,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11034003",
@@ -3400,7 +3400,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50034004",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_65",
"text": "圣诞老人碎片，集齐一定数量可以兑换相应的守护者。"
@@ -3420,7 +3420,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11034004",
@@ -3453,7 +3453,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50034005",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_66",
"text": "瓜哥碎片，集齐一定数量可以兑换相应的守护者。"
@@ -3473,7 +3473,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11034005",
@@ -3506,7 +3506,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50034006",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_67",
"text": "沃尔特·史翠克勒碎片，集齐一定数量可以兑换相应的守护者。"
@@ -3526,7 +3526,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11034006",
@@ -3559,7 +3559,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50034007",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_68",
"text": "冰霜杰克碎片，集齐一定数量可以兑换相应的守护者。"
@@ -3579,7 +3579,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11034007",
@@ -3612,7 +3612,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50034008",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_69",
"text": "菲奥娜碎片，集齐一定数量可以兑换相应的守护者。"
@@ -3632,7 +3632,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11034008",
@@ -3665,7 +3665,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50035001",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_70",
"text": "悍夫那特碎片，集齐一定数量可以兑换相应的守护者。"
@@ -3685,7 +3685,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11035001",
@@ -3718,7 +3718,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50035002",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_71",
"text": "师父碎片，集齐一定数量可以兑换相应的守护者。"
@@ -3738,7 +3738,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11035002",
@@ -3771,7 +3771,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50035003",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_72",
"text": "希卡普碎片，集齐一定数量可以兑换相应的守护者。"
@@ -3791,7 +3791,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11035003",
@@ -3824,7 +3824,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50035004",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_73",
"text": "漆黑碎片，集齐一定数量可以兑换相应的守护者。"
@@ -3844,7 +3844,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11035004",
@@ -3877,7 +3877,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50035005",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_74",
"text": "黛安·福克斯顿碎片，集齐一定数量可以兑换相应的守护者。"
@@ -3897,7 +3897,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11035005",
@@ -3930,7 +3930,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50035006",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_75",
"text": "幸运·普雷斯科特碎片，集齐一定数量可以兑换相应的守护者。"
@@ -3950,7 +3950,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11035006",
@@ -3983,7 +3983,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50043001",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_76",
"text": "平先生碎片，集齐一定数量可以兑换相应的守护者。"
@@ -4003,7 +4003,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11043001",
@@ -4036,7 +4036,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50043002",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_77",
"text": "阿比盖尔·斯通碎片，集齐一定数量可以兑换相应的守护者。"
@@ -4056,7 +4056,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11043002",
@@ -4089,7 +4089,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50043003",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_78",
"text": "果酱教授碎片，集齐一定数量可以兑换相应的守护者。"
@@ -4109,7 +4109,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11043003",
@@ -4142,7 +4142,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50043004",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_79",
"text": "史蒂夫·帕丘克碎片，集齐一定数量可以兑换相应的守护者。"
@@ -4162,7 +4162,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11043004",
@@ -4195,7 +4195,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50043005",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_80",
"text": "姜饼人碎片，集齐一定数量可以兑换相应的守护者。"
@@ -4215,7 +4215,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11043005",
@@ -4248,7 +4248,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50043006",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_81",
"text": "瓦希尔指挥官碎片，集齐一定数量可以兑换相应的守护者。"
@@ -4268,7 +4268,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11043006",
@@ -4301,7 +4301,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50043007",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_82",
"text": "布里奇特碎片，集齐一定数量可以兑换相应的守护者。"
@@ -4321,7 +4321,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11043007",
@@ -4354,7 +4354,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50044001",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_83",
"text": "戈伯碎片，集齐一定数量可以兑换相应的守护者。"
@@ -4374,7 +4374,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11044001",
@@ -4407,7 +4407,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50044002",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_84",
"text": "美肚鲨碎片，集齐一定数量可以兑换相应的守护者。"
@@ -4427,7 +4427,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11044002",
@@ -4460,7 +4460,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50044003",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_85",
"text": "蛇先生碎片，集齐一定数量可以兑换相应的守护者。"
@@ -4480,7 +4480,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11044003",
@@ -4513,7 +4513,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50044004",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_86",
"text": "匹诺曹碎片，集齐一定数量可以兑换相应的守护者。"
@@ -4533,7 +4533,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11044004",
@@ -4566,7 +4566,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50044006",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_87",
"text": "骇客蛛碎片，集齐一定数量可以兑换相应的守护者。"
@@ -4586,7 +4586,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11044005",
@@ -4619,7 +4619,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50045001",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_88",
"text": "小伊碎片，集齐一定数量可以兑换相应的守护者。"
@@ -4639,7 +4639,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11044006",
@@ -4672,7 +4672,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50045002",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_89",
"text": "悍娇虎碎片，集齐一定数量可以兑换相应的守护者。"
@@ -4692,7 +4692,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11045001",
@@ -4725,7 +4725,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50045003",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_90",
"text": "乌龟大师碎片，集齐一定数量可以兑换相应的守护者。"
@@ -4745,7 +4745,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11045002",
@@ -4778,7 +4778,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50045004",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_91",
"text": "梅林碎片，集齐一定数量可以兑换相应的守护者。"
@@ -4798,7 +4798,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11045003",
@@ -4831,7 +4831,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50044005",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_92",
"text": "盖碎片，集齐一定数量可以兑换相应的守护者。"
@@ -4851,7 +4851,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "11045004",
@@ -4884,7 +4884,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
- "img": "item_50015005",
+ "img": "item_50013001",
"intr": {
"key": "item_item_intr_93",
"text": "穿靴子的猫碎片，集齐一定数量可以兑换相应的守护者。"
@@ -4904,7 +4904,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12013001",
@@ -5247,7 +5247,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12014003",
@@ -5345,7 +5345,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12014005",
@@ -5443,7 +5443,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12014007",
@@ -5541,7 +5541,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12015002",
@@ -5786,7 +5786,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12023002",
@@ -5835,7 +5835,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12023003",
@@ -5884,7 +5884,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12023004",
@@ -6227,7 +6227,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12024007",
@@ -6276,7 +6276,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12024008",
@@ -6472,7 +6472,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12025003",
@@ -6521,7 +6521,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12025004",
@@ -6619,7 +6619,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12033002",
@@ -6668,7 +6668,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12033003",
@@ -6766,7 +6766,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12033005",
@@ -6815,7 +6815,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12033006",
@@ -6864,7 +6864,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12034001",
@@ -6913,7 +6913,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12034002",
@@ -7060,7 +7060,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12034005",
@@ -7403,7 +7403,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12035004",
@@ -7452,7 +7452,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12035005",
@@ -7697,7 +7697,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12043004",
@@ -7746,7 +7746,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12043005",
@@ -7795,7 +7795,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12043006",
@@ -7893,7 +7893,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12044001",
@@ -7942,7 +7942,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12044002",
@@ -7991,7 +7991,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12044003",
@@ -8040,7 +8040,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12044004",
@@ -8285,7 +8285,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "12045003",
@@ -8383,7 +8383,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "13000001",
@@ -15360,7 +15360,7 @@
"id": "17050001",
"name": {
"key": "item_item_name_305",
- "text": "5星全守护者自选宝箱"
+ "text": "5星全守护者自选箱"
},
"usetype": 4,
"color": 5,
@@ -15407,7 +15407,7 @@
"id": "17050002",
"name": {
"key": "item_item_name_306",
- "text": "5星热情之火自选宝箱"
+ "text": "5星热情之火自选箱"
},
"usetype": 4,
"color": 5,
@@ -15454,7 +15454,7 @@
"id": "17050003",
"name": {
"key": "item_item_name_307",
- "text": "5星感观之林自选宝箱"
+ "text": "5星感观之林自选箱"
},
"usetype": 4,
"color": 5,
@@ -15501,7 +15501,7 @@
"id": "17050004",
"name": {
"key": "item_item_name_308",
- "text": "5星包容之水自选宝箱"
+ "text": "5星包容之水自选箱"
},
"usetype": 4,
"color": 5,
@@ -15548,7 +15548,7 @@
"id": "17050005",
"name": {
"key": "item_item_name_309",
- "text": "5星荣耀之光自选宝箱"
+ "text": "5星荣耀之光自选箱"
},
"usetype": 4,
"color": 5,
@@ -15736,7 +15736,7 @@
"id": "17060002",
"name": {
"key": "item_item_name_313",
- "text": "热情之火回响材料宝箱"
+ "text": "热情之火回响箱"
},
"usetype": 4,
"color": 5,
@@ -15783,7 +15783,7 @@
"id": "17060003",
"name": {
"key": "item_item_name_314",
- "text": "感观之林回响材料宝箱"
+ "text": "感观之林回响箱"
},
"usetype": 4,
"color": 5,
@@ -15830,7 +15830,7 @@
"id": "17060004",
"name": {
"key": "item_item_name_315",
- "text": "包容之水回响材料宝箱"
+ "text": "包容之水回响箱"
},
"usetype": 4,
"color": 5,
@@ -15877,7 +15877,7 @@
"id": "17060005",
"name": {
"key": "item_item_name_316",
- "text": "荣耀之光回响材料宝箱"
+ "text": "荣耀之光回响箱"
},
"usetype": 4,
"color": 5,
@@ -18334,7 +18334,7 @@
"id": "21000013",
"name": {
"key": "item_item_name_367",
- "text": "纪念版巨怪徽章"
+ "text": "典藏巨怪徽章"
},
"usetype": 2,
"color": 2,
@@ -19509,7 +19509,7 @@
"id": "23000001",
"name": {
"key": "item_item_name_392",
- "text": "开服活动抽奖卷"
+ "text": "开服抽奖券"
},
"usetype": 2,
"color": 2,
@@ -19697,7 +19697,7 @@
"id": "10000039",
"name": {
"key": "item_item_name_396",
- "text": "石阵秘境宝箱钥匙"
+ "text": "秘境宝箱钥匙"
},
"usetype": 1,
"color": 4,
@@ -19744,7 +19744,7 @@
"id": "17110001",
"name": {
"key": "item_item_name_397",
- "text": "3种族招募卡自选箱"
+ "text": "3种族自选箱"
},
"usetype": 4,
"color": 5,
@@ -19785,7 +19785,7 @@
"n": 1000
}
],
- "gm": 0
+ "gm": 1
},
{
"id": "17040001",
@@ -20451,7 +20451,7 @@
"id": "24012011",
"name": {
"key": "item_item_name_412",
- "text": "与龙之花结合的鱼"
+ "text": "龙之花鱼"
},
"usetype": 1,
"color": 2,
diff --git a/bin/json/game_loading.json b/bin/json/game_loading.json
index a177f7f90..b0d1c8307 100644
--- a/bin/json/game_loading.json
+++ b/bin/json/game_loading.json
@@ -6,7 +6,7 @@
"icon": "loading_icon_fc",
"prompt": {
"key": "loading_Sheet1_prompt_1",
- "text": "废墟中重建的奇迹，文明与希望的火种，人类的新家园中轴城。"
+ "text": "地下的月能闪耀光芒，中心的桃树继续盛放，城中的一切都充满希望。"
}
},
{
@@ -26,7 +26,7 @@
"icon": "loading_icon_gfxm",
"prompt": {
"key": "loading_Sheet1_prompt_3",
- "text": "武学的第一奥义，便是要心如止水。"
+ "text": "功夫的心学奥义，便是要心如止水。"
}
},
{
diff --git a/bin/json/game_lottery.json b/bin/json/game_lottery.json
index a54813861..3de8e246a 100644
--- a/bin/json/game_lottery.json
+++ b/bin/json/game_lottery.json
@@ -23405,7 +23405,7 @@
"description": "英雄自选宝箱",
"type": 3,
"groupwt": 0,
- "groupid": 2,
+ "groupid": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
@@ -23429,7 +23429,7 @@
"description": "英雄自选宝箱",
"type": 3,
"groupwt": 0,
- "groupid": 2,
+ "groupid": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
@@ -23453,7 +23453,7 @@
"description": "英雄自选宝箱",
"type": 3,
"groupwt": 0,
- "groupid": 2,
+ "groupid": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
@@ -23477,7 +23477,7 @@
"description": "英雄自选宝箱",
"type": 3,
"groupwt": 0,
- "groupid": 2,
+ "groupid": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
@@ -23501,7 +23501,7 @@
"description": "英雄自选宝箱",
"type": 3,
"groupwt": 0,
- "groupid": 2,
+ "groupid": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
@@ -23525,7 +23525,7 @@
"description": "英雄自选宝箱",
"type": 3,
"groupwt": 0,
- "groupid": 2,
+ "groupid": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
@@ -23549,7 +23549,7 @@
"description": "英雄自选宝箱",
"type": 3,
"groupwt": 0,
- "groupid": 2,
+ "groupid": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
@@ -23573,7 +23573,7 @@
"description": "英雄自选宝箱",
"type": 3,
"groupwt": 0,
- "groupid": 2,
+ "groupid": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
@@ -23597,7 +23597,7 @@
"description": "英雄自选宝箱",
"type": 3,
"groupwt": 0,
- "groupid": 2,
+ "groupid": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index 61caef89d..125e6fd54 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -481,10 +481,10 @@
{
"Id": 225004315,
"EmitPR": 1000,
- "From": 1,
+ "From": 8,
"Where": [],
"Order": "",
- "Limit": 10,
+ "Limit": 1,
"ExecuteCnt": 1,
"Type": 5,
"Argu": [
@@ -550,10 +550,10 @@
{
"Id": 225004325,
"EmitPR": 1000,
- "From": 1,
+ "From": 8,
"Where": [],
"Order": "",
- "Limit": 10,
+ "Limit": 1,
"ExecuteCnt": 1,
"Type": 5,
"Argu": [
@@ -596,10 +596,10 @@
{
"Id": 225004335,
"EmitPR": 1000,
- "From": 1,
+ "From": 8,
"Where": [],
"Order": "",
- "Limit": 10,
+ "Limit": 1,
"ExecuteCnt": 1,
"Type": 5,
"Argu": [
@@ -642,10 +642,10 @@
{
"Id": 225004345,
"EmitPR": 1000,
- "From": 1,
+ "From": 8,
"Where": [],
"Order": "",
- "Limit": 10,
+ "Limit": 1,
"ExecuteCnt": 1,
"Type": 5,
"Argu": [
diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json
index c1bd1cadf..3dfb26108 100644
--- a/bin/json/game_skillpassive.json
+++ b/bin/json/game_skillpassive.json
@@ -2287,7 +2287,7 @@
},
{
"Id": 414002212,
- "When": 12,
+ "When": 16,
"FromCheck": "Target=2,HasBuff=390001426",
"TargetCheck": "Target=3",
"MainSkillCheck": "",
@@ -2309,7 +2309,7 @@
},
{
"Id": 414002213,
- "When": 12,
+ "When": 16,
"FromCheck": "Target=2,HasBuff=390001426",
"TargetCheck": "Target=4",
"MainSkillCheck": "",
@@ -3391,9 +3391,9 @@
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
- "MaxEmitTimesInRoundByRole": 0,
+ "MaxEmitTimesInRoundByRole": 1,
"MaxEmitTimes": 0,
- "MaxEmitTimesInRound": 10,
+ "MaxEmitTimesInRound": 0,
"Callback": [
224008114
]
@@ -3413,9 +3413,9 @@
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
- "MaxEmitTimesInRoundByRole": 0,
+ "MaxEmitTimesInRoundByRole": 1,
"MaxEmitTimes": 0,
- "MaxEmitTimesInRound": 10,
+ "MaxEmitTimesInRound": 0,
"Callback": [
224008214
]
@@ -3435,9 +3435,9 @@
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
- "MaxEmitTimesInRoundByRole": 0,
+ "MaxEmitTimesInRoundByRole": 1,
"MaxEmitTimes": 0,
- "MaxEmitTimesInRound": 1,
+ "MaxEmitTimesInRound": 0,
"Callback": [
234008114
]
@@ -3457,9 +3457,9 @@
"PasPr": 1000,
"PasCorrection": 0,
"Type": "CallSkillPas",
- "MaxEmitTimesInRoundByRole": 0,
+ "MaxEmitTimesInRoundByRole": 1,
"MaxEmitTimes": 0,
- "MaxEmitTimesInRound": 1,
+ "MaxEmitTimesInRound": 0,
"Callback": [
234008214
]
diff --git a/comm/const.go b/comm/const.go
index 231b991d8..33170c13a 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -122,6 +122,7 @@ const (
ModuleCanineRabbit core.M_Modules = "caninerabbit" //犬兔游戏
ModuleIsLand core.M_Modules = "island" //海岛探险
ModuleEgghunt core.M_Modules = "egghunt" //彩蛋
+ ModuleCatchbugs core.M_Modules = "catchbugs" //捉虫子
)
// 数据表名定义处
diff --git a/modules/caninerabbit/module.go b/modules/caninerabbit/module.go
index 7e0c57e22..bccd02680 100644
--- a/modules/caninerabbit/module.go
+++ b/modules/caninerabbit/module.go
@@ -68,6 +68,8 @@ func (this *CanineRabbit) CreateRoom(sessions []comm.IUserSession, rulesStr stri
red *pb.DBUser
redtype, bluetype int32
blue *pb.DBUser
+ redinfo *pb.DBCanineRabbit
+ blueinfo *pb.DBCanineRabbit
room *Room
)
@@ -87,6 +89,16 @@ func (this *CanineRabbit) CreateRoom(sessions []comm.IUserSession, rulesStr stri
this.Error("未找到蓝方信息", log.Field{Key: "uid", Value: sessions[1].GetUserId()})
return
}
+
+ if redinfo, err = this.model.getModel(sessions[0].GetUserId()); err != nil {
+ this.Error("未找到红方信息", log.Field{Key: "uid", Value: sessions[0].GetUserId()})
+ return
+ }
+ if blueinfo, err = this.model.getModel(sessions[0].GetUserId()); err != nil {
+ this.Error("未找到蓝方信息", log.Field{Key: "uid", Value: sessions[0].GetUserId()})
+ return
+ }
+
chess = make([]*pb.DBCanineRabbitChess, 0)
roomid = primitive.NewObjectID().Hex()
@@ -127,12 +139,16 @@ func (this *CanineRabbit) CreateRoom(sessions []comm.IUserSession, rulesStr stri
Rid: roomid,
Rules: rules,
Red: &pb.DBCanineRabbitRoomPlayer{
- Info: comm.GetUserBaseInfo(red),
- Ctype: redtype,
+ Info: comm.GetUserBaseInfo(red),
+ Rabbitintegral: redinfo.Rabbitintegral,
+ Houndintegral: redinfo.Houndintegral,
+ Ctype: redtype,
},
Blue: &pb.DBCanineRabbitRoomPlayer{
- Info: comm.GetUserBaseInfo(blue),
- Ctype: bluetype,
+ Info: comm.GetUserBaseInfo(blue),
+ Rabbitintegral: blueinfo.Rabbitintegral,
+ Houndintegral: blueinfo.Houndintegral,
+ Ctype: bluetype,
},
Chess: chess,
}, sessions); err != nil {
diff --git a/modules/catchbugs/api.go b/modules/catchbugs/api.go
new file mode 100644
index 000000000..d2bc8ec11
--- /dev/null
+++ b/modules/catchbugs/api.go
@@ -0,0 +1,17 @@
+package catchbugs
+
+import (
+ "go_dreamfactory/lego/core"
+ "go_dreamfactory/modules"
+)
+
+type apiComp struct {
+ modules.MCompGate
+ module *CatchBugs
+}
+
+func (this *apiComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
+ _ = this.MCompGate.Init(service, module, comp, options)
+ this.module = module.(*CatchBugs)
+ return
+}
diff --git a/modules/catchbugs/api_award.go b/modules/catchbugs/api_award.go
new file mode 100644
index 000000000..21b6cc244
--- /dev/null
+++ b/modules/catchbugs/api_award.go
@@ -0,0 +1,56 @@
+package catchbugs
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+ cfg "go_dreamfactory/sys/configure/structs"
+)
+
+func (this *apiComp) AwardCheck(session comm.IUserSession, req *pb.CatchbugsAwardReq) (errdata *pb.ErrorData) {
+ return
+}
+
+func (this *apiComp) Award(session comm.IUserSession, req *pb.CatchbugsAwardReq) (errdata *pb.ErrorData) {
+ var (
+ confs []*cfg.GameCatchbugRewardData
+ info *pb.DBCatchBugs
+ res []*cfg.Gameatn
+ atno []*pb.UserAtno
+ ok bool
+ err error
+ )
+ if errdata = this.AwardCheck(session, req); errdata != nil {
+ return
+ }
+ if confs, err = this.module.configure.getGameGColorRewardDatas(); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ConfigNoFound,
+ Message: err.Error(),
+ }
+ return
+ }
+
+ if info, err = this.module.model.getModel(session.GetUserId()); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Message: err.Error(),
+ }
+ return
+ }
+
+ for _, v := range confs {
+ if _, ok = info.Awards[v.Key]; !ok && info.Integral >= v.Condition {
+ res = append(res, v.Reward...)
+ info.Awards[v.Key] = true
+ }
+ }
+
+ if errdata, atno = this.module.DispenseAtno(session, res, true); errdata != nil {
+ return
+ }
+ this.module.model.Change(session.GetUserId(), map[string]interface{}{
+ "award": info.Awards,
+ })
+ session.SendMsg(string(this.module.GetType()), "award", &pb.CatchbugsAwardResp{Awardmap: info.Awards, Award: atno})
+ return
+}
diff --git a/modules/catchbugs/api_handle.go b/modules/catchbugs/api_handle.go
new file mode 100644
index 000000000..6c7e6097a
--- /dev/null
+++ b/modules/catchbugs/api_handle.go
@@ -0,0 +1,48 @@
+package catchbugs
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+)
+
+//接受切磋
+func (this *apiComp) HandleCheck(session comm.IUserSession, req *pb.CatchbugsHandleReq) (errdata *pb.ErrorData) {
+ if req.Roomid == "" {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ReqParameterError,
+ Title: pb.ErrorCode_ReqParameterError.ToString(),
+ }
+ }
+ return
+}
+
+func (this *apiComp) Handle(session comm.IUserSession, req *pb.CatchbugsHandleReq) (errdata *pb.ErrorData) {
+ var (
+ room *Room
+ err error
+ )
+
+ if errdata = this.HandleCheck(session, req); errdata != nil {
+ return
+ }
+
+ if room, err = this.module.rooms.queryRoom(req.Roomid); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.String(),
+ Message: err.Error(),
+ }
+ return
+ }
+
+ if err = room.PlayerHandle(session.GetUserId(), req); errdata != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.String(),
+ Message: err.Error(),
+ }
+ return
+ }
+ session.SendMsg(string(this.module.GetType()), "handle", &pb.CanineRabbitHandleResp{})
+ return
+}
diff --git a/modules/catchbugs/api_handleend.go b/modules/catchbugs/api_handleend.go
new file mode 100644
index 000000000..8aea1cbd2
--- /dev/null
+++ b/modules/catchbugs/api_handleend.go
@@ -0,0 +1,48 @@
+package catchbugs
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+)
+
+//接受切磋
+func (this *apiComp) HandleEndCheck(session comm.IUserSession, req *pb.CatchbugsHandleEndReq) (errdata *pb.ErrorData) {
+ if req.Roomid == "" {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ReqParameterError,
+ Title: pb.ErrorCode_ReqParameterError.ToString(),
+ }
+ }
+ return
+}
+
+func (this *apiComp) HandleEnd(session comm.IUserSession, req *pb.CatchbugsHandleEndReq) (errdata *pb.ErrorData) {
+ var (
+ room *Room
+ err error
+ )
+
+ if errdata = this.HandleEndCheck(session, req); errdata != nil {
+ return
+ }
+
+ if room, err = this.module.rooms.queryRoom(req.Roomid); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.String(),
+ Message: err.Error(),
+ }
+ return
+ }
+
+ if err = room.PlayerHandleEnd(session.GetUserId(), req); errdata != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.String(),
+ Message: err.Error(),
+ }
+ return
+ }
+ session.SendMsg(string(this.module.GetType()), "handle", &pb.CatchbugsHandleEndResp{})
+ return
+}
diff --git a/modules/catchbugs/api_info.go b/modules/catchbugs/api_info.go
new file mode 100644
index 000000000..16a789c36
--- /dev/null
+++ b/modules/catchbugs/api_info.go
@@ -0,0 +1,30 @@
+package catchbugs
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+)
+
+func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.CatchbugsInfoReq) (errdata *pb.ErrorData) {
+ return
+}
+
+func (this *apiComp) Info(session comm.IUserSession, req *pb.CatchbugsInfoReq) (errdata *pb.ErrorData) {
+ var (
+ info *pb.DBCatchBugs
+ err error
+ )
+ if errdata = this.InfoCheck(session, req); errdata != nil {
+ return
+ }
+ if info, err = this.module.model.getModel(session.GetUserId()); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Message: err.Error(),
+ }
+ return
+ }
+
+ session.SendMsg(string(this.module.GetType()), "info", &pb.CatchbugsInfoResp{Info: info})
+ return
+}
diff --git a/modules/catchbugs/api_loadcomplete.go b/modules/catchbugs/api_loadcomplete.go
new file mode 100644
index 000000000..5dc569134
--- /dev/null
+++ b/modules/catchbugs/api_loadcomplete.go
@@ -0,0 +1,48 @@
+package catchbugs
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+)
+
+//接受切磋
+func (this *apiComp) LoadCompleteCheck(session comm.IUserSession, req *pb.CanineRabbitLoadCompleteReq) (errdata *pb.ErrorData) {
+ if req.Roomid == "" {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ReqParameterError,
+ Title: pb.ErrorCode_ReqParameterError.ToString(),
+ }
+ }
+ return
+}
+
+func (this *apiComp) LoadComplete(session comm.IUserSession, req *pb.CanineRabbitLoadCompleteReq) (errdata *pb.ErrorData) {
+ var (
+ room *Room
+ err error
+ )
+
+ if errdata = this.LoadCompleteCheck(session, req); errdata != nil {
+ return
+ }
+
+ if room, err = this.module.rooms.queryRoom(req.Roomid); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.String(),
+ Message: err.Error(),
+ }
+ return
+ }
+
+ if err = room.PlayerLoadEnd(session.GetUserId()); errdata != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.String(),
+ Message: err.Error(),
+ }
+ return
+ }
+ session.SendMsg(string(this.module.GetType()), "loadcomplete", &pb.CanineRabbitLoadCompleteResp{Roomid: req.Roomid, Issucc: true})
+ return
+}
diff --git a/modules/catchbugs/api_singleover.go b/modules/catchbugs/api_singleover.go
new file mode 100644
index 000000000..b8071dd83
--- /dev/null
+++ b/modules/catchbugs/api_singleover.go
@@ -0,0 +1,21 @@
+package catchbugs
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+)
+
+//接受切磋
+
+func (this *apiComp) SingleOverCheck(session comm.IUserSession, req *pb.CanineRabbitSingleOverReq) (errdata *pb.ErrorData) {
+
+ return
+}
+
+func (this *apiComp) SingleOver(session comm.IUserSession, req *pb.CanineRabbitSingleOverReq) (errdata *pb.ErrorData) {
+ if errdata = this.SingleOverCheck(session, req); errdata != nil {
+ return
+ }
+ session.SendMsg(string(this.module.GetType()), "singleover", &pb.CanineRabbitSingleOverResp{})
+ return
+}
diff --git a/modules/catchbugs/configure.go b/modules/catchbugs/configure.go
new file mode 100644
index 000000000..54ae546db
--- /dev/null
+++ b/modules/catchbugs/configure.go
@@ -0,0 +1,51 @@
+package catchbugs
+
+import (
+ "go_dreamfactory/lego/core"
+ "go_dreamfactory/modules"
+ cfg "go_dreamfactory/sys/configure/structs"
+)
+
+const (
+ game_catchbugreward = "game_catchbugreward.json"
+ game_catchbuglllustrated = "game_catchbuglllustrated.json"
+)
+
+type configureComp struct {
+ modules.MCompConfigure
+ module *CatchBugs
+}
+
+func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
+ err = this.MCompConfigure.Init(service, module, comp, options)
+ this.module = module.(*CatchBugs)
+ err = this.LoadMultiConfigure(map[string]interface{}{
+ game_catchbugreward: cfg.NewGameCatchbugReward,
+ game_catchbuglllustrated: cfg.NewGameCatchbugLllustrated,
+ })
+ return
+}
+
+// 获取奖励列表
+func (this *configureComp) getGameGColorRewardDatas() (confs []*cfg.GameCatchbugRewardData, err error) {
+ var (
+ v interface{}
+ )
+ if v, err = this.GetConfigure(game_catchbugreward); err != nil {
+ return
+ }
+ confs = v.(*cfg.GameCatchbugReward).GetDataList()
+ return
+}
+
+// 获取奖励列表
+func (this *configureComp) getGameCatchbugLllustratedDatas() (confs []*cfg.GameCatchbugLllustratedData, err error) {
+ var (
+ v interface{}
+ )
+ if v, err = this.GetConfigure(game_catchbuglllustrated); err != nil {
+ return
+ }
+ confs = v.(*cfg.GameCatchbugLllustrated).GetDataList()
+ return
+}
diff --git a/modules/catchbugs/model.go b/modules/catchbugs/model.go
new file mode 100644
index 000000000..f2e4a1642
--- /dev/null
+++ b/modules/catchbugs/model.go
@@ -0,0 +1,46 @@
+package catchbugs
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/lego/core"
+ "go_dreamfactory/lego/sys/mgo"
+ "go_dreamfactory/modules"
+ "go_dreamfactory/pb"
+
+ "go.mongodb.org/mongo-driver/bson/primitive"
+ "go.mongodb.org/mongo-driver/mongo"
+ "go.mongodb.org/mongo-driver/x/bsonx"
+)
+
+type modelComp struct {
+ modules.MCompModel
+ module *CatchBugs
+}
+
+func (this *modelComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
+ err = this.MCompModel.Init(service, module, comp, options)
+ this.TableName = comm.TablekCanineRabbit
+ this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
+ Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}},
+ })
+ return
+}
+
+// 获取用户全部的埋点数据
+func (this *modelComp) getModel(uid string) (info *pb.DBCatchBugs, err error) {
+ info = &pb.DBCatchBugs{}
+ if err = this.Get(uid, info); err != nil && err != mgo.MongodbNil {
+ this.module.Errorln(err)
+ return
+ }
+ if err == mgo.MongodbNil {
+ info = &pb.DBCatchBugs{
+ Id: primitive.NewObjectID().Hex(),
+ Uid: uid,
+ Books: make(map[int32]int32),
+ Awards: make(map[int32]bool),
+ }
+ err = this.Add(uid, info)
+ }
+ return
+}
diff --git a/modules/catchbugs/module.go b/modules/catchbugs/module.go
new file mode 100644
index 000000000..c34dbf2d1
--- /dev/null
+++ b/modules/catchbugs/module.go
@@ -0,0 +1,154 @@
+package catchbugs
+
+import (
+ "encoding/json"
+ "go_dreamfactory/comm"
+ "go_dreamfactory/lego/core"
+ "go_dreamfactory/lego/sys/log"
+ "go_dreamfactory/modules"
+ "go_dreamfactory/pb"
+ cfg "go_dreamfactory/sys/configure/structs"
+
+ "go.mongodb.org/mongo-driver/bson/primitive"
+)
+
+func NewModule() core.IModule {
+ m := new(CatchBugs)
+ return m
+}
+
+/*
+模块名称:捉虫子
+*/
+type CatchBugs struct {
+ modules.ModuleBase
+ service comm.IService
+ api *apiComp
+ configure *configureComp
+ model *modelComp
+ rooms *roomsComp
+ gameInvite comm.IGameInvite
+}
+
+// 模块名
+func (this *CatchBugs) GetType() core.M_Modules {
+ return comm.ModuleCatchbugs
+}
+
+// 模块初始化接口 注册用户创建角色事件
+func (this *CatchBugs) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
+ err = this.ModuleBase.Init(service, module, options)
+ this.service = service.(comm.IService)
+ return
+}
+
+func (this *CatchBugs) Start() (err error) {
+ if err = this.ModuleBase.Start(); err != nil {
+ return
+ }
+ var module core.IModule
+ if module, err = this.service.GetModule(comm.ModuleGameInvite); err != nil {
+ return
+ }
+ this.gameInvite = module.(comm.IGameInvite)
+ return
+}
+
+func (this *CatchBugs) OnInstallComp() {
+ this.ModuleBase.OnInstallComp()
+ this.api = this.RegisterComp(new(apiComp)).(*apiComp)
+ this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
+ this.model = this.RegisterComp(new(modelComp)).(*modelComp)
+ this.rooms = this.RegisterComp(new(roomsComp)).(*roomsComp)
+}
+
+func (this *CatchBugs) CreateRoom(sessions []comm.IUserSession, rulesStr string) (roomid string, err error) {
+ var (
+ rules *pb.DBCatchBugsRules = &pb.DBCatchBugsRules{}
+ confs []*cfg.GameCatchbugLllustratedData
+ cardsSlice []int32
+ cardsTemp []*pb.DBCatchBugsCard
+ cards []*pb.DBCatchBugsCard
+ weights []int32
+ red *pb.DBUser
+ blue *pb.DBUser
+ redinfo *pb.DBCatchBugs
+ blueinfo *pb.DBCatchBugs
+ room *Room
+ )
+ if err = json.Unmarshal([]byte(rulesStr), rules); err != nil {
+ this.Error("解析规则json", log.Field{Key: "err", Value: err.Error()})
+ return
+ }
+ //发起者 red
+ red, err = this.ModuleUser.GetUser(sessions[0].GetUserId())
+ if err != nil {
+ this.Error("未找到红方信息", log.Field{Key: "uid", Value: sessions[0].GetUserId()})
+ return
+ }
+ blue, err = this.ModuleUser.GetUser(sessions[1].GetUserId())
+ if err != nil {
+ this.Error("未找到蓝方信息", log.Field{Key: "uid", Value: sessions[1].GetUserId()})
+ return
+ }
+
+ if confs, err = this.configure.getGameCatchbugLllustratedDatas(); err != nil {
+ this.Error("配置未找到", log.Field{Key: "err", Value: err.Error()})
+ return
+ }
+
+ for _, v := range confs {
+ weights = append(weights, v.Weights)
+ }
+ results := comm.GetRandWs(weights, 24)
+ for _, v := range results {
+ cardsSlice = append(cardsSlice, confs[v].Id)
+ }
+
+ for i, v := range cardsSlice[:12] {
+ cardsTemp = append(cardsTemp, &pb.DBCatchBugsCard{
+ Id: int32(1000 + i*2),
+ Cid: v,
+ }, &pb.DBCatchBugsCard{
+ Id: int32(1001 + i*2),
+ Cid: v,
+ })
+ }
+
+ indexs := comm.RandShuffle(len(cardsTemp))
+ cards = make([]*pb.DBCatchBugsCard, len(cardsTemp))
+ for i, v := range indexs {
+ cards[i] = cardsTemp[v]
+ cards[i].Index = int32(i)
+ }
+
+ if redinfo, err = this.model.getModel(sessions[0].GetUserId()); err != nil {
+ this.Error("未找到红方信息", log.Field{Key: "uid", Value: sessions[0].GetUserId()})
+ return
+ }
+ if blueinfo, err = this.model.getModel(sessions[0].GetUserId()); err != nil {
+ this.Error("未找到蓝方信息", log.Field{Key: "uid", Value: sessions[0].GetUserId()})
+ return
+ }
+
+ roomid = primitive.NewObjectID().Hex()
+ if room, err = this.rooms.newRoom(&pb.DBCatchBugsRoom{
+ Rid: roomid,
+ Rules: rules,
+ Red: &pb.DBCatchBugsPlayer{
+ Info: comm.GetUserBaseInfo(red),
+ Integral: redinfo.Integral,
+ },
+ Blue: &pb.DBCatchBugsPlayer{
+ Info: comm.GetUserBaseInfo(blue),
+ Integral: blueinfo.Integral,
+ },
+ Backup: cardsSlice[12:],
+ Card: cards,
+ }, sessions); err != nil {
+ this.Error("创建房间错误", log.Field{Key: "err", Value: err.Error()})
+ return
+ }
+ go room.GameStart()
+ return
+}
diff --git a/modules/catchbugs/room.go b/modules/catchbugs/room.go
new file mode 100644
index 000000000..202f63777
--- /dev/null
+++ b/modules/catchbugs/room.go
@@ -0,0 +1,170 @@
+package catchbugs
+
+import (
+ "fmt"
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+ "go_dreamfactory/sys/configure"
+ "time"
+
+ "google.golang.org/protobuf/proto"
+)
+
+type Room struct {
+ module *CatchBugs
+ data *pb.DBCatchBugsRoom
+ sessions []comm.IUserSession
+ starttime time.Time
+ round int32
+ handleplayer string
+ currindex int32
+}
+
+func (this *Room) GameStart() (err error) {
+ this.starttime = configure.Now()
+ if err = this.Broadcast("gameready", &pb.CatchbugsGameReadyPush{
+ ServicePath: fmt.Sprintf("%s/%s", this.module.service.GetType(), this.module.service.GetId()),
+ Room: this.data,
+ Countdown: 60,
+ }); err != nil {
+ this.module.Errorln(err)
+ }
+
+ return
+}
+
+func (this *Room) PlayerLoadEnd(uid string) (err error) {
+ if uid == this.data.Red.Info.Uid {
+ this.data.Red.Ready = true
+ } else {
+ this.data.Blue.Ready = true
+ }
+
+ if this.data.Rules.Headstart == 0 {
+ this.handleplayer = this.data.Red.Info.Uid
+ } else {
+ this.handleplayer = this.data.Blue.Info.Uid
+ }
+
+ if this.data.Red.Ready && this.data.Blue.Ready { //两个人都准备了
+ if err = this.Broadcast("roundstart", &pb.CatchbugsRoundStartPush{
+ Round: this.round,
+ Handleplayer: this.handleplayer,
+ }); err != nil {
+ this.module.Errorln(err)
+ }
+ }
+ return
+}
+
+//玩家操作
+func (this *Room) PlayerHandle(uid string, handle *pb.CatchbugsHandleReq) (err error) {
+ if uid != this.handleplayer {
+ err = fmt.Errorf("It's not your operation!")
+ return
+ }
+ var (
+ issucc bool
+ )
+ if this.data.Red.Info.Uid == uid {
+ if this.data.Red.Lastopencard == 0 {
+ this.data.Red.Lastopencard = handle.Index
+ } else {
+ if this.data.Card[this.data.Red.Lastopencard].Cid == this.data.Card[handle.Index].Cid {
+ issucc = true
+ this.data.Card[this.data.Red.Lastopencard].Isopen = true
+ this.data.Card[handle.Index].Isopen = true
+ this.data.Red.Cards = append(this.data.Red.Cards, this.data.Card[this.data.Red.Lastopencard].Cid)
+ }
+ }
+ } else {
+ if this.data.Blue.Lastopencard == 0 {
+ this.data.Blue.Lastopencard = handle.Index
+ } else {
+ if this.data.Card[this.data.Blue.Lastopencard].Cid == this.data.Card[handle.Index].Cid {
+ issucc = true
+ this.data.Card[this.data.Red.Lastopencard].Isopen = true
+ this.data.Card[handle.Index].Isopen = true
+ this.data.Blue.Cards = append(this.data.Red.Cards, this.data.Card[this.data.Blue.Lastopencard].Cid)
+ }
+ }
+ }
+ if err = this.Broadcast("gameover", &pb.CatchbugsOpenCardPush{
+ Roomid: this.data.Rid,
+ Index: handle.Index,
+ Issucc: issucc,
+ }); err != nil {
+ this.module.Errorln(err)
+ }
+ return
+}
+
+//玩家操作
+func (this *Room) PlayerHandleEnd(uid string, handle *pb.CatchbugsHandleEndReq) (err error) {
+ if uid != this.handleplayer {
+ err = fmt.Errorf("It's not your operation!")
+ return
+ }
+ this.round++
+
+ if this.data.Red.Info.Uid == uid {
+ this.handleplayer = this.data.Blue.Info.Uid
+ } else {
+ this.handleplayer = this.data.Red.Info.Uid
+ }
+
+ if err = this.Broadcast("roundstart", &pb.CatchbugsRoundStartPush{
+ Round: this.round,
+ Handleplayer: this.handleplayer,
+ }); err != nil {
+ this.module.Errorln(err)
+ }
+ return
+}
+
+func (this *Room) Broadcast(stype string, msg proto.Message) (err error) {
+ if err = this.module.SendMsgToSession(string(this.module.GetType()), stype, msg, this.sessions...); err != nil {
+ this.module.Errorln(err)
+ }
+ return
+}
+
+//技能效果1 随机2x2的区域 旋转
+func Skill1Effect(cards []*pb.DBCatchBugsCard) (ramdonCard []*pb.DBCatchBugsCard) {
+ var (
+ cardsSlice []int32
+ ramdon int32 //随机点
+ x int32
+ y int32
+ offsetX, offsetY int32
+ )
+ for _, v := range cards {
+ if !v.Isopen {
+ cardsSlice = append(cardsSlice, v.Index)
+ }
+ }
+ ramdon = cardsSlice[comm.RandShuffle(len(cardsSlice))[0]]
+ x = ramdon % 4
+ y = ramdon / 4
+ offsetX = 1
+ if x == 3 {
+ offsetX = -1
+ }
+ offsetY = 1
+ if y == 6 {
+ offsetY = -1
+ }
+ ramdonCard = append(ramdonCard, cards[y*6+x])
+ ramdonCard = append(ramdonCard, cards[y*6+x+offsetX])
+ ramdonCard = append(ramdonCard, cards[(y+offsetY)*6+x+offsetX])
+ ramdonCard = append(ramdonCard, cards[(y+offsetY)*6+x])
+ index0 := ramdonCard[0].Index
+ for i, v := range ramdonCard {
+ if i < len(ramdonCard) {
+ v.Index = ramdonCard[i+1].Index
+ } else {
+ v.Index = index0
+ }
+ }
+ return
+}
diff --git a/modules/catchbugs/rooms.go b/modules/catchbugs/rooms.go
new file mode 100644
index 000000000..05caa7d14
--- /dev/null
+++ b/modules/catchbugs/rooms.go
@@ -0,0 +1,65 @@
+package catchbugs
+
+import (
+ "fmt"
+ "go_dreamfactory/comm"
+ "go_dreamfactory/lego/core"
+ "go_dreamfactory/lego/core/cbase"
+ "go_dreamfactory/pb"
+ "sync"
+)
+
+type roomsComp struct {
+ cbase.ModuleCompBase
+ module *CatchBugs
+ lock sync.RWMutex
+ rooms map[string]*Room
+}
+
+func (this *roomsComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
+ err = this.ModuleCompBase.Init(service, module, comp, options)
+ this.module = module.(*CatchBugs)
+ this.rooms = make(map[string]*Room)
+ return
+}
+
+func (this *roomsComp) queryRoom(rid string) (room *Room, err error) {
+ var (
+ ok bool
+ )
+ this.lock.Lock()
+ room, ok = this.rooms[rid]
+ this.lock.Unlock()
+ if !ok {
+ err = fmt.Errorf("no found room:%s", rid)
+ return
+ }
+ return
+}
+
+func (this *roomsComp) newRoom(data *pb.DBCatchBugsRoom, session []comm.IUserSession) (room *Room, err error) {
+ room = &Room{
+ module: this.module,
+ data: data,
+ sessions: session,
+ }
+ this.lock.Lock()
+ this.rooms[data.Rid] = room
+ this.lock.Unlock()
+
+ return
+}
+
+func (this *roomsComp) removeRoom(rid string) {
+ var (
+ ok bool
+ room *Room
+ )
+ this.lock.Lock()
+ room, ok = this.rooms[rid]
+ delete(this.rooms, rid)
+ this.lock.Unlock()
+ if ok {
+ go this.module.gameInvite.GameInviteEnd(3, room.data.Red.Info.Uid)
+ }
+}
diff --git a/modules/island/api_receive.go b/modules/island/api_receive.go
index 93d27807c..92e857443 100644
--- a/modules/island/api_receive.go
+++ b/modules/island/api_receive.go
@@ -17,7 +17,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.IsLandReceiveReq
var (
info *pb.DBIsland
warorder *pb.Warorder
- confs []*cfg.GamePuggsyPassCheckData
+ confs []*cfg.GamePuggsyPasscheckData
awards []*cfg.Gameatn
award []*pb.UserAtno
err error
diff --git a/modules/island/configure.go b/modules/island/configure.go
index f9d46ab13..c825f1b41 100644
--- a/modules/island/configure.go
+++ b/modules/island/configure.go
@@ -31,7 +31,7 @@ func (this *ConfigureComp) Init(service core.IService, module core.IModule, comp
err = this.LoadConfigure(game_puggsyskill, cfg.NewGamePuggsySkill)
err = this.LoadConfigure(game_puggsyfight, cfg.NewGamePuggsyFight)
err = this.LoadConfigure(game_puggsyscore, cfg.NewGamePuggsyScore)
- err = this.LoadConfigure(game_puggsypasscheck, cfg.NewGamePuggsyPassCheck)
+ err = this.LoadConfigure(game_puggsypasscheck, cfg.NewGamePuggsyPasscheck)
return
}
@@ -133,14 +133,14 @@ func (this *ConfigureComp) getGamePuggsyScoreData(harm int32) (results *cfg.Game
}
// 获取伤害对应的评分组
-func (this *ConfigureComp) getGamePuggsyPasscheckData() (results []*cfg.GamePuggsyPassCheckData, err error) {
+func (this *ConfigureComp) getGamePuggsyPasscheckData() (results []*cfg.GamePuggsyPasscheckData, err error) {
var (
v interface{}
)
if v, err = this.GetConfigure(game_puggsyscore); err != nil {
return
} else {
- results = v.(*cfg.GamePuggsyPassCheck).GetDataList()
+ results = v.(*cfg.GamePuggsyPasscheck).GetDataList()
}
return
}
diff --git a/pb/catchbugs_db.pb.go b/pb/catchbugs_db.pb.go
new file mode 100644
index 000000000..2bb921b63
--- /dev/null
+++ b/pb/catchbugs_db.pb.go
@@ -0,0 +1,604 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// protoc-gen-go v1.28.0
+// protoc v3.20.0
+// source: catchbugs/catchbugs_db.proto
+
+package pb
+
+import (
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+ reflect "reflect"
+ sync "sync"
+)
+
+const (
+ // Verify that this generated code is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+ // Verify that runtime/protoimpl is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+//捉虫子
+type DBCatchBugs struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
+ Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`
+ Integral int32 `protobuf:"varint,3,opt,name=integral,proto3" json:"integral"`
+ Books map[int32]int32 `protobuf:"bytes,4,rep,name=books,proto3" json:"books" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //图鉴
+ Awards map[int32]bool `protobuf:"bytes,5,rep,name=awards,proto3" json:"awards" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //奖励
+ Weektime int64 `protobuf:"varint,6,opt,name=weektime,proto3" json:"weektime"` //周时长
+}
+
+func (x *DBCatchBugs) Reset() {
+ *x = DBCatchBugs{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_catchbugs_catchbugs_db_proto_msgTypes[0]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *DBCatchBugs) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBCatchBugs) ProtoMessage() {}
+
+func (x *DBCatchBugs) ProtoReflect() protoreflect.Message {
+ mi := &file_catchbugs_catchbugs_db_proto_msgTypes[0]
+ 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 DBCatchBugs.ProtoReflect.Descriptor instead.
+func (*DBCatchBugs) Descriptor() ([]byte, []int) {
+ return file_catchbugs_catchbugs_db_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *DBCatchBugs) GetId() string {
+ if x != nil {
+ return x.Id
+ }
+ return ""
+}
+
+func (x *DBCatchBugs) GetUid() string {
+ if x != nil {
+ return x.Uid
+ }
+ return ""
+}
+
+func (x *DBCatchBugs) GetIntegral() int32 {
+ if x != nil {
+ return x.Integral
+ }
+ return 0
+}
+
+func (x *DBCatchBugs) GetBooks() map[int32]int32 {
+ if x != nil {
+ return x.Books
+ }
+ return nil
+}
+
+func (x *DBCatchBugs) GetAwards() map[int32]bool {
+ if x != nil {
+ return x.Awards
+ }
+ return nil
+}
+
+func (x *DBCatchBugs) GetWeektime() int64 {
+ if x != nil {
+ return x.Weektime
+ }
+ return 0
+}
+
+//游戏规则
+type DBCatchBugsRules struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Skill int32 `protobuf:"varint,1,opt,name=skill,proto3" json:"skill"`
+ Headstart int32 `protobuf:"varint,3,opt,name=headstart,proto3" json:"headstart"` //谁先手 0 红方 1 蓝方
+}
+
+func (x *DBCatchBugsRules) Reset() {
+ *x = DBCatchBugsRules{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_catchbugs_catchbugs_db_proto_msgTypes[1]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *DBCatchBugsRules) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBCatchBugsRules) ProtoMessage() {}
+
+func (x *DBCatchBugsRules) ProtoReflect() protoreflect.Message {
+ mi := &file_catchbugs_catchbugs_db_proto_msgTypes[1]
+ 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 DBCatchBugsRules.ProtoReflect.Descriptor instead.
+func (*DBCatchBugsRules) Descriptor() ([]byte, []int) {
+ return file_catchbugs_catchbugs_db_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *DBCatchBugsRules) GetSkill() int32 {
+ if x != nil {
+ return x.Skill
+ }
+ return 0
+}
+
+func (x *DBCatchBugsRules) GetHeadstart() int32 {
+ if x != nil {
+ return x.Headstart
+ }
+ return 0
+}
+
+//玩家信息
+type DBCatchBugsPlayer struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Info *BaseUserInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` //发起者信息
+ Ready bool `protobuf:"varint,2,opt,name=ready,proto3" json:"ready"`
+ Score int32 `protobuf:"varint,3,opt,name=score,proto3" json:"score"`
+ Integral int32 `protobuf:"varint,4,opt,name=integral,proto3" json:"integral"` //积分
+ Lastopencard int32 `protobuf:"varint,5,opt,name=lastopencard,proto3" json:"lastopencard"`
+ Cards []int32 `protobuf:"varint,6,rep,packed,name=cards,proto3" json:"cards"`
+}
+
+func (x *DBCatchBugsPlayer) Reset() {
+ *x = DBCatchBugsPlayer{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_catchbugs_catchbugs_db_proto_msgTypes[2]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *DBCatchBugsPlayer) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBCatchBugsPlayer) ProtoMessage() {}
+
+func (x *DBCatchBugsPlayer) ProtoReflect() protoreflect.Message {
+ mi := &file_catchbugs_catchbugs_db_proto_msgTypes[2]
+ 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 DBCatchBugsPlayer.ProtoReflect.Descriptor instead.
+func (*DBCatchBugsPlayer) Descriptor() ([]byte, []int) {
+ return file_catchbugs_catchbugs_db_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *DBCatchBugsPlayer) GetInfo() *BaseUserInfo {
+ if x != nil {
+ return x.Info
+ }
+ return nil
+}
+
+func (x *DBCatchBugsPlayer) GetReady() bool {
+ if x != nil {
+ return x.Ready
+ }
+ return false
+}
+
+func (x *DBCatchBugsPlayer) GetScore() int32 {
+ if x != nil {
+ return x.Score
+ }
+ return 0
+}
+
+func (x *DBCatchBugsPlayer) GetIntegral() int32 {
+ if x != nil {
+ return x.Integral
+ }
+ return 0
+}
+
+func (x *DBCatchBugsPlayer) GetLastopencard() int32 {
+ if x != nil {
+ return x.Lastopencard
+ }
+ return 0
+}
+
+func (x *DBCatchBugsPlayer) GetCards() []int32 {
+ if x != nil {
+ return x.Cards
+ }
+ return nil
+}
+
+//卡牌
+type DBCatchBugsCard struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` //唯一id
+ Cid int32 `protobuf:"varint,2,opt,name=cid,proto3" json:"cid"` //卡牌配置id
+ Index int32 `protobuf:"varint,3,opt,name=index,proto3" json:"index"`
+ Isopen bool `protobuf:"varint,4,opt,name=isopen,proto3" json:"isopen"` //是否开启
+}
+
+func (x *DBCatchBugsCard) Reset() {
+ *x = DBCatchBugsCard{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_catchbugs_catchbugs_db_proto_msgTypes[3]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *DBCatchBugsCard) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBCatchBugsCard) ProtoMessage() {}
+
+func (x *DBCatchBugsCard) ProtoReflect() protoreflect.Message {
+ mi := &file_catchbugs_catchbugs_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 DBCatchBugsCard.ProtoReflect.Descriptor instead.
+func (*DBCatchBugsCard) Descriptor() ([]byte, []int) {
+ return file_catchbugs_catchbugs_db_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *DBCatchBugsCard) GetId() int32 {
+ if x != nil {
+ return x.Id
+ }
+ return 0
+}
+
+func (x *DBCatchBugsCard) GetCid() int32 {
+ if x != nil {
+ return x.Cid
+ }
+ return 0
+}
+
+func (x *DBCatchBugsCard) GetIndex() int32 {
+ if x != nil {
+ return x.Index
+ }
+ return 0
+}
+
+func (x *DBCatchBugsCard) GetIsopen() bool {
+ if x != nil {
+ return x.Isopen
+ }
+ return false
+}
+
+//犬兔大赛 房间
+type DBCatchBugsRoom struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Rid string `protobuf:"bytes,1,opt,name=rid,proto3" json:"rid"`
+ Rules *DBCatchBugsRules `protobuf:"bytes,2,opt,name=rules,proto3" json:"rules"`
+ Red *DBCatchBugsPlayer `protobuf:"bytes,3,opt,name=red,proto3" json:"red"`
+ Blue *DBCatchBugsPlayer `protobuf:"bytes,4,opt,name=blue,proto3" json:"blue"`
+ Backup []int32 `protobuf:"varint,5,rep,packed,name=backup,proto3" json:"backup"` //预备卡牌
+ Card []*DBCatchBugsCard `protobuf:"bytes,6,rep,name=card,proto3" json:"card"` //桌面卡牌
+}
+
+func (x *DBCatchBugsRoom) Reset() {
+ *x = DBCatchBugsRoom{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_catchbugs_catchbugs_db_proto_msgTypes[4]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *DBCatchBugsRoom) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBCatchBugsRoom) ProtoMessage() {}
+
+func (x *DBCatchBugsRoom) ProtoReflect() protoreflect.Message {
+ mi := &file_catchbugs_catchbugs_db_proto_msgTypes[4]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use DBCatchBugsRoom.ProtoReflect.Descriptor instead.
+func (*DBCatchBugsRoom) Descriptor() ([]byte, []int) {
+ return file_catchbugs_catchbugs_db_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *DBCatchBugsRoom) GetRid() string {
+ if x != nil {
+ return x.Rid
+ }
+ return ""
+}
+
+func (x *DBCatchBugsRoom) GetRules() *DBCatchBugsRules {
+ if x != nil {
+ return x.Rules
+ }
+ return nil
+}
+
+func (x *DBCatchBugsRoom) GetRed() *DBCatchBugsPlayer {
+ if x != nil {
+ return x.Red
+ }
+ return nil
+}
+
+func (x *DBCatchBugsRoom) GetBlue() *DBCatchBugsPlayer {
+ if x != nil {
+ return x.Blue
+ }
+ return nil
+}
+
+func (x *DBCatchBugsRoom) GetBackup() []int32 {
+ if x != nil {
+ return x.Backup
+ }
+ return nil
+}
+
+func (x *DBCatchBugsRoom) GetCard() []*DBCatchBugsCard {
+ if x != nil {
+ return x.Card
+ }
+ return nil
+}
+
+var File_catchbugs_catchbugs_db_proto protoreflect.FileDescriptor
+
+var file_catchbugs_catchbugs_db_proto_rawDesc = []byte{
+ 0x0a, 0x1c, 0x63, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x2f, 0x63, 0x61, 0x74, 0x63,
+ 0x68, 0x62, 0x75, 0x67, 0x73, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a,
+ 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xbd, 0x02, 0x0a, 0x0b, 0x44,
+ 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
+ 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08,
+ 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
+ 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x2d, 0x0a, 0x05, 0x62, 0x6f, 0x6f, 0x6b,
+ 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63,
+ 0x68, 0x42, 0x75, 0x67, 0x73, 0x2e, 0x42, 0x6f, 0x6f, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
+ 0x52, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x12, 0x30, 0x0a, 0x06, 0x61, 0x77, 0x61, 0x72, 0x64,
+ 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63,
+ 0x68, 0x42, 0x75, 0x67, 0x73, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72,
+ 0x79, 0x52, 0x06, 0x61, 0x77, 0x61, 0x72, 0x64, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x65, 0x65,
+ 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x77, 0x65, 0x65,
+ 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x42, 0x6f, 0x6f, 0x6b, 0x73, 0x45, 0x6e,
+ 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
+ 0x39, 0x0a, 0x0b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
+ 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79,
+ 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
+ 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x46, 0x0a, 0x10, 0x44, 0x42,
+ 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x14,
+ 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73,
+ 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x61, 0x64, 0x73, 0x74, 0x61, 0x72,
+ 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x68, 0x65, 0x61, 0x64, 0x73, 0x74, 0x61,
+ 0x72, 0x74, 0x22, 0xb8, 0x01, 0x0a, 0x11, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75,
+ 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x04, 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, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x72,
+ 0x65, 0x61, 0x64, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x72, 0x65, 0x61, 0x64,
+ 0x79, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67,
+ 0x72, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67,
+ 0x72, 0x61, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x65, 0x6e, 0x63,
+ 0x61, 0x72, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x6f,
+ 0x70, 0x65, 0x6e, 0x63, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x61, 0x72, 0x64, 0x73,
+ 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x63, 0x61, 0x72, 0x64, 0x73, 0x22, 0x61, 0x0a,
+ 0x0f, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64,
+ 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64,
+ 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63,
+ 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x6f, 0x70,
+ 0x65, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x6f, 0x70, 0x65, 0x6e,
+ 0x22, 0xd8, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73,
+ 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x27, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42,
+ 0x75, 0x67, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12,
+ 0x24, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44,
+ 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72,
+ 0x52, 0x03, 0x72, 0x65, 0x64, 0x12, 0x26, 0x0a, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67,
+ 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x12, 0x16, 0x0a,
+ 0x06, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x62,
+ 0x61, 0x63, 0x6b, 0x75, 0x70, 0x12, 0x24, 0x0a, 0x04, 0x63, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20,
+ 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67,
+ 0x73, 0x43, 0x61, 0x72, 0x64, 0x52, 0x04, 0x63, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+ 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+ file_catchbugs_catchbugs_db_proto_rawDescOnce sync.Once
+ file_catchbugs_catchbugs_db_proto_rawDescData = file_catchbugs_catchbugs_db_proto_rawDesc
+)
+
+func file_catchbugs_catchbugs_db_proto_rawDescGZIP() []byte {
+ file_catchbugs_catchbugs_db_proto_rawDescOnce.Do(func() {
+ file_catchbugs_catchbugs_db_proto_rawDescData = protoimpl.X.CompressGZIP(file_catchbugs_catchbugs_db_proto_rawDescData)
+ })
+ return file_catchbugs_catchbugs_db_proto_rawDescData
+}
+
+var file_catchbugs_catchbugs_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_catchbugs_catchbugs_db_proto_goTypes = []interface{}{
+ (*DBCatchBugs)(nil), // 0: DBCatchBugs
+ (*DBCatchBugsRules)(nil), // 1: DBCatchBugsRules
+ (*DBCatchBugsPlayer)(nil), // 2: DBCatchBugsPlayer
+ (*DBCatchBugsCard)(nil), // 3: DBCatchBugsCard
+ (*DBCatchBugsRoom)(nil), // 4: DBCatchBugsRoom
+ nil, // 5: DBCatchBugs.BooksEntry
+ nil, // 6: DBCatchBugs.AwardsEntry
+ (*BaseUserInfo)(nil), // 7: BaseUserInfo
+}
+var file_catchbugs_catchbugs_db_proto_depIdxs = []int32{
+ 5, // 0: DBCatchBugs.books:type_name -> DBCatchBugs.BooksEntry
+ 6, // 1: DBCatchBugs.awards:type_name -> DBCatchBugs.AwardsEntry
+ 7, // 2: DBCatchBugsPlayer.info:type_name -> BaseUserInfo
+ 1, // 3: DBCatchBugsRoom.rules:type_name -> DBCatchBugsRules
+ 2, // 4: DBCatchBugsRoom.red:type_name -> DBCatchBugsPlayer
+ 2, // 5: DBCatchBugsRoom.blue:type_name -> DBCatchBugsPlayer
+ 3, // 6: DBCatchBugsRoom.card:type_name -> DBCatchBugsCard
+ 7, // [7:7] is the sub-list for method output_type
+ 7, // [7:7] is the sub-list for method input_type
+ 7, // [7:7] is the sub-list for extension type_name
+ 7, // [7:7] is the sub-list for extension extendee
+ 0, // [0:7] is the sub-list for field type_name
+}
+
+func init() { file_catchbugs_catchbugs_db_proto_init() }
+func file_catchbugs_catchbugs_db_proto_init() {
+ if File_catchbugs_catchbugs_db_proto != nil {
+ return
+ }
+ file_comm_proto_init()
+ if !protoimpl.UnsafeEnabled {
+ file_catchbugs_catchbugs_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*DBCatchBugs); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_catchbugs_catchbugs_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*DBCatchBugsRules); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_catchbugs_catchbugs_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*DBCatchBugsPlayer); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_catchbugs_catchbugs_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*DBCatchBugsCard); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_catchbugs_catchbugs_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*DBCatchBugsRoom); 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{
+ File: protoimpl.DescBuilder{
+ GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+ RawDescriptor: file_catchbugs_catchbugs_db_proto_rawDesc,
+ NumEnums: 0,
+ NumMessages: 7,
+ NumExtensions: 0,
+ NumServices: 0,
+ },
+ GoTypes: file_catchbugs_catchbugs_db_proto_goTypes,
+ DependencyIndexes: file_catchbugs_catchbugs_db_proto_depIdxs,
+ MessageInfos: file_catchbugs_catchbugs_db_proto_msgTypes,
+ }.Build()
+ File_catchbugs_catchbugs_db_proto = out.File
+ file_catchbugs_catchbugs_db_proto_rawDesc = nil
+ file_catchbugs_catchbugs_db_proto_goTypes = nil
+ file_catchbugs_catchbugs_db_proto_depIdxs = nil
+}
diff --git a/pb/catchbugs_msg.pb.go b/pb/catchbugs_msg.pb.go
new file mode 100644
index 000000000..c4f9f5470
--- /dev/null
+++ b/pb/catchbugs_msg.pb.go
@@ -0,0 +1,1217 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// protoc-gen-go v1.28.0
+// protoc v3.20.0
+// source: catchbugs/catchbugs_msg.proto
+
+package pb
+
+import (
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+ reflect "reflect"
+ sync "sync"
+)
+
+const (
+ // Verify that this generated code is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+ // Verify that runtime/protoimpl is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+//查询信息
+type CatchbugsInfoReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+}
+
+func (x *CatchbugsInfoReq) Reset() {
+ *x = CatchbugsInfoReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[0]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *CatchbugsInfoReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CatchbugsInfoReq) ProtoMessage() {}
+
+func (x *CatchbugsInfoReq) ProtoReflect() protoreflect.Message {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[0]
+ 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 CatchbugsInfoReq.ProtoReflect.Descriptor instead.
+func (*CatchbugsInfoReq) Descriptor() ([]byte, []int) {
+ return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{0}
+}
+
+type CatchbugsInfoResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Info *DBCatchBugs `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
+}
+
+func (x *CatchbugsInfoResp) Reset() {
+ *x = CatchbugsInfoResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[1]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *CatchbugsInfoResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CatchbugsInfoResp) ProtoMessage() {}
+
+func (x *CatchbugsInfoResp) ProtoReflect() protoreflect.Message {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[1]
+ 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 CatchbugsInfoResp.ProtoReflect.Descriptor instead.
+func (*CatchbugsInfoResp) Descriptor() ([]byte, []int) {
+ return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *CatchbugsInfoResp) GetInfo() *DBCatchBugs {
+ if x != nil {
+ return x.Info
+ }
+ return nil
+}
+
+//领奖
+type CatchbugsAwardReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+}
+
+func (x *CatchbugsAwardReq) Reset() {
+ *x = CatchbugsAwardReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[2]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *CatchbugsAwardReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CatchbugsAwardReq) ProtoMessage() {}
+
+func (x *CatchbugsAwardReq) ProtoReflect() protoreflect.Message {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[2]
+ 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 CatchbugsAwardReq.ProtoReflect.Descriptor instead.
+func (*CatchbugsAwardReq) Descriptor() ([]byte, []int) {
+ return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{2}
+}
+
+type CatchbugsAwardResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Awardmap map[int32]bool `protobuf:"bytes,1,rep,name=awardmap,proto3" json:"awardmap" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+ Award []*UserAtno `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //获取资源
+}
+
+func (x *CatchbugsAwardResp) Reset() {
+ *x = CatchbugsAwardResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[3]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *CatchbugsAwardResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CatchbugsAwardResp) ProtoMessage() {}
+
+func (x *CatchbugsAwardResp) ProtoReflect() protoreflect.Message {
+ mi := &file_catchbugs_catchbugs_msg_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 CatchbugsAwardResp.ProtoReflect.Descriptor instead.
+func (*CatchbugsAwardResp) Descriptor() ([]byte, []int) {
+ return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *CatchbugsAwardResp) GetAwardmap() map[int32]bool {
+ if x != nil {
+ return x.Awardmap
+ }
+ return nil
+}
+
+func (x *CatchbugsAwardResp) GetAward() []*UserAtno {
+ if x != nil {
+ return x.Award
+ }
+ return nil
+}
+
+//单机游戏请求
+type CatchbugsSingleOverReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Books []int32 `protobuf:"varint,1,rep,packed,name=books,proto3" json:"books"` //图鉴
+}
+
+func (x *CatchbugsSingleOverReq) Reset() {
+ *x = CatchbugsSingleOverReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[4]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *CatchbugsSingleOverReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CatchbugsSingleOverReq) ProtoMessage() {}
+
+func (x *CatchbugsSingleOverReq) ProtoReflect() protoreflect.Message {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[4]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use CatchbugsSingleOverReq.ProtoReflect.Descriptor instead.
+func (*CatchbugsSingleOverReq) Descriptor() ([]byte, []int) {
+ return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *CatchbugsSingleOverReq) GetBooks() []int32 {
+ if x != nil {
+ return x.Books
+ }
+ return nil
+}
+
+type CatchbugsSingleOverResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Integral int32 `protobuf:"varint,1,opt,name=integral,proto3" json:"integral"`
+ Books map[int32]int32 `protobuf:"bytes,2,rep,name=books,proto3" json:"books" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //图鉴
+}
+
+func (x *CatchbugsSingleOverResp) Reset() {
+ *x = CatchbugsSingleOverResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[5]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *CatchbugsSingleOverResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CatchbugsSingleOverResp) ProtoMessage() {}
+
+func (x *CatchbugsSingleOverResp) ProtoReflect() protoreflect.Message {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[5]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use CatchbugsSingleOverResp.ProtoReflect.Descriptor instead.
+func (*CatchbugsSingleOverResp) Descriptor() ([]byte, []int) {
+ return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *CatchbugsSingleOverResp) GetIntegral() int32 {
+ if x != nil {
+ return x.Integral
+ }
+ return 0
+}
+
+func (x *CatchbugsSingleOverResp) GetBooks() map[int32]int32 {
+ if x != nil {
+ return x.Books
+ }
+ return nil
+}
+
+//游戏准备推送
+type CatchbugsGameReadyPush struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ ServicePath string `protobuf:"bytes,1,opt,name=servicePath,proto3" json:"servicePath"` //游戏区服地址
+ Room *DBCatchBugsRoom `protobuf:"bytes,2,opt,name=room,proto3" json:"room"` //房间
+ Countdown int32 `protobuf:"varint,3,opt,name=countdown,proto3" json:"countdown"` //布阵倒计时
+}
+
+func (x *CatchbugsGameReadyPush) Reset() {
+ *x = CatchbugsGameReadyPush{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[6]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *CatchbugsGameReadyPush) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CatchbugsGameReadyPush) ProtoMessage() {}
+
+func (x *CatchbugsGameReadyPush) ProtoReflect() protoreflect.Message {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[6]
+ 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 CatchbugsGameReadyPush.ProtoReflect.Descriptor instead.
+func (*CatchbugsGameReadyPush) Descriptor() ([]byte, []int) {
+ return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *CatchbugsGameReadyPush) GetServicePath() string {
+ if x != nil {
+ return x.ServicePath
+ }
+ return ""
+}
+
+func (x *CatchbugsGameReadyPush) GetRoom() *DBCatchBugsRoom {
+ if x != nil {
+ return x.Room
+ }
+ return nil
+}
+
+func (x *CatchbugsGameReadyPush) GetCountdown() int32 {
+ if x != nil {
+ return x.Countdown
+ }
+ return 0
+}
+
+//加载完毕请求
+type CatchbugsLoadCompleteReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"` //房间id
+}
+
+func (x *CatchbugsLoadCompleteReq) Reset() {
+ *x = CatchbugsLoadCompleteReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[7]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *CatchbugsLoadCompleteReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CatchbugsLoadCompleteReq) ProtoMessage() {}
+
+func (x *CatchbugsLoadCompleteReq) ProtoReflect() protoreflect.Message {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[7]
+ 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 CatchbugsLoadCompleteReq.ProtoReflect.Descriptor instead.
+func (*CatchbugsLoadCompleteReq) Descriptor() ([]byte, []int) {
+ return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *CatchbugsLoadCompleteReq) GetRoomid() string {
+ if x != nil {
+ return x.Roomid
+ }
+ return ""
+}
+
+//加载完毕请求
+type CatchbugsLoadCompleteResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"` //房间id
+ Issucc bool `protobuf:"varint,2,opt,name=issucc,proto3" json:"issucc"`
+}
+
+func (x *CatchbugsLoadCompleteResp) Reset() {
+ *x = CatchbugsLoadCompleteResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[8]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *CatchbugsLoadCompleteResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CatchbugsLoadCompleteResp) ProtoMessage() {}
+
+func (x *CatchbugsLoadCompleteResp) ProtoReflect() protoreflect.Message {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[8]
+ 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 CatchbugsLoadCompleteResp.ProtoReflect.Descriptor instead.
+func (*CatchbugsLoadCompleteResp) Descriptor() ([]byte, []int) {
+ return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{8}
+}
+
+func (x *CatchbugsLoadCompleteResp) GetRoomid() string {
+ if x != nil {
+ return x.Roomid
+ }
+ return ""
+}
+
+func (x *CatchbugsLoadCompleteResp) GetIssucc() bool {
+ if x != nil {
+ return x.Issucc
+ }
+ return false
+}
+
+//回合数结束推送
+type CatchbugsRoundStartPush struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Round int32 `protobuf:"varint,1,opt,name=round,proto3" json:"round"` //回合数
+ Cards []*DBCatchBugsCard `protobuf:"bytes,5,rep,name=cards,proto3" json:"cards"` //桌子上的卡牌 技能生效才会有值
+ Handleplayer string `protobuf:"bytes,2,opt,name=handleplayer,proto3" json:"handleplayer"` //操作玩家
+}
+
+func (x *CatchbugsRoundStartPush) Reset() {
+ *x = CatchbugsRoundStartPush{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[9]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *CatchbugsRoundStartPush) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CatchbugsRoundStartPush) ProtoMessage() {}
+
+func (x *CatchbugsRoundStartPush) ProtoReflect() protoreflect.Message {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[9]
+ 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 CatchbugsRoundStartPush.ProtoReflect.Descriptor instead.
+func (*CatchbugsRoundStartPush) Descriptor() ([]byte, []int) {
+ return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{9}
+}
+
+func (x *CatchbugsRoundStartPush) GetRound() int32 {
+ if x != nil {
+ return x.Round
+ }
+ return 0
+}
+
+func (x *CatchbugsRoundStartPush) GetCards() []*DBCatchBugsCard {
+ if x != nil {
+ return x.Cards
+ }
+ return nil
+}
+
+func (x *CatchbugsRoundStartPush) GetHandleplayer() string {
+ if x != nil {
+ return x.Handleplayer
+ }
+ return ""
+}
+
+//发送操作请求
+type CatchbugsHandleReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"` //房间id
+ Index int32 `protobuf:"varint,2,opt,name=index,proto3" json:"index"` //卡牌下表
+}
+
+func (x *CatchbugsHandleReq) Reset() {
+ *x = CatchbugsHandleReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[10]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *CatchbugsHandleReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CatchbugsHandleReq) ProtoMessage() {}
+
+func (x *CatchbugsHandleReq) ProtoReflect() protoreflect.Message {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[10]
+ 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 CatchbugsHandleReq.ProtoReflect.Descriptor instead.
+func (*CatchbugsHandleReq) Descriptor() ([]byte, []int) {
+ return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{10}
+}
+
+func (x *CatchbugsHandleReq) GetRoomid() string {
+ if x != nil {
+ return x.Roomid
+ }
+ return ""
+}
+
+func (x *CatchbugsHandleReq) GetIndex() int32 {
+ if x != nil {
+ return x.Index
+ }
+ return 0
+}
+
+type CatchbugsHandleResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+}
+
+func (x *CatchbugsHandleResp) Reset() {
+ *x = CatchbugsHandleResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[11]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *CatchbugsHandleResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CatchbugsHandleResp) ProtoMessage() {}
+
+func (x *CatchbugsHandleResp) ProtoReflect() protoreflect.Message {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[11]
+ 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 CatchbugsHandleResp.ProtoReflect.Descriptor instead.
+func (*CatchbugsHandleResp) Descriptor() ([]byte, []int) {
+ return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{11}
+}
+
+//玩家操作推送
+type CatchbugsOpenCardPush struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"` //房间id
+ Handleplayer string `protobuf:"bytes,2,opt,name=handleplayer,proto3" json:"handleplayer"` //操作玩家
+ Index int32 `protobuf:"varint,3,opt,name=index,proto3" json:"index"` //卡牌id
+ Issucc bool `protobuf:"varint,4,opt,name=issucc,proto3" json:"issucc"` //是否得分
+}
+
+func (x *CatchbugsOpenCardPush) Reset() {
+ *x = CatchbugsOpenCardPush{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[12]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *CatchbugsOpenCardPush) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CatchbugsOpenCardPush) ProtoMessage() {}
+
+func (x *CatchbugsOpenCardPush) ProtoReflect() protoreflect.Message {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[12]
+ 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 CatchbugsOpenCardPush.ProtoReflect.Descriptor instead.
+func (*CatchbugsOpenCardPush) Descriptor() ([]byte, []int) {
+ return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{12}
+}
+
+func (x *CatchbugsOpenCardPush) GetRoomid() string {
+ if x != nil {
+ return x.Roomid
+ }
+ return ""
+}
+
+func (x *CatchbugsOpenCardPush) GetHandleplayer() string {
+ if x != nil {
+ return x.Handleplayer
+ }
+ return ""
+}
+
+func (x *CatchbugsOpenCardPush) GetIndex() int32 {
+ if x != nil {
+ return x.Index
+ }
+ return 0
+}
+
+func (x *CatchbugsOpenCardPush) GetIssucc() bool {
+ if x != nil {
+ return x.Issucc
+ }
+ return false
+}
+
+//操作结束请求
+type CatchbugsHandleEndReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"` //房间id
+}
+
+func (x *CatchbugsHandleEndReq) Reset() {
+ *x = CatchbugsHandleEndReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[13]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *CatchbugsHandleEndReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CatchbugsHandleEndReq) ProtoMessage() {}
+
+func (x *CatchbugsHandleEndReq) ProtoReflect() protoreflect.Message {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[13]
+ 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 CatchbugsHandleEndReq.ProtoReflect.Descriptor instead.
+func (*CatchbugsHandleEndReq) Descriptor() ([]byte, []int) {
+ return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{13}
+}
+
+func (x *CatchbugsHandleEndReq) GetRoomid() string {
+ if x != nil {
+ return x.Roomid
+ }
+ return ""
+}
+
+//操作结束请求
+type CatchbugsHandleEndResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+}
+
+func (x *CatchbugsHandleEndResp) Reset() {
+ *x = CatchbugsHandleEndResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[14]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *CatchbugsHandleEndResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CatchbugsHandleEndResp) ProtoMessage() {}
+
+func (x *CatchbugsHandleEndResp) ProtoReflect() protoreflect.Message {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[14]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use CatchbugsHandleEndResp.ProtoReflect.Descriptor instead.
+func (*CatchbugsHandleEndResp) Descriptor() ([]byte, []int) {
+ return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{14}
+}
+
+//游戏结束推送
+type CatchbugsGameOverPush struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Winuid string `protobuf:"bytes,1,opt,name=winuid,proto3" json:"winuid"` //赢得人
+ Redintegral int32 `protobuf:"varint,2,opt,name=redintegral,proto3" json:"redintegral"` //红方积分
+ Blueintegral int32 `protobuf:"varint,3,opt,name=blueintegral,proto3" json:"blueintegral"` //蓝方积分
+}
+
+func (x *CatchbugsGameOverPush) Reset() {
+ *x = CatchbugsGameOverPush{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[15]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *CatchbugsGameOverPush) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CatchbugsGameOverPush) ProtoMessage() {}
+
+func (x *CatchbugsGameOverPush) ProtoReflect() protoreflect.Message {
+ mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[15]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use CatchbugsGameOverPush.ProtoReflect.Descriptor instead.
+func (*CatchbugsGameOverPush) Descriptor() ([]byte, []int) {
+ return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{15}
+}
+
+func (x *CatchbugsGameOverPush) GetWinuid() string {
+ if x != nil {
+ return x.Winuid
+ }
+ return ""
+}
+
+func (x *CatchbugsGameOverPush) GetRedintegral() int32 {
+ if x != nil {
+ return x.Redintegral
+ }
+ return 0
+}
+
+func (x *CatchbugsGameOverPush) GetBlueintegral() int32 {
+ if x != nil {
+ return x.Blueintegral
+ }
+ return 0
+}
+
+var File_catchbugs_catchbugs_msg_proto protoreflect.FileDescriptor
+
+var file_catchbugs_catchbugs_msg_proto_rawDesc = []byte{
+ 0x0a, 0x1d, 0x63, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x2f, 0x63, 0x61, 0x74, 0x63,
+ 0x68, 0x62, 0x75, 0x67, 0x73, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
+ 0x1c, 0x63, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x2f, 0x63, 0x61, 0x74, 0x63, 0x68,
+ 0x62, 0x75, 0x67, 0x73, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63,
+ 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x12, 0x0a, 0x10, 0x43, 0x61, 0x74,
+ 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x35, 0x0a,
+ 0x11, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65,
+ 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+ 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x04,
+ 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x13, 0x0a, 0x11, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67,
+ 0x73, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0xb1, 0x01, 0x0a, 0x12, 0x43, 0x61,
+ 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70,
+ 0x12, 0x3d, 0x0a, 0x08, 0x61, 0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70, 0x18, 0x01, 0x20, 0x03,
+ 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x41, 0x77,
+ 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70,
+ 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x61, 0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70, 0x12,
+ 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09,
+ 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64,
+ 0x1a, 0x3b, 0x0a, 0x0d, 0x41, 0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72,
+ 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
+ 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
+ 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x2e, 0x0a,
+ 0x16, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65,
+ 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73,
+ 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x22, 0xaa, 0x01,
+ 0x0a, 0x17, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x53, 0x69, 0x6e, 0x67, 0x6c,
+ 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74,
+ 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74,
+ 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x39, 0x0a, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x18, 0x02,
+ 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73,
+ 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x42,
+ 0x6f, 0x6f, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73,
+ 0x1a, 0x38, 0x0a, 0x0a, 0x42, 0x6f, 0x6f, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
+ 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79,
+ 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x7e, 0x0a, 0x16, 0x43, 0x61,
+ 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x61, 0x64, 0x79,
+ 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50,
+ 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69,
+ 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x24, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75,
+ 0x67, 0x73, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x12, 0x1c, 0x0a, 0x09,
+ 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x22, 0x32, 0x0a, 0x18, 0x43, 0x61,
+ 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x4c, 0x6f, 0x61, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x6c,
+ 0x65, 0x74, 0x65, 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, 0x4b,
+ 0x0a, 0x19, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x4c, 0x6f, 0x61, 0x64, 0x43,
+ 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 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, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x02, 0x20,
+ 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x7b, 0x0a, 0x17, 0x43,
+ 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x53, 0x74, 0x61,
+ 0x72, 0x74, 0x50, 0x75, 0x73, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x26, 0x0a, 0x05,
+ 0x63, 0x61, 0x72, 0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42,
+ 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x52, 0x05, 0x63,
+ 0x61, 0x72, 0x64, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x70, 0x6c,
+ 0x61, 0x79, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x68, 0x61, 0x6e, 0x64,
+ 0x6c, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x22, 0x42, 0x0a, 0x12, 0x43, 0x61, 0x74, 0x63,
+ 0x68, 0x62, 0x75, 0x67, 0x73, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 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, 0x6e, 0x64, 0x65, 0x78, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x15, 0x0a, 0x13,
+ 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x52,
+ 0x65, 0x73, 0x70, 0x22, 0x81, 0x01, 0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67,
+ 0x73, 0x4f, 0x70, 0x65, 0x6e, 0x43, 0x61, 0x72, 0x64, 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, 0x22, 0x0a, 0x0c, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x70,
+ 0x6c, 0x61, 0x79, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x68, 0x61, 0x6e,
+ 0x64, 0x6c, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64,
+ 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12,
+ 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52,
+ 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x2f, 0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68,
+ 0x62, 0x75, 0x67, 0x73, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x45, 0x6e, 0x64, 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, 0x18, 0x0a, 0x16, 0x43, 0x61, 0x74, 0x63,
+ 0x68, 0x62, 0x75, 0x67, 0x73, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x52, 0x65,
+ 0x73, 0x70, 0x22, 0x75, 0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x47,
+ 0x61, 0x6d, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x77,
+ 0x69, 0x6e, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x77, 0x69, 0x6e,
+ 0x75, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72,
+ 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x72, 0x65, 0x64, 0x69, 0x6e, 0x74,
+ 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x6c, 0x75, 0x65, 0x69, 0x6e, 0x74,
+ 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x6c, 0x75,
+ 0x65, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
+ 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+ file_catchbugs_catchbugs_msg_proto_rawDescOnce sync.Once
+ file_catchbugs_catchbugs_msg_proto_rawDescData = file_catchbugs_catchbugs_msg_proto_rawDesc
+)
+
+func file_catchbugs_catchbugs_msg_proto_rawDescGZIP() []byte {
+ file_catchbugs_catchbugs_msg_proto_rawDescOnce.Do(func() {
+ file_catchbugs_catchbugs_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_catchbugs_catchbugs_msg_proto_rawDescData)
+ })
+ return file_catchbugs_catchbugs_msg_proto_rawDescData
+}
+
+var file_catchbugs_catchbugs_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 18)
+var file_catchbugs_catchbugs_msg_proto_goTypes = []interface{}{
+ (*CatchbugsInfoReq)(nil), // 0: CatchbugsInfoReq
+ (*CatchbugsInfoResp)(nil), // 1: CatchbugsInfoResp
+ (*CatchbugsAwardReq)(nil), // 2: CatchbugsAwardReq
+ (*CatchbugsAwardResp)(nil), // 3: CatchbugsAwardResp
+ (*CatchbugsSingleOverReq)(nil), // 4: CatchbugsSingleOverReq
+ (*CatchbugsSingleOverResp)(nil), // 5: CatchbugsSingleOverResp
+ (*CatchbugsGameReadyPush)(nil), // 6: CatchbugsGameReadyPush
+ (*CatchbugsLoadCompleteReq)(nil), // 7: CatchbugsLoadCompleteReq
+ (*CatchbugsLoadCompleteResp)(nil), // 8: CatchbugsLoadCompleteResp
+ (*CatchbugsRoundStartPush)(nil), // 9: CatchbugsRoundStartPush
+ (*CatchbugsHandleReq)(nil), // 10: CatchbugsHandleReq
+ (*CatchbugsHandleResp)(nil), // 11: CatchbugsHandleResp
+ (*CatchbugsOpenCardPush)(nil), // 12: CatchbugsOpenCardPush
+ (*CatchbugsHandleEndReq)(nil), // 13: CatchbugsHandleEndReq
+ (*CatchbugsHandleEndResp)(nil), // 14: CatchbugsHandleEndResp
+ (*CatchbugsGameOverPush)(nil), // 15: CatchbugsGameOverPush
+ nil, // 16: CatchbugsAwardResp.AwardmapEntry
+ nil, // 17: CatchbugsSingleOverResp.BooksEntry
+ (*DBCatchBugs)(nil), // 18: DBCatchBugs
+ (*UserAtno)(nil), // 19: UserAtno
+ (*DBCatchBugsRoom)(nil), // 20: DBCatchBugsRoom
+ (*DBCatchBugsCard)(nil), // 21: DBCatchBugsCard
+}
+var file_catchbugs_catchbugs_msg_proto_depIdxs = []int32{
+ 18, // 0: CatchbugsInfoResp.info:type_name -> DBCatchBugs
+ 16, // 1: CatchbugsAwardResp.awardmap:type_name -> CatchbugsAwardResp.AwardmapEntry
+ 19, // 2: CatchbugsAwardResp.award:type_name -> UserAtno
+ 17, // 3: CatchbugsSingleOverResp.books:type_name -> CatchbugsSingleOverResp.BooksEntry
+ 20, // 4: CatchbugsGameReadyPush.room:type_name -> DBCatchBugsRoom
+ 21, // 5: CatchbugsRoundStartPush.cards:type_name -> DBCatchBugsCard
+ 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
+}
+
+func init() { file_catchbugs_catchbugs_msg_proto_init() }
+func file_catchbugs_catchbugs_msg_proto_init() {
+ if File_catchbugs_catchbugs_msg_proto != nil {
+ return
+ }
+ file_catchbugs_catchbugs_db_proto_init()
+ file_comm_proto_init()
+ if !protoimpl.UnsafeEnabled {
+ file_catchbugs_catchbugs_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*CatchbugsInfoReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_catchbugs_catchbugs_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*CatchbugsInfoResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_catchbugs_catchbugs_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*CatchbugsAwardReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_catchbugs_catchbugs_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*CatchbugsAwardResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_catchbugs_catchbugs_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*CatchbugsSingleOverReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_catchbugs_catchbugs_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*CatchbugsSingleOverResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_catchbugs_catchbugs_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*CatchbugsGameReadyPush); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_catchbugs_catchbugs_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*CatchbugsLoadCompleteReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_catchbugs_catchbugs_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*CatchbugsLoadCompleteResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_catchbugs_catchbugs_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*CatchbugsRoundStartPush); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_catchbugs_catchbugs_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*CatchbugsHandleReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_catchbugs_catchbugs_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*CatchbugsHandleResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_catchbugs_catchbugs_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*CatchbugsOpenCardPush); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_catchbugs_catchbugs_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*CatchbugsHandleEndReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_catchbugs_catchbugs_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*CatchbugsHandleEndResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_catchbugs_catchbugs_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*CatchbugsGameOverPush); 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{
+ File: protoimpl.DescBuilder{
+ GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+ RawDescriptor: file_catchbugs_catchbugs_msg_proto_rawDesc,
+ NumEnums: 0,
+ NumMessages: 18,
+ NumExtensions: 0,
+ NumServices: 0,
+ },
+ GoTypes: file_catchbugs_catchbugs_msg_proto_goTypes,
+ DependencyIndexes: file_catchbugs_catchbugs_msg_proto_depIdxs,
+ MessageInfos: file_catchbugs_catchbugs_msg_proto_msgTypes,
+ }.Build()
+ File_catchbugs_catchbugs_msg_proto = out.File
+ file_catchbugs_catchbugs_msg_proto_rawDesc = nil
+ file_catchbugs_catchbugs_msg_proto_goTypes = nil
+ file_catchbugs_catchbugs_msg_proto_depIdxs = nil
+}
diff --git a/sys/configure/structs/Game.BuzkashiGradeData.go b/sys/configure/structs/Game.BuzkashiGradeData.go
index 008754ded..fd160a1db 100644
--- a/sys/configure/structs/Game.BuzkashiGradeData.go
+++ b/sys/configure/structs/Game.BuzkashiGradeData.go
@@ -16,6 +16,7 @@ type GameBuzkashiGradeData struct {
Value int32
Energy int32
Matchvalue int32
+ ScoreText string
}
const TypeId_GameBuzkashiGradeData = -378990226
@@ -30,6 +31,7 @@ func (_v *GameBuzkashiGradeData)Deserialize(_buf map[string]interface{}) (err er
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["energy"].(float64); !_ok_ { err = errors.New("energy error"); return }; _v.Energy = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["matchvalue"].(float64); !_ok_ { err = errors.New("matchvalue error"); return }; _v.Matchvalue = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["scoreText"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ScoreText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ScoreText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return
}
diff --git a/sys/configure/structs/Game.BuzkashiQteLvData.go b/sys/configure/structs/Game.BuzkashiQteLvData.go
index 372c54a1e..d39bcc569 100644
--- a/sys/configure/structs/Game.BuzkashiQteLvData.go
+++ b/sys/configure/structs/Game.BuzkashiQteLvData.go
@@ -15,6 +15,7 @@ type GameBuzkashiQteLvData struct {
Time float32
Value int32
Matchvalue int32
+ ScoreText string
}
const TypeId_GameBuzkashiQteLvData = 795602659
@@ -28,6 +29,7 @@ func (_v *GameBuzkashiQteLvData)Deserialize(_buf map[string]interface{}) (err er
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time"].(float64); !_ok_ { err = errors.New("time error"); return }; _v.Time = float32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["matchvalue"].(float64); !_ok_ { err = errors.New("matchvalue error"); return }; _v.Matchvalue = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["scoreText"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ScoreText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ScoreText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return
}
diff --git a/sys/configure/structs/Game.CatchbugLllustrated.go b/sys/configure/structs/Game.CatchbugLllustrated.go
new file mode 100644
index 000000000..a1e353885
--- /dev/null
+++ b/sys/configure/structs/Game.CatchbugLllustrated.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameCatchbugLllustrated struct {
+ _dataMap map[int32]*GameCatchbugLllustratedData
+ _dataList []*GameCatchbugLllustratedData
+}
+
+func NewGameCatchbugLllustrated(_buf []map[string]interface{}) (*GameCatchbugLllustrated, error) {
+ _dataList := make([]*GameCatchbugLllustratedData, 0, len(_buf))
+ dataMap := make(map[int32]*GameCatchbugLllustratedData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameCatchbugLllustratedData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameCatchbugLllustrated{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameCatchbugLllustrated) GetDataMap() map[int32]*GameCatchbugLllustratedData {
+ return table._dataMap
+}
+
+func (table *GameCatchbugLllustrated) GetDataList() []*GameCatchbugLllustratedData {
+ return table._dataList
+}
+
+func (table *GameCatchbugLllustrated) Get(key int32) *GameCatchbugLllustratedData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.CatchbugLllustratedData.go b/sys/configure/structs/Game.CatchbugLllustratedData.go
new file mode 100644
index 000000000..500db1f96
--- /dev/null
+++ b/sys/configure/structs/Game.CatchbugLllustratedData.go
@@ -0,0 +1,45 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameCatchbugLllustratedData struct {
+ Id int32
+ Rarity int32
+ Cardname string
+ Carddescribe string
+ Pic string
+ Weights int32
+}
+
+const TypeId_GameCatchbugLllustratedData = -1899586481
+
+func (*GameCatchbugLllustratedData) GetTypeId() int32 {
+ return -1899586481
+}
+
+func (_v *GameCatchbugLllustratedData)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["rarity"].(float64); !_ok_ { err = errors.New("rarity error"); return }; _v.Rarity = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["cardname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Cardname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Cardname, _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["carddescribe"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Carddescribe error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Carddescribe, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; if _v.Pic, _ok_ = _buf["pic"].(string); !_ok_ { err = errors.New("pic error"); return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["weights"].(float64); !_ok_ { err = errors.New("weights error"); return }; _v.Weights = int32(_tempNum_) }
+ return
+}
+
+func DeserializeGameCatchbugLllustratedData(_buf map[string]interface{}) (*GameCatchbugLllustratedData, error) {
+ v := &GameCatchbugLllustratedData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.CatchbugReward.go b/sys/configure/structs/Game.CatchbugReward.go
new file mode 100644
index 000000000..34e651f48
--- /dev/null
+++ b/sys/configure/structs/Game.CatchbugReward.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameCatchbugReward struct {
+ _dataMap map[int32]*GameCatchbugRewardData
+ _dataList []*GameCatchbugRewardData
+}
+
+func NewGameCatchbugReward(_buf []map[string]interface{}) (*GameCatchbugReward, error) {
+ _dataList := make([]*GameCatchbugRewardData, 0, len(_buf))
+ dataMap := make(map[int32]*GameCatchbugRewardData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameCatchbugRewardData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Key] = _v
+ }
+ }
+ return &GameCatchbugReward{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameCatchbugReward) GetDataMap() map[int32]*GameCatchbugRewardData {
+ return table._dataMap
+}
+
+func (table *GameCatchbugReward) GetDataList() []*GameCatchbugRewardData {
+ return table._dataList
+}
+
+func (table *GameCatchbugReward) Get(key int32) *GameCatchbugRewardData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.CatchbugRewardData.go b/sys/configure/structs/Game.CatchbugRewardData.go
new file mode 100644
index 000000000..3c5ed7c31
--- /dev/null
+++ b/sys/configure/structs/Game.CatchbugRewardData.go
@@ -0,0 +1,52 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameCatchbugRewardData struct {
+ Key int32
+ Condition int32
+ Reward []*Gameatn
+}
+
+const TypeId_GameCatchbugRewardData = -1852697170
+
+func (*GameCatchbugRewardData) GetTypeId() int32 {
+ return -1852697170
+}
+
+func (_v *GameCatchbugRewardData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["condition"].(float64); !_ok_ { err = errors.New("condition error"); return }; _v.Condition = 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 DeserializeGameCatchbugRewardData(_buf map[string]interface{}) (*GameCatchbugRewardData, error) {
+ v := &GameCatchbugRewardData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.CatchbugSkill.go b/sys/configure/structs/Game.CatchbugSkill.go
new file mode 100644
index 000000000..5c403790c
--- /dev/null
+++ b/sys/configure/structs/Game.CatchbugSkill.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameCatchbugSkill struct {
+ _dataMap map[int32]*GameCatchbugSkillData
+ _dataList []*GameCatchbugSkillData
+}
+
+func NewGameCatchbugSkill(_buf []map[string]interface{}) (*GameCatchbugSkill, error) {
+ _dataList := make([]*GameCatchbugSkillData, 0, len(_buf))
+ dataMap := make(map[int32]*GameCatchbugSkillData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameCatchbugSkillData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameCatchbugSkill{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameCatchbugSkill) GetDataMap() map[int32]*GameCatchbugSkillData {
+ return table._dataMap
+}
+
+func (table *GameCatchbugSkill) GetDataList() []*GameCatchbugSkillData {
+ return table._dataList
+}
+
+func (table *GameCatchbugSkill) Get(key int32) *GameCatchbugSkillData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.CatchbugSkillData.go b/sys/configure/structs/Game.CatchbugSkillData.go
new file mode 100644
index 000000000..2b2de927d
--- /dev/null
+++ b/sys/configure/structs/Game.CatchbugSkillData.go
@@ -0,0 +1,39 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameCatchbugSkillData struct {
+ Id int32
+ Skillname string
+ Round int32
+}
+
+const TypeId_GameCatchbugSkillData = -340365114
+
+func (*GameCatchbugSkillData) GetTypeId() int32 {
+ return -340365114
+}
+
+func (_v *GameCatchbugSkillData)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["skillname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Skillname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Skillname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["round"].(float64); !_ok_ { err = errors.New("round error"); return }; _v.Round = int32(_tempNum_) }
+ return
+}
+
+func DeserializeGameCatchbugSkillData(_buf map[string]interface{}) (*GameCatchbugSkillData, error) {
+ v := &GameCatchbugSkillData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.CatchbugSset.go b/sys/configure/structs/Game.CatchbugSset.go
new file mode 100644
index 000000000..7630cdcb3
--- /dev/null
+++ b/sys/configure/structs/Game.CatchbugSset.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameCatchbugSset struct {
+ _dataMap map[int32]*GameCatchbugSsetData
+ _dataList []*GameCatchbugSsetData
+}
+
+func NewGameCatchbugSset(_buf []map[string]interface{}) (*GameCatchbugSset, error) {
+ _dataList := make([]*GameCatchbugSsetData, 0, len(_buf))
+ dataMap := make(map[int32]*GameCatchbugSsetData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameCatchbugSsetData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameCatchbugSset{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameCatchbugSset) GetDataMap() map[int32]*GameCatchbugSsetData {
+ return table._dataMap
+}
+
+func (table *GameCatchbugSset) GetDataList() []*GameCatchbugSsetData {
+ return table._dataList
+}
+
+func (table *GameCatchbugSset) Get(key int32) *GameCatchbugSsetData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.CatchbugSsetData.go b/sys/configure/structs/Game.CatchbugSsetData.go
new file mode 100644
index 000000000..be8708c5c
--- /dev/null
+++ b/sys/configure/structs/Game.CatchbugSsetData.go
@@ -0,0 +1,69 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameCatchbugSsetData struct {
+ Id int32
+ Round int32
+ Time int32
+ Deducttime []int32
+ Rewardtime []int32
+}
+
+const TypeId_GameCatchbugSsetData = 469033678
+
+func (*GameCatchbugSsetData) GetTypeId() int32 {
+ return 469033678
+}
+
+func (_v *GameCatchbugSsetData)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["round"].(float64); !_ok_ { err = errors.New("round error"); return }; _v.Round = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time"].(float64); !_ok_ { err = errors.New("time error"); return }; _v.Time = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["deducttime"].([]interface{}); !_ok_ { err = errors.New("deducttime error"); return }
+
+ _v.Deducttime = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Deducttime = append(_v.Deducttime, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["rewardtime"].([]interface{}); !_ok_ { err = errors.New("rewardtime error"); return }
+
+ _v.Rewardtime = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Rewardtime = append(_v.Rewardtime, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameCatchbugSsetData(_buf map[string]interface{}) (*GameCatchbugSsetData, error) {
+ v := &GameCatchbugSsetData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.CatchbugStage.go b/sys/configure/structs/Game.CatchbugStage.go
new file mode 100644
index 000000000..d1327bba0
--- /dev/null
+++ b/sys/configure/structs/Game.CatchbugStage.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameCatchbugStage struct {
+ _dataMap map[int32]*GameCatchbugStageData
+ _dataList []*GameCatchbugStageData
+}
+
+func NewGameCatchbugStage(_buf []map[string]interface{}) (*GameCatchbugStage, error) {
+ _dataList := make([]*GameCatchbugStageData, 0, len(_buf))
+ dataMap := make(map[int32]*GameCatchbugStageData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameCatchbugStageData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameCatchbugStage{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameCatchbugStage) GetDataMap() map[int32]*GameCatchbugStageData {
+ return table._dataMap
+}
+
+func (table *GameCatchbugStage) GetDataList() []*GameCatchbugStageData {
+ return table._dataList
+}
+
+func (table *GameCatchbugStage) Get(key int32) *GameCatchbugStageData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.CatchbugStageData.go b/sys/configure/structs/Game.CatchbugStageData.go
new file mode 100644
index 000000000..8a37fd1f8
--- /dev/null
+++ b/sys/configure/structs/Game.CatchbugStageData.go
@@ -0,0 +1,69 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameCatchbugStageData struct {
+ Id int32
+ Cardnum *Gamekv
+ Stagetime int32
+ Skill []int32
+ Skilltime []int32
+}
+
+const TypeId_GameCatchbugStageData = -494646541
+
+func (*GameCatchbugStageData) GetTypeId() int32 {
+ return -494646541
+}
+
+func (_v *GameCatchbugStageData)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 _x_ map[string]interface{}; if _x_, _ok_ = _buf["cardnum"].(map[string]interface{}); !_ok_ { err = errors.New("cardnum error"); return }; if _v.Cardnum, err = DeserializeGamekv(_x_); err != nil { return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stagetime"].(float64); !_ok_ { err = errors.New("stagetime error"); return }; _v.Stagetime = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["skill"].([]interface{}); !_ok_ { err = errors.New("skill error"); return }
+
+ _v.Skill = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Skill = append(_v.Skill, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["skilltime"].([]interface{}); !_ok_ { err = errors.New("skilltime error"); return }
+
+ _v.Skilltime = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Skilltime = append(_v.Skilltime, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameCatchbugStageData(_buf map[string]interface{}) (*GameCatchbugStageData, error) {
+ v := &GameCatchbugStageData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.PuggsyPassCheck.go b/sys/configure/structs/Game.PuggsyPassCheck.go
index c122f0b29..b657b1448 100644
--- a/sys/configure/structs/Game.PuggsyPassCheck.go
+++ b/sys/configure/structs/Game.PuggsyPassCheck.go
@@ -8,34 +8,34 @@
package cfg
-type GamePuggsyPassCheck struct {
- _dataMap map[int32]*GamePuggsyPassCheckData
- _dataList []*GamePuggsyPassCheckData
+type GamePuggsyPasscheck struct {
+ _dataMap map[int32]*GamePuggsyPasscheckData
+ _dataList []*GamePuggsyPasscheckData
}
-func NewGamePuggsyPassCheck(_buf []map[string]interface{}) (*GamePuggsyPassCheck, error) {
- _dataList := make([]*GamePuggsyPassCheckData, 0, len(_buf))
- dataMap := make(map[int32]*GamePuggsyPassCheckData)
+func NewGamePuggsyPasscheck(_buf []map[string]interface{}) (*GamePuggsyPasscheck, error) {
+ _dataList := make([]*GamePuggsyPasscheckData, 0, len(_buf))
+ dataMap := make(map[int32]*GamePuggsyPasscheckData)
for _, _ele_ := range _buf {
- if _v, err2 := DeserializeGamePuggsyPassCheckData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGamePuggsyPasscheckData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
- return &GamePuggsyPassCheck{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GamePuggsyPasscheck{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *GamePuggsyPassCheck) GetDataMap() map[int32]*GamePuggsyPassCheckData {
+func (table *GamePuggsyPasscheck) GetDataMap() map[int32]*GamePuggsyPasscheckData {
return table._dataMap
}
-func (table *GamePuggsyPassCheck) GetDataList() []*GamePuggsyPassCheckData {
+func (table *GamePuggsyPasscheck) GetDataList() []*GamePuggsyPasscheckData {
return table._dataList
}
-func (table *GamePuggsyPassCheck) Get(key int32) *GamePuggsyPassCheckData {
+func (table *GamePuggsyPasscheck) Get(key int32) *GamePuggsyPasscheckData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/Game.PuggsyPassCheckData.go b/sys/configure/structs/Game.PuggsyPassCheckData.go
index 793bdbd6e..9f98f1965 100644
--- a/sys/configure/structs/Game.PuggsyPassCheckData.go
+++ b/sys/configure/structs/Game.PuggsyPassCheckData.go
@@ -10,7 +10,7 @@ package cfg
import "errors"
-type GamePuggsyPassCheckData struct {
+type GamePuggsyPasscheckData struct {
Id int32
PayId string
Parameter int32
@@ -19,13 +19,13 @@ type GamePuggsyPassCheckData struct {
PayReward []*Gameatn
}
-const TypeId_GamePuggsyPassCheckData = -216498502
+const TypeId_GamePuggsyPasscheckData = 2074500826
-func (*GamePuggsyPassCheckData) GetTypeId() int32 {
- return -216498502
+func (*GamePuggsyPasscheckData) GetTypeId() int32 {
+ return 2074500826
}
-func (_v *GamePuggsyPassCheckData)Deserialize(_buf map[string]interface{}) (err error) {
+func (_v *GamePuggsyPasscheckData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; if _v.PayId, _ok_ = _buf["pay_id"].(string); !_ok_ { err = errors.New("pay_id error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["parameter"].(float64); !_ok_ { err = errors.New("parameter error"); return }; _v.Parameter = int32(_tempNum_) }
@@ -48,8 +48,8 @@ func (_v *GamePuggsyPassCheckData)Deserialize(_buf map[string]interface{}) (err
return
}
-func DeserializeGamePuggsyPassCheckData(_buf map[string]interface{}) (*GamePuggsyPassCheckData, error) {
- v := &GamePuggsyPassCheckData{}
+func DeserializeGamePuggsyPasscheckData(_buf map[string]interface{}) (*GamePuggsyPasscheckData, error) {
+ v := &GamePuggsyPasscheckData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
diff --git a/sys/configure/structs/Game.Unblanking.go b/sys/configure/structs/Game.Unblanking.go
new file mode 100644
index 000000000..64d7b4b17
--- /dev/null
+++ b/sys/configure/structs/Game.Unblanking.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameUnblanking struct {
+ _dataMap map[int32]*GameUnblankingData
+ _dataList []*GameUnblankingData
+}
+
+func NewGameUnblanking(_buf []map[string]interface{}) (*GameUnblanking, error) {
+ _dataList := make([]*GameUnblankingData, 0, len(_buf))
+ dataMap := make(map[int32]*GameUnblankingData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameUnblankingData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameUnblanking{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameUnblanking) GetDataMap() map[int32]*GameUnblankingData {
+ return table._dataMap
+}
+
+func (table *GameUnblanking) GetDataList() []*GameUnblankingData {
+ return table._dataList
+}
+
+func (table *GameUnblanking) Get(key int32) *GameUnblankingData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.UnblankingData.go b/sys/configure/structs/Game.UnblankingData.go
new file mode 100644
index 000000000..2483f6042
--- /dev/null
+++ b/sys/configure/structs/Game.UnblankingData.go
@@ -0,0 +1,88 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameUnblankingData struct {
+ Id int32
+ Key int32
+ Type int32
+ Pic string
+ Left []*Gamekv
+ Right []*Gamekv
+ Picangle []int32
+ Time int32
+}
+
+const TypeId_GameUnblankingData = 1670050157
+
+func (*GameUnblankingData) GetTypeId() int32 {
+ return 1670050157
+}
+
+func (_v *GameUnblankingData)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["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
+ { var _ok_ bool; if _v.Pic, _ok_ = _buf["pic"].(string); !_ok_ { err = errors.New("pic error"); return } }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["left"].([]interface{}); !_ok_ { err = errors.New("left error"); return }
+
+ _v.Left = make([]*Gamekv, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gamekv
+ { 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 = DeserializeGamekv(_x_); err != nil { return } }
+ _v.Left = append(_v.Left, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["right"].([]interface{}); !_ok_ { err = errors.New("right error"); return }
+
+ _v.Right = make([]*Gamekv, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gamekv
+ { 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 = DeserializeGamekv(_x_); err != nil { return } }
+ _v.Right = append(_v.Right, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["picangle"].([]interface{}); !_ok_ { err = errors.New("picangle error"); return }
+
+ _v.Picangle = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Picangle = append(_v.Picangle, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time"].(float64); !_ok_ { err = errors.New("time error"); return }; _v.Time = int32(_tempNum_) }
+ return
+}
+
+func DeserializeGameUnblankingData(_buf map[string]interface{}) (*GameUnblankingData, error) {
+ v := &GameUnblankingData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index 57bf949ac..03f324ec0 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -290,8 +290,14 @@ type Tables struct {
PuggsyFight *GamePuggsyFight
PuggsyScore *GamePuggsyScore
PuggsySkill *GamePuggsySkill
+ PuggsyPasscheck *GamePuggsyPasscheck
Catchrabbit *GameCatchrabbit
- PuggsyPassCheck *GamePuggsyPassCheck
+ Unblanking *GameUnblanking
+ CatchbugSset *GameCatchbugSset
+ CatchbugStage *GameCatchbugStage
+ CatchbugReward *GameCatchbugReward
+ CatchbugLllustrated *GameCatchbugLllustrated
+ CatchbugSkill *GameCatchbugSkill
}
func NewTables(loader JsonLoader) (*Tables, error) {
@@ -1973,16 +1979,52 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.PuggsySkill, err = NewGamePuggsySkill(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_puggsypasscheck") ; err != nil {
+ return nil, err
+ }
+ if tables.PuggsyPasscheck, err = NewGamePuggsyPasscheck(buf) ; err != nil {
+ return nil, err
+ }
if buf, err = loader("game_catchrabbit") ; err != nil {
return nil, err
}
if tables.Catchrabbit, err = NewGameCatchrabbit(buf) ; err != nil {
return nil, err
}
- if buf, err = loader("game_puggsypasscheck") ; err != nil {
+ if buf, err = loader("game_unblanking") ; err != nil {
return nil, err
}
- if tables.PuggsyPassCheck, err = NewGamePuggsyPassCheck(buf) ; err != nil {
+ if tables.Unblanking, err = NewGameUnblanking(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_catchbugsset") ; err != nil {
+ return nil, err
+ }
+ if tables.CatchbugSset, err = NewGameCatchbugSset(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_catchbugstage") ; err != nil {
+ return nil, err
+ }
+ if tables.CatchbugStage, err = NewGameCatchbugStage(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_catchbugreward") ; err != nil {
+ return nil, err
+ }
+ if tables.CatchbugReward, err = NewGameCatchbugReward(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_catchbuglllustrated") ; err != nil {
+ return nil, err
+ }
+ if tables.CatchbugLllustrated, err = NewGameCatchbugLllustrated(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_catchbugskill") ; err != nil {
+ return nil, err
+ }
+ if tables.CatchbugSkill, err = NewGameCatchbugSkill(buf) ; err != nil {
return nil, err
}
return tables, nil
diff --git a/sys/configure/structs/game.heroData.go b/sys/configure/structs/game.heroData.go
index 084cbc9df..b7d481967 100644
--- a/sys/configure/structs/game.heroData.go
+++ b/sys/configure/structs/game.heroData.go
@@ -25,6 +25,7 @@ type GameHeroData struct {
Prefab string
Rotation string
Revolve int32
+ Scale []float32
Icon string
Vocal string
Tujing []int32
@@ -74,6 +75,20 @@ func (_v *GameHeroData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Prefab, _ok_ = _buf["prefab"].(string); !_ok_ { err = errors.New("prefab error"); return } }
{ var _ok_ bool; if _v.Rotation, _ok_ = _buf["rotation"].(string); !_ok_ { err = errors.New("rotation error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["revolve"].(float64); !_ok_ { err = errors.New("revolve error"); return }; _v.Revolve = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["scale"].([]interface{}); !_ok_ { err = errors.New("scale error"); return }
+
+ _v.Scale = make([]float32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ float32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = float32(_x_) }
+ _v.Scale = append(_v.Scale, _list_v_)
+ }
+ }
+
{ var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
{ var _ok_ bool; if _v.Vocal, _ok_ = _buf["vocal"].(string); !_ok_ { err = errors.New("vocal error"); return } }
{