上传旧时光代码优化

This commit is contained in:
liwei1dao 2023-06-01 18:03:01 +08:00
parent a70c3b8652
commit a3b4fd5288
18 changed files with 2208 additions and 378 deletions

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": {

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"
}

File diff suppressed because it is too large Load Diff

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,

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",

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": "普通背景"

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"
}
}
]

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": [],

File diff suppressed because it is too large Load Diff

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",

View File

@ -130,8 +130,10 @@ 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
condis = append(condis, &pb.ConIProgress{
Btype: conf.Type,
Conid: v1.Conid,
@ -141,6 +143,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

View File

@ -49,42 +49,50 @@ func (this *apiComp) Ask(session comm.IUserSession, req *pb.CombatAskReq) (code
}
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
pitem.Passmaintask = condis
for _, v := range condis {
level.Progress += v.Value
if v.State != 2 {
ok = false
}
Level: level.Id,
Progress: level.Progress,
Pass: level.Pass,
Passpertask: level.Passpertask,
Passmaintask: level.Passmaintask,
}
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,
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
}
}
pitem.Mainaward = atns
}
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 level.Pass == 1 {
if condis, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), lvconf.Subtask...); err != nil {
code = pb.ErrorCode_ExternalModule
data = &pb.ErrorData{
@ -93,16 +101,19 @@ func (this *apiComp) Ask(session comm.IUserSession, req *pb.CombatAskReq) (code
}
return
}
level.Passpertask = condis
pitem.Passpertask = condis
ok = true
for _, v := range condis {
level.Progress += v.Value
if v.State != 2 {
if v.Conid == lvconf.Debrisitemid {
level.Progress = v.Value
}
if v.State != pb.BuriedItemFinishState_buried_finish {
ok = false
}
}
if ok { //
if level.Pass == 1 && ok { //
level.Pass = 2
pitem.Pass = 2
this.module.DispenseRes(session, lvconf.Profectaward, true)
@ -116,14 +127,15 @@ func (this *apiComp) Ask(session comm.IUserSession, req *pb.CombatAskReq) (code
}
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
}
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()), "progress", &pb.CombatAskResp{Level: pitem})
session.SendMsg(string(this.module.GetType()), "ask", &pb.CombatAskResp{Level: pitem})
return
}

View File

@ -27,7 +27,6 @@ func (this *apiComp) In(session comm.IUserSession, req *pb.CombatInReq) (code pb
return
}
if level, ok = info.Level[req.Level]; !ok {
level = &pb.DBCombatLevel{
Id: req.Level,
Passmanster: make([]int32, 0),

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 {

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

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

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
}

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