活动：时间

2022-03-23 13:54:04 +08:00
parent 29c5ae8a0a
commit 7bb8250060
70 changed files with 456 additions and 342 deletions
@@ -212,6 +212,7 @@ export enum REDIS_KEY {
    GUILD_INFO ="guildInfo", // 公会信息
    GUILD_ACTIVE_RANK ="guildActiveRank", // 公会周活跃排行榜
    SERVER ='server',                // 服务器列表
+    SERVER_OPEN_TIME = 'serverOpenTime', // 服务器开服时间
    ONLINE_USERS ='onlineUsers',        // 在线用户情况
    ONLINE_TIME ='onlineTime',          // 玩家在线时间
    CHANNEL_SERVERS ='chat:channelServers',        // 渠道对应的 chat 服务器 Id,
@@ -46,7 +46,7 @@ export abstract class ActivityBase {
        }
    }

-    constructor(activityData: ActivityModelType, createTime: number, serverTime?: number) {
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
        this.activityId = activityData.activityId;
        this.groupId = activityData.groupId;
        this.delayDay = activityData.delayDay ? activityData.delayDay : 0;
@@ -62,7 +62,7 @@ export abstract class ActivityBase {
        console.log('***** activityData', activityData.timeType)
        switch (activityData.timeType) {
            case ACTIVITY_TIME_TYPE.SERVER_OPEN_TIME: {
-                this.beginTime = moment(serverTime).add(this.delayDay, 'd').startOf('d').add(REFRESH_TIME, 'h').valueOf();
+                this.beginTime = moment(serverTime * 1000).add(this.delayDay, 'd').startOf('d').add(REFRESH_TIME, 'h').valueOf();
                if (activityData.days > 0) {
                    this.endTime = moment(this.beginTime).add(activityData.days, 'd').valueOf();
                } else {
@@ -73,8 +73,8 @@ export class DailyChallengesData extends ActivityBase {
        }
    }

-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime)
        this.initData(activityData.data)
    }
 }
@@ -110,8 +110,8 @@ export class DailyCoinData extends ActivityBase {

    }

-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime)
        this.initData(activityData.data)
    }
 }
@@ -55,8 +55,8 @@ export class DailyGKData extends ActivityBase {
        }
    }

-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime)
        this.initData(activityData.data)
    }
 }
@@ -72,8 +72,8 @@ export class DailyGiftsData extends ActivityBase {
        }
    }

-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime)
        this.initData(activityData.data)
    }
 }
@@ -66,8 +66,8 @@ export class DailyMealData extends ActivityBase {
        // console.log('ddddddddddddbbbbbbb')
    }

-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime);
        this.initData(activityData.data)
    }
 }
@@ -100,8 +100,8 @@ export class DailyRMBGiftsData extends ActivityBase {
        }
    }

-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime)
        this.initData(activityData.data)
    }
 }
@@ -143,8 +143,8 @@ export class FirstGiftData extends ActivityBase {
        }
    }

-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime)
        this.initData(activityData.data)
    }
 }
@@ -38,8 +38,8 @@ export class GachaData extends ActivityBase {
        this.floor = userGacha.floor;
    }

-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime)
    }
 }

@@ -149,8 +149,8 @@ export class GrowthData extends ActivityBase {
        }
    }

-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime)
        this.initData(activityData.data)
    }
 }
@@ -164,7 +164,7 @@ export class GrowthFundData extends ActivityBase {
        }
    }

-    constructor(activityData: ActivityModelType, createTime: number, serverTime?: number) {
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
        super(activityData, createTime, serverTime)
        this.initData(activityData.data)
    }
@@ -42,7 +42,7 @@ export class GuildPayData extends ActivityBase {
    payMemberCnt: number = 0;
    payRecord: string[] = [];

-    constructor(activityData: ActivityModelType, createTime: number, serverTime?: number) {
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
        super(activityData, createTime, serverTime)
        this.initData(activityData.data)
    }
@@ -90,8 +90,8 @@ export class LimitShopData extends ActivityBase {
        }
    }

-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime)
        this.initData(activityData.data)
    }
 }
@@ -182,8 +182,8 @@ export class LuckyTurntableData extends ActivityBase {
        }
    }

-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime)
        this.initData(activityData.data)
    }
 }
@@ -68,8 +68,8 @@ export class MonopolyData extends ActivityBase {
        }
    }

-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime)
        this.initData(activityData.data)
    }
 }
@@ -36,8 +36,8 @@ export class MonthlyTicketData extends ActivityBase {
    isOpen: boolean = false;  // 是否开启中
    todayIndex: number = 0;   // 现在可以领取第几天的奖励

-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime)
        this.initData(activityData.data);
        this.isForever = activityData.type == ACTIVITY_TYPE.MONTHLY_TICKET_2;
    }
@@ -97,8 +97,8 @@ export class NewHeroGKData extends ActivityBase {
        }
    }

-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime)
        this.initData(activityData.data)
    }
 }
@@ -72,8 +72,8 @@ export class NewHeroGachaData extends ActivityBase {

    }

-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime)
        this.initData(activityData.data)
    }
 }
@@ -64,8 +64,8 @@ export class NewHeroGiftData extends ActivityBase {
        }
    }

-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime)
        this.initData(activityData.data)
    }
 }
@@ -61,7 +61,7 @@ export class PopUpShopData extends ActivityBase {
    maxPrice: number = 0;       // 礼包上限

    constructor(activityData: ActivityModelType) {
-        super(activityData, 0);
+        super(activityData, 0, 0);
        this.initData(activityData.data)
    }

@@ -134,8 +134,8 @@ export class RechargeMoneyData extends ActivityBase {
        }
    }

-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime)
        this.initData(activityData.data)
    }
 }
@@ -169,8 +169,8 @@ export class RefreshShopData extends ActivityBase {
        }
    }

-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime)
        this.initData(activityData.data)
    }
 }
@@ -131,7 +131,7 @@ export class RefreshTaskData extends ActivityBase {
        }
    }

-    constructor(activityData: ActivityModelType, createTime: number, serverTime?: number) {
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
        super(activityData, createTime, serverTime)
        this.initData(activityData.data)
    }
@@ -104,8 +104,8 @@ export class SelfServiceShopData extends ActivityBase {
        this.roundIndex = Math.ceil(this.todayIndex / this.days);
    }

-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime)
        this.initData(activityData.data)
    }
 }
@@ -108,8 +108,8 @@ export class SignInData extends ActivityBase {

    }

-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime)
        this.initData(activityData.data)
    }
 }
@@ -146,8 +146,8 @@ export class TaskPassData extends ActivityBase {
    totalPoint: number = 0;
    map: Map<number, number> = new Map(); // pageIndex => rewards的index

-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime)
        this.initData(activityData.data)
    }
    
@@ -242,7 +242,7 @@ export class ThirtyDaysData extends ActivityBase {
        }
    }

-    constructor(activityData: ActivityModelType, createTime: number, serverTime?: number) {
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
        super(activityData, createTime, serverTime)
        this.initData(activityData.data)
    }
@@ -83,8 +83,8 @@ export class TimeLimitRankData extends ActivityBase {
        }
    }

-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime);
        this.initData(activityData.data)
    }
 }
@@ -341,7 +341,7 @@ export class TreasureHuntData extends ActivityBase {
        }
    }

-    constructor(activityData: ActivityModelType, createTime: number, sererTime?: number) {
+    constructor(activityData: ActivityModelType, createTime: number, sererTime: number) {
        super(activityData, createTime, sererTime);
        this.initData(activityData.data)
    }
@@ -61,8 +61,8 @@ export class VipRechargeMoneyData extends ActivityBase {
        }
    }

-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime)
        this.initData(activityData.data)
    }
 }
@@ -62,8 +62,8 @@ export class YuanBaoShopData extends ActivityBase {
        }
    }

-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime: number) {
+        super(activityData, createTime, serverTime)
        this.initData(activityData.data)
    }
 }