From ee2c8d6ef196289e5d6ee8ecb8ea95ed953336e3 Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期一, 08 十月 2018 10:14:29 +0800
Subject: [PATCH] 3997 【前端】【1.2.0】仙界盛典开启和关闭时间修改为凌晨5点
---
Core/NetworkPackage/DTCFile/ServerPack/HAC_Activity/DTCAC09_tagGCFairyCeremonyInfo.cs | 3 ++-
System/Welfare/OperationTimeHepler.cs | 1 +
System/KnapSack/New/BatchUseModel.cs | 54 +++++++++++++++++++++++++++---------------------------
Core/NetworkPackage/ServerPack/HAC_Activity/HAC09_tagGCFairyCeremonyInfo.cs | 2 ++
4 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HAC_Activity/DTCAC09_tagGCFairyCeremonyInfo.cs b/Core/NetworkPackage/DTCFile/ServerPack/HAC_Activity/DTCAC09_tagGCFairyCeremonyInfo.cs
index 9170e9b..f24ca2a 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/HAC_Activity/DTCAC09_tagGCFairyCeremonyInfo.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HAC_Activity/DTCAC09_tagGCFairyCeremonyInfo.cs
@@ -6,7 +6,8 @@
-public class DTCAC09_tagGCFairyCeremonyInfo : DtcBasic {
+public class DTCAC09_tagGCFairyCeremonyInfo : DtcBasic
+{
FairylandCeremonyModel ceremonyModel { get { return ModelCenter.Instance.GetModel<FairylandCeremonyModel>(); } }
diff --git a/Core/NetworkPackage/ServerPack/HAC_Activity/HAC09_tagGCFairyCeremonyInfo.cs b/Core/NetworkPackage/ServerPack/HAC_Activity/HAC09_tagGCFairyCeremonyInfo.cs
index dcbb66b..87f1af3 100644
--- a/Core/NetworkPackage/ServerPack/HAC_Activity/HAC09_tagGCFairyCeremonyInfo.cs
+++ b/Core/NetworkPackage/ServerPack/HAC_Activity/HAC09_tagGCFairyCeremonyInfo.cs
@@ -8,6 +8,7 @@
public string EndtDate; // 结束日期 y-m-d
public ushort WorldLV; // 世界等级
public ushort LimitLV; // 限制等级
+ public byte ResetType; // 重置类型 0-0点重置 1-5点重置
public HAC09_tagGCFairyCeremonyInfo () {
_cmd = (ushort)0xAC09;
@@ -18,6 +19,7 @@
TransBytes (out EndtDate, vBytes, NetDataType.Chars, 10);
TransBytes (out WorldLV, vBytes, NetDataType.WORD);
TransBytes (out LimitLV, vBytes, NetDataType.WORD);
+ TransBytes (out ResetType, vBytes, NetDataType.BYTE);
}
}
diff --git a/System/KnapSack/New/BatchUseModel.cs b/System/KnapSack/New/BatchUseModel.cs
index 9bc9a16..aedf4b7 100644
--- a/System/KnapSack/New/BatchUseModel.cs
+++ b/System/KnapSack/New/BatchUseModel.cs
@@ -1,30 +1,30 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using TableConfig;
-
-namespace Snxxz.UI
-{
- public class BatchUseModel : Singleton<BatchUseModel>
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using TableConfig;
+
+namespace Snxxz.UI
+{
+ public class BatchUseModel : Singleton<BatchUseModel>
{
- #region 鎵归噺浣跨敤鏁版嵁
- public string guid { get; private set; }
- public void SetBatchModel(string guid)
- {
- extraPrams = 0;
- this.maxValue = 0;
- this.guid = guid;
- }
-
- public int extraPrams { get; private set; }
- public int maxValue { get; private set; }
- public void SetExtraInfo(int extraUseInfo, int maxValue)
+ #region 鎵归噺浣跨敤鏁版嵁
+ public string guid { get; private set; }
+ public void SetBatchModel(string guid)
{
- this.extraPrams = extraUseInfo;
- this.maxValue = maxValue;
+ extraPrams = 0;
+ this.maxValue = 0;
+ this.guid = guid;
}
- #endregion
+
+ public int extraPrams { get; private set; }
+ public int maxValue { get; private set; }
+ public void SetExtraInfo(int extraUseInfo, int maxValue)
+ {
+ this.extraPrams = extraUseInfo;
+ this.maxValue = maxValue;
+ }
+ #endregion
#region 鎵归噺璐拱鏁版嵁
public StoreConfig storeConfig { get; private set; }
@@ -50,6 +50,6 @@
{
storeConfig = null;
}
- #endregion
- }
-}
+ #endregion
+ }
+}
diff --git a/System/Welfare/OperationTimeHepler.cs b/System/Welfare/OperationTimeHepler.cs
index 6ffca8e..2e2a544 100644
--- a/System/Welfare/OperationTimeHepler.cs
+++ b/System/Welfare/OperationTimeHepler.cs
@@ -310,6 +310,7 @@
operation.startDate = ParseOperationDate(package.StartDate);
operation.endDate = ParseOperationDate(package.EndtDate);
operation.limitLv = package.LimitLV;
+ operation.resetType = package.ResetType;
if (operationTimeUpdateEvent != null)
{
operationTimeUpdateEvent(Operation.FairyCeremony);
--
Gitblit v1.8.0