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

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

Browse Source
This commit is contained in:
liwei 2023-08-04 15:41:02 +08:00
commit bf5a489cb3
23 changed files with 738 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
bin/json/game_hdcelebration.json Normal file
View File

@ -0,0 +1,39 @@
[
{
"ID": 1,
"systemtype": 1,
"bosstype": [
0
],
"num": [
6
],
"days": 2
},
{
"ID": 2,
"systemtype": 2,
"bosstype": [
31
],
"num": [
6
],
"days": 2
},
{
"ID": 3,
"systemtype": 2,
"bosstype": [
1,
2,
3
],
"num": [
2,
2,
2
],
"days": 2
}
]

9
bin/json/game_heroupstory.json
View File

@ -1,8 +1,17 @@
[ [
{ {
"heroid": 25001, "heroid": 25001,
<<<<<<< HEAD
"opentime": "2023/8/14 0:00:00", "opentime": "2023/8/14 0:00:00",
"newheroday": 2, "newheroday": 2,
"reward": [] "reward": []
=======
"opentime": [
0,
0,
0
],
"newheroday": 2
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
} }
] ]

146
bin/json/game_heroupstorychapter.json
View File

@ -3,8 +3,11 @@
"key": 1, "key": 1,
"hero": 25001, "hero": 25001,
"chapter": 1001, "chapter": 1001,
<<<<<<< HEAD
"onlevel": 0, "onlevel": 0,
"onlevelstory": 0, "onlevelstory": 0,
=======
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"level": 101, "level": 101,
"levellink": [ "levellink": [
102 102
@ -19,6 +22,10 @@
"n": 3000 "n": 3000
} }
], ],
<<<<<<< HEAD
=======
"clearance": 0,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"txt": { "txt": {
"key": "", "key": "",
"text": "" "text": ""
@ -32,8 +39,11 @@
"key": 2, "key": 2,
"hero": 25001, "hero": 25001,
"chapter": 1001, "chapter": 1001,
<<<<<<< HEAD
"onlevel": 1, "onlevel": 1,
"onlevelstory": 0, "onlevelstory": 0,
=======
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"level": 102, "level": 102,
"levellink": [ "levellink": [
101, 101,
@ -50,6 +60,10 @@
"n": 3010 "n": 3010
} }
], ],
<<<<<<< HEAD
=======
"clearance": 0,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"txt": { "txt": {
"key": "", "key": "",
"text": "" "text": ""
@ -63,8 +77,11 @@
"key": 3, "key": 3,
"hero": 25001, "hero": 25001,
"chapter": 1001, "chapter": 1001,
<<<<<<< HEAD
"onlevel": 2, "onlevel": 2,
"onlevelstory": 0, "onlevelstory": 0,
=======
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"level": 103, "level": 103,
"levellink": [ "levellink": [
102, 102,
@ -80,6 +97,10 @@
"n": 3020 "n": 3020
} }
], ],
<<<<<<< HEAD
=======
"clearance": 0,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"txt": { "txt": {
"key": "", "key": "",
"text": "" "text": ""
@ -93,17 +114,33 @@
"key": 4, "key": 4,
"hero": 25001, "hero": 25001,
"chapter": 1001, "chapter": 1001,
<<<<<<< HEAD
"onlevel": 3, "onlevel": 3,
"onlevelstory": 0, "onlevelstory": 0,
=======
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"level": 104, "level": 104,
"levellink": [ "levellink": [
102, 102,
103 103
], ],
"leveltype": 4, "leveltype": 4,
<<<<<<< HEAD
"startstory": 0, "startstory": 0,
"battle": 0, "battle": 0,
"reward": [], "reward": [],
=======
"startstory": 10254,
"battle": 101,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 3030
}
],
"clearance": 0,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"txt": { "txt": {
"key": "", "key": "",
"text": "" "text": ""
@ -117,8 +154,11 @@
"key": 5, "key": 5,
"hero": 25001, "hero": 25001,
"chapter": 1001, "chapter": 1001,
<<<<<<< HEAD
"onlevel": 4, "onlevel": 4,
"onlevelstory": 0, "onlevelstory": 0,
=======
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"level": 105, "level": 105,
"levellink": [ "levellink": [
104 104
@ -133,6 +173,10 @@
"n": 3040 "n": 3040
} }
], ],
<<<<<<< HEAD
=======
"clearance": 0,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"txt": { "txt": {
"key": "", "key": "",
"text": "" "text": ""
@ -146,8 +190,11 @@
"key": 6, "key": 6,
"hero": 25001, "hero": 25001,
"chapter": 1002, "chapter": 1002,
<<<<<<< HEAD
"onlevel": 5, "onlevel": 5,
"onlevelstory": 0, "onlevelstory": 0,
=======
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"level": 101, "level": 101,
"levellink": [ "levellink": [
102 102
@ -162,6 +209,10 @@
"n": 3050 "n": 3050
} }
], ],
<<<<<<< HEAD
=======
"clearance": 0,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"txt": { "txt": {
"key": "", "key": "",
"text": "" "text": ""
@ -175,8 +226,11 @@
"key": 7, "key": 7,
"hero": 25001, "hero": 25001,
"chapter": 1002, "chapter": 1002,
<<<<<<< HEAD
"onlevel": 6, "onlevel": 6,
"onlevelstory": 0, "onlevelstory": 0,
=======
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"level": 102, "level": 102,
"levellink": [ "levellink": [
101, 101,
@ -193,6 +247,10 @@
"n": 3060 "n": 3060
} }
], ],
<<<<<<< HEAD
=======
"clearance": 0,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"txt": { "txt": {
"key": "", "key": "",
"text": "" "text": ""
@ -206,8 +264,11 @@
"key": 8, "key": 8,
"hero": 25001, "hero": 25001,
"chapter": 1002, "chapter": 1002,
<<<<<<< HEAD
"onlevel": 7, "onlevel": 7,
"onlevelstory": 0, "onlevelstory": 0,
=======
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"level": 103, "level": 103,
"levellink": [ "levellink": [
102, 102,
@ -223,6 +284,10 @@
"n": 3070 "n": 3070
} }
], ],
<<<<<<< HEAD
=======
"clearance": 0,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"txt": { "txt": {
"key": "", "key": "",
"text": "" "text": ""
@ -236,17 +301,33 @@
"key": 9, "key": 9,
"hero": 25001, "hero": 25001,
"chapter": 1002, "chapter": 1002,
<<<<<<< HEAD
"onlevel": 8, "onlevel": 8,
"onlevelstory": 0, "onlevelstory": 0,
=======
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"level": 104, "level": 104,
"levellink": [ "levellink": [
102, 102,
103 103
], ],
"leveltype": 4, "leveltype": 4,
<<<<<<< HEAD
"startstory": 0, "startstory": 0,
"battle": 0, "battle": 0,
"reward": [], "reward": [],
=======
"startstory": 10254,
"battle": 101,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 3080
}
],
"clearance": 0,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"txt": { "txt": {
"key": "", "key": "",
"text": "" "text": ""
@ -260,8 +341,11 @@
"key": 10, "key": 10,
"hero": 25001, "hero": 25001,
"chapter": 1002, "chapter": 1002,
<<<<<<< HEAD
"onlevel": 9, "onlevel": 9,
"onlevelstory": 0, "onlevelstory": 0,
=======
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"level": 105, "level": 105,
"levellink": [ "levellink": [
104 104
@ -276,6 +360,10 @@
"n": 3090 "n": 3090
} }
], ],
<<<<<<< HEAD
=======
"clearance": 0,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"txt": { "txt": {
"key": "", "key": "",
"text": "" "text": ""
@ -289,8 +377,11 @@
"key": 11, "key": 11,
"hero": 25001, "hero": 25001,
"chapter": 1003, "chapter": 1003,
<<<<<<< HEAD
"onlevel": 10, "onlevel": 10,
"onlevelstory": 0, "onlevelstory": 0,
=======
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"level": 101, "level": 101,
"levellink": [ "levellink": [
102 102
@ -305,6 +396,10 @@
"n": 3100 "n": 3100
} }
], ],
<<<<<<< HEAD
=======
"clearance": 0,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"txt": { "txt": {
"key": "", "key": "",
"text": "" "text": ""
@ -318,8 +413,11 @@
"key": 12, "key": 12,
"hero": 25001, "hero": 25001,
"chapter": 1003, "chapter": 1003,
<<<<<<< HEAD
"onlevel": 11, "onlevel": 11,
"onlevelstory": 0, "onlevelstory": 0,
=======
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"level": 102, "level": 102,
"levellink": [ "levellink": [
101, 101,
@ -336,6 +434,10 @@
"n": 3110 "n": 3110
} }
], ],
<<<<<<< HEAD
=======
"clearance": 0,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"txt": { "txt": {
"key": "", "key": "",
"text": "" "text": ""
@ -349,8 +451,11 @@
"key": 13, "key": 13,
"hero": 25001, "hero": 25001,
"chapter": 1003, "chapter": 1003,
<<<<<<< HEAD
"onlevel": 12, "onlevel": 12,
"onlevelstory": 0, "onlevelstory": 0,
=======
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"level": 103, "level": 103,
"levellink": [ "levellink": [
102, 102,
@ -366,6 +471,10 @@
"n": 3120 "n": 3120
} }
], ],
<<<<<<< HEAD
=======
"clearance": 0,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"txt": { "txt": {
"key": "", "key": "",
"text": "" "text": ""
@ -379,8 +488,11 @@
"key": 14, "key": 14,
"hero": 25001, "hero": 25001,
"chapter": 1003, "chapter": 1003,
<<<<<<< HEAD
"onlevel": 13, "onlevel": 13,
"onlevelstory": 0, "onlevelstory": 0,
=======
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"level": 104, "level": 104,
"levellink": [ "levellink": [
102, 102,
@ -396,6 +508,10 @@
"n": 3130 "n": 3130
} }
], ],
<<<<<<< HEAD
=======
"clearance": 0,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"txt": { "txt": {
"key": "", "key": "",
"text": "" "text": ""
@ -409,8 +525,11 @@
"key": 15, "key": 15,
"hero": 25001, "hero": 25001,
"chapter": 1003, "chapter": 1003,
<<<<<<< HEAD
"onlevel": 14, "onlevel": 14,
"onlevelstory": 0, "onlevelstory": 0,
=======
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"level": 105, "level": 105,
"levellink": [ "levellink": [
104 104
@ -425,6 +544,10 @@
"n": 3140 "n": 3140
} }
], ],
<<<<<<< HEAD
=======
"clearance": 0,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"txt": { "txt": {
"key": "", "key": "",
"text": "" "text": ""
@ -438,8 +561,11 @@
"key": 16, "key": 16,
"hero": 25001, "hero": 25001,
"chapter": 1004, "chapter": 1004,
<<<<<<< HEAD
"onlevel": 15, "onlevel": 15,
"onlevelstory": 0, "onlevelstory": 0,
=======
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"level": 101, "level": 101,
"levellink": [ "levellink": [
102 102
@ -454,6 +580,10 @@
"n": 3150 "n": 3150
} }
], ],
<<<<<<< HEAD
=======
"clearance": 0,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"txt": { "txt": {
"key": "", "key": "",
"text": "" "text": ""
@ -467,16 +597,32 @@
"key": 17, "key": 17,
"hero": 25001, "hero": 25001,
"chapter": 1004, "chapter": 1004,
<<<<<<< HEAD
"onlevel": 16, "onlevel": 16,
"onlevelstory": 0, "onlevelstory": 0,
=======
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"level": 102, "level": 102,
"levellink": [ "levellink": [
101 101
], ],
"leveltype": 4, "leveltype": 4,
<<<<<<< HEAD
"startstory": 0, "startstory": 0,
"battle": 0, "battle": 0,
"reward": [], "reward": [],
=======
"startstory": 10254,
"battle": 101,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 3160
}
],
"clearance": 0,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"txt": { "txt": {
"key": "", "key": "",
"text": "" "text": ""

135
bin/json/game_mainstage.json
View File

@ -77,8 +77,13 @@
"hide": 0, "hide": 0,
"destroy": 1, "destroy": 1,
"progress": 1, "progress": 1,
<<<<<<< HEAD
"frontstoryid": 10241, "frontstoryid": 10241,
"afterstoryid": 10242, "afterstoryid": 10242,
=======
"frontstoryid": 0,
"afterstoryid": 10241,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"maingroupName": { "maingroupName": {
"key": "", "key": "",
"text": "" "text": ""
@ -515,11 +520,17 @@
"Episodetype": 1, "Episodetype": 1,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
<<<<<<< HEAD
"venturemodel": "", "venturemodel": "",
"venturetype": 1, "venturetype": 1,
"ventureavatar": [ "ventureavatar": [
"Person/44005/44005_q.prefab" "Person/44005/44005_q.prefab"
], ],
=======
"venturemodel": "Person/44005/44005_q.prefab",
"venturetype": 0,
"ventureavatar": [],
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"herocolor": 1, "herocolor": 1,
"heroimg": "zxgq_qp_icon_gth", "heroimg": "zxgq_qp_icon_gth",
"bubbletext": { "bubbletext": {
@ -608,23 +619,34 @@
100106 100106
], ],
"previoustage": 0, "previoustage": 0,
<<<<<<< HEAD
"Episodetype": 3, "Episodetype": 3,
=======
"Episodetype": 7,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
"venturemodel": "Person/44005/44005_q.prefab", "venturemodel": "Person/44005/44005_q.prefab",
"venturetype": 0, "venturetype": 0,
"ventureavatar": [], "ventureavatar": [],
"herocolor": 1, "herocolor": 1,
<<<<<<< HEAD
"heroimg": "zxgq_qp_icon_it", "heroimg": "zxgq_qp_icon_it",
"bubbletext": { "bubbletext": {
"key": "main_stage_bubbletext_7", "key": "main_stage_bubbletext_7",
"text": "老父亲的责任心" "text": "老父亲的责任心"
=======
"heroimg": "attr_diamond",
"bubbletext": {
"key": "main_stage_bubbletext_8",
"text": "瓜哥找到了神秘碎片？"
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
}, },
"animation": "", "animation": "",
"hide": 0, "hide": 0,
"destroy": 1, "destroy": 1,
"progress": 1, "progress": 1,
"frontstoryid": 10256, "frontstoryid": 0,
"afterstoryid": 0, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
@ -721,7 +743,11 @@
{ {
"id": 1100109, "id": 1100109,
"chapterid": 11001, "chapterid": 11001,
<<<<<<< HEAD
"group_id": 100109, "group_id": 100109,
=======
"group_id": 100108,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"previous_group_id": [ "previous_group_id": [
100107 100107
], ],
@ -733,7 +759,11 @@
"venturetype": 0, "venturetype": 0,
"ventureavatar": [], "ventureavatar": [],
"herocolor": 1, "herocolor": 1,
<<<<<<< HEAD
"heroimg": "zxgq_qp_icon_sq", "heroimg": "zxgq_qp_icon_sq",
=======
"heroimg": "attr_diamond",
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"bubbletext": { "bubbletext": {
"key": "main_stage_bubbletext_9", "key": "main_stage_bubbletext_9",
"text": "瓜哥找到了神秘碎片？" "text": "瓜哥找到了神秘碎片？"
@ -742,7 +772,11 @@
"hide": 0, "hide": 0,
"destroy": 1, "destroy": 1,
"progress": 1, "progress": 1,
<<<<<<< HEAD
"frontstoryid": 10258, "frontstoryid": 10258,
=======
"frontstoryid": 0,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"afterstoryid": 0, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
@ -750,11 +784,19 @@
}, },
"mainlineName": { "mainlineName": {
"key": "mainchapter_main_stage_mainlineName_9", "key": "mainchapter_main_stage_mainlineName_9",
<<<<<<< HEAD
"text": "1-9" "text": "1-9"
}, },
"title": { "title": {
"key": "mainchapter_main_stage_title_9", "key": "mainchapter_main_stage_title_9",
"text": "捡东西" "text": "捡东西"
=======
"text": "1-s"
},
"title": {
"key": "mainchapter_main_stage_title_9",
"text": "小游戏"
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
}, },
"desc": { "desc": {
"key": "mainchapter_main_stage_desc_9", "key": "mainchapter_main_stage_desc_9",
@ -783,19 +825,35 @@
{ {
"id": 1100110, "id": 1100110,
"chapterid": 11001, "chapterid": 11001,
<<<<<<< HEAD
"group_id": 100110, "group_id": 100110,
"previous_group_id": [ "previous_group_id": [
100107 100107
=======
"group_id": 100109,
"previous_group_id": [
100108
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 7, "Episodetype": 7,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
<<<<<<< HEAD
"venturemodel": "Person/44005/44005_q.prefab", "venturemodel": "Person/44005/44005_q.prefab",
"venturetype": 0, "venturetype": 0,
"ventureavatar": [], "ventureavatar": [],
"herocolor": 1, "herocolor": 1,
"heroimg": "zxgq_qp_icon_sq", "heroimg": "zxgq_qp_icon_sq",
=======
"venturemodel": "",
"venturetype": 1,
"ventureavatar": [
"Person/13002/13002_exhibition.prefab"
],
"herocolor": 1,
"heroimg": "attr_diamond",
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"bubbletext": { "bubbletext": {
"key": "main_stage_bubbletext_10", "key": "main_stage_bubbletext_10",
"text": "瓜哥找到了神秘碎片？" "text": "瓜哥找到了神秘碎片？"
@ -804,7 +862,11 @@
"hide": 0, "hide": 0,
"destroy": 1, "destroy": 1,
"progress": 1, "progress": 1,
<<<<<<< HEAD
"frontstoryid": 10259, "frontstoryid": 10259,
=======
"frontstoryid": 0,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"afterstoryid": 0, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
@ -812,11 +874,19 @@
}, },
"mainlineName": { "mainlineName": {
"key": "mainchapter_main_stage_mainlineName_10", "key": "mainchapter_main_stage_mainlineName_10",
<<<<<<< HEAD
"text": "1-10" "text": "1-10"
}, },
"title": { "title": {
"key": "mainchapter_main_stage_title_10", "key": "mainchapter_main_stage_title_10",
"text": "捡东西" "text": "捡东西"
=======
"text": "1-7"
},
"title": {
"key": "mainchapter_main_stage_title_10",
"text": "月光暴走"
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
}, },
"desc": { "desc": {
"key": "mainchapter_main_stage_desc_10", "key": "mainchapter_main_stage_desc_10",
@ -845,6 +915,7 @@
{ {
"id": 1100111, "id": 1100111,
"chapterid": 11001, "chapterid": 11001,
<<<<<<< HEAD
"group_id": 100111, "group_id": 100111,
"previous_group_id": [ "previous_group_id": [
100110, 100110,
@ -853,11 +924,20 @@
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 3, "Episodetype": 3,
=======
"group_id": 100110,
"previous_group_id": [
100109
],
"previoustage": 0,
"Episodetype": 1,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
"venturemodel": "", "venturemodel": "",
"venturetype": 1, "venturetype": 1,
"ventureavatar": [ "ventureavatar": [
<<<<<<< HEAD
"Person/44005/44005_q.prefab" "Person/44005/44005_q.prefab"
], ],
"herocolor": 1, "herocolor": 1,
@ -865,12 +945,25 @@
"bubbletext": { "bubbletext": {
"key": "main_stage_bubbletext_11", "key": "main_stage_bubbletext_11",
"text": "瓜哥怎么带着这么多东西回来了" "text": "瓜哥怎么带着这么多东西回来了"
=======
"Person/13002/13002_exhibition.prefab"
],
"herocolor": 1,
"heroimg": "zxgq_js_13002",
"bubbletext": {
"key": "main_stage_bubbletext_11",
"text": "跟着小伊去寻找月光原石吧~"
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
}, },
"animation": "", "animation": "",
"hide": 0, "hide": 0,
"destroy": 1, "destroy": 1,
"progress": 1, "progress": 1,
<<<<<<< HEAD
"frontstoryid": 10260, "frontstoryid": 10260,
=======
"frontstoryid": 10256,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"afterstoryid": 0, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
@ -878,7 +971,11 @@
}, },
"mainlineName": { "mainlineName": {
"key": "mainchapter_main_stage_mainlineName_11", "key": "mainchapter_main_stage_mainlineName_11",
<<<<<<< HEAD
"text": "1-11" "text": "1-11"
=======
"text": "1-x"
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
}, },
"title": { "title": {
"key": "mainchapter_main_stage_title_11", "key": "mainchapter_main_stage_title_11",
@ -1057,11 +1154,19 @@
"challengeward": 0 "challengeward": 0
}, },
{ {
<<<<<<< HEAD
"id": 1100114, "id": 1100114,
"chapterid": 11001, "chapterid": 11001,
"group_id": 100114, "group_id": 100114,
"previous_group_id": [ "previous_group_id": [
100113 100113
=======
"id": 1100112,
"chapterid": 11001,
"group_id": 100111,
"previous_group_id": [
100110
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 1, "Episodetype": 1,
@ -1073,10 +1178,17 @@
"Person/44005/44005_q.prefab" "Person/44005/44005_q.prefab"
], ],
"herocolor": 1, "herocolor": 1,
<<<<<<< HEAD
"heroimg": "zxgq_qp_icon_wh", "heroimg": "zxgq_qp_icon_wh",
"bubbletext": { "bubbletext": {
"key": "main_stage_bubbletext_14", "key": "main_stage_bubbletext_14",
"text": "·············" "text": "·············"
=======
"heroimg": "zxgq_js_13002",
"bubbletext": {
"key": "main_stage_bubbletext_12",
"text": "小伊突然失控！？"
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
}, },
"animation": "", "animation": "",
"hide": 0, "hide": 0,
@ -1089,6 +1201,7 @@
"text": "" "text": ""
}, },
"mainlineName": { "mainlineName": {
<<<<<<< HEAD
"key": "mainchapter_main_stage_mainlineName_14", "key": "mainchapter_main_stage_mainlineName_14",
"text": "1-14" "text": "1-14"
}, },
@ -1099,6 +1212,18 @@
"desc": { "desc": {
"key": "mainchapter_main_stage_desc_14", "key": "mainchapter_main_stage_desc_14",
"text": "地洞山摇，猩猩出现！" "text": "地洞山摇，猩猩出现！"
=======
"key": "mainchapter_main_stage_mainlineName_12",
"text": "1-c"
},
"title": {
"key": "mainchapter_main_stage_title_12",
"text": "寻找小游戏"
},
"desc": {
"key": "mainchapter_main_stage_desc_12",
"text": "瓜哥一家受到月光原石的影响，彻底失控。"
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
}, },
"exp": 0, "exp": 0,
"hero_exp": 300, "hero_exp": 300,
@ -1158,6 +1283,7 @@
"challengeward": 0 "challengeward": 0
}, },
{ {
<<<<<<< HEAD
"id": 1100115, "id": 1100115,
"chapterid": 11001, "chapterid": 11001,
"group_id": 100115, "group_id": 100115,
@ -1215,10 +1341,17 @@
}, },
{ {
"id": 1100116, "id": 1100116,
=======
"id": 1100113,
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
"chapterid": 11001, "chapterid": 11001,
"group_id": 100116, "group_id": 100116,
"previous_group_id": [ "previous_group_id": [
<<<<<<< HEAD
100115 100115
=======
100111
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
], ],
"previoustage": 0, "previoustage": 0,
"Episodetype": 7, "Episodetype": 7,

20
bin/json/game_venturegiftslottery.json
View File

@ -1,20 +0,0 @@
[
{
"rewardkey": 1,
"drawreward_type": [
{
"k": 6,
"s": "inevitable_10001"
}
]
},
{
"rewardkey": 2,
"drawreward_type": [
{
"k": 6,
"s": "inevitable_10002"
}
]
}
]

6
comm/const.go
View File

@ -996,6 +996,10 @@ const (
XSFundExp = 6 //现时活动 经验基金 XSFundExp = 6 //现时活动 经验基金
HdLevel = 7 //开服等级活动 HdLevel = 7 //开服等级活动
HdTypeSign = 8 //七日签到 HdTypeSign = 8 //七日签到
HdTypeTurntable = 9 //大转盘
AddUpRecharge = 10 //累计充值 AddUpRecharge = 10 //累计充值
// 特殊类型活动 只受活动开启限制
HdTypeTurntable = 1001 //大转盘
HdCelebration = 1002 // 庆典活动
) )

3
comm/imodule.go
View File

@ -594,6 +594,9 @@ type (
GetAllHdInfo() (hdList map[int32][]*pb.DBHuodong) // 获取所有活动信息 GetAllHdInfo() (hdList map[int32][]*pb.DBHuodong) // 获取所有活动信息
GetHdInfoByItype(itype int32) (result []*pb.DBHuodong, err error) // GetHdInfoByItype(itype int32) (result []*pb.DBHuodong, err error) //
UpdateActivitySlider(session IUserSession) // 修改活动进度 UpdateActivitySlider(session IUserSession) // 修改活动进度
// 庆典活动
HDCelebration(session IUserSession, systemtype int32, bosstype int32) bool
} }
//每日任务 //每日任务
IDailytask interface { IDailytask interface {

21
modules/activity/api_gethddata.go
View File

@ -24,7 +24,7 @@ func (this *apiComp) GetHdData(session comm.IUserSession, req *pb.ActivityGetHdD
curTime := configure.Now().Unix() curTime := configure.Now().Unix()
for _, id := range req.Oid { for _, id := range req.Oid {
if activity, err = this.module.modelhdList.getHdListByHdId(id); err != nil { if activity, err = this.module.modelhdList.getHdListByHdId(id); err != nil {
if activity.Stime <= curTime && curTime <= activity.Etime { if activity.Stime > curTime || curTime > activity.Etime { // 不在活动范围内数据不给活动记录数据
continue continue
} }
} }
@ -52,6 +52,25 @@ func (this *apiComp) GetHdData(session comm.IUserSession, req *pb.ActivityGetHdD
} }
} }
} }
// 获取开服庆典活动
if activity.Itype == comm.HdCelebration {
key := fmt.Sprintf("%s:%s", session.GetUserId(), id)
if data, err := this.module.modelhdData.getHddataByOid(session.GetUserId(), key); err != nil {
// 注意 Gotarr:map[int32]int32 key value 已经挑战的次数
if !utils.IsToday(data.Lasttime) { // 不是今天重置
data.Lasttime = configure.Now().Unix()
data.Gotarr = make(map[int32]int32)
// 计算进度
data.Val = int32((configure.Now().Unix()-activity.Stime)/24*3600) + 1
update := make(map[string]interface{})
update["lasttime"] = data.Lasttime
update["val"] = data.Val
update["gotarr"] = data.Gotarr
this.module.modelhdData.ModifyActivityList(session.GetUserId(), data.Id, update)
}
}
}
result = append(result, list) result = append(result, list)
} }

27
modules/activity/comp_configure.go
View File

@ -12,6 +12,7 @@ import (
const ( const (
venturegiftsdraw = "game_venturegiftsdraw.json" //大转盘 venturegiftsdraw = "game_venturegiftsdraw.json" //大转盘
hdcelebration = "game_hdcelebration.json" //开服庆典
) )
// /配置管理基础组件 // /配置管理基础组件
@ -29,6 +30,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
this.module = module.(*Activity) this.module = module.(*Activity)
err = this.LoadMultiConfigure(map[string]interface{}{ err = this.LoadMultiConfigure(map[string]interface{}{
venturegiftsdraw: cfg.NewGameVenturegiftsDraw, venturegiftsdraw: cfg.NewGameVenturegiftsDraw,
hdcelebration: cfg.NewGameCelebration,
}) })
configure.RegisterConfigure(venturegiftsdraw, cfg.NewGameVenturegiftsDraw, func() { configure.RegisterConfigure(venturegiftsdraw, cfg.NewGameVenturegiftsDraw, func() {
@ -97,3 +99,28 @@ func (this *configureComp) GetPool1() (m map[int32]*cfg.GameVenturegiftsDrawData
func (this *configureComp) GetPool2() (m map[int32]*cfg.GameVenturegiftsDrawData) { func (this *configureComp) GetPool2() (m map[int32]*cfg.GameVenturegiftsDrawData) {
return this.pool2 return this.pool2
} }
// id
func (this *configureComp) GetHDCelebration(id int32) (conf *cfg.GameCelebrationData, err error) {
var (
v interface{}
ok bool
)
if v, err = this.GetConfigure(hdcelebration); err == nil {
if conf, ok = v.(*cfg.GameCelebration).GetDataMap()[id]; !ok {
err = fmt.Errorf("%T no is *cfg.GameCelebrationData", v)
return
}
}
return
}
func (this *configureComp) GetHDCelebrationData() (days []int32) {
if v, err := this.GetConfigure(hdcelebration); err == nil {
for _, v := range v.(*cfg.GameCelebration).GetDataList() {
days = append(days, v.Days)
}
}
return
}

2
modules/activity/model_hddata.go
View File

@ -6,6 +6,7 @@ import (
"go_dreamfactory/lego/core" "go_dreamfactory/lego/core"
"go_dreamfactory/modules" "go_dreamfactory/modules"
"go_dreamfactory/pb" "go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
"go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/x/bsonx" "go.mongodb.org/mongo-driver/x/bsonx"
@ -54,6 +55,7 @@ func (this *modelhdData) getHddataByOid(uid string, oid string) (result *pb.DBAc
result.Id = fmt.Sprintf("%s:%s", uid, oid) result.Id = fmt.Sprintf("%s:%s", uid, oid)
result.Uid = uid result.Uid = uid
result.Hdoid = oid result.Hdoid = oid
result.Lasttime = configure.Now().Unix()
this.AddList(uid, result.Id, result) this.AddList(uid, result.Id, result)
err = nil err = nil
return return

6
modules/activity/model_hdlist.go
View File

@ -93,3 +93,9 @@ func (this *modelHdList) LoadActivityData() {
} }
} }
} }
func (this *modelHdList) getHdInfoByType(itype int32) (activity []*pb.DBHuodong) {
if v, ok := this.activity[itype]; ok {
return v
}
return nil
}

67
modules/activity/module.go
View File

@ -6,8 +6,10 @@ import (
"go_dreamfactory/lego/core" "go_dreamfactory/lego/core"
"go_dreamfactory/modules" "go_dreamfactory/modules"
"go_dreamfactory/pb" "go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs" cfg "go_dreamfactory/sys/configure/structs"
"go_dreamfactory/sys/db" "go_dreamfactory/sys/db"
"go_dreamfactory/utils"
) )
type Activity struct { type Activity struct {
@ -205,3 +207,68 @@ func (this *Activity) Turntable(drawIndex int32, reward []int32) (item *cfg.Game
return return
} }
// 统计庆典活动完成情况
func (this *Activity) HDCelebration(session comm.IUserSession, systemtype int32, bosstype int32) bool {
bDouble := false // 是否开启双倍奖励
if activity := this.modelhdList.getHdInfoByType(comm.HdCelebration); activity != nil {
for _, v := range activity {
if configure.Now().Unix() > v.Stime && configure.Now().Unix() < v.Etime { // 活动范围内
update := make(map[string]interface{})
bChange := false
// 查询玩家活动记录
key := fmt.Sprintf("%s:%s", session.GetUserId(), v.Id)
if data, err := this.modelhdData.getHddataByOid(session.GetUserId(), key); err != nil {
// 注意 Gotarr:map[int32]int32 key value 已经挑战的次数
if !utils.IsToday(data.Lasttime) { // 不是今天重置
data.Lasttime = configure.Now().Unix()
data.Gotarr = make(map[int32]int32)
// 计算进度
data.Val = int32((configure.Now().Unix()-v.Stime)/24*3600) + 1
update["lasttime"] = data.Lasttime
update["val"] = data.Val
update["gotarr"] = data.Gotarr
bChange = true
}
var pos int32
for index, v := range this.configure.GetHDCelebrationData() {
for i := 0; i < int(v); i++ {
pos++
if data.Val == pos {
if conf, err := this.configure.GetHDCelebration(int32(index) + 1); err != nil {
if conf.Systemtype == systemtype {
data.Gotarr[bosstype] += 1
// 天数
var idays int32
for i, v1 := range conf.Bosstype {
if v1 == systemtype || v1 == 0 { // bosstype 为0 表示所有的boss 类型都算
idays = conf.Num[i]
break
}
}
// 更新信息
update["gotarr"] = data.Gotarr
bChange = true
if data.Gotarr[bosstype] <= idays {
bDouble = true
}
}
}
}
}
}
if bChange {
this.modelhdData.ModifyActivityList(session.GetUserId(), data.Id, update)
// 推送活动数据进度变化
session.SendMsg(string(this.GetType()), "change", &pb.ActivityDataChangePush{
Data: []*pb.DBActivityData{data},
})
}
}
}
}
}
return bDouble
}

14
modules/hunting/api_challengeover.go
View File

@ -97,12 +97,8 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
key := strconv.Itoa(int(req.BossType)) + "_" + strconv.Itoa(int(req.Difficulty)) key := strconv.Itoa(int(req.BossType)) + "_" + strconv.Itoa(int(req.Difficulty))
if hunting.BossTime[key] == 0 { // 新关卡挑战通过 发放首通奖励 if hunting.BossTime[key] == 0 { // 新关卡挑战通过 发放首通奖励
//hunting.BossTime[key] = req.Report.Costtime
//mapData["bossTime"] = hunting.BossTime
res = append(res, cfgHunting.Firstprize...) res = append(res, cfgHunting.Firstprize...)
// if errdata = this.module.DispenseRes(session, cfgHunting.Firstprize, true); errdata != nil {
// return
// }
for _, v := range cfgHunting.Firstprize { for _, v := range cfgHunting.Firstprize {
if _conf, err := this.module.configure.GetItemConfigureData(v.T); err == nil { if _conf, err := this.module.configure.GetItemConfigureData(v.T); err == nil {
if _conf.Usetype == comm.UseType8 { if _conf.Usetype == comm.UseType8 {
@ -121,6 +117,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
//reward = this.module.configure.GetDropReward(cfgHunting.Drop) // 获取掉落奖励 //reward = this.module.configure.GetDropReward(cfgHunting.Drop) // 获取掉落奖励
user := this.module.ModuleUser.GetUser(session.GetUserId()) user := this.module.ModuleUser.GetUser(session.GetUserId())
reward = this.module.ModuleTools.GetGroupDataByLottery(cfgHunting.Drop, user.Vip, user.Lv) // 走新的掉落 reward = this.module.ModuleTools.GetGroupDataByLottery(cfgHunting.Drop, user.Vip, user.Lv) // 走新的掉落
b := this.module.ModuleActivity.HDCelebration(session, 1, req.BossType)
for _, v := range reward { for _, v := range reward {
bFound := false bFound := false
if v.A == "equp" { if v.A == "equp" {
@ -131,6 +128,10 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
bFound = true bFound = true
del = append(del, cfg.Id) del = append(del, cfg.Id)
res = append(res, cfg.Sale...) res = append(res, cfg.Sale...)
if b {
del = append(del, cfg.Id)
res = append(res, cfg.Sale...)
}
} }
break break
} }
@ -138,6 +139,9 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
} }
if !bFound { if !bFound {
res = append(res, v) res = append(res, v)
if b {
res = append(res, v)
}
} }
} }
if errdata, atno = this.module.DispenseAtno(session, res, true); errdata != nil { if errdata, atno = this.module.DispenseAtno(session, res, true); errdata != nil {

11
modules/viking/api_challengeover.go
View File

@ -117,6 +117,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
viking.Round[req.Auto] = req.Report.Round viking.Round[req.Auto] = req.Report.Round
mapData["round"] = viking.Round mapData["round"] = viking.Round
} }
// 连续自动战斗
if len(viking.Round) == 10 { if len(viking.Round) == 10 {
var total int32 var total int32
for _, v := range viking.Round { for _, v := range viking.Round {
@ -141,7 +142,8 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
user := this.module.ModuleUser.GetUser(session.GetUserId()) user := this.module.ModuleUser.GetUser(session.GetUserId())
reward = this.module.ModuleTools.GetGroupDataByLottery(vikingCfg.Drop, user.Vip, user.Lv) reward = this.module.ModuleTools.GetGroupDataByLottery(vikingCfg.Drop, user.Vip, user.Lv)
//reward = this.module.configure.GetDropReward(vikingCfg.Drop) // 获取掉落奖励
b := this.module.ModuleActivity.HDCelebration(session, 2, req.BossId)
// 星级校验 // 星级校验
for _, v := range reward { for _, v := range reward {
bFound := false bFound := false
@ -153,6 +155,10 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
bFound = true bFound = true
del = append(del, cfg.Id) del = append(del, cfg.Id)
res = append(res, cfg.Sale...) res = append(res, cfg.Sale...)
if b { // 活动双倍
del = append(del, cfg.Id)
res = append(res, cfg.Sale...)
}
} }
break break
} }
@ -161,6 +167,9 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
if !bFound { if !bFound {
res = append(res, v) res = append(res, v)
if b { // 活动双倍
res = append(res, v)
}
} }
} }

2
pb/activity_db.pb.go
View File

@ -332,7 +332,7 @@ type DBActivityData struct {
Hdoid string `protobuf:"bytes,3,opt,name=hdoid,proto3" json:"hdoid"` // 活动唯一id 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"` 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"`
Lasttime int64 `protobuf:"varint,5,opt,name=lasttime,proto3" json:"lasttime"` Lasttime int64 `protobuf:"varint,5,opt,name=lasttime,proto3" json:"lasttime"`
Val int32 `protobuf:"varint,6,opt,name=val,proto3" json:"val"` // 第几天登录 Val int32 `protobuf:"varint,6,opt,name=val,proto3" json:"val"`
} }
func (x *DBActivityData) Reset() { func (x *DBActivityData) Reset() {

102
pb/activity_msg.pb.go
View File

@ -418,6 +418,54 @@ func (x *ActivityTurntableRewardResp) GetAtno() []*UserAtno {
return nil return nil
} }
// 活动数据变更推送
type ActivityDataChangePush struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Data []*DBActivityData `protobuf:"bytes,1,rep,name=data,proto3" json:"data"`
}
func (x *ActivityDataChangePush) Reset() {
*x = ActivityDataChangePush{}
if protoimpl.UnsafeEnabled {
mi := &file_activity_activity_msg_proto_msgTypes[8]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *ActivityDataChangePush) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ActivityDataChangePush) ProtoMessage() {}
func (x *ActivityDataChangePush) ProtoReflect() protoreflect.Message {
mi := &file_activity_activity_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 ActivityDataChangePush.ProtoReflect.Descriptor instead.
func (*ActivityDataChangePush) Descriptor() ([]byte, []int) {
return file_activity_activity_msg_proto_rawDescGZIP(), []int{8}
}
func (x *ActivityDataChangePush) GetData() []*DBActivityData {
if x != nil {
return x.Data
}
return nil
}
var File_activity_activity_msg_proto protoreflect.FileDescriptor var File_activity_activity_msg_proto protoreflect.FileDescriptor
var file_activity_activity_msg_proto_rawDesc = []byte{ var file_activity_activity_msg_proto_rawDesc = []byte{
@ -455,8 +503,12 @@ var file_activity_activity_msg_proto_rawDesc = []byte{
0x32, 0x0f, 0x2e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x44, 0x61, 0x74, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x44, 0x61, 0x74,
0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 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, 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, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, 0x3d, 0x0a, 0x16, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x74, 0x79, 0x44, 0x61, 0x74, 0x61, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68,
0x12, 0x23, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f,
0x2e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x44, 0x61, 0x74, 0x61, 0x52,
0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -471,7 +523,7 @@ func file_activity_activity_msg_proto_rawDescGZIP() []byte {
return file_activity_activity_msg_proto_rawDescData return file_activity_activity_msg_proto_rawDescData
} }
var file_activity_activity_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 8) var file_activity_activity_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
var file_activity_activity_msg_proto_goTypes = []interface{}{ var file_activity_activity_msg_proto_goTypes = []interface{}{
(*ActivityGetListReq)(nil), // 0: ActivityGetListReq (*ActivityGetListReq)(nil), // 0: ActivityGetListReq
(*ActivityGetListResp)(nil), // 1: ActivityGetListResp (*ActivityGetListResp)(nil), // 1: ActivityGetListResp
@ -481,22 +533,24 @@ var file_activity_activity_msg_proto_goTypes = []interface{}{
(*ActivityGetRewardResp)(nil), // 5: ActivityGetRewardResp (*ActivityGetRewardResp)(nil), // 5: ActivityGetRewardResp
(*ActivityTurntableRewardReq)(nil), // 6: ActivityTurntableRewardReq (*ActivityTurntableRewardReq)(nil), // 6: ActivityTurntableRewardReq
(*ActivityTurntableRewardResp)(nil), // 7: ActivityTurntableRewardResp (*ActivityTurntableRewardResp)(nil), // 7: ActivityTurntableRewardResp
(*DBHuodong)(nil), // 8: DBHuodong (*ActivityDataChangePush)(nil), // 8: ActivityDataChangePush
(*DBActivityData)(nil), // 9: DBActivityData (*DBHuodong)(nil), // 9: DBHuodong
(*UserAtno)(nil), // 10: UserAtno (*DBActivityData)(nil), // 10: DBActivityData
(*UserAtno)(nil), // 11: UserAtno
} }
var file_activity_activity_msg_proto_depIdxs = []int32{ var file_activity_activity_msg_proto_depIdxs = []int32{
8, // 0: ActivityGetListResp.data:type_name -> DBHuodong 9, // 0: ActivityGetListResp.data:type_name -> DBHuodong
9, // 1: ActivityGetHdDataResp.data:type_name -> DBActivityData 10, // 1: ActivityGetHdDataResp.data:type_name -> DBActivityData
9, // 2: ActivityGetRewardResp.data:type_name -> DBActivityData 10, // 2: ActivityGetRewardResp.data:type_name -> DBActivityData
10, // 3: ActivityGetRewardResp.atno:type_name -> UserAtno 11, // 3: ActivityGetRewardResp.atno:type_name -> UserAtno
9, // 4: ActivityTurntableRewardResp.data:type_name -> DBActivityData 10, // 4: ActivityTurntableRewardResp.data:type_name -> DBActivityData
10, // 5: ActivityTurntableRewardResp.atno:type_name -> UserAtno 11, // 5: ActivityTurntableRewardResp.atno:type_name -> UserAtno
6, // [6:6] is the sub-list for method output_type 10, // 6: ActivityDataChangePush.data:type_name -> DBActivityData
6, // [6:6] is the sub-list for method input_type 7, // [7:7] is the sub-list for method output_type
6, // [6:6] is the sub-list for extension type_name 7, // [7:7] is the sub-list for method input_type
6, // [6:6] is the sub-list for extension extendee 7, // [7:7] is the sub-list for extension type_name
0, // [0:6] is the sub-list for field 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_activity_activity_msg_proto_init() } func init() { file_activity_activity_msg_proto_init() }
@ -603,6 +657,18 @@ func file_activity_activity_msg_proto_init() {
return nil return nil
} }
} }
file_activity_activity_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*ActivityDataChangePush); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
} }
type x struct{} type x struct{}
out := protoimpl.TypeBuilder{ out := protoimpl.TypeBuilder{
@ -610,7 +676,7 @@ func file_activity_activity_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(), GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_activity_activity_msg_proto_rawDesc, RawDescriptor: file_activity_activity_msg_proto_rawDesc,
NumEnums: 0, NumEnums: 0,
NumMessages: 8, NumMessages: 9,
NumExtensions: 0, NumExtensions: 0,
NumServices: 0, NumServices: 0,
}, },

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

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

69
sys/configure/structs/Game.HDCelebrationData.go Normal file
View File

@ -0,0 +1,69 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GameHDCelebrationData struct {
ID int32
Systemtype int32
Bosstype []int32
Num []int32
Days int32
}
const TypeId_GameHDCelebrationData = -1921981892
func (*GameHDCelebrationData) GetTypeId() int32 {
return -1921981892
}
func (_v *GameHDCelebrationData)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["systemtype"].(float64); !_ok_ { err = errors.New("systemtype error"); return }; _v.Systemtype = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["bosstype"].([]interface{}); !_ok_ { err = errors.New("bosstype error"); return }
_v.Bosstype = 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.Bosstype = append(_v.Bosstype, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["num"].([]interface{}); !_ok_ { err = errors.New("num error"); return }
_v.Num = 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.Num = append(_v.Num, _list_v_)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["days"].(float64); !_ok_ { err = errors.New("days error"); return }; _v.Days = int32(_tempNum_) }
return
}
func DeserializeGameHDCelebrationData(_buf map[string]interface{}) (*GameHDCelebrationData, error) {
v := &GameHDCelebrationData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

14
sys/configure/structs/Game.HeroupstoryChapterData.go
View File

@ -14,14 +14,21 @@ type GameHeroupstoryChapterData struct {
Key int32 Key int32
Hero int32 Hero int32
Chapter int32 Chapter int32
<<<<<<< HEAD
Onlevel int32 Onlevel int32
Onlevelstory int32 Onlevelstory int32
=======
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
Level int32 Level int32
Levellink []int32 Levellink []int32
Leveltype int32 Leveltype int32
Startstory int32 Startstory int32
Battle int32 Battle int32
Reward []*Gameatn Reward []*Gameatn
<<<<<<< HEAD
=======
Clearance int32
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
Txt string Txt string
Circle string Circle string
Qq int32 Qq int32
@ -39,8 +46,11 @@ func (_v *GameHeroupstoryChapterData)Deserialize(_buf map[string]interface{}) (e
{ 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["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hero"].(float64); !_ok_ { err = errors.New("hero error"); return }; _v.Hero = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hero"].(float64); !_ok_ { err = errors.New("hero error"); return }; _v.Hero = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["chapter"].(float64); !_ok_ { err = errors.New("chapter error"); return }; _v.Chapter = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["chapter"].(float64); !_ok_ { err = errors.New("chapter error"); return }; _v.Chapter = int32(_tempNum_) }
<<<<<<< HEAD
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["onlevel"].(float64); !_ok_ { err = errors.New("onlevel error"); return }; _v.Onlevel = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["onlevel"].(float64); !_ok_ { err = errors.New("onlevel error"); return }; _v.Onlevel = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["onlevelstory"].(float64); !_ok_ { err = errors.New("onlevelstory error"); return }; _v.Onlevelstory = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["onlevelstory"].(float64); !_ok_ { err = errors.New("onlevelstory error"); return }; _v.Onlevelstory = int32(_tempNum_) }
=======
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["level"].(float64); !_ok_ { err = errors.New("level error"); return }; _v.Level = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["level"].(float64); !_ok_ { err = errors.New("level error"); return }; _v.Level = int32(_tempNum_) }
{ {
var _arr_ []interface{} var _arr_ []interface{}
@ -73,6 +83,10 @@ func (_v *GameHeroupstoryChapterData)Deserialize(_buf map[string]interface{}) (e
} }
} }
<<<<<<< HEAD
=======
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["clearance"].(float64); !_ok_ { err = errors.New("clearance error"); return }; _v.Clearance = int32(_tempNum_) }
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; if _v.Circle, _ok_ = _buf["circle"].(string); !_ok_ { err = errors.New("circle error"); return } } { var _ok_ bool; if _v.Circle, _ok_ = _buf["circle"].(string); !_ok_ { err = errors.New("circle error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["qq"].(float64); !_ok_ { err = errors.New("qq error"); return }; _v.Qq = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["qq"].(float64); !_ok_ { err = errors.New("qq error"); return }; _v.Qq = int32(_tempNum_) }

23
sys/configure/structs/Game.HeroupstoryData.go
View File

@ -12,9 +12,14 @@ import "errors"
type GameHeroupstoryData struct { type GameHeroupstoryData struct {
Heroid int32 Heroid int32
<<<<<<< HEAD
Opentime string Opentime string
Newheroday int32 Newheroday int32
Reward []*Gameatn Reward []*Gameatn
=======
Opentime []int32
Newheroday int32
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
} }
const TypeId_GameHeroupstoryData = 2045922254 const TypeId_GameHeroupstoryData = 2045922254
@ -25,6 +30,7 @@ func (*GameHeroupstoryData) GetTypeId() int32 {
func (_v *GameHeroupstoryData)Deserialize(_buf map[string]interface{}) (err error) { func (_v *GameHeroupstoryData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["heroid"].(float64); !_ok_ { err = errors.New("heroid error"); return }; _v.Heroid = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["heroid"].(float64); !_ok_ { err = errors.New("heroid error"); return }; _v.Heroid = int32(_tempNum_) }
<<<<<<< HEAD
{ var _ok_ bool; if _v.Opentime, _ok_ = _buf["opentime"].(string); !_ok_ { err = errors.New("opentime error"); return } } { var _ok_ bool; if _v.Opentime, _ok_ = _buf["opentime"].(string); !_ok_ { err = errors.New("opentime error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["newheroday"].(float64); !_ok_ { err = errors.New("newheroday error"); return }; _v.Newheroday = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["newheroday"].(float64); !_ok_ { err = errors.New("newheroday error"); return }; _v.Newheroday = int32(_tempNum_) }
{ {
@ -41,6 +47,23 @@ func (_v *GameHeroupstoryData)Deserialize(_buf map[string]interface{}) (err erro
} }
} }
=======
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["opentime"].([]interface{}); !_ok_ { err = errors.New("opentime error"); return }
_v.Opentime = 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.Opentime = append(_v.Opentime, _list_v_)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["newheroday"].(float64); !_ok_ { err = errors.New("newheroday error"); return }; _v.Newheroday = int32(_tempNum_) }
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
return return
} }

42
sys/configure/structs/Game.VenturegiftsLottery.go
View File

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

50
sys/configure/structs/Game.VenturegiftsLotteryData.go
View File

@ -1,50 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GameVenturegiftsLotteryData struct {
Rewardkey int32
DrawrewardType []*Gameks
}
const TypeId_GameVenturegiftsLotteryData = -1609823769
func (*GameVenturegiftsLotteryData) GetTypeId() int32 {
return -1609823769
}
func (_v *GameVenturegiftsLotteryData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rewardkey"].(float64); !_ok_ { err = errors.New("rewardkey error"); return }; _v.Rewardkey = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["drawreward_type"].([]interface{}); !_ok_ { err = errors.New("drawreward_type error"); return }
_v.DrawrewardType = make([]*Gameks, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameks
{ 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 = DeserializeGameks(_x_); err != nil { return } }
_v.DrawrewardType = append(_v.DrawrewardType, _list_v_)
}
}
return
}
func DeserializeGameVenturegiftsLotteryData(_buf map[string]interface{}) (*GameVenturegiftsLotteryData, error) {
v := &GameVenturegiftsLotteryData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

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

@ -214,8 +214,11 @@ type Tables struct {
StoneBattle *GameStoneBattle StoneBattle *GameStoneBattle
StoneStore *GameStoneStore StoneStore *GameStoneStore
StoneStory *GameStoneStory StoneStory *GameStoneStory
<<<<<<< HEAD
StoneWeek *GameStoneWeek StoneWeek *GameStoneWeek
StoneTalent *GameStoneTalent StoneTalent *GameStoneTalent
=======
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
GameSummaryTab *GameGameSummaryTab GameSummaryTab *GameGameSummaryTab
GameSummary *GameGameSummary GameSummary *GameGameSummary
CompositeAll *GameCompositeAll CompositeAll *GameCompositeAll
@ -235,6 +238,10 @@ type Tables struct {
Heroupstory *GameHeroupstory Heroupstory *GameHeroupstory
HeroupstoryChapter *GameHeroupstoryChapter HeroupstoryChapter *GameHeroupstoryChapter
HeroupstoryBattle *GameHeroupstoryBattle HeroupstoryBattle *GameHeroupstoryBattle
<<<<<<< HEAD
=======
HDCelebration *GameHDCelebration
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
} }
func NewTables(loader JsonLoader) (*Tables, error) { func NewTables(loader JsonLoader) (*Tables, error) {
@ -1460,6 +1467,7 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.StoneStory, err = NewGameStoneStory(buf) ; err != nil { if tables.StoneStory, err = NewGameStoneStory(buf) ; err != nil {
return nil, err return nil, err
} }
<<<<<<< HEAD
if buf, err = loader("game_stoneweek") ; err != nil { if buf, err = loader("game_stoneweek") ; err != nil {
return nil, err return nil, err
} }
@ -1472,6 +1480,8 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.StoneTalent, err = NewGameStoneTalent(buf) ; err != nil { if tables.StoneTalent, err = NewGameStoneTalent(buf) ; err != nil {
return nil, err return nil, err
} }
=======
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
if buf, err = loader("game_gamesummarytab") ; err != nil { if buf, err = loader("game_gamesummarytab") ; err != nil {
return nil, err return nil, err
} }
@ -1586,5 +1596,14 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.HeroupstoryBattle, err = NewGameHeroupstoryBattle(buf) ; err != nil { if tables.HeroupstoryBattle, err = NewGameHeroupstoryBattle(buf) ; err != nil {
return nil, err return nil, err
} }
<<<<<<< HEAD
=======
if buf, err = loader("game_hdcelebration") ; err != nil {
return nil, err
}
if tables.HDCelebration, err = NewGameHDCelebration(buf) ; err != nil {
return nil, err
}
>>>>>>> 990d3eafc8c4ec2c754f820359c9e9a0b0277b5e
return tables, nil return tables, nil
} }