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-05-08 18:20:53 +08:00
commit bb3398e78e
29 changed files with 1430 additions and 1209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/json/game_battleready.json
View File

@ -35,7 +35,7 @@
"id": 102, "id": 102,
"PlayType": "MainLine", "PlayType": "MainLine",
"HeroCount": 5, "HeroCount": 5,
"readyScene": "scenesfight_role_interface_02", "readyScene": "scenesfight_role_interface_03",
"battleScenes": [ "battleScenes": [
"scenesfight_05_01" "scenesfight_05_01"
], ],
@ -291,7 +291,7 @@
"id": 118, "id": 118,
"PlayType": "test", "PlayType": "test",
"HeroCount": 5, "HeroCount": 5,
"readyScene": "scenesfight_role_interface_02", "readyScene": "scenesfight_role_interface_03",
"battleScenes": [ "battleScenes": [
"scenesfight_05_01" "scenesfight_05_01"
], ],

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": 125, "tasktime": 138,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -56,7 +56,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 141, "tasktime": 170,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -104,7 +104,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 110, "tasktime": 170,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -152,7 +152,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 176, "tasktime": 117,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -200,7 +200,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 66, "tasktime": 120,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -248,7 +248,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 129, "tasktime": 141,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -296,7 +296,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 64, "tasktime": 138,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -344,7 +344,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 136, "tasktime": 148,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -392,7 +392,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 126, "tasktime": 104,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -440,7 +440,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 164, "tasktime": 91,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -488,7 +488,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 145, "tasktime": 90,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -536,7 +536,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 116, "tasktime": 135,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -584,7 +584,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 153, "tasktime": 103,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -632,7 +632,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 89, "tasktime": 114,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -680,7 +680,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 120, "tasktime": 180,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -728,7 +728,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 87, "tasktime": 132,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -776,7 +776,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 99, "tasktime": 122,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -824,7 +824,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 77, "tasktime": 177,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -872,7 +872,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 80, "tasktime": 163,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -920,7 +920,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 92, "tasktime": 136,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -968,7 +968,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 75, "tasktime": 147,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -1016,7 +1016,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 91, "tasktime": 140,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -1064,7 +1064,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 74, "tasktime": 139,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -1112,7 +1112,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 93, "tasktime": 110,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -1208,7 +1208,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 132, "tasktime": 122,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -1256,7 +1256,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 74, "tasktime": 105,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -1304,7 +1304,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 63, "tasktime": 176,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -1352,7 +1352,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 118, "tasktime": 65,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -1400,7 +1400,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 83, "tasktime": 142,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -1448,7 +1448,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 164, "tasktime": 117,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -1496,7 +1496,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 139, "tasktime": 61,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -1544,7 +1544,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 107, "tasktime": 63,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -1592,7 +1592,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 160, "tasktime": 95,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -1640,7 +1640,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 73, "tasktime": 151,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -1688,7 +1688,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 111, "tasktime": 145,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -1736,7 +1736,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 154, "tasktime": 135,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -1784,7 +1784,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 150, "tasktime": 157,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -1832,7 +1832,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 134, "tasktime": 114,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -1880,7 +1880,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 150, "tasktime": 82,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -1928,7 +1928,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 99, "tasktime": 150,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -1976,7 +1976,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 72, "tasktime": 80,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -2024,7 +2024,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 106, "tasktime": 92,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -2072,7 +2072,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 165, "tasktime": 99,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -2120,7 +2120,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 95, "tasktime": 154,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -2168,7 +2168,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 175, "tasktime": 123,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -2216,7 +2216,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 168, "tasktime": 70,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -2264,7 +2264,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 83, "tasktime": 118,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -2312,7 +2312,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 122, "tasktime": 176,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -2360,7 +2360,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 168, "tasktime": 165,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -2408,7 +2408,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 171, "tasktime": 115,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -2456,7 +2456,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 174, "tasktime": 67,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -2504,7 +2504,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 78, "tasktime": 169,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -2552,7 +2552,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 94, "tasktime": 158,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -2600,7 +2600,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 62, "tasktime": 170,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -2648,7 +2648,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 152, "tasktime": 87,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -2696,7 +2696,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 146, "tasktime": 131,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -2744,7 +2744,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 128, "tasktime": 80,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -2792,7 +2792,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 165, "tasktime": 82,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -2840,7 +2840,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 140, "tasktime": 97,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -2888,7 +2888,7 @@
}, },
"icon": "xmwg_rw_pt5", "icon": "xmwg_rw_pt5",
"taskcd": 200, "taskcd": 200,
"tasktime": 124, "tasktime": 127,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -2936,7 +2936,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 63, "tasktime": 77,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -2984,7 +2984,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 121, "tasktime": 174,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -3032,7 +3032,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 120, "tasktime": 102,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -3080,7 +3080,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 73, "tasktime": 133,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -3128,7 +3128,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 146, "tasktime": 125,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -3176,7 +3176,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 126, "tasktime": 105,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -3272,7 +3272,7 @@
}, },
"icon": "xmwg_rw_pt6", "icon": "xmwg_rw_pt6",
"taskcd": 200, "taskcd": 200,
"tasktime": 163, "tasktime": 162,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -3320,7 +3320,7 @@
}, },
"icon": "xmwg_rw_pt7", "icon": "xmwg_rw_pt7",
"taskcd": 200, "taskcd": 200,
"tasktime": 166, "tasktime": 70,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"
@ -3368,7 +3368,7 @@
}, },
"icon": "xmwg_rw_pt1", "icon": "xmwg_rw_pt1",
"taskcd": 200, "taskcd": 200,
"tasktime": 80, "tasktime": 175,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Tiger", "key": "Entrustment details of Tiger",
"text": "这是属于悍娇虎的专属委托" "text": "这是属于悍娇虎的专属委托"
@ -3416,7 +3416,7 @@
}, },
"icon": "xmwg_rw_pt2", "icon": "xmwg_rw_pt2",
"taskcd": 200, "taskcd": 200,
"tasktime": 119, "tasktime": 179,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Shifu", "key": "Entrustment details of Shifu",
"text": "这是属于师父的专属委托" "text": "这是属于师父的专属委托"
@ -3464,7 +3464,7 @@
}, },
"icon": "xmwg_rw_pt3", "icon": "xmwg_rw_pt3",
"taskcd": 200, "taskcd": 200,
"tasktime": 78, "tasktime": 68,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Po", "key": "Entrustment details of Po",
"text": "这是属于阿宝的专属委托" "text": "这是属于阿宝的专属委托"
@ -3512,7 +3512,7 @@
}, },
"icon": "xmwg_rw_pt4", "icon": "xmwg_rw_pt4",
"taskcd": 200, "taskcd": 200,
"tasktime": 159, "tasktime": 122,
"tasktxt": { "tasktxt": {
"key": "Entrustment details of Bobi", "key": "Entrustment details of Bobi",
"text": "这是属于波比的专属委托" "text": "这是属于波比的专属委托"

28
bin/json/game_dreamlandtrigger.json
View File

@ -1,27 +1 @@
[ []
{
"id": 1,
"dreamland_pro": 1000,
"open": true
},
{
"id": 2,
"dreamland_pro": 1000,
"open": true
},
{
"id": 3,
"dreamland_pro": 1000,
"open": true
},
{
"id": 4,
"dreamland_pro": 1000,
"open": true
},
{
"id": 5,
"dreamland_pro": 1000,
"open": true
}
]

1296
bin/json/game_equip.json
View File

File diff suppressed because it is too large Load Diff

40
bin/json/game_equipsuit.json
View File

@ -4,7 +4,7 @@
"suitnum": 6, "suitnum": 6,
"skill": 0, "skill": 0,
"skillname": { "skillname": {
"key": "suit_13001", "key": "suit_1",
"text": "无极神功套装" "text": "无极神功套装"
}, },
"icon": "tz_icon_qg", "icon": "tz_icon_qg",
@ -25,7 +25,7 @@
"suitnum": 6, "suitnum": 6,
"skill": 0, "skill": 0,
"skillname": { "skillname": {
"key": "suit_13002", "key": "suit_2",
"text": "驯龙套装" "text": "驯龙套装"
}, },
"icon": "tz_icon_xl", "icon": "tz_icon_xl",
@ -46,7 +46,7 @@
"suitnum": 6, "suitnum": 6,
"skill": 100003001, "skill": 100003001,
"skillname": { "skillname": {
"key": "suit_13003", "key": "suit_3",
"text": "雪精灵套装" "text": "雪精灵套装"
}, },
"icon": "tz_icon_xjl", "icon": "tz_icon_xjl",
@ -62,7 +62,7 @@
"suitnum": 6, "suitnum": 6,
"skill": 0, "skill": 0,
"skillname": { "skillname": {
"key": "suit_13004", "key": "suit_4",
"text": "噩梦漩涡套装" "text": "噩梦漩涡套装"
}, },
"icon": "tz_icon_em", "icon": "tz_icon_em",
@ -83,7 +83,7 @@
"suitnum": 6, "suitnum": 6,
"skill": 0, "skill": 0,
"skillname": { "skillname": {
"key": "suit_13005", "key": "suit_5",
"text": "音乐精灵套装" "text": "音乐精灵套装"
}, },
"icon": "tz_icon_yy", "icon": "tz_icon_yy",
@ -104,7 +104,7 @@
"suitnum": 6, "suitnum": 6,
"skill": 100006001, "skill": 100006001,
"skillname": { "skillname": {
"key": "suit_13006", "key": "suit_6",
"text": "永恒萌狗套装" "text": "永恒萌狗套装"
}, },
"icon": "tz_icon_mg", "icon": "tz_icon_mg",
@ -120,7 +120,7 @@
"suitnum": 6, "suitnum": 6,
"skill": 100007001, "skill": 100007001,
"skillname": { "skillname": {
"key": "suit_13007", "key": "suit_7",
"text": "原始狩猎套装" "text": "原始狩猎套装"
}, },
"icon": "tz_icon_sl", "icon": "tz_icon_sl",
@ -136,7 +136,7 @@
"suitnum": 6, "suitnum": 6,
"skill": 0, "skill": 0,
"skillname": { "skillname": {
"key": "suit_13008", "key": "suit_8",
"text": "气功大师套装" "text": "气功大师套装"
}, },
"icon": "tz_icon_wj", "icon": "tz_icon_wj",
@ -157,8 +157,8 @@
"suitnum": 6, "suitnum": 6,
"skill": 100009001, "skill": 100009001,
"skillname": { "skillname": {
"key": "suit_13009", "key": "suit_9",
"text": "黄金包子" "text": "黄金包子套装"
}, },
"icon": "tz_icon_ms", "icon": "tz_icon_ms",
"FloatIcon": "ty_zd_buff_z007", "FloatIcon": "ty_zd_buff_z007",
@ -173,7 +173,7 @@
"suitnum": 6, "suitnum": 6,
"skill": 100001001, "skill": 100001001,
"skillname": { "skillname": {
"key": "suit_13010", "key": "suit_10",
"text": "马术套装" "text": "马术套装"
}, },
"icon": "tz_icon_ms", "icon": "tz_icon_ms",
@ -189,7 +189,7 @@
"suitnum": 6, "suitnum": 6,
"skill": 0, "skill": 0,
"skillname": { "skillname": {
"key": "suit_13011", "key": "suit_11",
"text": "波波星套装" "text": "波波星套装"
}, },
"icon": "tz_icon_pp", "icon": "tz_icon_pp",
@ -210,7 +210,7 @@
"suitnum": 6, "suitnum": 6,
"skill": 0, "skill": 0,
"skillname": { "skillname": {
"key": "suit_13012", "key": "suit_12",
"text": "穴居人套装" "text": "穴居人套装"
}, },
"icon": "tz_icon_xj", "icon": "tz_icon_xj",
@ -231,7 +231,7 @@
"suitnum": 6, "suitnum": 6,
"skill": 0, "skill": 0,
"skillname": { "skillname": {
"key": "suit_13013", "key": "suit_13",
"text": "文明人套装" "text": "文明人套装"
}, },
"icon": "tz_icon_wm", "icon": "tz_icon_wm",
@ -252,7 +252,7 @@
"suitnum": 6, "suitnum": 6,
"skill": 100001401, "skill": 100001401,
"skillname": { "skillname": {
"key": "suit_13014", "key": "suit_14",
"text": "马戏团套装" "text": "马戏团套装"
}, },
"icon": "tz_icon_mxt", "icon": "tz_icon_mxt",
@ -268,7 +268,7 @@
"suitnum": 6, "suitnum": 6,
"skill": 100001501, "skill": 100001501,
"skillname": { "skillname": {
"key": "suit_13015", "key": "suit_15",
"text": "泰坦套装" "text": "泰坦套装"
}, },
"icon": "tz_icon_tt", "icon": "tz_icon_tt",
@ -284,7 +284,7 @@
"suitnum": 6, "suitnum": 6,
"skill": 0, "skill": 0,
"skillname": { "skillname": {
"key": "suit_13016", "key": "suit_16",
"text": "巨怪猎人套装" "text": "巨怪猎人套装"
}, },
"icon": "tz_icon_jg", "icon": "tz_icon_jg",
@ -305,7 +305,7 @@
"suitnum": 6, "suitnum": 6,
"skill": 100001701, "skill": 100001701,
"skillname": { "skillname": {
"key": "suit_13017", "key": "suit_17",
"text": "天外陨石套装" "text": "天外陨石套装"
}, },
"icon": "tz_icon_ys", "icon": "tz_icon_ys",
@ -321,7 +321,7 @@
"suitnum": 6, "suitnum": 6,
"skill": 0, "skill": 0,
"skillname": { "skillname": {
"key": "suit_13018", "key": "suit_18",
"text": "沼泽怪物套装" "text": "沼泽怪物套装"
}, },
"icon": "tz_icon_zz", "icon": "tz_icon_zz",
@ -342,7 +342,7 @@
"suitnum": 6, "suitnum": 6,
"skill": 100001901, "skill": 100001901,
"skillname": { "skillname": {
"key": "suit_13019", "key": "suit_19",
"text": "守护神套装" "text": "守护神套装"
}, },
"icon": "tz_icon_shs", "icon": "tz_icon_shs",

37
bin/json/game_item.json
View File

@ -9939,5 +9939,42 @@
"sale": [], "sale": [],
"synthetize_deplete": [], "synthetize_deplete": [],
"decompose_deplete": [] "decompose_deplete": []
},
{
"id": "9999999",
"name": {
"key": "weektask_dj_9999999",
"text": "时限道具（测试）"
},
"usetype": 3,
"color": 1,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 2,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"access": [
1001
],
"use_skip": 1001,
"upper_limit": -1,
"img": "tj_icon_flower",
"intr": {
"key": "itemdesc_9999999",
"text": "测试时限道具，2分钟消失"
},
"sale": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"synthetize_deplete": [],
"decompose_deplete": []
} }
] ]

48
bin/json/game_mainchapter.json
View File

@ -13,7 +13,7 @@
"text": "第1章：功夫熊猫" "text": "第1章：功夫熊猫"
}, },
"desc": { "desc": {
"key": "mainchapter_desc_10001", "key": "mainchapter_desc_11001",
"text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。话说熊猫阿宝是一家面条店的学徒，虽然笨手笨脚，也勉强算是谋到了一份职业。" "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。话说熊猫阿宝是一家面条店的学徒，虽然笨手笨脚，也勉强算是谋到了一份职业。"
}, },
"starreward": 11001 "starreward": 11001
@ -32,7 +32,7 @@
"text": "第2章：疯狂原始人" "text": "第2章：疯狂原始人"
}, },
"desc": { "desc": {
"key": "mainchapter_desc_10002", "key": "mainchapter_desc_11002",
"text": "别看阿宝所在的“和平谷”一派欣欣向荣的安详景象，其实是一个卧虎藏龙的风水宝地，先不说五大功夫高手皆坐镇于此，更有一大师级别的宗师在这里隐居。" "text": "别看阿宝所在的“和平谷”一派欣欣向荣的安详景象，其实是一个卧虎藏龙的风水宝地，先不说五大功夫高手皆坐镇于此，更有一大师级别的宗师在这里隐居。"
}, },
"starreward": 11002 "starreward": 11002
@ -51,7 +51,7 @@
"text": "第3章：怪物史莱克" "text": "第3章：怪物史莱克"
}, },
"desc": { "desc": {
"key": "mainchapter_desc_10003", "key": "mainchapter_desc_11003",
"text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。"
}, },
"starreward": 11003 "starreward": 11003
@ -70,7 +70,7 @@
"text": "第4章：乌龟大师" "text": "第4章：乌龟大师"
}, },
"desc": { "desc": {
"key": "mainchapter_desc_10004", "key": "mainchapter_desc_11004",
"text": "自负的毒蛇大师虽然给人的感觉稍显轻浮，但对这件事的态度就有如她善变的性格，不太明朗；螳螂大师算是几位高手中最聪明的一个，对阿宝的现状很是无奈，总是暗中帮忙。" "text": "自负的毒蛇大师虽然给人的感觉稍显轻浮，但对这件事的态度就有如她善变的性格，不太明朗；螳螂大师算是几位高手中最聪明的一个，对阿宝的现状很是无奈，总是暗中帮忙。"
}, },
"starreward": 11004 "starreward": 11004
@ -89,7 +89,7 @@
"text": "第5章：激烈战斗" "text": "第5章：激烈战斗"
}, },
"desc": { "desc": {
"key": "mainchapter_desc_10005", "key": "mainchapter_desc_11005",
"text": "最后要将阿宝调教成“功夫高手”的一代宗师“师父”华丽丽地出场了，然而有着一身好功夫并不意味着就是完美的，“师父”因为过去犯下的一个错误，一直纠结着没办法释然。" "text": "最后要将阿宝调教成“功夫高手”的一代宗师“师父”华丽丽地出场了，然而有着一身好功夫并不意味着就是完美的，“师父”因为过去犯下的一个错误，一直纠结着没办法释然。"
}, },
"starreward": 11005 "starreward": 11005
@ -108,7 +108,7 @@
"text": "第6章：下山" "text": "第6章：下山"
}, },
"desc": { "desc": {
"key": "mainchapter_desc_10006", "key": "mainchapter_desc_11006",
"text": "至于那个让人人都如临大敌的太郎，则是一只非常自恋的雪豹，他等待复仇的这一天，已经整整等了20年了，可是他做梦也没想到，自己等来的竟然是一只大熊猫。" "text": "至于那个让人人都如临大敌的太郎，则是一只非常自恋的雪豹，他等待复仇的这一天，已经整整等了20年了，可是他做梦也没想到，自己等来的竟然是一只大熊猫。"
}, },
"starreward": 11006 "starreward": 11006
@ -127,7 +127,7 @@
"text": "第7章：事件余波" "text": "第7章：事件余波"
}, },
"desc": { "desc": {
"key": "mainchapter_desc_10007", "key": "mainchapter_desc_11007",
"text": "激烈的战斗后，阿宝以自己对武功的悟性和师父传授的武术，战胜了太郎，拯救了山谷，为山谷带来了和平。" "text": "激烈的战斗后，阿宝以自己对武功的悟性和师父传授的武术，战胜了太郎，拯救了山谷，为山谷带来了和平。"
}, },
"starreward": 11007 "starreward": 11007
@ -146,7 +146,7 @@
"text": "第8章：乌龟大师" "text": "第8章：乌龟大师"
}, },
"desc": { "desc": {
"key": "mainchapter_desc_10008", "key": "mainchapter_desc_11008",
"text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。"
}, },
"starreward": 11008 "starreward": 11008
@ -165,7 +165,7 @@
"text": "第9章：太狼来袭" "text": "第9章：太狼来袭"
}, },
"desc": { "desc": {
"key": "mainchapter_desc_10009", "key": "mainchapter_desc_11009",
"text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。"
}, },
"starreward": 11009 "starreward": 11009
@ -184,7 +184,7 @@
"text": "第10章：乌龟大师" "text": "第10章：乌龟大师"
}, },
"desc": { "desc": {
"key": "mainchapter_desc_10010", "key": "mainchapter_desc_11010",
"text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。"
}, },
"starreward": 11010 "starreward": 11010
@ -203,7 +203,7 @@
"text": "第11章：太狼来袭" "text": "第11章：太狼来袭"
}, },
"desc": { "desc": {
"key": "mainchapter_desc_10011", "key": "mainchapter_desc_11011",
"text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。"
}, },
"starreward": 11011 "starreward": 11011
@ -222,7 +222,7 @@
"text": "第12章：乌龟大师" "text": "第12章：乌龟大师"
}, },
"desc": { "desc": {
"key": "mainchapter_desc_10012", "key": "mainchapter_desc_11012",
"text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。"
}, },
"starreward": 11012 "starreward": 11012
@ -241,7 +241,7 @@
"text": "第1章：功夫世界" "text": "第1章：功夫世界"
}, },
"desc": { "desc": {
"key": "mainchapter_desc_10001", "key": "mainchapter_desc_12001",
"text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。话说熊猫阿宝是一家面条店的学徒，虽然笨手笨脚，也勉强算是谋到了一份职业。" "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。话说熊猫阿宝是一家面条店的学徒，虽然笨手笨脚，也勉强算是谋到了一份职业。"
}, },
"starreward": 11013 "starreward": 11013
@ -260,7 +260,7 @@
"text": "第2章：练功房" "text": "第2章：练功房"
}, },
"desc": { "desc": {
"key": "mainchapter_desc_10002", "key": "mainchapter_desc_12002",
"text": "别看阿宝所在的“和平谷”一派欣欣向荣的安详景象，其实是一个卧虎藏龙的风水宝地，先不说五大功夫高手皆坐镇于此，更有一大师级别的宗师在这里隐居。" "text": "别看阿宝所在的“和平谷”一派欣欣向荣的安详景象，其实是一个卧虎藏龙的风水宝地，先不说五大功夫高手皆坐镇于此，更有一大师级别的宗师在这里隐居。"
}, },
"starreward": 11014 "starreward": 11014
@ -279,7 +279,7 @@
"text": "第3章：太狼来袭" "text": "第3章：太狼来袭"
}, },
"desc": { "desc": {
"key": "mainchapter_desc_10003", "key": "mainchapter_desc_12003",
"text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。"
}, },
"starreward": 11015 "starreward": 11015
@ -298,7 +298,7 @@
"text": "第4章：乌龟大师" "text": "第4章：乌龟大师"
}, },
"desc": { "desc": {
"key": "mainchapter_desc_10004", "key": "mainchapter_desc_12004",
"text": "自负的毒蛇大师虽然给人的感觉稍显轻浮，但对这件事的态度就有如她善变的性格，不太明朗；螳螂大师算是几位高手中最聪明的一个，对阿宝的现状很是无奈，总是暗中帮忙。" "text": "自负的毒蛇大师虽然给人的感觉稍显轻浮，但对这件事的态度就有如她善变的性格，不太明朗；螳螂大师算是几位高手中最聪明的一个，对阿宝的现状很是无奈，总是暗中帮忙。"
}, },
"starreward": 11016 "starreward": 11016
@ -317,7 +317,7 @@
"text": "第5章：激烈战斗" "text": "第5章：激烈战斗"
}, },
"desc": { "desc": {
"key": "mainchapter_desc_10005", "key": "mainchapter_desc_12005",
"text": "最后要将阿宝调教成“功夫高手”的一代宗师“师父”华丽丽地出场了，然而有着一身好功夫并不意味着就是完美的，“师父”因为过去犯下的一个错误，一直纠结着没办法释然。" "text": "最后要将阿宝调教成“功夫高手”的一代宗师“师父”华丽丽地出场了，然而有着一身好功夫并不意味着就是完美的，“师父”因为过去犯下的一个错误，一直纠结着没办法释然。"
}, },
"starreward": 11017 "starreward": 11017
@ -336,7 +336,7 @@
"text": "第6章：下山" "text": "第6章：下山"
}, },
"desc": { "desc": {
"key": "mainchapter_desc_10006", "key": "mainchapter_desc_12006",
"text": "至于那个让人人都如临大敌的太郎，则是一只非常自恋的雪豹，他等待复仇的这一天，已经整整等了20年了，可是他做梦也没想到，自己等来的竟然是一只大熊猫。" "text": "至于那个让人人都如临大敌的太郎，则是一只非常自恋的雪豹，他等待复仇的这一天，已经整整等了20年了，可是他做梦也没想到，自己等来的竟然是一只大熊猫。"
}, },
"starreward": 11018 "starreward": 11018
@ -355,7 +355,7 @@
"text": "第7章：事件余波" "text": "第7章：事件余波"
}, },
"desc": { "desc": {
"key": "mainchapter_desc_10007", "key": "mainchapter_desc_12007",
"text": "激烈的战斗后，阿宝以自己对武功的悟性和师父传授的武术，战胜了太郎，拯救了山谷，为山谷带来了和平。" "text": "激烈的战斗后，阿宝以自己对武功的悟性和师父传授的武术，战胜了太郎，拯救了山谷，为山谷带来了和平。"
}, },
"starreward": 11019 "starreward": 11019
@ -374,7 +374,7 @@
"text": "第8章：乌龟大师" "text": "第8章：乌龟大师"
}, },
"desc": { "desc": {
"key": "mainchapter_desc_10008", "key": "mainchapter_desc_12008",
"text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。"
}, },
"starreward": 11020 "starreward": 11020
@ -393,7 +393,7 @@
"text": "第9章：太狼来袭" "text": "第9章：太狼来袭"
}, },
"desc": { "desc": {
"key": "mainchapter_desc_10009", "key": "mainchapter_desc_12009",
"text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。"
}, },
"starreward": 11021 "starreward": 11021
@ -412,7 +412,7 @@
"text": "第10章：乌龟大师" "text": "第10章：乌龟大师"
}, },
"desc": { "desc": {
"key": "mainchapter_desc_10010", "key": "mainchapter_desc_12010",
"text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。"
}, },
"starreward": 11022 "starreward": 11022
@ -431,7 +431,7 @@
"text": "第11章：太狼来袭" "text": "第11章：太狼来袭"
}, },
"desc": { "desc": {
"key": "mainchapter_desc_10011", "key": "mainchapter_desc_12011",
"text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。"
}, },
"starreward": 11023 "starreward": 11023
@ -450,7 +450,7 @@
"text": "第12章：乌龟大师" "text": "第12章：乌龟大师"
}, },
"desc": { "desc": {
"key": "mainchapter_desc_10012", "key": "mainchapter_desc_12012",
"text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。"
}, },
"starreward": 11024 "starreward": 11024

4
bin/json/game_pandamasmryl.json
View File

@ -7,7 +7,7 @@
}, },
"icon": "开合跳", "icon": "开合跳",
"des": { "des": {
"key": "wuguandongzuo_开合跳", "key": "wuguandongzuo_kaihetiao",
"text": "双脚并立,双臂自然垂在身体的两侧。向上跳,双腿打开,双手举过头顶。\n再向上跳,双脚并拢,手臂放回身体两侧，重复这个动作。这项运动锻炼身体所有的大肌肉群。" "text": "双脚并立,双臂自然垂在身体的两侧。向上跳,双腿打开,双手举过头顶。\n再向上跳,双脚并拢,手臂放回身体两侧，重复这个动作。这项运动锻炼身体所有的大肌肉群。"
}, },
"ticks": 3, "ticks": 3,
@ -27,7 +27,7 @@
}, },
"icon": "手臂环绕", "icon": "手臂环绕",
"des": { "des": {
"key": "wuguandongzuo_手臂环绕", "key": "wuguandongzuo_shoubihuanrao",
"text": "双腿与肩同宽,双臂与肩同高平伸于身体两侧。\n然后双臂进行顺时针绕环活动,之后逆时针绕环。" "text": "双腿与肩同宽,双臂与肩同高平伸于身体两侧。\n然后双臂进行顺时针绕环活动,之后逆时针绕环。"
}, },
"ticks": 3, "ticks": 3,

64
bin/json/game_vikingboss.json
View File

@ -55,7 +55,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1001, "drop": 1004,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11009, "bossmodel": 11009,
"boss_skill": 51004, "boss_skill": 51004,
@ -133,7 +133,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1002, "drop": 1005,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11009, "bossmodel": 11009,
"boss_skill": 51004, "boss_skill": 51004,
@ -211,7 +211,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1003, "drop": 1006,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11009, "bossmodel": 11009,
"boss_skill": 51004, "boss_skill": 51004,
@ -289,7 +289,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1004, "drop": 1007,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11009, "bossmodel": 11009,
"boss_skill": 51004, "boss_skill": 51004,
@ -367,7 +367,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1005, "drop": 1008,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11009, "bossmodel": 11009,
"boss_skill": 51004, "boss_skill": 51004,
@ -445,7 +445,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1006, "drop": 1009,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11009, "bossmodel": 11009,
"boss_skill": 51004, "boss_skill": 51004,
@ -523,7 +523,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1007, "drop": 1010,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11009, "bossmodel": 11009,
"boss_skill": 51004, "boss_skill": 51004,
@ -601,7 +601,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1008, "drop": 1011,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11009, "bossmodel": 11009,
"boss_skill": 51004, "boss_skill": 51004,
@ -679,7 +679,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1009, "drop": 1012,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11009, "bossmodel": 11009,
"boss_skill": 51004, "boss_skill": 51004,
@ -757,7 +757,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1010, "drop": 1013,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11009, "bossmodel": 11009,
"boss_skill": 51004, "boss_skill": 51004,
@ -835,7 +835,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1011, "drop": 1014,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11003, "bossmodel": 11003,
"boss_skill": 51004, "boss_skill": 51004,
@ -913,7 +913,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1012, "drop": 1015,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11003, "bossmodel": 11003,
"boss_skill": 51004, "boss_skill": 51004,
@ -991,7 +991,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1013, "drop": 1016,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11003, "bossmodel": 11003,
"boss_skill": 51004, "boss_skill": 51004,
@ -1069,7 +1069,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1014, "drop": 1017,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11003, "bossmodel": 11003,
"boss_skill": 51004, "boss_skill": 51004,
@ -1147,7 +1147,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1015, "drop": 1018,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11003, "bossmodel": 11003,
"boss_skill": 51004, "boss_skill": 51004,
@ -1225,7 +1225,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1016, "drop": 1019,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11003, "bossmodel": 11003,
"boss_skill": 51004, "boss_skill": 51004,
@ -1303,7 +1303,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1017, "drop": 1020,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11003, "bossmodel": 11003,
"boss_skill": 51004, "boss_skill": 51004,
@ -1381,7 +1381,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1018, "drop": 1021,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11003, "bossmodel": 11003,
"boss_skill": 51004, "boss_skill": 51004,
@ -1459,7 +1459,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1019, "drop": 1022,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11003, "bossmodel": 11003,
"boss_skill": 51004, "boss_skill": 51004,
@ -1537,7 +1537,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1020, "drop": 1023,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11003, "bossmodel": 11003,
"boss_skill": 51004, "boss_skill": 51004,
@ -1615,7 +1615,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1021, "drop": 1024,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11018, "bossmodel": 11018,
"boss_skill": 51004, "boss_skill": 51004,
@ -1693,7 +1693,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1022, "drop": 1025,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11018, "bossmodel": 11018,
"boss_skill": 51004, "boss_skill": 51004,
@ -1771,7 +1771,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1023, "drop": 1026,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11018, "bossmodel": 11018,
"boss_skill": 51004, "boss_skill": 51004,
@ -1849,7 +1849,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1024, "drop": 1027,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11018, "bossmodel": 11018,
"boss_skill": 51004, "boss_skill": 51004,
@ -1927,7 +1927,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1025, "drop": 1028,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11018, "bossmodel": 11018,
"boss_skill": 51004, "boss_skill": 51004,
@ -2005,7 +2005,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1026, "drop": 1029,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11018, "bossmodel": 11018,
"boss_skill": 51004, "boss_skill": 51004,
@ -2083,7 +2083,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1027, "drop": 1030,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11018, "bossmodel": 11018,
"boss_skill": 51004, "boss_skill": 51004,
@ -2161,7 +2161,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1028, "drop": 1004,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11018, "bossmodel": 11018,
"boss_skill": 51004, "boss_skill": 51004,
@ -2239,7 +2239,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1029, "drop": 1005,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11018, "bossmodel": 11018,
"boss_skill": 51004, "boss_skill": 51004,
@ -2317,7 +2317,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1030, "drop": 1006,
"scene": "bossfight_spinymandrilla_02", "scene": "bossfight_spinymandrilla_02",
"bossmodel": 11018, "bossmodel": 11018,
"boss_skill": 51004, "boss_skill": 51004,
@ -2395,7 +2395,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1001, "drop": 1007,
"scene": "", "scene": "",
"bossmodel": 11009, "bossmodel": 11009,
"boss_skill": 51004, "boss_skill": 51004,
@ -2473,7 +2473,7 @@
"n": 1 "n": 1
} }
], ],
"drop": 1002, "drop": 1008,
"scene": "", "scene": "",
"bossmodel": 11009, "bossmodel": 11009,
"boss_skill": 51004, "boss_skill": 51004,

16
bin/json/game_worldtask.json
View File

@ -635,28 +635,28 @@
"des": 3, "des": 3,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
"key": "welcom_txt", "key": "Side_Quest0_task_Tname",
"text": "欢迎到来" "text": "欢迎到来"
}, },
"task_name": { "task_name": {
"key": "welcom_txt", "key": "Side_Quest0_task_name",
"text": "欢迎到来" "text": "初次来到世界"
}, },
"npctxt": { "npctxt": {
"key": "welcom_txt1", "key": "Side_Quest0_npctxt",
"text": "和门口的小家伙聊聊" "text": "和门口的小家伙聊聊"
}, },
"npc": 70070, "npc": 70070,
"completetasktxt": { "completetasktxt": {
"key": "welcom_txt", "key": "Side_Quest0_npctxt",
"text": "欢迎到来" "text": "和门口的小家伙聊聊"
}, },
"completetask": [ "completetask": [
0 0
], ],
"deliver_npctxt": { "deliver_npctxt": {
"key": "welcom_txt", "key": "Side_Quest0_npctxt",
"text": "欢迎到来" "text": "和门口的小家伙聊聊"
}, },
"deliver_npc": 0, "deliver_npc": 0,
"auto_accept": 0, "auto_accept": 0,

3
comm/imodule.go
View File

@ -28,6 +28,9 @@ type (
ISys interface { ISys interface {
IsAccess(funcName string, uid string) (code pb.ErrorCode) IsAccess(funcName string, uid string) (code pb.ErrorCode)
ValidCond(uid string, conf *cfg.GameOpencondData) string ValidCond(uid string, conf *cfg.GameOpencondData) string
CheckLvUpCond(session IUserSession, lv int32)
CheckTaskCond(session IUserSession, id int32)
CheckMlineCond(session IUserSession, id int32)
} }
//邮件业务模块对外接口定义 提供给其他模块使用的 //邮件业务模块对外接口定义 提供给其他模块使用的

6
modules/library/api_activationfetter.go
View File

@ -25,14 +25,14 @@ func (this *apiComp) ActivationFetter(session comm.IUserSession, req *pb.Library
code = pb.ErrorCode_LibraryNoData code = pb.ErrorCode_LibraryNoData
return return
} }
if fetter.Activation { if fetter.Fidlv != 0 {
code = pb.ErrorCode_LibraryActivation code = pb.ErrorCode_LibraryActivation
return return
} }
fetter.Activation = true fetter.Fidlv = 1
mapData := make(map[string]interface{}, 0) mapData := make(map[string]interface{}, 0)
mapData["activation"] = fetter.Activation mapData["fidlv"] = fetter.Fidlv
this.module.modelLibrary.modifyLibraryDataByObjId(session.GetUserId(), fetter.Id, mapData) this.module.modelLibrary.modifyLibraryDataByObjId(session.GetUserId(), fetter.Id, mapData)
rsp.Data = fetter rsp.Data = fetter

19
modules/library/api_getstoryreward.go
View File

@ -46,9 +46,9 @@ func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGe
} }
} }
// 等级规则校验 // 等级规则校验
l := len(_heroFetter.History) _len := len(_heroFetter.History)
if len(favorConf.Favorlv) < l { if len(favorConf.Favorlv) < _len {
if favorConf.Favorlv[l] > _heroFetter.Favorlv { // 等级不够 if favorConf.Favorlv[_len] > _heroFetter.Favorlv { // 等级不够
code = pb.ErrorCode_LibraryLvReward code = pb.ErrorCode_LibraryLvReward
return return
} }
@ -57,16 +57,14 @@ func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGe
var res []*cfg.Gameatn var res []*cfg.Gameatn
if v == req.History { if v == req.History {
switch iPos { if iPos == 0 {
case 1:
res = append(res, favorConf.BiographyReward1...) res = append(res, favorConf.BiographyReward1...)
case 2: } else if iPos == 1 {
res = append(res, favorConf.BiographyReward2...) res = append(res, favorConf.BiographyReward2...)
case 3: } else if iPos == 2 {
res = append(res, favorConf.BiographyReward3...) res = append(res, favorConf.BiographyReward3...)
} }
break
}
if len(res) > 0 { if len(res) > 0 {
if code = this.module.DispenseRes(session, res, true); code != pb.ErrorCode_Success { if code = this.module.DispenseRes(session, res, true); code != pb.ErrorCode_Success {
return return
@ -76,7 +74,8 @@ func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGe
code = pb.ErrorCode_LibraryLvReward code = pb.ErrorCode_LibraryLvReward
return return
} }
break
}
} }
_heroFetter.History = append(_heroFetter.History, req.History) _heroFetter.History = append(_heroFetter.History, req.History)

22
modules/library/api_getreward.go → modules/library/api_lvup.go
View File

@ -7,27 +7,27 @@ import (
) )
//参数校验 //参数校验
func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.LibraryGetRewardReq) (code pb.ErrorCode) { func (this *apiComp) FetterLvUpCheck(session comm.IUserSession, req *pb.LibraryFetterLvUpReq) (code pb.ErrorCode) {
if req.ObjId == "" || req.Fetterlv == 0 { if req.LibOid == "" {
code = pb.ErrorCode_ReqParameterError code = pb.ErrorCode_ReqParameterError
} }
return return
} }
// 羁绊等级奖励 // 羁绊等级奖励
func (this *apiComp) GetReward(session comm.IUserSession, req *pb.LibraryGetRewardReq) (code pb.ErrorCode, data *pb.ErrorData) { func (this *apiComp) FetterLvUp(session comm.IUserSession, req *pb.LibraryFetterLvUpReq) (code pb.ErrorCode, data *pb.ErrorData) {
var ( var (
totalFetterLv int32 //羁绊总等级 totalFetterLv int32 //羁绊总等级
) )
code = this.GetRewardCheck(session, req) code = this.FetterLvUpCheck(session, req)
if code != pb.ErrorCode_Success { if code != pb.ErrorCode_Success {
return // 参数校验失败直接返回 return // 参数校验失败直接返回
} }
// 配置校验 // 配置校验
rsp := &pb.LibraryGetRewardResp{} rsp := &pb.LibraryFetterLvUpResp{}
fetter := this.module.getLibraryByObjID(session.GetUserId(), req.ObjId) fetter := this.module.getLibraryByObjID(session.GetUserId(), req.LibOid)
if fetter == nil { if fetter == nil {
code = pb.ErrorCode_LibraryNoData code = pb.ErrorCode_LibraryNoData
return return
@ -38,22 +38,23 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.LibraryGetRewa
} }
} }
totalFetterLv = 0 totalFetterLv = 0
conf := this.module.configure.GetFriendData(fetter.Fid, req.Fetterlv) conf := this.module.configure.GetFriendData(fetter.Fid, fetter.Fidlv+1)
if len(conf) == 0 { if len(conf) == 0 {
code = pb.ErrorCode_ConfigNoFound code = pb.ErrorCode_ConfigNoFound
return return
} else { } else {
fetter.Fidlv += 1
if conf[0].FavorabilityLv > totalFetterLv { if conf[0].FavorabilityLv > totalFetterLv {
code = pb.ErrorCode_LibraryLvReward code = pb.ErrorCode_LibraryLvReward
return return
} }
} }
if _, ok := fetter.Prize[req.Fetterlv]; ok { if _, ok := fetter.Prize[fetter.Fidlv]; ok {
code = pb.ErrorCode_LibraryReward code = pb.ErrorCode_LibraryReward
return return
} }
fetter.Prize[req.Fetterlv] = 1 fetter.Prize[fetter.Fidlv] = 1
// 发奖 // 发奖
hProperty := make(map[string][]*cfg.Gameatr, 0) hProperty := make(map[string][]*cfg.Gameatr, 0)
@ -71,8 +72,9 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.LibraryGetRewa
this.module.ModuleHero.AddHeroFetterAttribute(session, hProperty) this.module.ModuleHero.AddHeroFetterAttribute(session, hProperty)
mapData := make(map[string]interface{}, 0) mapData := make(map[string]interface{}, 0)
mapData["prize"] = fetter.Prize mapData["prize"] = fetter.Prize
mapData["fidlv"] = fetter.Fidlv
this.module.ModifyLibraryData(session.GetUserId(), fetter.Id, mapData) // 更新内存信息 this.module.ModifyLibraryData(session.GetUserId(), fetter.Id, mapData) // 更新内存信息
rsp.Data = fetter rsp.Data = fetter
session.SendMsg(string(this.module.GetType()), LibraryGetRewardResp, rsp) session.SendMsg(string(this.module.GetType()), "fetterlvup", rsp)
return return
} }

7
modules/parkour/api_invitehandle.go
View File

@ -42,10 +42,10 @@ func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInvi
code = pb.ErrorCode_ParkourMemberFull code = pb.ErrorCode_ParkourMemberFull
return return
} }
if req.State == 1 { if req.State == 3 {
ok = false ok = false
for i, v := range tean.Invite { for i, v := range tean.Invite {
if v.Uid == session.GetUserId() && !configure.Now().Before(time.Unix(v.Expired, 0)) { //邀请未过期 if v.Uid == session.GetUserId() && configure.Now().Before(time.Unix(v.Expired, 0)) { //邀请未过期
invite = v invite = v
index = int32(i) index = int32(i)
ok = true ok = true
@ -64,6 +64,7 @@ func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInvi
code = pb.ErrorCode_ConfigNoFound code = pb.ErrorCode_ConfigNoFound
return return
} }
users = append(users, invite.Uid)
member = &pb.DBRaceMember{Uid: invite.Uid, Name: invite.Name, Avatar: invite.Avatar, Lv: invite.Lv, Mount: info.Dfmount, Hp: mount.Hp} member = &pb.DBRaceMember{Uid: invite.Uid, Name: invite.Name, Avatar: invite.Avatar, Lv: invite.Lv, Mount: info.Dfmount, Hp: mount.Hp}
tean.Captainid = tean.Uid tean.Captainid = tean.Uid
tean.State = pb.RaceTeamState_teaming tean.State = pb.RaceTeamState_teaming
@ -93,6 +94,6 @@ func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInvi
&pb.ParkourInviteNoticePush{Team: tean, State: 3}, tean.Captainid) &pb.ParkourInviteNoticePush{Team: tean, State: 3}, tean.Captainid)
} }
session.SendMsg(string(this.module.GetType()), "invite", &pb.ParkourInviteHandleResp{IsSucc: true}) session.SendMsg(string(this.module.GetType()), "invitehandle", &pb.ParkourInviteHandleResp{IsSucc: true})
return return
} }

10
modules/parkour/api_jointeam.go
View File

@ -8,6 +8,10 @@ import (
//参数校验 //参数校验
func (this *apiComp) JoinTeamCheck(session comm.IUserSession, req *pb.ParkourJoinTeamReq) (code pb.ErrorCode) { func (this *apiComp) JoinTeamCheck(session comm.IUserSession, req *pb.ParkourJoinTeamReq) (code pb.ErrorCode) {
if session.GetUserId() == req.Uid {
code = pb.ErrorCode_ReqParameterError
}
return return
} }
@ -36,7 +40,7 @@ func (this *apiComp) JoinTeam(session comm.IUserSession, req *pb.ParkourJoinTeam
} }
if len(info.Member) > 3 { if len(info.Member) > 3 {
code = pb.ErrorCode_ReqParameterError code = pb.ErrorCode_ParkourMemberFull
return return
} }
if tean, err = this.module.parkourComp.queryinfo(req.Uid); err != nil { if tean, err = this.module.parkourComp.queryinfo(req.Uid); err != nil {
@ -58,7 +62,7 @@ func (this *apiComp) JoinTeam(session comm.IUserSession, req *pb.ParkourJoinTeam
code = pb.ErrorCode_ConfigNoFound code = pb.ErrorCode_ConfigNoFound
return return
} }
member = &pb.DBRaceMember{Uid: session.GetUserId(), Name: user.Name, Avatar: user.Avatar, Lv: user.Lv, Mount: tean.Dfmount, Hp: mount.Hp} member = &pb.DBRaceMember{Uid: user.Uid, Name: user.Name, Avatar: user.Avatar, Lv: user.Lv, Mount: tean.Dfmount, Hp: mount.Hp}
tean.Captainid = tean.Uid tean.Captainid = tean.Uid
tean.State = pb.RaceTeamState_teaming tean.State = pb.RaceTeamState_teaming
tean.Member = append(tean.Member, member) tean.Member = append(tean.Member, member)
@ -71,7 +75,7 @@ func (this *apiComp) JoinTeam(session comm.IUserSession, req *pb.ParkourJoinTeam
return return
} }
user := this.module.ModuleUser.GetUser(session.GetUserId()) user := this.module.ModuleUser.GetUser(session.GetUserId())
member = &pb.DBRaceMember{Uid: session.GetUserId(), Name: user.Name, Avatar: user.Avatar, Lv: user.Lv, Mount: info.Dfmount, Hp: mount.Hp} member = &pb.DBRaceMember{Uid: user.Uid, Name: user.Name, Avatar: user.Avatar, Lv: user.Lv, Mount: info.Dfmount, Hp: mount.Hp}
tean.Member = append(tean.Member, member) tean.Member = append(tean.Member, member)
if err = this.module.parkourComp.Change(session.GetUserId(), map[string]interface{}{ if err = this.module.parkourComp.Change(session.GetUserId(), map[string]interface{}{
"state": tean.State, "state": tean.State,

26
modules/parkour/api_racematch.go
View File

@ -3,6 +3,7 @@ package parkour
import ( import (
"go_dreamfactory/comm" "go_dreamfactory/comm"
"go_dreamfactory/pb" "go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
) )
//参数校验 //参数校验
@ -17,6 +18,8 @@ func (this *apiComp) RaceMatchCheck(session comm.IUserSession, req *pb.ParkourRa
func (this *apiComp) RaceMatch(session comm.IUserSession, req *pb.ParkourRaceMatchReq) (code pb.ErrorCode, data *pb.ErrorData) { func (this *apiComp) RaceMatch(session comm.IUserSession, req *pb.ParkourRaceMatchReq) (code pb.ErrorCode, data *pb.ErrorData) {
var ( var (
team *pb.DBParkour team *pb.DBParkour
tuser *pb.DBUser
mount *cfg.GameBuzkashiMountData
users []string users []string
err error err error
) )
@ -27,10 +30,31 @@ func (this *apiComp) RaceMatch(session comm.IUserSession, req *pb.ParkourRaceMat
code = pb.ErrorCode_DBError code = pb.ErrorCode_DBError
return return
} }
if team.Captainid != session.GetUserId() { if team.Captainid != "" && team.Captainid != session.GetUserId() {
code = pb.ErrorCode_ReqParameterError code = pb.ErrorCode_ReqParameterError
return return
} }
if team.Captainid == "" { //为组队情况
team.Captainid = team.Uid
team.State = pb.RaceTeamState_teaming
if tuser = this.module.ModuleUser.GetUser(session.GetUserId()); tuser == nil {
code = pb.ErrorCode_SystemError
return
}
if mount, err = this.module.configure.getGameBuzkashiMount(team.Dfmount); err != nil {
code = pb.ErrorCode_ConfigNoFound
return
}
team.Member = append(team.Member, &pb.DBRaceMember{Uid: tuser.Uid, Name: tuser.Name, Avatar: tuser.Avatar, Lv: tuser.Lv, Mount: team.Dfmount, Hp: mount.Hp})
if err = this.module.parkourComp.Change(team.Captainid, map[string]interface{}{
"state": team.State,
"captainid": team.Captainid,
"member": team.Member,
}); err != nil {
code = pb.ErrorCode_DBError
return
}
}
if err = this.module.match(team); err != nil { if err = this.module.match(team); err != nil {
code = pb.ErrorCode_DBError code = pb.ErrorCode_DBError

4
modules/parkour/api_viewplayer.go
View File

@ -18,7 +18,9 @@ func (this *apiComp) ViewPlayer(session comm.IUserSession, req *pb.ParkourViewPl
if code = this.ViewPlayerCheck(session, req); code != pb.ErrorCode_Success { if code = this.ViewPlayerCheck(session, req); code != pb.ErrorCode_Success {
return return
} }
resp = &pb.ParkourViewPlayerResp{
Player: make([]*pb.ParkourData, 0),
}
for _, uid := range req.Uid { for _, uid := range req.Uid {
if u := this.module.ModuleUser.GetUser(uid); u != nil { if u := this.module.ModuleUser.GetUser(uid); u != nil {
{ {

25
modules/parkour/module.go
View File

@ -148,11 +148,12 @@ func (this *Parkour) createbattle(ctx context.Context, req *pb.RPCParkourMatchSu
v.Ready = true v.Ready = true
} }
} }
battle.BuleMember = req.Bule
for _, v := range battle.Session { for _, v := range battle.Session {
sessions = append(sessions, v) sessions = append(sessions, v)
} }
battle.BuleMember = req.Bule
if err = this.raceComp.addrace(race); err != nil { if err = this.raceComp.addrace(race); err != nil {
return return
} }
@ -406,17 +407,6 @@ func (this *Parkour) useroffline(uid, sessionid string) {
} }
if info.State == pb.RaceTeamState_teaming { if info.State == pb.RaceTeamState_teaming {
if info.Captainid == uid { if info.Captainid == uid {
info.Invite = info.Invite[:0]
info.Member = info.Member[:0]
if err = this.parkourComp.Change(uid, map[string]interface{}{
"captainid": "",
"state": 0,
"Invite": info.Invite,
"member": info.Member,
}); err != nil {
this.Error("用户离线! 处理数据", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()})
return
}
users = make([]string, 0) users = make([]string, 0)
for _, v := range info.Member { for _, v := range info.Member {
if v.Uid != uid && !v.Isai { if v.Uid != uid && !v.Isai {
@ -430,6 +420,17 @@ func (this *Parkour) useroffline(uid, sessionid string) {
} }
} }
} }
info.Invite = info.Invite[:0]
info.Member = info.Member[:0]
if err = this.parkourComp.Change(uid, map[string]interface{}{
"captainid": "",
"state": 0,
"Invite": info.Invite,
"member": info.Member,
}); err != nil {
this.Error("用户离线! 处理数据", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()})
return
}
if len(users) > 0 { if len(users) > 0 {
if err = this.SendMsgToUsers(string(comm.ModulePvp), "teamdisbandnotice", &pb.ParkourTeamDisbandNoticePush{}, users...); err != nil { if err = this.SendMsgToUsers(string(comm.ModulePvp), "teamdisbandnotice", &pb.ParkourTeamDisbandNoticePush{}, users...); err != nil {
this.Errorln(err) this.Errorln(err)

2
modules/smithy/api_forgeequip.go
View File

@ -87,7 +87,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
needTemperatureCos = reelcfg.TemperatureCos * req.Count needTemperatureCos = reelcfg.TemperatureCos * req.Count
// 熟练度减少的温度 // 熟练度减少的温度
t := this.module.modelStove.CheckTemperature(req.ReelId, stove.Data[req.ReelId].Lv) t := this.module.modelStove.CheckTemperature(req.ReelId, stove.Data[req.ReelId].Lv)
needTemperatureCos = reelcfg.TemperatureCos * (1000 - t) / 1000 // 千分比 needTemperatureCos = needTemperatureCos * (1000 - t) / 1000 // 千分比
if req.Lava > 0 { // 熔岩打造 if req.Lava > 0 { // 熔岩打造
exemption := this.module.ModuleTools.GetGlobalConf().ExemptionTemperatureCos // 预计消耗温度 exemption := this.module.ModuleTools.GetGlobalConf().ExemptionTemperatureCos // 预计消耗温度

50
modules/sys/config.go
View File

@ -4,7 +4,9 @@ import (
"fmt" "fmt"
"go_dreamfactory/lego/core" "go_dreamfactory/lego/core"
"go_dreamfactory/modules" "go_dreamfactory/modules"
"go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs" cfg "go_dreamfactory/sys/configure/structs"
"sync"
) )
const ( const (
@ -13,15 +15,61 @@ const (
type configureComp struct { type configureComp struct {
modules.MCompConfigure modules.MCompConfigure
module *ModuleSys
hlock sync.RWMutex
maplv map[int32][]string // 监听等级大于1 的配置
maptask map[int32][]string
mapmline map[int32][]string
} }
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) {
err = this.MCompConfigure.Init(service, module, comp, options) err = this.MCompConfigure.Init(service, module, comp, options)
this.LoadConfigure(gameOpencond, cfg.NewGameOpencond) //this.LoadConfigure(gameOpencond, cfg.NewGameOpencond)
configure.RegisterConfigure(gameOpencond, cfg.NewGameOpencond, this.LoadCondConfig)
this.module = module.(*ModuleSys)
this.getFuncCfg("sign")
return return
} }
func (this *configureComp) LoadCondConfig() {
this.maplv = make(map[int32][]string, 0)
this.maptask = make(map[int32][]string, 0)
this.mapmline = make(map[int32][]string, 0)
if v, err := this.GetConfigure(gameOpencond); err == nil {
if data, ok := v.(*cfg.GameOpencond); ok {
for _, v := range data.GetDataList() {
for _, v1 := range v.Main {
if v.ActivateType == 2 {
if v1.Key == 1 && v1.Param > 1 {
this.maplv[v1.Param] = append(this.maplv[v1.Param], v.Id)
}
if v1.Key == 3 && v1.Param > 1 {
this.maptask[v1.Param] = append(this.maptask[v1.Param], v.Id)
}
if v1.Key == 2 && v1.Param > 1 {
this.mapmline[v1.Param] = append(this.mapmline[v1.Param], v.Id)
}
}
}
}
}
}
}
func (this *configureComp) GetOpencondLv(lv int32) []string {
return this.maplv[lv]
}
func (this *configureComp) getOpencondMline(id int32) []string {
return this.mapmline[id]
}
func (this *configureComp) getOpencondTask(id int32) []string {
return this.maptask[id]
}
func (this *configureComp) getOpencondCfg() (data *cfg.GameOpencond, err error) { func (this *configureComp) getOpencondCfg() (data *cfg.GameOpencond, err error) {
var ( var (
v interface{} v interface{}

49
modules/sys/module.go
View File

@ -45,3 +45,52 @@ func (this *ModuleSys) IsAccess(funcName string, userId string) (code pb.ErrorCo
func (this *ModuleSys) ValidCond(uid string, conf *cfg.GameOpencondData) string { func (this *ModuleSys) ValidCond(uid string, conf *cfg.GameOpencondData) string {
return this.modelSys.validCond(uid, conf) return this.modelSys.validCond(uid, conf)
} }
func (this *ModuleSys) CheckLvUpCond(session comm.IUserSession, lv int32) {
if cond := this.configure.GetOpencondLv(lv); len(cond) > 0 {
this.AutoActivate(session, cond)
}
}
func (this *ModuleSys) CheckMlineCond(session comm.IUserSession, id int32) {
if cond := this.configure.getOpencondMline(id); len(cond) > 0 {
this.AutoActivate(session, cond)
}
}
func (this *ModuleSys) CheckTaskCond(session comm.IUserSession, id int32) {
if cond := this.configure.getOpencondTask(id); len(cond) > 0 {
this.AutoActivate(session, cond)
}
}
// 自动激活
func (this *ModuleSys) AutoActivate(session comm.IUserSession, cids []string) bool {
var (
szOpen []string
)
list, _ := this.modelSys.GetOpenCondList(session.GetUserId())
for _, cid := range cids {
opencfg := this.configure.getOpencondCfgByCid(cid)
if opencfg != nil {
if id := this.modelSys.validCond(session.GetUserId(), opencfg); id == "" { // 条件不满足
break
}
}
for k, v := range list.Cond {
if k == cid && v != 0 {
list.Cond[cid] = 1
szOpen = append(szOpen, cid)
break
}
}
}
if len(szOpen) > 0 {
this.modelSys.ChangeOpenCondData(session.GetUserId(), map[string]interface{}{
"cond": list.Cond,
})
}
// 推送变化
session.SendMsg(string(this.GetType()), "open", &pb.SysFuncOpnePush{
Cid: szOpen,
})
return true
}

11
modules/timer/parkour.go
View File

@ -197,6 +197,7 @@ func (this *ParkourComp) cancel(ctx context.Context, req *pb.RPCParkourCancelMat
//定时匹配处理 //定时匹配处理
func (this *ParkourComp) timer() { func (this *ParkourComp) timer() {
this.module.Errorf("捕羊大赛 定时匹配,%d", this.total)
if this.total == 0 { if this.total == 0 {
return return
} }
@ -338,7 +339,7 @@ func (this *ParkourComp) timer() {
reduser = append(reduser, this.teams[v]...) reduser = append(reduser, this.teams[v]...)
} }
for _, v := range bule { for _, v := range bule {
buleuser = append(reduser, this.teams[v]...) buleuser = append(buleuser, this.teams[v]...)
} }
if len(users)+rednum+bulenum < 6 { if len(users)+rednum+bulenum < 6 {
@ -347,8 +348,9 @@ func (this *ParkourComp) timer() {
//补充人员 //补充人员
if len(reduser) < 3 { if len(reduser) < 3 {
n := len(reduser)
reduser = append(reduser, users[0:(3-len(reduser))]...) reduser = append(reduser, users[0:(3-len(reduser))]...)
users = users[(3 - len(reduser)):] users = users[(3 - n):]
for _, v := range reduser[rednum:3] { for _, v := range reduser[rednum:3] {
if v.Name == "" { //同步用户数据 if v.Name == "" { //同步用户数据
if user, err := this.getuser(v.Uid); err != nil { if user, err := this.getuser(v.Uid); err != nil {
@ -357,13 +359,15 @@ func (this *ParkourComp) timer() {
} else { } else {
v.Name = user.Name v.Name = user.Name
v.Avatar = user.Avatar v.Avatar = user.Avatar
v.Lv = user.Lv
} }
} }
} }
} }
if len(buleuser) < 3 { if len(buleuser) < 3 {
n := len(buleuser)
buleuser = append(buleuser, users[0:(3-len(buleuser))]...) buleuser = append(buleuser, users[0:(3-len(buleuser))]...)
users = users[(3 - len(buleuser)):] users = users[(3 - n):]
for _, v := range buleuser[bulenum:3] { for _, v := range buleuser[bulenum:3] {
if v.Name == "" { //同步用户数据 if v.Name == "" { //同步用户数据
if user, err := this.getuser(v.Uid); err != nil { if user, err := this.getuser(v.Uid); err != nil {
@ -372,6 +376,7 @@ func (this *ParkourComp) timer() {
} else { } else {
v.Name = user.Name v.Name = user.Name
v.Avatar = user.Avatar v.Avatar = user.Avatar
v.Lv = user.Lv
} }
} }
} }

1
modules/user/model_user.go
View File

@ -289,6 +289,7 @@ func (this *ModelUser) ChangeLevel(event interface{}, next func(event interface{
} }
et.TriggerEvent(comm.EventOpenCond, ul.session.GetUserId(), funcList) et.TriggerEvent(comm.EventOpenCond, ul.session.GetUserId(), funcList)
isys.CheckLvUpCond(ul.session, curLv) // 校验新功能是否开启
} }
} }
if err := ul.session.SendMsg(string(this.module.GetType()), UserSubTypeLvChangedPush, if err := ul.session.SendMsg(string(this.module.GetType()), UserSubTypeLvChangedPush,

43
modules/viking/api_challengeover.go
View File

@ -25,6 +25,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
atno []*pb.UserAtno // atno 类型 atno []*pb.UserAtno // atno 类型
del []string // 自动出售的装备 del []string // 自动出售的装备
changExp map[string]int32 changExp map[string]int32
res []*cfg.Gameatn // 最后获得的资源
) )
changExp = make(map[string]int32, 0) changExp = make(map[string]int32, 0)
mapData = make(map[string]interface{}, 0) mapData = make(map[string]interface{}, 0)
@ -102,22 +103,36 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
mapData["bossTime"] = viking.BossTime // 更新时间 mapData["bossTime"] = viking.BossTime // 更新时间
reward = this.module.configure.GetDropReward(vikingCfg.Drop) // 获取掉落奖励 reward = this.module.configure.GetDropReward(vikingCfg.Drop) // 获取掉落奖励
if code, atno = this.module.DispenseAtno(session, reward, true); code != pb.ErrorCode_Success { // 星级校验
return for _, v := range reward {
bFound := false
if v.A == "equp" {
for _, star := range req.Star {
cfg := this.configure.GetEquipmentConfigureById(v.T)
if cfg != nil && star == cfg.Star { // 自动出售 转换成其他道具
if len(cfg.Sale) != 0 {
bFound = true
res = append(res, cfg.Sale...)
}
break
}
}
}
// else if v.A == "item" { //道具出售 以后补充
// if cfg, err := this.configure.GetItemConfigureData(v.T); err != nil { // 自动出售 转换成其他道具
// if len(cfg.Sale) != 0 {
// bFound = true
// res = append(res, cfg.Sale...)
// }
// }
// }
if !bFound {
res = append(res, v)
}
} }
for _, v := range req.Star { if code, atno = this.module.DispenseAtno(session, res, true); code != pb.ErrorCode_Success {
for _, v1 := range atno { return
if v1.A == "equp" {
cfg := this.configure.GetEquipmentConfigureById(v1.T)
if cfg != nil && cfg.Star == v {
del = append(del, v1.O)
}
}
}
}
if len(del) > 0 { // 自动出售
this.equip.SellEquipments(session, del)
} }
code = this.module.ModifyVikingData(session.GetUserId(), mapData) code = this.module.ModifyVikingData(session.GetUserId(), mapData)

106
pb/library_db.pb.go
View File

@ -31,7 +31,7 @@ type DBLibrary struct {
Herofetter map[string]string `protobuf:"bytes,4,rep,name=herofetter,proto3" json:"herofetter" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // key: hid value: DBHeroFetter ObjID Herofetter map[string]string `protobuf:"bytes,4,rep,name=herofetter,proto3" json:"herofetter" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // key: hid value: DBHeroFetter ObjID
Prize map[int32]int32 `protobuf:"bytes,5,rep,name=prize,proto3" json:"prize" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //是否领奖 key 好感度等级 Prize map[int32]int32 `protobuf:"bytes,5,rep,name=prize,proto3" json:"prize" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //是否领奖 key 好感度等级
Storyid int32 `protobuf:"varint,6,opt,name=storyid,proto3" json:"storyid"` // 故事id 用来判断是否领奖 Storyid int32 `protobuf:"varint,6,opt,name=storyid,proto3" json:"storyid"` // 故事id 用来判断是否领奖
Activation bool `protobuf:"varint,7,opt,name=activation,proto3" json:"activation"` // 是否激活 Fidlv int32 `protobuf:"varint,7,opt,name=fidlv,proto3" json:"fidlv"` // 羁绊领奖等级
} }
func (x *DBLibrary) Reset() { func (x *DBLibrary) Reset() {
@ -108,11 +108,11 @@ func (x *DBLibrary) GetStoryid() int32 {
return 0 return 0
} }
func (x *DBLibrary) GetActivation() bool { func (x *DBLibrary) GetFidlv() int32 {
if x != nil { if x != nil {
return x.Activation return x.Fidlv
} }
return false return 0
} }
// 羁绊英雄数据 // 羁绊英雄数据
@ -398,7 +398,7 @@ var File_library_library_db_proto protoreflect.FileDescriptor
var file_library_library_db_proto_rawDesc = []byte{ var file_library_library_db_proto_rawDesc = []byte{
0x0a, 0x18, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x2f, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x0a, 0x18, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x2f, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72,
0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xdb, 0x02, 0x0a, 0x09, 0x44, 0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd1, 0x02, 0x0a, 0x09, 0x44,
0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x66, 0x69, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x66, 0x69,
@ -411,55 +411,55 @@ var file_library_library_db_proto_rawDesc = []byte{
0x61, 0x72, 0x79, 0x2e, 0x50, 0x72, 0x69, 0x7a, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x61, 0x72, 0x79, 0x2e, 0x50, 0x72, 0x69, 0x7a, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05,
0x70, 0x72, 0x69, 0x7a, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x69, 0x64, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x69, 0x64,
0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x69, 0x64, 0x12, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x69, 0x64, 0x12,
0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x14, 0x0a, 0x05, 0x66, 0x69, 0x64, 0x6c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
0x01, 0x28, 0x08, 0x52, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x66, 0x69, 0x64, 0x6c, 0x76, 0x1a, 0x3d, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x66, 0x65, 0x74,
0x3d, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x74, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x7a, 0x65, 0x45, 0x6e, 0x74,
0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xbe,
0x0a, 0x0a, 0x50, 0x72, 0x69, 0x7a, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x02, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x12,
0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12,
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xbe, 0x02, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, 0x73,
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x68, 0x69, 0x73, 0x74,
0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x6f, 0x72, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x61, 0x76, 0x6f, 0x72, 0x6c, 0x76, 0x18, 0x05,
0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x66, 0x61, 0x76, 0x6f, 0x72, 0x6c, 0x76, 0x12, 0x1a, 0x0a,
0x6f, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x04, 0x08, 0x66, 0x61, 0x76, 0x6f, 0x72, 0x65, 0x78, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52,
0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x18, 0x0a, 0x08, 0x66, 0x61, 0x76, 0x6f, 0x72, 0x65, 0x78, 0x70, 0x12, 0x34, 0x0a, 0x07, 0x6c, 0x76, 0x70,
0x07, 0x66, 0x61, 0x76, 0x6f, 0x72, 0x6c, 0x76, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x69, 0x7a, 0x65, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x48,
0x66, 0x61, 0x76, 0x6f, 0x72, 0x6c, 0x76, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x61, 0x76, 0x6f, 0x72, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x2e, 0x4c, 0x76, 0x70, 0x72, 0x69, 0x7a,
0x65, 0x78, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x61, 0x76, 0x6f, 0x72, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x6c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x12,
0x65, 0x78, 0x70, 0x12, 0x34, 0x0a, 0x07, 0x6c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x18, 0x08, 0x1c, 0x0a, 0x09, 0x67, 0x69, 0x76, 0x65, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x28, 0x05, 0x52, 0x09, 0x67, 0x69, 0x76, 0x65, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a,
0x74, 0x65, 0x72, 0x2e, 0x4c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74,
0x52, 0x07, 0x6c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x67, 0x69, 0x76, 0x69, 0x6d, 0x65, 0x1a, 0x3a, 0x0a, 0x0c, 0x4c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x45, 0x6e,
0x65, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x67, 0x69, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
0x76, 0x65, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x3a, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
0x0c, 0x4c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0xbe, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72,
0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69,
0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xbe, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x75, 0x69, 0x64, 0x12, 0x3e, 0x0a, 0x0a, 0x66, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73,
0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x6b, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x44, 0x42, 0x46, 0x65, 0x74, 0x74,
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x2e, 0x46, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54, 0x61,
0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x3e, 0x0a, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x66, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54,
0x0a, 0x66, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x18, 0x03, 0x20, 0x03, 0x28, 0x61, 0x73, 0x6b, 0x1a, 0x4b, 0x0a, 0x0f, 0x46, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73,
0x0b, 0x32, 0x1e, 0x2e, 0x44, 0x42, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
0x79, 0x2e, 0x46, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x22, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
0x79, 0x52, 0x0a, 0x66, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x1a, 0x4b, 0x0a, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72,
0x0f, 0x46, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x22, 0x23, 0x0a, 0x0b, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x12,
0x65, 0x79, 0x12, 0x22, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05,
0x0b, 0x32, 0x0c, 0x2e, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x3c, 0x0a, 0x0a, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x54,
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x23, 0x0a, 0x0b, 0x46, 0x65, 0x61, 0x73, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20,
0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73,
0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61,
0x3c, 0x0a, 0x0a, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x16, 0x0a, 0x74, 0x75, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x74, 0x6f, 0x33,
0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18,
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x06, 0x5a,
0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (

477
pb/library_msg.pb.go
View File

@ -192,109 +192,6 @@ func (x *LibraryGetFetterListResp) GetData() []*DBHeroFetter {
return nil return nil
} }
// 领取羁绊等级奖励
type LibraryGetRewardReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
ObjId string `protobuf:"bytes,1,opt,name=objId,proto3" json:"objId"` // DBLibrary 的ObjID
Fetterlv int32 `protobuf:"varint,2,opt,name=fetterlv,proto3" json:"fetterlv"` // 羁绊等级
}
func (x *LibraryGetRewardReq) Reset() {
*x = LibraryGetRewardReq{}
if protoimpl.UnsafeEnabled {
mi := &file_library_library_msg_proto_msgTypes[4]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *LibraryGetRewardReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*LibraryGetRewardReq) ProtoMessage() {}
func (x *LibraryGetRewardReq) ProtoReflect() protoreflect.Message {
mi := &file_library_library_msg_proto_msgTypes[4]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use LibraryGetRewardReq.ProtoReflect.Descriptor instead.
func (*LibraryGetRewardReq) Descriptor() ([]byte, []int) {
return file_library_library_msg_proto_rawDescGZIP(), []int{4}
}
func (x *LibraryGetRewardReq) GetObjId() string {
if x != nil {
return x.ObjId
}
return ""
}
func (x *LibraryGetRewardReq) GetFetterlv() int32 {
if x != nil {
return x.Fetterlv
}
return 0
}
type LibraryGetRewardResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Data *DBLibrary `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
}
func (x *LibraryGetRewardResp) Reset() {
*x = LibraryGetRewardResp{}
if protoimpl.UnsafeEnabled {
mi := &file_library_library_msg_proto_msgTypes[5]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *LibraryGetRewardResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*LibraryGetRewardResp) ProtoMessage() {}
func (x *LibraryGetRewardResp) ProtoReflect() protoreflect.Message {
mi := &file_library_library_msg_proto_msgTypes[5]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use LibraryGetRewardResp.ProtoReflect.Descriptor instead.
func (*LibraryGetRewardResp) Descriptor() ([]byte, []int) {
return file_library_library_msg_proto_rawDescGZIP(), []int{5}
}
func (x *LibraryGetRewardResp) GetData() *DBLibrary {
if x != nil {
return x.Data
}
return nil
}
// 领取剧情奖励 // 领取剧情奖励
type LibraryGetStoryRewardReq struct { type LibraryGetStoryRewardReq struct {
state protoimpl.MessageState state protoimpl.MessageState
@ -308,7 +205,7 @@ type LibraryGetStoryRewardReq struct {
func (x *LibraryGetStoryRewardReq) Reset() { func (x *LibraryGetStoryRewardReq) Reset() {
*x = LibraryGetStoryRewardReq{} *x = LibraryGetStoryRewardReq{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_library_library_msg_proto_msgTypes[6] mi := &file_library_library_msg_proto_msgTypes[4]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -321,7 +218,7 @@ func (x *LibraryGetStoryRewardReq) String() string {
func (*LibraryGetStoryRewardReq) ProtoMessage() {} func (*LibraryGetStoryRewardReq) ProtoMessage() {}
func (x *LibraryGetStoryRewardReq) ProtoReflect() protoreflect.Message { func (x *LibraryGetStoryRewardReq) ProtoReflect() protoreflect.Message {
mi := &file_library_library_msg_proto_msgTypes[6] mi := &file_library_library_msg_proto_msgTypes[4]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -334,7 +231,7 @@ func (x *LibraryGetStoryRewardReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use LibraryGetStoryRewardReq.ProtoReflect.Descriptor instead. // Deprecated: Use LibraryGetStoryRewardReq.ProtoReflect.Descriptor instead.
func (*LibraryGetStoryRewardReq) Descriptor() ([]byte, []int) { func (*LibraryGetStoryRewardReq) Descriptor() ([]byte, []int) {
return file_library_library_msg_proto_rawDescGZIP(), []int{6} return file_library_library_msg_proto_rawDescGZIP(), []int{4}
} }
func (x *LibraryGetStoryRewardReq) GetOid() string { func (x *LibraryGetStoryRewardReq) GetOid() string {
@ -362,7 +259,7 @@ type LibraryGetStoryRewardResp struct {
func (x *LibraryGetStoryRewardResp) Reset() { func (x *LibraryGetStoryRewardResp) Reset() {
*x = LibraryGetStoryRewardResp{} *x = LibraryGetStoryRewardResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_library_library_msg_proto_msgTypes[7] mi := &file_library_library_msg_proto_msgTypes[5]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -375,7 +272,7 @@ func (x *LibraryGetStoryRewardResp) String() string {
func (*LibraryGetStoryRewardResp) ProtoMessage() {} func (*LibraryGetStoryRewardResp) ProtoMessage() {}
func (x *LibraryGetStoryRewardResp) ProtoReflect() protoreflect.Message { func (x *LibraryGetStoryRewardResp) ProtoReflect() protoreflect.Message {
mi := &file_library_library_msg_proto_msgTypes[7] mi := &file_library_library_msg_proto_msgTypes[5]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -388,7 +285,7 @@ func (x *LibraryGetStoryRewardResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use LibraryGetStoryRewardResp.ProtoReflect.Descriptor instead. // Deprecated: Use LibraryGetStoryRewardResp.ProtoReflect.Descriptor instead.
func (*LibraryGetStoryRewardResp) Descriptor() ([]byte, []int) { func (*LibraryGetStoryRewardResp) Descriptor() ([]byte, []int) {
return file_library_library_msg_proto_rawDescGZIP(), []int{7} return file_library_library_msg_proto_rawDescGZIP(), []int{5}
} }
func (x *LibraryGetStoryRewardResp) GetData() *DBHeroFetter { func (x *LibraryGetStoryRewardResp) GetData() *DBHeroFetter {
@ -412,7 +309,7 @@ type LibraryUseGiftReq struct {
func (x *LibraryUseGiftReq) Reset() { func (x *LibraryUseGiftReq) Reset() {
*x = LibraryUseGiftReq{} *x = LibraryUseGiftReq{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_library_library_msg_proto_msgTypes[8] mi := &file_library_library_msg_proto_msgTypes[6]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -425,7 +322,7 @@ func (x *LibraryUseGiftReq) String() string {
func (*LibraryUseGiftReq) ProtoMessage() {} func (*LibraryUseGiftReq) ProtoMessage() {}
func (x *LibraryUseGiftReq) ProtoReflect() protoreflect.Message { func (x *LibraryUseGiftReq) ProtoReflect() protoreflect.Message {
mi := &file_library_library_msg_proto_msgTypes[8] mi := &file_library_library_msg_proto_msgTypes[6]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -438,7 +335,7 @@ func (x *LibraryUseGiftReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use LibraryUseGiftReq.ProtoReflect.Descriptor instead. // Deprecated: Use LibraryUseGiftReq.ProtoReflect.Descriptor instead.
func (*LibraryUseGiftReq) Descriptor() ([]byte, []int) { func (*LibraryUseGiftReq) Descriptor() ([]byte, []int) {
return file_library_library_msg_proto_rawDescGZIP(), []int{8} return file_library_library_msg_proto_rawDescGZIP(), []int{6}
} }
func (x *LibraryUseGiftReq) GetHeroid() string { func (x *LibraryUseGiftReq) GetHeroid() string {
@ -473,7 +370,7 @@ type LibraryUseGiftResp struct {
func (x *LibraryUseGiftResp) Reset() { func (x *LibraryUseGiftResp) Reset() {
*x = LibraryUseGiftResp{} *x = LibraryUseGiftResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_library_library_msg_proto_msgTypes[9] mi := &file_library_library_msg_proto_msgTypes[7]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -486,7 +383,7 @@ func (x *LibraryUseGiftResp) String() string {
func (*LibraryUseGiftResp) ProtoMessage() {} func (*LibraryUseGiftResp) ProtoMessage() {}
func (x *LibraryUseGiftResp) ProtoReflect() protoreflect.Message { func (x *LibraryUseGiftResp) ProtoReflect() protoreflect.Message {
mi := &file_library_library_msg_proto_msgTypes[9] mi := &file_library_library_msg_proto_msgTypes[7]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -499,7 +396,7 @@ func (x *LibraryUseGiftResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use LibraryUseGiftResp.ProtoReflect.Descriptor instead. // Deprecated: Use LibraryUseGiftResp.ProtoReflect.Descriptor instead.
func (*LibraryUseGiftResp) Descriptor() ([]byte, []int) { func (*LibraryUseGiftResp) Descriptor() ([]byte, []int) {
return file_library_library_msg_proto_rawDescGZIP(), []int{9} return file_library_library_msg_proto_rawDescGZIP(), []int{7}
} }
func (x *LibraryUseGiftResp) GetData() *DBHeroFetter { func (x *LibraryUseGiftResp) GetData() *DBHeroFetter {
@ -521,7 +418,7 @@ type LibraryActivationFetterReq struct {
func (x *LibraryActivationFetterReq) Reset() { func (x *LibraryActivationFetterReq) Reset() {
*x = LibraryActivationFetterReq{} *x = LibraryActivationFetterReq{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_library_library_msg_proto_msgTypes[10] mi := &file_library_library_msg_proto_msgTypes[8]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -534,7 +431,7 @@ func (x *LibraryActivationFetterReq) String() string {
func (*LibraryActivationFetterReq) ProtoMessage() {} func (*LibraryActivationFetterReq) ProtoMessage() {}
func (x *LibraryActivationFetterReq) ProtoReflect() protoreflect.Message { func (x *LibraryActivationFetterReq) ProtoReflect() protoreflect.Message {
mi := &file_library_library_msg_proto_msgTypes[10] mi := &file_library_library_msg_proto_msgTypes[8]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -547,7 +444,7 @@ func (x *LibraryActivationFetterReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use LibraryActivationFetterReq.ProtoReflect.Descriptor instead. // Deprecated: Use LibraryActivationFetterReq.ProtoReflect.Descriptor instead.
func (*LibraryActivationFetterReq) Descriptor() ([]byte, []int) { func (*LibraryActivationFetterReq) Descriptor() ([]byte, []int) {
return file_library_library_msg_proto_rawDescGZIP(), []int{10} return file_library_library_msg_proto_rawDescGZIP(), []int{8}
} }
func (x *LibraryActivationFetterReq) GetOid() string { func (x *LibraryActivationFetterReq) GetOid() string {
@ -568,7 +465,7 @@ type LibraryActivationFetterResp struct {
func (x *LibraryActivationFetterResp) Reset() { func (x *LibraryActivationFetterResp) Reset() {
*x = LibraryActivationFetterResp{} *x = LibraryActivationFetterResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_library_library_msg_proto_msgTypes[11] mi := &file_library_library_msg_proto_msgTypes[9]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -581,7 +478,7 @@ func (x *LibraryActivationFetterResp) String() string {
func (*LibraryActivationFetterResp) ProtoMessage() {} func (*LibraryActivationFetterResp) ProtoMessage() {}
func (x *LibraryActivationFetterResp) ProtoReflect() protoreflect.Message { func (x *LibraryActivationFetterResp) ProtoReflect() protoreflect.Message {
mi := &file_library_library_msg_proto_msgTypes[11] mi := &file_library_library_msg_proto_msgTypes[9]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -594,7 +491,7 @@ func (x *LibraryActivationFetterResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use LibraryActivationFetterResp.ProtoReflect.Descriptor instead. // Deprecated: Use LibraryActivationFetterResp.ProtoReflect.Descriptor instead.
func (*LibraryActivationFetterResp) Descriptor() ([]byte, []int) { func (*LibraryActivationFetterResp) Descriptor() ([]byte, []int) {
return file_library_library_msg_proto_rawDescGZIP(), []int{11} return file_library_library_msg_proto_rawDescGZIP(), []int{9}
} }
func (x *LibraryActivationFetterResp) GetData() *DBLibrary { func (x *LibraryActivationFetterResp) GetData() *DBLibrary {
@ -617,7 +514,7 @@ type LibraryChangePush struct {
func (x *LibraryChangePush) Reset() { func (x *LibraryChangePush) Reset() {
*x = LibraryChangePush{} *x = LibraryChangePush{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_library_library_msg_proto_msgTypes[12] mi := &file_library_library_msg_proto_msgTypes[10]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -630,7 +527,7 @@ func (x *LibraryChangePush) String() string {
func (*LibraryChangePush) ProtoMessage() {} func (*LibraryChangePush) ProtoMessage() {}
func (x *LibraryChangePush) ProtoReflect() protoreflect.Message { func (x *LibraryChangePush) ProtoReflect() protoreflect.Message {
mi := &file_library_library_msg_proto_msgTypes[12] mi := &file_library_library_msg_proto_msgTypes[10]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -643,7 +540,7 @@ func (x *LibraryChangePush) ProtoReflect() protoreflect.Message {
// Deprecated: Use LibraryChangePush.ProtoReflect.Descriptor instead. // Deprecated: Use LibraryChangePush.ProtoReflect.Descriptor instead.
func (*LibraryChangePush) Descriptor() ([]byte, []int) { func (*LibraryChangePush) Descriptor() ([]byte, []int) {
return file_library_library_msg_proto_rawDescGZIP(), []int{12} return file_library_library_msg_proto_rawDescGZIP(), []int{10}
} }
func (x *LibraryChangePush) GetData() []*DBLibrary { func (x *LibraryChangePush) GetData() []*DBLibrary {
@ -673,7 +570,7 @@ type LibraryLvRewardReq struct {
func (x *LibraryLvRewardReq) Reset() { func (x *LibraryLvRewardReq) Reset() {
*x = LibraryLvRewardReq{} *x = LibraryLvRewardReq{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_library_library_msg_proto_msgTypes[13] mi := &file_library_library_msg_proto_msgTypes[11]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -686,7 +583,7 @@ func (x *LibraryLvRewardReq) String() string {
func (*LibraryLvRewardReq) ProtoMessage() {} func (*LibraryLvRewardReq) ProtoMessage() {}
func (x *LibraryLvRewardReq) ProtoReflect() protoreflect.Message { func (x *LibraryLvRewardReq) ProtoReflect() protoreflect.Message {
mi := &file_library_library_msg_proto_msgTypes[13] mi := &file_library_library_msg_proto_msgTypes[11]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -699,7 +596,7 @@ func (x *LibraryLvRewardReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use LibraryLvRewardReq.ProtoReflect.Descriptor instead. // Deprecated: Use LibraryLvRewardReq.ProtoReflect.Descriptor instead.
func (*LibraryLvRewardReq) Descriptor() ([]byte, []int) { func (*LibraryLvRewardReq) Descriptor() ([]byte, []int) {
return file_library_library_msg_proto_rawDescGZIP(), []int{13} return file_library_library_msg_proto_rawDescGZIP(), []int{11}
} }
func (x *LibraryLvRewardReq) GetOid() string { func (x *LibraryLvRewardReq) GetOid() string {
@ -727,7 +624,7 @@ type LibraryLvRewardResp struct {
func (x *LibraryLvRewardResp) Reset() { func (x *LibraryLvRewardResp) Reset() {
*x = LibraryLvRewardResp{} *x = LibraryLvRewardResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_library_library_msg_proto_msgTypes[14] mi := &file_library_library_msg_proto_msgTypes[12]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -740,7 +637,7 @@ func (x *LibraryLvRewardResp) String() string {
func (*LibraryLvRewardResp) ProtoMessage() {} func (*LibraryLvRewardResp) ProtoMessage() {}
func (x *LibraryLvRewardResp) ProtoReflect() protoreflect.Message { func (x *LibraryLvRewardResp) ProtoReflect() protoreflect.Message {
mi := &file_library_library_msg_proto_msgTypes[14] mi := &file_library_library_msg_proto_msgTypes[12]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -753,7 +650,7 @@ func (x *LibraryLvRewardResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use LibraryLvRewardResp.ProtoReflect.Descriptor instead. // Deprecated: Use LibraryLvRewardResp.ProtoReflect.Descriptor instead.
func (*LibraryLvRewardResp) Descriptor() ([]byte, []int) { func (*LibraryLvRewardResp) Descriptor() ([]byte, []int) {
return file_library_library_msg_proto_rawDescGZIP(), []int{14} return file_library_library_msg_proto_rawDescGZIP(), []int{12}
} }
func (x *LibraryLvRewardResp) GetData() *DBHeroFetter { func (x *LibraryLvRewardResp) GetData() *DBHeroFetter {
@ -775,7 +672,7 @@ type LibraryFetterstoryTaskReq struct {
func (x *LibraryFetterstoryTaskReq) Reset() { func (x *LibraryFetterstoryTaskReq) Reset() {
*x = LibraryFetterstoryTaskReq{} *x = LibraryFetterstoryTaskReq{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_library_library_msg_proto_msgTypes[15] mi := &file_library_library_msg_proto_msgTypes[13]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -788,7 +685,7 @@ func (x *LibraryFetterstoryTaskReq) String() string {
func (*LibraryFetterstoryTaskReq) ProtoMessage() {} func (*LibraryFetterstoryTaskReq) ProtoMessage() {}
func (x *LibraryFetterstoryTaskReq) ProtoReflect() protoreflect.Message { func (x *LibraryFetterstoryTaskReq) ProtoReflect() protoreflect.Message {
mi := &file_library_library_msg_proto_msgTypes[15] mi := &file_library_library_msg_proto_msgTypes[13]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -801,7 +698,7 @@ func (x *LibraryFetterstoryTaskReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use LibraryFetterstoryTaskReq.ProtoReflect.Descriptor instead. // Deprecated: Use LibraryFetterstoryTaskReq.ProtoReflect.Descriptor instead.
func (*LibraryFetterstoryTaskReq) Descriptor() ([]byte, []int) { func (*LibraryFetterstoryTaskReq) Descriptor() ([]byte, []int) {
return file_library_library_msg_proto_rawDescGZIP(), []int{15} return file_library_library_msg_proto_rawDescGZIP(), []int{13}
} }
func (x *LibraryFetterstoryTaskReq) GetFetterId() int32 { func (x *LibraryFetterstoryTaskReq) GetFetterId() int32 {
@ -822,7 +719,7 @@ type LibraryFetterstoryTaskResp struct {
func (x *LibraryFetterstoryTaskResp) Reset() { func (x *LibraryFetterstoryTaskResp) Reset() {
*x = LibraryFetterstoryTaskResp{} *x = LibraryFetterstoryTaskResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_library_library_msg_proto_msgTypes[16] mi := &file_library_library_msg_proto_msgTypes[14]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -835,7 +732,7 @@ func (x *LibraryFetterstoryTaskResp) String() string {
func (*LibraryFetterstoryTaskResp) ProtoMessage() {} func (*LibraryFetterstoryTaskResp) ProtoMessage() {}
func (x *LibraryFetterstoryTaskResp) ProtoReflect() protoreflect.Message { func (x *LibraryFetterstoryTaskResp) ProtoReflect() protoreflect.Message {
mi := &file_library_library_msg_proto_msgTypes[16] mi := &file_library_library_msg_proto_msgTypes[14]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -848,7 +745,7 @@ func (x *LibraryFetterstoryTaskResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use LibraryFetterstoryTaskResp.ProtoReflect.Descriptor instead. // Deprecated: Use LibraryFetterstoryTaskResp.ProtoReflect.Descriptor instead.
func (*LibraryFetterstoryTaskResp) Descriptor() ([]byte, []int) { func (*LibraryFetterstoryTaskResp) Descriptor() ([]byte, []int) {
return file_library_library_msg_proto_rawDescGZIP(), []int{16} return file_library_library_msg_proto_rawDescGZIP(), []int{14}
} }
func (x *LibraryFetterstoryTaskResp) GetList() []*FetterTask { func (x *LibraryFetterstoryTaskResp) GetList() []*FetterTask {
@ -858,6 +755,101 @@ func (x *LibraryFetterstoryTaskResp) GetList() []*FetterTask {
return nil return nil
} }
// 手动提升羁绊等级
type LibraryFetterLvUpReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
LibOid string `protobuf:"bytes,1,opt,name=libOid,proto3" json:"libOid"` // 羁绊对象id
}
func (x *LibraryFetterLvUpReq) Reset() {
*x = LibraryFetterLvUpReq{}
if protoimpl.UnsafeEnabled {
mi := &file_library_library_msg_proto_msgTypes[15]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *LibraryFetterLvUpReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*LibraryFetterLvUpReq) ProtoMessage() {}
func (x *LibraryFetterLvUpReq) ProtoReflect() protoreflect.Message {
mi := &file_library_library_msg_proto_msgTypes[15]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use LibraryFetterLvUpReq.ProtoReflect.Descriptor instead.
func (*LibraryFetterLvUpReq) Descriptor() ([]byte, []int) {
return file_library_library_msg_proto_rawDescGZIP(), []int{15}
}
func (x *LibraryFetterLvUpReq) GetLibOid() string {
if x != nil {
return x.LibOid
}
return ""
}
type LibraryFetterLvUpResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Data *DBLibrary `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
}
func (x *LibraryFetterLvUpResp) Reset() {
*x = LibraryFetterLvUpResp{}
if protoimpl.UnsafeEnabled {
mi := &file_library_library_msg_proto_msgTypes[16]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *LibraryFetterLvUpResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*LibraryFetterLvUpResp) ProtoMessage() {}
func (x *LibraryFetterLvUpResp) ProtoReflect() protoreflect.Message {
mi := &file_library_library_msg_proto_msgTypes[16]
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 LibraryFetterLvUpResp.ProtoReflect.Descriptor instead.
func (*LibraryFetterLvUpResp) Descriptor() ([]byte, []int) {
return file_library_library_msg_proto_rawDescGZIP(), []int{16}
}
func (x *LibraryFetterLvUpResp) GetData() *DBLibrary {
if x != nil {
return x.Data
}
return nil
}
var File_library_library_msg_proto protoreflect.FileDescriptor var File_library_library_msg_proto protoreflect.FileDescriptor
var file_library_library_msg_proto_rawDesc = []byte{ var file_library_library_msg_proto_rawDesc = []byte{
@ -874,61 +866,60 @@ var file_library_library_msg_proto_rawDesc = []byte{
0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x4c,
0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18,
0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65,
0x74, 0x74, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x47, 0x0a, 0x13, 0x4c, 0x69, 0x74, 0x74, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x46, 0x0a, 0x18, 0x4c, 0x69,
0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x77,
0x71, 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20,
0x52, 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, 0x73, 0x74,
0x72, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x68, 0x69, 0x73, 0x74, 0x6f,
0x72, 0x6c, 0x76, 0x22, 0x36, 0x0a, 0x14, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x72, 0x79, 0x22, 0x3e, 0x0a, 0x19, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74,
0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12,
0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x46, 0x0a, 0x18, 0x4c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61,
0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x74, 0x61, 0x22, 0x59, 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x55, 0x73, 0x65,
0x47, 0x69, 0x66, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69,
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x12,
0x14, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18,
0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x22, 0x37, 0x0a,
0x12, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x55, 0x73, 0x65, 0x47, 0x69, 0x66, 0x74, 0x52,
0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28,
0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72,
0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x1a, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72,
0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x65, 0x74, 0x74, 0x65,
0x72, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, 0x3d, 0x0a, 0x1b, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72,
0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x65, 0x74, 0x74, 0x65,
0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52,
0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x5a, 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79,
0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61,
0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62,
0x72, 0x61, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x25, 0x0a, 0x06, 0x66, 0x65,
0x74, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48,
0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x06, 0x66, 0x65, 0x74, 0x74, 0x65,
0x72, 0x22, 0x36, 0x0a, 0x12, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65,
0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01,
0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, 0x73, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18,
0x74, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x68, 0x69, 0x73, 0x74, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x38, 0x0a, 0x13, 0x4c, 0x69, 0x62,
0x6f, 0x72, 0x79, 0x22, 0x3e, 0x0a, 0x19, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70,
0x74, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70,
0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d,
0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x04, 0x64, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x04, 0x64,
0x61, 0x74, 0x61, 0x22, 0x59, 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x55, 0x73, 0x61, 0x74, 0x61, 0x22, 0x37, 0x0a, 0x19, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65,
0x65, 0x47, 0x69, 0x66, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71,
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x28, 0x05, 0x52, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x49, 0x64, 0x22, 0x3d, 0x0a, 0x1a,
0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f,
0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x22, 0x37, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69,
0x0a, 0x12, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x55, 0x73, 0x65, 0x47, 0x69, 0x66, 0x74, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x65, 0x74, 0x74, 0x65,
0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2e, 0x0a, 0x14, 0x4c,
0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x4c, 0x76, 0x55, 0x70,
0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x1a, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x6c, 0x69, 0x62, 0x4f, 0x69, 0x64, 0x18, 0x01, 0x20,
0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x65, 0x74, 0x74, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6c, 0x69, 0x62, 0x4f, 0x69, 0x64, 0x22, 0x37, 0x0a, 0x15, 0x4c,
0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x4c, 0x76, 0x55, 0x70,
0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, 0x3d, 0x0a, 0x1b, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01,
0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x65, 0x74, 0x74, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x04,
0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x6f, 0x74, 0x6f, 0x33,
0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x5a, 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72,
0x79, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x04, 0x64,
0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69,
0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x25, 0x0a, 0x06, 0x66,
0x65, 0x74, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42,
0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x06, 0x66, 0x65, 0x74, 0x74,
0x65, 0x72, 0x22, 0x36, 0x0a, 0x12, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52,
0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18,
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76,
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x38, 0x0a, 0x13, 0x4c, 0x69,
0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73,
0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x04,
0x64, 0x61, 0x74, 0x61, 0x22, 0x37, 0x0a, 0x19, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46,
0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65,
0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20,
0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x49, 0x64, 0x22, 0x3d, 0x0a,
0x1a, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74,
0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c,
0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x65, 0x74, 0x74,
0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x42, 0x06, 0x5a, 0x04,
0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -949,19 +940,19 @@ var file_library_library_msg_proto_goTypes = []interface{}{
(*LibraryGetListResp)(nil), // 1: LibraryGetListResp (*LibraryGetListResp)(nil), // 1: LibraryGetListResp
(*LibraryGetFetterListReq)(nil), // 2: LibraryGetFetterListReq (*LibraryGetFetterListReq)(nil), // 2: LibraryGetFetterListReq
(*LibraryGetFetterListResp)(nil), // 3: LibraryGetFetterListResp (*LibraryGetFetterListResp)(nil), // 3: LibraryGetFetterListResp
(*LibraryGetRewardReq)(nil), // 4: LibraryGetRewardReq (*LibraryGetStoryRewardReq)(nil), // 4: LibraryGetStoryRewardReq
(*LibraryGetRewardResp)(nil), // 5: LibraryGetRewardResp (*LibraryGetStoryRewardResp)(nil), // 5: LibraryGetStoryRewardResp
(*LibraryGetStoryRewardReq)(nil), // 6: LibraryGetStoryRewardReq (*LibraryUseGiftReq)(nil), // 6: LibraryUseGiftReq
(*LibraryGetStoryRewardResp)(nil), // 7: LibraryGetStoryRewardResp (*LibraryUseGiftResp)(nil), // 7: LibraryUseGiftResp
(*LibraryUseGiftReq)(nil), // 8: LibraryUseGiftReq (*LibraryActivationFetterReq)(nil), // 8: LibraryActivationFetterReq
(*LibraryUseGiftResp)(nil), // 9: LibraryUseGiftResp (*LibraryActivationFetterResp)(nil), // 9: LibraryActivationFetterResp
(*LibraryActivationFetterReq)(nil), // 10: LibraryActivationFetterReq (*LibraryChangePush)(nil), // 10: LibraryChangePush
(*LibraryActivationFetterResp)(nil), // 11: LibraryActivationFetterResp (*LibraryLvRewardReq)(nil), // 11: LibraryLvRewardReq
(*LibraryChangePush)(nil), // 12: LibraryChangePush (*LibraryLvRewardResp)(nil), // 12: LibraryLvRewardResp
(*LibraryLvRewardReq)(nil), // 13: LibraryLvRewardReq (*LibraryFetterstoryTaskReq)(nil), // 13: LibraryFetterstoryTaskReq
(*LibraryLvRewardResp)(nil), // 14: LibraryLvRewardResp (*LibraryFetterstoryTaskResp)(nil), // 14: LibraryFetterstoryTaskResp
(*LibraryFetterstoryTaskReq)(nil), // 15: LibraryFetterstoryTaskReq (*LibraryFetterLvUpReq)(nil), // 15: LibraryFetterLvUpReq
(*LibraryFetterstoryTaskResp)(nil), // 16: LibraryFetterstoryTaskResp (*LibraryFetterLvUpResp)(nil), // 16: LibraryFetterLvUpResp
(*DBLibrary)(nil), // 17: DBLibrary (*DBLibrary)(nil), // 17: DBLibrary
(*DBHeroFetter)(nil), // 18: DBHeroFetter (*DBHeroFetter)(nil), // 18: DBHeroFetter
(*FetterTask)(nil), // 19: FetterTask (*FetterTask)(nil), // 19: FetterTask
@ -969,14 +960,14 @@ var file_library_library_msg_proto_goTypes = []interface{}{
var file_library_library_msg_proto_depIdxs = []int32{ var file_library_library_msg_proto_depIdxs = []int32{
17, // 0: LibraryGetListResp.data:type_name -> DBLibrary 17, // 0: LibraryGetListResp.data:type_name -> DBLibrary
18, // 1: LibraryGetFetterListResp.data:type_name -> DBHeroFetter 18, // 1: LibraryGetFetterListResp.data:type_name -> DBHeroFetter
17, // 2: LibraryGetRewardResp.data:type_name -> DBLibrary 18, // 2: LibraryGetStoryRewardResp.data:type_name -> DBHeroFetter
18, // 3: LibraryGetStoryRewardResp.data:type_name -> DBHeroFetter 18, // 3: LibraryUseGiftResp.data:type_name -> DBHeroFetter
18, // 4: LibraryUseGiftResp.data:type_name -> DBHeroFetter 17, // 4: LibraryActivationFetterResp.data:type_name -> DBLibrary
17, // 5: LibraryActivationFetterResp.data:type_name -> DBLibrary 17, // 5: LibraryChangePush.data:type_name -> DBLibrary
17, // 6: LibraryChangePush.data:type_name -> DBLibrary 18, // 6: LibraryChangePush.fetter:type_name -> DBHeroFetter
18, // 7: LibraryChangePush.fetter:type_name -> DBHeroFetter 18, // 7: LibraryLvRewardResp.data:type_name -> DBHeroFetter
18, // 8: LibraryLvRewardResp.data:type_name -> DBHeroFetter 19, // 8: LibraryFetterstoryTaskResp.list:type_name -> FetterTask
19, // 9: LibraryFetterstoryTaskResp.list:type_name -> FetterTask 17, // 9: LibraryFetterLvUpResp.data:type_name -> DBLibrary
10, // [10:10] is the sub-list for method output_type 10, // [10:10] is the sub-list for method output_type
10, // [10:10] is the sub-list for method input_type 10, // [10:10] is the sub-list for method input_type
10, // [10:10] is the sub-list for extension type_name 10, // [10:10] is the sub-list for extension type_name
@ -1040,30 +1031,6 @@ func file_library_library_msg_proto_init() {
} }
} }
file_library_library_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { file_library_library_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*LibraryGetRewardReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_library_library_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*LibraryGetRewardResp); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_library_library_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*LibraryGetStoryRewardReq); i { switch v := v.(*LibraryGetStoryRewardReq); i {
case 0: case 0:
return &v.state return &v.state
@ -1075,7 +1042,7 @@ func file_library_library_msg_proto_init() {
return nil return nil
} }
} }
file_library_library_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { file_library_library_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*LibraryGetStoryRewardResp); i { switch v := v.(*LibraryGetStoryRewardResp); i {
case 0: case 0:
return &v.state return &v.state
@ -1087,7 +1054,7 @@ func file_library_library_msg_proto_init() {
return nil return nil
} }
} }
file_library_library_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { file_library_library_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*LibraryUseGiftReq); i { switch v := v.(*LibraryUseGiftReq); i {
case 0: case 0:
return &v.state return &v.state
@ -1099,7 +1066,7 @@ func file_library_library_msg_proto_init() {
return nil return nil
} }
} }
file_library_library_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { file_library_library_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*LibraryUseGiftResp); i { switch v := v.(*LibraryUseGiftResp); i {
case 0: case 0:
return &v.state return &v.state
@ -1111,7 +1078,7 @@ func file_library_library_msg_proto_init() {
return nil return nil
} }
} }
file_library_library_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { file_library_library_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*LibraryActivationFetterReq); i { switch v := v.(*LibraryActivationFetterReq); i {
case 0: case 0:
return &v.state return &v.state
@ -1123,7 +1090,7 @@ func file_library_library_msg_proto_init() {
return nil return nil
} }
} }
file_library_library_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { file_library_library_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*LibraryActivationFetterResp); i { switch v := v.(*LibraryActivationFetterResp); i {
case 0: case 0:
return &v.state return &v.state
@ -1135,7 +1102,7 @@ func file_library_library_msg_proto_init() {
return nil return nil
} }
} }
file_library_library_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { file_library_library_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*LibraryChangePush); i { switch v := v.(*LibraryChangePush); i {
case 0: case 0:
return &v.state return &v.state
@ -1147,7 +1114,7 @@ func file_library_library_msg_proto_init() {
return nil return nil
} }
} }
file_library_library_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { file_library_library_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*LibraryLvRewardReq); i { switch v := v.(*LibraryLvRewardReq); i {
case 0: case 0:
return &v.state return &v.state
@ -1159,7 +1126,7 @@ func file_library_library_msg_proto_init() {
return nil return nil
} }
} }
file_library_library_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { file_library_library_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*LibraryLvRewardResp); i { switch v := v.(*LibraryLvRewardResp); i {
case 0: case 0:
return &v.state return &v.state
@ -1171,7 +1138,7 @@ func file_library_library_msg_proto_init() {
return nil return nil
} }
} }
file_library_library_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { file_library_library_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*LibraryFetterstoryTaskReq); i { switch v := v.(*LibraryFetterstoryTaskReq); i {
case 0: case 0:
return &v.state return &v.state
@ -1183,7 +1150,7 @@ func file_library_library_msg_proto_init() {
return nil return nil
} }
} }
file_library_library_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { file_library_library_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*LibraryFetterstoryTaskResp); i { switch v := v.(*LibraryFetterstoryTaskResp); i {
case 0: case 0:
return &v.state return &v.state
@ -1195,6 +1162,30 @@ func file_library_library_msg_proto_init() {
return nil return nil
} }
} }
file_library_library_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*LibraryFetterLvUpReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_library_library_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*LibraryFetterLvUpResp); 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{

73
pb/sys_msg.pb.go
View File

@ -209,6 +209,53 @@ func (x *SysFuncActivateResp) GetCid() string {
return "" return ""
} }
type SysFuncOpnePush struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Cid []string `protobuf:"bytes,1,rep,name=cid,proto3" json:"cid"`
}
func (x *SysFuncOpnePush) Reset() {
*x = SysFuncOpnePush{}
if protoimpl.UnsafeEnabled {
mi := &file_sys_sys_msg_proto_msgTypes[4]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *SysFuncOpnePush) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*SysFuncOpnePush) ProtoMessage() {}
func (x *SysFuncOpnePush) ProtoReflect() protoreflect.Message {
mi := &file_sys_sys_msg_proto_msgTypes[4]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use SysFuncOpnePush.ProtoReflect.Descriptor instead.
func (*SysFuncOpnePush) Descriptor() ([]byte, []int) {
return file_sys_sys_msg_proto_rawDescGZIP(), []int{4}
}
func (x *SysFuncOpnePush) GetCid() []string {
if x != nil {
return x.Cid
}
return nil
}
var File_sys_sys_msg_proto protoreflect.FileDescriptor var File_sys_sys_msg_proto protoreflect.FileDescriptor
var file_sys_sys_msg_proto_rawDesc = []byte{ var file_sys_sys_msg_proto_rawDesc = []byte{
@ -229,7 +276,10 @@ var file_sys_sys_msg_proto_rawDesc = []byte{
0x28, 0x09, 0x52, 0x03, 0x63, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x13, 0x53, 0x79, 0x73, 0x46, 0x75, 0x28, 0x09, 0x52, 0x03, 0x63, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x13, 0x53, 0x79, 0x73, 0x46, 0x75,
0x6e, 0x63, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x6e, 0x63, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10,
0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x69, 0x64, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x69, 0x64,
0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x22, 0x23, 0x0a, 0x0f, 0x53, 0x79, 0x73, 0x46, 0x75, 0x6e, 0x63, 0x4f, 0x70, 0x6e, 0x65, 0x50,
0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09,
0x52, 0x03, 0x63, 0x69, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -244,16 +294,17 @@ func file_sys_sys_msg_proto_rawDescGZIP() []byte {
return file_sys_sys_msg_proto_rawDescData return file_sys_sys_msg_proto_rawDescData
} }
var file_sys_sys_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 5) var file_sys_sys_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
var file_sys_sys_msg_proto_goTypes = []interface{}{ var file_sys_sys_msg_proto_goTypes = []interface{}{
(*SysFuncGetListReq)(nil), // 0: SysFuncGetListReq (*SysFuncGetListReq)(nil), // 0: SysFuncGetListReq
(*SysFuncGetListResp)(nil), // 1: SysFuncGetListResp (*SysFuncGetListResp)(nil), // 1: SysFuncGetListResp
(*SysFuncActivateReq)(nil), // 2: SysFuncActivateReq (*SysFuncActivateReq)(nil), // 2: SysFuncActivateReq
(*SysFuncActivateResp)(nil), // 3: SysFuncActivateResp (*SysFuncActivateResp)(nil), // 3: SysFuncActivateResp
nil, // 4: SysFuncGetListResp.CondEntry (*SysFuncOpnePush)(nil), // 4: SysFuncOpnePush
nil, // 5: SysFuncGetListResp.CondEntry
} }
var file_sys_sys_msg_proto_depIdxs = []int32{ var file_sys_sys_msg_proto_depIdxs = []int32{
4, // 0: SysFuncGetListResp.cond:type_name -> SysFuncGetListResp.CondEntry 5, // 0: SysFuncGetListResp.cond:type_name -> SysFuncGetListResp.CondEntry
1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method output_type
1, // [1:1] is the sub-list for method input_type 1, // [1:1] is the sub-list for method input_type
1, // [1:1] is the sub-list for extension type_name 1, // [1:1] is the sub-list for extension type_name
@ -315,6 +366,18 @@ func file_sys_sys_msg_proto_init() {
return nil return nil
} }
} }
file_sys_sys_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*SysFuncOpnePush); 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{
@ -322,7 +385,7 @@ func file_sys_sys_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(), GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_sys_sys_msg_proto_rawDesc, RawDescriptor: file_sys_sys_msg_proto_rawDesc,
NumEnums: 0, NumEnums: 0,
NumMessages: 5, NumMessages: 6,
NumExtensions: 0, NumExtensions: 0,
NumServices: 0, NumServices: 0,
}, },

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

@ -38,3 +38,5 @@ func (table *GameEquipAttrlibrary) GetDataList() []*GameEquipAttrlibraryData {
func (table *GameEquipAttrlibrary) Get(key int32) *GameEquipAttrlibraryData { func (table *GameEquipAttrlibrary) Get(key int32) *GameEquipAttrlibraryData {
return table._dataMap[key] return table._dataMap[key]
} }