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:
wh_zcy 2023-06-19 20:30:14 +08:00
commit fe68a876d5
39 changed files with 95826 additions and 95257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/json/game_buriedtype.json
View File

@ -383,7 +383,7 @@
"id": 61, "id": 61,
"insert": 1, "insert": 1,
"filter": [ "filter": [
"eq" "gte"
] ]
}, },
{ {

144
bin/json/game_dispatch_task.json
View File

@ -8,7 +8,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 158, "tasktime": 102,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_1", "key": "pandamas_pandamas_dispatch_tasktxt_1",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -56,7 +56,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 88, "tasktime": 154,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_2", "key": "pandamas_pandamas_dispatch_tasktxt_2",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -104,7 +104,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 88, "tasktime": 140,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_3", "key": "pandamas_pandamas_dispatch_tasktxt_3",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -152,7 +152,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 73, "tasktime": 136,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_4", "key": "pandamas_pandamas_dispatch_tasktxt_4",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -200,7 +200,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 119, "tasktime": 107,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_5", "key": "pandamas_pandamas_dispatch_tasktxt_5",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -248,7 +248,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 132, "tasktime": 156,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_6", "key": "pandamas_pandamas_dispatch_tasktxt_6",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -296,7 +296,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 171, "tasktime": 133,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_7", "key": "pandamas_pandamas_dispatch_tasktxt_7",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -344,7 +344,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 97, "tasktime": 70,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_8", "key": "pandamas_pandamas_dispatch_tasktxt_8",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -392,7 +392,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 172, "tasktime": 99,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_9", "key": "pandamas_pandamas_dispatch_tasktxt_9",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -440,7 +440,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 60, "tasktime": 71,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_10", "key": "pandamas_pandamas_dispatch_tasktxt_10",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -488,7 +488,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 175, "tasktime": 94,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_11", "key": "pandamas_pandamas_dispatch_tasktxt_11",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -536,7 +536,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 174, "tasktime": 178,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_12", "key": "pandamas_pandamas_dispatch_tasktxt_12",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -584,7 +584,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 142, "tasktime": 154,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_13", "key": "pandamas_pandamas_dispatch_tasktxt_13",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -632,7 +632,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 141, "tasktime": 93,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_14", "key": "pandamas_pandamas_dispatch_tasktxt_14",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -680,7 +680,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 79, "tasktime": 111,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_15", "key": "pandamas_pandamas_dispatch_tasktxt_15",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -728,7 +728,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 108, "tasktime": 96,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_16", "key": "pandamas_pandamas_dispatch_tasktxt_16",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -776,7 +776,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 60, "tasktime": 102,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_17", "key": "pandamas_pandamas_dispatch_tasktxt_17",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -824,7 +824,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 85, "tasktime": 166,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_18", "key": "pandamas_pandamas_dispatch_tasktxt_18",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -872,7 +872,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 85, "tasktime": 177,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_19", "key": "pandamas_pandamas_dispatch_tasktxt_19",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -920,7 +920,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 69, "tasktime": 144,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_20", "key": "pandamas_pandamas_dispatch_tasktxt_20",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -968,7 +968,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 114, "tasktime": 80,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_21", "key": "pandamas_pandamas_dispatch_tasktxt_21",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -1016,7 +1016,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 161, "tasktime": 115,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_22", "key": "pandamas_pandamas_dispatch_tasktxt_22",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -1064,7 +1064,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 71, "tasktime": 162,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_23", "key": "pandamas_pandamas_dispatch_tasktxt_23",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -1112,7 +1112,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 154, "tasktime": 137,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_24", "key": "pandamas_pandamas_dispatch_tasktxt_24",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -1160,7 +1160,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 111, "tasktime": 91,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_25", "key": "pandamas_pandamas_dispatch_tasktxt_25",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -1208,7 +1208,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 153, "tasktime": 80,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_26", "key": "pandamas_pandamas_dispatch_tasktxt_26",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -1304,7 +1304,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 162, "tasktime": 92,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_28", "key": "pandamas_pandamas_dispatch_tasktxt_28",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -1352,7 +1352,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 76, "tasktime": 109,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_29", "key": "pandamas_pandamas_dispatch_tasktxt_29",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -1400,7 +1400,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 142, "tasktime": 143,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_30", "key": "pandamas_pandamas_dispatch_tasktxt_30",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -1448,7 +1448,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 164, "tasktime": 139,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_31", "key": "pandamas_pandamas_dispatch_tasktxt_31",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -1496,7 +1496,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 67, "tasktime": 85,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_32", "key": "pandamas_pandamas_dispatch_tasktxt_32",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -1544,7 +1544,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 137, "tasktime": 77,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_33", "key": "pandamas_pandamas_dispatch_tasktxt_33",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -1592,7 +1592,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 120, "tasktime": 106,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_34", "key": "pandamas_pandamas_dispatch_tasktxt_34",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -1688,7 +1688,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 114, "tasktime": 102,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_36", "key": "pandamas_pandamas_dispatch_tasktxt_36",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -1736,7 +1736,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 177, "tasktime": 98,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_37", "key": "pandamas_pandamas_dispatch_tasktxt_37",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -1784,7 +1784,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 60, "tasktime": 64,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_38", "key": "pandamas_pandamas_dispatch_tasktxt_38",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -1832,7 +1832,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 147, "tasktime": 78,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_39", "key": "pandamas_pandamas_dispatch_tasktxt_39",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -1880,7 +1880,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 152, "tasktime": 98,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_40", "key": "pandamas_pandamas_dispatch_tasktxt_40",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -1928,7 +1928,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 130, "tasktime": 80,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_41", "key": "pandamas_pandamas_dispatch_tasktxt_41",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -1976,7 +1976,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 90, "tasktime": 64,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_42", "key": "pandamas_pandamas_dispatch_tasktxt_42",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -2024,7 +2024,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 156, "tasktime": 139,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_43", "key": "pandamas_pandamas_dispatch_tasktxt_43",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -2072,7 +2072,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 77, "tasktime": 75,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_44", "key": "pandamas_pandamas_dispatch_tasktxt_44",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -2120,7 +2120,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 154, "tasktime": 124,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_45", "key": "pandamas_pandamas_dispatch_tasktxt_45",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -2168,7 +2168,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 93, "tasktime": 150,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_46", "key": "pandamas_pandamas_dispatch_tasktxt_46",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -2216,7 +2216,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 101, "tasktime": 67,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_47", "key": "pandamas_pandamas_dispatch_tasktxt_47",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -2264,7 +2264,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 113, "tasktime": 177,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_48", "key": "pandamas_pandamas_dispatch_tasktxt_48",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -2312,7 +2312,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 167, "tasktime": 120,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_49", "key": "pandamas_pandamas_dispatch_tasktxt_49",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -2360,7 +2360,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 177, "tasktime": 163,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_50", "key": "pandamas_pandamas_dispatch_tasktxt_50",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -2408,7 +2408,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 68, "tasktime": 117,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_51", "key": "pandamas_pandamas_dispatch_tasktxt_51",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -2456,7 +2456,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 75, "tasktime": 70,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_52", "key": "pandamas_pandamas_dispatch_tasktxt_52",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -2504,7 +2504,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 103, "tasktime": 137,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_53", "key": "pandamas_pandamas_dispatch_tasktxt_53",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -2552,7 +2552,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 103, "tasktime": 123,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_54", "key": "pandamas_pandamas_dispatch_tasktxt_54",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -2600,7 +2600,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 155, "tasktime": 76,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_55", "key": "pandamas_pandamas_dispatch_tasktxt_55",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -2648,7 +2648,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 152, "tasktime": 100,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_56", "key": "pandamas_pandamas_dispatch_tasktxt_56",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -2696,7 +2696,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 147, "tasktime": 63,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_57", "key": "pandamas_pandamas_dispatch_tasktxt_57",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -2744,7 +2744,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 95, "tasktime": 86,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_58", "key": "pandamas_pandamas_dispatch_tasktxt_58",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -2792,7 +2792,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 99, "tasktime": 98,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_59", "key": "pandamas_pandamas_dispatch_tasktxt_59",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -2840,7 +2840,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 67, "tasktime": 121,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_60", "key": "pandamas_pandamas_dispatch_tasktxt_60",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -2888,7 +2888,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 106, "tasktime": 175,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_61", "key": "pandamas_pandamas_dispatch_tasktxt_61",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -2936,7 +2936,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 66, "tasktime": 97,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_62", "key": "pandamas_pandamas_dispatch_tasktxt_62",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -2984,7 +2984,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 147, "tasktime": 70,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_63", "key": "pandamas_pandamas_dispatch_tasktxt_63",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -3032,7 +3032,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 149, "tasktime": 122,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_64", "key": "pandamas_pandamas_dispatch_tasktxt_64",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -3080,7 +3080,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 175, "tasktime": 75,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_65", "key": "pandamas_pandamas_dispatch_tasktxt_65",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -3128,7 +3128,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 129, "tasktime": 96,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_66", "key": "pandamas_pandamas_dispatch_tasktxt_66",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -3176,7 +3176,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 116, "tasktime": 167,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_67", "key": "pandamas_pandamas_dispatch_tasktxt_67",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -3224,7 +3224,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 133, "tasktime": 152,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_68", "key": "pandamas_pandamas_dispatch_tasktxt_68",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -3272,7 +3272,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 151, "tasktime": 162,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_69", "key": "pandamas_pandamas_dispatch_tasktxt_69",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -3320,7 +3320,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 131, "tasktime": 168,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_70", "key": "pandamas_pandamas_dispatch_tasktxt_70",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -3368,7 +3368,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 142, "tasktime": 95,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_71", "key": "pandamas_pandamas_dispatch_tasktxt_71",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -3416,7 +3416,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 170, "tasktime": 171,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_72", "key": "pandamas_pandamas_dispatch_tasktxt_72",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -3464,7 +3464,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 179, "tasktime": 112,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_73", "key": "pandamas_pandamas_dispatch_tasktxt_73",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -3512,7 +3512,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 169, "tasktime": 126,
"tasktxt": { "tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_74", "key": "pandamas_pandamas_dispatch_tasktxt_74",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"

2
bin/json/game_global.json
View File

@ -733,6 +733,6 @@
"buzkashi_bumpdis": 5, "buzkashi_bumpdis": 5,
"stamina_potion": 10000003, "stamina_potion": 10000003,
"fight_ps": 3, "fight_ps": 3,
"player_bodychange": 20060 "player_bodychange": 20170
} }
] ]

2
bin/json/game_guide.json
View File

@ -83,7 +83,7 @@
"startPar": "", "startPar": "",
"parameter": "", "parameter": "",
"interface": "", "interface": "",
"condition": "worldtasksubfinish_20010", "condition": "worldtasktrigger_20011",
"followtj": "OpenNpcOption_20010_熊猫_1", "followtj": "OpenNpcOption_20010_熊猫_1",
"followguide": 1000202, "followguide": 1000202,
"finger": [ "finger": [

462
bin/json/game_horoscope.json
View File

File diff suppressed because it is too large Load Diff

12
bin/json/game_huntingopentime.json
View File

@ -18,7 +18,8 @@
"text": "开启时间：1、2" "text": "开启时间：1、2"
}, },
"bg": "fb_pt_jxxx", "bg": "fb_pt_jxxx",
"icon": "wjyz_img016" "icon": "wjyz_img016",
"bossIcon": "sl_rk_boss04"
}, },
{ {
"type": 2, "type": 2,
@ -39,7 +40,8 @@
"text": "开启时间：3、4" "text": "开启时间：3、4"
}, },
"bg": "fb_pt_hl", "bg": "fb_pt_hl",
"icon": "wjyz_img015" "icon": "wjyz_img015",
"bossIcon": "sl_rk_boss02"
}, },
{ {
"type": 3, "type": 3,
@ -60,7 +62,8 @@
"text": "开启时间：5、6" "text": "开启时间：5、6"
}, },
"bg": "fb_pt_dc", "bg": "fb_pt_dc",
"icon": "wjyz_img014" "icon": "wjyz_img014",
"bossIcon": "sl_rk_boss01"
}, },
{ {
"type": 4, "type": 4,
@ -81,6 +84,7 @@
"text": "开启时间：1、7" "text": "开启时间：1、7"
}, },
"bg": "fb_pt_tkhx", "bg": "fb_pt_tkhx",
"icon": "wjyz_img017" "icon": "wjyz_img017",
"bossIcon": "sl_rk_boss03"
} }
] ]

803
bin/json/game_item.json
View File

File diff suppressed because it is too large Load Diff

187712
bin/json/game_monsterformat.json
View File

File diff suppressed because it is too large Load Diff

2
bin/json/game_navigation.json
View File

@ -117,7 +117,7 @@
"sceneicon": "ty_qp_my01", "sceneicon": "ty_qp_my01",
"functionname": { "functionname": {
"key": "navigation_Sheet1_functionname_7", "key": "navigation_Sheet1_functionname_7",
"text": "羁绊" "text": "好感度"
}, },
"npcName": [ "npcName": [
"功能入口-藏书馆" "功能入口-藏书馆"

630
bin/json/game_pagoda.json
View File

File diff suppressed because it is too large Load Diff

38
bin/json/game_rdtasknpc.json
View File

@ -716,7 +716,7 @@
"heroid": 44004, "heroid": 44004,
"datas": [ "datas": [
"CommandScene", "CommandScene",
"20010_骇客蛛_1", "功能入口_主线",
"905" "905"
], ],
"event": [ "event": [
@ -730,7 +730,7 @@
"heroid": 44004, "heroid": 44004,
"datas": [ "datas": [
"CommandScene", "CommandScene",
"20010_骇客蛛_1", "功能入口_主线",
"905" "905"
], ],
"event": [ "event": [
@ -756,7 +756,7 @@
"heroid": 44004, "heroid": 44004,
"datas": [ "datas": [
"CommandScene", "CommandScene",
"20010_骇客蛛_1", "功能入口_主线",
"905" "905"
], ],
"event": [ "event": [
@ -794,7 +794,7 @@
"heroid": 44004, "heroid": 44004,
"datas": [ "datas": [
"CommandScene", "CommandScene",
"20010_骇客蛛_1", "功能入口_主线",
"905" "905"
], ],
"event": [ "event": [
@ -808,7 +808,7 @@
"heroid": 44004, "heroid": 44004,
"datas": [ "datas": [
"CommandScene", "CommandScene",
"20010_骇客蛛_1", "功能入口_主线",
"905" "905"
], ],
"event": [ "event": [
@ -994,7 +994,7 @@
"heroid": 44004, "heroid": 44004,
"datas": [ "datas": [
"CommandScene", "CommandScene",
"20010_骇客蛛_1", "功能入口_主线",
"905" "905"
], ],
"event": [ "event": [
@ -1008,7 +1008,7 @@
"heroid": 44004, "heroid": 44004,
"datas": [ "datas": [
"CommandScene", "CommandScene",
"20010_骇客蛛_1", "功能入口_主线",
"905" "905"
], ],
"event": [ "event": [
@ -1034,7 +1034,7 @@
"heroid": 44004, "heroid": 44004,
"datas": [ "datas": [
"CommandScene", "CommandScene",
"20010_骇客蛛_1", "功能入口_主线",
"905" "905"
], ],
"event": [ "event": [
@ -1352,7 +1352,7 @@
"heroid": 25001, "heroid": 25001,
"datas": [ "datas": [
"CommandScene", "CommandScene",
"20010_骇客蛛_1", "功能入口_主线",
"905" "905"
], ],
"event": [ "event": [
@ -1390,7 +1390,7 @@
"heroid": 25001, "heroid": 25001,
"datas": [ "datas": [
"CommandScene", "CommandScene",
"20010_骇客蛛_1", "功能入口_主线",
"905" "905"
], ],
"event": [ "event": [
@ -1428,7 +1428,7 @@
"heroid": 25001, "heroid": 25001,
"datas": [ "datas": [
"CommandScene", "CommandScene",
"20010_骇客蛛_1", "功能入口_主线",
"905" "905"
], ],
"event": [ "event": [
@ -1442,7 +1442,7 @@
"heroid": 25001, "heroid": 25001,
"datas": [ "datas": [
"CommandScene", "CommandScene",
"20010_骇客蛛_1", "功能入口_主线",
"905" "905"
], ],
"event": [ "event": [
@ -1456,7 +1456,7 @@
"heroid": 25001, "heroid": 25001,
"datas": [ "datas": [
"CommandScene", "CommandScene",
"20010_骇客蛛_1", "功能入口_主线",
"905" "905"
], ],
"event": [ "event": [
@ -1470,7 +1470,7 @@
"heroid": 25001, "heroid": 25001,
"datas": [ "datas": [
"CommandScene", "CommandScene",
"20010_骇客蛛_1", "功能入口_主线",
"905" "905"
], ],
"event": [ "event": [
@ -1526,7 +1526,7 @@
"heroid": 25001, "heroid": 25001,
"datas": [ "datas": [
"CommandScene", "CommandScene",
"20010_骇客蛛_1", "功能入口_主线",
"905" "905"
], ],
"event": [ "event": [
@ -1674,7 +1674,7 @@
"heroid": 25001, "heroid": 25001,
"datas": [ "datas": [
"CommandScene", "CommandScene",
"20010_骇客蛛_1", "功能入口_主线",
"905" "905"
], ],
"event": [ "event": [
@ -1806,7 +1806,7 @@
"heroid": 25001, "heroid": 25001,
"datas": [ "datas": [
"CommandScene", "CommandScene",
"20010_骇客蛛_1", "功能入口_主线",
"905" "905"
], ],
"event": [ "event": [
@ -1832,7 +1832,7 @@
"heroid": 25001, "heroid": 25001,
"datas": [ "datas": [
"CommandScene", "CommandScene",
"20010_骇客蛛_1", "功能入口_主线",
"905" "905"
], ],
"event": [ "event": [
@ -2086,7 +2086,7 @@
"heroid": 25001, "heroid": 25001,
"datas": [ "datas": [
"CommandScene", "CommandScene",
"20010_骇客蛛_1", "功能入口_主线",
"905" "905"
], ],
"event": [ "event": [

4
bin/json/game_reddot.json
View File

@ -649,7 +649,7 @@
}, },
{ {
"id": 24100, "id": 24100,
"msg_type": 2, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
@ -658,7 +658,7 @@
}, },
{ {
"id": 24101, "id": 24101,
"msg_type": 0, "msg_type": 2,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",

32
bin/json/game_skillafteratk.json
View File

@ -9457,7 +9457,7 @@
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 3, "Type": 3,
"Argu": [ "Argu": [
390001008, 390001401,
1000, 1000,
1, 1,
2 2
@ -21420,7 +21420,7 @@
{ {
"Id": 244004211, "Id": 244004211,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 3,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
@ -21447,12 +21447,12 @@
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
"ExecuteCnt": 2, "ExecuteCnt": 1,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
1, 1,
4, 4,
200, 1000,
2, 2,
2, 2,
60 60
@ -21470,7 +21470,7 @@
}, },
{ {
"Id": 244004213, "Id": 244004213,
"EmitPR": 600, "EmitPR": 1000,
"From": 4, "From": 4,
"Where": [], "Where": [],
"Order": "", "Order": "",
@ -21498,12 +21498,12 @@
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
"ExecuteCnt": 2, "ExecuteCnt": 1,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
1, 1,
4, 4,
300, 1100,
2, 2,
2, 2,
60 60
@ -21526,12 +21526,12 @@
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
"ExecuteCnt": 2, "ExecuteCnt": 1,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
1, 1,
4, 4,
400, 1200,
2, 2,
2, 2,
60 60
@ -21554,12 +21554,12 @@
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
"ExecuteCnt": 2, "ExecuteCnt": 1,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
1, 1,
4, 4,
500, 1300,
2, 2,
2, 2,
60 60
@ -21582,12 +21582,12 @@
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
"ExecuteCnt": 2, "ExecuteCnt": 1,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
1, 1,
4, 4,
600, 1400,
2, 2,
2, 2,
60 60
@ -21659,7 +21659,7 @@
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 1, "Type": 11,
"Argu": [ "Argu": [
2, 2,
2, 2,
@ -21773,7 +21773,7 @@
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 1, "Type": 11,
"Argu": [ "Argu": [
2, 2,
2, 2,
@ -21887,7 +21887,7 @@
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 1, "Type": 11,
"Argu": [ "Argu": [
2, 2,
2, 2,

290
bin/json/game_skillatk.json
View File

File diff suppressed because it is too large Load Diff

28
bin/json/game_skillbuff.json
View File

@ -904,7 +904,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_buff_Desc_390001119", "key": "skill_skill_buff_Desc_390001119",
"text": "（无法驱散类状态）造成伤害时为目标附加2回合【禁疗】" "text": "（无法驱散类状态）造成伤害时为目标附加2回合[color=#c84a32]禁疗[/color] "
}, },
"BuffType": 0, "BuffType": 0,
"EffectArgu": [], "EffectArgu": [],
@ -960,7 +960,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_buff_Desc_390001121", "key": "skill_skill_buff_Desc_390001121",
"text": "（无法驱散类状态）造成伤害时有40%概率为目标附加2回合【防御下降】" "text": "（无法驱散类状态）造成伤害时有40%概率为目标附加2回合[color=#c84a32]防御下降[/color] "
}, },
"BuffType": 0, "BuffType": 0,
"EffectArgu": [], "EffectArgu": [],
@ -1387,7 +1387,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_buff_Desc_390001206", "key": "skill_skill_buff_Desc_390001206",
"text": "每层为崔佛（释放者）提供15%伤害减免" "text": "每层为（释放者）提供15%伤害减免"
}, },
"BuffType": 0, "BuffType": 0,
"EffectArgu": [], "EffectArgu": [],
@ -1533,7 +1533,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_buff_Desc_390001211", "key": "skill_skill_buff_Desc_390001211",
"text": "状态携带者受击5次后，【童真】自动引爆，对该目标及随机2个地方目标造成该状态释放者攻击力85%的伤害，并有50%概率对被童真影响的目标附加2回合【沉默】" "text": "状态携带者受击5次后，[color=#c84a32]童真[/color] 自动引爆，对该目标及随机2个地方目标造成该状态释放者攻击力85%的伤害，并有50%概率对被童真影响的目标附加2回合[color=#c84a32]沉默[/color] "
}, },
"BuffType": 69, "BuffType": 69,
"EffectArgu": [ "EffectArgu": [
@ -1684,7 +1684,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_buff_Desc_390001216", "key": "skill_skill_buff_Desc_390001216",
"text": "行动两次后触发，扣除50%的当前生命值并附加1回合【眩晕】" "text": "行动两次后触发，扣除50%的当前生命值并附加1回合[color=#c84a32]眩晕[/color] "
}, },
"BuffType": 71, "BuffType": 71,
"EffectArgu": [ "EffectArgu": [
@ -1701,7 +1701,7 @@
"AddEffect": false, "AddEffect": false,
"RemoveType": true, "RemoveType": true,
"NotOverlay": 0, "NotOverlay": 0,
"OverlayTimes": 0, "OverlayTimes": 1,
"SameID": false, "SameID": false,
"golbalbufficon": "", "golbalbufficon": "",
"buffIcon": "jn_buff_hkqz", "buffIcon": "jn_buff_hkqz",
@ -1716,7 +1716,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_buff_Desc_390001217", "key": "skill_skill_buff_Desc_390001217",
"text": "行动两次后触发，扣除50%的当前生命值并附加2回合【眩晕】" "text": "行动两次后触发，扣除50%的当前生命值并附加2回合[color=#c84a32]眩晕[/color] "
}, },
"BuffType": 0, "BuffType": 0,
"EffectArgu": [], "EffectArgu": [],
@ -1727,9 +1727,9 @@
1 1
], ],
"AddEffect": false, "AddEffect": false,
"RemoveType": false, "RemoveType": true,
"NotOverlay": 0, "NotOverlay": 0,
"OverlayTimes": 0, "OverlayTimes": 1,
"SameID": false, "SameID": false,
"golbalbufficon": "", "golbalbufficon": "",
"buffIcon": "jn_buff_hkqz", "buffIcon": "jn_buff_hkqz",
@ -2706,7 +2706,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_buff_Desc_390001404", "key": "skill_skill_buff_Desc_390001404",
"text": "回合开始时受到伤害，上海微状态附加者攻击力50%" "text": "回合开始时受到伤害，附加者攻击力50%"
}, },
"BuffType": 73, "BuffType": 73,
"EffectArgu": [ "EffectArgu": [
@ -3284,7 +3284,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_buff_Desc_390001424", "key": "skill_skill_buff_Desc_390001424",
"text": "为1个友方附加2回合【生死簿】记录当前生命值，2 回合后，回溯其生命值至记录值。" "text": "为1个友方附加2回合[color=#37d8a9]生死簿[/color] 记录当前生命值，2 回合后，回溯其生命值至记录值。"
}, },
"BuffType": 57, "BuffType": 57,
"EffectArgu": [], "EffectArgu": [],
@ -3462,7 +3462,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_buff_Desc_390001430", "key": "skill_skill_buff_Desc_390001430",
"text": "回合开始时受到伤害，上海微状态附加者攻击力50%" "text": "回合开始时受到伤害，伤害为附加者攻击力50%"
}, },
"BuffType": 73, "BuffType": 73,
"EffectArgu": [ "EffectArgu": [
@ -3552,7 +3552,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_buff_Desc_390001433", "key": "skill_skill_buff_Desc_390001433",
"text": "无法被附加【中毒】状态，受击时有概率为攻击者附加1回合【中毒】" "text": "无法被附加[color=#c84a32]中毒[/color] 状态，受击时有概率为攻击者附加1回合[color=#c84a32]中毒[/color] "
}, },
"BuffType": 70, "BuffType": 70,
"EffectArgu": [ "EffectArgu": [
@ -4008,7 +4008,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_buff_Desc_390001448", "key": "skill_skill_buff_Desc_390001448",
"text": "解除自身所有减益效果，自身造成的伤害提升100%，附加2回合【速度提升】【吸血】" "text": "解除自身所有减益效果，自身造成的伤害提升100%，附加2回合[color=#37d8a9]速度提升[/color] "
}, },
"BuffType": 0, "BuffType": 0,
"EffectArgu": [], "EffectArgu": [],

18
bin/json/game_vikingbossskill.json
View File

@ -15,7 +15,8 @@
"guardskill": [ "guardskill": [
124004111, 124004111,
144005111 144005111
] ],
"bossIcon": "sl_rk_boss04"
}, },
{ {
"bossid": 2, "bossid": 2,
@ -33,7 +34,8 @@
"guardskill": [ "guardskill": [
124004111, 124004111,
144005111 144005111
] ],
"bossIcon": "sl_rk_boss04"
}, },
{ {
"bossid": 3, "bossid": 3,
@ -51,7 +53,8 @@
"guardskill": [ "guardskill": [
124004111, 124004111,
144005111 144005111
] ],
"bossIcon": "sl_rk_boss04"
}, },
{ {
"bossid": 11, "bossid": 11,
@ -69,7 +72,8 @@
"guardskill": [ "guardskill": [
124004111, 124004111,
144005111 144005111
] ],
"bossIcon": "sl_rk_boss04"
}, },
{ {
"bossid": 21, "bossid": 21,
@ -87,7 +91,8 @@
"guardskill": [ "guardskill": [
124004111, 124004111,
144005111 144005111
] ],
"bossIcon": "sl_rk_boss02"
}, },
{ {
"bossid": 31, "bossid": 31,
@ -105,6 +110,7 @@
"guardskill": [ "guardskill": [
125001111, 125001111,
125001211 125001211
] ],
"bossIcon": "sl_rk_boss01"
} }
] ]

9
comm/const.go
View File

@ -86,6 +86,7 @@ const (
ModuleOldtimes core.M_Modules = "oldtimes" //旧时光 ModuleOldtimes core.M_Modules = "oldtimes" //旧时光
ModuleCaravan core.M_Modules = "caravan" //巨怪商队 ModuleCaravan core.M_Modules = "caravan" //巨怪商队
ModuleBuried core.M_Modules = "buried" //埋点中心 ModuleBuried core.M_Modules = "buried" //埋点中心
ModuleActivity core.M_Modules = "acrivity" //活动
) )
// 数据表名定义处 // 数据表名定义处
@ -258,6 +259,12 @@ const (
//埋点数据统计 //埋点数据统计
TableBuried = "buried" TableBuried = "buried"
// 活动数据
TableHdData = "hddata"
// 活动列表
TableHdList = "huodong"
) )
// RPC服务接口定义处 // RPC服务接口定义处
@ -466,7 +473,7 @@ const (
Reddot19110 ReddotType = 19110 // 当存在好感度羁绊可以升级的时候，好感度羁绊界面激活 Reddot19110 ReddotType = 19110 // 当存在好感度羁绊可以升级的时候，好感度羁绊界面激活
// 主线 // 主线
Reddot24100 ReddotType = 24100 // 主线章节有奖励没领取 Reddot24101 ReddotType = 24101 // 主线章节有奖励没领取
// 好友 // 好友
Reddot21101 ReddotType = 21101 //当好友申请存在时，一级位置：好友界面左边申请列表图标上右上角位置 当好友申请处理完红点消失 Reddot21101 ReddotType = 21101 //当好友申请存在时，一级位置：好友界面左边申请列表图标上右上角位置 当好友申请处理完红点消失
) )

25
modules/activity/api.go Normal file
View File

@ -0,0 +1,25 @@
package activity
import (
"go_dreamfactory/lego/core"
"go_dreamfactory/modules"
)
type apiComp struct {
modules.MCompGate
service core.IService
module *Activity
}
//组件初始化接口
func (this *apiComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
this.MCompGate.Init(service, module, comp, options)
this.module = module.(*Activity)
this.service = service
return
}
func (this *apiComp) Start() (err error) {
err = this.MCompGate.Start()
return
}

28
modules/activity/api_getlist.go Normal file
View File

@ -0,0 +1,28 @@
package activity
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
)
//参数校验
func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.ActivityGetListReq) (errdata *pb.ErrorData) {
return
}
func (this *apiComp) GetList(session comm.IUserSession, req *pb.ActivityGetListReq) (errdata *pb.ErrorData) {
list, err := this.module.modelhdList.getHdList(session.GetUserId())
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
}
return
}
session.SendMsg(string(this.module.GetType()), "getlist", &pb.ActivityGetListResp{
Data: list,
})
return
}

39
modules/activity/comp_configure.go Normal file
View File

@ -0,0 +1,39 @@
package activity
import (
"go_dreamfactory/lego/core"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/modules"
"go_dreamfactory/sys/configure"
)
const ()
// /配置管理基础组件
type configureComp struct {
modules.MCompConfigure
}
// 组件初始化接口
func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
err = this.MCompConfigure.Init(service, module, comp, options)
return
}
// 加载多个配置文件
func (this *configureComp) LoadMultiConfigure(confs map[string]interface{}) (err error) {
for k, v := range confs {
err = configure.RegisterConfigure(k, v, nil)
if err != nil {
log.Errorf("配置文件:%s解析失败!", k)
break
}
}
return
}
// 读取配置数据
func (this *configureComp) GetConfigure(name string) (v interface{}, err error) {
return configure.GetConfigure(name)
}

53
modules/activity/model_hddata.go Normal file
View File

@ -0,0 +1,53 @@
package activity
import (
"go_dreamfactory/comm"
"go_dreamfactory/lego/core"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/x/bsonx"
)
type modelActivity struct {
modules.MCompModel
module *Activity
}
func (this *modelActivity) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
this.TableName = string(comm.TableHdData)
err = this.MCompModel.Init(service, module, comp, options)
this.module = module.(*Activity)
// uid 创建索引
this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}},
})
return
}
func (this *modelActivity) getActivityList(uid string) (result *pb.DBActivityData, err error) {
result = &pb.DBActivityData{
Uid: uid,
Hid: 0,
Gotarr: []int32{},
Lasttime: 0,
Val: 0,
}
if err = this.Get(uid, result); err != nil {
if mongo.ErrNoDocuments == err {
result.Id = primitive.NewObjectID().Hex()
result.Uid = uid
this.Add(uid, result)
err = nil
}
return
}
return
}
func (this *modelActivity) modifyActivityList(uid string, data map[string]interface{}) error {
return this.Change(uid, data)
}

35
modules/activity/model_hdlist.go Normal file
View File

@ -0,0 +1,35 @@
package activity
import (
"go_dreamfactory/comm"
"go_dreamfactory/lego/core"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
)
type modelHdList struct {
modules.MCompModel
module *Activity
}
func (this *modelHdList) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
this.TableName = string(comm.TableHdList)
err = this.MCompModel.Init(service, module, comp, options)
this.module = module.(*Activity)
return
}
func (this *modelHdList) getHdList(uid string) (result []*pb.DBHuodong, err error) {
result = make([]*pb.DBHuodong, 0)
if err = this.GetList(uid, &result); err != nil {
this.module.Errorf("getActivityList db error: %v", err)
err = nil
}
return
}
// 不需要修改 此接口不调用
func (this *modelHdList) modifyHdList(uid string, data map[string]interface{}) error {
return this.Change(uid, data)
}

43
modules/activity/module.go Normal file
View File

@ -0,0 +1,43 @@
package activity
import (
"go_dreamfactory/comm"
"go_dreamfactory/lego/core"
"go_dreamfactory/modules"
)
type Activity struct {
modules.ModuleBase
api *apiComp
configure *configureComp
modelActivity *modelActivity
service core.IService
modelhdList *modelHdList
}
func NewModule() core.IModule {
return &Activity{}
}
func (this *Activity) GetType() core.M_Modules {
return comm.ModuleActivity
}
func (this *Activity) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
err = this.ModuleBase.Init(service, module, options)
this.service = service
return
}
func (this *Activity) OnInstallComp() {
this.ModuleBase.OnInstallComp()
this.api = this.RegisterComp(new(apiComp)).(*apiComp)
this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
this.modelActivity = this.RegisterComp(new(modelActivity)).(*modelActivity)
this.modelhdList = this.RegisterComp(new(modelHdList)).(*modelHdList)
}
func (this *Activity) CheckActivateActivityCollect(uid string, id string) (err error) {
return
}

16
modules/buried/configure.go
View File

@ -16,7 +16,7 @@ const (
game_buriedcondi = "game_buriedcondi.json" game_buriedcondi = "game_buriedcondi.json"
) )
//配置管理组件 // 配置管理组件
type configureComp struct { type configureComp struct {
modules.MCompConfigure modules.MCompConfigure
module *Buried module *Buried
@ -24,7 +24,7 @@ type configureComp struct {
group map[int32][]*cfg.GameBuriedCondiData //安排点类型 分组 group map[int32][]*cfg.GameBuriedCondiData //安排点类型 分组
} }
//组件初始化接口 // 组件初始化接口
func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
this.MCompConfigure.Init(service, module, comp, options) this.MCompConfigure.Init(service, module, comp, options)
this.module = module.(*Buried) this.module = module.(*Buried)
@ -40,7 +40,7 @@ func (this *configureComp) Start() (err error) {
return return
} }
//校验配置异常 // 校验配置异常
func (this *configureComp) checkconfig() (err error) { func (this *configureComp) checkconfig() (err error) {
var ( var (
v interface{} v interface{}
@ -77,7 +77,7 @@ func (this *configureComp) checkconfig() (err error) {
return return
} }
//读取埋点配置数据 // 读取埋点配置数据
func (this *configureComp) getburiedtypedata(tt int32) (result *cfg.GameBuriedTypeData, err error) { func (this *configureComp) getburiedtypedata(tt int32) (result *cfg.GameBuriedTypeData, err error) {
var ( var (
v interface{} v interface{}
@ -96,7 +96,7 @@ func (this *configureComp) getburiedtypedata(tt int32) (result *cfg.GameBuriedTy
return return
} }
//读取条件任务id配置 // 读取条件任务id配置
func (this *configureComp) getburiedcondidata(cid int32) (result *cfg.GameBuriedCondiData, err error) { func (this *configureComp) getburiedcondidata(cid int32) (result *cfg.GameBuriedCondiData, err error) {
var ( var (
v interface{} v interface{}
@ -107,7 +107,7 @@ func (this *configureComp) getburiedcondidata(cid int32) (result *cfg.GameBuried
return return
} else { } else {
if result, ok = v.(*cfg.GameBuriedCondi).GetDataMap()[cid]; !ok { if result, ok = v.(*cfg.GameBuriedCondi).GetDataMap()[cid]; !ok {
err = comm.NewNotFoundConfErr(moduleName, game_buriedtype, cid) err = comm.NewNotFoundConfErr(moduleName, game_buriedcondi, cid)
this.module.Errorf("err:%v", err) this.module.Errorf("err:%v", err)
return return
} }
@ -115,7 +115,7 @@ func (this *configureComp) getburiedcondidata(cid int32) (result *cfg.GameBuried
return return
} }
//动态更新配置 // 动态更新配置
func (this *configureComp) updateconfigure() { func (this *configureComp) updateconfigure() {
if v, err := this.GetConfigure(game_buriedcondi); err != nil { if v, err := this.GetConfigure(game_buriedcondi); err != nil {
return return
@ -138,7 +138,7 @@ func (this *configureComp) updateconfigure() {
} }
} }
//读取埋点条件配置 // 读取埋点条件配置
func (this *configureComp) getCondiDatas(tt int32) (result []*cfg.GameBuriedCondiData) { func (this *configureComp) getCondiDatas(tt int32) (result []*cfg.GameBuriedCondiData) {
result = make([]*cfg.GameBuriedCondiData, 0) result = make([]*cfg.GameBuriedCondiData, 0)
this.lock.RLock() this.lock.RLock()

26
modules/buried/module.go
View File

@ -52,7 +52,7 @@ func (this *Buried) Start() (err error) {
return return
} }
//装备组件 // 装备组件
func (this *Buried) OnInstallComp() { func (this *Buried) OnInstallComp() {
this.ModuleBase.OnInstallComp() this.ModuleBase.OnInstallComp()
@ -67,7 +67,7 @@ func (this *Buried) Rpc_ModuleBuriedTrigger(ctx context.Context, args *pb.Rpc_Mo
return return
} }
//激活数据采集点 // 激活数据采集点
func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (err error) { func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (err error) {
var ( var (
conf *cfg.GameBuriedCondiData conf *cfg.GameBuriedCondiData
@ -82,6 +82,9 @@ func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (err error) {
} }
for _, v := range condiIds { for _, v := range condiIds {
if v == 0 {
continue
}
if conf, err = this.configure.getburiedcondidata(v); err != nil { if conf, err = this.configure.getburiedcondidata(v); err != nil {
return return
} }
@ -133,7 +136,7 @@ func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (err error) {
return return
} }
//激活数据采集点 // 激活数据采集点
func (this *Buried) CheckCondition(uid string, condiIds ...int32) (condis []*pb.ConIProgress, err error) { func (this *Buried) CheckCondition(uid string, condiIds ...int32) (condis []*pb.ConIProgress, err error) {
var ( var (
model *buriedModel model *buriedModel
@ -150,6 +153,9 @@ func (this *Buried) CheckCondition(uid string, condiIds ...int32) (condis []*pb.
} }
condis = make([]*pb.ConIProgress, 0) condis = make([]*pb.ConIProgress, 0)
for _, v := range condiIds { for _, v := range condiIds {
if v == 0 {
continue
}
if conf, err = this.configure.getburiedcondidata(v); err != nil { if conf, err = this.configure.getburiedcondidata(v); err != nil {
return return
} }
@ -195,7 +201,7 @@ func (this *Buried) CheckCondition(uid string, condiIds ...int32) (condis []*pb.
return return
} }
//设置任务完成状态并校验 // 设置任务完成状态并校验
func (this *Buried) FinishConditionAndCheck(uid string, finishcondiIds []int32, condiIds ...int32) (condis []*pb.ConIProgress, err error) { func (this *Buried) FinishConditionAndCheck(uid string, finishcondiIds []int32, condiIds ...int32) (condis []*pb.ConIProgress, err error) {
var ( var (
model *buriedModel model *buriedModel
@ -225,6 +231,9 @@ func (this *Buried) FinishConditionAndCheck(uid string, finishcondiIds []int32,
condis = make([]*pb.ConIProgress, 0) condis = make([]*pb.ConIProgress, 0)
for _, v := range finishcondiIds { for _, v := range finishcondiIds {
if v == 0 {
continue
}
if conf, err = this.configure.getburiedcondidata(v); err != nil { if conf, err = this.configure.getburiedcondidata(v); err != nil {
return return
} }
@ -280,6 +289,9 @@ func (this *Buried) FinishConditionAndCheck(uid string, finishcondiIds []int32,
} }
for _, v := range condiIds { for _, v := range condiIds {
if v == 0 {
continue
}
if conf, err = this.configure.getburiedcondidata(v); err != nil { if conf, err = this.configure.getburiedcondidata(v); err != nil {
return return
} }
@ -341,7 +353,7 @@ func (this *Buried) FinishConditionAndCheck(uid string, finishcondiIds []int32,
return return
} }
//触发埋点 // 触发埋点
func (this *Buried) TriggerBuried(uid string, burieds ...*pb.BuriedParam) { func (this *Buried) TriggerBuried(uid string, burieds ...*pb.BuriedParam) {
if db.IsCross() { if db.IsCross() {
@ -494,7 +506,7 @@ func (this *Buried) trigger(uid string, burieds ...*pb.BuriedParam) {
} }
} }
//更新并校验完成 // 更新并校验完成
func (this *Buried) updateAndCheckBuried(bconf *cfg.GameBuriedTypeData, bdata *pb.DBBuriedItem, collec *pb.BuriedParam, cond *cfg.GameBuriedCondiData, autoActivated bool) (chanage bool, bitem *pb.DBBuriedConItem, err error) { func (this *Buried) updateAndCheckBuried(bconf *cfg.GameBuriedTypeData, bdata *pb.DBBuriedItem, collec *pb.BuriedParam, cond *cfg.GameBuriedCondiData, autoActivated bool) (chanage bool, bitem *pb.DBBuriedConItem, err error) {
var ( var (
ok bool ok bool
@ -598,7 +610,7 @@ func (this *Buried) updateAndCheckBuried(bconf *cfg.GameBuriedTypeData, bdata *p
return return
} }
//判断埋点数据的有效性 // 判断埋点数据的有效性
func (this *Buried) checkburied(buried *pb.BuriedParam, bconf *cfg.GameBuriedTypeData, conf *cfg.GameBuriedCondiData) (efficient bool) { func (this *Buried) checkburied(buried *pb.BuriedParam, bconf *cfg.GameBuriedTypeData, conf *cfg.GameBuriedCondiData) (efficient bool) {
if !(len(buried.Filter) == len(conf.Filter) && len(bconf.Filter) == len(conf.Filter)) { if !(len(buried.Filter) == len(conf.Filter) && len(bconf.Filter) == len(conf.Filter)) {
this.Error("校验埋点错误!", log.Field{Key: "buried", Value: buried}, log.Field{Key: "conf", Value: conf}) this.Error("校验埋点错误!", log.Field{Key: "buried", Value: buried}, log.Field{Key: "conf", Value: conf})

9
modules/equipment/api_equip.go
View File

@ -8,7 +8,7 @@ import (
"go_dreamfactory/utils" "go_dreamfactory/utils"
) )
//参数校验 // 参数校验
func (this *apiComp) EquipCheck(session comm.IUserSession, req *pb.EquipmentEquipReq) (errdata *pb.ErrorData) { func (this *apiComp) EquipCheck(session comm.IUserSession, req *pb.EquipmentEquipReq) (errdata *pb.ErrorData) {
if len(req.EquipmentId) != 8 || req.HeroCardId == "" { if len(req.EquipmentId) != 8 || req.HeroCardId == "" {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
@ -19,7 +19,7 @@ func (this *apiComp) EquipCheck(session comm.IUserSession, req *pb.EquipmentEqui
return return
} }
///英雄挂在装备 code 错误码信息 data 错误附加数据 // /英雄挂在装备 code 错误码信息 data 错误附加数据
func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) (errdata *pb.ErrorData) { func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) (errdata *pb.ErrorData) {
var ( var (
err error err error
@ -94,8 +94,9 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
} }
suit = nil suit = nil
for _, suit = range suits { for _, _suit := range suits {
if suit.Suitid == confs[i].Suittype && !suit.Effect { //找到一个未生效的套装 if _suit.Suitid == confs[i].Suittype && !_suit.Effect { //找到一个未生效的套装
suit = _suit
break break
} }
} }

9
modules/equipment/api_upgrade.go
View File

@ -12,7 +12,7 @@ import (
"go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/bson/primitive"
) )
//参数校验 // 参数校验
func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.EquipmentUpgradeReq) (errdata *pb.ErrorData) { func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.EquipmentUpgradeReq) (errdata *pb.ErrorData) {
if req.EquipmentId == "" { if req.EquipmentId == "" {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
@ -24,7 +24,7 @@ func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.EquipmentUp
return return
} }
///英雄挂在装备 // /英雄挂在装备
func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgradeReq) (errdata *pb.ErrorData) { func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgradeReq) (errdata *pb.ErrorData) {
var ( var (
err error err error
@ -229,8 +229,9 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade
} }
} }
suit = nil suit = nil
for _, suit = range suits { for _, _suit := range suits {
if suit.Suitid == confs[i].Suittype && !suit.Effect { //找到一个未生效的套装 if _suit.Suitid == confs[i].Suittype && !_suit.Effect { //找到一个未生效的套装
suit = _suit
break break
} }
} }

2
modules/library/api_activationfetter.go
View File

@ -39,7 +39,7 @@ func (this *apiComp) ActivationFetter(session comm.IUserSession, req *pb.Library
return return
} }
// 检查是否有这几个英雄 // 检查是否有这几个英雄
c, _ := this.configure.GetFriendData(fetter.Fid, 1) c, _ := this.module.configure.GetFriendData(fetter.Fid, 1)
if len(fetter.Herofetter) != len(c) { if len(fetter.Herofetter) != len(c) {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_LibraryNoData, Code: pb.ErrorCode_LibraryNoData,

19
modules/library/module.go
View File

@ -96,10 +96,12 @@ func (this *Library) GetLibraryListByHid(uid string, hid string) *pb.DBLibrary {
// //
func (this *Library) CheckFetter(uid string, hid string) (dbLibrary []*pb.DBLibrary, fetter []*pb.DBHeroFetter) { func (this *Library) CheckFetter(uid string, hid string) (dbLibrary []*pb.DBLibrary, fetter []*pb.DBHeroFetter) {
var (
oid *pb.DBHeroFetter
)
oid = this.CheckHeroFetter(uid, hid) // 校验羁绊数据
szFid := this.configure.GetHeroFetterID(hid) szFid := this.configure.GetHeroFetterID(hid)
for fid := range szFid { for fid := range szFid {
if list := this.GetLibraryListByFid(uid, fid); list == nil { // 没有这条羁绊数据 if list := this.GetLibraryListByFid(uid, fid); list == nil { // 没有这条羁绊数据
tmp := &pb.DBLibrary{ // 创建一条羁绊数据 tmp := &pb.DBLibrary{ // 创建一条羁绊数据
Id: primitive.NewObjectID().Hex(), Id: primitive.NewObjectID().Hex(),
@ -109,9 +111,9 @@ func (this *Library) CheckFetter(uid string, hid string) (dbLibrary []*pb.DBLibr
Prize: map[int32]int32{}, Prize: map[int32]int32{},
} }
if _d := this.CheckHeroFetter(uid, hid); _d != nil { // check DBHeroFetter if oid != nil { // check DBHeroFetter
tmp.Herofetter[hid] = _d.Id tmp.Herofetter[hid] = oid.Id
fetter = append(fetter, _d) fetter = append(fetter, oid)
} }
if err := this.modelLibrary.createLibrary(uid, tmp); err != nil { if err := this.modelLibrary.createLibrary(uid, tmp); err != nil {
@ -120,11 +122,10 @@ func (this *Library) CheckFetter(uid string, hid string) (dbLibrary []*pb.DBLibr
} }
dbLibrary = append(dbLibrary, tmp) dbLibrary = append(dbLibrary, tmp)
} else { // 有这条羁绊数据 } else { // 有这条羁绊数据
if _, ok := list.Herofetter[hid]; !ok { if _, ok := list.Herofetter[hid]; !ok {
if _d := this.CheckHeroFetter(uid, hid); _d != nil { if oid != nil {
list.Herofetter[hid] = _d.Id list.Herofetter[hid] = oid.Id
fetter = append(fetter, _d) fetter = append(fetter, oid)
} }
mapData := make(map[string]interface{}, 0) mapData := make(map[string]interface{}, 0)
mapData["herofetter"] = list.Herofetter mapData["herofetter"] = list.Herofetter

13
modules/mline/module.go
View File

@ -53,9 +53,9 @@ func (this *Mline) Start() (err error) {
func (this *Mline) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (reddot map[comm.ReddotType]*pb.ReddotItem) { func (this *Mline) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (reddot map[comm.ReddotType]*pb.ReddotItem) {
reddot = make(map[comm.ReddotType]*pb.ReddotItem) reddot = make(map[comm.ReddotType]*pb.ReddotItem)
for _, v := range rid { for _, v := range rid {
if v == comm.Reddot24100 { if v == comm.Reddot24101 {
reddot[comm.Reddot24100] = &pb.ReddotItem{ reddot[comm.Reddot24101] = &pb.ReddotItem{
Rid: int32(comm.Reddot24100), Rid: int32(comm.Reddot24101),
Activated: this.CheckPoint(session.GetUserId()), Activated: this.CheckPoint(session.GetUserId()),
} }
break break
@ -75,8 +75,15 @@ func (this *Mline) CheckPoint(uid string) bool {
if mLineConf == nil { if mLineConf == nil {
return false return false
} }
var maxstar int32
for _, v1 := range v.Star {
maxstar += v1
}
awardConf := this.configure.GetMainStarRewardConf(mLineConf.Starreward) awardConf := this.configure.GetMainStarRewardConf(mLineConf.Starreward)
for _, v1 := range awardConf { for _, v1 := range awardConf {
if v1.Starnum > maxstar {
break
}
if _, ok := v.Award[v1.Starnum]; !ok { // 找到没有领奖的数据 if _, ok := v.Award[v1.Starnum]; !ok { // 找到没有领奖的数据
return true return true
} }

2
modules/reddot/api_get.go
View File

@ -28,7 +28,7 @@ func (this *apiComp) Get(session comm.IUserSession, req *pb.ReddotGetReq) (errda
reddot[int32(k)] = v reddot[int32(k)] = v
} }
//主线 //主线
case comm.Reddot24100: case comm.Reddot24101:
for k, v := range this.module.mline.Reddot(session, _rid) { for k, v := range this.module.mline.Reddot(session, _rid) {
reddot[int32(k)] = v reddot[int32(k)] = v
} }

2
modules/reddot/api_getall.go
View File

@ -29,7 +29,7 @@ func (this *apiComp) GetAll(session comm.IUserSession, req *pb.ReddotGetAllReq)
reddot[int32(k)] = v reddot[int32(k)] = v
} }
//主线 //主线
for k, v := range this.module.mline.Reddot(session, comm.Reddot24100) { for k, v := range this.module.mline.Reddot(session, comm.Reddot24101) {
reddot[int32(k)] = v reddot[int32(k)] = v
} }
//铁匠铺 //铁匠铺

110
pb/activity_db.pb.go
View File

@ -143,21 +143,22 @@ type DBHuodong struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Hdid int32 `protobuf:"varint,1,opt,name=hdid,proto3" json:"hdid"` // 活动ID Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
Showtime string `protobuf:"bytes,2,opt,name=showtime,proto3" json:"showtime"` // 客户端显示的时间 Hdid int32 `protobuf:"varint,2,opt,name=hdid,proto3" json:"hdid"` // 活动ID
Stime int64 `protobuf:"varint,3,opt,name=stime,proto3" json:"stime"` // 开始时间 Showtime string `protobuf:"bytes,3,opt,name=showtime,proto3" json:"showtime"` // 客户端显示的时间
Etime int64 `protobuf:"varint,4,opt,name=etime,proto3" json:"etime"` // 结束时间 Stime int64 `protobuf:"varint,4,opt,name=stime,proto3" json:"stime"` // 开始时间
Rtime int64 `protobuf:"varint,5,opt,name=rtime,proto3" json:"rtime"` // 刷新时间 Etime int64 `protobuf:"varint,5,opt,name=etime,proto3" json:"etime"` // 结束时间
Ttype int32 `protobuf:"varint,6,opt,name=ttype,proto3" json:"ttype"` Rtime int64 `protobuf:"varint,6,opt,name=rtime,proto3" json:"rtime"` // 刷新时间
Name string `protobuf:"bytes,7,opt,name=name,proto3" json:"name"` // 活动名称 Ttype int32 `protobuf:"varint,7,opt,name=ttype,proto3" json:"ttype"`
Htype int32 `protobuf:"varint,8,opt,name=htype,proto3" json:"htype"` // 活动类型 自定义 Name string `protobuf:"bytes,8,opt,name=name,proto3" json:"name"` // 活动名称
Stype int32 `protobuf:"varint,9,opt,name=stype,proto3" json:"stype"` Htype int32 `protobuf:"varint,9,opt,name=htype,proto3" json:"htype"` // 活动类型 自定义
Itype int32 `protobuf:"varint,10,opt,name=itype,proto3" json:"itype"` Stype int32 `protobuf:"varint,10,opt,name=stype,proto3" json:"stype"`
Intr string `protobuf:"bytes,11,opt,name=intr,proto3" json:"intr"` // 活动说明 Itype int32 `protobuf:"varint,11,opt,name=itype,proto3" json:"itype"`
Img string `protobuf:"bytes,12,opt,name=img,proto3" json:"img"` // Intr string `protobuf:"bytes,12,opt,name=intr,proto3" json:"intr"` // 活动说明
Icon string `protobuf:"bytes,13,opt,name=icon,proto3" json:"icon"` Img string `protobuf:"bytes,13,opt,name=img,proto3" json:"img"` //
Showtype int32 `protobuf:"varint,14,opt,name=showtype,proto3" json:"showtype"` // 显示类型 Icon string `protobuf:"bytes,14,opt,name=icon,proto3" json:"icon"`
Data *ActivityInfo `protobuf:"bytes,15,opt,name=data,proto3" json:"data"` // 活动详细数据 Showtype int32 `protobuf:"varint,15,opt,name=showtype,proto3" json:"showtype"` // 显示类型
Data *ActivityInfo `protobuf:"bytes,16,opt,name=data,proto3" json:"data"` // 活动详细数据
} }
func (x *DBHuodong) Reset() { func (x *DBHuodong) Reset() {
@ -192,6 +193,13 @@ func (*DBHuodong) Descriptor() ([]byte, []int) {
return file_activity_activity_db_proto_rawDescGZIP(), []int{2} return file_activity_activity_db_proto_rawDescGZIP(), []int{2}
} }
func (x *DBHuodong) GetId() string {
if x != nil {
return x.Id
}
return ""
}
func (x *DBHuodong) GetHdid() int32 { func (x *DBHuodong) GetHdid() int32 {
if x != nil { if x != nil {
return x.Hdid return x.Hdid
@ -303,11 +311,12 @@ type DBActivityData struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
Hid int32 `protobuf:"varint,2,opt,name=hid,proto3" json:"hid"` Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`
Gotarr []int32 `protobuf:"varint,3,rep,packed,name=gotarr,proto3" json:"gotarr"` Hid int32 `protobuf:"varint,3,opt,name=hid,proto3" json:"hid"`
Lasttime int64 `protobuf:"varint,4,opt,name=lasttime,proto3" json:"lasttime"` Gotarr []int32 `protobuf:"varint,4,rep,packed,name=gotarr,proto3" json:"gotarr"`
Val int32 `protobuf:"varint,5,opt,name=val,proto3" json:"val"` Lasttime int64 `protobuf:"varint,5,opt,name=lasttime,proto3" json:"lasttime"`
Val int32 `protobuf:"varint,6,opt,name=val,proto3" json:"val"`
} }
func (x *DBActivityData) Reset() { func (x *DBActivityData) Reset() {
@ -342,6 +351,13 @@ func (*DBActivityData) Descriptor() ([]byte, []int) {
return file_activity_activity_db_proto_rawDescGZIP(), []int{3} return file_activity_activity_db_proto_rawDescGZIP(), []int{3}
} }
func (x *DBActivityData) GetId() string {
if x != nil {
return x.Id
}
return ""
}
func (x *DBActivityData) GetUid() string { func (x *DBActivityData) GetUid() string {
if x != nil { if x != nil {
return x.Uid return x.Uid
@ -390,38 +406,40 @@ var file_activity_activity_db_proto_rawDesc = []byte{
0x61, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x04, 0x2e, 0x41, 0x72, 0x72, 0x52, 0x61, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x04, 0x2e, 0x41, 0x72, 0x72, 0x52,
0x03, 0x61, 0x72, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x74, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x61, 0x72, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x74, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28,
0x09, 0x52, 0x03, 0x62, 0x74, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x68, 0x6f, 0x77, 0x18, 0x03, 0x09, 0x52, 0x03, 0x62, 0x74, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x68, 0x6f, 0x77, 0x18, 0x03,
0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x68, 0x6f, 0x77, 0x22, 0xe2, 0x02, 0x0a, 0x09, 0x44, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x68, 0x6f, 0x77, 0x22, 0xf2, 0x02, 0x0a, 0x09, 0x44,
0x42, 0x48, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x64, 0x69, 0x64, 0x42, 0x48, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x64, 0x69, 0x64,
0x73, 0x68, 0x6f, 0x77, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08,
0x73, 0x68, 0x6f, 0x77, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
0x73, 0x68, 0x6f, 0x77, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x69, 0x6d, 0x73, 0x68, 0x6f, 0x77, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x69, 0x6d,
0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14,
0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65,
0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20,
0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x74, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x74,
0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x74, 0x79, 0x70, 0x65, 0x79, 0x70, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x74, 0x79, 0x70, 0x65,
0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x68, 0x74, 0x79, 0x70, 0x65, 0x18, 0x08, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x68, 0x74, 0x79, 0x70, 0x65, 0x18, 0x09, 0x20,
0x01, 0x28, 0x05, 0x52, 0x05, 0x68, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x01, 0x28, 0x05, 0x52, 0x05, 0x68, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74,
0x79, 0x70, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x79, 0x70, 0x65, 0x79, 0x70, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x79, 0x70, 0x65,
0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52,
0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x6e, 0x74, 0x72, 0x18, 0x0b, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x6e, 0x74, 0x72, 0x18, 0x0c,
0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x6e, 0x74, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x69, 0x6d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x6e, 0x74, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x69, 0x6d,
0x67, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x69, 0x6d, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x69, 0x6d, 0x67, 0x12, 0x12, 0x0a, 0x04,
0x69, 0x63, 0x6f, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x69, 0x63, 0x6f, 0x6e, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e,
0x12, 0x1a, 0x0a, 0x08, 0x73, 0x68, 0x6f, 0x77, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x68, 0x6f, 0x77, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0f, 0x20, 0x01,
0x28, 0x05, 0x52, 0x08, 0x73, 0x68, 0x6f, 0x77, 0x74, 0x79, 0x70, 0x65, 0x12, 0x21, 0x0a, 0x04, 0x28, 0x05, 0x52, 0x08, 0x73, 0x68, 0x6f, 0x77, 0x74, 0x79, 0x70, 0x65, 0x12, 0x21, 0x0a, 0x04,
0x64, 0x61, 0x74, 0x61, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x41, 0x63, 0x74, 0x64, 0x61, 0x74, 0x61, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x41, 0x63, 0x74,
0x69, 0x76, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x69, 0x76, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22,
0x7a, 0x0a, 0x0e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x44, 0x61, 0x74, 0x8a, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x44, 0x61,
0x61, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x68, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
0x52, 0x03, 0x68, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x18, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x68, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x12, 0x1a, 0x0a, 0x05, 0x52, 0x03, 0x68, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72,
0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x12, 0x1a,
0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x61, 0x6c, 0x0a, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03,
0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x52, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x61,
0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x42, 0x06, 0x5a, 0x04,
0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (

320
pb/activity_msg.pb.go Normal file
View File

@ -0,0 +1,320 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.0
// protoc v3.20.0
// source: activity/activity_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 ActivityGetListReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
}
func (x *ActivityGetListReq) Reset() {
*x = ActivityGetListReq{}
if protoimpl.UnsafeEnabled {
mi := &file_activity_activity_msg_proto_msgTypes[0]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *ActivityGetListReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ActivityGetListReq) ProtoMessage() {}
func (x *ActivityGetListReq) ProtoReflect() protoreflect.Message {
mi := &file_activity_activity_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 ActivityGetListReq.ProtoReflect.Descriptor instead.
func (*ActivityGetListReq) Descriptor() ([]byte, []int) {
return file_activity_activity_msg_proto_rawDescGZIP(), []int{0}
}
// 获取活动列表
type ActivityGetListResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Data []*DBHuodong `protobuf:"bytes,1,rep,name=data,proto3" json:"data"`
}
func (x *ActivityGetListResp) Reset() {
*x = ActivityGetListResp{}
if protoimpl.UnsafeEnabled {
mi := &file_activity_activity_msg_proto_msgTypes[1]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *ActivityGetListResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ActivityGetListResp) ProtoMessage() {}
func (x *ActivityGetListResp) ProtoReflect() protoreflect.Message {
mi := &file_activity_activity_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 ActivityGetListResp.ProtoReflect.Descriptor instead.
func (*ActivityGetListResp) Descriptor() ([]byte, []int) {
return file_activity_activity_msg_proto_rawDescGZIP(), []int{1}
}
func (x *ActivityGetListResp) GetData() []*DBHuodong {
if x != nil {
return x.Data
}
return nil
}
type ActivityGetHdDataReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
}
func (x *ActivityGetHdDataReq) Reset() {
*x = ActivityGetHdDataReq{}
if protoimpl.UnsafeEnabled {
mi := &file_activity_activity_msg_proto_msgTypes[2]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *ActivityGetHdDataReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ActivityGetHdDataReq) ProtoMessage() {}
func (x *ActivityGetHdDataReq) ProtoReflect() protoreflect.Message {
mi := &file_activity_activity_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 ActivityGetHdDataReq.ProtoReflect.Descriptor instead.
func (*ActivityGetHdDataReq) Descriptor() ([]byte, []int) {
return file_activity_activity_msg_proto_rawDescGZIP(), []int{2}
}
// 获取活动数据列表
type ActivityGetHdDataResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Data []*DBActivityData `protobuf:"bytes,1,rep,name=data,proto3" json:"data"`
}
func (x *ActivityGetHdDataResp) Reset() {
*x = ActivityGetHdDataResp{}
if protoimpl.UnsafeEnabled {
mi := &file_activity_activity_msg_proto_msgTypes[3]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *ActivityGetHdDataResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ActivityGetHdDataResp) ProtoMessage() {}
func (x *ActivityGetHdDataResp) ProtoReflect() protoreflect.Message {
mi := &file_activity_activity_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 ActivityGetHdDataResp.ProtoReflect.Descriptor instead.
func (*ActivityGetHdDataResp) Descriptor() ([]byte, []int) {
return file_activity_activity_msg_proto_rawDescGZIP(), []int{3}
}
func (x *ActivityGetHdDataResp) GetData() []*DBActivityData {
if x != nil {
return x.Data
}
return nil
}
var File_activity_activity_msg_proto protoreflect.FileDescriptor
var file_activity_activity_msg_proto_rawDesc = []byte{
0x0a, 0x1b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x76,
0x69, 0x74, 0x79, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1a, 0x61,
0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79,
0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x14, 0x0a, 0x12, 0x41, 0x63, 0x74,
0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22,
0x35, 0x0a, 0x13, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69,
0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67,
0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x16, 0x0a, 0x14, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69,
0x74, 0x79, 0x47, 0x65, 0x74, 0x48, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x22, 0x3c,
0x0a, 0x15, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x65, 0x74, 0x48, 0x64, 0x44,
0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 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 (
file_activity_activity_msg_proto_rawDescOnce sync.Once
file_activity_activity_msg_proto_rawDescData = file_activity_activity_msg_proto_rawDesc
)
func file_activity_activity_msg_proto_rawDescGZIP() []byte {
file_activity_activity_msg_proto_rawDescOnce.Do(func() {
file_activity_activity_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_activity_activity_msg_proto_rawDescData)
})
return file_activity_activity_msg_proto_rawDescData
}
var file_activity_activity_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
var file_activity_activity_msg_proto_goTypes = []interface{}{
(*ActivityGetListReq)(nil), // 0: ActivityGetListReq
(*ActivityGetListResp)(nil), // 1: ActivityGetListResp
(*ActivityGetHdDataReq)(nil), // 2: ActivityGetHdDataReq
(*ActivityGetHdDataResp)(nil), // 3: ActivityGetHdDataResp
(*DBHuodong)(nil), // 4: DBHuodong
(*DBActivityData)(nil), // 5: DBActivityData
}
var file_activity_activity_msg_proto_depIdxs = []int32{
4, // 0: ActivityGetListResp.data:type_name -> DBHuodong
5, // 1: ActivityGetHdDataResp.data:type_name -> DBActivityData
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_activity_activity_msg_proto_init() }
func file_activity_activity_msg_proto_init() {
if File_activity_activity_msg_proto != nil {
return
}
file_activity_activity_db_proto_init()
if !protoimpl.UnsafeEnabled {
file_activity_activity_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*ActivityGetListReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_activity_activity_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*ActivityGetListResp); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_activity_activity_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*ActivityGetHdDataReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_activity_activity_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*ActivityGetHdDataResp); 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_activity_activity_msg_proto_rawDesc,
NumEnums: 0,
NumMessages: 4,
NumExtensions: 0,
NumServices: 0,
},
GoTypes: file_activity_activity_msg_proto_goTypes,
DependencyIndexes: file_activity_activity_msg_proto_depIdxs,
MessageInfos: file_activity_activity_msg_proto_msgTypes,
}.Build()
File_activity_activity_msg_proto = out.File
file_activity_activity_msg_proto_rawDesc = nil
file_activity_activity_msg_proto_goTypes = nil
file_activity_activity_msg_proto_depIdxs = nil
}

2
pb/buried_db.pb.go
View File

@ -271,7 +271,7 @@ type DBBuried struct {
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //唯一ID Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //唯一ID
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID
Items map[int32]*DBBuriedItem `protobuf:"bytes,4,rep,name=items,proto3" json:"items" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"burieds"` //埋点数据 key条件id Items map[int32]*DBBuriedItem `protobuf:"bytes,4,rep,name=items,proto3" json:"items" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //埋点数据 key条件id
} }
func (x *DBBuried) Reset() { func (x *DBBuried) Reset() {

55
pb/notify_db.pb.go
View File

@ -20,6 +20,50 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
) )
//通知
type NotifyEvent int32
const (
NotifyEvent_Notify_1001 NotifyEvent = 0
)
// Enum value maps for NotifyEvent.
var (
NotifyEvent_name = map[int32]string{
0: "Notify_1001",
}
NotifyEvent_value = map[string]int32{
"Notify_1001": 0,
}
)
func (x NotifyEvent) Enum() *NotifyEvent {
p := new(NotifyEvent)
*p = x
return p
}
func (x NotifyEvent) String() string {
return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
}
func (NotifyEvent) Descriptor() protoreflect.EnumDescriptor {
return file_notify_notify_db_proto_enumTypes[0].Descriptor()
}
func (NotifyEvent) Type() protoreflect.EnumType {
return &file_notify_notify_db_proto_enumTypes[0]
}
func (x NotifyEvent) Number() protoreflect.EnumNumber {
return protoreflect.EnumNumber(x)
}
// Deprecated: Use NotifyEvent.Descriptor instead.
func (NotifyEvent) EnumDescriptor() ([]byte, []int) {
return file_notify_notify_db_proto_rawDescGZIP(), []int{0}
}
//系统公告数据结构 //系统公告数据结构
type DBSystemNotify struct { type DBSystemNotify struct {
state protoimpl.MessageState state protoimpl.MessageState
@ -121,7 +165,9 @@ var file_notify_notify_db_proto_rawDesc = []byte{
0x73, 0x74, 0x6f, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x74, 0x6f, 0x73, 0x74, 0x6f, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x74, 0x6f,
0x70, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03,
0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65,
0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x2a, 0x1e, 0x0a,
0x0b, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x0f, 0x0a, 0x0b,
0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x5f, 0x31, 0x30, 0x30, 0x31, 0x10, 0x00, 0x42, 0x06, 0x5a,
0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
@ -137,9 +183,11 @@ func file_notify_notify_db_proto_rawDescGZIP() []byte {
return file_notify_notify_db_proto_rawDescData return file_notify_notify_db_proto_rawDescData
} }
var file_notify_notify_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_notify_notify_db_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_notify_notify_db_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
var file_notify_notify_db_proto_goTypes = []interface{}{ var file_notify_notify_db_proto_goTypes = []interface{}{
(*DBSystemNotify)(nil), // 0: DBSystemNotify (NotifyEvent)(0), // 0: NotifyEvent
(*DBSystemNotify)(nil), // 1: DBSystemNotify
} }
var file_notify_notify_db_proto_depIdxs = []int32{ var file_notify_notify_db_proto_depIdxs = []int32{
0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method output_type
@ -173,13 +221,14 @@ func file_notify_notify_db_proto_init() {
File: protoimpl.DescBuilder{ File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(), GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_notify_notify_db_proto_rawDesc, RawDescriptor: file_notify_notify_db_proto_rawDesc,
NumEnums: 0, NumEnums: 1,
NumMessages: 1, NumMessages: 1,
NumExtensions: 0, NumExtensions: 0,
NumServices: 0, NumServices: 0,
}, },
GoTypes: file_notify_notify_db_proto_goTypes, GoTypes: file_notify_notify_db_proto_goTypes,
DependencyIndexes: file_notify_notify_db_proto_depIdxs, DependencyIndexes: file_notify_notify_db_proto_depIdxs,
EnumInfos: file_notify_notify_db_proto_enumTypes,
MessageInfos: file_notify_notify_db_proto_msgTypes, MessageInfos: file_notify_notify_db_proto_msgTypes,
}.Build() }.Build()
File_notify_notify_db_proto = out.File File_notify_notify_db_proto = out.File

77
pb/notify_msg.pb.go
View File

@ -205,6 +205,45 @@ func (x *NotifyGetListResp) GetSysNotify() []*DBSystemNotify {
return nil return nil
} }
//通知事件推送
type NotifyEventPush struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
}
func (x *NotifyEventPush) Reset() {
*x = NotifyEventPush{}
if protoimpl.UnsafeEnabled {
mi := &file_notify_notify_msg_proto_msgTypes[3]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *NotifyEventPush) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*NotifyEventPush) ProtoMessage() {}
func (x *NotifyEventPush) ProtoReflect() protoreflect.Message {
mi := &file_notify_notify_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 NotifyEventPush.ProtoReflect.Descriptor instead.
func (*NotifyEventPush) Descriptor() ([]byte, []int) {
return file_notify_notify_msg_proto_rawDescGZIP(), []int{3}
}
var File_notify_notify_msg_proto protoreflect.FileDescriptor var File_notify_notify_msg_proto protoreflect.FileDescriptor
var file_notify_notify_msg_proto_rawDesc = []byte{ var file_notify_notify_msg_proto_rawDesc = []byte{
@ -235,8 +274,9 @@ var file_notify_notify_msg_proto_rawDesc = []byte{
0x52, 0x0c, 0x4c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x61, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x2d, 0x52, 0x0c, 0x4c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x61, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x2d,
0x0a, 0x09, 0x53, 0x79, 0x73, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0a, 0x09, 0x53, 0x79, 0x73, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28,
0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x4e, 0x6f, 0x74, 0x69, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x4e, 0x6f, 0x74, 0x69,
0x66, 0x79, 0x52, 0x09, 0x53, 0x79, 0x73, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x42, 0x06, 0x5a, 0x66, 0x79, 0x52, 0x09, 0x53, 0x79, 0x73, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x22, 0x11, 0x0a,
0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x0f, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x50, 0x75, 0x73, 0x68,
0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -251,21 +291,22 @@ func file_notify_notify_msg_proto_rawDescGZIP() []byte {
return file_notify_notify_msg_proto_rawDescData return file_notify_notify_msg_proto_rawDescData
} }
var file_notify_notify_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 3) var file_notify_notify_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
var file_notify_notify_msg_proto_goTypes = []interface{}{ var file_notify_notify_msg_proto_goTypes = []interface{}{
(*NotifyErrorNotifyPush)(nil), // 0: NotifyErrorNotifyPush (*NotifyErrorNotifyPush)(nil), // 0: NotifyErrorNotifyPush
(*NotifyGetListReq)(nil), // 1: NotifyGetListReq (*NotifyGetListReq)(nil), // 1: NotifyGetListReq
(*NotifyGetListResp)(nil), // 2: NotifyGetListResp (*NotifyGetListResp)(nil), // 2: NotifyGetListResp
(ErrorCode)(0), // 3: ErrorCode (*NotifyEventPush)(nil), // 3: NotifyEventPush
(*anypb.Any)(nil), // 4: google.protobuf.Any (ErrorCode)(0), // 4: ErrorCode
(*ErrorData)(nil), // 5: ErrorData (*anypb.Any)(nil), // 5: google.protobuf.Any
(*DBSystemNotify)(nil), // 6: DBSystemNotify (*ErrorData)(nil), // 6: ErrorData
(*DBSystemNotify)(nil), // 7: DBSystemNotify
} }
var file_notify_notify_msg_proto_depIdxs = []int32{ var file_notify_notify_msg_proto_depIdxs = []int32{
3, // 0: NotifyErrorNotifyPush.Code:type_name -> ErrorCode 4, // 0: NotifyErrorNotifyPush.Code:type_name -> ErrorCode
4, // 1: NotifyErrorNotifyPush.arg:type_name -> google.protobuf.Any 5, // 1: NotifyErrorNotifyPush.arg:type_name -> google.protobuf.Any
5, // 2: NotifyErrorNotifyPush.err:type_name -> ErrorData 6, // 2: NotifyErrorNotifyPush.err:type_name -> ErrorData
6, // 3: NotifyGetListResp.SysNotify:type_name -> DBSystemNotify 7, // 3: NotifyGetListResp.SysNotify:type_name -> DBSystemNotify
4, // [4:4] is the sub-list for method output_type 4, // [4:4] is the sub-list for method output_type
4, // [4:4] is the sub-list for method input_type 4, // [4:4] is the sub-list for method input_type
4, // [4:4] is the sub-list for extension type_name 4, // [4:4] is the sub-list for extension type_name
@ -318,6 +359,18 @@ func file_notify_notify_msg_proto_init() {
return nil return nil
} }
} }
file_notify_notify_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*NotifyEventPush); 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{
@ -325,7 +378,7 @@ func file_notify_notify_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(), GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_notify_notify_msg_proto_rawDesc, RawDescriptor: file_notify_notify_msg_proto_rawDesc,
NumEnums: 0, NumEnums: 0,
NumMessages: 3, NumMessages: 4,
NumExtensions: 0, NumExtensions: 0,
NumServices: 0, NumServices: 0,
}, },

2
sys/configure/structs/Game.HuntingOpenTimeData.go
View File

@ -18,6 +18,7 @@ type GameHuntingOpenTimeData struct {
Opentimetext string Opentimetext string
Bg string Bg string
Icon string Icon string
BossIcon string
} }
const TypeId_GameHuntingOpenTimeData = 1854578068 const TypeId_GameHuntingOpenTimeData = 1854578068
@ -47,6 +48,7 @@ func (_v *GameHuntingOpenTimeData)Deserialize(_buf map[string]interface{}) (err
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["opentimetext"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Opentimetext error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Opentimetext, _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["opentimetext"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Opentimetext error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Opentimetext, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; if _v.Bg, _ok_ = _buf["bg"].(string); !_ok_ { err = errors.New("bg error"); return } } { var _ok_ bool; if _v.Bg, _ok_ = _buf["bg"].(string); !_ok_ { err = errors.New("bg error"); return } }
{ var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
{ var _ok_ bool; if _v.BossIcon, _ok_ = _buf["bossIcon"].(string); !_ok_ { err = errors.New("bossIcon error"); return } }
return return
} }

2
sys/configure/structs/Game.VikingBossSkillData.go
View File

@ -18,6 +18,7 @@ type GameVikingBossSkillData struct {
Introduce string Introduce string
Icon string Icon string
Guardskill []int32 Guardskill []int32
BossIcon string
} }
const TypeId_GameVikingBossSkillData = -1331434488 const TypeId_GameVikingBossSkillData = -1331434488
@ -47,6 +48,7 @@ func (_v *GameVikingBossSkillData)Deserialize(_buf map[string]interface{}) (err
} }
} }
{ var _ok_ bool; if _v.BossIcon, _ok_ = _buf["bossIcon"].(string); !_ok_ { err = errors.New("bossIcon error"); return } }
return return
} }