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

军团：bug修复

Browse Source
This commit is contained in:
luying
2021-09-26 18:43:49 +08:00
parent 023490c642
commit e952580ac8
9 changed files with 52 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
shared/consts/constModules/chatConst.ts
View File

@@ -54,7 +54,8 @@ export const MSG_SOURCE = {
EQUIP_REFRESH_BEST: 20,
ACQUIRE_RARE_GOODS: 21,
GROUP_SEND_GIFT: 22,
SEND_MARQUEE: 23
SEND_MARQUEE: 23,
GUILD_RECURIT: 24,
}
export const ON_PRIVATE_MSG_ROUTE = 'onPrivateMessage';

7
shared/db/UserGuild.ts
View File

@@ -88,6 +88,9 @@ export default class UserGuild extends BaseModel {
@prop({ required: true, default: [], type: WishGood, _id: false })
wishGoods: Array<WishGood>;
@prop({ required: true, default: [], type: Number })
receivedWishPool: number[];
@prop({ required: true, default: 0 })
wishDntCnt: number;//今天许愿池捐献次数
@@ -127,12 +130,12 @@ export default class UserGuild extends BaseModel {
public static async createUserGuild(guildCode: string, role: RoleType, isLeader: boolean) {
const lastGuild = await UserGuildModel.findMyLastGuild(role.roleId);
let { receiveBoxs = [], donateCnt = 0, receivedActive = [], encourageCnt = 0, bossChallengeCnt = 0 } = lastGuild||{};
let { receiveBoxs = [], donateCnt = 0, receivedActive = [], encourageCnt = 0, bossChallengeCnt = 0, receivedWishPool = [] } = lastGuild||{};
const doc = new UserGuildModel();
let job = isLeader? GUILD_JOB.DAJIANGJUN: GUILD_JOB.SHIBING;
let auth = isLeader? GUILD_AUTH.LEADER: GUILD_AUTH.MEMBER;
const update = Object.assign(doc.toJSON(), { guildCode, roleId: role.roleId, role: role._id, job, auth, receiveBoxs, donateCnt, receivedActive, encourageCnt, bossChallengeCnt });
const update = Object.assign(doc.toJSON(), { guildCode, roleId: role.roleId, role: role._id, job, auth, receiveBoxs, donateCnt, receivedActive, encourageCnt, bossChallengeCnt, receivedWishPool });
delete update._id;
const result: UserGuildType = await UserGuildModel.findOneAndUpdate({ roleId: role.roleId, guildCode, status: USER_GUILD_STATUS.ON }, update, { upsert: true, new: true })
.select('activeDaily activeRecord activeWeekly activeUpdateTime job auth receivedActive guildCode')

2
shared/pubUtils/dictionary/DicTrainSoloReward.ts
View File

@@ -7,7 +7,6 @@ export interface DicTrainSoloReward {
readonly id: number;
// 目标品质
readonly ratio: number;
readonly winScore: number;
readonly failScore: number;
readonly winHonour: number;
@@ -17,7 +16,6 @@ export interface DicTrainSoloReward {
const DicTrainSoloRewardKeys: KeysEnum<DicTrainSoloReward> = {
id: true,
ratio: true,
winScore: true,
failScore: true,
winHonour: true,

10
shared/resource/jsons/dic_zyz_chat_system.json
View File

@@ -148,7 +148,7 @@
"name": "TEAM_INVITE",
"mean": "组队一键邀请",
"type": "2&3",
"template": "<color=#c08834>%d</color><color=#a49a48>发起组队邀请，诚邀各路侠士加入</color><color=#a49a48>%d</color><color=#a49a48>寻宝队伍，</color><color=#2f9b00><on click=%d>[加入]</on></color>",
"template": "<color=#c08834>%d</color><color=#a49a48>发起组队邀请，诚邀各路侠士加入</color><color=#a49a48> %d</color><color=#a49a48>寻宝队伍，</color><color=#2f9b00><on click=%d>[加入]</on></color>",
"comments": "1:%d(发出组队邀请的玩家名)；2:%d(藏宝图对应的关卡名); 3:%d(跳转链接)"
},
{
@@ -190,5 +190,13 @@
"type": "1&",
"template": "%d",
"comments": "&"
},
{
"id": 24,
"name": "GUILD_RECURIT",
"mean": "军团招募",
"type": "2&",
"template": "<color=#c08834>%d</color><color=#a49a48>正在招兵买马，诚邀各路侠士加入！<color=#2f9b00><on click=%d>[前往]</on></color>",
"comments": "1:%d(军团名)"
}
]