liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

上传用户信息获取缓存适配接口

Browse Source
This commit is contained in:
liwei1dao 2024-01-11 17:39:45 +08:00
parent 5de5b2fa25
commit c0bc22d916
72 changed files with 1055 additions and 593 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/json/game_global.json
View File

@ -631,6 +631,7 @@
"buzkashi_catchspeed": 800,
"buzkashi_catchqtetime": 2000,
"buzkashi_recentPlayer": 10,
"buzkashi_trackpartdis": 200,
"task_activation": 10000007,
"favorability_attenuation": [
{

96
bin/json/game_huntingboss.json
View File

@ -7,6 +7,8 @@
"text": "巨型猩猩怪兽"
},
"difficulty": 1,
"sweepId": 7,
"sweepOpenId": [],
"BattleReadyID": 10400001,
"firstprize": [
{
@ -63,6 +65,8 @@
"text": "巨型猩猩怪兽"
},
"difficulty": 2,
"sweepId": 7,
"sweepOpenId": [],
"BattleReadyID": 10400001,
"firstprize": [
{
@ -119,6 +123,8 @@
"text": "巨型猩猩怪兽"
},
"difficulty": 3,
"sweepId": 7,
"sweepOpenId": [],
"BattleReadyID": 10400001,
"firstprize": [
{
@ -180,6 +186,8 @@
"text": "巨型猩猩怪兽"
},
"difficulty": 4,
"sweepId": 7,
"sweepOpenId": [],
"BattleReadyID": 10400001,
"firstprize": [
{
@ -241,6 +249,8 @@
"text": "巨型猩猩怪兽"
},
"difficulty": 5,
"sweepId": 8,
"sweepOpenId": [],
"BattleReadyID": 10400001,
"firstprize": [
{
@ -302,6 +312,8 @@
"text": "巨型猩猩怪兽"
},
"difficulty": 6,
"sweepId": 8,
"sweepOpenId": [],
"BattleReadyID": 10400001,
"firstprize": [
{
@ -363,6 +375,8 @@
"text": "巨型猩猩怪兽"
},
"difficulty": 7,
"sweepId": 8,
"sweepOpenId": [],
"BattleReadyID": 10400001,
"firstprize": [
{
@ -429,6 +443,8 @@
"text": "巨型猩猩怪兽"
},
"difficulty": 8,
"sweepId": 8,
"sweepOpenId": [],
"BattleReadyID": 10400001,
"firstprize": [
{
@ -495,6 +511,8 @@
"text": "巨型猩猩怪兽"
},
"difficulty": 9,
"sweepId": 9,
"sweepOpenId": [],
"BattleReadyID": 10400001,
"firstprize": [
{
@ -561,6 +579,8 @@
"text": "巨型猩猩怪兽"
},
"difficulty": 10,
"sweepId": 9,
"sweepOpenId": [],
"BattleReadyID": 10400001,
"firstprize": [
{
@ -627,6 +647,8 @@
"text": "巨型猩猩怪兽"
},
"difficulty": 11,
"sweepId": 9,
"sweepOpenId": [],
"BattleReadyID": 10400001,
"firstprize": [
{
@ -693,6 +715,8 @@
"text": "巨型猩猩怪兽"
},
"difficulty": 12,
"sweepId": 9,
"sweepOpenId": [],
"BattleReadyID": 10400001,
"firstprize": [
{
@ -759,6 +783,8 @@
"text": "火龙"
},
"difficulty": 1,
"sweepId": 7,
"sweepOpenId": [],
"BattleReadyID": 10400002,
"firstprize": [
{
@ -815,6 +841,8 @@
"text": "火龙"
},
"difficulty": 2,
"sweepId": 7,
"sweepOpenId": [],
"BattleReadyID": 10400002,
"firstprize": [
{
@ -871,6 +899,8 @@
"text": "火龙"
},
"difficulty": 3,
"sweepId": 7,
"sweepOpenId": [],
"BattleReadyID": 10400002,
"firstprize": [
{
@ -932,6 +962,8 @@
"text": "火龙"
},
"difficulty": 4,
"sweepId": 7,
"sweepOpenId": [],
"BattleReadyID": 10400002,
"firstprize": [
{
@ -993,6 +1025,8 @@
"text": "火龙"
},
"difficulty": 5,
"sweepId": 8,
"sweepOpenId": [],
"BattleReadyID": 10400002,
"firstprize": [
{
@ -1054,6 +1088,8 @@
"text": "火龙"
},
"difficulty": 6,
"sweepId": 8,
"sweepOpenId": [],
"BattleReadyID": 10400002,
"firstprize": [
{
@ -1115,6 +1151,8 @@
"text": "火龙"
},
"difficulty": 7,
"sweepId": 8,
"sweepOpenId": [],
"BattleReadyID": 10400002,
"firstprize": [
{
@ -1181,6 +1219,8 @@
"text": "火龙"
},
"difficulty": 8,
"sweepId": 8,
"sweepOpenId": [],
"BattleReadyID": 10400002,
"firstprize": [
{
@ -1247,6 +1287,8 @@
"text": "火龙"
},
"difficulty": 9,
"sweepId": 9,
"sweepOpenId": [],
"BattleReadyID": 10400002,
"firstprize": [
{
@ -1313,6 +1355,8 @@
"text": "火龙"
},
"difficulty": 10,
"sweepId": 9,
"sweepOpenId": [],
"BattleReadyID": 10400002,
"firstprize": [
{
@ -1379,6 +1423,8 @@
"text": "火龙"
},
"difficulty": 11,
"sweepId": 9,
"sweepOpenId": [],
"BattleReadyID": 10400002,
"firstprize": [
{
@ -1445,6 +1491,8 @@
"text": "火龙"
},
"difficulty": 12,
"sweepId": 9,
"sweepOpenId": [],
"BattleReadyID": 10400002,
"firstprize": [
{
@ -1511,6 +1559,8 @@
"text": "大厨"
},
"difficulty": 1,
"sweepId": 7,
"sweepOpenId": [],
"BattleReadyID": 10400003,
"firstprize": [
{
@ -1567,6 +1617,8 @@
"text": "大厨"
},
"difficulty": 2,
"sweepId": 7,
"sweepOpenId": [],
"BattleReadyID": 10400003,
"firstprize": [
{
@ -1623,6 +1675,8 @@
"text": "大厨"
},
"difficulty": 3,
"sweepId": 7,
"sweepOpenId": [],
"BattleReadyID": 10400003,
"firstprize": [
{
@ -1684,6 +1738,8 @@
"text": "大厨"
},
"difficulty": 4,
"sweepId": 7,
"sweepOpenId": [],
"BattleReadyID": 10400003,
"firstprize": [
{
@ -1745,6 +1801,8 @@
"text": "大厨"
},
"difficulty": 5,
"sweepId": 8,
"sweepOpenId": [],
"BattleReadyID": 10400003,
"firstprize": [
{
@ -1806,6 +1864,8 @@
"text": "大厨"
},
"difficulty": 6,
"sweepId": 8,
"sweepOpenId": [],
"BattleReadyID": 10400003,
"firstprize": [
{
@ -1867,6 +1927,8 @@
"text": "大厨"
},
"difficulty": 7,
"sweepId": 8,
"sweepOpenId": [],
"BattleReadyID": 10400003,
"firstprize": [
{
@ -1933,6 +1995,8 @@
"text": "大厨"
},
"difficulty": 8,
"sweepId": 8,
"sweepOpenId": [],
"BattleReadyID": 10400003,
"firstprize": [
{
@ -1999,6 +2063,8 @@
"text": "大厨"
},
"difficulty": 9,
"sweepId": 9,
"sweepOpenId": [],
"BattleReadyID": 10400003,
"firstprize": [
{
@ -2065,6 +2131,8 @@
"text": "大厨"
},
"difficulty": 10,
"sweepId": 9,
"sweepOpenId": [],
"BattleReadyID": 10400003,
"firstprize": [
{
@ -2131,6 +2199,8 @@
"text": "大厨"
},
"difficulty": 11,
"sweepId": 9,
"sweepOpenId": [],
"BattleReadyID": 10400003,
"firstprize": [
{
@ -2197,6 +2267,8 @@
"text": "大厨"
},
"difficulty": 12,
"sweepId": 9,
"sweepOpenId": [],
"BattleReadyID": 10400003,
"firstprize": [
{
@ -2263,6 +2335,8 @@
"text": "格尔族"
},
"difficulty": 1,
"sweepId": 7,
"sweepOpenId": [],
"BattleReadyID": 10400004,
"firstprize": [
{
@ -2319,6 +2393,8 @@
"text": "格尔族"
},
"difficulty": 2,
"sweepId": 7,
"sweepOpenId": [],
"BattleReadyID": 10400004,
"firstprize": [
{
@ -2375,6 +2451,8 @@
"text": "格尔族"
},
"difficulty": 3,
"sweepId": 7,
"sweepOpenId": [],
"BattleReadyID": 10400004,
"firstprize": [
{
@ -2436,6 +2514,8 @@
"text": "格尔族"
},
"difficulty": 4,
"sweepId": 7,
"sweepOpenId": [],
"BattleReadyID": 10400004,
"firstprize": [
{
@ -2497,6 +2577,8 @@
"text": "格尔族"
},
"difficulty": 5,
"sweepId": 8,
"sweepOpenId": [],
"BattleReadyID": 10400004,
"firstprize": [
{
@ -2558,6 +2640,8 @@
"text": "格尔族"
},
"difficulty": 6,
"sweepId": 8,
"sweepOpenId": [],
"BattleReadyID": 10400004,
"firstprize": [
{
@ -2619,6 +2703,8 @@
"text": "格尔族"
},
"difficulty": 7,
"sweepId": 8,
"sweepOpenId": [],
"BattleReadyID": 10400004,
"firstprize": [
{
@ -2685,6 +2771,8 @@
"text": "格尔族"
},
"difficulty": 8,
"sweepId": 8,
"sweepOpenId": [],
"BattleReadyID": 10400004,
"firstprize": [
{
@ -2751,6 +2839,8 @@
"text": "格尔族"
},
"difficulty": 9,
"sweepId": 9,
"sweepOpenId": [],
"BattleReadyID": 10400004,
"firstprize": [
{
@ -2817,6 +2907,8 @@
"text": "格尔族"
},
"difficulty": 10,
"sweepId": 9,
"sweepOpenId": [],
"BattleReadyID": 10400004,
"firstprize": [
{
@ -2883,6 +2975,8 @@
"text": "格尔族"
},
"difficulty": 11,
"sweepId": 9,
"sweepOpenId": [],
"BattleReadyID": 10400004,
"firstprize": [
{
@ -2949,6 +3043,8 @@
"text": "格尔族"
},
"difficulty": 12,
"sweepId": 9,
"sweepOpenId": [],
"BattleReadyID": 10400004,
"firstprize": [
{

357
bin/json/game_opencond.json
View File

File diff suppressed because it is too large Load Diff

136
bin/json/game_vikingboss.json
View File

@ -8,6 +8,8 @@
"text": "火焰泰坦"
},
"difficulty": 1,
"sweepId": 4,
"sweepOpenId": [],
"BattleReadyID": 10500004,
"captionrecommend": [
25001,
@ -73,6 +75,8 @@
"text": "火焰泰坦"
},
"difficulty": 2,
"sweepId": 4,
"sweepOpenId": [],
"BattleReadyID": 10500001,
"captionrecommend": [
25001,
@ -133,6 +137,8 @@
"text": "火焰泰坦"
},
"difficulty": 3,
"sweepId": 4,
"sweepOpenId": [],
"BattleReadyID": 10500001,
"captionrecommend": [
25001,
@ -198,6 +204,8 @@
"text": "火焰泰坦"
},
"difficulty": 4,
"sweepId": 4,
"sweepOpenId": [],
"BattleReadyID": 10500001,
"captionrecommend": [
25001,
@ -258,6 +266,8 @@
"text": "火焰泰坦"
},
"difficulty": 5,
"sweepId": 5,
"sweepOpenId": [],
"BattleReadyID": 10500001,
"captionrecommend": [
25001,
@ -323,6 +333,8 @@
"text": "火焰泰坦"
},
"difficulty": 6,
"sweepId": 5,
"sweepOpenId": [],
"BattleReadyID": 10500001,
"captionrecommend": [
25001,
@ -388,6 +400,8 @@
"text": "火焰泰坦"
},
"difficulty": 7,
"sweepId": 5,
"sweepOpenId": [],
"BattleReadyID": 10500001,
"captionrecommend": [
25001,
@ -458,6 +472,8 @@
"text": "火焰泰坦"
},
"difficulty": 8,
"sweepId": 5,
"sweepOpenId": [],
"BattleReadyID": 10500001,
"captionrecommend": [
25001,
@ -523,6 +539,8 @@
"text": "火焰泰坦"
},
"difficulty": 9,
"sweepId": 6,
"sweepOpenId": [],
"BattleReadyID": 10500001,
"captionrecommend": [
25001,
@ -593,6 +611,8 @@
"text": "火焰泰坦"
},
"difficulty": 10,
"sweepId": 6,
"sweepOpenId": [],
"BattleReadyID": 10500001,
"captionrecommend": [
25001,
@ -663,6 +683,8 @@
"text": "火焰泰坦"
},
"difficulty": 11,
"sweepId": 6,
"sweepOpenId": [],
"BattleReadyID": 10500001,
"captionrecommend": [
25001,
@ -733,6 +755,8 @@
"text": "火焰泰坦"
},
"difficulty": 12,
"sweepId": 6,
"sweepOpenId": [],
"BattleReadyID": 10500001,
"captionrecommend": [
25001,
@ -798,6 +822,8 @@
"text": "冰霜泰坦"
},
"difficulty": 1,
"sweepId": 4,
"sweepOpenId": [],
"BattleReadyID": 10500003,
"captionrecommend": [
14007,
@ -863,6 +889,8 @@
"text": "冰霜泰坦"
},
"difficulty": 2,
"sweepId": 4,
"sweepOpenId": [],
"BattleReadyID": 10500003,
"captionrecommend": [
14007,
@ -923,6 +951,8 @@
"text": "冰霜泰坦"
},
"difficulty": 3,
"sweepId": 4,
"sweepOpenId": [],
"BattleReadyID": 10500003,
"captionrecommend": [
14007,
@ -988,6 +1018,8 @@
"text": "冰霜泰坦"
},
"difficulty": 4,
"sweepId": 4,
"sweepOpenId": [],
"BattleReadyID": 10500003,
"captionrecommend": [
14007,
@ -1048,6 +1080,8 @@
"text": "冰霜泰坦"
},
"difficulty": 5,
"sweepId": 5,
"sweepOpenId": [],
"BattleReadyID": 10500003,
"captionrecommend": [
14007,
@ -1113,6 +1147,8 @@
"text": "冰霜泰坦"
},
"difficulty": 6,
"sweepId": 5,
"sweepOpenId": [],
"BattleReadyID": 10500003,
"captionrecommend": [
14007,
@ -1178,6 +1214,8 @@
"text": "冰霜泰坦"
},
"difficulty": 7,
"sweepId": 5,
"sweepOpenId": [],
"BattleReadyID": 10500003,
"captionrecommend": [
14007,
@ -1248,6 +1286,8 @@
"text": "冰霜泰坦"
},
"difficulty": 8,
"sweepId": 5,
"sweepOpenId": [],
"BattleReadyID": 10500003,
"captionrecommend": [
14007,
@ -1313,6 +1353,8 @@
"text": "冰霜泰坦"
},
"difficulty": 9,
"sweepId": 6,
"sweepOpenId": [],
"BattleReadyID": 10500003,
"captionrecommend": [
14007,
@ -1383,6 +1425,8 @@
"text": "冰霜泰坦"
},
"difficulty": 10,
"sweepId": 6,
"sweepOpenId": [],
"BattleReadyID": 10500003,
"captionrecommend": [
14007,
@ -1453,6 +1497,8 @@
"text": "冰霜泰坦"
},
"difficulty": 11,
"sweepId": 6,
"sweepOpenId": [],
"BattleReadyID": 10500003,
"captionrecommend": [
14007,
@ -1523,6 +1569,8 @@
"text": "冰霜泰坦"
},
"difficulty": 12,
"sweepId": 6,
"sweepOpenId": [],
"BattleReadyID": 10500003,
"captionrecommend": [
14007,
@ -1588,6 +1636,8 @@
"text": "森林泰坦"
},
"difficulty": 1,
"sweepId": 4,
"sweepOpenId": [],
"BattleReadyID": 10500002,
"captionrecommend": [
25003,
@ -1653,6 +1703,8 @@
"text": "森林泰坦"
},
"difficulty": 2,
"sweepId": 4,
"sweepOpenId": [],
"BattleReadyID": 10500002,
"captionrecommend": [
25003,
@ -1713,6 +1765,8 @@
"text": "森林泰坦"
},
"difficulty": 3,
"sweepId": 4,
"sweepOpenId": [],
"BattleReadyID": 10500002,
"captionrecommend": [
25003,
@ -1778,6 +1832,8 @@
"text": "森林泰坦"
},
"difficulty": 4,
"sweepId": 4,
"sweepOpenId": [],
"BattleReadyID": 10500002,
"captionrecommend": [
25003,
@ -1838,6 +1894,8 @@
"text": "森林泰坦"
},
"difficulty": 5,
"sweepId": 5,
"sweepOpenId": [],
"BattleReadyID": 10500002,
"captionrecommend": [
25003,
@ -1903,6 +1961,8 @@
"text": "森林泰坦"
},
"difficulty": 6,
"sweepId": 5,
"sweepOpenId": [],
"BattleReadyID": 10500002,
"captionrecommend": [
25003,
@ -1968,6 +2028,8 @@
"text": "森林泰坦"
},
"difficulty": 7,
"sweepId": 5,
"sweepOpenId": [],
"BattleReadyID": 10500002,
"captionrecommend": [
25003,
@ -2038,6 +2100,8 @@
"text": "森林泰坦"
},
"difficulty": 8,
"sweepId": 5,
"sweepOpenId": [],
"BattleReadyID": 10500002,
"captionrecommend": [
25003,
@ -2103,6 +2167,8 @@
"text": "森林泰坦"
},
"difficulty": 9,
"sweepId": 6,
"sweepOpenId": [],
"BattleReadyID": 10500002,
"captionrecommend": [
25003,
@ -2173,6 +2239,8 @@
"text": "森林泰坦"
},
"difficulty": 10,
"sweepId": 6,
"sweepOpenId": [],
"BattleReadyID": 10500002,
"captionrecommend": [
25003,
@ -2243,6 +2311,8 @@
"text": "森林泰坦"
},
"difficulty": 11,
"sweepId": 6,
"sweepOpenId": [],
"BattleReadyID": 10500002,
"captionrecommend": [
25003,
@ -2313,6 +2383,8 @@
"text": "森林泰坦"
},
"difficulty": 12,
"sweepId": 6,
"sweepOpenId": [],
"BattleReadyID": 10500002,
"captionrecommend": [
25003,
@ -2378,6 +2450,8 @@
"text": "武器BOSS"
},
"difficulty": 1,
"sweepId": 0,
"sweepOpenId": [],
"BattleReadyID": 11106001,
"captionrecommend": [
25001,
@ -2458,6 +2532,8 @@
"text": "武器BOSS"
},
"difficulty": 2,
"sweepId": 0,
"sweepOpenId": [],
"BattleReadyID": 11106001,
"captionrecommend": [
25001,
@ -2538,6 +2614,8 @@
"text": "武器BOSS"
},
"difficulty": 3,
"sweepId": 0,
"sweepOpenId": [],
"BattleReadyID": 11106001,
"captionrecommend": [
25001,
@ -2618,6 +2696,8 @@
"text": "武器BOSS"
},
"difficulty": 4,
"sweepId": 0,
"sweepOpenId": [],
"BattleReadyID": 11106001,
"captionrecommend": [
25001,
@ -2698,6 +2778,8 @@
"text": "武器BOSS"
},
"difficulty": 5,
"sweepId": 0,
"sweepOpenId": [],
"BattleReadyID": 11106001,
"captionrecommend": [
25001,
@ -2778,6 +2860,8 @@
"text": "武器BOSS"
},
"difficulty": 6,
"sweepId": 0,
"sweepOpenId": [],
"BattleReadyID": 11106001,
"captionrecommend": [
25001,
@ -2858,6 +2942,8 @@
"text": "武器BOSS"
},
"difficulty": 7,
"sweepId": 0,
"sweepOpenId": [],
"BattleReadyID": 11106001,
"captionrecommend": [
25001,
@ -2938,6 +3024,8 @@
"text": "武器BOSS"
},
"difficulty": 8,
"sweepId": 0,
"sweepOpenId": [],
"BattleReadyID": 11106001,
"captionrecommend": [
25001,
@ -3018,6 +3106,8 @@
"text": "武器BOSS"
},
"difficulty": 9,
"sweepId": 0,
"sweepOpenId": [],
"BattleReadyID": 11106001,
"captionrecommend": [
25001,
@ -3098,6 +3188,8 @@
"text": "武器BOSS"
},
"difficulty": 10,
"sweepId": 0,
"sweepOpenId": [],
"BattleReadyID": 11106001,
"captionrecommend": [
25001,
@ -3178,6 +3270,8 @@
"text": "饰品BOSS"
},
"difficulty": 1,
"sweepId": 0,
"sweepOpenId": [],
"BattleReadyID": 11106001,
"captionrecommend": [
25001,
@ -3258,6 +3352,8 @@
"text": "饰品BOSS"
},
"difficulty": 2,
"sweepId": 0,
"sweepOpenId": [],
"BattleReadyID": 11106001,
"captionrecommend": [
25001,
@ -3338,6 +3434,8 @@
"text": "饰品BOSS"
},
"difficulty": 3,
"sweepId": 0,
"sweepOpenId": [],
"BattleReadyID": 11106001,
"captionrecommend": [
25001,
@ -3418,6 +3516,8 @@
"text": "饰品BOSS"
},
"difficulty": 4,
"sweepId": 0,
"sweepOpenId": [],
"BattleReadyID": 11106001,
"captionrecommend": [
25001,
@ -3498,6 +3598,8 @@
"text": "饰品BOSS"
},
"difficulty": 5,
"sweepId": 0,
"sweepOpenId": [],
"BattleReadyID": 11106001,
"captionrecommend": [
25001,
@ -3578,6 +3680,8 @@
"text": "饰品BOSS"
},
"difficulty": 6,
"sweepId": 0,
"sweepOpenId": [],
"BattleReadyID": 11106001,
"captionrecommend": [
25001,
@ -3658,6 +3762,8 @@
"text": "饰品BOSS"
},
"difficulty": 7,
"sweepId": 0,
"sweepOpenId": [],
"BattleReadyID": 11106001,
"captionrecommend": [
25001,
@ -3738,6 +3844,8 @@
"text": "饰品BOSS"
},
"difficulty": 8,
"sweepId": 0,
"sweepOpenId": [],
"BattleReadyID": 11106001,
"captionrecommend": [
25001,
@ -3818,6 +3926,8 @@
"text": "饰品BOSS"
},
"difficulty": 9,
"sweepId": 0,
"sweepOpenId": [],
"BattleReadyID": 11106001,
"captionrecommend": [
25001,
@ -3898,6 +4008,8 @@
"text": "饰品BOSS"
},
"difficulty": 10,
"sweepId": 0,
"sweepOpenId": [],
"BattleReadyID": 11106001,
"captionrecommend": [
25001,
@ -3978,6 +4090,8 @@
"text": "梦境回廊"
},
"difficulty": 1,
"sweepId": 1,
"sweepOpenId": [],
"BattleReadyID": 11904001,
"captionrecommend": [
25001,
@ -4043,6 +4157,8 @@
"text": "梦境回廊"
},
"difficulty": 2,
"sweepId": 1,
"sweepOpenId": [],
"BattleReadyID": 11904001,
"captionrecommend": [
25001,
@ -4108,6 +4224,8 @@
"text": "梦境回廊"
},
"difficulty": 3,
"sweepId": 1,
"sweepOpenId": [],
"BattleReadyID": 11904001,
"captionrecommend": [
25001,
@ -4173,6 +4291,8 @@
"text": "梦境回廊"
},
"difficulty": 4,
"sweepId": 1,
"sweepOpenId": [],
"BattleReadyID": 11904001,
"captionrecommend": [
25001,
@ -4239,6 +4359,8 @@
"text": "梦境回廊"
},
"difficulty": 5,
"sweepId": 2,
"sweepOpenId": [],
"BattleReadyID": 11904001,
"captionrecommend": [
25001,
@ -4305,6 +4427,8 @@
"text": "梦境回廊"
},
"difficulty": 6,
"sweepId": 2,
"sweepOpenId": [],
"BattleReadyID": 11904001,
"captionrecommend": [
25001,
@ -4371,6 +4495,8 @@
"text": "梦境回廊"
},
"difficulty": 7,
"sweepId": 2,
"sweepOpenId": [],
"BattleReadyID": 11904001,
"captionrecommend": [
25001,
@ -4437,6 +4563,8 @@
"text": "梦境回廊"
},
"difficulty": 8,
"sweepId": 2,
"sweepOpenId": [],
"BattleReadyID": 11904001,
"captionrecommend": [
25001,
@ -4504,6 +4632,8 @@
"text": "梦境回廊"
},
"difficulty": 9,
"sweepId": 3,
"sweepOpenId": [],
"BattleReadyID": 11904001,
"captionrecommend": [
25001,
@ -4576,6 +4706,8 @@
"text": "梦境回廊"
},
"difficulty": 10,
"sweepId": 3,
"sweepOpenId": [],
"BattleReadyID": 11904001,
"captionrecommend": [
25001,
@ -4648,6 +4780,8 @@
"text": "梦境回廊"
},
"difficulty": 11,
"sweepId": 3,
"sweepOpenId": [],
"BattleReadyID": 11904001,
"captionrecommend": [
25001,
@ -4720,6 +4854,8 @@
"text": "梦境回廊"
},
"difficulty": 12,
"sweepId": 3,
"sweepOpenId": [],
"BattleReadyID": 11904001,
"captionrecommend": [
25001,

462
bin/json/game_worldtask.json
View File

File diff suppressed because it is too large Load Diff

4
comm/imodule.go
View File

@ -422,7 +422,7 @@ type (
}
// 世界任务
IWorldtask interface {
IOpenCmdNotice
// IOpenCmdNotice
// bingo任务
BingoJumpTask(session IUserSession, groupId, rtaskId int32) error
// 通过任务ID bingo
@ -577,7 +577,7 @@ type (
// 世界任务
IWtask interface {
IBuriedUpdateNotify
IOpenCmdNotice
// IOpenCmdNotice
AcceptCaravanTask(session IUserSession, groupId int32) (tid, groud int32, errdata *pb.ErrorData)
ClearCaravanTask(session IUserSession, task int32)
// bingo任务

2
modules/arena/api_info.go
View File

@ -28,7 +28,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (errd
if errdata = this.InfoCheck(session, req); errdata != nil {
return
}
user, err = this.module.ModuleUser.GetUser(session.GetUserId())
user, err = this.module.GetUserForSession(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,

2
modules/capturesheep/api_info.go
View File

@ -26,7 +26,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.CapturesheepInfoReq
if errdata = this.InfoCheck(session, req); errdata != nil {
return
}
user, err = this.module.ModuleUser.GetUser(session.GetUserId())
user, err = this.module.GetUserForSession(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,

2
modules/caravan/api_ranklist.go
View File

@ -22,7 +22,7 @@ func (this *apiComp) RankList(session comm.IUserSession, req *pb.CaravanRankList
}
//resp.List, rankid = this.module.modelCaravan.GetRankListData(comm.MaxRankList, session.GetUserId())
resp.List, rankid = this.module.rank.getRankList(session.GetUserId()) // 2023.10.10 改跨服
userinfo, err := this.module.ModuleUser.GetUser(session.GetUserId())
userinfo, err := this.module.GetUserForSession(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,

2
modules/catchbugs/api_singlegame.go
View File

@ -28,7 +28,7 @@ func (this *apiComp) SingleGame(session comm.IUserSession, req *pb.CatchbugsSing
return
}
//发起者 red
user, err = this.module.ModuleUser.GetUser(session.GetUserId())
user, err = this.module.GetUserForSession(session)
if err != nil {
this.module.Error("未找到红方信息", log.Field{Key: "uid", Value: session.GetUserId()})
return

2
modules/chat/api_send.go
View File

@ -36,7 +36,7 @@ func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendReq) (errda
}
// 禁言校验
if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil {
if user, err = this.module.GetUserForSession(session); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_UserNofound,
Title: pb.ErrorCode_UserNofound.ToString(),

2
modules/combat/api_drop.go
View File

@ -75,7 +75,7 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (err
}
return
}
user, err = this.module.ModuleUser.GetUser(session.GetUserId())
user, err = this.module.GetUserForSession(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,

2
modules/dailytask/module.go
View File

@ -159,7 +159,7 @@ func (this *Dailytask) refreshtask(session comm.IUserSession) {
}
if !utils.IsToday(dtask.Rtime) { //不是同一天 重置
if user, err = this.ModuleUser.GetUser(session.GetUserId()); err != nil {
if user, err = this.GetUserForSession(session); err != nil {
this.Error("no found user", log.Field{Key: "uid", Value: session.GetUserId()})
return
}

2
modules/dcolor/api_accept.go
View File

@ -102,7 +102,7 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.DColorAcceptReq)
this.module.Error("未找到红方信息", log.Field{Key: "uid", Value: req.Uid})
return
}
blue, err := this.module.ModuleUser.GetUser(session.GetUserId())
blue, err := this.module.GetUserForSession(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_UserNofound,

2
modules/dcolor/api_qiecuo.go
View File

@ -92,7 +92,7 @@ func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.DColorQiecuoReq)
return
}
if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil {
if user, err = this.module.GetUserForSession(session); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),

2
modules/dcolor/api_refuse.go
View File

@ -21,7 +21,7 @@ func (this *apiComp) Refuse(session comm.IUserSession, req *pb.DColorRefuseReq)
result *pb.DBDColorQiecuoRecord
keep bool
)
if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil {
if user, err = this.module.GetUserForSession(session); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),

2
modules/enchant/api_challengeover.go
View File

@ -75,7 +75,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.EnchantCha
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "EnchantChallengeOverReq", cfgEnchant[0].PsConsume)
})
userinfo, err := this.module.ModuleUser.GetUser(session.GetUserId())
userinfo, err := this.module.GetUserForSession(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,

2
modules/entertainment/api_boxreward.go
View File

@ -57,7 +57,7 @@ func (this *apiComp) BoxReward(session comm.IUserSession, req *pb.EntertainBoxRe
}
return
} else {
user, err := this.module.ModuleUser.GetUser(session.GetUserId())
user, err := this.module.GetUserForSession(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,

2
modules/entertainment/api_create.go
View File

@ -61,7 +61,7 @@ func (this *apiComp) CreateRoom(session comm.IUserSession, req *pb.EntertainCrea
}
}
}
user, err = this.module.ModuleUser.GetUser(session.GetUserId())
user, err = this.module.GetUserForSession(session)
if err != nil {
return
}

2
modules/entertainment/api_joinroom.go
View File

@ -59,7 +59,7 @@ func (this *apiComp) JoinRoom(session comm.IUserSession, req *pb.EntertainJoinRo
}
}
}
user, err = this.module.ModuleUser.GetUser(session.GetUserId())
user, err = this.module.GetUserForSession(session)
if err != nil {
return
}

2
modules/entertainment/api_match.go
View File

@ -25,7 +25,7 @@ func (this *apiComp) Match(session comm.IUserSession, req *pb.EntertainMatchReq)
conf *cfg.GameConsumeHeroData
list *pb.DBXXLData
)
user, err = this.module.ModuleUser.GetUser(session.GetUserId())
user, err = this.module.GetUserForSession(session)
if err != nil {
return
}

2
modules/equipment/api_upgrade.go
View File

@ -289,7 +289,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
this.module.ModuleBuried.TriggerBuried(session, tasks...)
if issucc { //聊天公告通知
if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err == nil {
if user, err = this.module.GetUserForSession(session); err == nil {
this.module.chat.SendSysChatToWorld(session, comm.ChatSystem3, equipment, equipment.Lv, 0, user.Name, conf.Id)
} else {
this.module.Errorf("no found userdata uid:%s", session.GetUserId())

2
modules/gameinvite/api_accept.go
View File

@ -108,7 +108,7 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.GameInviteAcceptR
sessions = append(sessions, redsession)
}
sessions = append(sessions, session.Clone())
if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil {
if user, err = this.module.GetUserForSession(session); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),

2
modules/gameinvite/api_qiecuo.go
View File

@ -51,7 +51,7 @@ func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.GameInviteQiecuoR
return
}
if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil {
if user, err = this.module.GetUserForSession(session); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),

2
modules/gameinvite/api_refuse.go
View File

@ -23,7 +23,7 @@ func (this *apiComp) Refuse(session comm.IUserSession, req *pb.GameInviteRefuseR
ok bool
keep bool
)
if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil {
if user, err = this.module.GetUserForSession(session); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),

4
modules/guildgve/api_challengefinish.go
View File

@ -77,7 +77,7 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.GuildGve
// }
// return
// }
if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil {
if user, err = this.module.GetUserForSession(session); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
@ -156,7 +156,7 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.GuildGve
if ok {
member.Boosticket--
this.module.modelGuildMember.updateGuildMember(member)
user, err := this.module.ModuleUser.GetUser(session.GetUserId())
user, err := this.module.GetUserForSession(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,

2
modules/guildgve/api_roulette.go
View File

@ -54,7 +54,7 @@ func (this *apiComp) Roulette(session comm.IUserSession, req *pb.GuildGveRoulett
})
}
if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil {
if user, err = this.module.GetUserForSession(session); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),

2
modules/hero/api_awaken.go
View File

@ -141,7 +141,7 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (e
}
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
//英雄觉醒 【玩家名称】已将【英雄名称】觉醒至满级！
if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil {
if user, err := this.module.GetUserForSession(session); err == nil {
this.chat.SendSysChatToWorld(session, comm.ChatSystem11, _hero, _hero.JuexingLv, _hero.Star, user.Name, _hero.HeroID)
} else {
this.module.Errorf("no found userdata uid:%s", session.GetUserId())

4
modules/hero/api_drawCard.go
View File

@ -329,7 +329,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
var szHero []*pb.DBHero
for _, hero := range add { // 奖励一次性发放
if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil { // 广播 首次获得英雄
if user, err := this.module.GetUserForSession(session); err == nil { // 广播 首次获得英雄
HeroConf, _ := this.module.configure.GetHeroConfig(hero.HeroID)
this.chat.SendSysChatToWorld(session, comm.ChatSystem13, hero, HeroConf.Star, 0, user.Name, hero.HeroID)
}
@ -457,7 +457,7 @@ func (this *apiComp) wishDrawCard(session comm.IUserSession, heroRecord *pb.DBHe
rsp.Record = heroRecord
session.SendMsg(string(this.module.GetType()), DrawCard, rsp)
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil { // 广播 首次获得英雄
if user, err := this.module.GetUserForSession(session); err == nil { // 广播 首次获得英雄
for _, v := range atno {
if v.A == "hero" && v.T == heroRecord.WishHero && v.N == 1 {
if HeroConf, err := this.module.configure.GetHeroConfig(heroRecord.WishHero); err == nil {

2
modules/hero/api_peachreward.go
View File

@ -34,7 +34,7 @@ func (this *apiComp) PeachReward(session comm.IUserSession, req *pb.HeroPeachRew
}
return
}
if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil {
if user, err := this.module.GetUserForSession(session); err == nil {
if drawConf.Etime != -1 {
if user.Ctime+int64(drawConf.Etime*3600*24) < configure.Now().Unix() {
errdata = &pb.ErrorData{

2
modules/hero/api_selectcard.go
View File

@ -79,7 +79,7 @@ func (this *apiComp) SelectCard(session comm.IUserSession, req *pb.HeroSelectCar
}
var szHero []*pb.DBHero
for _, hero := range add { // 奖励一次性发放
if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil { // 广播 首次获得英雄
if user, err := this.module.GetUserForSession(session); err == nil { // 广播 首次获得英雄
HeroConf, _ := this.module.configure.GetHeroConfig(hero.HeroID)
this.chat.SendSysChatToWorld(session, comm.ChatSystem13, hero, HeroConf.Star, 0, user.Name, hero.HeroID)
}

2
modules/hero/api_strengthenUpSkill.go
View File

@ -150,7 +150,7 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
//英雄技能培养 【玩家名称】已将【英雄名称】技能培养至满级！
if maxLv { // 满级星级参数
if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil {
if user, err := this.module.GetUserForSession(session); err == nil {
this.chat.SendSysChatToWorld(session, comm.ChatSystem9, _hero, _hero.Star, 0, user.Name, _hero.HeroID)
} else {
this.module.Errorf("no found userdata uid:%s", session.GetUserId())

2
modules/hero/api_strengthenUpStar.go
View File

@ -109,7 +109,7 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype115, 1, _hero.Star))
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
//英雄升星 【玩家名称】已将【英雄名称】培养至6星！
if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil {
if user, err := this.module.GetUserForSession(session); err == nil {
this.chat.SendSysChatToWorld(session, comm.ChatSystem8, _hero, _hero.Star, 0, user.Name, _hero.HeroID)
} else {
this.module.Errorf("no found userdata uid:%s", session.GetUserId())

2
modules/hero/api_strengthenUplv.go
View File

@ -98,7 +98,7 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
//英雄升级 【玩家名称】已将【英雄名称】培养至60级！
if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil {
if user, err := this.module.GetUserForSession(session); err == nil {
this.chat.SendSysChatToWorld(session, comm.ChatSystem7, _hero, _hero.Lv, 0, user.Name, _hero.HeroID)
} else {
this.module.Errorf("no found userdata uid:%s", session.GetUserId())

2
modules/hero/api_talentlearn.go
View File

@ -217,7 +217,7 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe
// 满回响
if this.module.configure.GetHeroTalentMaxLv(heroObj.HeroID) == int32(len(talent.Talent)) {
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype128, 1, cfg.Race))
if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil {
if user, err := this.module.GetUserForSession(session); err == nil {
this.chat.SendSysChatToWorld(session, comm.ChatSystem10, heroObj, heroObj.Star, 0, user.Name, heroObj.HeroID)
} else {
this.module.Errorf("no found userdata uid:%s", session.GetUserId())

2
modules/hero/model_hero.go
View File

@ -427,7 +427,7 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, heros []*pb.DBHero,
var maxLv int32 // 校验等级达到上限
maxLv = this.module.configure.GetHeroMaxLv(hero.Star)
// 校验玩家等级
if _user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil {
if _user, err := this.module.GetUserForSession(session); err == nil {
if expConf := this.module.configure.GetPlayerlvConf(_user.Lv); expConf != nil {
if maxLv > expConf.HeroLv {
maxLv = expConf.HeroLv // 英雄最大等级限制

2
modules/hunting/api_challenge.go
View File

@ -128,7 +128,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen
})
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil {
if user, err := this.module.GetUserForSession(session); err == nil {
this.chat.SendSysChatToWorld(session, comm.ChatSystem15, nil, req.BossType, req.Difficulty, user.Name)
} else {
this.module.Errorf("no found userdata uid:%s", session.GetUserId())

2
modules/hunting/api_challengeover.go
View File

@ -116,7 +116,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
}
// 发放通关随机奖励
user, err := this.module.ModuleUser.GetUser(session.GetUserId())
user, err := this.module.GetUserForSession(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,

4
modules/integral/api_challengeover.go
View File

@ -66,7 +66,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.IntegralCh
return
}
userinfo, err := this.module.ModuleUser.GetUser(session.GetUserId())
userinfo, err := this.module.GetUserForSession(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
@ -122,7 +122,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.IntegralCh
if first {
res = append(res, cfgData.Firstprize...)
}
if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil {
if user, err := this.module.GetUserForSession(session); err == nil {
reward = this.module.ModuleTools.GetGroupDataByLottery(cfgData.Drop, user.Vip, user.Lv)
res = append(res, reward...)
}

4
modules/items/modelitems.go
View File

@ -573,7 +573,7 @@ func (this *ModelItemsComp) recoverTicket(session comm.IUserSession) (errdata *p
return
}
if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil {
if user, err = this.module.GetUserForSession(session); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
@ -756,7 +756,7 @@ func (this *ModelItemsComp) useitem(session comm.IUserSession, gid string, amoun
return
}
case itemuse_randombox: //宝箱
user, err := this.module.ModuleUser.GetUser(session.GetUserId())
user, err := this.module.GetUserForSession(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,

2
modules/kftask/api_receive.go
View File

@ -54,7 +54,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.KFTaskReceiveReq
}
return
}
if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil {
if user, err = this.module.GetUserForSession(session); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),

2
modules/mainline/api_challengeover.go
View File

@ -140,7 +140,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh
} else {
res = append(res, conf.Commonaward...)
}
user, err := this.module.ModuleUser.GetUser(session.GetUserId())
user, err := this.module.GetUserForSession(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,

2
modules/mainline/api_levelpass.go
View File

@ -108,7 +108,7 @@ func (this *apiComp) LevelPass(session comm.IUserSession, req *pb.MainlineLevelP
// return
// }
// aeward = append(aeward, atno...)
user, err := this.module.ModuleUser.GetUser(session.GetUserId())
user, err := this.module.GetUserForSession(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,

26
modules/modulebase.go
View File

@ -1001,3 +1001,29 @@ func (this *ModuleBase) AsynHandleSession(session comm.IUserSession, handle func
func (this *ModuleBase) WriteUserLog(uid string, req interface{}, itype int32, tag string, data interface{}) {
this.userlog.AddUserLog(uid, req, itype, tag, data)
}
func (this *ModuleBase) GetUserForSession(session comm.IUserSession) (user *pb.DBUser, err error) {
if ok, userMate := session.GetMate(comm.Session_User); ok {
user = userMate.(*pb.DBUser)
} else {
if user, err = this.GetUserForSession(session); err != nil {
this.Error("获取用户信息失败!", log.Field{Key: "uid", Value: session.GetUserId()})
return
}
session.SetMate(comm.Session_User, user)
}
return
}
func (this *ModuleBase) GetUserExpandForSession(session comm.IUserSession) (user *pb.DBUserExpand, err error) {
if ok, userMate := session.GetMate(comm.Session_UserExpand); ok {
user = userMate.(*pb.DBUserExpand)
} else {
if user, err = this.ModuleUser.GetUserExpand(session.GetUserId()); err != nil {
this.Error("获取用户信息失败!", log.Field{Key: "uid", Value: session.GetUserId()})
return
}
session.SetMate(comm.Session_UserExpand, user)
}
return
}

2
modules/moonfantasy/api_ask.go
View File

@ -85,7 +85,7 @@ func (this *apiComp) Ask(session comm.IUserSession, req *pb.MoonfantasyAskReq) (
// this.module.modelUserMF.Change(session.GetUserId(), map[string]interface{}{
// "mfantasys": umfantasy.Mfantasys,
// })
if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil {
if user, err = this.module.GetUserForSession(session); err != nil {
this.module.Errorf("no found uer:%d", session.GetUserId())
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,

4
modules/moonfantasy/modelDream.go
View File

@ -109,7 +109,7 @@ func (this *modelDreamComp) trigger(session comm.IUserSession) {
this.module.Errorln(err)
return
}
if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil {
if user, err = this.module.GetUserForSession(session); err != nil {
this.module.Errorf("no found uer:%d", session.GetUserId())
return
}
@ -170,7 +170,7 @@ func (this *modelDreamComp) triggerbyid(session comm.IUserSession, boosid string
this.module.Errorln(err)
return
}
if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil {
if user, err = this.module.GetUserForSession(session); err != nil {
this.module.Errorf("no found uer:%d", session.GetUserId())
return
}

2
modules/pagoda/api_challengeover.go
View File

@ -132,7 +132,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChal
}
}
// 数据直接插入跨服数据库中
if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil {
if user, err = this.module.GetUserForSession(session); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),

2
modules/pagoda/pagoda_test.go
View File

@ -90,7 +90,7 @@ func TestXxx(t *testing.T) {
// uid := session.GetUserId()
// if !this.module.IsCross() {
// if conn, err := db.Cross(); err == nil {
// userinfo := this.module.ModuleUser.GetUser(session.GetUserId())
// userinfo := this.module.GetUserForSession(session)
// newData := &pb.DBPagodaRecord{
// Id: primitive.NewObjectID().Hex(),
// Uid: session.GetUserId(),

2
modules/parkour/api_Info.go
View File

@ -26,7 +26,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ParkourInfoReq) (er
if errdata = this.InfoCheck(session, req); errdata != nil {
return
}
user, err = this.module.ModuleUser.GetUser(session.GetUserId())
user, err = this.module.GetUserForSession(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,

2
modules/privilege/api_buygift.go
View File

@ -27,7 +27,7 @@ func (this *apiComp) BuyGift(session comm.IUserSession, req *pb.PrivilegeBuyGift
return
}
userinfo, err := this.module.ModuleUser.GetUser(session.GetUserId())
userinfo, err := this.module.GetUserForSession(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,

2
modules/shop/api_getlist.go
View File

@ -56,7 +56,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
}
return
}
if udata, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil {
if udata, err = this.module.GetUserForSession(session); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),

2
modules/shopcenter/api_receive.go
View File

@ -78,7 +78,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.ShopCenterReceiv
Message: "activity is close",
}
}
if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil {
if user, err = this.module.GetUserForSession(session); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),

4
modules/smithy/api_forgeequip.go
View File

@ -237,7 +237,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
} else if bQuality { // 精炼打造
newdrop := this.module.modelStove.CheckUnlockSuid(req.ReelId, stove.Data[req.ReelId].Lv, reelcfg.BasicDrop)
user, err := this.module.ModuleUser.GetUser(session.GetUserId())
user, err := this.module.GetUserForSession(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
@ -264,7 +264,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
} else { // 普通打造
// 获取掉落id
newdrop := this.module.modelStove.CheckUnlockSuid(req.ReelId, stove.Data[req.ReelId].Lv, reelcfg.BasicDrop)
user, err := this.module.ModuleUser.GetUser(session.GetUserId())
user, err := this.module.GetUserForSession(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,

6
modules/stonehenge/api_event.go
View File

@ -101,7 +101,7 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
switch eventConf.EventType {
case EventType16: // 捡垃圾事件
user, err := this.module.ModuleUser.GetUser(session.GetUserId())
user, err := this.module.GetUserForSession(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
@ -170,7 +170,7 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
// 掉落奖励
if conf, err := this.module.configure.GetStoneEventDataById(req.Eventid); err == nil {
if battleConf, err := this.module.configure.GetBattleConfById(conf.Value1); err == nil {
user, err := this.module.ModuleUser.GetUser(session.GetUserId())
user, err := this.module.GetUserForSession(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
@ -244,7 +244,7 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
}
// 次数校验
if stone.Rooms.Box[req.Eventid] < eventConf.Value2 {
user, err := this.module.ModuleUser.GetUser(session.GetUserId())
user, err := this.module.GetUserForSession(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,

1
modules/sys/api_funcactivate.go
View File

@ -66,7 +66,6 @@ func (this *apiComp) FuncActivate(session comm.IUserSession, req *pb.SysFuncActi
}
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
this.module.wtask.OpenCmdNotice(session, req.Cid)
//手动激活通知模块
for _, m := range opencfg.Notify {
i, err := this.service.GetModule(core.M_Modules(m))

1
modules/sys/api_funcgetList.go
View File

@ -81,7 +81,6 @@ func (this *apiComp) FuncGetList(session comm.IUserSession, req *pb.SysFuncGetLi
if len(change) > 0 {
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
this.module.wtask.OpenCmdNotice(session, change...)
//手动激活通知模块
for _, m := range change {
opencfg, _ := this.module.configure.GetOpenCondCfgById(m)

2
modules/turntable/module.go
View File

@ -133,7 +133,7 @@ func (this *Turntable) EventUserLogin(session comm.IUserSession) {
err error
)
endTime := this.ModuleTools.GetGlobalConf().SignAccount
if user, err := this.ModuleUser.GetUser(session.GetUserId()); err == nil {
if user, err := this.GetUserForSession(session); err == nil {
if configure.Now().Unix() > user.Ctime+int64(endTime*24*3600) {
bEnd = true
}

35
modules/user/module.go
View File

@ -475,32 +475,23 @@ func (this *User) change(session comm.IUserSession, attrs map[string]int32) (atn
temp *pb.UserAtno
err error
)
if ok, userMate := session.GetMate(comm.Session_User); ok {
user = userMate.(*pb.DBUser)
session.SetMate(comm.Session_User, user)
} else {
if user, err = this.GetUser(session.GetUserId()); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_UserSessionNobeing,
Title: pb.ErrorCode_UserSessionNobeing.ToString(),
Message: err.Error(),
}
return
if user, err = this.GetUserForSession(session); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_UserSessionNobeing,
Title: pb.ErrorCode_UserSessionNobeing.ToString(),
Message: err.Error(),
}
return
}
if ok, userMate := session.GetMate(comm.Session_UserExpand); ok {
userEx = userMate.(*pb.DBUserExpand)
session.SetMate(comm.Session_UserExpand, userEx)
} else {
if userEx, err = this.GetUserExpand(uid); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_UserExpandNull,
Title: pb.ErrorCode_UserExpandNull.ToString(),
Message: err.Error(),
}
return
if userEx, err = this.GetUserExpandForSession(session); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_UserExpandNull,
Title: pb.ErrorCode_UserExpandNull.ToString(),
Message: err.Error(),
}
return
}
change = &pb.UserResChangedPush{

2
modules/venture/api_lvreward.go
View File

@ -47,7 +47,7 @@ func (this *apiComp) LvReward(session comm.IUserSession, req *pb.VentureLvReward
return
}
// 等级校验
if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil {
if user, err = this.module.GetUserForSession(session); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),

2
modules/venture/api_signlist.go
View File

@ -23,7 +23,7 @@ func (this *apiComp) SignGetList(session comm.IUserSession, req *pb.VentureSignG
return
}
endTime := this.module.ModuleTools.GetGlobalConf().SignAccount
if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil {
if user, err := this.module.GetUserForSession(session); err == nil {
if configure.Now().Unix() > user.Ctime+int64(endTime*24*3600) {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ActivityOver,

2
modules/viking/api_challengeover.go
View File

@ -79,7 +79,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
viking.Boss[req.BossId] = req.Difficulty
mapData["boss"] = viking.Boss
}
if user, err = this.module.ModuleUser.GetUser(session.GetUserId()); err != nil {
if user, err = this.module.GetUserForSession(session); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),

2
modules/wtask/api_battlefinish.go
View File

@ -67,7 +67,7 @@ func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.WTaskBattle
}
}
if conf.Reward > 0 {
user, err := this.module.ModuleUser.GetUser(session.GetUserId())
user, err := this.module.GetUserForSession(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,

2
modules/wtask/api_boxreceive.go
View File

@ -72,7 +72,7 @@ func (this *apiComp) BoxReceive(session comm.IUserSession, req *pb.WTaskBoxRecei
return
}
user, err := this.module.ModuleUser.GetUser(session.GetUserId())
user, err := this.module.GetUserForSession(session)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,

2
modules/wtask/api_info.go
View File

@ -30,7 +30,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.WTaskInfoReq) (errd
}
return
}
if _, errdata = this.module.fishtask(session, wtask, false); errdata != nil {
if errdata = this.module.fishtask(session, wtask, false); errdata != nil {
return
}
// if progress, errdata = this.module.pushtaskprogress(session, wtask, false); errdata != nil {

20
modules/wtask/configure.go
View File

@ -26,10 +26,10 @@ type configureComp struct {
modules.MCompConfigure
module *WTask
lock sync.RWMutex
condlTask map[int32][]*cfg.GameWorldTaskData //key 条件ID
desTask map[int32][]*cfg.GameWorldTaskData //key 分类
groupTask map[int32][]*cfg.GameWorldTaskData //key 任务组
opencmdTask map[string][]*cfg.GameWorldTaskData //key 功能开启
condlTask map[int32][]*cfg.GameWorldTaskData //key 条件ID
desTask map[int32][]*cfg.GameWorldTaskData //key 分类
groupTask map[int32][]*cfg.GameWorldTaskData //key 任务组
opencmdTask map[int32][]*cfg.GameWorldTaskData //key 功能开启
daylock sync.RWMutex
daygroupTasks map[int32][]*cfg.GameAnnulartask_LibraryData //key 条件ID
evevtlock sync.RWMutex
@ -82,7 +82,7 @@ func (this *configureComp) updateconfigure() {
worldtaskConf := make(map[int32][]*cfg.GameWorldTaskData)
destaskConf := make(map[int32][]*cfg.GameWorldTaskData)
grouptaskConf := make(map[int32][]*cfg.GameWorldTaskData)
opencmdConf := make(map[string][]*cfg.GameWorldTaskData)
opencmdConf := make(map[int32][]*cfg.GameWorldTaskData)
for _, v := range gwt.GetDataList() {
if _, ok := destaskConf[v.Des]; !ok {
@ -95,11 +95,11 @@ func (this *configureComp) updateconfigure() {
}
grouptaskConf[v.Group] = append(grouptaskConf[v.Group], v)
if v.Opencond != "" {
if _, ok := opencmdConf[v.Opencond]; !ok {
opencmdConf[v.Opencond] = make([]*cfg.GameWorldTaskData, 0)
for _, v1 := range v.Opencond {
if _, ok := opencmdConf[v1]; !ok {
opencmdConf[v1] = make([]*cfg.GameWorldTaskData, 0)
}
opencmdConf[v.Opencond] = append(opencmdConf[v.Opencond], v)
opencmdConf[v1] = append(opencmdConf[v1], v)
}
for _, condl := range v.Completetask {
@ -164,7 +164,7 @@ func (this *configureComp) getgroupTask() map[int32][]*cfg.GameWorldTaskData {
return this.groupTask
}
func (this *configureComp) getopencmdTask() map[string][]*cfg.GameWorldTaskData {
func (this *configureComp) getopencmdTask() map[int32][]*cfg.GameWorldTaskData {
this.lock.RLock()
defer this.lock.RUnlock()
return this.opencmdTask

316
modules/wtask/module.go
View File

@ -73,117 +73,50 @@ func (this *WTask) OnInstallComp() {
// 埋点通知
func (this *WTask) BuriedsNotify(session comm.IUserSession, condis []*pb.ConIProgress) {
// var (
// condisMap map[int32]*pb.ConIProgress = make(map[int32]*pb.ConIProgress)
// utask *pb.DBWTask
// accepttaskMap map[int32]struct{} = make(map[int32]struct{})
// condlTask map[int32][]*cfg.GameWorldTaskData
// temptasks []*cfg.GameWorldTaskData
// changetasks map[int32]*cfg.GameWorldTaskData = make(map[int32]*cfg.GameWorldTaskData)
// checkcondlsMap map[int32]struct{} = make(map[int32]struct{})
// checkcondls []int32 = make([]int32, 0)
// detailstasks []*pb.DBWTaskItem = make([]*pb.DBWTaskItem, 0)
// ok bool
// needcheck bool //是否需要校验
// err error
// )
// this.Debug("收到子任务进度变化推送", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "condis", Value: condis})
// if utask, err = this.modelwtask.getUserWTasks(session.GetUserId()); err != nil {
// this.Error("读取玩家世界任务数据 失败", log.Field{Key: "err", Value: err.Error()})
// return
// }
// condlTask = this.configure.getcondlTask()
// for _, v := range condis {
// condisMap[v.Conid] = v
// }
// for _, v := range utask.Accepts {
// accepttaskMap[v] = struct{}{}
// }
// for _, v := range condis {
// if temptasks, ok = condlTask[v.Conid]; ok {
// for _, task := range temptasks {
// if _, ok = accepttaskMap[task.Key]; ok { //任务列表进度有变化
// if _, ok = changetasks[task.Key]; !ok {
// changetasks[task.Key] = task
// for _, cid := range task.Completetask {
// if _, ok = checkcondlsMap[cid]; !ok {
// checkcondlsMap[cid] = struct{}{}
// checkcondls = append(checkcondls, cid)
// }
// }
// }
// }
// }
// }
// }
// if len(changetasks) == 0 { //没有任务变化
// return
// }
// for k, _ := range checkcondlsMap {
// if _, ok = condisMap[k]; !ok {
// needcheck = true
// }
// }
// if needcheck { //校验有变化的任务 的完成条件
// if condis, err = this.ModuleBuried.CheckCondition(session, checkcondls...); err != nil {
// this.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()})
// return
// }
// for _, v := range condis {
// condisMap[v.Conid] = v
// }
// }
// //推送进度变化消息
// for k, v := range changetasks {
// task := &pb.DBWTaskItem{
// Tid: k,
// Conlds: make([]*pb.ConIProgress, len(v.Completetask)),
// }
// for i, v := range v.Completetask {
// task.Conlds[i] = condisMap[v]
// }
// detailstasks = append(detailstasks, task)
// }
// //发送进度变化消息
// session.SendMsg(string(this.GetType()), "acceptchange", &pb.WTaskAcceptChangePush{Accepts: detailstasks})
}
// 功能开启
func (this *WTask) OpenCmdNotice(session comm.IUserSession, keys ...string) {
this.Debug("收到子任务进度变化推送", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "condis", Value: condis})
var (
opencmdTask map[string][]*cfg.GameWorldTaskData
user *pb.DBUser
wtask *pb.DBWTask
err error
ok bool
wtask *pb.DBWTask
opencmdCondis map[int32][]*cfg.GameWorldTaskData
condisAll []int32
progress []*pb.ConIProgress
complete []int32
user *pb.DBUser
err error
errdata *pb.ErrorData
ok bool
)
//初步校验
opencmdTask = this.configure.getopencmdTask()
for _, key := range keys {
if _, ok = opencmdTask[key]; ok {
opencmdCondis = this.configure.getopencmdTask()
for _, condi := range condis {
if _, ok = opencmdCondis[condi.Conid]; ok {
break
}
}
if !ok {
return
}
if user, err = this.ModuleUser.GetUser(session.GetUserId()); err != nil {
this.Error("获取用户信息失败!", log.Field{Key: "uid", Value: session.GetUserId()})
return
for k, _ := range opencmdCondis {
condisAll = append(condisAll, k)
}
if wtask, err = this.modelwtask.getUserWTasks(session.GetUserId()); err != nil {
this.Error("获取世界任务数据 失败!", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "err", Value: err.Error()})
this.Error("读取玩家世界任务数据 失败", log.Field{Key: "err", Value: err.Error()})
return
}
this.inquireActivations(session, wtask, user.Lv, keys, true)
if _, progress, err = this.ModuleBuried.CheckCondition(session, condisAll...); err != nil {
this.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()})
return
}
for _, v := range progress {
if v.State == pb.BuriedItemFinishState_buried_finish {
complete = append(complete, v.Conid)
}
}
if user, err = this.GetUserForSession(session); err != nil {
return
}
if errdata = this.inquireActivations(session, wtask, user.Lv, complete, true); errdata != nil {
this.Error("查询任务失败", log.Field{Key: "err", Value: errdata.String()})
}
}
// 获取商队任务
@ -390,71 +323,6 @@ func (this *WTask) InquireCompletes(uid string) []int32 {
return completes
}
// 查询日常任务进度
// func (this *WTask) InquireTaskProgress(session comm.IUserSession, tasks ...int32) (progress []*pb.DBWTaskItem, errdata *pb.ErrorData) {
// var (
// checkcondlsMap map[int32]struct{} = make(map[int32]struct{})
// checkcondls []int32 = make([]int32, 0)
// conf *cfg.GameWorldTaskData
// condis []*pb.ConIProgress = make([]*pb.ConIProgress, 0)
// condisMap map[int32]*pb.ConIProgress = make(map[int32]*pb.ConIProgress)
// err error
// ok bool
// )
// for _, v := range tasks {
// if conf, err = this.configure.gettaskconfconfigure(v); err != nil {
// this.Errorln(err)
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ConfigNoFound,
// Title: pb.ErrorCode_ConfigNoFound.ToString(),
// Message: err.Error(),
// }
// return
// }
// for _, v := range conf.Completetask {
// if _, ok = checkcondlsMap[v]; !ok {
// checkcondlsMap[v] = struct{}{}
// checkcondls = append(checkcondls, v)
// }
// }
// }
// if len(checkcondls) > 0 {
// if _, condis, err = this.ModuleBuried.CheckCondition(session, checkcondls...); err != nil {
// this.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()})
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ExternalModule,
// Title: pb.ErrorCode_ExternalModule.ToString(),
// Message: fmt.Sprintf("ModuleBuried.CheckCondition Error:%s", err.Error()),
// }
// return
// }
// for _, v := range condis {
// condisMap[v.Conid] = v
// }
// }
// for _, v := range tasks {
// if conf, err = this.configure.gettaskconfconfigure(v); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ConfigNoFound,
// Title: pb.ErrorCode_ConfigNoFound.ToString(),
// Message: err.Error(),
// }
// return
// }
// task := &pb.DBWTaskItem{
// Tid: v,
// Conlds: make([]*pb.ConIProgress, len(conf.Completetask)),
// }
// for i, v := range conf.Completetask {
// task.Conlds[i] = condisMap[v]
// }
// progress = append(progress, task)
// }
// return
// }
// 清除商队任务
func (this *WTask) ClearCaravanTask(session comm.IUserSession, task int32) {
var (
@ -576,103 +444,21 @@ func (this *WTask) BingoJumpTask(session comm.IUserSession, taskId int32) (errda
return
}
// 校验任务进度
// func (this *WTask) pushtaskprogress(session comm.IUserSession, wtask *pb.DBWTask, ispush bool) (progress []*pb.DBWTaskItem, errdata *pb.ErrorData) {
// var (
// checkcondlsMap map[int32]struct{} = make(map[int32]struct{})
// checkcondls []int32 = make([]int32, 0)
// conf *cfg.GameWorldTaskData
// condis []*pb.ConIProgress = make([]*pb.ConIProgress, 0)
// condisMap map[int32]*pb.ConIProgress = make(map[int32]*pb.ConIProgress)
// err error
// ok bool
// )
// progress = make([]*pb.DBWTaskItem, 0)
// if len(wtask.Accepts) == 0 {
// return
// }
// for _, v := range wtask.Accepts {
// if conf, err = this.configure.gettaskconfconfigure(v); err != nil {
// this.Errorln(err)
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ConfigNoFound,
// Title: pb.ErrorCode_ConfigNoFound.ToString(),
// Message: err.Error(),
// }
// return
// }
// for _, v := range conf.Completetask {
// if _, ok = checkcondlsMap[v]; !ok {
// checkcondlsMap[v] = struct{}{}
// checkcondls = append(checkcondls, v)
// }
// }
// }
// if len(checkcondls) > 0 {
// if condis, err = this.ModuleBuried.CheckCondition(session, checkcondls...); err != nil {
// this.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()})
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ExternalModule,
// Title: pb.ErrorCode_ExternalModule.ToString(),
// Message: fmt.Sprintf("ModuleBuried.CheckCondition Error:%s", err.Error()),
// }
// return
// }
// for _, v := range condis {
// condisMap[v.Conid] = v
// }
// }
// for _, v := range wtask.Accepts {
// if conf, err = this.configure.gettaskconfconfigure(v); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ConfigNoFound,
// Title: pb.ErrorCode_ConfigNoFound.ToString(),
// Message: err.Error(),
// }
// return
// }
// task := &pb.DBWTaskItem{
// Tid: v,
// Conlds: make([]*pb.ConIProgress, len(conf.Completetask)),
// }
// ok = true
// for i, v := range conf.Completetask {
// task.Conlds[i] = condisMap[v]
// }
// progress = append(progress, task)
// }
// if ispush {
// session.SendMsg(string(this.GetType()), "acceptchange", &pb.WTaskAcceptChangePush{Accepts: progress})
// }
// return
// }
// 完成任务
func (this *WTask) fishtask(session comm.IUserSession, wtask *pb.DBWTask, ispush bool) (progress []*pb.DBWTaskItem, errdata *pb.ErrorData) {
func (this *WTask) fishtask(session comm.IUserSession, wtask *pb.DBWTask, ispush bool) (errdata *pb.ErrorData) {
var (
opencmdMap map[string]int32
opencmd []string
user *pb.DBUser
err error
opencmd []int32 = make([]int32, 0)
user *pb.DBUser
err error
)
if opencmdMap, errdata = this.sys.QueryOpenCondData(session.GetUserId()); errdata != nil {
this.Error("查询用户功能是否开启表 失败!", log.Field{Key: "key", Value: errdata})
return
}
opencmd = make([]string, 0)
for k, v := range opencmdMap {
if v == 2 {
opencmd = append(opencmd, k)
if user, err = this.GetUserForSession(session); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Message: err.Error(),
}
}
if user, err = this.ModuleUser.GetUser(session.GetUserId()); err != nil {
this.Error("获取用户信息失败!", log.Field{Key: "uid", Value: session.GetUserId()})
return
}
progress, errdata = this.inquireActivations(session, wtask, user.Lv, opencmd, ispush)
errdata = this.inquireActivations(session, wtask, user.Lv, opencmd, ispush)
return
}
@ -703,15 +489,15 @@ func (this *WTask) checkgroupState(session comm.IUserSession, wtask *pb.DBWTask,
}
// 查询可接取任务列表
func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTask, lv int32, opencmd []string, ispush bool) (progress []*pb.DBWTaskItem, errdata *pb.ErrorData) {
func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTask, lv int32, opencmd []int32, ispush bool) (errdata *pb.ErrorData) {
var (
conf *cfg.GameWorldTask
err error
activatMap map[int32]struct{} = make(map[int32]struct{})
acceptsMap map[int32]struct{} = make(map[int32]struct{})
completeMap map[int32]struct{} = make(map[int32]struct{})
opencmdMap map[string]struct{} = make(map[string]struct{})
condiIds []int32 = make([]int32, 0)
activatMap map[int32]struct{} = make(map[int32]struct{})
acceptsMap map[int32]struct{} = make(map[int32]struct{})
completeMap map[int32]struct{} = make(map[int32]struct{})
opencmdMap map[int32]struct{} = make(map[int32]struct{})
condiIds []int32 = make([]int32, 0)
ok bool
changeActiva bool
changeAccept bool
@ -744,9 +530,16 @@ func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTa
if lv < v.Lock || lv > v.Lockend { //等级不符合
continue
}
if _, ok = opencmdMap[v.Opencond]; v.Opencond != "" && !ok { //功能未开启
ok = true
for _, v1 := range v.Opencond {
if _, ok = opencmdMap[v1]; !ok { //功能未开启
break
}
}
if !ok {
continue
}
if _, ok = completeMap[v.Ontxe]; v.Ontxe != 0 && !ok { //前置任务判断
continue
}
@ -772,7 +565,6 @@ func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTa
if errdata = this.ModuleBuried.ActiveCondition(session, condiIds...); err != nil {
return
}
// progress, errdata = this.pushtaskprogress(session, wtask, ispush)
}
return
}

17
sys/configure/structs/Game.HuntingBossData.go
View File

@ -15,6 +15,8 @@ type GameHuntingBossData struct {
Type int32
Name string
Difficulty int32
SweepId int32
SweepOpenId []int32
BattleReadyID int32
Firstprize []*Gameatn
Dropshow []*Gameatn
@ -38,6 +40,21 @@ func (_v *GameHuntingBossData)Deserialize(_buf map[string]interface{}) (err erro
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
{var _ok_ bool; var __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 _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["difficulty"].(float64); !_ok_ { err = errors.New("difficulty error"); return }; _v.Difficulty = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sweepId"].(float64); !_ok_ { err = errors.New("sweepId error"); return }; _v.SweepId = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["sweepOpenId"].([]interface{}); !_ok_ { err = errors.New("sweepOpenId error"); return }
_v.SweepOpenId = make([]int32, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ int32
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
_v.SweepOpenId = append(_v.SweepOpenId, _list_v_)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) }
{
var _arr_ []interface{}

17
sys/configure/structs/Game.VikingBossData.go
View File

@ -16,6 +16,8 @@ type GameVikingBossData struct {
Bossid int32
Name string
Difficulty int32
SweepId int32
SweepOpenId []int32
BattleReadyID int32
Captionrecommend []int32
Firstprize []*Gameatn
@ -43,6 +45,21 @@ func (_v *GameVikingBossData)Deserialize(_buf map[string]interface{}) (err error
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bossid"].(float64); !_ok_ { err = errors.New("bossid error"); return }; _v.Bossid = 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 _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["difficulty"].(float64); !_ok_ { err = errors.New("difficulty error"); return }; _v.Difficulty = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sweepId"].(float64); !_ok_ { err = errors.New("sweepId error"); return }; _v.SweepId = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["sweepOpenId"].([]interface{}); !_ok_ { err = errors.New("sweepOpenId error"); return }
_v.SweepOpenId = make([]int32, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ int32
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
_v.SweepOpenId = append(_v.SweepOpenId, _list_v_)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) }
{
var _arr_ []interface{}

17
sys/configure/structs/Game.WorldTaskData.go
View File

@ -12,7 +12,7 @@ import "errors"
type GameWorldTaskData struct {
Key int32
Opencond string
Opencond []int32
Lock int32
Lockend int32
Ontxe int32
@ -50,7 +50,20 @@ func (*GameWorldTaskData) GetTypeId() int32 {
func (_v *GameWorldTaskData)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.Opencond, _ok_ = _buf["opencond"].(string); !_ok_ { err = errors.New("opencond error"); return } }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["opencond"].([]interface{}); !_ok_ { err = errors.New("opencond error"); return }
_v.Opencond = make([]int32, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ int32
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
_v.Opencond = append(_v.Opencond, _list_v_)
}
}
{ 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["lockend"].(float64); !_ok_ { err = errors.New("lockend error"); return }; _v.Lockend = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ontxe"].(float64); !_ok_ { err = errors.New("ontxe error"); return }; _v.Ontxe = int32(_tempNum_) }

1
sys/configure/structs/TEnum.ETrackType.go
View File

@ -11,4 +11,5 @@ package cfg
const (
TEnumETrackType_Normal = 1
TEnumETrackType_Guide = 2
TEnumETrackType_Speed = 3
)

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

@ -218,6 +218,7 @@ type GameGlobalData struct {
BuzkashiCatchspeed int32
BuzkashiCatchqtetime int32
BuzkashiRecentPlayer int32
BuzkashiTrackpartdis int32
TaskActivation int32
FavorabilityAttenuation []*Gamekv
Mounts string
@ -921,6 +922,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_catchspeed"].(float64); !_ok_ { err = errors.New("buzkashi_catchspeed error"); return }; _v.BuzkashiCatchspeed = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_catchqtetime"].(float64); !_ok_ { err = errors.New("buzkashi_catchqtetime error"); return }; _v.BuzkashiCatchqtetime = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_recentPlayer"].(float64); !_ok_ { err = errors.New("buzkashi_recentPlayer error"); return }; _v.BuzkashiRecentPlayer = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_trackpartdis"].(float64); !_ok_ { err = errors.New("buzkashi_trackpartdis error"); return }; _v.BuzkashiTrackpartdis = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["task_activation"].(float64); !_ok_ { err = errors.New("task_activation error"); return }; _v.TaskActivation = int32(_tempNum_) }
{
var _arr_ []interface{}

15
sys/configure/structs/game.opencondData.go
View File

@ -14,6 +14,7 @@ type GameOpencondData struct {
Id string
Name string
Main []*GameOpenedCond
Opencondi []int32
Wkqbx int32
Img string
Prompt string
@ -48,6 +49,20 @@ func (_v *GameOpencondData)Deserialize(_buf map[string]interface{}) (err error)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["opencondi"].([]interface{}); !_ok_ { err = errors.New("opencondi error"); return }
_v.Opencondi = make([]int32, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ int32
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
_v.Opencondi = append(_v.Opencondi, _list_v_)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["wkqbx"].(float64); !_ok_ { err = errors.New("wkqbx error"); return }; _v.Wkqbx = int32(_tempNum_) }
{ var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["prompt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Prompt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Prompt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }