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-06-01 18:07:02 +08:00
commit 70aa49e386
24 changed files with 3416 additions and 1344 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1504
bin/json/game_buriedcondi.json
View File

File diff suppressed because it is too large Load Diff

4
bin/json/game_caravancity.json
View File

@ -173,7 +173,7 @@
"cityexlock": [
0
],
"citylvlock": 2,
"citylvlock": 1,
"citymainlock": 0,
"cityman": 45001,
"cityname": {
@ -225,7 +225,7 @@
"cityexlock": [
0
],
"citylvlock": 2,
"citylvlock": 1,
"citymainlock": 0,
"cityman": 14007,
"cityname": {

20
bin/json/game_combatlevel.json
View File

@ -33,7 +33,7 @@
"n": 1
}
],
"debrisitemid": "16004002",
"debrisitemid": 11187022,
"scenemusic": "scenemusic_leveldemo_fcamer_1_1",
"atmosphere": "atmospheremusic_leveldemo_fcamer_1_1"
},
@ -71,7 +71,7 @@
"n": 1
}
],
"debrisitemid": "16001002",
"debrisitemid": 11187004,
"scenemusic": "scenemusic_leveldemo_fcamer_1_3",
"atmosphere": "atmospheremusic_leveldemo_fcamer_1_3"
},
@ -109,7 +109,7 @@
"n": 1
}
],
"debrisitemid": "16001003",
"debrisitemid": 11187006,
"scenemusic": "scenemusic_leveldemo_fcamer_1_2",
"atmosphere": "atmospheremusic_leveldemo_fcamer_1_2"
},
@ -147,7 +147,7 @@
"n": 1
}
],
"debrisitemid": "16002001",
"debrisitemid": 11187008,
"scenemusic": "scenemusic_leveldemo_fcamer_1_4",
"atmosphere": "atmospheremusic_leveldemo_fcamer_1_4"
},
@ -185,7 +185,7 @@
"n": 1
}
],
"debrisitemid": "16002002",
"debrisitemid": 11187010,
"scenemusic": "scenemusic_leveldemo_fcamer_1_5",
"atmosphere": "atmospheremusic_leveldemo_fcamer_1_5"
},
@ -223,7 +223,7 @@
"n": 1
}
],
"debrisitemid": "16002003",
"debrisitemid": 11187012,
"scenemusic": "scenemusic_leveldemo_fcamer_1_6",
"atmosphere": "atmospheremusic_leveldemo_fcamer_1_6"
},
@ -261,7 +261,7 @@
"n": 1
}
],
"debrisitemid": "16003001",
"debrisitemid": 11187014,
"scenemusic": "scenemusic_leveldemo_fcamer_1_7",
"atmosphere": "atmospheremusic_leveldemo_fcamer_1_7"
},
@ -299,7 +299,7 @@
"n": 1
}
],
"debrisitemid": "16001001",
"debrisitemid": 11187002,
"scenemusic": "scenemusic_leveldemo_fcamer_1_8",
"atmosphere": "atmospheremusic_leveldemo_fcamer_1_8"
},
@ -337,7 +337,7 @@
"n": 1
}
],
"debrisitemid": "16003003",
"debrisitemid": 11187018,
"scenemusic": "scenemusic_leveldemo_fcamer_1_9",
"atmosphere": "atmospheremusic_leveldemo_fcamer_1_9"
},
@ -375,7 +375,7 @@
"n": 1
}
],
"debrisitemid": "16004001",
"debrisitemid": 11187020,
"scenemusic": "scenemusic_leveldemo_fcamer_1_10",
"atmosphere": "atmospheremusic_leveldemo_fcamer_1_10"
}

1704
bin/json/game_heroawaken.json
View File

File diff suppressed because it is too large Load Diff

56
bin/json/game_itemlink.json
View File

@ -2,11 +2,11 @@
{
"id": 122,
"title": {
"key": "itemlink_itemlink_title_4",
"key": "itemlink_itemlink_title_1",
"text": "金币商店"
},
"desc": {
"key": "itemlink_itemlink_desc_4",
"key": "itemlink_itemlink_desc_1",
"text": "金币商店"
},
"jumpid": 122,
@ -15,11 +15,11 @@
{
"id": 123,
"title": {
"key": "itemlink_itemlink_title_5",
"key": "itemlink_itemlink_title_2",
"text": "钻石商店"
},
"desc": {
"key": "itemlink_itemlink_desc_5",
"key": "itemlink_itemlink_desc_2",
"text": "钻石商店"
},
"jumpid": 123,
@ -28,11 +28,11 @@
{
"id": 124,
"title": {
"key": "itemlink_itemlink_title_6",
"key": "itemlink_itemlink_title_3",
"text": "友情商店"
},
"desc": {
"key": "itemlink_itemlink_desc_6",
"key": "itemlink_itemlink_desc_3",
"text": "友情商店"
},
"jumpid": 124,
@ -41,11 +41,11 @@
{
"id": 125,
"title": {
"key": "itemlink_itemlink_title_7",
"key": "itemlink_itemlink_title_4",
"text": "竞技商店"
},
"desc": {
"key": "itemlink_itemlink_desc_7",
"key": "itemlink_itemlink_desc_4",
"text": "竞技商店"
},
"jumpid": 125,
@ -54,11 +54,11 @@
{
"id": 126,
"title": {
"key": "itemlink_itemlink_title_8",
"key": "itemlink_itemlink_title_5",
"text": "公会商店"
},
"desc": {
"key": "itemlink_itemlink_desc_8",
"key": "itemlink_itemlink_desc_5",
"text": "公会商店"
},
"jumpid": 126,
@ -67,11 +67,11 @@
{
"id": 1127,
"title": {
"key": "itemlink_itemlink_title_9",
"key": "itemlink_itemlink_title_6",
"text": "特殊商店"
},
"desc": {
"key": "itemlink_itemlink_desc_9",
"key": "itemlink_itemlink_desc_6",
"text": "特殊商店"
},
"jumpid": 1127,
@ -80,11 +80,11 @@
{
"id": 1128,
"title": {
"key": "itemlink_itemlink_title_10",
"key": "itemlink_itemlink_title_7",
"text": "铁匠商店"
},
"desc": {
"key": "itemlink_itemlink_desc_10",
"key": "itemlink_itemlink_desc_7",
"text": "铁匠商店"
},
"jumpid": 1128,
@ -93,11 +93,11 @@
{
"id": 158,
"title": {
"key": "itemlink_itemlink_title_11",
"key": "itemlink_itemlink_title_8",
"text": "充值钻石"
},
"desc": {
"key": "itemlink_itemlink_desc_11",
"key": "itemlink_itemlink_desc_8",
"text": "充值钻石"
},
"jumpid": 158,
@ -106,11 +106,11 @@
{
"id": 113,
"title": {
"key": "itemlink_itemlink_title_12",
"key": "itemlink_itemlink_title_9",
"text": "主线章节界面"
},
"desc": {
"key": "itemlink_itemlink_desc_12",
"key": "itemlink_itemlink_desc_9",
"text": "主线章节界面"
},
"jumpid": 113,
@ -119,11 +119,11 @@
{
"id": 115,
"title": {
"key": "itemlink_itemlink_title_13",
"key": "itemlink_itemlink_title_10",
"text": "好友列表"
},
"desc": {
"key": "itemlink_itemlink_desc_13",
"key": "itemlink_itemlink_desc_10",
"text": "好友列表"
},
"jumpid": 115,
@ -132,11 +132,11 @@
{
"id": 157,
"title": {
"key": "itemlink_itemlink_title_14",
"key": "itemlink_itemlink_title_11",
"text": "公会"
},
"desc": {
"key": "itemlink_itemlink_desc_14",
"key": "itemlink_itemlink_desc_11",
"text": "公会"
},
"jumpid": 157,
@ -145,11 +145,11 @@
{
"id": 156,
"title": {
"key": "itemlink_itemlink_title_15",
"key": "itemlink_itemlink_title_12",
"text": "竞技场"
},
"desc": {
"key": "itemlink_itemlink_desc_15",
"key": "itemlink_itemlink_desc_12",
"text": "竞技场"
},
"jumpid": 156,
@ -158,11 +158,11 @@
{
"id": 107,
"title": {
"key": "itemlink_itemlink_title_16",
"key": "itemlink_itemlink_title_13",
"text": "普通招募"
},
"desc": {
"key": "itemlink_itemlink_desc_16",
"key": "itemlink_itemlink_desc_13",
"text": "普通招募"
},
"jumpid": 107,
@ -171,11 +171,11 @@
{
"id": 165,
"title": {
"key": "itemlink_itemlink_title_17",
"key": "itemlink_itemlink_title_14",
"text": "前往vip"
},
"desc": {
"key": "itemlink_itemlink_desc_17",
"key": "itemlink_itemlink_desc_14",
"text": "前往vip"
},
"jumpid": 165,

52
bin/json/game_linestorymaintask.json
View File

@ -39,9 +39,9 @@
},
{
"Id": 3,
"subTask": 1,
"subTask": 2,
"group": 10001,
"nodeIndex": 1,
"nodeIndex": 2,
"order": "3",
"stageid": 10003,
"name": {
@ -58,10 +58,10 @@
},
{
"Id": 4,
"subTask": 2,
"group": 10001,
"nodeIndex": 2,
"order": "4",
"subTask": 3,
"group": 10002,
"nodeIndex": 0,
"order": "1",
"stageid": 10004,
"name": {
"key": "linestory_maintask_name_4",
@ -77,10 +77,10 @@
},
{
"Id": 5,
"subTask": 3,
"group": 10001,
"nodeIndex": 2,
"order": "5",
"subTask": 4,
"group": 10002,
"nodeIndex": 1,
"order": "2",
"stageid": 10005,
"name": {
"key": "linestory_maintask_name_5",
@ -96,10 +96,10 @@
},
{
"Id": 6,
"subTask": 4,
"group": 10001,
"nodeIndex": 3,
"order": "6",
"subTask": 5,
"group": 10002,
"nodeIndex": 2,
"order": "3",
"stageid": 10006,
"name": {
"key": "linestory_maintask_name_6",
@ -115,10 +115,10 @@
},
{
"Id": 7,
"subTask": 5,
"group": 10001,
"nodeIndex": 3,
"order": "7",
"subTask": 6,
"group": 10003,
"nodeIndex": 0,
"order": "1",
"stageid": 10007,
"name": {
"key": "linestory_maintask_name_7",
@ -134,10 +134,10 @@
},
{
"Id": 8,
"subTask": 6,
"group": 10001,
"nodeIndex": 4,
"order": "8",
"subTask": 7,
"group": 10003,
"nodeIndex": 1,
"order": "2",
"stageid": 10001,
"name": {
"key": "linestory_maintask_name_8",
@ -153,10 +153,10 @@
},
{
"Id": 9,
"subTask": 7,
"group": 10001,
"nodeIndex": 5,
"order": "9",
"subTask": 8,
"group": 10003,
"nodeIndex": 2,
"order": "3",
"stageid": 10009,
"name": {
"key": "linestory_maintask_name_9",

15
bin/json/game_playerinfor_overview.json
View File

@ -2,14 +2,15 @@
{
"id": "16010101",
"type": 1,
"icon": "icon/sbkp_js_nz",
"micon": "icon/sbkp_js_nz",
"wicon": "icon/sbkp_js_nvz",
"tujing": [
107
],
"murl": "100001",
"wurl": "200001",
"mplayerhead": "ytx_js_14004",
"wplayerhead": "ytx_js_14004",
"wplayerhead": "tx_js_nvz",
"name": {
"key": "playerinfor_playerinfor_overview_name_1",
"text": "普通皮肤"
@ -18,14 +19,15 @@
{
"id": "16010201",
"type": 2,
"icon": "icon/zj_dz_001",
"micon": "icon/zj_dz_001",
"wicon": "icon/zj_dz_001",
"tujing": [
107
],
"murl": "explore",
"wurl": "explore",
"mplayerhead": "ytx_js_14004",
"wplayerhead": "ytx_js_14004",
"wplayerhead": "tx_js_nvz",
"name": {
"key": "playerinfor_playerinfor_overview_name_2",
"text": "普通动作"
@ -34,14 +36,15 @@
{
"id": "16010301",
"type": 3,
"icon": "protagonistsystem/zj_bg_xk",
"micon": "protagonistsystem/zj_bg_xk",
"wicon": "protagonistsystem/zj_bg_xk",
"tujing": [
107
],
"murl": "character_cardshow",
"wurl": "character_cardshow",
"mplayerhead": "ytx_js_14004",
"wplayerhead": "ytx_js_14004",
"wplayerhead": "tx_js_nvz",
"name": {
"key": "playerinfor_playerinfor_overview_name_3",
"text": "普通背景"

80
bin/json/game_ruledesc.json
View File

@ -1,42 +1,90 @@
[
{
"id": 10001,
"title": "Fetter_help_title",
"content": "Fetter_help_content"
"title": {
"key": "ruledesc_ruledesc_title_1",
"text": "Fetter_help_title"
},
"content": {
"key": "ruledesc_ruledesc_content_1",
"text": "Fetter_help_content"
}
},
{
"id": 10002,
"title": "Fetter_help_title",
"content": "Fetter_help_content"
"title": {
"key": "ruledesc_ruledesc_title_2",
"text": "Fetter_help_title"
},
"content": {
"key": "ruledesc_ruledesc_content_2",
"text": "Fetter_help_content"
}
},
{
"id": 10003,
"title": "GoodImpression_help_title",
"content": "GoodImpression_help_content"
"title": {
"key": "ruledesc_ruledesc_title_3",
"text": "GoodImpression_help_title"
},
"content": {
"key": "ruledesc_ruledesc_content_3",
"text": "GoodImpression_help_content"
}
},
{
"id": 10004,
"title": "GoodImpression_help_title",
"content": "GoodImpression_help_content"
"title": {
"key": "ruledesc_ruledesc_title_4",
"text": "GoodImpression_help_title"
},
"content": {
"key": "ruledesc_ruledesc_content_4",
"text": "GoodImpression_help_content"
}
},
{
"id": 10005,
"title": "Panda_paiqian",
"content": "Panda_paiqian1"
"title": {
"key": "ruledesc_ruledesc_title_5",
"text": "Panda_paiqian"
},
"content": {
"key": "ruledesc_ruledesc_content_5",
"text": "Panda_paiqian1"
}
},
{
"id": 10006,
"title": "Panda_meiriyilian",
"content": "Panda_meiriyilian1"
"title": {
"key": "ruledesc_ruledesc_title_6",
"text": "Panda_meiriyilian"
},
"content": {
"key": "ruledesc_ruledesc_content_6",
"text": "Panda_meiriyilian1"
}
},
{
"id": 10007,
"title": "Potions help information",
"content": "Potions help information01"
"title": {
"key": "ruledesc_ruledesc_title_7",
"text": "Potions help information"
},
"content": {
"key": "ruledesc_ruledesc_content_7",
"text": "Potions help information01"
}
},
{
"id": 10008,
"title": "arena_help_title",
"content": "arena_help_content"
"title": {
"key": "ruledesc_ruledesc_title_8",
"text": "arena_help_title"
},
"content": {
"key": "ruledesc_ruledesc_content_8",
"text": "arena_help_content"
}
}
]

142
bin/json/game_skillafteratk.json
View File

@ -6012,7 +6012,7 @@
"Argu": [
1,
4,
1500
3000
],
"FollowSK": [],
"SucFollowSK": [
@ -6061,7 +6061,7 @@
"Argu": [
1,
4,
1500
3100
],
"FollowSK": [],
"SucFollowSK": [
@ -6110,7 +6110,7 @@
"Argu": [
1,
4,
1600
3200
],
"FollowSK": [],
"SucFollowSK": [
@ -6159,7 +6159,7 @@
"Argu": [
1,
4,
1700
3300
],
"FollowSK": [],
"SucFollowSK": [
@ -6208,7 +6208,7 @@
"Argu": [
1,
4,
1700
3300
],
"FollowSK": [],
"SucFollowSK": [
@ -6304,7 +6304,7 @@
"Argu": [
1,
4,
1700
6000
],
"FollowSK": [],
"SucFollowSK": [],
@ -9739,7 +9739,7 @@
300,
1,
5,
500
1500
],
"FollowSK": [],
"SucFollowSK": [
@ -9791,7 +9791,7 @@
300,
1,
5,
600
1600
],
"FollowSK": [],
"SucFollowSK": [
@ -9843,7 +9843,7 @@
300,
1,
5,
600
1600
],
"FollowSK": [],
"SucFollowSK": [
@ -9895,7 +9895,7 @@
300,
1,
5,
700
1700
],
"FollowSK": [],
"SucFollowSK": [
@ -9947,7 +9947,7 @@
300,
1,
5,
700
1700
],
"FollowSK": [],
"SucFollowSK": [
@ -9999,7 +9999,7 @@
300,
1,
5,
800
1800
],
"FollowSK": [],
"SucFollowSK": [
@ -10141,7 +10141,7 @@
"Argu": [
1,
5,
150
1500
],
"FollowSK": [],
"SucFollowSK": [],
@ -10164,7 +10164,7 @@
"Argu": [
1,
5,
300
2000
],
"FollowSK": [],
"SucFollowSK": [
@ -10240,7 +10240,7 @@
"Argu": [
1,
5,
150
1600
],
"FollowSK": [],
"SucFollowSK": [],
@ -10263,7 +10263,7 @@
"Argu": [
1,
5,
400
2500
],
"FollowSK": [],
"SucFollowSK": [
@ -10339,7 +10339,7 @@
"Argu": [
1,
5,
150
1600
],
"FollowSK": [],
"SucFollowSK": [],
@ -10362,7 +10362,7 @@
"Argu": [
1,
5,
400
2500
],
"FollowSK": [],
"SucFollowSK": [
@ -10438,7 +10438,7 @@
"Argu": [
1,
5,
150
1600
],
"FollowSK": [],
"SucFollowSK": [],
@ -10461,7 +10461,7 @@
"Argu": [
1,
5,
500
2500
],
"FollowSK": [],
"SucFollowSK": [
@ -10537,7 +10537,7 @@
"Argu": [
1,
5,
150
1600
],
"FollowSK": [],
"SucFollowSK": [],
@ -10560,7 +10560,7 @@
"Argu": [
1,
5,
500
2500
],
"FollowSK": [],
"SucFollowSK": [
@ -11426,8 +11426,8 @@
1,
4,
900,
2,
1,
2,
55
],
"FollowSK": [
@ -12539,7 +12539,7 @@
"Argu": [
1,
4,
1000
2500
],
"FollowSK": [],
"SucFollowSK": [
@ -12588,7 +12588,7 @@
"Argu": [
1,
4,
1000
4000
],
"FollowSK": [],
"SucFollowSK": [],
@ -12818,30 +12818,6 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 235005112,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 26,
"Argu": [
1,
6,
4,
45
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 235005211,
"EmitPR": 1000,
@ -12849,37 +12825,12 @@
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 2,
"Type": 1,
"Argu": [
1,
4,
200
],
"FollowSK": [],
"SucFollowSK": [
235005213
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 235005212,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
400
2000
],
"FollowSK": [],
"SucFollowSK": [
@ -12971,12 +12922,12 @@
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 2,
"ExecuteCnt": 5,
"Type": 1,
"Argu": [
1,
4,
1050
1000
],
"FollowSK": [],
"SucFollowSK": [
@ -16681,7 +16632,7 @@
"Argu": [
1,
4,
5400
6600
],
"FollowSK": [],
"SucFollowSK": [
@ -16755,7 +16706,7 @@
"Argu": [
1,
4,
1200
2200
],
"FollowSK": [],
"SucFollowSK": [
@ -16804,7 +16755,7 @@
"Argu": [
1,
4,
1000
2000
],
"FollowSK": [],
"SucFollowSK": [
@ -16853,7 +16804,7 @@
"Argu": [
1,
4,
1800
3600
],
"FollowSK": [],
"SucFollowSK": [
@ -16878,7 +16829,7 @@
"Argu": [
1,
4,
1800
3600
],
"FollowSK": [],
"SucFollowSK": [
@ -17479,7 +17430,7 @@
"Argu": [
1,
4,
600
1600
],
"FollowSK": [],
"SucFollowSK": [],
@ -17551,7 +17502,7 @@
"Argu": [
1,
4,
800
1000
],
"FollowSK": [],
"SucFollowSK": [
@ -17576,7 +17527,7 @@
"Argu": [
1,
4,
800
1000
],
"FollowSK": [],
"SucFollowSK": [
@ -17601,7 +17552,7 @@
"Argu": [
1,
4,
400
1000
],
"FollowSK": [],
"SucFollowSK": [
@ -17675,7 +17626,7 @@
"Argu": [
1,
4,
2800
5800
],
"FollowSK": [],
"SucFollowSK": [
@ -18019,7 +17970,7 @@
"Argu": [
1,
4,
1000
2500
],
"FollowSK": [],
"SucFollowSK": [
@ -18091,7 +18042,7 @@
"Argu": [
1,
4,
2500
3500
],
"FollowSK": [],
"SucFollowSK": [
@ -19356,6 +19307,7 @@
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001301,
1000,
-1,
-1
@ -20253,7 +20205,7 @@
"Argu": [
1,
4,
600
1800
],
"FollowSK": [],
"SucFollowSK": [
@ -20302,7 +20254,7 @@
"Argu": [
1,
4,
800
1800
],
"FollowSK": [],
"SucFollowSK": [
@ -20396,7 +20348,7 @@
"Argu": [
1,
4,
2500
7500
],
"FollowSK": [],
"SucFollowSK": [],
@ -25643,7 +25595,7 @@
"Argu": [
1,
4,
2000
3000
],
"FollowSK": [
215003112
@ -25762,7 +25714,7 @@
"Argu": [
1,
4,
1880
3000
],
"FollowSK": [
215003312
@ -25813,7 +25765,7 @@
"Argu": [
1,
4,
3800
4000
],
"FollowSK": [],
"SucFollowSK": [],

377
bin/json/game_skillatk.json
View File

File diff suppressed because it is too large Load Diff

4
bin/json/game_skillbuff.json
View File

@ -733,7 +733,7 @@
"key": "skill_skill_buff_Desc_390001113",
"text": "无法进行任何行动，无法被选中，无法被攻击，无法获得任何强化及弱化效果"
},
"BuffType": 0,
"BuffType": 34,
"EffectArgu": [],
"BufParNum": 1,
"RelyCheckArgu": [],
@ -3523,7 +3523,7 @@
"Id": 390001433,
"Name": {
"key": "skill_skill_buff_Name_390001433",
"text": "【毒牙】"
"text": "毒牙"
},
"Desc": {
"key": "skill_skill_buff_Desc_390001433",

10
modules/buried/core.go
View File

@ -26,6 +26,12 @@ const (
)
const (
//任务完成自动锁定
autolock = 1
//一次性任务
ctype_once = 1
//重复性任务
ctype_repeat = 2
//日常任务
ctype_daily = 3
//周长任务
ctype_weekly = 4
)

73
modules/buried/module.go
View File

@ -10,8 +10,10 @@ import (
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs"
"go_dreamfactory/sys/db"
"go_dreamfactory/utils"
"time"
)
@ -128,8 +130,26 @@ func (this *Buried) CheckCondition(uid string, condiIds ...int32) (condis []*pb.
return
}
if bdata, ok := bdatas.Items[conf.Type]; ok {
ok = false
for _, v1 := range bdata.Condi {
if v1.Conid == v {
ok = true
//状态等于休眠
if v1.State == pb.BuriedItemState_Sleep {
if conf.Ctype == ctype_daily { //日常
if !utils.IsToday(v1.Timestamp) { //不是同一天 可以重置数据
v1.State = pb.BuriedItemState_Activated
v1.Value = 0
v1.Finish = pb.BuriedItemFinishState_buried_unfinish
}
} else if conf.Ctype == ctype_weekly { //周常
if !utils.IsSameWeek(v1.Timestamp) { //不是同一周
v1.State = pb.BuriedItemState_Activated
v1.Value = 0
v1.Finish = pb.BuriedItemFinishState_buried_unfinish
}
}
}
condis = append(condis, &pb.ConIProgress{
Btype: conf.Type,
Conid: v1.Conid,
@ -139,6 +159,23 @@ func (this *Buried) CheckCondition(uid string, condiIds ...int32) (condis []*pb.
})
}
}
if !ok { //未找到 初始化一个
condis = append(condis, &pb.ConIProgress{
Btype: conf.Type,
Conid: v,
Value: 0,
Target: conf.Value,
State: pb.BuriedItemFinishState_buried_unfinish,
})
}
} else { //未找到 初始化一个
condis = append(condis, &pb.ConIProgress{
Btype: conf.Type,
Conid: v,
Value: 0,
Target: conf.Value,
State: pb.BuriedItemFinishState_buried_unfinish,
})
}
}
return
@ -331,6 +368,32 @@ func (this *Buried) updateAndCheckBuried(bconf *cfg.GameBuriedTypeData, bdata *p
return
}
//状态等于休眠
if bitem.State == pb.BuriedItemState_Sleep {
if cond.Ctype == ctype_repeat { //完成后自动锁定
bitem.State = pb.BuriedItemState_Activated
bitem.Value = 0
bitem.Finish = pb.BuriedItemFinishState_buried_unfinish
} else if cond.Ctype == ctype_daily { //日常
if !utils.IsToday(bitem.Timestamp) { //不是同一天 可以重置数据
bitem.State = pb.BuriedItemState_Activated
bitem.Value = 0
bitem.Finish = pb.BuriedItemFinishState_buried_unfinish
}
} else if cond.Ctype == ctype_weekly { //周常
if !utils.IsSameWeek(bitem.Timestamp) { //不是同一周
bitem.State = pb.BuriedItemState_Activated
bitem.Value = 0
bitem.Finish = pb.BuriedItemFinishState_buried_unfinish
}
}
}
//非激活状态不写入输出
if bitem.State != pb.BuriedItemState_Activated {
return
}
switch bconf.Insert { //数据接入方式
case overlay: //累加数据
bitem.Value += collec.Value
@ -360,12 +423,20 @@ func (this *Buried) updateAndCheckBuried(bconf *cfg.GameBuriedTypeData, bdata *p
if bitem.Value >= cond.Value { //完成进度
bitem.Finish = pb.BuriedItemFinishState_buried_finish
if cond.Lock == autolock { //完成后自动锁定
if cond.Ctype == ctype_once { //完成后自动锁定
bitem.State = pb.BuriedItemState_Freeze
} else if cond.Ctype == ctype_repeat {
bitem.State = pb.BuriedItemState_Sleep
} else if cond.Ctype == ctype_daily {
bitem.State = pb.BuriedItemState_Sleep
} else if cond.Ctype == ctype_weekly {
bitem.State = pb.BuriedItemState_Sleep
}
bitem.Timestamp = configure.Now().Unix() //记录最后一次操作时间
} else {
this.Debug("完成条件未达成!", log.Field{Key: "埋点Id", Value: bdata.Btype}, log.Field{Key: "条件Id", Value: bitem.Conid}, log.Field{Key: "当前进度", Value: bitem.Value}, log.Field{Key: "目标进度", Value: cond.Value})
}
return
}

141
modules/combat/api_ask.go Normal file
View File

@ -0,0 +1,141 @@
package combat
import (
"fmt"
"go_dreamfactory/comm"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
)
//参数校验
func (this *apiComp) AskCheck(session comm.IUserSession, req *pb.CombatAskReq) (code pb.ErrorCode) {
return
}
///获取自己的排行榜信息
func (this *apiComp) Ask(session comm.IUserSession, req *pb.CombatAskReq) (code pb.ErrorCode, data *pb.ErrorData) {
var (
info *pb.DBCombatUser
level *pb.DBCombatLevel
lvconf *cfg.GameCombatLevelData
pitem *pb.LevelProgressItem
condis []*pb.ConIProgress
ok bool
err error
)
if code = this.AskCheck(session, req); code != pb.ErrorCode_Success {
return
}
if info, err = this.module.modelCombat.queryInfo(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError
return
}
if lvconf, err = this.module.configure.getCombatLevel(req.Level); err != nil {
code = pb.ErrorCode_ConfigNoFound
return
}
if level, ok = info.Level[req.Level]; !ok {
err = fmt.Errorf("没有初始化指定关卡数据:%d", req.Level)
code = pb.ErrorCode_ReqParameterError
data = &pb.ErrorData{
Title: code.ToString(),
Message: err.Error(),
}
this.module.Errorln(err)
return
}
pitem = &pb.LevelProgressItem{
Level: level.Id,
Progress: level.Progress,
Pass: level.Pass,
Passpertask: level.Passpertask,
Passmaintask: level.Passmaintask,
}
if level.Pass != 2 {
level.Progress = 0
if condis, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), lvconf.Maintask...); err != nil {
code = pb.ErrorCode_ExternalModule
data = &pb.ErrorData{
Title: code.ToString(),
Message: comm.NewExternalModuleErr("Buried", "CheckCondition", lvconf.Maintask).Error(),
}
return
}
level.Passmaintask = condis
pitem.Passmaintask = condis
ok = true
for _, v := range condis {
if v.State != pb.BuriedItemFinishState_buried_finish {
ok = false
}
if v.Conid == lvconf.Debrisitemid {
level.Progress = v.Value
}
}
if level.Pass == 0 && ok {
level.Pass = 1
pitem.Pass = 1
this.module.DispenseRes(session, lvconf.Award, true)
atns := make([]*pb.UserAssets, len(lvconf.Award))
for i, v := range lvconf.Award {
atns[i] = &pb.UserAssets{
A: v.A,
T: v.T,
N: v.N,
}
}
pitem.Mainaward = atns
}
if condis, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), lvconf.Subtask...); err != nil {
code = pb.ErrorCode_ExternalModule
data = &pb.ErrorData{
Title: code.ToString(),
Message: comm.NewExternalModuleErr("Buried", "CheckCondition", lvconf.Subtask).Error(),
}
return
}
level.Passpertask = condis
pitem.Passpertask = condis
ok = true
for _, v := range condis {
if v.Conid == lvconf.Debrisitemid {
level.Progress = v.Value
}
if v.State != pb.BuriedItemFinishState_buried_finish {
ok = false
}
}
if level.Pass == 1 && ok { //
level.Pass = 2
pitem.Pass = 2
this.module.DispenseRes(session, lvconf.Profectaward, true)
atns := make([]*pb.UserAssets, len(lvconf.Profectaward))
for i, v := range lvconf.Profectaward {
atns[i] = &pb.UserAssets{
A: v.A,
T: v.T,
N: v.N,
}
}
pitem.Peraward = atns
}
info.Level[req.Level] = level
if err = this.module.modelCombat.updateInfo(info); err != nil {
code = pb.ErrorCode_DBError
return
}
pitem.Progress = level.Progress
}
session.SendMsg(string(this.module.GetType()), "ask", &pb.CombatAskResp{Level: pitem})
return
}

104
modules/combat/api_in.go
View File

@ -3,7 +3,6 @@ package combat
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
)
//参数校验
@ -15,14 +14,10 @@ func (this *apiComp) InCheck(session comm.IUserSession, req *pb.CombatInReq) (co
///获取自己的排行榜信息
func (this *apiComp) In(session comm.IUserSession, req *pb.CombatInReq) (code pb.ErrorCode, data *pb.ErrorData) {
var (
info *pb.DBCombatUser
level *pb.DBCombatLevel
lvconf *cfg.GameCombatLevelData
condis []*pb.ConIProgress
pitem *pb.LevelProgressItem
push bool
ok bool
err error
info *pb.DBCombatUser
level *pb.DBCombatLevel
ok bool
err error
)
if code = this.InCheck(session, req); code != pb.ErrorCode_Success {
return
@ -31,106 +26,21 @@ func (this *apiComp) In(session comm.IUserSession, req *pb.CombatInReq) (code pb
code = pb.ErrorCode_DBError
return
}
if lvconf, err = this.module.configure.getCombatLevel(req.Id); err != nil {
code = pb.ErrorCode_ConfigNoFound
return
}
if level, ok = info.Level[req.Id]; !ok {
if level, ok = info.Level[req.Level]; !ok {
level = &pb.DBCombatLevel{
Id: req.Id,
Id: req.Level,
Passmanster: make([]int32, 0),
Passdrop: make([]int32, 0),
Progress: 0,
Pass: 0,
}
pitem = &pb.LevelProgressItem{
Level: level.Id,
Pass: level.Pass,
}
if condis, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), lvconf.Maintask...); err != nil {
code = pb.ErrorCode_ExternalModule
data = &pb.ErrorData{
Title: code.ToString(),
Message: comm.NewExternalModuleErr("Buried", "CheckCondition", lvconf.Maintask).Error(),
}
return
}
ok = true
level.Passmaintask = condis
pitem.Passmaintask = condis
for _, v := range condis {
level.Progress += v.Value
if v.State != 2 {
ok = false
}
}
if ok { //
level.Pass = 1
pitem.Pass = 1
this.module.DispenseRes(session, lvconf.Award, true)
atns := make([]*pb.UserAssets, len(lvconf.Award))
for i, v := range lvconf.Award {
atns[i] = &pb.UserAssets{
A: v.A,
T: v.T,
N: v.N,
}
}
pitem.Mainaward = atns
push = true
}
if level.Pass == 1 {
if condis, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), lvconf.Subtask...); err != nil {
code = pb.ErrorCode_ExternalModule
data = &pb.ErrorData{
Title: code.ToString(),
Message: comm.NewExternalModuleErr("Buried", "CheckCondition", lvconf.Subtask).Error(),
}
return
}
level.Passpertask = condis
pitem.Passpertask = condis
ok = true
for _, v := range condis {
level.Progress += v.Value
if v.State != 2 {
ok = false
}
}
if ok { //
level.Pass = 2
pitem.Pass = 2
this.module.DispenseRes(session, lvconf.Profectaward, true)
atns := make([]*pb.UserAssets, len(lvconf.Profectaward))
for i, v := range lvconf.Profectaward {
atns[i] = &pb.UserAssets{
A: v.A,
T: v.T,
N: v.N,
}
}
pitem.Peraward = atns
push = true
}
}
info.Level[req.Id] = level
info.Level[req.Level] = level
if err = this.module.modelCombat.updateInfo(info); err != nil {
code = pb.ErrorCode_DBError
return
}
}
session.SendMsg(string(this.module.GetType()), "in", &pb.CombatInResp{Level: level})
if push {
pitem.Progress = level.Progress
session.SendMsg(string(this.module.GetType()), "progress", &pb.CombatProgressPush{Levels: []*pb.LevelProgressItem{pitem}})
}
return
}

3
modules/combat/module.go
View File

@ -80,6 +80,9 @@ func (this *Combat) GetLevels(uid string) (levels map[int32]*pb.DBCombatLevel) {
//任务埋点通知
func (this *Combat) BuriedsNotify(uid string, condis []*pb.ConIProgress) {
this.Debug("收到埋点中心 进度改变通知", log.Field{Key: "uid", Value: uid}, log.Field{Key: "condis", Value: condis})
//废弃 采用主动询问机制
return
var (
err error
session comm.IUserSession

2
modules/oldtimes/api_getall.go
View File

@ -27,7 +27,7 @@ func (this *apiComp) Getall(session comm.IUserSession, req *pb.OldtimesGetallReq
for _, level := range chapter.Levels {
if level.Status == int32(finish) {
unlockLevelIds = append(unlockLevelIds, level.Lid)
continue
// continue
}
conf := this.module.configure.getMaintaskCfgBy(level.Lid)
if conf != nil {

436
pb/combat_msg.pb.go
View File

@ -26,7 +26,7 @@ type CombatInReq struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` //关卡id
Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"` //关卡id
}
func (x *CombatInReq) Reset() {
@ -61,9 +61,9 @@ func (*CombatInReq) Descriptor() ([]byte, []int) {
return file_combat_combat_msg_proto_rawDescGZIP(), []int{0}
}
func (x *CombatInReq) GetId() int32 {
func (x *CombatInReq) GetLevel() int32 {
if x != nil {
return x.Id
return x.Level
}
return 0
}
@ -116,6 +116,101 @@ func (x *CombatInResp) GetLevel() *DBCombatLevel {
return nil
}
//询问关卡进度
type CombatAskReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"` //关卡id
}
func (x *CombatAskReq) Reset() {
*x = CombatAskReq{}
if protoimpl.UnsafeEnabled {
mi := &file_combat_combat_msg_proto_msgTypes[2]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *CombatAskReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*CombatAskReq) ProtoMessage() {}
func (x *CombatAskReq) ProtoReflect() protoreflect.Message {
mi := &file_combat_combat_msg_proto_msgTypes[2]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use CombatAskReq.ProtoReflect.Descriptor instead.
func (*CombatAskReq) Descriptor() ([]byte, []int) {
return file_combat_combat_msg_proto_rawDescGZIP(), []int{2}
}
func (x *CombatAskReq) GetLevel() int32 {
if x != nil {
return x.Level
}
return 0
}
type CombatAskResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Level *LevelProgressItem `protobuf:"bytes,1,opt,name=level,proto3" json:"level"` //关卡id
}
func (x *CombatAskResp) Reset() {
*x = CombatAskResp{}
if protoimpl.UnsafeEnabled {
mi := &file_combat_combat_msg_proto_msgTypes[3]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *CombatAskResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*CombatAskResp) ProtoMessage() {}
func (x *CombatAskResp) ProtoReflect() protoreflect.Message {
mi := &file_combat_combat_msg_proto_msgTypes[3]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use CombatAskResp.ProtoReflect.Descriptor instead.
func (*CombatAskResp) Descriptor() ([]byte, []int) {
return file_combat_combat_msg_proto_rawDescGZIP(), []int{3}
}
func (x *CombatAskResp) GetLevel() *LevelProgressItem {
if x != nil {
return x.Level
}
return nil
}
type CombatUpdateLevelReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -128,7 +223,7 @@ type CombatUpdateLevelReq struct {
func (x *CombatUpdateLevelReq) Reset() {
*x = CombatUpdateLevelReq{}
if protoimpl.UnsafeEnabled {
mi := &file_combat_combat_msg_proto_msgTypes[2]
mi := &file_combat_combat_msg_proto_msgTypes[4]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -141,7 +236,7 @@ func (x *CombatUpdateLevelReq) String() string {
func (*CombatUpdateLevelReq) ProtoMessage() {}
func (x *CombatUpdateLevelReq) ProtoReflect() protoreflect.Message {
mi := &file_combat_combat_msg_proto_msgTypes[2]
mi := &file_combat_combat_msg_proto_msgTypes[4]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -154,7 +249,7 @@ func (x *CombatUpdateLevelReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use CombatUpdateLevelReq.ProtoReflect.Descriptor instead.
func (*CombatUpdateLevelReq) Descriptor() ([]byte, []int) {
return file_combat_combat_msg_proto_rawDescGZIP(), []int{2}
return file_combat_combat_msg_proto_rawDescGZIP(), []int{4}
}
func (x *CombatUpdateLevelReq) GetLevel() int32 {
@ -182,7 +277,7 @@ type CombatUpdateLevelResp struct {
func (x *CombatUpdateLevelResp) Reset() {
*x = CombatUpdateLevelResp{}
if protoimpl.UnsafeEnabled {
mi := &file_combat_combat_msg_proto_msgTypes[3]
mi := &file_combat_combat_msg_proto_msgTypes[5]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -195,7 +290,7 @@ func (x *CombatUpdateLevelResp) String() string {
func (*CombatUpdateLevelResp) ProtoMessage() {}
func (x *CombatUpdateLevelResp) ProtoReflect() protoreflect.Message {
mi := &file_combat_combat_msg_proto_msgTypes[3]
mi := &file_combat_combat_msg_proto_msgTypes[5]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -208,7 +303,7 @@ func (x *CombatUpdateLevelResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use CombatUpdateLevelResp.ProtoReflect.Descriptor instead.
func (*CombatUpdateLevelResp) Descriptor() ([]byte, []int) {
return file_combat_combat_msg_proto_rawDescGZIP(), []int{3}
return file_combat_combat_msg_proto_rawDescGZIP(), []int{5}
}
func (x *CombatUpdateLevelResp) GetLevel() int32 {
@ -232,7 +327,7 @@ type CombatChallengeReq struct {
func (x *CombatChallengeReq) Reset() {
*x = CombatChallengeReq{}
if protoimpl.UnsafeEnabled {
mi := &file_combat_combat_msg_proto_msgTypes[4]
mi := &file_combat_combat_msg_proto_msgTypes[6]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -245,7 +340,7 @@ func (x *CombatChallengeReq) String() string {
func (*CombatChallengeReq) ProtoMessage() {}
func (x *CombatChallengeReq) ProtoReflect() protoreflect.Message {
mi := &file_combat_combat_msg_proto_msgTypes[4]
mi := &file_combat_combat_msg_proto_msgTypes[6]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -258,7 +353,7 @@ func (x *CombatChallengeReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use CombatChallengeReq.ProtoReflect.Descriptor instead.
func (*CombatChallengeReq) Descriptor() ([]byte, []int) {
return file_combat_combat_msg_proto_rawDescGZIP(), []int{4}
return file_combat_combat_msg_proto_rawDescGZIP(), []int{6}
}
func (x *CombatChallengeReq) GetLevel() int32 {
@ -296,7 +391,7 @@ type CombatChallengeResp struct {
func (x *CombatChallengeResp) Reset() {
*x = CombatChallengeResp{}
if protoimpl.UnsafeEnabled {
mi := &file_combat_combat_msg_proto_msgTypes[5]
mi := &file_combat_combat_msg_proto_msgTypes[7]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -309,7 +404,7 @@ func (x *CombatChallengeResp) String() string {
func (*CombatChallengeResp) ProtoMessage() {}
func (x *CombatChallengeResp) ProtoReflect() protoreflect.Message {
mi := &file_combat_combat_msg_proto_msgTypes[5]
mi := &file_combat_combat_msg_proto_msgTypes[7]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -322,7 +417,7 @@ func (x *CombatChallengeResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use CombatChallengeResp.ProtoReflect.Descriptor instead.
func (*CombatChallengeResp) Descriptor() ([]byte, []int) {
return file_combat_combat_msg_proto_rawDescGZIP(), []int{5}
return file_combat_combat_msg_proto_rawDescGZIP(), []int{7}
}
func (x *CombatChallengeResp) GetLevel() int32 {
@ -360,7 +455,7 @@ type CombatChallengeReceiveReq struct {
func (x *CombatChallengeReceiveReq) Reset() {
*x = CombatChallengeReceiveReq{}
if protoimpl.UnsafeEnabled {
mi := &file_combat_combat_msg_proto_msgTypes[6]
mi := &file_combat_combat_msg_proto_msgTypes[8]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -373,7 +468,7 @@ func (x *CombatChallengeReceiveReq) String() string {
func (*CombatChallengeReceiveReq) ProtoMessage() {}
func (x *CombatChallengeReceiveReq) ProtoReflect() protoreflect.Message {
mi := &file_combat_combat_msg_proto_msgTypes[6]
mi := &file_combat_combat_msg_proto_msgTypes[8]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -386,7 +481,7 @@ func (x *CombatChallengeReceiveReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use CombatChallengeReceiveReq.ProtoReflect.Descriptor instead.
func (*CombatChallengeReceiveReq) Descriptor() ([]byte, []int) {
return file_combat_combat_msg_proto_rawDescGZIP(), []int{6}
return file_combat_combat_msg_proto_rawDescGZIP(), []int{8}
}
func (x *CombatChallengeReceiveReq) GetLevel() int32 {
@ -424,7 +519,7 @@ type CombatChallengeReceiveResp struct {
func (x *CombatChallengeReceiveResp) Reset() {
*x = CombatChallengeReceiveResp{}
if protoimpl.UnsafeEnabled {
mi := &file_combat_combat_msg_proto_msgTypes[7]
mi := &file_combat_combat_msg_proto_msgTypes[9]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -437,7 +532,7 @@ func (x *CombatChallengeReceiveResp) String() string {
func (*CombatChallengeReceiveResp) ProtoMessage() {}
func (x *CombatChallengeReceiveResp) ProtoReflect() protoreflect.Message {
mi := &file_combat_combat_msg_proto_msgTypes[7]
mi := &file_combat_combat_msg_proto_msgTypes[9]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -450,7 +545,7 @@ func (x *CombatChallengeReceiveResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use CombatChallengeReceiveResp.ProtoReflect.Descriptor instead.
func (*CombatChallengeReceiveResp) Descriptor() ([]byte, []int) {
return file_combat_combat_msg_proto_rawDescGZIP(), []int{7}
return file_combat_combat_msg_proto_rawDescGZIP(), []int{9}
}
func (x *CombatChallengeReceiveResp) GetLevel() int32 {
@ -487,7 +582,7 @@ type CombatDropReq struct {
func (x *CombatDropReq) Reset() {
*x = CombatDropReq{}
if protoimpl.UnsafeEnabled {
mi := &file_combat_combat_msg_proto_msgTypes[8]
mi := &file_combat_combat_msg_proto_msgTypes[10]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -500,7 +595,7 @@ func (x *CombatDropReq) String() string {
func (*CombatDropReq) ProtoMessage() {}
func (x *CombatDropReq) ProtoReflect() protoreflect.Message {
mi := &file_combat_combat_msg_proto_msgTypes[8]
mi := &file_combat_combat_msg_proto_msgTypes[10]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -513,7 +608,7 @@ func (x *CombatDropReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use CombatDropReq.ProtoReflect.Descriptor instead.
func (*CombatDropReq) Descriptor() ([]byte, []int) {
return file_combat_combat_msg_proto_rawDescGZIP(), []int{8}
return file_combat_combat_msg_proto_rawDescGZIP(), []int{10}
}
func (x *CombatDropReq) GetLevel() int32 {
@ -543,7 +638,7 @@ type CombatDropResp struct {
func (x *CombatDropResp) Reset() {
*x = CombatDropResp{}
if protoimpl.UnsafeEnabled {
mi := &file_combat_combat_msg_proto_msgTypes[9]
mi := &file_combat_combat_msg_proto_msgTypes[11]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -556,7 +651,7 @@ func (x *CombatDropResp) String() string {
func (*CombatDropResp) ProtoMessage() {}
func (x *CombatDropResp) ProtoReflect() protoreflect.Message {
mi := &file_combat_combat_msg_proto_msgTypes[9]
mi := &file_combat_combat_msg_proto_msgTypes[11]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -569,7 +664,7 @@ func (x *CombatDropResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use CombatDropResp.ProtoReflect.Descriptor instead.
func (*CombatDropResp) Descriptor() ([]byte, []int) {
return file_combat_combat_msg_proto_rawDescGZIP(), []int{9}
return file_combat_combat_msg_proto_rawDescGZIP(), []int{11}
}
func (x *CombatDropResp) GetLevel() int32 {
@ -604,7 +699,7 @@ type LevelProgressItem struct {
func (x *LevelProgressItem) Reset() {
*x = LevelProgressItem{}
if protoimpl.UnsafeEnabled {
mi := &file_combat_combat_msg_proto_msgTypes[10]
mi := &file_combat_combat_msg_proto_msgTypes[12]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -617,7 +712,7 @@ func (x *LevelProgressItem) String() string {
func (*LevelProgressItem) ProtoMessage() {}
func (x *LevelProgressItem) ProtoReflect() protoreflect.Message {
mi := &file_combat_combat_msg_proto_msgTypes[10]
mi := &file_combat_combat_msg_proto_msgTypes[12]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -630,7 +725,7 @@ func (x *LevelProgressItem) ProtoReflect() protoreflect.Message {
// Deprecated: Use LevelProgressItem.ProtoReflect.Descriptor instead.
func (*LevelProgressItem) Descriptor() ([]byte, []int) {
return file_combat_combat_msg_proto_rawDescGZIP(), []int{10}
return file_combat_combat_msg_proto_rawDescGZIP(), []int{12}
}
func (x *LevelProgressItem) GetLevel() int32 {
@ -694,7 +789,7 @@ type CombatProgressPush struct {
func (x *CombatProgressPush) Reset() {
*x = CombatProgressPush{}
if protoimpl.UnsafeEnabled {
mi := &file_combat_combat_msg_proto_msgTypes[11]
mi := &file_combat_combat_msg_proto_msgTypes[13]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -707,7 +802,7 @@ func (x *CombatProgressPush) String() string {
func (*CombatProgressPush) ProtoMessage() {}
func (x *CombatProgressPush) ProtoReflect() protoreflect.Message {
mi := &file_combat_combat_msg_proto_msgTypes[11]
mi := &file_combat_combat_msg_proto_msgTypes[13]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -720,7 +815,7 @@ func (x *CombatProgressPush) ProtoReflect() protoreflect.Message {
// Deprecated: Use CombatProgressPush.ProtoReflect.Descriptor instead.
func (*CombatProgressPush) Descriptor() ([]byte, []int) {
return file_combat_combat_msg_proto_rawDescGZIP(), []int{11}
return file_combat_combat_msg_proto_rawDescGZIP(), []int{13}
}
func (x *CombatProgressPush) GetLevels() []*LevelProgressItem {
@ -739,84 +834,90 @@ var file_combat_combat_msg_proto_rawDesc = []byte{
0x6d, 0x62, 0x61, 0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x62,
0x75, 0x72, 0x69, 0x65, 0x64, 0x2f, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x5f, 0x64, 0x62, 0x2e,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61,
0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x1d,
0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x49, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a,
0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x34, 0x0a,
0x0c, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x49, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a,
0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44,
0x42, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x05, 0x6c, 0x65,
0x76, 0x65, 0x6c, 0x22, 0x9a, 0x01, 0x0a, 0x14, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x55, 0x70,
0x64, 0x61, 0x74, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05,
0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76,
0x65, 0x6c, 0x12, 0x33, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
0x32, 0x1f, 0x2e, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4c,
0x65, 0x76, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72,
0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x37, 0x0a, 0x09, 0x44, 0x61, 0x74, 0x61, 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, 0x61, 0x6c, 0x75, 0x65, 0x18,
0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
0x22, 0x2d, 0x0a, 0x15, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76,
0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x23,
0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x49, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a,
0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65,
0x76, 0x65, 0x6c, 0x22, 0x34, 0x0a, 0x0c, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x49, 0x6e, 0x52,
0x65, 0x73, 0x70, 0x12, 0x24, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x4c, 0x65, 0x76,
0x65, 0x6c, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0x24, 0x0a, 0x0c, 0x43, 0x6f, 0x6d,
0x62, 0x61, 0x74, 0x41, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76,
0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x22,
0x6e, 0x0a, 0x12, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e,
0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01,
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x6d,
0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x61,
0x6e, 0x73, 0x74, 0x65, 0x72, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18,
0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f,
0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22,
0x66, 0x0a, 0x13, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e,
0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18,
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07,
0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6d,
0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03,
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66,
0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x72, 0x0a, 0x19, 0x43, 0x6f, 0x6d, 0x62, 0x61,
0x74, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76,
0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20,
0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x61,
0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x61, 0x6e,
0x73, 0x74, 0x65, 0x72, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03,
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70,
0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x6d, 0x0a, 0x1a, 0x43,
0x6f, 0x6d, 0x62, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65,
0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76,
0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12,
0x18, 0x0a, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
0x52, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1f, 0x0a, 0x04, 0x61, 0x74, 0x6e,
0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73,
0x73, 0x65, 0x74, 0x73, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x73, 0x22, 0x39, 0x0a, 0x0d, 0x43, 0x6f,
0x6d, 0x62, 0x61, 0x74, 0x44, 0x72, 0x6f, 0x70, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c,
0x39, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x41, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70,
0x12, 0x28, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x12, 0x2e, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x49,
0x74, 0x65, 0x6d, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0x9a, 0x01, 0x0a, 0x14, 0x43,
0x6f, 0x6d, 0x62, 0x61, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c,
0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01,
0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x33, 0x0a, 0x04, 0x64, 0x61, 0x74,
0x61, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74,
0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x2e, 0x44,
0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x37,
0x0a, 0x09, 0x44, 0x61, 0x74, 0x61, 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, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61,
0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x2d, 0x0a, 0x15, 0x43, 0x6f, 0x6d, 0x62, 0x61,
0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70,
0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0x6e, 0x0a, 0x12, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74,
0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05,
0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76,
0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20,
0x01, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x12, 0x28, 0x0a, 0x06,
0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42,
0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06,
0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x66, 0x0a, 0x13, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74,
0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a,
0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65,
0x76, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02,
0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1f, 0x0a,
0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61,
0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x72,
0x0a, 0x19, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c,
0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65,
0x6c, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x72, 0x6f, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
0x04, 0x64, 0x72, 0x6f, 0x70, 0x22, 0x47, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x44,
0x72, 0x6f, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c,
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x1f, 0x0a,
0x04, 0x61, 0x74, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73,
0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x73, 0x22, 0x91,
0x02, 0x0a, 0x11, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73,
0x49, 0x74, 0x65, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20,
0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x31, 0x0a, 0x0c, 0x70, 0x61,
0x73, 0x73, 0x6d, 0x61, 0x69, 0x6e, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52,
0x0c, 0x70, 0x61, 0x73, 0x73, 0x6d, 0x61, 0x69, 0x6e, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x2f, 0x0a,
0x0b, 0x70, 0x61, 0x73, 0x73, 0x70, 0x65, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x03, 0x20, 0x03,
0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73,
0x73, 0x52, 0x0b, 0x70, 0x61, 0x73, 0x73, 0x70, 0x65, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x1a,
0x0a, 0x08, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
0x52, 0x08, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61,
0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x70, 0x61, 0x73, 0x73, 0x12, 0x29,
0x0a, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28,
0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x09,
0x6d, 0x61, 0x69, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x27, 0x0a, 0x08, 0x70, 0x65, 0x72,
0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73,
0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x08, 0x70, 0x65, 0x72, 0x61, 0x77, 0x61,
0x72, 0x64, 0x22, 0x40, 0x0a, 0x12, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x50, 0x72, 0x6f, 0x67,
0x72, 0x65, 0x73, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x2a, 0x0a, 0x06, 0x6c, 0x65, 0x76, 0x65,
0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x4c, 0x65, 0x76, 0x65, 0x6c,
0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x06, 0x6c, 0x65,
0x76, 0x65, 0x6c, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
0x6f, 0x74, 0x6f, 0x33,
0x6c, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01,
0x28, 0x05, 0x52, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x12, 0x25, 0x0a, 0x06, 0x72,
0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61,
0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f,
0x72, 0x74, 0x22, 0x6d, 0x0a, 0x1a, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6c,
0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70,
0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65,
0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72,
0x12, 0x1f, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b,
0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x04, 0x61, 0x74, 0x6e,
0x73, 0x22, 0x39, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x44, 0x72, 0x6f, 0x70, 0x52,
0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28,
0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x72, 0x6f, 0x70,
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x64, 0x72, 0x6f, 0x70, 0x22, 0x47, 0x0a, 0x0e,
0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x44, 0x72, 0x6f, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14,
0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c,
0x65, 0x76, 0x65, 0x6c, 0x12, 0x1f, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03,
0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52,
0x04, 0x61, 0x74, 0x6e, 0x73, 0x22, 0x91, 0x02, 0x0a, 0x11, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x50,
0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x6c,
0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65,
0x6c, 0x12, 0x31, 0x0a, 0x0c, 0x70, 0x61, 0x73, 0x73, 0x6d, 0x61, 0x69, 0x6e, 0x74, 0x61, 0x73,
0x6b, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72,
0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x0c, 0x70, 0x61, 0x73, 0x73, 0x6d, 0x61, 0x69, 0x6e,
0x74, 0x61, 0x73, 0x6b, 0x12, 0x2f, 0x0a, 0x0b, 0x70, 0x61, 0x73, 0x73, 0x70, 0x65, 0x72, 0x74,
0x61, 0x73, 0x6b, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49,
0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x0b, 0x70, 0x61, 0x73, 0x73, 0x70, 0x65,
0x72, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73,
0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73,
0x73, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52,
0x04, 0x70, 0x61, 0x73, 0x73, 0x12, 0x29, 0x0a, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x61, 0x77, 0x61,
0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41,
0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x64,
0x12, 0x27, 0x0a, 0x08, 0x70, 0x65, 0x72, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x07, 0x20, 0x03,
0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52,
0x08, 0x70, 0x65, 0x72, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x40, 0x0a, 0x12, 0x43, 0x6f, 0x6d,
0x62, 0x61, 0x74, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12,
0x2a, 0x0a, 0x06, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x12, 0x2e, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x49,
0x74, 0x65, 0x6d, 0x52, 0x06, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e,
0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -831,46 +932,49 @@ func file_combat_combat_msg_proto_rawDescGZIP() []byte {
return file_combat_combat_msg_proto_rawDescData
}
var file_combat_combat_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
var file_combat_combat_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 15)
var file_combat_combat_msg_proto_goTypes = []interface{}{
(*CombatInReq)(nil), // 0: CombatInReq
(*CombatInResp)(nil), // 1: CombatInResp
(*CombatUpdateLevelReq)(nil), // 2: CombatUpdateLevelReq
(*CombatUpdateLevelResp)(nil), // 3: CombatUpdateLevelResp
(*CombatChallengeReq)(nil), // 4: CombatChallengeReq
(*CombatChallengeResp)(nil), // 5: CombatChallengeResp
(*CombatChallengeReceiveReq)(nil), // 6: CombatChallengeReceiveReq
(*CombatChallengeReceiveResp)(nil), // 7: CombatChallengeReceiveResp
(*CombatDropReq)(nil), // 8: CombatDropReq
(*CombatDropResp)(nil), // 9: CombatDropResp
(*LevelProgressItem)(nil), // 10: LevelProgressItem
(*CombatProgressPush)(nil), // 11: CombatProgressPush
nil, // 12: CombatUpdateLevelReq.DataEntry
(*DBCombatLevel)(nil), // 13: DBCombatLevel
(*BattleFormation)(nil), // 14: BattleFormation
(*BattleInfo)(nil), // 15: BattleInfo
(*BattleReport)(nil), // 16: BattleReport
(*UserAssets)(nil), // 17: UserAssets
(*ConIProgress)(nil), // 18: ConIProgress
(*CombatAskReq)(nil), // 2: CombatAskReq
(*CombatAskResp)(nil), // 3: CombatAskResp
(*CombatUpdateLevelReq)(nil), // 4: CombatUpdateLevelReq
(*CombatUpdateLevelResp)(nil), // 5: CombatUpdateLevelResp
(*CombatChallengeReq)(nil), // 6: CombatChallengeReq
(*CombatChallengeResp)(nil), // 7: CombatChallengeResp
(*CombatChallengeReceiveReq)(nil), // 8: CombatChallengeReceiveReq
(*CombatChallengeReceiveResp)(nil), // 9: CombatChallengeReceiveResp
(*CombatDropReq)(nil), // 10: CombatDropReq
(*CombatDropResp)(nil), // 11: CombatDropResp
(*LevelProgressItem)(nil), // 12: LevelProgressItem
(*CombatProgressPush)(nil), // 13: CombatProgressPush
nil, // 14: CombatUpdateLevelReq.DataEntry
(*DBCombatLevel)(nil), // 15: DBCombatLevel
(*BattleFormation)(nil), // 16: BattleFormation
(*BattleInfo)(nil), // 17: BattleInfo
(*BattleReport)(nil), // 18: BattleReport
(*UserAssets)(nil), // 19: UserAssets
(*ConIProgress)(nil), // 20: ConIProgress
}
var file_combat_combat_msg_proto_depIdxs = []int32{
13, // 0: CombatInResp.level:type_name -> DBCombatLevel
12, // 1: CombatUpdateLevelReq.data:type_name -> CombatUpdateLevelReq.DataEntry
14, // 2: CombatChallengeReq.battle:type_name -> BattleFormation
15, // 3: CombatChallengeResp.info:type_name -> BattleInfo
16, // 4: CombatChallengeReceiveReq.report:type_name -> BattleReport
17, // 5: CombatChallengeReceiveResp.atns:type_name -> UserAssets
17, // 6: CombatDropResp.atns:type_name -> UserAssets
18, // 7: LevelProgressItem.passmaintask:type_name -> ConIProgress
18, // 8: LevelProgressItem.passpertask:type_name -> ConIProgress
17, // 9: LevelProgressItem.mainaward:type_name -> UserAssets
17, // 10: LevelProgressItem.peraward:type_name -> UserAssets
10, // 11: CombatProgressPush.levels:type_name -> LevelProgressItem
12, // [12:12] is the sub-list for method output_type
12, // [12:12] is the sub-list for method input_type
12, // [12:12] is the sub-list for extension type_name
12, // [12:12] is the sub-list for extension extendee
0, // [0:12] is the sub-list for field type_name
15, // 0: CombatInResp.level:type_name -> DBCombatLevel
12, // 1: CombatAskResp.level:type_name -> LevelProgressItem
14, // 2: CombatUpdateLevelReq.data:type_name -> CombatUpdateLevelReq.DataEntry
16, // 3: CombatChallengeReq.battle:type_name -> BattleFormation
17, // 4: CombatChallengeResp.info:type_name -> BattleInfo
18, // 5: CombatChallengeReceiveReq.report:type_name -> BattleReport
19, // 6: CombatChallengeReceiveResp.atns:type_name -> UserAssets
19, // 7: CombatDropResp.atns:type_name -> UserAssets
20, // 8: LevelProgressItem.passmaintask:type_name -> ConIProgress
20, // 9: LevelProgressItem.passpertask:type_name -> ConIProgress
19, // 10: LevelProgressItem.mainaward:type_name -> UserAssets
19, // 11: LevelProgressItem.peraward:type_name -> UserAssets
12, // 12: CombatProgressPush.levels:type_name -> LevelProgressItem
13, // [13:13] is the sub-list for method output_type
13, // [13:13] is the sub-list for method input_type
13, // [13:13] is the sub-list for extension type_name
13, // [13:13] is the sub-list for extension extendee
0, // [0:13] is the sub-list for field type_name
}
func init() { file_combat_combat_msg_proto_init() }
@ -908,7 +1012,7 @@ func file_combat_combat_msg_proto_init() {
}
}
file_combat_combat_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*CombatUpdateLevelReq); i {
switch v := v.(*CombatAskReq); i {
case 0:
return &v.state
case 1:
@ -920,7 +1024,7 @@ func file_combat_combat_msg_proto_init() {
}
}
file_combat_combat_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*CombatUpdateLevelResp); i {
switch v := v.(*CombatAskResp); i {
case 0:
return &v.state
case 1:
@ -932,7 +1036,7 @@ func file_combat_combat_msg_proto_init() {
}
}
file_combat_combat_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*CombatChallengeReq); i {
switch v := v.(*CombatUpdateLevelReq); i {
case 0:
return &v.state
case 1:
@ -944,7 +1048,7 @@ func file_combat_combat_msg_proto_init() {
}
}
file_combat_combat_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*CombatChallengeResp); i {
switch v := v.(*CombatUpdateLevelResp); i {
case 0:
return &v.state
case 1:
@ -956,7 +1060,7 @@ func file_combat_combat_msg_proto_init() {
}
}
file_combat_combat_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*CombatChallengeReceiveReq); i {
switch v := v.(*CombatChallengeReq); i {
case 0:
return &v.state
case 1:
@ -968,7 +1072,7 @@ func file_combat_combat_msg_proto_init() {
}
}
file_combat_combat_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*CombatChallengeReceiveResp); i {
switch v := v.(*CombatChallengeResp); i {
case 0:
return &v.state
case 1:
@ -980,7 +1084,7 @@ func file_combat_combat_msg_proto_init() {
}
}
file_combat_combat_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*CombatDropReq); i {
switch v := v.(*CombatChallengeReceiveReq); i {
case 0:
return &v.state
case 1:
@ -992,7 +1096,7 @@ func file_combat_combat_msg_proto_init() {
}
}
file_combat_combat_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*CombatDropResp); i {
switch v := v.(*CombatChallengeReceiveResp); i {
case 0:
return &v.state
case 1:
@ -1004,7 +1108,7 @@ func file_combat_combat_msg_proto_init() {
}
}
file_combat_combat_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*LevelProgressItem); i {
switch v := v.(*CombatDropReq); i {
case 0:
return &v.state
case 1:
@ -1016,6 +1120,30 @@ func file_combat_combat_msg_proto_init() {
}
}
file_combat_combat_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*CombatDropResp); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_combat_combat_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*LevelProgressItem); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_combat_combat_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*CombatProgressPush); i {
case 0:
return &v.state
@ -1034,7 +1162,7 @@ func file_combat_combat_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_combat_combat_msg_proto_rawDesc,
NumEnums: 0,
NumMessages: 13,
NumMessages: 15,
NumExtensions: 0,
NumServices: 0,
},

4
sys/configure/structs/Game.BuriedCondiData.go
View File

@ -13,7 +13,7 @@ import "errors"
type GameBuriedCondiData struct {
Id int32
Rtype int32
Lock int32
Ctype int32
Notify []string
TypeSp int32
Tasktxt string
@ -33,7 +33,7 @@ func (*GameBuriedCondiData) GetTypeId() int32 {
func (_v *GameBuriedCondiData)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["rtype"].(float64); !_ok_ { err = errors.New("rtype error"); return }; _v.Rtype = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lock"].(float64); !_ok_ { err = errors.New("lock error"); return }; _v.Lock = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ctype"].(float64); !_ok_ { err = errors.New("ctype error"); return }; _v.Ctype = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool

4
sys/configure/structs/Game.CombatLevelData.go
View File

@ -18,7 +18,7 @@ type GameCombatLevelData struct {
Subtask []int32
Award []*Gameatn
Profectaward []*Gameatn
Debrisitemid string
Debrisitemid int32
Scenemusic string
Atmosphere string
}
@ -89,7 +89,7 @@ func (_v *GameCombatLevelData)Deserialize(_buf map[string]interface{}) (err erro
}
}
{ var _ok_ bool; if _v.Debrisitemid, _ok_ = _buf["debrisitemid"].(string); !_ok_ { err = errors.New("debrisitemid error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["debrisitemid"].(float64); !_ok_ { err = errors.New("debrisitemid error"); return }; _v.Debrisitemid = int32(_tempNum_) }
{ var _ok_ bool; if _v.Scenemusic, _ok_ = _buf["scenemusic"].(string); !_ok_ { err = errors.New("scenemusic error"); return } }
{ var _ok_ bool; if _v.Atmosphere, _ok_ = _buf["atmosphere"].(string); !_ok_ { err = errors.New("atmosphere error"); return } }
return

6
sys/configure/structs/Game.PlayerInfor_overviewData.go
View File

@ -13,7 +13,8 @@ import "errors"
type GamePlayerInfor_overviewData struct {
Id string
Type int32
Icon string
Micon string
Wicon string
Tujing []int32
Murl string
Wurl string
@ -31,7 +32,8 @@ func (*GamePlayerInfor_overviewData) GetTypeId() int32 {
func (_v *GamePlayerInfor_overviewData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
{ 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; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
{ var _ok_ bool; if _v.Micon, _ok_ = _buf["micon"].(string); !_ok_ { err = errors.New("micon error"); return } }
{ var _ok_ bool; if _v.Wicon, _ok_ = _buf["wicon"].(string); !_ok_ { err = errors.New("wicon error"); return } }
{
var _arr_ []interface{}
var _ok_ bool

4
sys/configure/structs/Game.RuleDescData.go
View File

@ -24,8 +24,8 @@ func (*GameRuleDescData) GetTypeId() int32 {
func (_v *GameRuleDescData)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; if _v.Title, _ok_ = _buf["title"].(string); !_ok_ { err = errors.New("title error"); return } }
{ var _ok_ bool; if _v.Content, _ok_ = _buf["content"].(string); !_ok_ { err = errors.New("content error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["title"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Title error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Title, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["content"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Content error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Content, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return
}

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

@ -14,6 +14,7 @@ type GameHeroAwakenData struct {
Key int32
Hid string
Phase int32
Name string
Phasebonus []string
Icon string
Condition int32
@ -31,6 +32,7 @@ func (_v *GameHeroAwakenData)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; if _v.Hid, _ok_ = _buf["hid"].(string); !_ok_ { err = errors.New("hid error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["phase"].(float64); !_ok_ { err = errors.New("phase error"); return }; _v.Phase = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{
var _arr_ []interface{}
var _ok_ bool

13
utils/time.go
View File

@ -16,6 +16,19 @@ func IsToday(d int64) bool {
return tt.Year() == now.Year() && tt.Month() == now.Month() && tt.Day() == now.Day()
}
// 判断是否是出于同一周
func IsSameWeek(d int64) bool {
// 将时间戳转换成一个 time.Time 对象
t1 := time.Unix(d, 0)
t2 := configure.Now()
// 获取 t1 所在的周的第一天和 t2 所在的周的第一天
t1FirstDay := t1.AddDate(0, 0, -int(t1.Weekday())+1)
t2FirstDay := t2.AddDate(0, 0, -int(t2.Weekday())+1)
// 判断两个时间所在的周的第一天是否相同
return t1FirstDay.Equal(t2FirstDay)
}
//判断是否大于1周
func IsAfterWeek(d int64) bool {
tt := time.Unix(d, 0)