军团活动：诸侯混战城池状态

shared/pubUtils/data.ts

@@ -61,7 +61,7 @@ import { Attribute } from "../domain/roleField/attribute";
 import { dicGuildActivity, DicGuildActivity } from './dictionary/DicGuildActivity';
 import { dicGateActivityPoint } from './dictionary/DicGateActivityPoint';
 import { dicGuildAuction } from './dictionary/DicGuildAuction';
-import { getCutDay } from "./timeUtil";
+import { getCurDay } from "./timeUtil";
 import { dicCityActivity } from "./dictionary/DicCityActivity";
 import { dicChatAccuse } from "./dictionary/DicChatAccuse";
 import { dicCityActivityReward } from "./dictionary/DicCityActivityReward";
@@ -463,7 +463,7 @@ export function getDicFriendByLv(lv: number) {
  * @description 获取今天开启的活动的配置
  */
 export function getTodayGuildActivity() {
-    let today = getCutDay();
+    let today = getCurDay();
     let dic: DicGuildActivity;
     for(let [_id, dicGuildActivity] of gameData.guildActivity) {
         if(dicGuildActivity.openDay.includes(today)) {

shared/pubUtils/dictionary/DicCityActivity.ts

@@ -18,6 +18,8 @@ export interface DicCityActivity {
     readonly warid: number;
     // 城门血条
     readonly hp: number;
+    // 可开启星期
+    readonly week: number[];
 }
 
 const str = readJsonFile(FILENAME.DIC_CITY_ACTIVITY);
@@ -27,6 +29,7 @@ export const dicCityActivity = new Map<number, DicCityActivity>();
 
 arr.forEach(o => {
     o.preCity = parseNumberList(o.preCity);
+    o.week = parseNumberList(o.week);
     dicCityActivity.set( o.id, o );
 });
 arr = undefined;

shared/pubUtils/dictionary/DicGuildActivity.ts

@@ -11,9 +11,9 @@ export interface DicGuildActivity {
     // 持续时间 秒
     readonly duringTime: number;
     // 开启时间 几点
-    readonly startTime: number;
+    startTime: number;
     // 开启时间 几点
-    readonly startMinute: number;
+    startMinute: number;
     // 开始倒计时 几点
     readonly countDown: number;
     // 对应关卡id

shared/pubUtils/timeUtil.ts

@@ -180,9 +180,22 @@ export function getNextTime(date: Date, h: number, m = 0, s = 0, ms = 0): Date {
  * @param needHandle 是否处理周日
  * @param {Date} time 
  */
-export function getCutDay( needHandle = false, time?: Date) {
+
+let week = undefined;
+
+export function getCurDay( needHandle = false, time?: Date) {
     if(!time) time = new Date();
     let d = time.getDay();
     if(needHandle && d == 0) d = 7;
+
+    if(week != undefined) {
+        d = week;
+    }
+
     return d;
 }
+
+export function setWeek(d?: number) {
+    week = d;
+    if(d == 7) week = 0;
+}