镇念塔：一键跳关

game-server/app/services/activity/activityService.ts

@@ -38,6 +38,7 @@ import { ActivityTaskPointModel } from '../../db/ActivityTaskPoint';
 import { getRoleOnlineInfo } from '../redisService';
 import { addTaskPassPoint } from './taskPassService';
 import { getGuildChannelSid } from '../chatService';
+import { getGuildPayDataShow } from './guildPayService';
 
 /**
    * 获取活动数据
@@ -203,7 +204,7 @@ export async function getActivity(serverId: number, roleId: string, guildCode: s
             }
         case ACTIVITY_TYPE.GUILD_PAY:
             {
-
+                activityData = await getGuildPayDataShow(serverId, activityId, roleId, guildCode);
             }
         default: {
             console.log('未知活动类型.........', activityType)

game-server/app/services/activity/monthlyTicketService.ts

@@ -214,4 +214,11 @@ export function getVipRegretCnt(vipStartTime: number) {
         count = VIP.VIP_REGRET_CNT_WITH_VIP;
     }
     return count;
+}
+
+export function vipCanSkipTower(recommendCeSum: number, heroesCeSum: number, vipStartTime: number) {
+    console.log('####', recommendCeSum, heroesCeSum, vipStartTime, );
+    let ratio = vipStartTime > 0? VIP.VIP_TOWER_SKIP_CE_RATIO_WITH_VIP: VIP.VIP_TOWER_SKIP_CE_RATIO_WITHOUT_VIP;
+    console.log('#####', VIP.VIP_TOWER_SKIP_CE_RATIO_WITH_VIP, VIP.VIP_TOWER_SKIP_CE_RATIO_WITHOUT_VIP, ratio)
+    return heroesCeSum > recommendCeSum * ratio;
 }