军团相关战力使用get方法

game-server/app/services/guildService.ts

@@ -36,7 +36,7 @@ export async function checkAuth(func: number, roleId: string, code?: string, use
  * @param lv 公会当前等级，判断人数用
  * @param roleId 加入的玩家
  */
-export async function joinGuild(code: string, lv: number, roleId: string, serverId: number) {
+export async function joinGuild(code: string, guildName: string, lv: number, roleId: string, serverId: number) {
 
     // 周结算锁
     let isWeeklySum = await isLocked(serverId, GUILD_DATA_NAME.WEEKLY_GUILD_SUM, code);
@@ -46,7 +46,7 @@ export async function joinGuild(code: string, lv: number, roleId: string, server
     let res:any = await lockData(serverId, GUILD_DATA_NAME.JOIN_GUILD, code);// 加锁
     if (!!res.err) return { status: 0, resResult: resResult(STATUS.REDLOCK_ERR) };
     
-    const result = await RoleModel.joinGuild(roleId);
+    const result = await RoleModel.joinGuild(roleId, code, guildName);
     if(!result) {
         res.releaseCallback();//解锁
         return { status: 0, resResult: resResult(STATUS.GUILD_HAS_JOIN) };

game-server/app/services/playerEventService.ts

@@ -6,14 +6,14 @@ import { RoleModel } from '../db/Role';
 
 export async function eventOnPlayerLvUp(roleId: string, lv: number, addFuncs: Array<number>, dataFuncs: Array<number>) {
 
-    // if (!dataFuncs.includes(FUNCS_ID.PVP)) {//开启pvp
+    if (!dataFuncs.includes(FUNCS_ID.PVP)) {//开启pvp
         let res = getFuncsSwitch(FUNCS_ID.PVP);
         if (!res || lv >= res.param) {
             let role = await RoleModel.findByRoleId(roleId);
             await checkPvp(role);
             addFuncs.push(FUNCS_ID.PVP);
         } 
-    // }    
+    }    
     
     if (!dataFuncs.includes(FUNCS_ID.EVENT)) {//开启奇遇
         let res = getFuncsSwitch(FUNCS_ID.EVENT);