xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

好友：查看他人主线

Browse Source
This commit is contained in:
luying
2022-04-29 15:53:51 +08:00
parent 8b76be56bf
commit c063b2d135
5 changed files with 490 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
game-server/app/services/task/taskObj.ts
View File

@@ -660,7 +660,7 @@ export class CheckSingleTask {
{
let { warId, battleStar } = param;
let dicWar = gameData.war.get(warId);
if (dicWar.warType == WAR_TYPE.DAILY && (dicTaskParam[0] == 0|| dicTaskParam[0] == battleStar) && this.checkIdList(dicTaskParam, 2, warId)) {
if (dicWar.warType == WAR_TYPE.DAILY && (dicTaskParam[0] == 0|| battleStar >= dicTaskParam[0]) && this.checkIdList(dicTaskParam, 2, warId)) {
result = { inc: 1 }
}
break;

2
shared/domain/battleField/guild.ts
View File

@@ -75,7 +75,7 @@ class PlayerDetailBattle {
}
let curDicWar = gameData.war.get(main);
if(curDicWar) {
this.main = curDicWar.detailUIBg;
this.main.push(`${curDicWar.chapter}`, `${curDicWar.section}`);
}
this.pvp.push(pvp.toString());
this.tower.push(tower.toString());

12
shared/pubUtils/dictionary/DicWar.ts
View File

@@ -19,6 +19,8 @@ export interface DicWar {
readonly gk_name: string;
// 章节id
readonly chapter: number;
// 关卡id
readonly section: number;
// 胜利后获得的君主经验
readonly kingExp: number;
// 进入战场所需的最低等级
@@ -29,8 +31,6 @@ export interface DicWar {
readonly previousGk: number;
// 每日任务下的小类型
readonly dailyType: number;
// 显示章节名
readonly detailUIBg: string[];
// 寻宝匹配json
readonly dispatchJsonId: number;
// 寻宝奖励
@@ -73,7 +73,6 @@ export function loadWar() {
o.fixReward = parseFixReward(o.fixReward);
o.conditionReward = parseConditionReward(o.conditionReward);
o.randomReward = parseRandomReward(o.RandomReward||o.randomReward);
o.detailUIBg = parseDetailUIBg(o.detailUIBg);
o.jackpotReward = parseJackpotReward(o.jackpotReward);
o.teammateReward = parseFixReward(o.teammateReward);
o.fobiddenCharactor = parseForbiddenChara(o.fobiddenCharactor);
@@ -146,13 +145,6 @@ function parseRandomReward(str: string = '') {
return result
}
function parseDetailUIBg(str: string = '') {
let result = new Array<string>();
if(!str) return result;
let decodeArr = decodeArrayStr(str, '_');
return decodeArr;
}
function parseJackpotReward(str: string = '') {
let result = new Array<{id: number, weight: number}>();
if(!str) return result;

158
shared/resource/jsons/dic_goods.json
View File

@@ -1128,7 +1128,7 @@
"getWays": "&",
"useWays": "&",
"value": 0,
"condition": "3&1",
"condition": "&",
"timelimit": 0,
"gift": 0,
"info": "挚友头像框"
@@ -1146,7 +1146,7 @@
"getWays": "&",
"useWays": "&",
"value": 0,
"condition": "3&2",
"condition": "&",
"timelimit": 0,
"gift": 0,
"info": "常规头像框"
@@ -1164,10 +1164,10 @@
"getWays": "&",
"useWays": "&",
"value": 0,
"condition": "3&3",
"condition": "&",
"timelimit": 0,
"gift": 0,
"info": "第一军团军团成员专属头像框"
"info": "第一军团军团成员专属"
},
{
"good_id": 11305,
@@ -1182,10 +1182,10 @@
"getWays": "&",
"useWays": "&",
"value": 0,
"condition": "3&4",
"condition": "&",
"timelimit": 0,
"gift": 0,
"info": "第二军团军团成员专属头像框"
"info": "第二军团军团成员专属"
},
{
"good_id": 11306,
@@ -1200,14 +1200,14 @@
"getWays": "&",
"useWays": "&",
"value": 0,
"condition": "3&5",
"condition": "&",
"timelimit": 0,
"gift": 0,
"info": "第三军团军团成员专属头像框"
"info": "第三军团军团成员专属"
},
{
"good_id": 11307,
"name": "魁首军团头像框（大将军）",
"name": "魁首军团头像框",
"quality": 5,
"image_id": "jun3_tuan",
"itid": 51,
@@ -1218,14 +1218,14 @@
"getWays": "&",
"useWays": "&",
"value": 0,
"condition": "6&1",
"condition": "&",
"timelimit": 0,
"gift": 0,
"info": "第一军团军团大将军专属头像框"
"info": "第一军团军团大将军专属"
},
{
"good_id": 11308,
"name": "亚军军团头像框（大将军）",
"name": "亚军军团头像框",
"quality": 4,
"image_id": "jun2_tuan",
"itid": 51,
@@ -1236,14 +1236,14 @@
"getWays": "&",
"useWays": "&",
"value": 0,
"condition": "6&2",
"condition": "&",
"timelimit": 0,
"gift": 0,
"info": "第二军团军团大将军专属头像框"
"info": "第二军团军团大将军专属"
},
{
"good_id": 11309,
"name": "季军军团头像框（大将军）",
"name": "季军军团头像框",
"quality": 3,
"image_id": "jun1_tuan",
"itid": 51,
@@ -1254,118 +1254,10 @@
"getWays": "&",
"useWays": "&",
"value": 0,
"condition": "6&3",
"condition": "&",
"timelimit": 0,
"gift": 0,
"info": "第三军团军团大将军专属头像框"
},
{
"good_id": 11310,
"name": "独断九州头像框",
"quality": 1,
"image_id": 12530,
"itid": 51,
"goodType": 10,
"redPoint": 0,
"decomposeItem": "&",
"hid": 0,
"getWays": "&",
"useWays": "&",
"value": 0,
"condition": "6&4",
"timelimit": 0,
"gift": 0,
"info": "独断九州的头像框"
},
{
"good_id": 11311,
"name": "荷塘月色头像框",
"quality": 1,
"image_id": 12530,
"itid": 51,
"goodType": 10,
"redPoint": 0,
"decomposeItem": "&",
"hid": 0,
"getWays": "&",
"useWays": "&",
"value": 0,
"condition": "5&1",
"timelimit": 0,
"gift": 0,
"info": "荷塘月色的头像框"
},
{
"good_id": 11312,
"name": "天下无双头像框",
"quality": 1,
"image_id": 12530,
"itid": 51,
"goodType": 10,
"redPoint": 0,
"decomposeItem": "&",
"hid": 0,
"getWays": "&",
"useWays": "&",
"value": 0,
"condition": "5&2",
"timelimit": 0,
"gift": 0,
"info": "青青子衿的头像框"
},
{
"good_id": 11313,
"name": "万军莫敌头像框",
"quality": 1,
"image_id": 12530,
"itid": 51,
"goodType": 10,
"redPoint": 0,
"decomposeItem": "&",
"hid": 0,
"getWays": "&",
"useWays": "&",
"value": 0,
"condition": "5&3",
"timelimit": 0,
"gift": 0,
"info": "杨柳依依的头像框"
},
{
"good_id": 11314,
"name": "威震华夏头像框",
"quality": 1,
"image_id": 12530,
"itid": 51,
"goodType": 10,
"redPoint": 0,
"decomposeItem": "&",
"hid": 0,
"getWays": "&",
"useWays": "&",
"value": 0,
"condition": "5&4",
"timelimit": 0,
"gift": 0,
"info": "冬雪飘飘的头像框"
},
{
"good_id": 11315,
"name": "新年大吉头像框",
"quality": 1,
"image_id": 12530,
"itid": 51,
"goodType": 10,
"redPoint": 0,
"decomposeItem": "&",
"hid": 0,
"getWays": "&",
"useWays": "&",
"value": 0,
"condition": "5&5",
"timelimit": 0,
"gift": 0,
"info": "新年大吉的头像框"
"info": "第三军团军团大将军专属"
},
{
"good_id": 11316,
@@ -1380,7 +1272,7 @@
"getWays": "&",
"useWays": "&",
"value": 0,
"condition": "5&6",
"condition": "&",
"timelimit": 0,
"gift": 0,
"info": "封测专属纪念头像框"
@@ -1398,7 +1290,7 @@
"getWays": "&",
"useWays": "&",
"value": 0,
"condition": "5&7",
"condition": "&",
"timelimit": 0,
"gift": 0,
"info": "第一赛季纪念头像框"
@@ -1416,10 +1308,10 @@
"getWays": "&",
"useWays": "&",
"value": 0,
"condition": "4&1",
"condition": "&",
"timelimit": 0,
"gift": 0,
"info": "第一赛季冠军头像框"
"info": "第一赛季冠军专属"
},
{
"good_id": 11319,
@@ -1434,10 +1326,10 @@
"getWays": "&",
"useWays": "&",
"value": 0,
"condition": "4&2",
"condition": "&",
"timelimit": 0,
"gift": 0,
"info": "第一赛季亚军头像框"
"info": "第一赛季亚军专属"
},
{
"good_id": 11320,
@@ -1452,10 +1344,10 @@
"getWays": "&",
"useWays": "&",
"value": 0,
"condition": "4&3",
"condition": "&",
"timelimit": 0,
"gift": 0,
"info": "第一赛季季军头像框"
"info": "第一赛季季军专属"
},
{
"good_id": 11401,

739
shared/resource/jsons/dic_zyz_gk_main.json
View File

File diff suppressed because it is too large Load Diff