diff --git a/bin/json/game_gamesummary.json b/bin/json/game_gamesummary.json
index 397581663..1f792848f 100644
--- a/bin/json/game_gamesummary.json
+++ b/bin/json/game_gamesummary.json
@@ -385,7 +385,7 @@
"key": "gamesummary_node_name_11",
"text": "炼金塔"
},
- "tabId": 6,
+ "tabId": 7,
"mapPos": {
"x": 5040,
"y": 1202
@@ -423,7 +423,7 @@
"key": "gamesummary_node_name_12",
"text": "无极塔"
},
- "tabId": 6,
+ "tabId": 8,
"mapPos": {
"x": 5789,
"y": 1500
@@ -456,7 +456,7 @@
"key": "gamesummary_node_name_13",
"text": "六合塔"
},
- "tabId": 6,
+ "tabId": 9,
"mapPos": {
"x": 6008,
"y": 1805
diff --git a/bin/json/game_gamesummarytab.json b/bin/json/game_gamesummarytab.json
index b107be381..fc7b1b24d 100644
--- a/bin/json/game_gamesummarytab.json
+++ b/bin/json/game_gamesummarytab.json
@@ -63,7 +63,7 @@
},
"scale": 0.32,
"usetext": {
- "key": "gamesummary_fathernode_usetext_4",
+ "key": "gam+H7:N8esummary_fathernode_usetext_4",
"text": "现在是狩猎的时间！胜利获得的材料可以给守护者回响强化！"
}
},
@@ -101,6 +101,57 @@
"text": "功夫熊猫世界的人真是喜欢塔啊,但挑战胜利的奖励也很大方！"
}
},
+ {
+ "tabId": 7,
+ "layer": 1,
+ "name": {
+ "key": "gamesummary_fathernode_name_7",
+ "text": "炼金塔"
+ },
+ "mapPos": {
+ "x": -3065,
+ "y": 754
+ },
+ "scale": 0.65,
+ "usetext": {
+ "key": "gamesummary_fathernode_usetext_7",
+ "text": "点石成金的磨练地！挑战胜利可以获得教习的指导！"
+ }
+ },
+ {
+ "tabId": 8,
+ "layer": 1,
+ "name": {
+ "key": "gamesummary_fathernode_name_8",
+ "text": "无极塔"
+ },
+ "mapPos": {
+ "x": -3065,
+ "y": 754
+ },
+ "scale": 0.65,
+ "usetext": {
+ "key": "gamesummary_fathernode_usetext_8",
+ "text": ""
+ }
+ },
+ {
+ "tabId": 9,
+ "layer": 1,
+ "name": {
+ "key": "gamesummary_fathernode_name_9",
+ "text": "六合塔"
+ },
+ "mapPos": {
+ "x": -3065,
+ "y": 754
+ },
+ "scale": 0.65,
+ "usetext": {
+ "key": "gamesummary_fathernode_usetext_9",
+ "text": ""
+ }
+ },
{
"tabId": 10,
"layer": 0,
@@ -114,7 +165,7 @@
},
"scale": 0.8,
"usetext": {
- "key": "gamesummary_fathernode_usetext_7",
+ "key": "gamesummary_fathernode_usetext_10",
"text": "有人的地方就存在着纷争,·去战胜他人获得竞技币，在竞技商店兑换奖励吧！"
}
},
@@ -131,7 +182,7 @@
},
"scale": 0.8,
"usetext": {
- "key": "gamesummary_fathernode_usetext_8",
+ "key": "gamesummary_fathernode_usetext_11",
"text": "原始人的世界这么凶险吗？你要去那地方磨练自己？我都不知道胜利有什么奖励···"
}
},
@@ -148,7 +199,7 @@
},
"scale": 0.8,
"usetext": {
- "key": "gamesummary_fathernode_usetext_9",
+ "key": "gamesummary_fathernode_usetext_12",
"text": "巨怪商人们的脚步永不停歇,听说在他们那赚了足够多的钱财后可以有神秘大奖!"
}
}
diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json
index 40de4c78b..19848cdcb 100644
--- a/bin/json/game_hero.json
+++ b/bin/json/game_hero.json
@@ -10079,7 +10079,7 @@
"ip": 1,
"sd": 1,
"handbook": -1,
- "prefab": "54005",
+ "prefab": "54014",
"rotation": "0|0|0",
"revolve": 0,
"icon": "54005",
@@ -10153,7 +10153,7 @@
"ip": 1,
"sd": 1,
"handbook": -1,
- "prefab": "54005",
+ "prefab": "54014",
"rotation": "0|0|0",
"revolve": 0,
"icon": "54005",
diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json
index 91311d3ed..842a20228 100644
--- a/bin/json/game_mainstage.json
+++ b/bin/json/game_mainstage.json
@@ -6823,6 +6823,64 @@
"star_value": [],
"challengeward": 0
},
+ {
+ "id": 1100200,
+ "chapterid": 11002,
+ "group_id": 100200,
+ "previous_group_id": [
+ 100120
+ ],
+ "previoustage": 0,
+ "Episodetype": 0,
+ "openlevel": 1,
+ "EditorStage": 0,
+ "venturemodel": "",
+ "venturetype": 0,
+ "ventureavatar": [],
+ "herocolor": 0,
+ "heroimg": "",
+ "bubbletext": {
+ "key": "",
+ "text": ""
+ },
+ "animation": [],
+ "hide": 0,
+ "destroy": 1,
+ "progress": 0,
+ "frontstoryid": 0,
+ "afterstoryid": 0,
+ "maingroupName": {
+ "key": "",
+ "text": ""
+ },
+ "mainlineName": {
+ "key": "",
+ "text": ""
+ },
+ "title": {
+ "key": "",
+ "text": ""
+ },
+ "desc": {
+ "key": "",
+ "text": ""
+ },
+ "exp": 0,
+ "hero_exp": 0,
+ "ps_consume": [],
+ "ps_mg": [],
+ "firstaward": [],
+ "lotteryward": 0,
+ "commonaward": [],
+ "BattleReadyID": 0,
+ "FormatList": [],
+ "helphero": [],
+ "banhero": [],
+ "star": [],
+ "star_type": [],
+ "star_value": [],
+ "challengeward": 0
+ },
{
"id": 1100201,
"chapterid": 11002,
@@ -6830,7 +6888,7 @@
"previous_group_id": [
100120
],
- "previoustage": 1100201,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -6845,7 +6903,7 @@
},
"animation": [],
"hide": 0,
- "destroy": 0,
+ "destroy": 1,
"progress": 1,
"frontstoryid": 20105,
"afterstoryid": 20107,
@@ -6933,8 +6991,10 @@
"id": 1100202,
"chapterid": 11002,
"group_id": 100202,
- "previous_group_id": [],
- "previoustage": 1100202,
+ "previous_group_id": [
+ 100201
+ ],
+ "previoustage": 0,
"Episodetype": 4,
"openlevel": 1,
"EditorStage": 0,
@@ -6949,8 +7009,8 @@
},
"animation": [],
"hide": 0,
- "destroy": 0,
- "progress": 0,
+ "destroy": 1,
+ "progress": 1,
"frontstoryid": 20109,
"afterstoryid": 20110,
"maingroupName": {
@@ -7037,8 +7097,10 @@
"id": 1100203,
"chapterid": 11002,
"group_id": 100202,
- "previous_group_id": [],
- "previoustage": 1100203,
+ "previous_group_id": [
+ 100201
+ ],
+ "previoustage": 0,
"Episodetype": 4,
"openlevel": 1,
"EditorStage": 0,
@@ -7053,8 +7115,8 @@
},
"animation": [],
"hide": 0,
- "destroy": 0,
- "progress": 0,
+ "destroy": 1,
+ "progress": 1,
"frontstoryid": 20112,
"afterstoryid": 20113,
"maingroupName": {
@@ -7141,8 +7203,10 @@
"id": 1100204,
"chapterid": 11002,
"group_id": 100203,
- "previous_group_id": [],
- "previoustage": 1100204,
+ "previous_group_id": [
+ 100202
+ ],
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -7157,8 +7221,8 @@
},
"animation": [],
"hide": 0,
- "destroy": 0,
- "progress": 0,
+ "destroy": 1,
+ "progress": 1,
"frontstoryid": 20115,
"afterstoryid": 20117,
"maingroupName": {
@@ -7245,8 +7309,10 @@
"id": 1100205,
"chapterid": 11002,
"group_id": 100204,
- "previous_group_id": [],
- "previoustage": 1100205,
+ "previous_group_id": [
+ 100203
+ ],
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -7261,8 +7327,8 @@
},
"animation": [],
"hide": 0,
- "destroy": 0,
- "progress": 0,
+ "destroy": 1,
+ "progress": 1,
"frontstoryid": 20118,
"afterstoryid": 0,
"maingroupName": {
@@ -7349,9 +7415,11 @@
"id": 1100206,
"chapterid": 11002,
"group_id": 100205,
- "previous_group_id": [],
- "previoustage": 1100206,
- "Episodetype": 5,
+ "previous_group_id": [
+ 100204
+ ],
+ "previoustage": 0,
+ "Episodetype": 3,
"openlevel": 1,
"EditorStage": 0,
"venturemodel": "",
@@ -7365,8 +7433,8 @@
},
"animation": [],
"hide": 0,
- "destroy": 0,
- "progress": 0,
+ "destroy": 1,
+ "progress": 1,
"frontstoryid": 20119,
"afterstoryid": 0,
"maingroupName": {
@@ -7453,8 +7521,10 @@
"id": 1100207,
"chapterid": 11002,
"group_id": 100206,
- "previous_group_id": [],
- "previoustage": 1100207,
+ "previous_group_id": [
+ 100205
+ ],
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -7469,8 +7539,8 @@
},
"animation": [],
"hide": 0,
- "destroy": 0,
- "progress": 0,
+ "destroy": 1,
+ "progress": 1,
"frontstoryid": 20122,
"afterstoryid": 20125,
"maingroupName": {
@@ -7555,12 +7625,12 @@
},
{
"id": 1100208,
- "chapterid": 11003,
+ "chapterid": 11002,
"group_id": 100207,
"previous_group_id": [
100206
],
- "previoustage": 1100208,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -7575,7 +7645,7 @@
},
"animation": [],
"hide": 0,
- "destroy": 0,
+ "destroy": 1,
"progress": 1,
"frontstoryid": 20200,
"afterstoryid": 20201,
@@ -7661,10 +7731,12 @@
},
{
"id": 1100209,
- "chapterid": 11003,
+ "chapterid": 11002,
"group_id": 100208,
- "previous_group_id": [],
- "previoustage": 1100301,
+ "previous_group_id": [
+ 100207
+ ],
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -7679,8 +7751,8 @@
},
"animation": [],
"hide": 0,
- "destroy": 0,
- "progress": 0,
+ "destroy": 1,
+ "progress": 1,
"frontstoryid": 20204,
"afterstoryid": 20206,
"maingroupName": {
@@ -7765,10 +7837,12 @@
},
{
"id": 1100210,
- "chapterid": 11003,
+ "chapterid": 11002,
"group_id": 100209,
- "previous_group_id": [],
- "previoustage": 1100302,
+ "previous_group_id": [
+ 100208
+ ],
+ "previoustage": 0,
"Episodetype": 6,
"openlevel": 1,
"EditorStage": 0,
@@ -7783,8 +7857,8 @@
},
"animation": [],
"hide": 0,
- "destroy": 0,
- "progress": 0,
+ "destroy": 1,
+ "progress": 1,
"frontstoryid": 20207,
"afterstoryid": 20209,
"maingroupName": {
@@ -7869,10 +7943,12 @@
},
{
"id": 1100211,
- "chapterid": 11003,
+ "chapterid": 11002,
"group_id": 100210,
- "previous_group_id": [],
- "previoustage": 1100303,
+ "previous_group_id": [
+ 100209
+ ],
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -7887,8 +7963,8 @@
},
"animation": [],
"hide": 0,
- "destroy": 0,
- "progress": 0,
+ "destroy": 1,
+ "progress": 1,
"frontstoryid": 20210,
"afterstoryid": 20211,
"maingroupName": {
@@ -7973,10 +8049,12 @@
},
{
"id": 1100212,
- "chapterid": 11003,
+ "chapterid": 11002,
"group_id": 100211,
- "previous_group_id": [],
- "previoustage": 1100304,
+ "previous_group_id": [
+ 100210
+ ],
+ "previoustage": 0,
"Episodetype": 7,
"openlevel": 1,
"EditorStage": 0,
@@ -7991,8 +8069,8 @@
},
"animation": [],
"hide": 0,
- "destroy": 0,
- "progress": 0,
+ "destroy": 1,
+ "progress": 1,
"frontstoryid": 20222,
"afterstoryid": 0,
"maingroupName": {
@@ -8078,9 +8156,11 @@
{
"id": 1100213,
"chapterid": 11003,
- "group_id": 0,
- "previous_group_id": [],
- "previoustage": 1100305,
+ "group_id": 100301,
+ "previous_group_id": [
+ 100211
+ ],
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -8182,9 +8262,9 @@
{
"id": 1100214,
"chapterid": 11003,
- "group_id": 0,
+ "group_id": 100302,
"previous_group_id": [],
- "previoustage": 1100306,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -8286,9 +8366,9 @@
{
"id": 1100215,
"chapterid": 11003,
- "group_id": 0,
+ "group_id": 100303,
"previous_group_id": [],
- "previoustage": 1100307,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -8390,9 +8470,9 @@
{
"id": 1100216,
"chapterid": 11004,
- "group_id": 0,
+ "group_id": 100304,
"previous_group_id": [],
- "previoustage": 1100308,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -8494,9 +8574,9 @@
{
"id": 1100217,
"chapterid": 11004,
- "group_id": 0,
+ "group_id": 100305,
"previous_group_id": [],
- "previoustage": 1100401,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -8598,9 +8678,9 @@
{
"id": 1100218,
"chapterid": 11004,
- "group_id": 0,
+ "group_id": 100306,
"previous_group_id": [],
- "previoustage": 1100402,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -8702,9 +8782,9 @@
{
"id": 1100219,
"chapterid": 11004,
- "group_id": 0,
+ "group_id": 100307,
"previous_group_id": [],
- "previoustage": 1100403,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -8808,7 +8888,7 @@
"chapterid": 11004,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100404,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -8912,7 +8992,7 @@
"chapterid": 11004,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100405,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -9016,7 +9096,7 @@
"chapterid": 11004,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100406,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -9120,7 +9200,7 @@
"chapterid": 11004,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100407,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -9224,7 +9304,7 @@
"chapterid": 11005,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100408,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -9328,7 +9408,7 @@
"chapterid": 11005,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100501,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -9432,7 +9512,7 @@
"chapterid": 11005,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100502,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -9536,7 +9616,7 @@
"chapterid": 11005,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100503,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -9640,7 +9720,7 @@
"chapterid": 11005,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100504,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -9744,7 +9824,7 @@
"chapterid": 11005,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100505,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -9848,7 +9928,7 @@
"chapterid": 11005,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100506,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -9952,7 +10032,7 @@
"chapterid": 11005,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100507,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -10056,7 +10136,7 @@
"chapterid": 11006,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100508,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -10160,7 +10240,7 @@
"chapterid": 11006,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100601,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -10264,7 +10344,7 @@
"chapterid": 11006,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100602,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -10368,7 +10448,7 @@
"chapterid": 11006,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100603,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -10472,7 +10552,7 @@
"chapterid": 11006,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100604,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -10576,7 +10656,7 @@
"chapterid": 11006,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100605,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -10680,7 +10760,7 @@
"chapterid": 11006,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100606,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -10784,7 +10864,7 @@
"chapterid": 11006,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100607,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -10888,7 +10968,7 @@
"chapterid": 11007,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100608,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -10992,7 +11072,7 @@
"chapterid": 11007,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100701,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -11096,7 +11176,7 @@
"chapterid": 11007,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100702,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -11200,7 +11280,7 @@
"chapterid": 11007,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100703,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -11304,7 +11384,7 @@
"chapterid": 11007,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100704,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -11408,7 +11488,7 @@
"chapterid": 11007,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100705,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -11512,7 +11592,7 @@
"chapterid": 11007,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100706,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -11616,7 +11696,7 @@
"chapterid": 11007,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100707,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -11720,7 +11800,7 @@
"chapterid": 11008,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100708,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -11824,7 +11904,7 @@
"chapterid": 11008,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100801,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -11928,7 +12008,7 @@
"chapterid": 11008,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100802,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -12032,7 +12112,7 @@
"chapterid": 11008,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100803,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -12136,7 +12216,7 @@
"chapterid": 11008,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100804,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -12240,7 +12320,7 @@
"chapterid": 11008,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100805,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -12344,7 +12424,7 @@
"chapterid": 11008,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100806,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -12448,7 +12528,7 @@
"chapterid": 11008,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100807,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -12552,7 +12632,7 @@
"chapterid": 11009,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100808,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -12656,7 +12736,7 @@
"chapterid": 11009,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100901,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -12760,7 +12840,7 @@
"chapterid": 11009,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100902,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -12864,7 +12944,7 @@
"chapterid": 11009,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100903,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -12968,7 +13048,7 @@
"chapterid": 11009,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100904,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -13072,7 +13152,7 @@
"chapterid": 11009,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100905,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -13176,7 +13256,7 @@
"chapterid": 11009,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100906,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -13280,7 +13360,7 @@
"chapterid": 11009,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100907,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -13384,7 +13464,7 @@
"chapterid": 11010,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1100908,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -13488,7 +13568,7 @@
"chapterid": 11010,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1101001,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -13592,7 +13672,7 @@
"chapterid": 11010,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1101002,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -13696,7 +13776,7 @@
"chapterid": 11010,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1101003,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -13800,7 +13880,7 @@
"chapterid": 11010,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1101004,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -13904,7 +13984,7 @@
"chapterid": 11010,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1101005,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -14008,7 +14088,7 @@
"chapterid": 11010,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1101006,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -14112,7 +14192,7 @@
"chapterid": 11010,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1101007,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -14216,7 +14296,7 @@
"chapterid": 11011,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1101008,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -14320,7 +14400,7 @@
"chapterid": 11011,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1101101,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -14424,7 +14504,7 @@
"chapterid": 11011,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1101102,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -14528,7 +14608,7 @@
"chapterid": 11011,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1101103,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -14632,7 +14712,7 @@
"chapterid": 11011,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1101104,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -14736,7 +14816,7 @@
"chapterid": 11011,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1101105,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -14840,7 +14920,7 @@
"chapterid": 11011,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1101106,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -14944,7 +15024,7 @@
"chapterid": 11011,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1101107,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -15048,7 +15128,7 @@
"chapterid": 11012,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1101108,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -15152,7 +15232,7 @@
"chapterid": 11012,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1101201,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -15256,7 +15336,7 @@
"chapterid": 11012,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1101202,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -15360,7 +15440,7 @@
"chapterid": 11012,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1101203,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -15464,7 +15544,7 @@
"chapterid": 11012,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1101204,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -15568,7 +15648,7 @@
"chapterid": 11012,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1101205,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -15672,7 +15752,7 @@
"chapterid": 11012,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1101206,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
@@ -15776,7 +15856,7 @@
"chapterid": 11012,
"group_id": 0,
"previous_group_id": [],
- "previoustage": 1101207,
+ "previoustage": 0,
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
diff --git a/bin/json/game_pricegroup.json b/bin/json/game_pricegroup.json
index 28bd86069..8b261e8c6 100644
--- a/bin/json/game_pricegroup.json
+++ b/bin/json/game_pricegroup.json
@@ -146,7 +146,20 @@
"id": 12,
"pricegroupId": 1002,
"purchasemin": 10,
- "purchasemax": 12,
+ "purchasemax": 11,
+ "cost": [
+ {
+ "a": "item",
+ "t": "23000001",
+ "n": 200
+ }
+ ]
+ },
+ {
+ "id": 13,
+ "pricegroupId": 1002,
+ "purchasemin": 12,
+ "purchasemax": -1,
"cost": [
{
"a": "item",
diff --git a/bin/json/game_uigamelattice.json b/bin/json/game_uigamelattice.json
new file mode 100644
index 000000000..93722dfdc
--- /dev/null
+++ b/bin/json/game_uigamelattice.json
@@ -0,0 +1,156 @@
+[
+ {
+ "latticekey": 1,
+ "layers": 1,
+ "bornpos": {
+ "x": 1,
+ "y": 1
+ },
+ "chestspos": [
+ {
+ "x": 2,
+ "y": 2
+ },
+ {
+ "x": 3,
+ "y": 3
+ }
+ ],
+ "outpos": {
+ "x": 5,
+ "y": 5
+ }
+ },
+ {
+ "latticekey": 2,
+ "layers": 2,
+ "bornpos": {
+ "x": 5,
+ "y": 5
+ },
+ "chestspos": [
+ {
+ "x": 2,
+ "y": 2
+ },
+ {
+ "x": 3,
+ "y": 3
+ }
+ ],
+ "outpos": {
+ "x": 1,
+ "y": 1
+ }
+ },
+ {
+ "latticekey": 3,
+ "layers": 3,
+ "bornpos": {
+ "x": 1,
+ "y": 1
+ },
+ "chestspos": [
+ {
+ "x": 2,
+ "y": 2
+ },
+ {
+ "x": 3,
+ "y": 3
+ }
+ ],
+ "outpos": {
+ "x": 5,
+ "y": 5
+ }
+ },
+ {
+ "latticekey": 4,
+ "layers": 4,
+ "bornpos": {
+ "x": 5,
+ "y": 5
+ },
+ "chestspos": [
+ {
+ "x": 2,
+ "y": 2
+ },
+ {
+ "x": 3,
+ "y": 3
+ }
+ ],
+ "outpos": {
+ "x": 1,
+ "y": 1
+ }
+ },
+ {
+ "latticekey": 5,
+ "layers": 5,
+ "bornpos": {
+ "x": 1,
+ "y": 1
+ },
+ "chestspos": [
+ {
+ "x": 2,
+ "y": 2
+ },
+ {
+ "x": 3,
+ "y": 3
+ }
+ ],
+ "outpos": {
+ "x": 5,
+ "y": 5
+ }
+ },
+ {
+ "latticekey": 6,
+ "layers": 6,
+ "bornpos": {
+ "x": 5,
+ "y": 5
+ },
+ "chestspos": [
+ {
+ "x": 2,
+ "y": 2
+ },
+ {
+ "x": 3,
+ "y": 3
+ }
+ ],
+ "outpos": {
+ "x": 1,
+ "y": 1
+ }
+ },
+ {
+ "latticekey": 7,
+ "layers": 7,
+ "bornpos": {
+ "x": 1,
+ "y": 1
+ },
+ "chestspos": [
+ {
+ "x": 2,
+ "y": 2
+ },
+ {
+ "x": 3,
+ "y": 3
+ }
+ ],
+ "outpos": {
+ "x": 5,
+ "y": 5
+ }
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_uigameminer.json b/bin/json/game_uigameminer.json
new file mode 100644
index 000000000..4cc07d351
--- /dev/null
+++ b/bin/json/game_uigameminer.json
@@ -0,0 +1,197 @@
+[
+ {
+ "minerkey": 1,
+ "mineid": 1,
+ "itemid": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "itempos": {
+ "x": 100,
+ "y": 100
+ }
+ },
+ {
+ "minerkey": 2,
+ "mineid": 1,
+ "itemid": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "itempos": {
+ "x": 100,
+ "y": 101
+ }
+ },
+ {
+ "minerkey": 3,
+ "mineid": 1,
+ "itemid": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "itempos": {
+ "x": 100,
+ "y": 102
+ }
+ },
+ {
+ "minerkey": 4,
+ "mineid": 1,
+ "itemid": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "itempos": {
+ "x": 100,
+ "y": 103
+ }
+ },
+ {
+ "minerkey": 5,
+ "mineid": 1,
+ "itemid": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "itempos": {
+ "x": 100,
+ "y": 104
+ }
+ },
+ {
+ "minerkey": 6,
+ "mineid": 2,
+ "itemid": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "itempos": {
+ "x": 100,
+ "y": 105
+ }
+ },
+ {
+ "minerkey": 7,
+ "mineid": 2,
+ "itemid": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "itempos": {
+ "x": 100,
+ "y": 106
+ }
+ },
+ {
+ "minerkey": 8,
+ "mineid": 2,
+ "itemid": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "itempos": {
+ "x": 100,
+ "y": 107
+ }
+ },
+ {
+ "minerkey": 9,
+ "mineid": 2,
+ "itemid": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "itempos": {
+ "x": 100,
+ "y": 108
+ }
+ },
+ {
+ "minerkey": 10,
+ "mineid": 2,
+ "itemid": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "itempos": {
+ "x": 100,
+ "y": 109
+ }
+ },
+ {
+ "minerkey": 11,
+ "mineid": 3,
+ "itemid": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "itempos": {
+ "x": 100,
+ "y": 110
+ }
+ },
+ {
+ "minerkey": 12,
+ "mineid": 3,
+ "itemid": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "itempos": {
+ "x": 100,
+ "y": 111
+ }
+ },
+ {
+ "minerkey": 13,
+ "mineid": 3,
+ "itemid": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "itempos": {
+ "x": 100,
+ "y": 112
+ }
+ },
+ {
+ "minerkey": 14,
+ "mineid": 3,
+ "itemid": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "itempos": {
+ "x": 100,
+ "y": 113
+ }
+ },
+ {
+ "minerkey": 15,
+ "mineid": 3,
+ "itemid": {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ },
+ "itempos": {
+ "x": 100,
+ "y": 114
+ }
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_uigamepuzzle.json b/bin/json/game_uigamepuzzle.json
new file mode 100644
index 000000000..2f23c1ed4
--- /dev/null
+++ b/bin/json/game_uigamepuzzle.json
@@ -0,0 +1,97 @@
+[
+ {
+ "puzzlekey": 1,
+ "puzzleward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "puzzlekey": 2,
+ "puzzleward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "puzzlekey": 3,
+ "puzzleward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "puzzlekey": 4,
+ "puzzleward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "puzzlekey": 5,
+ "puzzleward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "puzzlekey": 6,
+ "puzzleward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "puzzlekey": 7,
+ "puzzleward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "puzzlekey": 8,
+ "puzzleward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "puzzlekey": 9,
+ "puzzleward": [
+ {
+ "a": "item",
+ "t": "10000001",
+ "n": 10
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 100000
+ }
+ ]
+ }
+]
\ No newline at end of file
diff --git a/pb/uigame_db.pb.go b/pb/uigame_db.pb.go
new file mode 100644
index 000000000..4613378e7
--- /dev/null
+++ b/pb/uigame_db.pb.go
@@ -0,0 +1,213 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// protoc-gen-go v1.28.0
+// protoc v3.20.0
+// source: uigame/uigame_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 DBPuzzleData struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`
+ Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`
+ Hdoid string `protobuf:"bytes,3,opt,name=hdoid,proto3" json:"hdoid"` // 活动唯一id
+ Gotarr map[int32]int32 `protobuf:"bytes,4,rep,name=gotarr,proto3" json:"gotarr" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 奖励领取状态
+ Puzzle map[int32]int32 `protobuf:"bytes,5,rep,name=puzzle,proto3" json:"puzzle" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 拼图数据
+ Lasttime int64 `protobuf:"varint,6,opt,name=lasttime,proto3" json:"lasttime"`
+ Val int32 `protobuf:"varint,7,opt,name=val,proto3" json:"val"` // 今天获得N个碎片
+}
+
+func (x *DBPuzzleData) Reset() {
+ *x = DBPuzzleData{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_uigame_uigame_db_proto_msgTypes[0]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *DBPuzzleData) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBPuzzleData) ProtoMessage() {}
+
+func (x *DBPuzzleData) ProtoReflect() protoreflect.Message {
+ mi := &file_uigame_uigame_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 DBPuzzleData.ProtoReflect.Descriptor instead.
+func (*DBPuzzleData) Descriptor() ([]byte, []int) {
+ return file_uigame_uigame_db_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *DBPuzzleData) GetId() string {
+ if x != nil {
+ return x.Id
+ }
+ return ""
+}
+
+func (x *DBPuzzleData) GetUid() string {
+ if x != nil {
+ return x.Uid
+ }
+ return ""
+}
+
+func (x *DBPuzzleData) GetHdoid() string {
+ if x != nil {
+ return x.Hdoid
+ }
+ return ""
+}
+
+func (x *DBPuzzleData) GetGotarr() map[int32]int32 {
+ if x != nil {
+ return x.Gotarr
+ }
+ return nil
+}
+
+func (x *DBPuzzleData) GetPuzzle() map[int32]int32 {
+ if x != nil {
+ return x.Puzzle
+ }
+ return nil
+}
+
+func (x *DBPuzzleData) GetLasttime() int64 {
+ if x != nil {
+ return x.Lasttime
+ }
+ return 0
+}
+
+func (x *DBPuzzleData) GetVal() int32 {
+ if x != nil {
+ return x.Val
+ }
+ return 0
+}
+
+var File_uigame_uigame_db_proto protoreflect.FileDescriptor
+
+var file_uigame_uigame_db_proto_rawDesc = []byte{
+ 0x0a, 0x16, 0x75, 0x69, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x75, 0x69, 0x67, 0x61, 0x6d, 0x65, 0x5f,
+ 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd0, 0x02, 0x0a, 0x0c, 0x44, 0x42, 0x50,
+ 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
+ 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x68,
+ 0x64, 0x6f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x68, 0x64, 0x6f, 0x69,
+ 0x64, 0x12, 0x31, 0x0a, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x18, 0x04, 0x20, 0x03, 0x28,
+ 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x44, 0x61, 0x74, 0x61,
+ 0x2e, 0x47, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x67, 0x6f,
+ 0x74, 0x61, 0x72, 0x72, 0x12, 0x31, 0x0a, 0x06, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x18, 0x05,
+ 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x44,
+ 0x61, 0x74, 0x61, 0x2e, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
+ 0x06, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74,
+ 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74,
+ 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x61, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x03, 0x76, 0x61, 0x6c, 0x1a, 0x39, 0x0a, 0x0b, 0x47, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x45,
+ 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
+ 0x1a, 0x39, 0x0a, 0x0b, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
+ 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65,
+ 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+ 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+ file_uigame_uigame_db_proto_rawDescOnce sync.Once
+ file_uigame_uigame_db_proto_rawDescData = file_uigame_uigame_db_proto_rawDesc
+)
+
+func file_uigame_uigame_db_proto_rawDescGZIP() []byte {
+ file_uigame_uigame_db_proto_rawDescOnce.Do(func() {
+ file_uigame_uigame_db_proto_rawDescData = protoimpl.X.CompressGZIP(file_uigame_uigame_db_proto_rawDescData)
+ })
+ return file_uigame_uigame_db_proto_rawDescData
+}
+
+var file_uigame_uigame_db_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_uigame_uigame_db_proto_goTypes = []interface{}{
+ (*DBPuzzleData)(nil), // 0: DBPuzzleData
+ nil, // 1: DBPuzzleData.GotarrEntry
+ nil, // 2: DBPuzzleData.PuzzleEntry
+}
+var file_uigame_uigame_db_proto_depIdxs = []int32{
+ 1, // 0: DBPuzzleData.gotarr:type_name -> DBPuzzleData.GotarrEntry
+ 2, // 1: DBPuzzleData.puzzle:type_name -> DBPuzzleData.PuzzleEntry
+ 2, // [2:2] is the sub-list for method output_type
+ 2, // [2:2] is the sub-list for method input_type
+ 2, // [2:2] is the sub-list for extension type_name
+ 2, // [2:2] is the sub-list for extension extendee
+ 0, // [0:2] is the sub-list for field type_name
+}
+
+func init() { file_uigame_uigame_db_proto_init() }
+func file_uigame_uigame_db_proto_init() {
+ if File_uigame_uigame_db_proto != nil {
+ return
+ }
+ if !protoimpl.UnsafeEnabled {
+ file_uigame_uigame_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*DBPuzzleData); 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_uigame_uigame_db_proto_rawDesc,
+ NumEnums: 0,
+ NumMessages: 3,
+ NumExtensions: 0,
+ NumServices: 0,
+ },
+ GoTypes: file_uigame_uigame_db_proto_goTypes,
+ DependencyIndexes: file_uigame_uigame_db_proto_depIdxs,
+ MessageInfos: file_uigame_uigame_db_proto_msgTypes,
+ }.Build()
+ File_uigame_uigame_db_proto = out.File
+ file_uigame_uigame_db_proto_rawDesc = nil
+ file_uigame_uigame_db_proto_goTypes = nil
+ file_uigame_uigame_db_proto_depIdxs = nil
+}
diff --git a/pb/uigame_msg.pb.go b/pb/uigame_msg.pb.go
new file mode 100644
index 000000000..ae8b2ab47
--- /dev/null
+++ b/pb/uigame_msg.pb.go
@@ -0,0 +1,513 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// protoc-gen-go v1.28.0
+// protoc v3.20.0
+// source: uigame/uigame_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 UiGameGetPuzzleReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Hdid string `protobuf:"bytes,1,opt,name=hdid,proto3" json:"hdid"` // 拼图活动ID
+}
+
+func (x *UiGameGetPuzzleReq) Reset() {
+ *x = UiGameGetPuzzleReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_uigame_uigame_msg_proto_msgTypes[0]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *UiGameGetPuzzleReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UiGameGetPuzzleReq) ProtoMessage() {}
+
+func (x *UiGameGetPuzzleReq) ProtoReflect() protoreflect.Message {
+ mi := &file_uigame_uigame_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 UiGameGetPuzzleReq.ProtoReflect.Descriptor instead.
+func (*UiGameGetPuzzleReq) Descriptor() ([]byte, []int) {
+ return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *UiGameGetPuzzleReq) GetHdid() string {
+ if x != nil {
+ return x.Hdid
+ }
+ return ""
+}
+
+// 获取活动列表
+type UiGameGetPuzzleResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Data *DBPuzzleData `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
+}
+
+func (x *UiGameGetPuzzleResp) Reset() {
+ *x = UiGameGetPuzzleResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_uigame_uigame_msg_proto_msgTypes[1]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *UiGameGetPuzzleResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UiGameGetPuzzleResp) ProtoMessage() {}
+
+func (x *UiGameGetPuzzleResp) ProtoReflect() protoreflect.Message {
+ mi := &file_uigame_uigame_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 UiGameGetPuzzleResp.ProtoReflect.Descriptor instead.
+func (*UiGameGetPuzzleResp) Descriptor() ([]byte, []int) {
+ return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *UiGameGetPuzzleResp) GetData() *DBPuzzleData {
+ if x != nil {
+ return x.Data
+ }
+ return nil
+}
+
+// 拼图
+type UiGamePuzzleGridReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Hdid string `protobuf:"bytes,1,opt,name=hdid,proto3" json:"hdid"` // 拼图活动ID
+ PuzzleId int32 `protobuf:"varint,2,opt,name=puzzleId,proto3" json:"puzzleId"` // 格子ID
+}
+
+func (x *UiGamePuzzleGridReq) Reset() {
+ *x = UiGamePuzzleGridReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_uigame_uigame_msg_proto_msgTypes[2]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *UiGamePuzzleGridReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UiGamePuzzleGridReq) ProtoMessage() {}
+
+func (x *UiGamePuzzleGridReq) ProtoReflect() protoreflect.Message {
+ mi := &file_uigame_uigame_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 UiGamePuzzleGridReq.ProtoReflect.Descriptor instead.
+func (*UiGamePuzzleGridReq) Descriptor() ([]byte, []int) {
+ return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *UiGamePuzzleGridReq) GetHdid() string {
+ if x != nil {
+ return x.Hdid
+ }
+ return ""
+}
+
+func (x *UiGamePuzzleGridReq) GetPuzzleId() int32 {
+ if x != nil {
+ return x.PuzzleId
+ }
+ return 0
+}
+
+type UiGamePuzzleGridResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Data *DBPuzzleData `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
+ Atno []*UserAtno `protobuf:"bytes,2,rep,name=atno,proto3" json:"atno"` // 奖励
+}
+
+func (x *UiGamePuzzleGridResp) Reset() {
+ *x = UiGamePuzzleGridResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_uigame_uigame_msg_proto_msgTypes[3]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *UiGamePuzzleGridResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UiGamePuzzleGridResp) ProtoMessage() {}
+
+func (x *UiGamePuzzleGridResp) ProtoReflect() protoreflect.Message {
+ mi := &file_uigame_uigame_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 UiGamePuzzleGridResp.ProtoReflect.Descriptor instead.
+func (*UiGamePuzzleGridResp) Descriptor() ([]byte, []int) {
+ return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *UiGamePuzzleGridResp) GetData() *DBPuzzleData {
+ if x != nil {
+ return x.Data
+ }
+ return nil
+}
+
+func (x *UiGamePuzzleGridResp) GetAtno() []*UserAtno {
+ if x != nil {
+ return x.Atno
+ }
+ return nil
+}
+
+// 拼图领取奖励
+type UiGamePuzzleRewardReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Hdid string `protobuf:"bytes,1,opt,name=hdid,proto3" json:"hdid"` // 拼图活动ID
+ PuzzleId int32 `protobuf:"varint,2,opt,name=puzzleId,proto3" json:"puzzleId"` // 横排或竖排的格子id
+}
+
+func (x *UiGamePuzzleRewardReq) Reset() {
+ *x = UiGamePuzzleRewardReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_uigame_uigame_msg_proto_msgTypes[4]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *UiGamePuzzleRewardReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UiGamePuzzleRewardReq) ProtoMessage() {}
+
+func (x *UiGamePuzzleRewardReq) ProtoReflect() protoreflect.Message {
+ mi := &file_uigame_uigame_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 UiGamePuzzleRewardReq.ProtoReflect.Descriptor instead.
+func (*UiGamePuzzleRewardReq) Descriptor() ([]byte, []int) {
+ return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *UiGamePuzzleRewardReq) GetHdid() string {
+ if x != nil {
+ return x.Hdid
+ }
+ return ""
+}
+
+func (x *UiGamePuzzleRewardReq) GetPuzzleId() int32 {
+ if x != nil {
+ return x.PuzzleId
+ }
+ return 0
+}
+
+// 获取活动列表
+type UiGamePuzzleRewardResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Data *DBPuzzleData `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
+ Atno []*UserAtno `protobuf:"bytes,2,rep,name=atno,proto3" json:"atno"` // 奖励
+}
+
+func (x *UiGamePuzzleRewardResp) Reset() {
+ *x = UiGamePuzzleRewardResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_uigame_uigame_msg_proto_msgTypes[5]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *UiGamePuzzleRewardResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UiGamePuzzleRewardResp) ProtoMessage() {}
+
+func (x *UiGamePuzzleRewardResp) ProtoReflect() protoreflect.Message {
+ mi := &file_uigame_uigame_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 UiGamePuzzleRewardResp.ProtoReflect.Descriptor instead.
+func (*UiGamePuzzleRewardResp) Descriptor() ([]byte, []int) {
+ return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *UiGamePuzzleRewardResp) GetData() *DBPuzzleData {
+ if x != nil {
+ return x.Data
+ }
+ return nil
+}
+
+func (x *UiGamePuzzleRewardResp) GetAtno() []*UserAtno {
+ if x != nil {
+ return x.Atno
+ }
+ return nil
+}
+
+var File_uigame_uigame_msg_proto protoreflect.FileDescriptor
+
+var file_uigame_uigame_msg_proto_rawDesc = []byte{
+ 0x0a, 0x17, 0x75, 0x69, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x75, 0x69, 0x67, 0x61, 0x6d, 0x65, 0x5f,
+ 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x75, 0x69, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x75, 0x69,
+ 0x67, 0x61, 0x6d, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x28, 0x0a,
+ 0x12, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x47, 0x65, 0x74, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65,
+ 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, 0x22, 0x38, 0x0a, 0x13, 0x55, 0x69, 0x47, 0x61, 0x6d,
+ 0x65, 0x47, 0x65, 0x74, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21,
+ 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44,
+ 0x42, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74,
+ 0x61, 0x22, 0x45, 0x0a, 0x13, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x50, 0x75, 0x7a, 0x7a, 0x6c,
+ 0x65, 0x47, 0x72, 0x69, 0x64, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x64, 0x69, 0x64,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08,
+ 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
+ 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x49, 0x64, 0x22, 0x58, 0x0a, 0x14, 0x55, 0x69, 0x47, 0x61,
+ 0x6d, 0x65, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x47, 0x72, 0x69, 0x64, 0x52, 0x65, 0x73, 0x70,
+ 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d,
+ 0x2e, 0x44, 0x42, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64,
+ 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28,
+ 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74,
+ 0x6e, 0x6f, 0x22, 0x47, 0x0a, 0x15, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x50, 0x75, 0x7a, 0x7a,
+ 0x6c, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x68,
+ 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, 0x12,
+ 0x1a, 0x0a, 0x08, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x08, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x49, 0x64, 0x22, 0x5a, 0x0a, 0x16, 0x55,
+ 0x69, 0x47, 0x61, 0x6d, 0x65, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72,
+ 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x44, 0x61,
+ 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f,
+ 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e,
+ 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
+ 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+ file_uigame_uigame_msg_proto_rawDescOnce sync.Once
+ file_uigame_uigame_msg_proto_rawDescData = file_uigame_uigame_msg_proto_rawDesc
+)
+
+func file_uigame_uigame_msg_proto_rawDescGZIP() []byte {
+ file_uigame_uigame_msg_proto_rawDescOnce.Do(func() {
+ file_uigame_uigame_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_uigame_uigame_msg_proto_rawDescData)
+ })
+ return file_uigame_uigame_msg_proto_rawDescData
+}
+
+var file_uigame_uigame_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+var file_uigame_uigame_msg_proto_goTypes = []interface{}{
+ (*UiGameGetPuzzleReq)(nil), // 0: UiGameGetPuzzleReq
+ (*UiGameGetPuzzleResp)(nil), // 1: UiGameGetPuzzleResp
+ (*UiGamePuzzleGridReq)(nil), // 2: UiGamePuzzleGridReq
+ (*UiGamePuzzleGridResp)(nil), // 3: UiGamePuzzleGridResp
+ (*UiGamePuzzleRewardReq)(nil), // 4: UiGamePuzzleRewardReq
+ (*UiGamePuzzleRewardResp)(nil), // 5: UiGamePuzzleRewardResp
+ (*DBPuzzleData)(nil), // 6: DBPuzzleData
+ (*UserAtno)(nil), // 7: UserAtno
+}
+var file_uigame_uigame_msg_proto_depIdxs = []int32{
+ 6, // 0: UiGameGetPuzzleResp.data:type_name -> DBPuzzleData
+ 6, // 1: UiGamePuzzleGridResp.data:type_name -> DBPuzzleData
+ 7, // 2: UiGamePuzzleGridResp.atno:type_name -> UserAtno
+ 6, // 3: UiGamePuzzleRewardResp.data:type_name -> DBPuzzleData
+ 7, // 4: UiGamePuzzleRewardResp.atno:type_name -> UserAtno
+ 5, // [5:5] is the sub-list for method output_type
+ 5, // [5:5] is the sub-list for method input_type
+ 5, // [5:5] is the sub-list for extension type_name
+ 5, // [5:5] is the sub-list for extension extendee
+ 0, // [0:5] is the sub-list for field type_name
+}
+
+func init() { file_uigame_uigame_msg_proto_init() }
+func file_uigame_uigame_msg_proto_init() {
+ if File_uigame_uigame_msg_proto != nil {
+ return
+ }
+ file_comm_proto_init()
+ file_uigame_uigame_db_proto_init()
+ if !protoimpl.UnsafeEnabled {
+ file_uigame_uigame_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*UiGameGetPuzzleReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_uigame_uigame_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*UiGameGetPuzzleResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_uigame_uigame_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*UiGamePuzzleGridReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_uigame_uigame_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*UiGamePuzzleGridResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_uigame_uigame_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*UiGamePuzzleRewardReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_uigame_uigame_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*UiGamePuzzleRewardResp); 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_uigame_uigame_msg_proto_rawDesc,
+ NumEnums: 0,
+ NumMessages: 6,
+ NumExtensions: 0,
+ NumServices: 0,
+ },
+ GoTypes: file_uigame_uigame_msg_proto_goTypes,
+ DependencyIndexes: file_uigame_uigame_msg_proto_depIdxs,
+ MessageInfos: file_uigame_uigame_msg_proto_msgTypes,
+ }.Build()
+ File_uigame_uigame_msg_proto = out.File
+ file_uigame_uigame_msg_proto_rawDesc = nil
+ file_uigame_uigame_msg_proto_goTypes = nil
+ file_uigame_uigame_msg_proto_depIdxs = nil
+}
diff --git a/sys/configure/structs/Game.UiGameLattice.go b/sys/configure/structs/Game.UiGameLattice.go
new file mode 100644
index 000000000..0df8850ba
--- /dev/null
+++ b/sys/configure/structs/Game.UiGameLattice.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 GameUiGameLattice struct {
+ _dataMap map[int32]*GameUiGameLatticeData
+ _dataList []*GameUiGameLatticeData
+}
+
+func NewGameUiGameLattice(_buf []map[string]interface{}) (*GameUiGameLattice, error) {
+ _dataList := make([]*GameUiGameLatticeData, 0, len(_buf))
+ dataMap := make(map[int32]*GameUiGameLatticeData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameUiGameLatticeData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Latticekey] = _v
+ }
+ }
+ return &GameUiGameLattice{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameUiGameLattice) GetDataMap() map[int32]*GameUiGameLatticeData {
+ return table._dataMap
+}
+
+func (table *GameUiGameLattice) GetDataList() []*GameUiGameLatticeData {
+ return table._dataList
+}
+
+func (table *GameUiGameLattice) Get(key int32) *GameUiGameLatticeData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.UiGameLatticeData.go b/sys/configure/structs/Game.UiGameLatticeData.go
new file mode 100644
index 000000000..4d25d2d90
--- /dev/null
+++ b/sys/configure/structs/Game.UiGameLatticeData.go
@@ -0,0 +1,75 @@
+//------------------------------------------------------------------------------
+//
+// 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"
+import "bright/serialization"
+
+type GameUiGameLatticeData struct {
+ Latticekey int32
+ Layers int32
+ Bornpos serialization.Vector2
+ Chestspos []serialization.Vector2
+ Outpos serialization.Vector2
+}
+
+const TypeId_GameUiGameLatticeData = -164420354
+
+func (*GameUiGameLatticeData) GetTypeId() int32 {
+ return -164420354
+}
+
+func (_v *GameUiGameLatticeData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["latticekey"].(float64); !_ok_ { err = errors.New("latticekey error"); return }; _v.Latticekey = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["layers"].(float64); !_ok_ { err = errors.New("layers error"); return }; _v.Layers = int32(_tempNum_) }
+ { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["bornpos"].(map[string]interface{}); !_ok_ { err = errors.New("bornpos error"); return }
+ var _x_, _y_ float32;
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) }
+ _v.Bornpos = serialization.NewVector2(_x_, _y_)
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["chestspos"].([]interface{}); !_ok_ { err = errors.New("chestspos error"); return }
+
+ _v.Chestspos = make([]serialization.Vector2, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ serialization.Vector2
+ { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }
+ var _x_, _y_ float32;
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) }
+ _list_v_ = serialization.NewVector2(_x_, _y_)
+ }
+
+ _v.Chestspos = append(_v.Chestspos, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["outpos"].(map[string]interface{}); !_ok_ { err = errors.New("outpos error"); return }
+ var _x_, _y_ float32;
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) }
+ _v.Outpos = serialization.NewVector2(_x_, _y_)
+ }
+
+ return
+}
+
+func DeserializeGameUiGameLatticeData(_buf map[string]interface{}) (*GameUiGameLatticeData, error) {
+ v := &GameUiGameLatticeData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.UiGameMiner.go b/sys/configure/structs/Game.UiGameMiner.go
new file mode 100644
index 000000000..36e4ecc83
--- /dev/null
+++ b/sys/configure/structs/Game.UiGameMiner.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 GameUiGameMiner struct {
+ _dataMap map[int32]*GameUiGameMinerData
+ _dataList []*GameUiGameMinerData
+}
+
+func NewGameUiGameMiner(_buf []map[string]interface{}) (*GameUiGameMiner, error) {
+ _dataList := make([]*GameUiGameMinerData, 0, len(_buf))
+ dataMap := make(map[int32]*GameUiGameMinerData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameUiGameMinerData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Minerkey] = _v
+ }
+ }
+ return &GameUiGameMiner{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameUiGameMiner) GetDataMap() map[int32]*GameUiGameMinerData {
+ return table._dataMap
+}
+
+func (table *GameUiGameMiner) GetDataList() []*GameUiGameMinerData {
+ return table._dataList
+}
+
+func (table *GameUiGameMiner) Get(key int32) *GameUiGameMinerData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.UiGameMinerData.go b/sys/configure/structs/Game.UiGameMinerData.go
new file mode 100644
index 000000000..c9e440930
--- /dev/null
+++ b/sys/configure/structs/Game.UiGameMinerData.go
@@ -0,0 +1,48 @@
+//------------------------------------------------------------------------------
+//
+// 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"
+import "bright/serialization"
+
+type GameUiGameMinerData struct {
+ Minerkey int32
+ Mineid int32
+ Itemid *Gameatn
+ Itempos serialization.Vector2
+}
+
+const TypeId_GameUiGameMinerData = 725220039
+
+func (*GameUiGameMinerData) GetTypeId() int32 {
+ return 725220039
+}
+
+func (_v *GameUiGameMinerData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["minerkey"].(float64); !_ok_ { err = errors.New("minerkey error"); return }; _v.Minerkey = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["mineid"].(float64); !_ok_ { err = errors.New("mineid error"); return }; _v.Mineid = int32(_tempNum_) }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["itemid"].(map[string]interface{}); !_ok_ { err = errors.New("itemid error"); return }; if _v.Itemid, err = DeserializeGameatn(_x_); err != nil { return } }
+ { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["itempos"].(map[string]interface{}); !_ok_ { err = errors.New("itempos error"); return }
+ var _x_, _y_ float32;
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) }
+ _v.Itempos = serialization.NewVector2(_x_, _y_)
+ }
+
+ return
+}
+
+func DeserializeGameUiGameMinerData(_buf map[string]interface{}) (*GameUiGameMinerData, error) {
+ v := &GameUiGameMinerData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.UiGamePuzzle.go b/sys/configure/structs/Game.UiGamePuzzle.go
new file mode 100644
index 000000000..e27787168
--- /dev/null
+++ b/sys/configure/structs/Game.UiGamePuzzle.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 GameUiGamePuzzle struct {
+ _dataMap map[int32]*GameUiGamePuzzleData
+ _dataList []*GameUiGamePuzzleData
+}
+
+func NewGameUiGamePuzzle(_buf []map[string]interface{}) (*GameUiGamePuzzle, error) {
+ _dataList := make([]*GameUiGamePuzzleData, 0, len(_buf))
+ dataMap := make(map[int32]*GameUiGamePuzzleData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameUiGamePuzzleData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Puzzlekey] = _v
+ }
+ }
+ return &GameUiGamePuzzle{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameUiGamePuzzle) GetDataMap() map[int32]*GameUiGamePuzzleData {
+ return table._dataMap
+}
+
+func (table *GameUiGamePuzzle) GetDataList() []*GameUiGamePuzzleData {
+ return table._dataList
+}
+
+func (table *GameUiGamePuzzle) Get(key int32) *GameUiGamePuzzleData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.UiGamePuzzleData.go b/sys/configure/structs/Game.UiGamePuzzleData.go
new file mode 100644
index 000000000..56e762533
--- /dev/null
+++ b/sys/configure/structs/Game.UiGamePuzzleData.go
@@ -0,0 +1,50 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameUiGamePuzzleData struct {
+ Puzzlekey int32
+ Puzzleward []*Gameatn
+}
+
+const TypeId_GameUiGamePuzzleData = 957242570
+
+func (*GameUiGamePuzzleData) GetTypeId() int32 {
+ return 957242570
+}
+
+func (_v *GameUiGamePuzzleData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["puzzlekey"].(float64); !_ok_ { err = errors.New("puzzlekey error"); return }; _v.Puzzlekey = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["puzzleward"].([]interface{}); !_ok_ { err = errors.New("puzzleward error"); return }
+
+ _v.Puzzleward = 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.Puzzleward = append(_v.Puzzleward, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameUiGamePuzzleData(_buf map[string]interface{}) (*GameUiGamePuzzleData, error) {
+ v := &GameUiGamePuzzleData{}
+ 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 7b8c6aedf..8fc7f689f 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -236,6 +236,9 @@ type Tables struct {
Heroupstory *GameHeroupstory
HeroupstoryChapter *GameHeroupstoryChapter
HeroupstoryBattle *GameHeroupstoryBattle
+ UiGamePuzzle *GameUiGamePuzzle
+ UiGameLattice *GameUiGameLattice
+ UiGameMiner *GameUiGameMiner
}
func NewTables(loader JsonLoader) (*Tables, error) {
@@ -1593,5 +1596,23 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.HeroupstoryBattle, err = NewGameHeroupstoryBattle(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_uigamepuzzle") ; err != nil {
+ return nil, err
+ }
+ if tables.UiGamePuzzle, err = NewGameUiGamePuzzle(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_uigamelattice") ; err != nil {
+ return nil, err
+ }
+ if tables.UiGameLattice, err = NewGameUiGameLattice(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_uigameminer") ; err != nil {
+ return nil, err
+ }
+ if tables.UiGameMiner, err = NewGameUiGameMiner(buf) ; err != nil {
+ return nil, err
+ }
return tables, nil
}