活动：修改显示逻辑

game-server/app/servers/activity/handler/activityHandler.ts

@@ -42,7 +42,7 @@ export class ActivityHandler {
                 let activityData = await getActivityById(activityId);
                 if (activityData) {
                     let playerActivityData = await getActivity(serverId, roleId, activityId, activityData.type);
-                    if(playerActivityData && playerActivityData.beginTime <= Date.now() && playerActivityData.endTime >= Date.now()) {
+                    if(playerActivityData && playerActivityData.canShow && playerActivityData.canShow()) {
                         playerGroupActivityArray.push(playerActivityData);
                     }
                 }

game-server/app/servers/role/handler/friendHandler.ts

@@ -417,7 +417,12 @@ export class FriendHandler {
                 if (!friend) {
                     str = getResStr(STATUS.FRIEND_HIS_APPLY_MAX);
                 } else {
-                    await FriendApplyModel.createApply(hisRoleId, role);
+                    let apply = await FriendApplyModel.createApply(hisRoleId, role);
+                    let hisOnlineInfo = await getRoleOnlineInfo(hisRoleId);
+                    if(hisOnlineInfo) {
+                        let myApply = await getMyApplyParam(apply.applyCode, role);
+                        this.channelService.pushMessageByUids('onFriendApply', resResult(STATUS.SUCCESS, { apply: myApply }), [{uid: hisRoleId, sid: hisOnlineInfo.sid}]);
+                    }
                 }
             }
             blackRoleIds.push(roleId);

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

@@ -66,14 +66,14 @@ export async function getActivity(serverId: number, roleId: string, activityId:
             {
                 let data = await getPlayerThirtyDaysData(activityId, serverId, roleId);
                 let todayIndex = await playerThirtyDaysActivityDays(roleId);
-                activityData = { playerData: data, todayIndex, beginTime: data.beginTime, endTime: data.endTime }
+                activityData = { playerData: data, todayIndex, canShow: () => data.canShow }
                 break;
             }
         case ACTIVITY_TYPE.SELF_SERVICE_SHOP://自选商店 糜家商队 13
             {
                 let data = await getPlayerActivityData(activityId, serverId, roleId);
                 let playerGoods = await ActivitySelfServiceGoodsModel.findData(activityId, roleId, data.roundIndex, true);
-                activityData = { playerData: data, playerGoods: playerGoods ? playerGoods : [], beginTime: data.beginTime, endTime: data.endTime }
+                activityData = { playerData: data, playerGoods: playerGoods ? playerGoods : [], canShow: () => data.canShow }
                 break;
             }
         case ACTIVITY_TYPE.FIRST_GIFT://首冲礼包活动 14

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

@@ -55,6 +55,7 @@ export async function getPlayerPopUpShopData(activityId: number, serverId: numbe
             }
         }
     }
+    allPlayerShop['canShow'] = () => true;
     return allPlayerShop;
 }