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

红点：修复练兵场

Browse Source
This commit is contained in:
luying
2021-06-18 10:56:41 +08:00
parent 7132468b86
commit c01dde6e76
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/connectorService.ts
+1 -2
View File
@@ -72,7 +72,6 @@ export async function pushData(role: RoleType, session: FrontendOrBackendSession
let { role, session } = data; let { role, session } = data;
const { roleId, serverId, roleName, guildCode } = role; const { roleId, serverId, roleName, guildCode } = role;
let { hasGuild, guild, userGuild, guildResult } = guildData; let { hasGuild, guild, userGuild, guildResult } = guildData;
console.log('*********', type)
switch(type) { switch(type) {
case 'shop': // 商店 case 'shop': // 商店
return await getAllShopList(roleId); return await getAllShopList(roleId);
@@ -198,7 +197,7 @@ async function getPvpEntryData(roleId: string) {
async function getGuildEntryData(role: RoleType, sid: string, session: FrontendOrBackendSession) { async function getGuildEntryData(role: RoleType, sid: string, session: FrontendOrBackendSession) {
if (role.hasGuild) { if (role.hasGuild) {
let userGuild = await getUserGuildWithRefActive(role.roleId, 'job auth guildCode receivedActive activeRecord activeDaily activeWeekly wishDntCnt wishGoods'); let userGuild = await getUserGuildWithRefActive(role.roleId);
if (userGuild) { if (userGuild) {
let guild = await getGuildWithRefActive(userGuild.guildCode, role.serverId); let guild = await getGuildWithRefActive(userGuild.guildCode, role.serverId);
if (guild) { if (guild) {
game-server/app/services/guildService.ts
+1 -1
View File
@@ -214,7 +214,7 @@ export async function addActive(roleId: string, serverId: number, id: number, ty
* @param roleId 用户id * @param roleId 用户id
* @param select 筛选字段 * @param select 筛选字段
*/ */
export async function getUserGuildWithRefActive(roleId: string, select: string, notPush?: boolean) { export async function getUserGuildWithRefActive(roleId: string, select?: string, notPush?: boolean) {
let userGuild = await UserGuildModel.getMyGuild(roleId, select ? select + ' wishGoods +refTimeDaily' : '+refTimeDaily'); let userGuild = await UserGuildModel.getMyGuild(roleId, select ? select + ' wishGoods +refTimeDaily' : '+refTimeDaily');
// console.log(JSON.stringify(userGuild)) // console.log(JSON.stringify(userGuild))
if (!userGuild) return false; if (!userGuild) return false;