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:
meixiongfeng 2023-11-04 18:10:48 +08:00
commit adce173e29
42 changed files with 2122 additions and 1632 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/json/game_achievetask.json
View File

@ -142,7 +142,7 @@
"task_group_from": 3, "task_group_from": 3,
"task_name": { "task_name": {
"key": "achieve_achieve_task_task_name_25", "key": "achieve_achieve_task_task_name_25",
"text": "完成1次自动战斗" "text": "自动战斗火焰泰坦难度1"
}, },
"task_desc": { "task_desc": {
"key": "", "key": "",
@ -165,7 +165,7 @@
"task_group_from": 3, "task_group_from": 3,
"task_name": { "task_name": {
"key": "achieve_achieve_task_task_name_26", "key": "achieve_achieve_task_task_name_26",
"text": "完成10次自动战斗" "text": "自动战斗冰霜泰坦难度1"
}, },
"task_desc": { "task_desc": {
"key": "", "key": "",
@ -188,7 +188,7 @@
"task_group_from": 3, "task_group_from": 3,
"task_name": { "task_name": {
"key": "achieve_achieve_task_task_name_27", "key": "achieve_achieve_task_task_name_27",
"text": "完成20次自动战斗" "text": "自动战斗森林泰坦难度1"
}, },
"task_desc": { "task_desc": {
"key": "", "key": "",

24
bin/json/game_buriedcondi.json
View File

@ -26482,7 +26482,7 @@
"key": "buried_buried_condi_tasktxt_899", "key": "buried_buried_condi_tasktxt_899",
"text": "应对师傅的训练" "text": "应对师傅的训练"
}, },
"type": 227, "type": 70,
"valid": 0, "valid": 0,
"head": { "head": {
"a": "attr", "a": "attr",
@ -32140,9 +32140,9 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_1104", "key": "buried_buried_condi_tasktxt_1104",
"text": "完成1次自动战斗" "text": "自动战斗火焰泰坦难度1"
}, },
"type": 161, "type": 75,
"valid": 0, "valid": 0,
"head": { "head": {
"a": "attr", "a": "attr",
@ -32150,7 +32150,7 @@
"n": 1 "n": 1
}, },
"Npc_event_type": 1, "Npc_event_type": 1,
"NPC": 103, "NPC": 10001001,
"value": 1, "value": 1,
"filter": [], "filter": [],
"filter2": [] "filter2": []
@ -32165,9 +32165,9 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_1105", "key": "buried_buried_condi_tasktxt_1105",
"text": "完成10次自动战斗" "text": "自动战斗冰霜泰坦难度1"
}, },
"type": 161, "type": 75,
"valid": 0, "valid": 0,
"head": { "head": {
"a": "attr", "a": "attr",
@ -32175,8 +32175,8 @@
"n": 1 "n": 1
}, },
"Npc_event_type": 1, "Npc_event_type": 1,
"NPC": 103, "NPC": 10002001,
"value": 10, "value": 1,
"filter": [], "filter": [],
"filter2": [] "filter2": []
}, },
@ -32190,9 +32190,9 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_1106", "key": "buried_buried_condi_tasktxt_1106",
"text": "完成20次自动战斗" "text": "自动战斗森林泰坦难度1"
}, },
"type": 161, "type": 75,
"valid": 0, "valid": 0,
"head": { "head": {
"a": "attr", "a": "attr",
@ -32200,8 +32200,8 @@
"n": 1 "n": 1
}, },
"Npc_event_type": 1, "Npc_event_type": 1,
"NPC": 103, "NPC": 10003001,
"value": 20, "value": 1,
"filter": [], "filter": [],
"filter2": [] "filter2": []
}, },

0
bin/json/game_catchrabbitreward.json → bin/json/game_catchrabbit.json
View File

2
bin/json/game_mainachievement.json
View File

@ -460,7 +460,7 @@
}, },
{ {
"key": 110028, "key": 110028,
"id": 11003, "id": 11004,
"title": { "title": {
"key": "mainchapter_main_achievement_title_28", "key": "mainchapter_main_achievement_title_28",
"text": "碎片28" "text": "碎片28"

72
bin/json/game_mainshopitem.json
View File

@ -192,7 +192,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011002", "t": "24021001",
"n": 25 "n": 25
} }
], ],
@ -212,7 +212,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011002", "t": "24021001",
"n": 25 "n": 25
} }
], ],
@ -232,7 +232,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011002", "t": "24021001",
"n": 25 "n": 25
} }
], ],
@ -252,7 +252,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011002", "t": "24021001",
"n": 25 "n": 25
} }
], ],
@ -272,7 +272,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011002", "t": "24021001",
"n": 15 "n": 15
} }
], ],
@ -292,7 +292,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011002", "t": "24021001",
"n": 50 "n": 50
} }
], ],
@ -312,7 +312,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011002", "t": "24021001",
"n": 50 "n": 50
} }
], ],
@ -332,7 +332,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011002", "t": "24021001",
"n": 100 "n": 100
} }
], ],
@ -352,7 +352,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011002", "t": "24021001",
"n": 40 "n": 40
} }
], ],
@ -372,7 +372,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011002", "t": "24021001",
"n": 40 "n": 40
} }
], ],
@ -392,7 +392,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011002", "t": "24021001",
"n": 40 "n": 40
} }
], ],
@ -412,7 +412,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011002", "t": "24021001",
"n": 40 "n": 40
} }
], ],
@ -432,7 +432,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011003", "t": "24031001",
"n": 25 "n": 25
} }
], ],
@ -452,7 +452,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011003", "t": "24031001",
"n": 25 "n": 25
} }
], ],
@ -472,7 +472,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011003", "t": "24031001",
"n": 25 "n": 25
} }
], ],
@ -492,7 +492,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011003", "t": "24031001",
"n": 25 "n": 25
} }
], ],
@ -512,7 +512,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011003", "t": "24031001",
"n": 15 "n": 15
} }
], ],
@ -532,7 +532,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011003", "t": "24031001",
"n": 50 "n": 50
} }
], ],
@ -552,7 +552,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011003", "t": "24031001",
"n": 50 "n": 50
} }
], ],
@ -572,7 +572,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011003", "t": "24031001",
"n": 100 "n": 100
} }
], ],
@ -592,7 +592,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011003", "t": "24031001",
"n": 70 "n": 70
} }
], ],
@ -612,7 +612,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011003", "t": "24031001",
"n": 70 "n": 70
} }
], ],
@ -632,7 +632,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011003", "t": "24031001",
"n": 70 "n": 70
} }
], ],
@ -652,7 +652,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011003", "t": "24031001",
"n": 70 "n": 70
} }
], ],
@ -672,7 +672,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011004", "t": "24041001",
"n": 25 "n": 25
} }
], ],
@ -692,7 +692,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011004", "t": "24041001",
"n": 25 "n": 25
} }
], ],
@ -712,7 +712,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011004", "t": "24041001",
"n": 25 "n": 25
} }
], ],
@ -732,7 +732,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011004", "t": "24041001",
"n": 25 "n": 25
} }
], ],
@ -752,7 +752,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011004", "t": "24041001",
"n": 15 "n": 15
} }
], ],
@ -772,7 +772,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011004", "t": "24041001",
"n": 50 "n": 50
} }
], ],
@ -792,7 +792,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011004", "t": "24041001",
"n": 50 "n": 50
} }
], ],
@ -812,7 +812,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011004", "t": "24041001",
"n": 100 "n": 100
} }
], ],
@ -832,7 +832,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011004", "t": "24041001",
"n": 90 "n": 90
} }
], ],
@ -852,7 +852,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011004", "t": "24041001",
"n": 90 "n": 90
} }
], ],
@ -872,7 +872,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011004", "t": "24041001",
"n": 90 "n": 90
} }
], ],
@ -892,7 +892,7 @@
"need": [ "need": [
{ {
"a": "item", "a": "item",
"t": "24011004", "t": "24041001",
"n": 90 "n": 90
} }
], ],

14
bin/json/game_navigation.json
View File

@ -138,7 +138,7 @@
"text": "冒险之旅" "text": "冒险之旅"
}, },
"npcName": [ "npcName": [
"20010_骇客蛛_1" "功能入口_主线"
], ],
"functionicon": "icon_sytj", "functionicon": "icon_sytj",
"jumpId": 166 "jumpId": 166
@ -163,7 +163,7 @@
}, },
{ {
"Id": 10, "Id": 10,
"scene": "WuGuanScene", "scene": "GameMain",
"scenename": { "scenename": {
"key": "navigation_Sheet1_scenename_10", "key": "navigation_Sheet1_scenename_10",
"text": "熊猫武馆" "text": "熊猫武馆"
@ -181,7 +181,7 @@
}, },
{ {
"Id": 11, "Id": 11,
"scene": "WuGuanScene", "scene": "GameMain",
"scenename": { "scenename": {
"key": "navigation_Sheet1_scenename_11", "key": "navigation_Sheet1_scenename_11",
"text": "熊猫武馆" "text": "熊猫武馆"
@ -217,7 +217,7 @@
}, },
{ {
"Id": 13, "Id": 13,
"scene": "WuGuanScene", "scene": "GameMain",
"scenename": { "scenename": {
"key": "navigation_Sheet1_scenename_13", "key": "navigation_Sheet1_scenename_13",
"text": "熊猫武馆" "text": "熊猫武馆"
@ -235,7 +235,7 @@
}, },
{ {
"Id": 14, "Id": 14,
"scene": "SmithyScene", "scene": "GameMain",
"scenename": { "scenename": {
"key": "navigation_Sheet1_scenename_14", "key": "navigation_Sheet1_scenename_14",
"text": "铁匠铺" "text": "铁匠铺"
@ -253,7 +253,7 @@
}, },
{ {
"Id": 15, "Id": 15,
"scene": "SmithyScene", "scene": "GameMain",
"scenename": { "scenename": {
"key": "navigation_Sheet1_scenename_15", "key": "navigation_Sheet1_scenename_15",
"text": "铁匠铺" "text": "铁匠铺"
@ -271,7 +271,7 @@
}, },
{ {
"Id": 16, "Id": 16,
"scene": "SmithyScene", "scene": "GameMain",
"scenename": { "scenename": {
"key": "navigation_Sheet1_scenename_16", "key": "navigation_Sheet1_scenename_16",
"text": "铁匠铺" "text": "铁匠铺"

292
bin/json/game_rdtasknpc.json
View File

@ -214,9 +214,9 @@
"heroid": 35001, "heroid": 35001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
10, 10,
@ -229,9 +229,9 @@
"heroid": 35001, "heroid": 35001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
10, 10,
@ -244,9 +244,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"阿宝", "阿宝",
"137" "901"
], ],
"event": [ "event": [
10, 10,
@ -259,9 +259,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"阿宝", "阿宝",
"137" "901"
], ],
"event": [ "event": [
10, 10,
@ -274,9 +274,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"阿宝", "阿宝",
"137" "901"
], ],
"event": [ "event": [
10, 10,
@ -289,9 +289,9 @@
"heroid": 43007, "heroid": 43007,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
10, 10,
@ -1568,9 +1568,9 @@
"heroid": 43007, "heroid": 43007,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -1611,9 +1611,9 @@
"heroid": 43007, "heroid": 43007,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -1626,9 +1626,9 @@
"heroid": 43007, "heroid": 43007,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
10, 10,
@ -1641,9 +1641,9 @@
"heroid": 43007, "heroid": 43007,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -1656,9 +1656,9 @@
"heroid": 43007, "heroid": 43007,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -1697,9 +1697,9 @@
"heroid": 43007, "heroid": 43007,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -1725,7 +1725,7 @@
"heroid": 43007, "heroid": 43007,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"901" "901"
], ],
@ -1968,9 +1968,9 @@
"heroid": 35001, "heroid": 35001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
2, 2,
@ -1983,9 +1983,9 @@
"heroid": 35001, "heroid": 35001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
2, 2,
@ -1998,9 +1998,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
2, 2,
@ -2041,9 +2041,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
2, 2,
@ -2056,9 +2056,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
10, 10,
@ -2271,9 +2271,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
2, 2,
@ -2505,9 +2505,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -2548,9 +2548,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -2819,9 +2819,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -3038,9 +3038,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -3079,9 +3079,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -3107,9 +3107,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
0 0
@ -3297,9 +3297,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
2, 2,
@ -3338,9 +3338,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
2, 2,
@ -3353,7 +3353,7 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"901" "901"
], ],
@ -3368,9 +3368,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
2, 2,
@ -3473,9 +3473,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -3503,9 +3503,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -3604,9 +3604,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -3866,9 +3866,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -3894,9 +3894,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -3909,9 +3909,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
2, 2,
@ -3952,9 +3952,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
2, 2,
@ -3967,9 +3967,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
10, 10,
@ -3982,9 +3982,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
2, 2,
@ -4132,9 +4132,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -4435,9 +4435,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -4463,9 +4463,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -4654,9 +4654,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -4684,9 +4684,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -4699,9 +4699,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
2, 2,
@ -4714,9 +4714,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
10, 10,
@ -4729,9 +4729,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
2, 2,
@ -4834,9 +4834,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -4862,9 +4862,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -5057,9 +5057,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -5085,9 +5085,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -6775,9 +6775,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
2, 2,
@ -6798,9 +6798,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
2, 2,
@ -6813,9 +6813,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -6828,9 +6828,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
10, 10,
@ -6843,9 +6843,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -6858,9 +6858,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -6881,9 +6881,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [], "event": [],
"goto": 0 "goto": 0
@ -6893,9 +6893,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -6916,9 +6916,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -7103,9 +7103,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
2, 2,
@ -7177,9 +7177,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -7207,9 +7207,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -7222,9 +7222,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -7248,9 +7248,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -7600,9 +7600,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
2, 2,
@ -7637,9 +7637,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"阿宝", "阿宝",
"137" "901"
], ],
"event": [ "event": [
2, 2,
@ -7652,9 +7652,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
2, 2,
@ -7667,9 +7667,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
2, 2,
@ -8555,9 +8555,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -8578,9 +8578,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -9000,9 +9000,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"SmithyScene", "GameMain",
"打造", "打造",
"139" "901"
], ],
"event": [ "event": [
2, 2,
@ -9201,9 +9201,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"阿宝", "阿宝",
"137" "901"
], ],
"event": [ "event": [
2, 2,
@ -9270,9 +9270,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"阿宝", "阿宝",
"137" "901"
], ],
"event": [ "event": [
2, 2,
@ -9316,9 +9316,9 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"WuGuanScene", "GameMain",
"总教习", "总教习",
"137" "901"
], ],
"event": [ "event": [
2, 2,

280
bin/json/game_skillafteratk.json
View File

@ -29601,7 +29601,7 @@
{ {
"Id": 214002213, "Id": 214002213,
"EmitPR": 1000, "EmitPR": 1000,
"From": 1, "From": 3,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
@ -29651,12 +29651,12 @@
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
"ExecuteCnt": 5, "ExecuteCnt": 4,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
1, 1,
4, 4,
800, 1000,
1, 1,
18, 18,
30 30
@ -29705,12 +29705,12 @@
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
"ExecuteCnt": 5, "ExecuteCnt": 4,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
1, 1,
4, 4,
900, 1000,
1, 1,
18, 18,
30 30
@ -29735,12 +29735,12 @@
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
"ExecuteCnt": 5, "ExecuteCnt": 4,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
1, 1,
4, 4,
1000, 1100,
1, 1,
18, 18,
30 30
@ -29765,12 +29765,12 @@
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
"ExecuteCnt": 5, "ExecuteCnt": 4,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
1, 1,
4, 4,
1100, 1200,
1, 1,
18, 18,
30 30
@ -29795,12 +29795,12 @@
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
"ExecuteCnt": 5, "ExecuteCnt": 4,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
1, 1,
4, 4,
1200, 1300,
1, 1,
18, 18,
150 150
@ -33145,6 +33145,106 @@
"RevisiCondition": "", "RevisiCondition": "",
"RevisiParams": [] "RevisiParams": []
}, },
{
"Id": 243004122,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
2300
],
"FollowSK": [
243004113
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 243004132,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
2400
],
"FollowSK": [
243004113
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 243004142,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
2500
],
"FollowSK": [
243004113
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 243004152,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
2600
],
"FollowSK": [
243004113
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{ {
"Id": 243004211, "Id": 243004211,
"EmitPR": 1000, "EmitPR": 1000,
@ -33196,6 +33296,114 @@
"RevisiCondition": "", "RevisiCondition": "",
"RevisiParams": [] "RevisiParams": []
}, },
{
"Id": 243004221,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 2,
"Type": 1,
"Argu": [
1,
4,
1850
],
"FollowSK": [
243004212
],
"SucFollowSK": [
243004213
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 243004231,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 2,
"Type": 1,
"Argu": [
1,
4,
1950
],
"FollowSK": [
243004212
],
"SucFollowSK": [
243004213
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 243004241,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 2,
"Type": 1,
"Argu": [
1,
4,
2050
],
"FollowSK": [
243004212
],
"SucFollowSK": [
243004213
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 243004251,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 2,
"Type": 1,
"Argu": [
1,
4,
2150
],
"FollowSK": [
243004212
],
"SucFollowSK": [
243004213
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{ {
"Id": 243004213, "Id": 243004213,
"EmitPR": 1000, "EmitPR": 1000,
@ -33292,6 +33500,56 @@
"RevisiCondition": "", "RevisiCondition": "",
"RevisiParams": [] "RevisiParams": []
}, },
{
"Id": 243004322,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
5300
],
"FollowSK": [],
"SucFollowSK": [
243004314
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 243004332,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
5400
],
"FollowSK": [],
"SucFollowSK": [
243004314
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{ {
"Id": 243004313, "Id": 243004313,
"EmitPR": 1000, "EmitPR": 1000,

349
bin/json/game_skillatk.json
View File

@ -17899,7 +17899,7 @@
"Type": 1, "Type": 1,
"CD": 3, "CD": 3,
"Where": [], "Where": [],
"Target": 1, "Target": 0,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
233001211 233001211
@ -17931,7 +17931,7 @@
"Type": 1, "Type": 1,
"CD": 2, "CD": 2,
"Where": [], "Where": [],
"Target": 1, "Target": 0,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
233001221 233001221
@ -19309,11 +19309,12 @@
"Target": 0, "Target": 0,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
213005311, 213005311
213005312
] ]
}, },
"passSkill": [], "passSkill": [
213005312
],
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_113005311_1", "key": "skill_skill_atk_Desc_113005311_1",
"text": "为友方附加2回合[color=#37d8a9]攻击提升[/color];目标已有[color=#37d8a9]攻击提升[/color]时，减少目标所有技能1回合冷却。" "text": "为友方附加2回合[color=#37d8a9]攻击提升[/color];目标已有[color=#37d8a9]攻击提升[/color]时，减少目标所有技能1回合冷却。"
@ -19342,11 +19343,12 @@
"Target": 0, "Target": 0,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
213005321, 213005311
213005322
] ]
}, },
"passSkill": [], "passSkill": [
213005312
],
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_113005311_2", "key": "skill_skill_atk_Desc_113005311_2",
"text": "技能冷却减少1回合。" "text": "技能冷却减少1回合。"
@ -19375,11 +19377,12 @@
"Target": 0, "Target": 0,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
213005331, 213005311
213005332
] ]
}, },
"passSkill": [], "passSkill": [
213005312
],
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_113005311_3", "key": "skill_skill_atk_Desc_113005311_3",
"text": "技能冷却减少1回合。" "text": "技能冷却减少1回合。"
@ -25092,7 +25095,7 @@
{ {
"id": 143004111, "id": 143004111,
"level": 1, "level": 1,
"MaxLV": 1, "MaxLV": 5,
"UnavailablePlayTypes": [], "UnavailablePlayTypes": [],
"Name": { "Name": {
"key": "skill_skill_atk_Name_143004111", "key": "skill_skill_atk_Name_143004111",
@ -25108,7 +25111,7 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
243004111 243004112
] ]
}, },
"passSkill": [], "passSkill": [],
@ -25119,10 +25122,130 @@
"buffid": [], "buffid": [],
"map": "" "map": ""
}, },
{
"id": 143004111,
"level": 2,
"MaxLV": 5,
"UnavailablePlayTypes": [],
"Name": {
"key": "skill_skill_atk_Name_143004111",
"text": "姜饼怒击"
},
"ico": "jn_43004_1",
"CorrectPos": 0,
"IsMelee": 1,
"act": "Skill_1",
"Type": 1,
"CD": 0,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
243004122
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_143004111_2",
"text": "伤害提升至230%。"
},
"buffid": [],
"map": ""
},
{
"id": 143004111,
"level": 3,
"MaxLV": 5,
"UnavailablePlayTypes": [],
"Name": {
"key": "skill_skill_atk_Name_143004111",
"text": "姜饼怒击"
},
"ico": "jn_43004_1",
"CorrectPos": 0,
"IsMelee": 1,
"act": "Skill_1",
"Type": 1,
"CD": 0,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
243004132
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_143004111_3",
"text": "伤害提升至240%。"
},
"buffid": [],
"map": ""
},
{
"id": 143004111,
"level": 4,
"MaxLV": 5,
"UnavailablePlayTypes": [],
"Name": {
"key": "skill_skill_atk_Name_143004111",
"text": "姜饼怒击"
},
"ico": "jn_43004_1",
"CorrectPos": 0,
"IsMelee": 1,
"act": "Skill_1",
"Type": 1,
"CD": 0,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
243004142
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_143004111_4",
"text": "伤害提升至250%。"
},
"buffid": [],
"map": ""
},
{
"id": 143004111,
"level": 5,
"MaxLV": 5,
"UnavailablePlayTypes": [],
"Name": {
"key": "skill_skill_atk_Name_143004111",
"text": "姜饼怒击"
},
"ico": "jn_43004_1",
"CorrectPos": 0,
"IsMelee": 1,
"act": "Skill_1",
"Type": 1,
"CD": 0,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
243004152
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_143004111_5",
"text": "伤害提升至260%。"
},
"buffid": [],
"map": ""
},
{ {
"id": 143004211, "id": 143004211,
"level": 1, "level": 1,
"MaxLV": 1, "MaxLV": 5,
"UnavailablePlayTypes": [], "UnavailablePlayTypes": [],
"Name": { "Name": {
"key": "skill_skill_atk_Name_143004211", "key": "skill_skill_atk_Name_143004211",
@ -25151,10 +25274,138 @@
], ],
"map": "" "map": ""
}, },
{
"id": 143004211,
"level": 2,
"MaxLV": 5,
"UnavailablePlayTypes": [],
"Name": {
"key": "skill_skill_atk_Name_143004211",
"text": "缤纷棒棒糖"
},
"ico": "jn_43004_2",
"CorrectPos": 0,
"IsMelee": 1,
"act": "Skill_2",
"Type": 1,
"CD": 3,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
243004221
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_143004211_2",
"text": "伤害提升至185%"
},
"buffid": [
390001107
],
"map": ""
},
{
"id": 143004211,
"level": 3,
"MaxLV": 5,
"UnavailablePlayTypes": [],
"Name": {
"key": "skill_skill_atk_Name_143004211",
"text": "缤纷棒棒糖"
},
"ico": "jn_43004_2",
"CorrectPos": 0,
"IsMelee": 1,
"act": "Skill_2",
"Type": 1,
"CD": 3,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
243004231
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_143004211_3",
"text": "伤害提升至195%"
},
"buffid": [
390001107
],
"map": ""
},
{
"id": 143004211,
"level": 4,
"MaxLV": 5,
"UnavailablePlayTypes": [],
"Name": {
"key": "skill_skill_atk_Name_143004211",
"text": "缤纷棒棒糖"
},
"ico": "jn_43004_2",
"CorrectPos": 0,
"IsMelee": 1,
"act": "Skill_2",
"Type": 1,
"CD": 3,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
243004241
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_143004211_4",
"text": "伤害提升至205%"
},
"buffid": [
390001107
],
"map": ""
},
{
"id": 143004211,
"level": 5,
"MaxLV": 5,
"UnavailablePlayTypes": [],
"Name": {
"key": "skill_skill_atk_Name_143004211",
"text": "缤纷棒棒糖"
},
"ico": "jn_43004_2",
"CorrectPos": 0,
"IsMelee": 1,
"act": "Skill_2",
"Type": 1,
"CD": 3,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
243004251
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_143004211_5",
"text": "伤害提升至215%"
},
"buffid": [
390001107
],
"map": ""
},
{ {
"id": 143004311, "id": 143004311,
"level": 1, "level": 1,
"MaxLV": 1, "MaxLV": 3,
"UnavailablePlayTypes": [], "UnavailablePlayTypes": [],
"Name": { "Name": {
"key": "skill_skill_atk_Name_143004311", "key": "skill_skill_atk_Name_143004311",
@ -25185,6 +25436,74 @@
], ],
"map": "" "map": ""
}, },
{
"id": 143004311,
"level": 2,
"MaxLV": 3,
"UnavailablePlayTypes": [],
"Name": {
"key": "skill_skill_atk_Name_143004311",
"text": "姜饼人诅咒"
},
"ico": "jn_43004_3",
"CorrectPos": 0,
"IsMelee": 1,
"act": "Skill_3",
"Type": 1,
"CD": 4,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
243004311,
243004322,
243004313
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_143004311_2",
"text": "伤害提升至530%。"
},
"buffid": [
390001115
],
"map": ""
},
{
"id": 143004311,
"level": 3,
"MaxLV": 3,
"UnavailablePlayTypes": [],
"Name": {
"key": "skill_skill_atk_Name_143004311",
"text": "姜饼人诅咒"
},
"ico": "jn_43004_3",
"CorrectPos": 0,
"IsMelee": 1,
"act": "Skill_3",
"Type": 1,
"CD": 4,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
243004311,
243004332,
243004313
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_143004311_3",
"text": "伤害提升至540%。"
},
"buffid": [
390001115
],
"map": ""
},
{ {
"id": 123003111, "id": 123003111,
"level": 1, "level": 1,

36
bin/json/game_worldtask.json
View File

@ -7231,15 +7231,15 @@
"icon": "25001", "icon": "25001",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_153", "key": "worldtask_world_task_task_name_153",
"text": "梅林的试炼" "text": "乌龟大师的试炼"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_152", "key": "worldtask_world_task_task_details_152",
"text": "梅林的试炼" "text": "乌龟大师的智慧与功力都非常深厚，定能给你不小启发。"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_152", "key": "worldtask_world_task_npctxt_152",
"text": "梅林的试炼" "text": "有人在找你"
}, },
"get_item": [], "get_item": [],
"trigger": 0, "trigger": 0,
@ -7289,15 +7289,15 @@
"icon": "25001", "icon": "25001",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_154", "key": "worldtask_world_task_task_name_154",
"text": "梅林的试炼" "text": "乌龟大师的试炼"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_153", "key": "worldtask_world_task_task_details_153",
"text": "梅林的试炼" "text": "乌龟大师的智慧与功力都非常深厚，定能给你不小启发。"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_153", "key": "worldtask_world_task_npctxt_153",
"text": "梅林的试炼" "text": "有人在找你"
}, },
"get_item": [], "get_item": [],
"trigger": 0, "trigger": 0,
@ -7347,15 +7347,15 @@
"icon": "25001", "icon": "25001",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_155", "key": "worldtask_world_task_task_name_155",
"text": "梅林的试炼" "text": "乌龟大师的试炼"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_154", "key": "worldtask_world_task_task_details_154",
"text": "梅林的试炼" "text": "乌龟大师的智慧与功力都非常深厚，定能给你不小启发。"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_154", "key": "worldtask_world_task_npctxt_154",
"text": "梅林的试炼" "text": "有人在找你"
}, },
"get_item": [], "get_item": [],
"trigger": 0, "trigger": 0,
@ -7405,15 +7405,15 @@
"icon": "25001", "icon": "25001",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_156", "key": "worldtask_world_task_task_name_156",
"text": "梅林的试炼" "text": "乌龟大师的试炼"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_155", "key": "worldtask_world_task_task_details_155",
"text": "梅林的试炼" "text": "乌龟大师的智慧与功力都非常深厚，定能给你不小启发。"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_155", "key": "worldtask_world_task_npctxt_155",
"text": "梅林的试炼" "text": "有人在找你"
}, },
"get_item": [], "get_item": [],
"trigger": 0, "trigger": 0,
@ -7463,15 +7463,15 @@
"icon": "25001", "icon": "25001",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_157", "key": "worldtask_world_task_task_name_157",
"text": "梅林的试炼" "text": "乌龟大师的试炼"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_156", "key": "worldtask_world_task_task_details_156",
"text": "梅林的试炼" "text": "乌龟大师的智慧与功力都非常深厚，定能给你不小启发。"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_156", "key": "worldtask_world_task_npctxt_156",
"text": "梅林的试炼" "text": "有人在找你"
}, },
"get_item": [], "get_item": [],
"trigger": 0, "trigger": 0,
@ -7521,15 +7521,15 @@
"icon": "25001", "icon": "25001",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_158", "key": "worldtask_world_task_task_name_158",
"text": "梅林的试炼" "text": "乌龟大师的试炼"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_157", "key": "worldtask_world_task_task_details_157",
"text": "梅林的试炼" "text": "乌龟大师的智慧与功力都非常深厚，定能给你不小启发。"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_157", "key": "worldtask_world_task_npctxt_157",
"text": "梅林的试炼" "text": "有人在找你"
}, },
"get_item": [], "get_item": [],
"trigger": 0, "trigger": 0,

40
modules/caninerabbit/api_award.go
View File

@ -12,8 +12,9 @@ func (this *apiComp) AwardCheck(session comm.IUserSession, req *pb.CanineRabbitA
func (this *apiComp) Award(session comm.IUserSession, req *pb.CanineRabbitAwardReq) (errdata *pb.ErrorData) { func (this *apiComp) Award(session comm.IUserSession, req *pb.CanineRabbitAwardReq) (errdata *pb.ErrorData) {
var ( var (
conf *cfg.GameCatchrabbitrewardData confs []*cfg.GameCatchrabbitData
info *pb.DBCanineRabbit info *pb.DBCanineRabbit
res []*cfg.Gameatn
atno []*pb.UserAtno atno []*pb.UserAtno
ok bool ok bool
err error err error
@ -21,7 +22,7 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.CanineRabbitAwardR
if errdata = this.AwardCheck(session, req); errdata != nil { if errdata = this.AwardCheck(session, req); errdata != nil {
return return
} }
if conf, err = this.module.configure.getGameGColorRewardData(req.Id); err != nil { if confs, err = this.module.configure.getGameGColorRewardDatas(req.Type + 1); err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound, Code: pb.ErrorCode_ConfigNoFound,
Message: err.Error(), Message: err.Error(),
@ -36,34 +37,29 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.CanineRabbitAwardR
} }
return return
} }
if _, ok = info.Award[req.Id]; ok {
errdata = &pb.ErrorData{ if req.Type == 0 { //兔子
Code: pb.ErrorCode_ReqParameterError, for _, v := range confs {
Message: "Allaward Claimed!", if _, ok = info.Award[v.Key]; !ok && info.Rabbitintegral >= v.Condition {
res = append(res, v.Reward...)
info.Award[v.Key] = true
} }
} }
if conf.Type == 1 {
if info.Rabbitintegral < conf.Condition {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ActivityCantReward,
Message: "Rabbitintegral no enough",
}
return
}
} else { } else {
if info.Houndintegral < conf.Condition { for _, v := range confs {
errdata = &pb.ErrorData{ if _, ok = info.Award[v.Key]; !ok && info.Houndintegral >= v.Condition {
Code: pb.ErrorCode_ActivityCantReward, res = append(res, v.Reward...)
Message: "Houndintegral no enough", info.Award[v.Key] = true
} }
return
} }
} }
if errdata, atno = this.module.DispenseAtno(session, conf.Reward, true); errdata != nil { if errdata, atno = this.module.DispenseAtno(session, res, true); errdata != nil {
return return
} }
this.module.model.Change(session.GetUserId(), map[string]interface{}{
session.SendMsg(string(this.module.GetType()), "award", &pb.CanineRabbitAwardResp{Id: req.Id, Award: atno}) "award": info.Award,
})
session.SendMsg(string(this.module.GetType()), "award", &pb.CanineRabbitAwardResp{Type: req.Type, Awardmap: info.Award, Award: atno})
return return
} }

29
modules/caninerabbit/configure.go
View File

@ -8,7 +8,7 @@ import (
) )
const ( const (
game_catchrabbitreward = "game_catchrabbitreward.json" game_catchrabbit = "game_catchrabbit.json"
) )
type configureComp struct { type configureComp struct {
@ -20,24 +20,41 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
err = this.MCompConfigure.Init(service, module, comp, options) err = this.MCompConfigure.Init(service, module, comp, options)
this.module = module.(*CanineRabbit) this.module = module.(*CanineRabbit)
err = this.LoadMultiConfigure(map[string]interface{}{ err = this.LoadMultiConfigure(map[string]interface{}{
game_catchrabbitreward: cfg.NewGameCatchrabbitreward, game_catchrabbit: cfg.NewGameCatchrabbit,
}) })
return return
} }
// 获取奖励列表 // 获取奖励列表
func (this *configureComp) getGameGColorRewardData(id int32) (conf *cfg.GameCatchrabbitrewardData, err error) { func (this *configureComp) getGameGColorRewardData(id int32) (conf *cfg.GameCatchrabbitData, err error) {
var ( var (
v interface{} v interface{}
ok bool ok bool
) )
if v, err = this.GetConfigure(game_catchrabbitreward); err != nil { if v, err = this.GetConfigure(game_catchrabbit); err != nil {
return return
} }
if conf, ok = v.(*cfg.GameCatchrabbitreward).GetDataMap()[id]; !ok { if conf, ok = v.(*cfg.GameCatchrabbit).GetDataMap()[id]; !ok {
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_catchrabbitreward, id) err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_catchrabbit, id)
this.module.Errorln(err) this.module.Errorln(err)
return return
} }
return return
} }
// 获取奖励列表
func (this *configureComp) getGameGColorRewardDatas(ctype int32) (confs []*cfg.GameCatchrabbitData, err error) {
var (
v interface{}
)
if v, err = this.GetConfigure(game_catchrabbit); err != nil {
return
}
confs = make([]*cfg.GameCatchrabbitData, 0)
for _, v := range v.(*cfg.GameCatchrabbit).GetDataList() {
if v.Type == ctype {
confs = append(confs, v)
}
}
return
}

1
modules/capturesheep/api_weekreward.go
View File

@ -50,7 +50,6 @@ func (this *apiComp) WeekReward(session comm.IUserSession, req *pb.CapturesheepW
} }
return return
} }
if info.Weekintegral < conf.Point { if info.Weekintegral < conf.Point {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError, Code: pb.ErrorCode_ReqParameterError,

2
modules/island/api_receive.go
View File

@ -17,7 +17,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.IsLandReceiveReq
var ( var (
info *pb.DBIsland info *pb.DBIsland
warorder *pb.Warorder warorder *pb.Warorder
confs []*cfg.GamePuggsyPasscheckData confs []*cfg.GamePuggsyPassCheckData
awards []*cfg.Gameatn awards []*cfg.Gameatn
award []*pb.UserAtno award []*pb.UserAtno
err error err error

6
modules/island/configure.go
View File

@ -31,7 +31,7 @@ func (this *ConfigureComp) Init(service core.IService, module core.IModule, comp
err = this.LoadConfigure(game_puggsyskill, cfg.NewGamePuggsySkill) err = this.LoadConfigure(game_puggsyskill, cfg.NewGamePuggsySkill)
err = this.LoadConfigure(game_puggsyfight, cfg.NewGamePuggsyFight) err = this.LoadConfigure(game_puggsyfight, cfg.NewGamePuggsyFight)
err = this.LoadConfigure(game_puggsyscore, cfg.NewGamePuggsyScore) err = this.LoadConfigure(game_puggsyscore, cfg.NewGamePuggsyScore)
err = this.LoadConfigure(game_puggsypasscheck, cfg.NewGamePuggsyPasscheck) err = this.LoadConfigure(game_puggsypasscheck, cfg.NewGamePuggsyPassCheck)
return return
} }
@ -133,14 +133,14 @@ func (this *ConfigureComp) getGamePuggsyScoreData(harm int32) (results *cfg.Game
} }
// 获取伤害对应的评分组 // 获取伤害对应的评分组
func (this *ConfigureComp) getGamePuggsyPasscheckData() (results []*cfg.GamePuggsyPasscheckData, err error) { func (this *ConfigureComp) getGamePuggsyPasscheckData() (results []*cfg.GamePuggsyPassCheckData, err error) {
var ( var (
v interface{} v interface{}
) )
if v, err = this.GetConfigure(game_puggsyscore); err != nil { if v, err = this.GetConfigure(game_puggsyscore); err != nil {
return return
} else { } else {
results = v.(*cfg.GamePuggsyPasscheck).GetDataList() results = v.(*cfg.GamePuggsyPassCheck).GetDataList()
} }
return return
} }

74
modules/parkour/api_allweekreward.go Normal file
View File

@ -0,0 +1,74 @@
package parkour
import (
"go_dreamfactory/comm"
"go_dreamfactory/lego/sys/mgo"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
)
// 参数校验
func (this *apiComp) AllWeekRewardCheck(session comm.IUserSession, req *pb.ParkourAllWeekRewardReq) (errdata *pb.ErrorData) {
return
}
// /获取自己的排行榜信息
func (this *apiComp) AllWeekReward(session comm.IUserSession, req *pb.ParkourAllWeekRewardReq) (errdata *pb.ErrorData) {
var (
conf []*cfg.GameDragonWeeklyrewardData
info *pb.DBParkour
award []*pb.UserAtno
temp []*pb.UserAtno
ok bool
err error
)
if errdata = this.AllWeekRewardCheck(session, req); errdata != nil {
return
}
if conf, err = this.module.configure.getGameDragonWeeklyrewards(); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
if info, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil && err != mgo.MongodbNil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
for _, v := range conf {
if ok = info.Weekreward[v.Id]; ok {
continue
}
if info.Weekintegral < v.Point {
continue
}
if errdata, temp = this.module.DispenseAtno(session, v.Rewarditem, true); errdata != nil {
return
}
award = append(award, temp...)
info.Weekreward[v.Id] = true
}
if err = this.module.parkourComp.Change(session.GetUserId(), map[string]interface{}{
"weekreward": info.Weekreward,
}); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
session.SendMsg(string(this.module.GetType()), "allweekreward", &pb.CapturesheepAllWeekRewardResp{Weekreward: info.Weekreward, Award: award})
return
}

56
modules/parkour/api_getreward.go
View File

@ -1,56 +0,0 @@
package parkour
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
)
//参数校验
func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.ParkourGetRewardReq) (errdata *pb.ErrorData) {
return
}
///积分领奖
func (this *apiComp) GetReward(session comm.IUserSession, req *pb.ParkourGetRewardReq) (errdata *pb.ErrorData) {
var (
info *pb.DBParkour
err error
)
if errdata = this.GetRewardCheck(session, req); errdata != nil {
return
}
if info, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
// _conf := this.module.configure.getGameBuzkashiReward(req.Rid)
// if _conf == nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ConfigNoFound,
// Title: pb.ErrorCode_ConfigNoFound.ToString(),
// Message: err.Error(),
// }
// return
// }
// if _conf.Schedule <= info.Integral && (info.Reward+1 == req.Rid) {
// info.Reward += 1
// if err = this.module.parkourComp.Change(session.GetUserId(), map[string]interface{}{
// "reward": info.Reward,
// }); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_DBError,
// Title: pb.ErrorCode_DBError.ToString(),
// Message: err.Error(),
// }
// return
// }
// }
session.SendMsg(string(this.module.GetType()), "getreward", &pb.ParkourGetRewardResp{
Info: info,
})
return
}

141
modules/parkour/api_invite.go
View File

@ -1,141 +0,0 @@
package parkour
// import (
// "go_dreamfactory/comm"
// "go_dreamfactory/pb"
// "go_dreamfactory/sys/configure"
// "time"
// )
// //参数校验
// func (this *apiComp) InviteCheck(session comm.IUserSession, req *pb.ParkourInviteReq) (errdata *pb.ErrorData) {
// if req.Uid == session.GetUserId() {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ReqParameterError,
// Title: pb.ErrorCode_ReqParameterError.ToString(),
// }
// }
// return
// }
// ///邀请组队
// func (this *apiComp) Invite(session comm.IUserSession, req *pb.ParkourInviteReq) (errdata *pb.ErrorData) {
// var (
// info *pb.DBParkour
// tinfo *pb.DBParkour
// tuser *pb.DBUser
// member *pb.DBRaceMember
// users []string
// ok bool
// err error
// )
// if errdata = this.InviteCheck(session, req); errdata != nil {
// return
// }
// if info, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_DBError,
// Title: pb.ErrorCode_DBError.ToString(),
// Message: err.Error(),
// }
// return
// }
// if info.Captainid != "" && info.Captainid != session.GetUserId() { //自己不是队长 无权邀请他人
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ParkourInviteNoPermissions,
// Title: pb.ErrorCode_ParkourInviteNoPermissions.ToString(),
// Message: err.Error(),
// }
// return
// }
// if len(info.Member) > 3 {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ReqParameterError,
// Title: pb.ErrorCode_ReqParameterError.ToString(),
// }
// return
// }
// if tuser, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_SystemError,
// Title: pb.ErrorCode_SystemError.ToString(),
// }
// return
// }
// ok = false
// for _, v := range info.Member {
// if v.Uid == session.GetUserId() {
// ok = true
// }
// }
// if !ok {
// info.Member = append(info.Member, &pb.DBRaceMember{Uid: tuser.Uid, Name: tuser.Name, Avatar: tuser.Avatar, Lv: tuser.Lv, Mount: info.Dfmount, Maxhp: 10})
// }
// if tinfo, err = this.module.parkourComp.queryinfo(req.Uid); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_DBError,
// Title: pb.ErrorCode_DBError.ToString(),
// Message: err.Error(),
// }
// return
// }
// if tuser, err = this.module.ModuleUser.GetUser(req.Uid); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_SystemError,
// Title: pb.ErrorCode_SystemError.ToString(),
// Message: err.Error(),
// }
// return
// }
// //目标是否在线
// if !this.module.ModuleUser.IsOnline(req.Uid) {
// member = &pb.DBRaceMember{Uid: tuser.Uid, Name: tuser.Name, Avatar: tuser.Avatar, Lv: tuser.Lv, Mount: tinfo.Dfmount, Maxhp: 10, Isai: true}
// info.Captainid = session.GetUserId()
// info.Member = append(info.Member, member)
// users = make([]string, len(info.Member))
// for i, v := range info.Member {
// users[i] = v.Uid
// }
// this.module.SendMsgToUsers(string(this.module.GetType()), "teamjoinnotice",
// &pb.ParkourTeamJoinNoticePush{Member: member}, users...)
// this.module.SendMsgToUsers(string(this.module.GetType()), "teamchanage",
// &pb.ParkourTeamChanagePush{Team: info}, users...)
// } else {
// if tinfo.Captainid != "" {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ParkourTargetTeamed,
// Title: pb.ErrorCode_ParkourTargetTeamed.ToString(),
// }
// return
// }
// ok = false
// for _, v := range info.Invite {
// if v.Uid == req.Uid {
// v.Expired = configure.Now().Add(time.Second * 10).Unix()
// ok = true
// }
// }
// if !ok {
// info.Invite = append(info.Invite, &pb.DBRaceInvite{Uid: tuser.Uid, Name: tuser.Name, Avatar: tuser.Avatar, Lv: tuser.Lv, Expired: configure.Now().Add(time.Second * 10).Unix()})
// }
// this.module.SendMsgToUser(string(this.module.GetType()), "invitenotice",
// &pb.ParkourInviteNoticePush{Team: info, State: 1}, req.Uid)
// }
// if err = this.module.parkourComp.Change(session.GetUserId(), map[string]interface{}{
// "captainid": info.Captainid,
// "invite": info.Invite,
// "member": info.Member,
// }); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_DBError,
// Title: pb.ErrorCode_DBError.ToString(),
// Message: err.Error(),
// }
// return
// }
// session.SendMsg(string(this.module.GetType()), "invite", &pb.ParkourInviteResp{Issucc: true, Team: info})
// return
// }

115
modules/parkour/api_invitehandle.go
View File

@ -1,115 +0,0 @@
package parkour
// import (
// "go_dreamfactory/comm"
// "go_dreamfactory/pb"
// "go_dreamfactory/sys/configure"
// "time"
// )
// //参数校验
// func (this *apiComp) InviteHandleCheck(session comm.IUserSession, req *pb.ParkourInviteHandleReq) (errdata *pb.ErrorData) {
// return
// }
// ///邀请组队
// func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInviteHandleReq) (errdata *pb.ErrorData) {
// var (
// info *pb.DBParkour
// tean *pb.DBParkour
// invite *pb.DBRaceInvite
// member *pb.DBRaceMember
// users []string
// ok bool
// index int32
// err error
// )
// if errdata = this.InviteHandleCheck(session, req); errdata != nil {
// return
// }
// if info, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_DBError,
// Title: pb.ErrorCode_DBError.ToString(),
// Message: err.Error(),
// }
// return
// }
// if tean, err = this.module.parkourComp.queryinfo(req.Captainid); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_DBError,
// Title: pb.ErrorCode_DBError.ToString(),
// Message: err.Error(),
// }
// return
// }
// if len(tean.Member) >= 3 {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ParkourMemberFull,
// Title: pb.ErrorCode_ParkourMemberFull.ToString(),
// }
// return
// }
// if req.State == 3 {
// ok = false
// for i, v := range tean.Invite {
// if v.Uid == session.GetUserId() && configure.Now().Before(time.Unix(v.Expired, 0)) { //邀请未过期
// invite = v
// index = int32(i)
// ok = true
// }
// }
// if !ok {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ParkourInviteOverdue,
// Title: pb.ErrorCode_ParkourInviteOverdue.ToString(),
// }
// return
// }
// tean.Invite = append(tean.Invite[0:index], tean.Invite[index+1:]...)
// users = make([]string, len(tean.Member))
// for i, v := range tean.Member {
// users[i] = v.Uid
// }
// users = append(users, invite.Uid)
// member = &pb.DBRaceMember{Uid: invite.Uid, Name: invite.Name, Avatar: invite.Avatar, Lv: invite.Lv, Mount: info.Dfmount, Maxhp: 10}
// tean.Captainid = tean.Uid
// tean.State = pb.RaceTeamState_teaming
// tean.Member = append(tean.Member, member)
// if err = this.module.parkourComp.Change(session.GetUserId(), map[string]interface{}{
// "captainid": tean.Captainid,
// "state": tean.State,
// }); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_DBError,
// Title: pb.ErrorCode_DBError.ToString(),
// Message: err.Error(),
// }
// return
// }
// if err = this.module.parkourComp.Change(tean.Captainid, map[string]interface{}{
// "state": tean.State,
// "invite": tean.Invite,
// "captainid": tean.Captainid,
// "member": tean.Member,
// }); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_DBError,
// Title: pb.ErrorCode_DBError.ToString(),
// Message: err.Error(),
// }
// return
// }
// this.module.SendMsgToUsers(string(this.module.GetType()), "teamjoinnotice",
// &pb.ParkourTeamJoinNoticePush{Member: member}, users...)
// this.module.SendMsgToUsers(string(this.module.GetType()), "teamchanage",
// &pb.ParkourTeamChanagePush{Team: tean}, users...)
// } else {
// this.module.SendMsgToUser(string(this.module.GetType()), "invitenotice",
// &pb.ParkourInviteNoticePush{Team: tean, State: 3}, tean.Captainid)
// }
// session.SendMsg(string(this.module.GetType()), "invitehandle", &pb.ParkourInviteHandleResp{IsSucc: true})
// return
// }

134
modules/parkour/api_jointeam.go
View File

@ -1,134 +0,0 @@
package parkour
// import (
// "go_dreamfactory/comm"
// "go_dreamfactory/pb"
// )
// //参数校验
// func (this *apiComp) JoinTeamCheck(session comm.IUserSession, req *pb.ParkourJoinTeamReq) (errdata *pb.ErrorData) {
// if session.GetUserId() == req.Uid {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ReqParameterError,
// Title: pb.ErrorCode_ReqParameterError.ToString(),
// }
// }
// return
// }
// ///请求进入队伍
// func (this *apiComp) JoinTeam(session comm.IUserSession, req *pb.ParkourJoinTeamReq) (errdata *pb.ErrorData) {
// var (
// info *pb.DBParkour
// tean *pb.DBParkour
// member *pb.DBRaceMember
// users []string
// err error
// )
// if errdata = this.JoinTeamCheck(session, req); errdata != nil {
// return
// }
// if info, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_DBError,
// Title: pb.ErrorCode_DBError.ToString(),
// Message: err.Error(),
// }
// return
// }
// // 状态校验
// if info.State != pb.RaceTeamState_resting { // 不是休息中不能参加
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_StateInvalid,
// Title: pb.ErrorCode_StateInvalid.ToString(),
// Message: err.Error(),
// }
// return
// }
// if len(info.Member) > 3 {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ParkourMemberFull,
// Title: pb.ErrorCode_ParkourMemberFull.ToString(),
// Message: err.Error(),
// }
// return
// }
// if tean, err = this.module.parkourComp.queryinfo(req.Uid); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_DBError,
// Title: pb.ErrorCode_DBError.ToString(),
// Message: err.Error(),
// }
// return
// }
// users = make([]string, len(tean.Member))
// for i, v := range tean.Member {
// if v.Uid == session.GetUserId() {
// // 自己已经在队伍中
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ParkourTargetTeamed,
// Title: pb.ErrorCode_ParkourTargetTeamed.ToString(),
// Message: err.Error(),
// }
// return
// }
// users[i] = v.Uid
// }
// user, err := this.module.ModuleUser.GetUser(session.GetUserId())
// if err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_SystemError,
// Title: pb.ErrorCode_SystemError.ToString(),
// Message: err.Error(),
// }
// return
// }
// if tean.Captainid == "" {
// member = &pb.DBRaceMember{Uid: user.Uid, Name: user.Name, Avatar: user.Avatar, Lv: user.Lv, Mount: tean.Dfmount, Maxhp: 10}
// tean.Captainid = tean.Uid
// tean.State = pb.RaceTeamState_teaming
// tean.Member = append(tean.Member, member)
// users = append(users, tean.Uid)
// }
// users = append(users, session.GetUserId())
// member = &pb.DBRaceMember{Uid: user.Uid, Name: user.Name, Avatar: user.Avatar, Lv: user.Lv, Mount: info.Dfmount, Maxhp: 10}
// tean.Member = append(tean.Member, member)
// if err = this.module.parkourComp.Change(session.GetUserId(), map[string]interface{}{
// "state": tean.State,
// "captainid": tean.Captainid,
// }); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_DBError,
// Title: pb.ErrorCode_DBError.ToString(),
// Message: err.Error(),
// }
// return
// }
// if err = this.module.parkourComp.Change(tean.Captainid, map[string]interface{}{
// "state": tean.State,
// "captainid": tean.Captainid,
// "member": tean.Member,
// }); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_DBError,
// Title: pb.ErrorCode_DBError.ToString(),
// Message: err.Error(),
// }
// return
// }
// this.module.SendMsgToUsers(string(this.module.GetType()), "teamjoinnotice",
// &pb.ParkourTeamJoinNoticePush{Member: member}, users...)
// this.module.SendMsgToUsers(string(this.module.GetType()), "teamchanage",
// &pb.ParkourTeamChanagePush{Team: tean}, users...)
// session.SendMsg(string(this.module.GetType()), "jointeam", &pb.ParkourJoinTeamResp{
// Team: tean,
// })
// return
// }

142
modules/parkour/api_quitteam.go
View File

@ -1,142 +0,0 @@
package parkour
// import (
// "go_dreamfactory/comm"
// "go_dreamfactory/pb"
// )
// //参数校验
// func (this *apiComp) QuitTeamCheck(session comm.IUserSession, req *pb.ParkourQuitTeamReq) (errdata *pb.ErrorData) {
// return
// }
// ///退出队伍
// func (this *apiComp) QuitTeam(session comm.IUserSession, req *pb.ParkourQuitTeamReq) (errdata *pb.ErrorData) {
// var (
// tean *pb.DBParkour
// ntean *pb.DBParkour
// member *pb.DBRaceMember
// users []string
// ok bool
// err error
// )
// if errdata = this.QuitTeamCheck(session, req); errdata != nil {
// return
// }
// if tean, err = this.module.parkourComp.queryinfo(req.Captainid); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_DBError,
// Title: pb.ErrorCode_DBError.ToString(),
// Message: err.Error(),
// }
// return
// }
// for i, v := range tean.Member {
// if v.Uid == session.GetUserId() {
// tean.Member = append(tean.Member[0:i], tean.Member[i+1:]...)
// member = v
// ok = true
// } else if !v.Isai {
// users = append(users, v.Uid)
// }
// }
// if !ok {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ReqParameterError,
// Title: pb.ErrorCode_ReqParameterError.ToString(),
// }
// return
// }
// if req.Captainid == session.GetUserId() { //自己是队长
// if len(users) > 0 {
// for i, v := range users {
// if i == 0 {
// if ntean, err = this.module.parkourComp.queryinfo(v); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_DBError,
// Title: pb.ErrorCode_DBError.ToString(),
// Message: err.Error(),
// }
// return
// } else {
// ntean.Captainid = users[0]
// ntean.Member = tean.Member
// if err = this.module.parkourComp.Change(v, map[string]interface{}{
// "captainid": v,
// "member": tean.Member,
// }); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_DBError,
// Title: pb.ErrorCode_DBError.ToString(),
// Message: err.Error(),
// }
// return
// }
// }
// } else {
// if err = this.module.parkourComp.Change(v, map[string]interface{}{
// "captainid": users[0],
// }); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_DBError,
// Title: pb.ErrorCode_DBError.ToString(),
// Message: err.Error(),
// }
// return
// }
// }
// }
// this.module.SendMsgToUsers(string(this.module.GetType()), "teamchanage",
// &pb.ParkourTeamChanagePush{Team: ntean}, users...)
// }
// tean.Invite = make([]*pb.DBRaceInvite, 0)
// tean.Member = make([]*pb.DBRaceMember, 0)
// if err = this.module.parkourComp.Change(session.GetUserId(), map[string]interface{}{
// "state": pb.RaceTeamState_resting,
// "captainid": "",
// "invite": tean.Invite,
// "member": tean.Member,
// }); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_DBError,
// Title: pb.ErrorCode_DBError.ToString(),
// Message: err.Error(),
// }
// return
// }
// } else {
// if err = this.module.parkourComp.Change(session.GetUserId(), map[string]interface{}{
// "state": pb.RaceTeamState_resting,
// "captainid": "",
// }); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_DBError,
// Title: pb.ErrorCode_DBError.ToString(),
// Message: err.Error(),
// }
// return
// }
// if err = this.module.parkourComp.Change(req.Captainid, map[string]interface{}{
// "member": tean.Member,
// }); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_DBError,
// Title: pb.ErrorCode_DBError.ToString(),
// Message: err.Error(),
// }
// return
// }
// if len(users) > 0 {
// this.module.SendMsgToUsers(string(this.module.GetType()), "teamquitnotice",
// &pb.ParkourTeamQuitNoticePush{Member: member}, users...)
// this.module.SendMsgToUsers(string(this.module.GetType()), "teamchanage",
// &pb.ParkourTeamChanagePush{Team: tean}, users...)
// }
// }
// session.SendMsg(string(this.module.GetType()), "quitteam", &pb.ParkourQuitTeamResp{})
// return
// }

16
modules/parkour/api_racematch.go
View File

@ -28,21 +28,13 @@ func (this *apiComp) RaceMatch(session comm.IUserSession, req *pb.ParkourRaceMat
} }
return return
} }
info.Captainid = session.GetUserId()
info.State = pb.RaceTeamState_teaming info.State = pb.RaceTeamState_teaming
info.Member = []*pb.DBRaceMember{
{
User: info.User,
Dan: info.Dan,
Mount: info.Mount,
Property: info.Property,
Currhp: info.Property[comm.Dhp],
},
}
if req.Rtype == pb.RaceType_ordinary { if req.Rtype == pb.RaceType_ordinary {
if err = this.module.matchTrain.MatchReq(&pb.DBMatchPlayer{ if err = this.module.matchTrain.MatchReq(&pb.DBMatchPlayer{
Suser: info.User, Suser: info.User,
Dan: info.Dan, Dan: info.Dan,
Integral: info.Integral,
Weekintegral: info.Weekintegral,
Mount: info.Mount, Mount: info.Mount,
Property: info.Property, Property: info.Property,
Mlv: info.Mlv, Mlv: info.Mlv,
@ -58,6 +50,8 @@ func (this *apiComp) RaceMatch(session comm.IUserSession, req *pb.ParkourRaceMat
if err = this.module.matchrank.MatchReq(&pb.DBMatchPlayer{ if err = this.module.matchrank.MatchReq(&pb.DBMatchPlayer{
Suser: info.User, Suser: info.User,
Dan: info.Dan, Dan: info.Dan,
Integral: info.Integral,
Weekintegral: info.Weekintegral,
Mount: info.Mount, Mount: info.Mount,
Property: info.Property, Property: info.Property,
Mlv: info.Mlv, Mlv: info.Mlv,
@ -73,8 +67,6 @@ func (this *apiComp) RaceMatch(session comm.IUserSession, req *pb.ParkourRaceMat
if err = this.module.parkourComp.Change(session.GetUserId(), map[string]interface{}{ if err = this.module.parkourComp.Change(session.GetUserId(), map[string]interface{}{
"state": pb.RaceTeamState_matching, "state": pb.RaceTeamState_matching,
"captainid": info.Captainid,
"member": info.Member,
"rtype": info.Rtype, "rtype": info.Rtype,
}); err != nil { }); err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{

9
modules/parkour/api_racematchcancel.go
View File

@ -13,13 +13,13 @@ func (this *apiComp) RaceMatchCancelCheck(session comm.IUserSession, req *pb.Par
///取消匹配 ///取消匹配
func (this *apiComp) RaceMatchCancel(session comm.IUserSession, req *pb.ParkourRaceMatchCancelReq) (errdata *pb.ErrorData) { func (this *apiComp) RaceMatchCancel(session comm.IUserSession, req *pb.ParkourRaceMatchCancelReq) (errdata *pb.ErrorData) {
var ( var (
team *pb.DBParkour info *pb.DBParkour
err error err error
) )
if errdata = this.RaceMatchCancelCheck(session, req); errdata != nil { if errdata = this.RaceMatchCancelCheck(session, req); errdata != nil {
return return
} }
if team, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil { if info, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError, Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(), Title: pb.ErrorCode_DBError.ToString(),
@ -27,13 +27,16 @@ func (this *apiComp) RaceMatchCancel(session comm.IUserSession, req *pb.ParkourR
} }
return return
} }
if team.Captainid != session.GetUserId() {
if info.State != pb.RaceTeamState_matching {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError, Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(), Title: pb.ErrorCode_ReqParameterError.ToString(),
Message: "no matching!",
} }
return return
} }
if req.Rtype == pb.RaceType_ordinary { if req.Rtype == pb.RaceType_ordinary {
if err = this.module.matchTrain.CancelMatch(session.GetUserId()); err != nil { if err = this.module.matchTrain.CancelMatch(session.GetUserId()); err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{

40
modules/parkour/api_reconnectroom.go Normal file
View File

@ -0,0 +1,40 @@
package parkour
import (
"fmt"
"go_dreamfactory/comm"
"go_dreamfactory/pb"
)
//参数校验
func (this *apiComp) ReconnectRoomCheck(session comm.IUserSession, req *pb.ParkourReconnectRoomReq) (errdata *pb.ErrorData) {
return
}
///匹配请求
func (this *apiComp) ReconnectRoom(session comm.IUserSession, req *pb.ParkourReconnectRoomReq) (errdata *pb.ErrorData) {
var (
room *RaceItem
race *pb.DBRace
ok bool
)
if errdata = this.ReconnectRoomCheck(session, req); errdata != nil {
return
}
this.module.lock.RLock()
room, ok = this.module.battles[req.Battleid]
this.module.lock.RUnlock()
if ok {
room.lock.Lock()
room.Session[session.GetUserId()] = session.Clone()
room.lock.Unlock()
race = &pb.DBRace{
Id: room.Id,
ServicePath: fmt.Sprintf("%s/%s", this.service.GetType(), this.service.GetId()),
Redmember: room.RedMember,
Bulemember: room.BuleMember,
}
}
session.SendMsg(string(this.module.GetType()), "reconnectroom", &pb.ParkourReconnectRoomResp{Race: race})
return
}

49
modules/parkour/api_viewplayer.go
View File

@ -1,49 +0,0 @@
package parkour
// import (
// "go_dreamfactory/comm"
// "go_dreamfactory/pb"
// )
// //参数校验
// func (this *apiComp) ViewPlayerCheck(session comm.IUserSession, req *pb.ParkourViewPlayerReq) (errdata *pb.ErrorData) {
// return
// }
// ///游戏
// func (this *apiComp) ViewPlayer(session comm.IUserSession, req *pb.ParkourViewPlayerReq) (errdata *pb.ErrorData) {
// var (
// resp *pb.ParkourViewPlayerResp
// )
// if errdata = this.ViewPlayerCheck(session, req); errdata != nil {
// return
// }
// resp = &pb.ParkourViewPlayerResp{
// Player: make([]*pb.ParkourData, 0),
// }
// for _, uid := range req.Uid {
// if u, err := this.module.ModuleUser.GetUser(uid); err == nil {
// {
// var time int64
// if this.module.ModuleUser.IsOnline(uid) {
// //if user := this.module.ModuleUser.GetUser(uid); user != nil {
// time = u.Offlinetime
// // }
// } else {
// time = -1
// }
// resp.Player = append(resp.Player, &pb.ParkourData{
// Uid: uid,
// Name: u.Name,
// Avatar: u.Avatar,
// Lv: u.Lv,
// OfflineTime: time, // 检查是否在线
// })
// }
// }
// }
// session.SendMsg(string(this.module.GetType()), "viewplayer", resp)
// return
// }

77
modules/parkour/api_weekreward.go Normal file
View File

@ -0,0 +1,77 @@
package parkour
import (
"go_dreamfactory/comm"
"go_dreamfactory/lego/sys/mgo"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
)
// 参数校验
func (this *apiComp) WeekRewardCheck(session comm.IUserSession, req *pb.ParkourWeekRewardReq) (errdata *pb.ErrorData) {
return
}
// /获取自己的排行榜信息
func (this *apiComp) WeekReward(session comm.IUserSession, req *pb.ParkourWeekRewardReq) (errdata *pb.ErrorData) {
var (
conf *cfg.GameDragonWeeklyrewardData
info *pb.DBParkour
award []*pb.UserAtno
ok bool
err error
)
if errdata = this.WeekRewardCheck(session, req); errdata != nil {
return
}
if conf, err = this.module.configure.getGameDragonWeeklyreward(req.Id); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
if info, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil && err != mgo.MongodbNil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
if ok = info.Weekreward[req.Id]; ok {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
Message: "Already claimed !",
}
return
}
if info.Weekintegral < conf.Point {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
Message: "Not enough points !",
}
}
if errdata, award = this.module.DispenseAtno(session, conf.Rewarditem, true); errdata != nil {
return
}
info.Weekreward[req.Id] = true
if err = this.module.parkourComp.Change(session.GetUserId(), map[string]interface{}{
"weekreward": info.Weekreward,
}); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
session.SendMsg(string(this.module.GetType()), "weekreward", &pb.CapturesheepWeekRewardResp{Id: req.Id, Award: award})
return
}

86
modules/parkour/configure.go
View File

@ -13,10 +13,12 @@ const (
game_bukashiai = "game_bukashiai.json" game_bukashiai = "game_bukashiai.json"
game_buzkashiopen = "game_buzkashiopen.json" game_buzkashiopen = "game_buzkashiopen.json"
game_buzkashigrade = "game_buzkashigrade.json" game_buzkashigrade = "game_buzkashigrade.json"
game_buzkashilv = "game_buzkashilv.json"
game_buzkashiqtelv = "game_buzkashiqtelv.json" game_buzkashiqtelv = "game_buzkashiqtelv.json"
game_buzkashimount = "game_buzkashimount.json" game_buzkashimount = "game_buzkashimount.json"
game_buzkashireward = "game_buzkashireward.json" game_buzkashireward = "game_buzkashireward.json"
game_buzkashilv = "game_buzkashilv.json" //评级表
game_qualifying = "game_qualifying.json" //段位
game_dragonweeklyreward = "game_dragonweeklyreward.json" //周长
) )
// /背包配置管理组件 // /背包配置管理组件
@ -35,7 +37,8 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
this.LoadConfigure(game_buzkashilv, cfg.NewGameBuzkashiLv) this.LoadConfigure(game_buzkashilv, cfg.NewGameBuzkashiLv)
this.LoadConfigure(game_buzkashiqtelv, cfg.NewGameBuzkashiQteLv) this.LoadConfigure(game_buzkashiqtelv, cfg.NewGameBuzkashiQteLv)
this.LoadConfigure(game_buzkashimount, cfg.NewGameBuzkashiMount) this.LoadConfigure(game_buzkashimount, cfg.NewGameBuzkashiMount)
// this.LoadConfigure(game_buzkashireward, cfg.NewGameBuzkashiReward) this.LoadConfigure(game_qualifying, cfg.NewGameQualifying)
this.LoadConfigure(game_dragonweeklyreward, cfg.NewGameDragonWeeklyreward)
return return
} }
@ -169,15 +172,70 @@ func (this *configureComp) getgameBukashiAiDataByDan(btype, dan int32) (conf *cf
return return
} }
// func (this *configureComp) getGameBuzkashiReward(id int32) (configure *cfg.GameBuzkashiRewardData) { //查询积分段位信息
// if v, err := this.GetConfigure(game_buzkashireward); err == nil { func (this *configureComp) getGameBuzkashiLv(scores int32) (conf *cfg.GameBuzkashiLvData, err error) {
// var ok bool var (
// if configure, ok = v.(*cfg.GameBuzkashiReward).GetDataMap()[id]; !ok { v interface{}
// // err = fmt.Errorf("not found:%d ", id) )
// err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_buzkashireward, id) if v, err = this.GetConfigure(game_buzkashilv); err != nil {
// this.module.Errorln(err) this.module.Errorln(err)
// return } else {
// } for i, v := range v.(*cfg.GameBuzkashiLv).GetDataList() {
// } if i == 0 && scores < v.Value {
// return nil conf = v
// } return
}
if scores >= v.Value {
conf = v
}
}
}
return
}
//查询积分段位信息
func (this *configureComp) getActiveRewardById(lv int32) (result *cfg.GameQualifyingData, err error) {
var (
v interface{}
ok bool
)
if v, err = this.GetConfigure(game_qualifying); err != nil {
this.module.Errorln(err)
} else {
if result, ok = v.(*cfg.GameQualifying).GetDataMap()[lv]; !ok {
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_qualifying, lv)
this.module.Errorln(err)
}
}
return
}
//查询积分段位信息
func (this *configureComp) getGameDragonWeeklyrewards() (confs []*cfg.GameDragonWeeklyrewardData, err error) {
var (
v interface{}
)
if v, err = this.GetConfigure(game_dragonweeklyreward); err != nil {
this.module.Errorln(err)
} else {
confs = v.(*cfg.GameDragonWeeklyreward).GetDataList()
}
return
}
//查询积分段位信息
func (this *configureComp) getGameDragonWeeklyreward(id int32) (result *cfg.GameDragonWeeklyrewardData, err error) {
var (
v interface{}
ok bool
)
if v, err = this.GetConfigure(game_dragonweeklyreward); err != nil {
this.module.Errorln(err)
} else {
if result, ok = v.(*cfg.GameDragonWeeklyreward).GetDataMap()[id]; !ok {
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_dragonweeklyreward, id)
this.module.Errorln(err)
}
}
return
}

7
modules/parkour/match_rank.go
View File

@ -26,7 +26,7 @@ func (this *matchrankComp) Init(service core.IService, module core.IModule, comp
this.MCompMatch.Init(service, module, comp, options) this.MCompMatch.Init(service, module, comp, options)
this.module = module.(*Parkour) this.module = module.(*Parkour)
this.service = service this.service = service
this.PoolName = "parkour" this.PoolName = "parkourRank"
return return
} }
@ -77,6 +77,8 @@ func (this *matchrankComp) MatchNotic(players map[string]interface{}) (err error
red = append(red, &pb.DBRaceMember{ red = append(red, &pb.DBRaceMember{
User: v.Suser, User: v.Suser,
Dan: v.Dan, Dan: v.Dan,
Integral: v.Integral,
Weekintegral: v.Weekintegral,
Mlv: v.Mlv, Mlv: v.Mlv,
Mount: v.Mount, Mount: v.Mount,
Property: v.Property, Property: v.Property,
@ -87,6 +89,7 @@ func (this *matchrankComp) MatchNotic(players map[string]interface{}) (err error
bule = append(bule, &pb.DBRaceMember{ bule = append(bule, &pb.DBRaceMember{
User: v.Suser, User: v.Suser,
Dan: v.Dan, Dan: v.Dan,
Integral: v.Integral,
Mlv: v.Mlv, Mlv: v.Mlv,
Mount: v.Mount, Mount: v.Mount,
Property: v.Property, Property: v.Property,
@ -111,7 +114,7 @@ func (this *matchrankComp) MatchNotic(players map[string]interface{}) (err error
bule = append(bule, ais[0:3-len(bule)]...) bule = append(bule, ais[0:3-len(bule)]...)
} }
} }
if err = this.module.createbattle(red, bule); err != nil { if err = this.module.createbattle(pb.RaceType_ordinary, red, bule); err != nil {
this.module.Error("createbattle err!", log.Field{Key: "key", Value: err.Error()}) this.module.Error("createbattle err!", log.Field{Key: "key", Value: err.Error()})
} }
return return

7
modules/parkour/match_train.go
View File

@ -26,7 +26,7 @@ func (this *matchTrainComp) Init(service core.IService, module core.IModule, com
this.MCompMatch.Init(service, module, comp, options) this.MCompMatch.Init(service, module, comp, options)
this.module = module.(*Parkour) this.module = module.(*Parkour)
this.service = service this.service = service
this.PoolName = "parkour" this.PoolName = "parkourTrain"
return return
} }
@ -77,6 +77,7 @@ func (this *matchTrainComp) MatchNotic(players map[string]interface{}) (err erro
red = append(red, &pb.DBRaceMember{ red = append(red, &pb.DBRaceMember{
User: v.Suser, User: v.Suser,
Dan: v.Dan, Dan: v.Dan,
Integral: v.Integral,
Mlv: v.Mlv, Mlv: v.Mlv,
Mount: v.Mount, Mount: v.Mount,
Property: v.Property, Property: v.Property,
@ -87,6 +88,8 @@ func (this *matchTrainComp) MatchNotic(players map[string]interface{}) (err erro
bule = append(bule, &pb.DBRaceMember{ bule = append(bule, &pb.DBRaceMember{
User: v.Suser, User: v.Suser,
Dan: v.Dan, Dan: v.Dan,
Integral: v.Integral,
Weekintegral: v.Weekintegral,
Mlv: v.Mlv, Mlv: v.Mlv,
Mount: v.Mount, Mount: v.Mount,
Property: v.Property, Property: v.Property,
@ -111,7 +114,7 @@ func (this *matchTrainComp) MatchNotic(players map[string]interface{}) (err erro
bule = append(bule, ais[0:3-len(bule)]...) bule = append(bule, ais[0:3-len(bule)]...)
} }
} }
if err = this.module.createbattle(red, bule); err != nil { if err = this.module.createbattle(pb.RaceType_prop, red, bule); err != nil {
this.module.Error("createbattle err!", log.Field{Key: "key", Value: err.Error()}) this.module.Error("createbattle err!", log.Field{Key: "key", Value: err.Error()})
} }
return return

6
modules/parkour/model_parkour.go
View File

@ -170,8 +170,8 @@ func (this *ModelParkourComp) queryinfo(uid string) (result *pb.DBParkour, err e
Id: primitive.NewObjectID().Hex(), Id: primitive.NewObjectID().Hex(),
User: comm.GetUserBaseInfo(user), User: comm.GetUserBaseInfo(user),
State: pb.RaceTeamState_resting, State: pb.RaceTeamState_resting,
Invite: make([]*pb.DBRaceInvite, 0), Dan: 1,
Member: []*pb.DBRaceMember{}, Property: make(map[string]int32),
Weekreward: make(map[int32]bool), Weekreward: make(map[int32]bool),
} }
if err = this.Add(uid, result); err != nil { if err = this.Add(uid, result); err != nil {
@ -204,8 +204,6 @@ func (this *ModelParkourComp) queryinfos(uids []string) (results []*pb.DBParkour
Id: primitive.NewObjectID().Hex(), Id: primitive.NewObjectID().Hex(),
User: comm.GetUserBaseInfo(user), User: comm.GetUserBaseInfo(user),
State: pb.RaceTeamState_resting, State: pb.RaceTeamState_resting,
Invite: make([]*pb.DBRaceInvite, 0),
Member: []*pb.DBRaceMember{},
Weekreward: make(map[int32]bool), Weekreward: make(map[int32]bool),
} }
newdata[v] = temp newdata[v] = temp

52
modules/parkour/model_race.go
View File

@ -1,52 +0,0 @@
package parkour
import (
"go_dreamfactory/comm"
"go_dreamfactory/lego/core"
"go_dreamfactory/lego/sys/mgo"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
"go_dreamfactory/sys/db"
)
///竞速数据模块
type ModelRaceComp struct {
modules.MCompModel
module *Parkour
}
//组件初始化接口
func (this *ModelRaceComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) {
this.TableName = comm.TableParkourRace
this.MCompModel.Init(service, module, comp, opt)
this.module = module.(*Parkour)
return
}
//记录战斗信息
func (this *ModelRaceComp) addrace(race *pb.DBRace) (err error) {
if err = this.AddList("", race.Id, race, db.SetDBMgoLog(false)); err != nil {
this.module.Errorln(err)
}
return
}
//移除战斗记录
func (this *ModelRaceComp) delrace(id string) (err error) {
if err = this.DelListlds("", []string{id}, db.SetDBMgoLog(false)); err != nil {
this.module.Errorln(err)
}
return
}
//查询用户重置数据
func (this *ModelRaceComp) queryraces() (result []*pb.DBRace, err error) {
result = make([]*pb.DBRace, 0)
if err = this.GetList("", &result); err != nil && err != mgo.MongodbNil {
this.module.Errorf("err:%v", err)
}
if err == mgo.MongodbNil {
err = nil
}
return
}

243
modules/parkour/module.go
View File

@ -43,7 +43,6 @@ type Parkour struct {
matchrank *matchrankComp matchrank *matchrankComp
configure *configureComp configure *configureComp
parkourComp *ModelParkourComp parkourComp *ModelParkourComp
raceComp *ModelRaceComp
lock sync.RWMutex lock sync.RWMutex
battles map[string]*RaceItem battles map[string]*RaceItem
} }
@ -87,11 +86,10 @@ func (this *Parkour) OnInstallComp() {
this.matchrank = this.RegisterComp(new(matchrankComp)).(*matchrankComp) this.matchrank = this.RegisterComp(new(matchrankComp)).(*matchrankComp)
this.configure = this.RegisterComp(new(configureComp)).(*configureComp) this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
this.parkourComp = this.RegisterComp(new(ModelParkourComp)).(*ModelParkourComp) this.parkourComp = this.RegisterComp(new(ModelParkourComp)).(*ModelParkourComp)
this.raceComp = this.RegisterComp(new(ModelRaceComp)).(*ModelRaceComp)
} }
// 匹配成功 创建战斗 // 匹配成功 创建战斗
func (this *Parkour) createbattle(red []*pb.DBRaceMember, bule []*pb.DBRaceMember) (err error) { func (this *Parkour) createbattle(rtype pb.RaceType, red []*pb.DBRaceMember, bule []*pb.DBRaceMember) (err error) {
var ( var (
race *pb.DBRace race *pb.DBRace
battle *RaceItem battle *RaceItem
@ -106,6 +104,7 @@ func (this *Parkour) createbattle(red []*pb.DBRaceMember, bule []*pb.DBRaceMembe
} }
battle = &RaceItem{ battle = &RaceItem{
Id: race.Id, Id: race.Id,
Rtype: rtype,
Session: make(map[string]comm.IUserSession), Session: make(map[string]comm.IUserSession),
} }
@ -117,6 +116,15 @@ func (this *Parkour) createbattle(red []*pb.DBRaceMember, bule []*pb.DBRaceMembe
if online { if online {
battle.Session[v.User.Uid] = session battle.Session[v.User.Uid] = session
} }
if err = this.parkourComp.Change(v.User.Uid, map[string]interface{}{
"state": pb.RaceTeamState_raceing,
"rtype": rtype,
"roomid": battle.Id,
"roompath": race.ServicePath,
}); err != nil {
this.Errorln(err)
return
}
} else { } else {
v.Ready = true v.Ready = true
} }
@ -141,9 +149,6 @@ func (this *Parkour) createbattle(red []*pb.DBRaceMember, bule []*pb.DBRaceMembe
sessions = append(sessions, v) sessions = append(sessions, v)
} }
if err = this.raceComp.addrace(race); err != nil {
return
}
this.lock.Lock() this.lock.Lock()
this.battles[race.Id] = battle this.battles[race.Id] = battle
this.lock.Unlock() this.lock.Unlock()
@ -277,6 +282,7 @@ func (this *Parkour) shot(id string, uid string) {
for _, v := range battle.RedMember { for _, v := range battle.RedMember {
if v.User.Uid == uid { if v.User.Uid == uid {
v.Scores += this.ModuleTools.GetGlobalConf().BuzkashiGoalscore v.Scores += this.ModuleTools.GetGlobalConf().BuzkashiGoalscore
v.Shot++
ok = true ok = true
side = 1 side = 1
member = v member = v
@ -286,6 +292,7 @@ func (this *Parkour) shot(id string, uid string) {
for _, v := range battle.BuleMember { for _, v := range battle.BuleMember {
if v.User.Uid == uid { if v.User.Uid == uid {
v.Scores += this.ModuleTools.GetGlobalConf().BuzkashiGoalscore v.Scores += this.ModuleTools.GetGlobalConf().BuzkashiGoalscore
v.Shot++
ok = true ok = true
side = 2 side = 2
member = v member = v
@ -448,12 +455,17 @@ func (this *Parkour) recoverhp(id string, uid string, hp int32) {
// 战斗结束 // 战斗结束
func (this *Parkour) overtimer(task *timewheel.Task, args ...interface{}) { func (this *Parkour) overtimer(task *timewheel.Task, args ...interface{}) {
this.Debug("shot", log.Field{Key: "id", Value: args}) this.Debug("overtimer", log.Field{Key: "id", Value: args})
var ( var (
battle *RaceItem battle *RaceItem
ok bool ok bool
side int32 side int32
sessions []comm.IUserSession = make([]comm.IUserSession, 0) sessions []comm.IUserSession = make([]comm.IUserSession, 0)
conf *cfg.GameQualifyingData
lvconf *cfg.GameBuzkashiLvData
awards map[string][]*cfg.Gameatn = make(map[string][]*cfg.Gameatn)
award map[string][]*pb.UserAtno = make(map[string][]*pb.UserAtno)
errdata *pb.ErrorData
err error err error
) )
id := args[0].(string) id := args[0].(string)
@ -464,36 +476,118 @@ func (this *Parkour) overtimer(task *timewheel.Task, args ...interface{}) {
this.lock.Lock() this.lock.Lock()
delete(this.battles, id) delete(this.battles, id)
this.lock.Unlock() this.lock.Unlock()
this.raceComp.delrace(id)
this.ai.removeAi(id) this.ai.removeAi(id)
if battle.RedScore > battle.BuleScore { if battle.RedScore > battle.BuleScore {
side = 1 side = 1
} else { for _, v := range battle.RedMember {
side = 2 if conf, err = this.configure.getActiveRewardById(v.Dan); err != nil {
this.Errorln(err)
return
}
v.Integral += conf.WinValue
if lvconf, err = this.configure.getGameBuzkashiLv(v.Scores); err != nil {
this.Errorln(err)
return
}
v.Rating = lvconf.Num
v.Weekintegral += lvconf.Point
if !v.Isai {
if battle.Rtype == pb.RaceType_ordinary {
awards[v.User.Uid] = conf.MatewinReward
} else {
awards[v.User.Uid] = conf.RankwinReward
} }
for _, v := range battle.Session {
sessions = append(sessions, v)
} }
if err = this.SendMsgToSession(string(this.GetType()), "raceover", &pb.ParkourRaceOverPush{ }
for _, v := range battle.BuleMember {
if conf, err = this.configure.getActiveRewardById(v.Dan); err != nil {
this.Errorln(err)
return
}
v.Integral += conf.FailValue
if lvconf, err = this.configure.getGameBuzkashiLv(v.Scores); err != nil {
this.Errorln(err)
return
}
v.Rating = lvconf.Num
v.Weekintegral += lvconf.Point
if !v.Isai {
if battle.Rtype == pb.RaceType_ordinary {
awards[v.User.Uid] = conf.MatefailReward
} else {
awards[v.User.Uid] = conf.RankfailReward
}
}
}
} else {
side = 2
for _, v := range battle.RedMember {
if conf, err = this.configure.getActiveRewardById(v.Dan); err != nil {
this.Errorln(err)
return
}
v.Integral += conf.FailValue
if lvconf, err = this.configure.getGameBuzkashiLv(v.Scores); err != nil {
this.Errorln(err)
return
}
v.Rating = lvconf.Num
v.Weekintegral += lvconf.Point
if !v.Isai {
if battle.Rtype == pb.RaceType_ordinary {
awards[v.User.Uid] = conf.MatefailReward
} else {
awards[v.User.Uid] = conf.RankfailReward
}
}
}
for _, v := range battle.BuleMember {
if conf, err = this.configure.getActiveRewardById(v.Dan); err != nil {
this.Errorln(err)
return
}
v.Integral += conf.WinValue
if lvconf, err = this.configure.getGameBuzkashiLv(v.Scores); err != nil {
this.Errorln(err)
return
}
v.Rating = lvconf.Num
v.Weekintegral += lvconf.Point
if !v.Isai {
if battle.Rtype == pb.RaceType_ordinary {
awards[v.User.Uid] = conf.MatewinReward
} else {
awards[v.User.Uid] = conf.RankwinReward
}
}
}
}
for _, v := range battle.Session {
if errdata, award[v.GetUserId()] = this.DispenseAtno(v, awards[v.GetUserId()], true); errdata != nil {
this.Errorln(errdata)
return
}
v.SendMsg(string(this.GetType()), "raceover", &pb.ParkourRaceOverPush{
Winside: side, Winside: side,
Race: &pb.DBRace{ Race: &pb.DBRace{
Id: battle.Id, Id: battle.Id,
Redmember: battle.RedMember, Redmember: battle.RedMember,
Bulemember: battle.BuleMember, Bulemember: battle.BuleMember,
}, },
}, sessions...); err != nil { Award: award[v.GetUserId()],
this.Errorln(err) })
return sessions = append(sessions, v)
} }
for _, v := range battle.RedMember { for _, v := range battle.RedMember {
if !v.Isai { if !v.Isai {
if err = this.parkourComp.Change(v.User.Uid, map[string]interface{}{ if err = this.parkourComp.Change(v.User.Uid, map[string]interface{}{
"captainid": "", "integral": v.Integral,
"weekintegral": v.Weekintegral,
"state": 0, "state": 0,
"invite": []*pb.DBRaceInvite{}, "roomid": "",
"member": []*pb.DBRaceMember{}, "roompath": "",
}); err != nil { }); err != nil {
this.Errorln(err) this.Errorln(err)
return return
@ -503,10 +597,11 @@ func (this *Parkour) overtimer(task *timewheel.Task, args ...interface{}) {
for _, v := range battle.BuleMember { for _, v := range battle.BuleMember {
if !v.Isai { if !v.Isai {
if err = this.parkourComp.Change(v.User.Uid, map[string]interface{}{ if err = this.parkourComp.Change(v.User.Uid, map[string]interface{}{
"captainid": "", "integral": v.Integral,
"weekintegral": v.Weekintegral,
"state": 0, "state": 0,
"invite": []*pb.DBRaceInvite{}, "roomid": "",
"member": []*pb.DBRaceMember{}, "roompath": "",
}); err != nil { }); err != nil {
this.Errorln(err) this.Errorln(err)
return return
@ -525,129 +620,41 @@ func (this *Parkour) overtimer(task *timewheel.Task, args ...interface{}) {
func (this *Parkour) useroffline(uid, sessionid string) { func (this *Parkour) useroffline(uid, sessionid string) {
var ( var (
info *pb.DBParkour info *pb.DBParkour
users []string
err error err error
) )
if info, err = this.parkourComp.queryinfo(uid); err != nil { if info, err = this.parkourComp.queryinfo(uid); err != nil {
this.Error("用户离线!", log.Field{Key: "err", Value: err.Error()}) this.Error("用户离线!", log.Field{Key: "err", Value: err.Error()})
return return
} }
if info.State == pb.RaceTeamState_teaming { if info.State == pb.RaceTeamState_matching {
if info.Captainid == uid {
users = make([]string, 0)
for _, v := range info.Member {
if v.User.Uid != uid && !v.Isai {
users = append(users, v.User.Uid)
if err = this.parkourComp.Change(v.User.Uid, map[string]interface{}{
"captainid": "",
"state": 0,
}); err != nil {
this.Error("用户离线! 解散队伍处理", log.Field{Key: "uid", Value: v.User.Uid}, log.Field{Key: "err", Value: err.Error()})
return
}
}
}
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
}
} else {
}
} else if info.State == pb.RaceTeamState_matching {
if info.Captainid == uid {
if info.Rtype == pb.RaceType_ordinary { if info.Rtype == pb.RaceType_ordinary {
this.matchTrain.CancelMatch(info.Currbattid) this.matchTrain.CancelMatch(uid)
} else { } else {
this.matchrank.CancelMatch(info.Currbattid) this.matchrank.CancelMatch(uid)
} }
if err = this.parkourComp.Change(uid, map[string]interface{}{ if err = this.parkourComp.Change(uid, map[string]interface{}{
"captainid": "",
"state": 0, "state": 0,
"Invite": info.Invite,
"member": info.Member,
}); err != nil { }); err != nil {
this.Error("用户离线! 处理数据", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()}) this.Error("用户离线! 处理数据", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()})
return return
} }
users = make([]string, 0)
for _, v := range info.Member {
if v.User.Uid != uid && !v.Isai {
users = append(users, v.User.Uid)
if err = this.parkourComp.Change(v.User.Uid, map[string]interface{}{
"captainid": "",
"state": 0,
}); err != nil {
this.Error("用户离线! 解散队伍处理", log.Field{Key: "uid", Value: v.User.Uid}, log.Field{Key: "err", Value: err.Error()})
return
}
}
}
// if len(users) > 0 {
// if err = this.SendMsgToUsers(string(comm.ModulePvp), "teamdisbandnotice", &pb.ParkourTeamDisbandNoticePush{}, users...); err != nil {
// this.Errorln(err)
// }
// }
}
} else if info.State == pb.RaceTeamState_raceing { } else if info.State == pb.RaceTeamState_raceing {
var ( var (
lockpath string = fmt.Sprintf("%s/%s", this.service.GetType(), this.service.GetId()) lockpath string = fmt.Sprintf("%s/%s", this.service.GetType(), this.service.GetId())
result []*pb.DBRace
) )
if result, err = this.raceComp.queryraces(); err != nil { if lockpath != info.Roompath { //在当前房间下
this.Errorln(err)
return
}
for _, v := range result {
for _, v1 := range v.Redmember {
if !v1.Isai && v1.User.Uid == uid {
if lockpath == v.ServicePath {
this.trusteeship(context.Background(), &pb.RPC_ParkourTrusteeshipReq{Battleid: v.Id, Uid: uid}, nil)
return
} else {
ctx, _ := context.WithTimeout(context.Background(), time.Second*5)
_, err = this.service.RpcGo( _, err = this.service.RpcGo(
ctx, context.Background(),
v.ServicePath, info.Roompath,
string(comm.RPC_ParkourTrusteeship), string(comm.RPC_ParkourTrusteeship),
&pb.RPC_ParkourTrusteeshipReq{Battleid: v.Id, Uid: uid}, &pb.RPC_ParkourTrusteeshipReq{Battleid: info.Roomid, Uid: uid},
nil) nil)
if err != nil { if err != nil {
this.Errorln(err) this.Errorln(err)
return return
} }
return
}
}
}
for _, v1 := range v.Bulemember {
if !v1.Isai && v1.User.Uid == uid {
if lockpath == v.ServicePath {
this.trusteeship(context.Background(), &pb.RPC_ParkourTrusteeshipReq{Battleid: v.Id, Uid: uid}, nil)
return
} else { } else {
ctx, _ := context.WithTimeout(context.Background(), time.Second*5) this.trusteeship(context.Background(), &pb.RPC_ParkourTrusteeshipReq{Battleid: info.Roomid, Uid: uid}, nil)
_, err = this.service.RpcGo(
ctx,
v.ServicePath,
string(comm.RPC_ParkourTrusteeship),
&pb.RPC_ParkourTrusteeshipReq{Battleid: v.Id, Uid: uid},
nil)
if err != nil {
this.Errorln(err)
return
}
return
}
}
}
} }
} }
} }

208
pb/caninerabbit_msg.pb.go
View File

@ -112,7 +112,7 @@ type CanineRabbitAwardReq struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` Type int32 `protobuf:"varint,1,opt,name=type,proto3" json:"type"` //0兔子 1 猎犬
} }
func (x *CanineRabbitAwardReq) Reset() { func (x *CanineRabbitAwardReq) Reset() {
@ -147,9 +147,9 @@ func (*CanineRabbitAwardReq) Descriptor() ([]byte, []int) {
return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{2} return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{2}
} }
func (x *CanineRabbitAwardReq) GetId() int32 { func (x *CanineRabbitAwardReq) GetType() int32 {
if x != nil { if x != nil {
return x.Id return x.Type
} }
return 0 return 0
} }
@ -159,7 +159,8 @@ type CanineRabbitAwardResp struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` Type int32 `protobuf:"varint,1,opt,name=type,proto3" json:"type"` //0兔子 1 猎犬
Awardmap map[int32]bool `protobuf:"bytes,2,rep,name=awardmap,proto3" json:"awardmap" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
Award []*UserAtno `protobuf:"bytes,3,rep,name=award,proto3" json:"award"` //获取资源 Award []*UserAtno `protobuf:"bytes,3,rep,name=award,proto3" json:"award"` //获取资源
} }
@ -195,13 +196,20 @@ func (*CanineRabbitAwardResp) Descriptor() ([]byte, []int) {
return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{3} return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{3}
} }
func (x *CanineRabbitAwardResp) GetId() int32 { func (x *CanineRabbitAwardResp) GetType() int32 {
if x != nil { if x != nil {
return x.Id return x.Type
} }
return 0 return 0
} }
func (x *CanineRabbitAwardResp) GetAwardmap() map[int32]bool {
if x != nil {
return x.Awardmap
}
return nil
}
func (x *CanineRabbitAwardResp) GetAward() []*UserAtno { func (x *CanineRabbitAwardResp) GetAward() []*UserAtno {
if x != nil { if x != nil {
return x.Award return x.Award
@ -874,79 +882,87 @@ var file_caninerabbit_caninerabbit_msg_proto_rawDesc = []byte{
0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x49, 0x6e, 0x66, 0x6f,
0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62,
0x62, 0x69, 0x74, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x26, 0x0a, 0x14, 0x43, 0x61, 0x6e, 0x62, 0x69, 0x74, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x2a, 0x0a, 0x14, 0x43, 0x61, 0x6e,
0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65,
0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
0x64, 0x22, 0x48, 0x0a, 0x15, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0xcb, 0x01, 0x0a, 0x15, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65,
0x74, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12,
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74,
0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x79, 0x70, 0x65, 0x12, 0x40, 0x0a, 0x08, 0x61, 0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70, 0x18,
0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x31, 0x0a, 0x19, 0x43, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61,
0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x62, 0x62, 0x69, 0x74, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x41, 0x77,
0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x79, 0x70, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x61, 0x77, 0x61,
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x79, 0x70, 0x65, 0x22, 0x6a, 0x72, 0x64, 0x6d, 0x61, 0x70, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03,
0x0a, 0x1a, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x53, 0x69, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52,
0x6e, 0x67, 0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x0e, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x3b, 0x0a, 0x0d, 0x41, 0x77, 0x61, 0x72, 0x64, 0x6d,
0x72, 0x61, 0x62, 0x62, 0x69, 0x74, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x01, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x72, 0x61, 0x62, 0x62, 0x69, 0x74, 0x69, 0x6e, 0x74, 0x65, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
0x67, 0x72, 0x61, 0x6c, 0x12, 0x24, 0x0a, 0x0d, 0x68, 0x6f, 0x75, 0x6e, 0x64, 0x69, 0x6e, 0x74, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x68, 0x6f, 0x75, 0x02, 0x38, 0x01, 0x22, 0x31, 0x0a, 0x19, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62,
0x6e, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x22, 0x84, 0x01, 0x0a, 0x19, 0x43, 0x62, 0x69, 0x74, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71,
0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
0x65, 0x61, 0x64, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x05, 0x73, 0x74, 0x79, 0x70, 0x65, 0x22, 0x6a, 0x0a, 0x1a, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65,
0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72,
0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x27, 0x0a, 0x04, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x0e, 0x72, 0x61, 0x62, 0x62, 0x69, 0x74, 0x69, 0x6e,
0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x72, 0x61,
0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x04, 0x72, 0x62, 0x62, 0x69, 0x74, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x24, 0x0a, 0x0d,
0x6f, 0x6f, 0x6d, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x68, 0x6f, 0x75, 0x6e, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x02, 0x20,
0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x68, 0x6f, 0x75, 0x6e, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72,
0x6e, 0x22, 0x35, 0x0a, 0x1b, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x61, 0x6c, 0x22, 0x84, 0x01, 0x0a, 0x19, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62,
0x74, 0x4c, 0x6f, 0x61, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x62, 0x69, 0x74, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x61, 0x64, 0x79, 0x50, 0x75, 0x73, 0x68,
0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x18,
0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x4e, 0x0a, 0x1c, 0x43, 0x61, 0x6e, 0x69, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61,
0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x4c, 0x6f, 0x61, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x74, 0x68, 0x12, 0x27, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69,
0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x12, 0x1c, 0x0a, 0x09, 0x63,
0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09,
0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x22, 0x35, 0x0a, 0x1b, 0x43, 0x61, 0x6e,
0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x4c, 0x6f, 0x61, 0x64, 0x43, 0x6f, 0x6d,
0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d,
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64,
0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x22, 0x4e, 0x0a, 0x1c, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74,
0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x53, 0x0a, 0x19, 0x43, 0x61, 0x6e, 0x69, 0x4c, 0x6f, 0x61, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70,
0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x47, 0x61, 0x6d, 0x65, 0x53, 0x74, 0x61, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x74, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75,
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x63, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63,
0x0a, 0x63, 0x75, 0x72, 0x72, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x22, 0x53, 0x0a, 0x19, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74,
0x09, 0x52, 0x0a, 0x63, 0x75, 0x72, 0x72, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x22, 0x5b, 0x0a, 0x47, 0x61, 0x6d, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a,
0x15, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x48, 0x61, 0x6e, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72,
0x64, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x72, 0x72, 0x70, 0x6c, 0x61,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x2a, 0x79, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x75, 0x72, 0x72, 0x70,
0x0a, 0x05, 0x63, 0x68, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x22, 0x5b, 0x0a, 0x15, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52,
0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x43, 0x68, 0x61, 0x62, 0x62, 0x69, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16,
0x65, 0x73, 0x73, 0x52, 0x05, 0x63, 0x68, 0x65, 0x73, 0x73, 0x22, 0x18, 0x0a, 0x16, 0x43, 0x61,
0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65,
0x52, 0x65, 0x73, 0x70, 0x22, 0x72, 0x0a, 0x1a, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61,
0x62, 0x62, 0x69, 0x74, 0x47, 0x61, 0x6d, 0x65, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x50, 0x75,
0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2a, 0x0a, 0x05,
0x63, 0x68, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42,
0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x43, 0x68, 0x65, 0x73,
0x73, 0x52, 0x05, 0x63, 0x68, 0x65, 0x73, 0x73, 0x22, 0x42, 0x0a, 0x12, 0x43, 0x61, 0x6e, 0x69,
0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x57, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x16,
0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x18, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x2a, 0x0a, 0x05, 0x63, 0x68, 0x65, 0x73, 0x73, 0x18,
0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x22, 0x15, 0x0a, 0x13, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65,
0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x57, 0x69, 0x6e, 0x52, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x43, 0x68, 0x65, 0x73, 0x73, 0x52, 0x05, 0x63, 0x68, 0x65,
0x65, 0x73, 0x70, 0x22, 0xb0, 0x01, 0x0a, 0x18, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x73, 0x73, 0x22, 0x18, 0x0a, 0x16, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62,
0x62, 0x62, 0x69, 0x74, 0x47, 0x61, 0x6d, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x50, 0x75, 0x73, 0x68, 0x69, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x72, 0x0a, 0x1a,
0x12, 0x16, 0x0a, 0x06, 0x77, 0x69, 0x6e, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x47, 0x61, 0x6d, 0x65,
0x52, 0x06, 0x77, 0x69, 0x6e, 0x75, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x64, 0x6d, 0x69, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f,
0x74, 0x64, 0x65, 0x66, 0x65, 0x61, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x61, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d,
0x64, 0x6d, 0x69, 0x74, 0x64, 0x65, 0x66, 0x65, 0x61, 0x74, 0x12, 0x2b, 0x0a, 0x03, 0x72, 0x65, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2a, 0x0a, 0x05, 0x63, 0x68, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20,
0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x50, 0x6c, 0x61, 0x79, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61,
0x65, 0x72, 0x52, 0x03, 0x72, 0x65, 0x64, 0x12, 0x2d, 0x0a, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x18, 0x62, 0x62, 0x69, 0x74, 0x43, 0x68, 0x65, 0x73, 0x73, 0x52, 0x05, 0x63, 0x68, 0x65, 0x73, 0x73,
0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x22, 0x42, 0x0a, 0x12, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74,
0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x57, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64,
0x52, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x14,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x0a, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69,
0x73, 0x77, 0x69, 0x6e, 0x22, 0x15, 0x0a, 0x13, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61,
0x62, 0x62, 0x69, 0x74, 0x57, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x22, 0xb0, 0x01, 0x0a, 0x18,
0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x47, 0x61, 0x6d, 0x65,
0x4f, 0x76, 0x65, 0x72, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x69, 0x6e, 0x75,
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x77, 0x69, 0x6e, 0x75, 0x69, 0x64,
0x12, 0x20, 0x0a, 0x0b, 0x61, 0x64, 0x6d, 0x69, 0x74, 0x64, 0x65, 0x66, 0x65, 0x61, 0x74, 0x18,
0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x61, 0x64, 0x6d, 0x69, 0x74, 0x64, 0x65, 0x66, 0x65,
0x61, 0x74, 0x12, 0x2b, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x19, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74,
0x52, 0x6f, 0x6f, 0x6d, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x03, 0x72, 0x65, 0x64, 0x12,
0x2d, 0x0a, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e,
0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x52, 0x6f,
0x6f, 0x6d, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x42, 0x06,
0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -961,7 +977,7 @@ func file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP() []byte {
return file_caninerabbit_caninerabbit_msg_proto_rawDescData return file_caninerabbit_caninerabbit_msg_proto_rawDescData
} }
var file_caninerabbit_caninerabbit_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 16) var file_caninerabbit_caninerabbit_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 17)
var file_caninerabbit_caninerabbit_msg_proto_goTypes = []interface{}{ var file_caninerabbit_caninerabbit_msg_proto_goTypes = []interface{}{
(*CanineRabbitInfoReq)(nil), // 0: CanineRabbitInfoReq (*CanineRabbitInfoReq)(nil), // 0: CanineRabbitInfoReq
(*CanineRabbitInfoResp)(nil), // 1: CanineRabbitInfoResp (*CanineRabbitInfoResp)(nil), // 1: CanineRabbitInfoResp
@ -979,25 +995,27 @@ var file_caninerabbit_caninerabbit_msg_proto_goTypes = []interface{}{
(*CanineRabbitWinReq)(nil), // 13: CanineRabbitWinReq (*CanineRabbitWinReq)(nil), // 13: CanineRabbitWinReq
(*CanineRabbitWinResp)(nil), // 14: CanineRabbitWinResp (*CanineRabbitWinResp)(nil), // 14: CanineRabbitWinResp
(*CanineRabbitGameOverPush)(nil), // 15: CanineRabbitGameOverPush (*CanineRabbitGameOverPush)(nil), // 15: CanineRabbitGameOverPush
(*DBCanineRabbit)(nil), // 16: DBCanineRabbit nil, // 16: CanineRabbitAwardResp.AwardmapEntry
(*UserAtno)(nil), // 17: UserAtno (*DBCanineRabbit)(nil), // 17: DBCanineRabbit
(*DBCanineRabbitRoom)(nil), // 18: DBCanineRabbitRoom (*UserAtno)(nil), // 18: UserAtno
(*DBCanineRabbitChess)(nil), // 19: DBCanineRabbitChess (*DBCanineRabbitRoom)(nil), // 19: DBCanineRabbitRoom
(*DBCanineRabbitRoomPlayer)(nil), // 20: DBCanineRabbitRoomPlayer (*DBCanineRabbitChess)(nil), // 20: DBCanineRabbitChess
(*DBCanineRabbitRoomPlayer)(nil), // 21: DBCanineRabbitRoomPlayer
} }
var file_caninerabbit_caninerabbit_msg_proto_depIdxs = []int32{ var file_caninerabbit_caninerabbit_msg_proto_depIdxs = []int32{
16, // 0: CanineRabbitInfoResp.info:type_name -> DBCanineRabbit 17, // 0: CanineRabbitInfoResp.info:type_name -> DBCanineRabbit
17, // 1: CanineRabbitAwardResp.award:type_name -> UserAtno 16, // 1: CanineRabbitAwardResp.awardmap:type_name -> CanineRabbitAwardResp.AwardmapEntry
18, // 2: CanineRabbitGameReadyPush.room:type_name -> DBCanineRabbitRoom 18, // 2: CanineRabbitAwardResp.award:type_name -> UserAtno
19, // 3: CanineRabbitHandleReq.chess:type_name -> DBCanineRabbitChess 19, // 3: CanineRabbitGameReadyPush.room:type_name -> DBCanineRabbitRoom
19, // 4: CanineRabbitGameHandlePush.chess:type_name -> DBCanineRabbitChess 20, // 4: CanineRabbitHandleReq.chess:type_name -> DBCanineRabbitChess
20, // 5: CanineRabbitGameOverPush.red:type_name -> DBCanineRabbitRoomPlayer 20, // 5: CanineRabbitGameHandlePush.chess:type_name -> DBCanineRabbitChess
20, // 6: CanineRabbitGameOverPush.blue:type_name -> DBCanineRabbitRoomPlayer 21, // 6: CanineRabbitGameOverPush.red:type_name -> DBCanineRabbitRoomPlayer
7, // [7:7] is the sub-list for method output_type 21, // 7: CanineRabbitGameOverPush.blue:type_name -> DBCanineRabbitRoomPlayer
7, // [7:7] is the sub-list for method input_type 8, // [8:8] is the sub-list for method output_type
7, // [7:7] is the sub-list for extension type_name 8, // [8:8] is the sub-list for method input_type
7, // [7:7] is the sub-list for extension extendee 8, // [8:8] is the sub-list for extension type_name
0, // [0:7] is the sub-list for field type_name 8, // [8:8] is the sub-list for extension extendee
0, // [0:8] is the sub-list for field type_name
} }
func init() { file_caninerabbit_caninerabbit_msg_proto_init() } func init() { file_caninerabbit_caninerabbit_msg_proto_init() }
@ -1207,7 +1225,7 @@ func file_caninerabbit_caninerabbit_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(), GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_caninerabbit_caninerabbit_msg_proto_rawDesc, RawDescriptor: file_caninerabbit_caninerabbit_msg_proto_rawDesc,
NumEnums: 0, NumEnums: 0,
NumMessages: 16, NumMessages: 17,
NumExtensions: 0, NumExtensions: 0,
NumServices: 0, NumServices: 0,
}, },

274
pb/parkour_db.pb.go
View File

@ -127,17 +127,20 @@ type DBRaceMember struct {
User *BaseUserInfo `protobuf:"bytes,1,opt,name=user,proto3" json:"user"` //发起者信息 User *BaseUserInfo `protobuf:"bytes,1,opt,name=user,proto3" json:"user"` //发起者信息
Dan int32 `protobuf:"varint,2,opt,name=dan,proto3" json:"dan"` //段位 Dan int32 `protobuf:"varint,2,opt,name=dan,proto3" json:"dan"` //段位
Mlv int32 `protobuf:"varint,3,opt,name=mlv,proto3" json:"mlv"` //坐骑等级 Integral int32 `protobuf:"varint,3,opt,name=integral,proto3" json:"integral"` //积分
Mount string `protobuf:"bytes,4,opt,name=mount,proto3" json:"mount"` //上阵坐骑 Mlv int32 `protobuf:"varint,4,opt,name=mlv,proto3" json:"mlv"` //坐骑等级
Property map[string]int32 `protobuf:"bytes,5,rep,name=property,proto3" json:"property" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //坐骑属性 Mount string `protobuf:"bytes,5,opt,name=mount,proto3" json:"mount"` //上阵坐骑
Currhp int32 `protobuf:"varint,6,opt,name=currhp,proto3" json:"currhp"` //当前血量 Property map[string]int32 `protobuf:"bytes,6,rep,name=property,proto3" json:"property" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //坐骑属性
Ready bool `protobuf:"varint,7,opt,name=ready,proto3" json:"ready"` //是否准备 Currhp int32 `protobuf:"varint,7,opt,name=currhp,proto3" json:"currhp"` //当前血量
Isai bool `protobuf:"varint,8,opt,name=isai,proto3" json:"isai"` //是否是ai Ready bool `protobuf:"varint,8,opt,name=ready,proto3" json:"ready"` //是否准备
Isoff bool `protobuf:"varint,9,opt,name=isoff,proto3" json:"isoff"` //是否离线 Isai bool `protobuf:"varint,9,opt,name=isai,proto3" json:"isai"` //是否是ai
Scores int32 `protobuf:"varint,10,opt,name=scores,proto3" json:"scores"` //当前分数 Isoff bool `protobuf:"varint,10,opt,name=isoff,proto3" json:"isoff"` //是否离线
Energy int32 `protobuf:"varint,11,opt,name=energy,proto3" json:"energy"` //当前能量 Scores int32 `protobuf:"varint,11,opt,name=scores,proto3" json:"scores"` //当前分数
Dodge int32 `protobuf:"varint,12,opt,name=dodge,proto3" json:"dodge"` //闪避次数 Energy int32 `protobuf:"varint,12,opt,name=energy,proto3" json:"energy"` //当前能量
Shot int32 `protobuf:"varint,13,opt,name=shot,proto3" json:"shot"` //射门次数 Dodge int32 `protobuf:"varint,13,opt,name=dodge,proto3" json:"dodge"` //闪避次数
Shot int32 `protobuf:"varint,14,opt,name=shot,proto3" json:"shot"` //射门次数
Weekintegral int32 `protobuf:"varint,15,opt,name=weekintegral,proto3" json:"weekintegral"` //周积分
Rating int32 `protobuf:"varint,16,opt,name=rating,proto3" json:"rating"` //评级
} }
func (x *DBRaceMember) Reset() { func (x *DBRaceMember) Reset() {
@ -186,6 +189,13 @@ func (x *DBRaceMember) GetDan() int32 {
return 0 return 0
} }
func (x *DBRaceMember) GetIntegral() int32 {
if x != nil {
return x.Integral
}
return 0
}
func (x *DBRaceMember) GetMlv() int32 { func (x *DBRaceMember) GetMlv() int32 {
if x != nil { if x != nil {
return x.Mlv return x.Mlv
@ -263,6 +273,20 @@ func (x *DBRaceMember) GetShot() int32 {
return 0 return 0
} }
func (x *DBRaceMember) GetWeekintegral() int32 {
if x != nil {
return x.Weekintegral
}
return 0
}
func (x *DBRaceMember) GetRating() int32 {
if x != nil {
return x.Rating
}
return 0
}
type DBRaceInvite struct { type DBRaceInvite struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
@ -357,14 +381,12 @@ type DBParkour struct {
Property map[string]int32 `protobuf:"bytes,7,rep,name=property,proto3" json:"property" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //坐骑属性 Property map[string]int32 `protobuf:"bytes,7,rep,name=property,proto3" json:"property" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //坐骑属性
State RaceTeamState `protobuf:"varint,8,opt,name=state,proto3,enum=RaceTeamState" json:"state"` //队伍状态 State RaceTeamState `protobuf:"varint,8,opt,name=state,proto3,enum=RaceTeamState" json:"state"` //队伍状态
Rtype RaceType `protobuf:"varint,9,opt,name=rtype,proto3,enum=RaceType" json:"rtype"` //比赛模式 Rtype RaceType `protobuf:"varint,9,opt,name=rtype,proto3,enum=RaceType" json:"rtype"` //比赛模式
Currbattid string `protobuf:"bytes,10,opt,name=currbattid,proto3" json:"currbattid"` //当前战斗id Roomid string `protobuf:"bytes,10,opt,name=roomid,proto3" json:"roomid"` //当前战斗id
Integral int32 `protobuf:"varint,11,opt,name=integral,proto3" json:"integral"` //积分 Roompath string `protobuf:"bytes,11,opt,name=roompath,proto3" json:"roompath"` //房间地址
Captainid string `protobuf:"bytes,12,opt,name=captainid,proto3" json:"captainid"` //队长id 当前所在队伍 Integral int32 `protobuf:"varint,12,opt,name=integral,proto3" json:"integral"` //积分
Invite []*DBRaceInvite `protobuf:"bytes,13,rep,name=invite,proto3" json:"invite"` //邀请列表 Weektime int64 `protobuf:"varint,13,opt,name=weektime,proto3" json:"weektime"` //周积分重置使用
Member []*DBRaceMember `protobuf:"bytes,14,rep,name=member,proto3" json:"member"` //成员列表 Weekreward map[int32]bool `protobuf:"bytes,14,rep,name=weekreward,proto3" json:"weekreward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //周长奖励领取
Weektime int64 `protobuf:"varint,15,opt,name=weektime,proto3" json:"weektime"` //周积分重置使用 Weekintegral int32 `protobuf:"varint,15,opt,name=weekintegral,proto3" json:"weekintegral"` //周积分
Weekreward map[int32]bool `protobuf:"bytes,16,rep,name=weekreward,proto3" json:"weekreward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //周长奖励领取
Weekintegral int32 `protobuf:"varint,17,opt,name=weekintegral,proto3" json:"weekintegral"` //周积分
} }
func (x *DBParkour) Reset() { func (x *DBParkour) Reset() {
@ -462,9 +484,16 @@ func (x *DBParkour) GetRtype() RaceType {
return RaceType_ordinary return RaceType_ordinary
} }
func (x *DBParkour) GetCurrbattid() string { func (x *DBParkour) GetRoomid() string {
if x != nil { if x != nil {
return x.Currbattid return x.Roomid
}
return ""
}
func (x *DBParkour) GetRoompath() string {
if x != nil {
return x.Roompath
} }
return "" return ""
} }
@ -476,27 +505,6 @@ func (x *DBParkour) GetIntegral() int32 {
return 0 return 0
} }
func (x *DBParkour) GetCaptainid() string {
if x != nil {
return x.Captainid
}
return ""
}
func (x *DBParkour) GetInvite() []*DBRaceInvite {
if x != nil {
return x.Invite
}
return nil
}
func (x *DBParkour) GetMember() []*DBRaceMember {
if x != nil {
return x.Member
}
return nil
}
func (x *DBParkour) GetWeektime() int64 { func (x *DBParkour) GetWeektime() int64 {
if x != nil { if x != nil {
return x.Weektime return x.Weektime
@ -638,9 +646,11 @@ type DBMatchPlayer struct {
Suser *BaseUserInfo `protobuf:"bytes,1,opt,name=suser,proto3" json:"suser"` //发起者信息 Suser *BaseUserInfo `protobuf:"bytes,1,opt,name=suser,proto3" json:"suser"` //发起者信息
Dan int32 `protobuf:"varint,2,opt,name=dan,proto3" json:"dan"` //段位 Dan int32 `protobuf:"varint,2,opt,name=dan,proto3" json:"dan"` //段位
Mount string `protobuf:"bytes,3,opt,name=mount,proto3" json:"mount"` //上阵坐骑 Integral int32 `protobuf:"varint,4,opt,name=integral,proto3" json:"integral"` //积分
Property map[string]int32 `protobuf:"bytes,4,rep,name=property,proto3" json:"property" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //坐骑属性 Weekintegral int32 `protobuf:"varint,5,opt,name=weekintegral,proto3" json:"weekintegral"` //周积分
Mlv int32 `protobuf:"varint,5,opt,name=mlv,proto3" json:"mlv"` //坐骑等级 Mount string `protobuf:"bytes,6,opt,name=mount,proto3" json:"mount"` //上阵坐骑
Property map[string]int32 `protobuf:"bytes,7,rep,name=property,proto3" json:"property" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //坐骑属性
Mlv int32 `protobuf:"varint,8,opt,name=mlv,proto3" json:"mlv"` //坐骑等级
} }
func (x *DBMatchPlayer) Reset() { func (x *DBMatchPlayer) Reset() {
@ -689,6 +699,20 @@ func (x *DBMatchPlayer) GetDan() int32 {
return 0 return 0
} }
func (x *DBMatchPlayer) GetIntegral() int32 {
if x != nil {
return x.Integral
}
return 0
}
func (x *DBMatchPlayer) GetWeekintegral() int32 {
if x != nil {
return x.Weekintegral
}
return 0
}
func (x *DBMatchPlayer) GetMount() string { func (x *DBMatchPlayer) GetMount() string {
if x != nil { if x != nil {
return x.Mount return x.Mount
@ -715,74 +739,74 @@ var File_parkour_parkour_db_proto protoreflect.FileDescriptor
var file_parkour_parkour_db_proto_rawDesc = []byte{ var file_parkour_parkour_db_proto_rawDesc = []byte{
0x0a, 0x18, 0x70, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x2f, 0x70, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x0a, 0x18, 0x70, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x2f, 0x70, 0x61, 0x72, 0x6b, 0x6f, 0x75,
0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d,
0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x93, 0x03, 0x0a, 0x0c, 0x44, 0x42, 0x52, 0x61, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xeb, 0x03, 0x0a, 0x0c, 0x44, 0x42, 0x52, 0x61, 0x63,
0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18,
0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72,
0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61,
0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x1a, 0x0a, 0x08,
0x6d, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6d, 0x6c, 0x76, 0x12, 0x14, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
0x0a, 0x05, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x6c, 0x76, 0x18,
0x6f, 0x75, 0x6e, 0x74, 0x12, 0x37, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6d, 0x6c, 0x76, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f,
0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x75, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x75, 0x6e, 0x74,
0x65, 0x6d, 0x62, 0x65, 0x72, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x12, 0x37, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x06, 0x20, 0x03,
0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65,
0x06, 0x63, 0x75, 0x72, 0x72, 0x68, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x72, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
0x75, 0x72, 0x72, 0x68, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, 0x61, 0x64, 0x79, 0x18, 0x07, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x75, 0x72,
0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x72, 0x65, 0x61, 0x64, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x72, 0x68, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x75, 0x72, 0x72, 0x68,
0x73, 0x61, 0x69, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69, 0x12, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, 0x61, 0x64, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08,
0x14, 0x0a, 0x05, 0x69, 0x73, 0x6f, 0x66, 0x66, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x52, 0x05, 0x72, 0x65, 0x61, 0x64, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x61, 0x69, 0x18,
0x69, 0x73, 0x6f, 0x66, 0x66, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x69,
0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x12, 0x16, 0x0a, 0x73, 0x6f, 0x66, 0x66, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x6f, 0x66,
0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x65, 0x66, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28,
0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x6f, 0x64, 0x67, 0x65, 0x18, 0x0c, 0x05, 0x52, 0x06, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65,
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x64, 0x6f, 0x64, 0x67, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x72, 0x67, 0x79, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67,
0x68, 0x6f, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x68, 0x6f, 0x74, 0x1a, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x6f, 0x64, 0x67, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05,
0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x64, 0x6f, 0x64, 0x67, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x68, 0x6f, 0x74, 0x18,
0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x68, 0x6f, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x77,
0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x65, 0x65, 0x6b, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x0f, 0x20, 0x01, 0x28,
0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x76, 0x0a, 0x0c, 0x05, 0x52, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12,
0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x16, 0x0a, 0x06, 0x72, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52,
0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x06, 0x72, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65,
0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x03, 0x20, 0x01, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x78, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x76, 0x0a, 0x0c, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x49, 0x6e,
0x70, 0x69, 0x72, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x78, 0x70, 0x76, 0x69, 0x74, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
0x69, 0x72, 0x65, 0x64, 0x22, 0xad, 0x05, 0x0a, 0x09, 0x44, 0x42, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02,
0x75, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76,
0x69, 0x64, 0x12, 0x21, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x61, 0x74, 0x61, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74,
0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x18, 0x05, 0x20,
0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x6d, 0x74, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x22, 0xd5, 0x04, 0x0a,
0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x65, 0x66, 0x6d, 0x74, 0x73, 0x12, 0x09, 0x44, 0x42, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
0x10, 0x0a, 0x03, 0x6d, 0x6c, 0x76, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6d, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x04, 0x75, 0x73,
0x76, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55,
0x52, 0x05, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x34, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x10, 0x0a,
0x72, 0x74, 0x79, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x12,
0x72, 0x6b, 0x6f, 0x75, 0x72, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x6d, 0x74, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x24, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x6d, 0x74, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x6c, 0x76, 0x18, 0x05,
0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0e, 0x2e, 0x52, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6d, 0x6c, 0x76, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f, 0x75,
0x61, 0x63, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12,
0x61, 0x74, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x09, 0x20, 0x01, 0x34, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x07, 0x20, 0x03, 0x28,
0x28, 0x0e, 0x32, 0x09, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x72, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x2e, 0x50, 0x72,
0x74, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x72, 0x72, 0x62, 0x61, 0x74, 0x74, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f,
0x69, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x75, 0x72, 0x72, 0x62, 0x61, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x08,
0x74, 0x74, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0e, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x53,
0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x72,
0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x64, 0x18, 0x0c, 0x20, 0x74, 0x79, 0x70, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x52, 0x61, 0x63,
0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x64, 0x12, 0x25, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06,
0x0a, 0x06, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f,
0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x52, 0x06, 0x69, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x6f, 0x6f, 0x6d, 0x70, 0x61, 0x74, 0x68,
0x6e, 0x76, 0x69, 0x74, 0x65, 0x12, 0x25, 0x0a, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x6f, 0x6f, 0x6d, 0x70, 0x61, 0x74, 0x68,
0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x0c, 0x20, 0x01,
0x6d, 0x62, 0x65, 0x72, 0x52, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x1a, 0x0a, 0x08,
0x77, 0x65, 0x65, 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x77, 0x65, 0x65, 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08,
0x77, 0x65, 0x65, 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x3a, 0x0a, 0x0a, 0x77, 0x65, 0x65, 0x6b, 0x77, 0x65, 0x65, 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x3a, 0x0a, 0x0a, 0x77, 0x65, 0x65, 0x6b,
0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x10, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44,
0x42, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x2e, 0x57, 0x65, 0x65, 0x6b, 0x72, 0x65, 0x77, 0x42, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x2e, 0x57, 0x65, 0x65, 0x6b, 0x72, 0x65, 0x77,
0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x77, 0x65, 0x65, 0x6b, 0x72, 0x65, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x77, 0x65, 0x65, 0x6b, 0x72, 0x65,
0x77, 0x61, 0x72, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x69, 0x6e, 0x74, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x69, 0x6e, 0x74, 0x65,
0x67, 0x72, 0x61, 0x6c, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x77, 0x65, 0x65, 0x6b,
0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70,
0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
@ -810,17 +834,21 @@ var file_parkour_parkour_db_proto_rawDesc = []byte{
0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x6d, 0x65, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x6d, 0x65,
0x6d, 0x62, 0x65, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x73, 0x63, 0x6f, 0x72, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x73, 0x63, 0x6f, 0x72,
0x65, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x73, 0x63, 0x65, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x73, 0x63,
0x6f, 0x72, 0x65, 0x73, 0x22, 0xe5, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x6f, 0x72, 0x65, 0x73, 0x22, 0xa5, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x4d, 0x61, 0x74, 0x63, 0x68,
0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x23, 0x0a, 0x05, 0x73, 0x75, 0x73, 0x65, 0x72, 0x18, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x23, 0x0a, 0x05, 0x73, 0x75, 0x73, 0x65, 0x72, 0x18,
0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72,
0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x73, 0x75, 0x73, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x73, 0x75, 0x73, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x64,
0x61, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x14, 0x0a, 0x61, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x1a, 0x0a,
0x05, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x77, 0x65, 0x65,
0x6b, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52,
0x0c, 0x77, 0x65, 0x65, 0x6b, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x14, 0x0a,
0x05, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f,
0x75, 0x6e, 0x74, 0x12, 0x38, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x75, 0x6e, 0x74, 0x12, 0x38, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18,
0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50,
0x6c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e,
0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x10, 0x0a, 0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x10, 0x0a,
0x03, 0x6d, 0x6c, 0x76, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6d, 0x6c, 0x76, 0x1a, 0x03, 0x6d, 0x6c, 0x76, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6d, 0x6c, 0x76, 0x1a,
0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79,
0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
@ -870,19 +898,17 @@ var file_parkour_parkour_db_proto_depIdxs = []int32{
8, // 3: DBParkour.property:type_name -> DBParkour.PropertyEntry 8, // 3: DBParkour.property:type_name -> DBParkour.PropertyEntry
1, // 4: DBParkour.state:type_name -> RaceTeamState 1, // 4: DBParkour.state:type_name -> RaceTeamState
0, // 5: DBParkour.rtype:type_name -> RaceType 0, // 5: DBParkour.rtype:type_name -> RaceType
3, // 6: DBParkour.invite:type_name -> DBRaceInvite 9, // 6: DBParkour.weekreward:type_name -> DBParkour.WeekrewardEntry
2, // 7: DBParkour.member:type_name -> DBRaceMember 0, // 7: DBRace.rtype:type_name -> RaceType
9, // 8: DBParkour.weekreward:type_name -> DBParkour.WeekrewardEntry 2, // 8: DBRace.redmember:type_name -> DBRaceMember
0, // 9: DBRace.rtype:type_name -> RaceType 2, // 9: DBRace.bulemember:type_name -> DBRaceMember
2, // 10: DBRace.redmember:type_name -> DBRaceMember 11, // 10: DBMatchPlayer.suser:type_name -> BaseUserInfo
2, // 11: DBRace.bulemember:type_name -> DBRaceMember 10, // 11: DBMatchPlayer.property:type_name -> DBMatchPlayer.PropertyEntry
11, // 12: DBMatchPlayer.suser:type_name -> BaseUserInfo 12, // [12:12] is the sub-list for method output_type
10, // 13: DBMatchPlayer.property:type_name -> DBMatchPlayer.PropertyEntry 12, // [12:12] is the sub-list for method input_type
14, // [14:14] is the sub-list for method output_type 12, // [12:12] is the sub-list for extension type_name
14, // [14:14] is the sub-list for method input_type 12, // [12:12] is the sub-list for extension extendee
14, // [14:14] is the sub-list for extension type_name 0, // [0:12] is the sub-list for field type_name
14, // [14:14] is the sub-list for extension extendee
0, // [0:14] is the sub-list for field type_name
} }
func init() { file_parkour_parkour_db_proto_init() } func init() { file_parkour_parkour_db_proto_init() }

531
pb/parkour_msg.pb.go
View File

@ -1492,17 +1492,17 @@ func (x *ParkourRaceOverPush) GetAward() []*UserAtno {
return nil return nil
} }
// 领取奖励 //周长奖励请求
type ParkourGetRewardReq struct { type ParkourWeekRewardReq struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Rid int32 `protobuf:"varint,1,opt,name=rid,proto3" json:"rid"` //领奖id Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"`
} }
func (x *ParkourGetRewardReq) Reset() { func (x *ParkourWeekRewardReq) Reset() {
*x = ParkourGetRewardReq{} *x = ParkourWeekRewardReq{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_parkour_parkour_msg_proto_msgTypes[28] mi := &file_parkour_parkour_msg_proto_msgTypes[28]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -1510,13 +1510,13 @@ func (x *ParkourGetRewardReq) Reset() {
} }
} }
func (x *ParkourGetRewardReq) String() string { func (x *ParkourWeekRewardReq) String() string {
return protoimpl.X.MessageStringOf(x) return protoimpl.X.MessageStringOf(x)
} }
func (*ParkourGetRewardReq) ProtoMessage() {} func (*ParkourWeekRewardReq) ProtoMessage() {}
func (x *ParkourGetRewardReq) ProtoReflect() protoreflect.Message { func (x *ParkourWeekRewardReq) ProtoReflect() protoreflect.Message {
mi := &file_parkour_parkour_msg_proto_msgTypes[28] mi := &file_parkour_parkour_msg_proto_msgTypes[28]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -1528,28 +1528,30 @@ func (x *ParkourGetRewardReq) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x) return mi.MessageOf(x)
} }
// Deprecated: Use ParkourGetRewardReq.ProtoReflect.Descriptor instead. // Deprecated: Use ParkourWeekRewardReq.ProtoReflect.Descriptor instead.
func (*ParkourGetRewardReq) Descriptor() ([]byte, []int) { func (*ParkourWeekRewardReq) Descriptor() ([]byte, []int) {
return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{28} return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{28}
} }
func (x *ParkourGetRewardReq) GetRid() int32 { func (x *ParkourWeekRewardReq) GetId() int32 {
if x != nil { if x != nil {
return x.Rid return x.Id
} }
return 0 return 0
} }
type ParkourGetRewardResp struct { //周长奖励请求
type ParkourWeekRewardResp struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Info *DBParkour `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"`
Award []*UserAtno `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励
} }
func (x *ParkourGetRewardResp) Reset() { func (x *ParkourWeekRewardResp) Reset() {
*x = ParkourGetRewardResp{} *x = ParkourWeekRewardResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_parkour_parkour_msg_proto_msgTypes[29] mi := &file_parkour_parkour_msg_proto_msgTypes[29]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -1557,13 +1559,13 @@ func (x *ParkourGetRewardResp) Reset() {
} }
} }
func (x *ParkourGetRewardResp) String() string { func (x *ParkourWeekRewardResp) String() string {
return protoimpl.X.MessageStringOf(x) return protoimpl.X.MessageStringOf(x)
} }
func (*ParkourGetRewardResp) ProtoMessage() {} func (*ParkourWeekRewardResp) ProtoMessage() {}
func (x *ParkourGetRewardResp) ProtoReflect() protoreflect.Message { func (x *ParkourWeekRewardResp) ProtoReflect() protoreflect.Message {
mi := &file_parkour_parkour_msg_proto_msgTypes[29] mi := &file_parkour_parkour_msg_proto_msgTypes[29]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -1575,14 +1577,211 @@ func (x *ParkourGetRewardResp) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x) return mi.MessageOf(x)
} }
// Deprecated: Use ParkourGetRewardResp.ProtoReflect.Descriptor instead. // Deprecated: Use ParkourWeekRewardResp.ProtoReflect.Descriptor instead.
func (*ParkourGetRewardResp) Descriptor() ([]byte, []int) { func (*ParkourWeekRewardResp) Descriptor() ([]byte, []int) {
return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{29} return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{29}
} }
func (x *ParkourGetRewardResp) GetInfo() *DBParkour { func (x *ParkourWeekRewardResp) GetId() int32 {
if x != nil { if x != nil {
return x.Info return x.Id
}
return 0
}
func (x *ParkourWeekRewardResp) GetAward() []*UserAtno {
if x != nil {
return x.Award
}
return nil
}
//周长奖励请求
type ParkourAllWeekRewardReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
}
func (x *ParkourAllWeekRewardReq) Reset() {
*x = ParkourAllWeekRewardReq{}
if protoimpl.UnsafeEnabled {
mi := &file_parkour_parkour_msg_proto_msgTypes[30]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *ParkourAllWeekRewardReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ParkourAllWeekRewardReq) ProtoMessage() {}
func (x *ParkourAllWeekRewardReq) ProtoReflect() protoreflect.Message {
mi := &file_parkour_parkour_msg_proto_msgTypes[30]
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 ParkourAllWeekRewardReq.ProtoReflect.Descriptor instead.
func (*ParkourAllWeekRewardReq) Descriptor() ([]byte, []int) {
return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{30}
}
//周长奖励请求
type ParkourAllWeekRewardResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Weekreward map[int32]bool `protobuf:"bytes,1,rep,name=weekreward,proto3" json:"weekreward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //周长奖励领取
Award []*UserAtno `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励
}
func (x *ParkourAllWeekRewardResp) Reset() {
*x = ParkourAllWeekRewardResp{}
if protoimpl.UnsafeEnabled {
mi := &file_parkour_parkour_msg_proto_msgTypes[31]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *ParkourAllWeekRewardResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ParkourAllWeekRewardResp) ProtoMessage() {}
func (x *ParkourAllWeekRewardResp) ProtoReflect() protoreflect.Message {
mi := &file_parkour_parkour_msg_proto_msgTypes[31]
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 ParkourAllWeekRewardResp.ProtoReflect.Descriptor instead.
func (*ParkourAllWeekRewardResp) Descriptor() ([]byte, []int) {
return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{31}
}
func (x *ParkourAllWeekRewardResp) GetWeekreward() map[int32]bool {
if x != nil {
return x.Weekreward
}
return nil
}
func (x *ParkourAllWeekRewardResp) GetAward() []*UserAtno {
if x != nil {
return x.Award
}
return nil
}
//重连
type ParkourReconnectRoomReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Battleid string `protobuf:"bytes,1,opt,name=battleid,proto3" json:"battleid"`
}
func (x *ParkourReconnectRoomReq) Reset() {
*x = ParkourReconnectRoomReq{}
if protoimpl.UnsafeEnabled {
mi := &file_parkour_parkour_msg_proto_msgTypes[32]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *ParkourReconnectRoomReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ParkourReconnectRoomReq) ProtoMessage() {}
func (x *ParkourReconnectRoomReq) ProtoReflect() protoreflect.Message {
mi := &file_parkour_parkour_msg_proto_msgTypes[32]
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 ParkourReconnectRoomReq.ProtoReflect.Descriptor instead.
func (*ParkourReconnectRoomReq) Descriptor() ([]byte, []int) {
return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{32}
}
func (x *ParkourReconnectRoomReq) GetBattleid() string {
if x != nil {
return x.Battleid
}
return ""
}
type ParkourReconnectRoomResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Race *DBRace `protobuf:"bytes,1,opt,name=race,proto3" json:"race"`
}
func (x *ParkourReconnectRoomResp) Reset() {
*x = ParkourReconnectRoomResp{}
if protoimpl.UnsafeEnabled {
mi := &file_parkour_parkour_msg_proto_msgTypes[33]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *ParkourReconnectRoomResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ParkourReconnectRoomResp) ProtoMessage() {}
func (x *ParkourReconnectRoomResp) ProtoReflect() protoreflect.Message {
mi := &file_parkour_parkour_msg_proto_msgTypes[33]
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 ParkourReconnectRoomResp.ProtoReflect.Descriptor instead.
func (*ParkourReconnectRoomResp) Descriptor() ([]byte, []int) {
return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{33}
}
func (x *ParkourReconnectRoomResp) GetRace() *DBRace {
if x != nil {
return x.Race
} }
return nil return nil
} }
@ -1602,7 +1801,7 @@ type RPCParkourJoinMatchReq struct {
func (x *RPCParkourJoinMatchReq) Reset() { func (x *RPCParkourJoinMatchReq) Reset() {
*x = RPCParkourJoinMatchReq{} *x = RPCParkourJoinMatchReq{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_parkour_parkour_msg_proto_msgTypes[30] mi := &file_parkour_parkour_msg_proto_msgTypes[34]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -1615,7 +1814,7 @@ func (x *RPCParkourJoinMatchReq) String() string {
func (*RPCParkourJoinMatchReq) ProtoMessage() {} func (*RPCParkourJoinMatchReq) ProtoMessage() {}
func (x *RPCParkourJoinMatchReq) ProtoReflect() protoreflect.Message { func (x *RPCParkourJoinMatchReq) ProtoReflect() protoreflect.Message {
mi := &file_parkour_parkour_msg_proto_msgTypes[30] mi := &file_parkour_parkour_msg_proto_msgTypes[34]
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 {
@ -1628,7 +1827,7 @@ func (x *RPCParkourJoinMatchReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use RPCParkourJoinMatchReq.ProtoReflect.Descriptor instead. // Deprecated: Use RPCParkourJoinMatchReq.ProtoReflect.Descriptor instead.
func (*RPCParkourJoinMatchReq) Descriptor() ([]byte, []int) { func (*RPCParkourJoinMatchReq) Descriptor() ([]byte, []int) {
return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{30} return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{34}
} }
func (x *RPCParkourJoinMatchReq) GetCaptainid() string { func (x *RPCParkourJoinMatchReq) GetCaptainid() string {
@ -1662,7 +1861,7 @@ type RPCParkourJoinMatchResp struct {
func (x *RPCParkourJoinMatchResp) Reset() { func (x *RPCParkourJoinMatchResp) Reset() {
*x = RPCParkourJoinMatchResp{} *x = RPCParkourJoinMatchResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_parkour_parkour_msg_proto_msgTypes[31] mi := &file_parkour_parkour_msg_proto_msgTypes[35]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -1675,7 +1874,7 @@ func (x *RPCParkourJoinMatchResp) String() string {
func (*RPCParkourJoinMatchResp) ProtoMessage() {} func (*RPCParkourJoinMatchResp) ProtoMessage() {}
func (x *RPCParkourJoinMatchResp) ProtoReflect() protoreflect.Message { func (x *RPCParkourJoinMatchResp) ProtoReflect() protoreflect.Message {
mi := &file_parkour_parkour_msg_proto_msgTypes[31] mi := &file_parkour_parkour_msg_proto_msgTypes[35]
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 {
@ -1688,7 +1887,7 @@ func (x *RPCParkourJoinMatchResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use RPCParkourJoinMatchResp.ProtoReflect.Descriptor instead. // Deprecated: Use RPCParkourJoinMatchResp.ProtoReflect.Descriptor instead.
func (*RPCParkourJoinMatchResp) Descriptor() ([]byte, []int) { func (*RPCParkourJoinMatchResp) Descriptor() ([]byte, []int) {
return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{31} return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{35}
} }
//取消匹配 //取消匹配
@ -1703,7 +1902,7 @@ type RPCParkourCancelMatchReq struct {
func (x *RPCParkourCancelMatchReq) Reset() { func (x *RPCParkourCancelMatchReq) Reset() {
*x = RPCParkourCancelMatchReq{} *x = RPCParkourCancelMatchReq{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_parkour_parkour_msg_proto_msgTypes[32] mi := &file_parkour_parkour_msg_proto_msgTypes[36]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -1716,7 +1915,7 @@ func (x *RPCParkourCancelMatchReq) String() string {
func (*RPCParkourCancelMatchReq) ProtoMessage() {} func (*RPCParkourCancelMatchReq) ProtoMessage() {}
func (x *RPCParkourCancelMatchReq) ProtoReflect() protoreflect.Message { func (x *RPCParkourCancelMatchReq) ProtoReflect() protoreflect.Message {
mi := &file_parkour_parkour_msg_proto_msgTypes[32] mi := &file_parkour_parkour_msg_proto_msgTypes[36]
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 {
@ -1729,7 +1928,7 @@ func (x *RPCParkourCancelMatchReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use RPCParkourCancelMatchReq.ProtoReflect.Descriptor instead. // Deprecated: Use RPCParkourCancelMatchReq.ProtoReflect.Descriptor instead.
func (*RPCParkourCancelMatchReq) Descriptor() ([]byte, []int) { func (*RPCParkourCancelMatchReq) Descriptor() ([]byte, []int) {
return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{32} return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{36}
} }
func (x *RPCParkourCancelMatchReq) GetCaptainid() string { func (x *RPCParkourCancelMatchReq) GetCaptainid() string {
@ -1748,7 +1947,7 @@ type RPCParkourCancelMatchResp struct {
func (x *RPCParkourCancelMatchResp) Reset() { func (x *RPCParkourCancelMatchResp) Reset() {
*x = RPCParkourCancelMatchResp{} *x = RPCParkourCancelMatchResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_parkour_parkour_msg_proto_msgTypes[33] mi := &file_parkour_parkour_msg_proto_msgTypes[37]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -1761,7 +1960,7 @@ func (x *RPCParkourCancelMatchResp) String() string {
func (*RPCParkourCancelMatchResp) ProtoMessage() {} func (*RPCParkourCancelMatchResp) ProtoMessage() {}
func (x *RPCParkourCancelMatchResp) ProtoReflect() protoreflect.Message { func (x *RPCParkourCancelMatchResp) ProtoReflect() protoreflect.Message {
mi := &file_parkour_parkour_msg_proto_msgTypes[33] mi := &file_parkour_parkour_msg_proto_msgTypes[37]
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 {
@ -1774,7 +1973,7 @@ func (x *RPCParkourCancelMatchResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use RPCParkourCancelMatchResp.ProtoReflect.Descriptor instead. // Deprecated: Use RPCParkourCancelMatchResp.ProtoReflect.Descriptor instead.
func (*RPCParkourCancelMatchResp) Descriptor() ([]byte, []int) { func (*RPCParkourCancelMatchResp) Descriptor() ([]byte, []int) {
return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{33} return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{37}
} }
///匹配成功通知请求 ///匹配成功通知请求
@ -1790,7 +1989,7 @@ type RPCParkourMatchSuccReq struct {
func (x *RPCParkourMatchSuccReq) Reset() { func (x *RPCParkourMatchSuccReq) Reset() {
*x = RPCParkourMatchSuccReq{} *x = RPCParkourMatchSuccReq{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_parkour_parkour_msg_proto_msgTypes[34] mi := &file_parkour_parkour_msg_proto_msgTypes[38]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -1803,7 +2002,7 @@ func (x *RPCParkourMatchSuccReq) String() string {
func (*RPCParkourMatchSuccReq) ProtoMessage() {} func (*RPCParkourMatchSuccReq) ProtoMessage() {}
func (x *RPCParkourMatchSuccReq) ProtoReflect() protoreflect.Message { func (x *RPCParkourMatchSuccReq) ProtoReflect() protoreflect.Message {
mi := &file_parkour_parkour_msg_proto_msgTypes[34] mi := &file_parkour_parkour_msg_proto_msgTypes[38]
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 {
@ -1816,7 +2015,7 @@ func (x *RPCParkourMatchSuccReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use RPCParkourMatchSuccReq.ProtoReflect.Descriptor instead. // Deprecated: Use RPCParkourMatchSuccReq.ProtoReflect.Descriptor instead.
func (*RPCParkourMatchSuccReq) Descriptor() ([]byte, []int) { func (*RPCParkourMatchSuccReq) Descriptor() ([]byte, []int) {
return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{34} return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{38}
} }
func (x *RPCParkourMatchSuccReq) GetRed() []*DBRaceMember { func (x *RPCParkourMatchSuccReq) GetRed() []*DBRaceMember {
@ -1843,7 +2042,7 @@ type RPCParkourMatchSuccResp struct {
func (x *RPCParkourMatchSuccResp) Reset() { func (x *RPCParkourMatchSuccResp) Reset() {
*x = RPCParkourMatchSuccResp{} *x = RPCParkourMatchSuccResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_parkour_parkour_msg_proto_msgTypes[35] mi := &file_parkour_parkour_msg_proto_msgTypes[39]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -1856,7 +2055,7 @@ func (x *RPCParkourMatchSuccResp) String() string {
func (*RPCParkourMatchSuccResp) ProtoMessage() {} func (*RPCParkourMatchSuccResp) ProtoMessage() {}
func (x *RPCParkourMatchSuccResp) ProtoReflect() protoreflect.Message { func (x *RPCParkourMatchSuccResp) ProtoReflect() protoreflect.Message {
mi := &file_parkour_parkour_msg_proto_msgTypes[35] mi := &file_parkour_parkour_msg_proto_msgTypes[39]
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 {
@ -1869,7 +2068,7 @@ func (x *RPCParkourMatchSuccResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use RPCParkourMatchSuccResp.ProtoReflect.Descriptor instead. // Deprecated: Use RPCParkourMatchSuccResp.ProtoReflect.Descriptor instead.
func (*RPCParkourMatchSuccResp) Descriptor() ([]byte, []int) { func (*RPCParkourMatchSuccResp) Descriptor() ([]byte, []int) {
return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{35} return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{39}
} }
//托管求情 //托管求情
@ -1885,7 +2084,7 @@ type RPC_ParkourTrusteeshipReq struct {
func (x *RPC_ParkourTrusteeshipReq) Reset() { func (x *RPC_ParkourTrusteeshipReq) Reset() {
*x = RPC_ParkourTrusteeshipReq{} *x = RPC_ParkourTrusteeshipReq{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_parkour_parkour_msg_proto_msgTypes[36] mi := &file_parkour_parkour_msg_proto_msgTypes[40]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -1898,7 +2097,7 @@ func (x *RPC_ParkourTrusteeshipReq) String() string {
func (*RPC_ParkourTrusteeshipReq) ProtoMessage() {} func (*RPC_ParkourTrusteeshipReq) ProtoMessage() {}
func (x *RPC_ParkourTrusteeshipReq) ProtoReflect() protoreflect.Message { func (x *RPC_ParkourTrusteeshipReq) ProtoReflect() protoreflect.Message {
mi := &file_parkour_parkour_msg_proto_msgTypes[36] mi := &file_parkour_parkour_msg_proto_msgTypes[40]
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 {
@ -1911,7 +2110,7 @@ func (x *RPC_ParkourTrusteeshipReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use RPC_ParkourTrusteeshipReq.ProtoReflect.Descriptor instead. // Deprecated: Use RPC_ParkourTrusteeshipReq.ProtoReflect.Descriptor instead.
func (*RPC_ParkourTrusteeshipReq) Descriptor() ([]byte, []int) { func (*RPC_ParkourTrusteeshipReq) Descriptor() ([]byte, []int) {
return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{36} return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{40}
} }
func (x *RPC_ParkourTrusteeshipReq) GetBattleid() string { func (x *RPC_ParkourTrusteeshipReq) GetBattleid() string {
@ -1937,7 +2136,7 @@ type RPC_ParkourTrusteeshipResp struct {
func (x *RPC_ParkourTrusteeshipResp) Reset() { func (x *RPC_ParkourTrusteeshipResp) Reset() {
*x = RPC_ParkourTrusteeshipResp{} *x = RPC_ParkourTrusteeshipResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_parkour_parkour_msg_proto_msgTypes[37] mi := &file_parkour_parkour_msg_proto_msgTypes[41]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -1950,7 +2149,7 @@ func (x *RPC_ParkourTrusteeshipResp) String() string {
func (*RPC_ParkourTrusteeshipResp) ProtoMessage() {} func (*RPC_ParkourTrusteeshipResp) ProtoMessage() {}
func (x *RPC_ParkourTrusteeshipResp) ProtoReflect() protoreflect.Message { func (x *RPC_ParkourTrusteeshipResp) ProtoReflect() protoreflect.Message {
mi := &file_parkour_parkour_msg_proto_msgTypes[37] mi := &file_parkour_parkour_msg_proto_msgTypes[41]
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 {
@ -1963,7 +2162,7 @@ func (x *RPC_ParkourTrusteeshipResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use RPC_ParkourTrusteeshipResp.ProtoReflect.Descriptor instead. // Deprecated: Use RPC_ParkourTrusteeshipResp.ProtoReflect.Descriptor instead.
func (*RPC_ParkourTrusteeshipResp) Descriptor() ([]byte, []int) { func (*RPC_ParkourTrusteeshipResp) Descriptor() ([]byte, []int) {
return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{37} return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{41}
} }
var File_parkour_parkour_msg_proto protoreflect.FileDescriptor var File_parkour_parkour_msg_proto protoreflect.FileDescriptor
@ -2085,43 +2284,65 @@ var file_parkour_parkour_msg_proto_rawDesc = []byte{
0x01, 0x28, 0x05, 0x52, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
0x6c, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x6c, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b,
0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61,
0x72, 0x64, 0x22, 0x27, 0x0a, 0x13, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x47, 0x65, 0x74, 0x72, 0x64, 0x22, 0x26, 0x0a, 0x14, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x57, 0x65, 0x65,
0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x22, 0x36, 0x0a, 0x14, 0x50, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x48, 0x0a, 0x15, 0x50, 0x61,
0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x57, 0x65, 0x65, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52,
0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x65, 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x04, 0x69, 0x02, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03,
0x6e, 0x66, 0x6f, 0x22, 0x7e, 0x0a, 0x16, 0x52, 0x50, 0x43, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61,
0x72, 0x4a, 0x6f, 0x69, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x77, 0x61, 0x72, 0x64, 0x22, 0x19, 0x0a, 0x17, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x41,
0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x6c, 0x6c, 0x57, 0x65, 0x65, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22,
0x52, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x6d, 0xc5, 0x01, 0x0a, 0x18, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x41, 0x6c, 0x6c, 0x57, 0x65,
0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x65, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x49, 0x0a, 0x0a,
0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x77, 0x65, 0x65, 0x6b, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
0x65, 0x72, 0x12, 0x1f, 0x0a, 0x03, 0x61, 0x69, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x29, 0x2e, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x41, 0x6c, 0x6c, 0x57, 0x65, 0x65,
0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x03, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x57, 0x65, 0x65, 0x6b,
0x61, 0x69, 0x73, 0x22, 0x19, 0x0a, 0x17, 0x52, 0x50, 0x43, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x77, 0x65, 0x65,
0x72, 0x4a, 0x6f, 0x69, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x22, 0x38, 0x6b, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64,
0x0a, 0x18, 0x52, 0x50, 0x43, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x43, 0x61, 0x6e, 0x63, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e,
0x65, 0x6c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x3d, 0x0a, 0x0f, 0x57, 0x65, 0x65, 0x6b,
0x70, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x64, 0x22, 0x1b, 0x0a, 0x19, 0x52, 0x50, 0x43, 0x50, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x4d, 0x61, 0x74, 0x63, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61,
0x68, 0x52, 0x65, 0x73, 0x70, 0x22, 0x5c, 0x0a, 0x16, 0x52, 0x50, 0x43, 0x50, 0x61, 0x72, 0x6b, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x35, 0x0a, 0x17, 0x50, 0x61, 0x72, 0x6b, 0x6f,
0x6f, 0x75, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x75, 0x63, 0x63, 0x52, 0x65, 0x71, 0x12, 0x75, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x52,
0x1f, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01,
0x42, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x03, 0x72, 0x65, 0x64, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x22, 0x37,
0x12, 0x21, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x0a, 0x18, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x04, 0x62, 0x63, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x72, 0x61,
0x75, 0x6c, 0x65, 0x22, 0x19, 0x0a, 0x17, 0x52, 0x50, 0x43, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63,
0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x75, 0x63, 0x63, 0x52, 0x65, 0x73, 0x70, 0x22, 0x49, 0x65, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x22, 0x7e, 0x0a, 0x16, 0x52, 0x50, 0x43, 0x50, 0x61,
0x0a, 0x19, 0x52, 0x50, 0x43, 0x5f, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x54, 0x72, 0x75, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4a, 0x6f, 0x69, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65,
0x73, 0x74, 0x65, 0x65, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x64, 0x18, 0x01,
0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x64, 0x12,
0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x25, 0x0a, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x1c, 0x0a, 0x1a, 0x52, 0x50, 0x43, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x06,
0x5f, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x54, 0x72, 0x75, 0x73, 0x74, 0x65, 0x65, 0x73, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x1f, 0x0a, 0x03, 0x61, 0x69, 0x73, 0x18, 0x03, 0x20,
0x68, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62,
0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x65, 0x72, 0x52, 0x03, 0x61, 0x69, 0x73, 0x22, 0x19, 0x0a, 0x17, 0x52, 0x50, 0x43, 0x50, 0x61,
0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4a, 0x6f, 0x69, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65,
0x73, 0x70, 0x22, 0x38, 0x0a, 0x18, 0x52, 0x50, 0x43, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72,
0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x1c,
0x0a, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
0x09, 0x52, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x64, 0x22, 0x1b, 0x0a, 0x19,
0x52, 0x50, 0x43, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c,
0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x22, 0x5c, 0x0a, 0x16, 0x52, 0x50, 0x43,
0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x75, 0x63, 0x63,
0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52,
0x03, 0x72, 0x65, 0x64, 0x12, 0x21, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x03,
0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65,
0x72, 0x52, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x22, 0x19, 0x0a, 0x17, 0x52, 0x50, 0x43, 0x50, 0x61,
0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x75, 0x63, 0x63, 0x52, 0x65,
0x73, 0x70, 0x22, 0x49, 0x0a, 0x19, 0x52, 0x50, 0x43, 0x5f, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75,
0x72, 0x54, 0x72, 0x75, 0x73, 0x74, 0x65, 0x65, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x71, 0x12,
0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75,
0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x1c, 0x0a,
0x1a, 0x52, 0x50, 0x43, 0x5f, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x54, 0x72, 0x75, 0x73,
0x74, 0x65, 0x65, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e,
0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -2136,7 +2357,7 @@ func file_parkour_parkour_msg_proto_rawDescGZIP() []byte {
return file_parkour_parkour_msg_proto_rawDescData return file_parkour_parkour_msg_proto_rawDescData
} }
var file_parkour_parkour_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 38) var file_parkour_parkour_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 43)
var file_parkour_parkour_msg_proto_goTypes = []interface{}{ var file_parkour_parkour_msg_proto_goTypes = []interface{}{
(*ParkourInfoReq)(nil), // 0: ParkourInfoReq (*ParkourInfoReq)(nil), // 0: ParkourInfoReq
(*ParkourInfoResp)(nil), // 1: ParkourInfoResp (*ParkourInfoResp)(nil), // 1: ParkourInfoResp
@ -2166,40 +2387,48 @@ var file_parkour_parkour_msg_proto_goTypes = []interface{}{
(*ParkourInfoChangePush)(nil), // 25: ParkourInfoChangePush (*ParkourInfoChangePush)(nil), // 25: ParkourInfoChangePush
(*ParkourRevivalPlayerPush)(nil), // 26: ParkourRevivalPlayerPush (*ParkourRevivalPlayerPush)(nil), // 26: ParkourRevivalPlayerPush
(*ParkourRaceOverPush)(nil), // 27: ParkourRaceOverPush (*ParkourRaceOverPush)(nil), // 27: ParkourRaceOverPush
(*ParkourGetRewardReq)(nil), // 28: ParkourGetRewardReq (*ParkourWeekRewardReq)(nil), // 28: ParkourWeekRewardReq
(*ParkourGetRewardResp)(nil), // 29: ParkourGetRewardResp (*ParkourWeekRewardResp)(nil), // 29: ParkourWeekRewardResp
(*RPCParkourJoinMatchReq)(nil), // 30: RPCParkourJoinMatchReq (*ParkourAllWeekRewardReq)(nil), // 30: ParkourAllWeekRewardReq
(*RPCParkourJoinMatchResp)(nil), // 31: RPCParkourJoinMatchResp (*ParkourAllWeekRewardResp)(nil), // 31: ParkourAllWeekRewardResp
(*RPCParkourCancelMatchReq)(nil), // 32: RPCParkourCancelMatchReq (*ParkourReconnectRoomReq)(nil), // 32: ParkourReconnectRoomReq
(*RPCParkourCancelMatchResp)(nil), // 33: RPCParkourCancelMatchResp (*ParkourReconnectRoomResp)(nil), // 33: ParkourReconnectRoomResp
(*RPCParkourMatchSuccReq)(nil), // 34: RPCParkourMatchSuccReq (*RPCParkourJoinMatchReq)(nil), // 34: RPCParkourJoinMatchReq
(*RPCParkourMatchSuccResp)(nil), // 35: RPCParkourMatchSuccResp (*RPCParkourJoinMatchResp)(nil), // 35: RPCParkourJoinMatchResp
(*RPC_ParkourTrusteeshipReq)(nil), // 36: RPC_ParkourTrusteeshipReq (*RPCParkourCancelMatchReq)(nil), // 36: RPCParkourCancelMatchReq
(*RPC_ParkourTrusteeshipResp)(nil), // 37: RPC_ParkourTrusteeshipResp (*RPCParkourCancelMatchResp)(nil), // 37: RPCParkourCancelMatchResp
(*DBParkour)(nil), // 38: DBParkour (*RPCParkourMatchSuccReq)(nil), // 38: RPCParkourMatchSuccReq
(RaceType)(0), // 39: RaceType (*RPCParkourMatchSuccResp)(nil), // 39: RPCParkourMatchSuccResp
(*DBRace)(nil), // 40: DBRace (*RPC_ParkourTrusteeshipReq)(nil), // 40: RPC_ParkourTrusteeshipReq
(*UserAtno)(nil), // 41: UserAtno (*RPC_ParkourTrusteeshipResp)(nil), // 41: RPC_ParkourTrusteeshipResp
(*DBRaceMember)(nil), // 42: DBRaceMember nil, // 42: ParkourAllWeekRewardResp.WeekrewardEntry
(*DBParkour)(nil), // 43: DBParkour
(RaceType)(0), // 44: RaceType
(*DBRace)(nil), // 45: DBRace
(*UserAtno)(nil), // 46: UserAtno
(*DBRaceMember)(nil), // 47: DBRaceMember
} }
var file_parkour_parkour_msg_proto_depIdxs = []int32{ var file_parkour_parkour_msg_proto_depIdxs = []int32{
38, // 0: ParkourInfoResp.info:type_name -> DBParkour 43, // 0: ParkourInfoResp.info:type_name -> DBParkour
39, // 1: ParkourRaceMatchReq.rtype:type_name -> RaceType 44, // 1: ParkourRaceMatchReq.rtype:type_name -> RaceType
39, // 2: ParkourRaceMatchCancelReq.rtype:type_name -> RaceType 44, // 2: ParkourRaceMatchCancelReq.rtype:type_name -> RaceType
40, // 3: ParkourRaceMatchSuccPush.race:type_name -> DBRace 45, // 3: ParkourRaceMatchSuccPush.race:type_name -> DBRace
38, // 4: ParkourInfoChangePush.Info:type_name -> DBParkour 43, // 4: ParkourInfoChangePush.Info:type_name -> DBParkour
40, // 5: ParkourRaceOverPush.race:type_name -> DBRace 45, // 5: ParkourRaceOverPush.race:type_name -> DBRace
41, // 6: ParkourRaceOverPush.award:type_name -> UserAtno 46, // 6: ParkourRaceOverPush.award:type_name -> UserAtno
38, // 7: ParkourGetRewardResp.info:type_name -> DBParkour 46, // 7: ParkourWeekRewardResp.award:type_name -> UserAtno
42, // 8: RPCParkourJoinMatchReq.member:type_name -> DBRaceMember 42, // 8: ParkourAllWeekRewardResp.weekreward:type_name -> ParkourAllWeekRewardResp.WeekrewardEntry
42, // 9: RPCParkourJoinMatchReq.ais:type_name -> DBRaceMember 46, // 9: ParkourAllWeekRewardResp.award:type_name -> UserAtno
42, // 10: RPCParkourMatchSuccReq.red:type_name -> DBRaceMember 45, // 10: ParkourReconnectRoomResp.race:type_name -> DBRace
42, // 11: RPCParkourMatchSuccReq.bule:type_name -> DBRaceMember 47, // 11: RPCParkourJoinMatchReq.member:type_name -> DBRaceMember
12, // [12:12] is the sub-list for method output_type 47, // 12: RPCParkourJoinMatchReq.ais:type_name -> DBRaceMember
12, // [12:12] is the sub-list for method input_type 47, // 13: RPCParkourMatchSuccReq.red:type_name -> DBRaceMember
12, // [12:12] is the sub-list for extension type_name 47, // 14: RPCParkourMatchSuccReq.bule:type_name -> DBRaceMember
12, // [12:12] is the sub-list for extension extendee 15, // [15:15] is the sub-list for method output_type
0, // [0:12] is the sub-list for field type_name 15, // [15:15] is the sub-list for method input_type
15, // [15:15] is the sub-list for extension type_name
15, // [15:15] is the sub-list for extension extendee
0, // [0:15] is the sub-list for field type_name
} }
func init() { file_parkour_parkour_msg_proto_init() } func init() { file_parkour_parkour_msg_proto_init() }
@ -2547,7 +2776,7 @@ func file_parkour_parkour_msg_proto_init() {
} }
} }
file_parkour_parkour_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { file_parkour_parkour_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*ParkourGetRewardReq); i { switch v := v.(*ParkourWeekRewardReq); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -2559,7 +2788,7 @@ func file_parkour_parkour_msg_proto_init() {
} }
} }
file_parkour_parkour_msg_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { file_parkour_parkour_msg_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*ParkourGetRewardResp); i { switch v := v.(*ParkourWeekRewardResp); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -2571,7 +2800,7 @@ func file_parkour_parkour_msg_proto_init() {
} }
} }
file_parkour_parkour_msg_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { file_parkour_parkour_msg_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RPCParkourJoinMatchReq); i { switch v := v.(*ParkourAllWeekRewardReq); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -2583,7 +2812,7 @@ func file_parkour_parkour_msg_proto_init() {
} }
} }
file_parkour_parkour_msg_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { file_parkour_parkour_msg_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RPCParkourJoinMatchResp); i { switch v := v.(*ParkourAllWeekRewardResp); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -2595,7 +2824,7 @@ func file_parkour_parkour_msg_proto_init() {
} }
} }
file_parkour_parkour_msg_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} { file_parkour_parkour_msg_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RPCParkourCancelMatchReq); i { switch v := v.(*ParkourReconnectRoomReq); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -2607,7 +2836,7 @@ func file_parkour_parkour_msg_proto_init() {
} }
} }
file_parkour_parkour_msg_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} { file_parkour_parkour_msg_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RPCParkourCancelMatchResp); i { switch v := v.(*ParkourReconnectRoomResp); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -2619,7 +2848,7 @@ func file_parkour_parkour_msg_proto_init() {
} }
} }
file_parkour_parkour_msg_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} { file_parkour_parkour_msg_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RPCParkourMatchSuccReq); i { switch v := v.(*RPCParkourJoinMatchReq); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -2631,7 +2860,7 @@ func file_parkour_parkour_msg_proto_init() {
} }
} }
file_parkour_parkour_msg_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} { file_parkour_parkour_msg_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RPCParkourMatchSuccResp); i { switch v := v.(*RPCParkourJoinMatchResp); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -2643,7 +2872,7 @@ func file_parkour_parkour_msg_proto_init() {
} }
} }
file_parkour_parkour_msg_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} { file_parkour_parkour_msg_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RPC_ParkourTrusteeshipReq); i { switch v := v.(*RPCParkourCancelMatchReq); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -2655,6 +2884,54 @@ func file_parkour_parkour_msg_proto_init() {
} }
} }
file_parkour_parkour_msg_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} { file_parkour_parkour_msg_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RPCParkourCancelMatchResp); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_parkour_parkour_msg_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RPCParkourMatchSuccReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_parkour_parkour_msg_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RPCParkourMatchSuccResp); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_parkour_parkour_msg_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RPC_ParkourTrusteeshipReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_parkour_parkour_msg_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RPC_ParkourTrusteeshipResp); i { switch v := v.(*RPC_ParkourTrusteeshipResp); i {
case 0: case 0:
return &v.state return &v.state
@ -2673,7 +2950,7 @@ func file_parkour_parkour_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(), GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_parkour_parkour_msg_proto_rawDesc, RawDescriptor: file_parkour_parkour_msg_proto_rawDesc,
NumEnums: 0, NumEnums: 0,
NumMessages: 38, NumMessages: 43,
NumExtensions: 0, NumExtensions: 0,
NumServices: 0, NumServices: 0,
}, },

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

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

14
sys/configure/structs/Game.CatchrabbitrewardData.go → sys/configure/structs/Game.CatchrabbitData.go
View File

@ -10,20 +10,20 @@ package cfg
import "errors" import "errors"
type GameCatchrabbitrewardData struct { type GameCatchrabbitData struct {
Key int32 Key int32
Type int32 Type int32
Condition int32 Condition int32
Reward []*Gameatn Reward []*Gameatn
} }
const TypeId_GameCatchrabbitrewardData = -1422030126 const TypeId_GameCatchrabbitData = -1864228381
func (*GameCatchrabbitrewardData) GetTypeId() int32 { func (*GameCatchrabbitData) GetTypeId() int32 {
return -1422030126 return -1864228381
} }
func (_v *GameCatchrabbitrewardData)Deserialize(_buf map[string]interface{}) (err error) { func (_v *GameCatchrabbitData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["condition"].(float64); !_ok_ { err = errors.New("condition error"); return }; _v.Condition = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["condition"].(float64); !_ok_ { err = errors.New("condition error"); return }; _v.Condition = int32(_tempNum_) }
@ -44,8 +44,8 @@ func (_v *GameCatchrabbitrewardData)Deserialize(_buf map[string]interface{}) (er
return return
} }
func DeserializeGameCatchrabbitrewardData(_buf map[string]interface{}) (*GameCatchrabbitrewardData, error) { func DeserializeGameCatchrabbitData(_buf map[string]interface{}) (*GameCatchrabbitData, error) {
v := &GameCatchrabbitrewardData{} v := &GameCatchrabbitData{}
if err := v.Deserialize(_buf); err == nil { if err := v.Deserialize(_buf); err == nil {
return v, nil return v, nil
} else { } else {

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

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

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

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

14
sys/configure/structs/Game.PuggsyPasscheckData.go → sys/configure/structs/Game.PuggsyPassCheckData.go
View File

@ -10,7 +10,7 @@ package cfg
import "errors" import "errors"
type GamePuggsyPasscheckData struct { type GamePuggsyPassCheckData struct {
Id int32 Id int32
PayId string PayId string
Parameter int32 Parameter int32
@ -19,13 +19,13 @@ type GamePuggsyPasscheckData struct {
PayReward []*Gameatn PayReward []*Gameatn
} }
const TypeId_GamePuggsyPasscheckData = 2074500826 const TypeId_GamePuggsyPassCheckData = -216498502
func (*GamePuggsyPasscheckData) GetTypeId() int32 { func (*GamePuggsyPassCheckData) GetTypeId() int32 {
return 2074500826 return -216498502
} }
func (_v *GamePuggsyPasscheckData)Deserialize(_buf map[string]interface{}) (err error) { func (_v *GamePuggsyPassCheckData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; if _v.PayId, _ok_ = _buf["pay_id"].(string); !_ok_ { err = errors.New("pay_id error"); return } } { var _ok_ bool; if _v.PayId, _ok_ = _buf["pay_id"].(string); !_ok_ { err = errors.New("pay_id error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["parameter"].(float64); !_ok_ { err = errors.New("parameter error"); return }; _v.Parameter = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["parameter"].(float64); !_ok_ { err = errors.New("parameter error"); return }; _v.Parameter = int32(_tempNum_) }
@ -48,8 +48,8 @@ func (_v *GamePuggsyPasscheckData)Deserialize(_buf map[string]interface{}) (err
return return
} }
func DeserializeGamePuggsyPasscheckData(_buf map[string]interface{}) (*GamePuggsyPasscheckData, error) { func DeserializeGamePuggsyPassCheckData(_buf map[string]interface{}) (*GamePuggsyPassCheckData, error) {
v := &GamePuggsyPasscheckData{} v := &GamePuggsyPassCheckData{}
if err := v.Deserialize(_buf); err == nil { if err := v.Deserialize(_buf); err == nil {
return v, nil return v, nil
} else { } else {

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

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

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

@ -290,6 +290,8 @@ type Tables struct {
PuggsyFight *GamePuggsyFight PuggsyFight *GamePuggsyFight
PuggsyScore *GamePuggsyScore PuggsyScore *GamePuggsyScore
PuggsySkill *GamePuggsySkill PuggsySkill *GamePuggsySkill
Catchrabbit *GameCatchrabbit
PuggsyPassCheck *GamePuggsyPassCheck
} }
func NewTables(loader JsonLoader) (*Tables, error) { func NewTables(loader JsonLoader) (*Tables, error) {
@ -1971,5 +1973,17 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.PuggsySkill, err = NewGamePuggsySkill(buf) ; err != nil { if tables.PuggsySkill, err = NewGamePuggsySkill(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_catchrabbit") ; err != nil {
return nil, err
}
if tables.Catchrabbit, err = NewGameCatchrabbit(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_puggsypasscheck") ; err != nil {
return nil, err
}
if tables.PuggsyPassCheck, err = NewGamePuggsyPassCheck(buf) ; err != nil {
return nil, err
}
return tables, nil return tables, nil
} }