From bed4e6b3b7922117288ff3b1773bcfb01e12df10 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 28 一月 2019 11:03:16 +0800
Subject: [PATCH] 5927 【前端】【1.5.100】XX巡礼支持活动配置
---
Core/GameEngine/Model/ConfigManager.cs | 3
Core/NetworkPackage/DTCFile/ServerPack/HAA_SaleActivity/DTCAA0A_tagMCWeekPartyInfo.cs | 1
Core/NetworkPackage/DTCFile/ServerPack/HAA_SaleActivity/DTCAA20_tagMCFeastWeekPartyInfo.cs.meta | 12 +
System/OpenServerActivity/SpringFestivalCell.cs | 2
System/OpenServerActivity/SpringFestivalWin.cs | 4
Core/NetworkPackage/DTCFile/ServerPack/HAA_SaleActivity/DTCAA21_tagMCFeastWeekPartyPlayerInfo.cs | 22 ++
Core/NetworkPackage/DTCFile/ServerPack/HAA_SaleActivity/DTCAA20_tagMCFeastWeekPartyInfo.cs | 22 ++
System/OpenServerActivity/SpringFestivalModel.cs | 4
Core/GameEngine/Model/Config/HolidayHomingConfig.cs | 56 +++++++
Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA21_tagMCFeastWeekPartyPlayerInfo.cs.meta | 12 +
Core/GameEngine/Model/Config/HolidayHomingConfig.cs.meta | 12 +
System/OpenServerActivity/SpringFestivalItem.cs | 10
Core/GameEngine/Model/Config/HolidayHomingPointConfig.cs | 47 +++++
System/Welfare/OperationTimeHepler.cs | 32 +++
Core/GameEngine/Model/Config/HolidayHomingPointConfig.cs.meta | 12 +
Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA20_tagMCFeastWeekPartyInfo.cs.meta | 12 +
Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA21_tagMCFeastWeekPartyPlayerInfo.cs | 47 +++++
Core/NetworkPackage/DTCFile/ServerPack/HAA_SaleActivity/DTCAA21_tagMCFeastWeekPartyPlayerInfo.cs.meta | 12 +
Core/GameEngine/DataToCtl/PackageRegedit.cs | 2
Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA20_tagMCFeastWeekPartyInfo.cs | 90 +++++++++++
System/OpenServerActivity/AchievementActivityWin.cs | 34 ++-
21 files changed, 422 insertions(+), 26 deletions(-)
diff --git a/Core/GameEngine/DataToCtl/PackageRegedit.cs b/Core/GameEngine/DataToCtl/PackageRegedit.cs
index b87f5bd..dec54b9 100644
--- a/Core/GameEngine/DataToCtl/PackageRegedit.cs
+++ b/Core/GameEngine/DataToCtl/PackageRegedit.cs
@@ -439,6 +439,8 @@
Register(typeof(HAA0B_tagMCWeekPartyPlayerInfo), typeof(DTCAA0B_tagMCWeekPartyPlayerInfo));
Register(typeof(HAA0C_tagMCActLoginAwardInfo), typeof(DTCAA0C_tagMCActLoginAwardInfo));
Register(typeof(HAA0D_tagMCActLoginAwardPlayerInfo), typeof(DTCAA0D_tagMCActLoginAwardPlayerInfo));
+ Register(typeof(HAA20_tagMCFeastWeekPartyInfo), typeof(DTCAA20_tagMCFeastWeekPartyInfo));
+ Register(typeof(HAA21_tagMCFeastWeekPartyPlayerInfo), typeof(DTCAA21_tagMCFeastWeekPartyPlayerInfo));
}
private static void Register(Type _pack, Type _business)
diff --git a/Core/GameEngine/Model/Config/HolidayHomingConfig.cs b/Core/GameEngine/Model/Config/HolidayHomingConfig.cs
new file mode 100644
index 0000000..a0085d4
--- /dev/null
+++ b/Core/GameEngine/Model/Config/HolidayHomingConfig.cs
@@ -0,0 +1,56 @@
+锘�//--------------------------------------------------------
+// [Author]: 绗簩涓栫晫
+// [ Date ]: Monday, January 28, 2019
+//--------------------------------------------------------
+
+using UnityEngine;
+using System;
+
+namespace TableConfig {
+
+
+ public partial class HolidayHomingConfig : ConfigBase {
+
+ public int Id { get ; private set ; }
+ public int ActionType { get ; private set ; }
+ public string Description { get ; private set; }
+ public int jump { get ; private set ; }
+ public int order { get ; private set ; }
+ public int DailyQusetId { get ; private set ; }
+ public int SpecialDisplayType { get ; private set ; }
+
+ public override string getKey()
+ {
+ return Id.ToString();
+ }
+
+ public override void Parse() {
+ try
+ {
+ Id=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0;
+
+ ActionType=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0;
+
+ Description = rawContents[2].Trim();
+
+ jump=IsNumeric(rawContents[3]) ? int.Parse(rawContents[3]):0;
+
+ order=IsNumeric(rawContents[4]) ? int.Parse(rawContents[4]):0;
+
+ DailyQusetId=IsNumeric(rawContents[5]) ? int.Parse(rawContents[5]):0;
+
+ SpecialDisplayType=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0;
+ }
+ catch (Exception ex)
+ {
+ DebugEx.Log(ex);
+ }
+ }
+
+ }
+
+}
+
+
+
+
diff --git a/Core/GameEngine/Model/Config/HolidayHomingConfig.cs.meta b/Core/GameEngine/Model/Config/HolidayHomingConfig.cs.meta
new file mode 100644
index 0000000..10fa13a
--- /dev/null
+++ b/Core/GameEngine/Model/Config/HolidayHomingConfig.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 8d3d7608c7608d344837efce0985daa5
+timeCreated: 1548642619
+licenseType: Free
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Core/GameEngine/Model/Config/HolidayHomingPointConfig.cs b/Core/GameEngine/Model/Config/HolidayHomingPointConfig.cs
new file mode 100644
index 0000000..8719442
--- /dev/null
+++ b/Core/GameEngine/Model/Config/HolidayHomingPointConfig.cs
@@ -0,0 +1,47 @@
+锘�//--------------------------------------------------------
+// [Author]: 绗簩涓栫晫
+// [ Date ]: Monday, January 28, 2019
+//--------------------------------------------------------
+
+using UnityEngine;
+using System;
+
+namespace TableConfig {
+
+
+ public partial class HolidayHomingPointConfig : ConfigBase {
+
+ public int Id { get ; private set ; }
+ public string ImageType1 { get ; private set; }
+ public string ImageType2 { get ; private set; }
+ public string name { get ; private set; }
+
+ public override string getKey()
+ {
+ return Id.ToString();
+ }
+
+ public override void Parse() {
+ try
+ {
+ Id=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0;
+
+ ImageType1 = rawContents[1].Trim();
+
+ ImageType2 = rawContents[2].Trim();
+
+ name = rawContents[3].Trim();
+ }
+ catch (Exception ex)
+ {
+ DebugEx.Log(ex);
+ }
+ }
+
+ }
+
+}
+
+
+
+
diff --git a/Core/GameEngine/Model/Config/HolidayHomingPointConfig.cs.meta b/Core/GameEngine/Model/Config/HolidayHomingPointConfig.cs.meta
new file mode 100644
index 0000000..e441a46
--- /dev/null
+++ b/Core/GameEngine/Model/Config/HolidayHomingPointConfig.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 72b35cd6566b7d34389dd31103502961
+timeCreated: 1548642631
+licenseType: Free
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Core/GameEngine/Model/ConfigManager.cs b/Core/GameEngine/Model/ConfigManager.cs
index 8239bbe..fc95451 100644
--- a/Core/GameEngine/Model/ConfigManager.cs
+++ b/Core/GameEngine/Model/ConfigManager.cs
@@ -229,7 +229,8 @@
AddAsyncTask<JadeDynastyBossConfig>();
AddAsyncTask<JadeDynastySuitAttrConfig>();
AddAsyncTask<SkillFrameAnimationConfig>();
-
+ AddAsyncTask<HolidayHomingConfig>();
+ AddAsyncTask<HolidayHomingPointConfig>();
while (!AllCompleted())
{
var completedCount = 0;
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HAA_SaleActivity/DTCAA0A_tagMCWeekPartyInfo.cs b/Core/NetworkPackage/DTCFile/ServerPack/HAA_SaleActivity/DTCAA0A_tagMCWeekPartyInfo.cs
index 3dadd36..84879e1 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/HAA_SaleActivity/DTCAA0A_tagMCWeekPartyInfo.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HAA_SaleActivity/DTCAA0A_tagMCWeekPartyInfo.cs
@@ -15,6 +15,7 @@
{
return;
}
+ OperationTimeHepler.Instance.OpenServiceAchievement(vNetData);
model.WeekPartyInfo(vNetData);
}
}
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HAA_SaleActivity/DTCAA20_tagMCFeastWeekPartyInfo.cs b/Core/NetworkPackage/DTCFile/ServerPack/HAA_SaleActivity/DTCAA20_tagMCFeastWeekPartyInfo.cs
new file mode 100644
index 0000000..f783338
--- /dev/null
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HAA_SaleActivity/DTCAA20_tagMCFeastWeekPartyInfo.cs
@@ -0,0 +1,22 @@
+using UnityEngine;
+using System.Collections;
+using Snxxz.UI;
+
+// AA 20 节日巡礼活动信息 #tagMCFeastWeekPartyInfo
+
+
+
+public class DTCAA20_tagMCFeastWeekPartyInfo : DtcBasic
+{
+ SpringFestivalModel model { get { return ModelCenter.Instance.GetModel<SpringFestivalModel>(); } }
+ public override void Done(GameNetPackBasic vNetPack)
+ {
+ base.Done(vNetPack);
+ HAA20_tagMCFeastWeekPartyInfo vNetData = vNetPack as HAA20_tagMCFeastWeekPartyInfo;
if (vNetData == null)
+ {
+ return;
+ }
+ OperationTimeHepler.Instance.SpringFestival(vNetData);
+ model.SpringFestivalTemplate(vNetData);
+ }
+}
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HAA_SaleActivity/DTCAA20_tagMCFeastWeekPartyInfo.cs.meta b/Core/NetworkPackage/DTCFile/ServerPack/HAA_SaleActivity/DTCAA20_tagMCFeastWeekPartyInfo.cs.meta
new file mode 100644
index 0000000..c42fc5f
--- /dev/null
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HAA_SaleActivity/DTCAA20_tagMCFeastWeekPartyInfo.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: aaf06cbce14a41245bd9fba2fdfbbc87
+timeCreated: 1548641524
+licenseType: Free
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HAA_SaleActivity/DTCAA21_tagMCFeastWeekPartyPlayerInfo.cs b/Core/NetworkPackage/DTCFile/ServerPack/HAA_SaleActivity/DTCAA21_tagMCFeastWeekPartyPlayerInfo.cs
new file mode 100644
index 0000000..270d635
--- /dev/null
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HAA_SaleActivity/DTCAA21_tagMCFeastWeekPartyPlayerInfo.cs
@@ -0,0 +1,22 @@
+using UnityEngine;
+using System.Collections;
+using Snxxz.UI;
+
+// AA 21 节日巡礼玩家活动信息 #tagMCFeastWeekPartyPlayerInfo
+
+
+
+public class DTCAA21_tagMCFeastWeekPartyPlayerInfo : DtcBasic
+{
+ SpringFestivalModel model { get { return ModelCenter.Instance.GetModel<SpringFestivalModel>(); } }
+ public override void Done(GameNetPackBasic vNetPack)
+ {
+ base.Done(vNetPack);
+ HAA21_tagMCFeastWeekPartyPlayerInfo vNetData = vNetPack as HAA21_tagMCFeastWeekPartyPlayerInfo;
+ if (vNetData == null)
+ {
+ return;
+ }
+ model.SpringFestivalInfo(vNetData);
+ }
+}
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HAA_SaleActivity/DTCAA21_tagMCFeastWeekPartyPlayerInfo.cs.meta b/Core/NetworkPackage/DTCFile/ServerPack/HAA_SaleActivity/DTCAA21_tagMCFeastWeekPartyPlayerInfo.cs.meta
new file mode 100644
index 0000000..7099301
--- /dev/null
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HAA_SaleActivity/DTCAA21_tagMCFeastWeekPartyPlayerInfo.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 545412b628f8a19419a48aee51cea0dc
+timeCreated: 1548641521
+licenseType: Free
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA20_tagMCFeastWeekPartyInfo.cs b/Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA20_tagMCFeastWeekPartyInfo.cs
new file mode 100644
index 0000000..4d92f7b
--- /dev/null
+++ b/Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA20_tagMCFeastWeekPartyInfo.cs
@@ -0,0 +1,90 @@
+using UnityEngine;
+using System.Collections;
+
+// AA 20 节日巡礼活动信息 #tagMCFeastWeekPartyInfo
+
+public class HAA20_tagMCFeastWeekPartyInfo : GameNetPackBasic {
+ public string StartDate; // 开始日期 y-m-d
+ public string EndtDate; // 结束日期 y-m-d
+ public ushort AdvanceMinutes; // 提前显示分钟
+ public byte IsDayReset; //是否每天重置
+ public byte ResetType; // 重置类型，0-0点重置；1-5点重置
+ public ushort LimitLV; // 限制等级
+ public byte DayCnt; // 天数
+ public tagMCFeastWeekPartyDayInfo[] DayInfoList; // 每天模板
+ public byte TCount; // 模板数
+ public tagMCFeastWeekPartyAction[] ActionInfo; // 活动模板信息
+
+ public HAA20_tagMCFeastWeekPartyInfo () {
+ _cmd = (ushort)0xAA20;
+ }
+
+ public override void ReadFromBytes (byte[] vBytes) {
+ TransBytes (out StartDate, vBytes, NetDataType.Chars, 10);
+ TransBytes (out EndtDate, vBytes, NetDataType.Chars, 10);
+ TransBytes (out AdvanceMinutes, vBytes, NetDataType.WORD);
+ TransBytes (out IsDayReset, vBytes, NetDataType.BYTE);
+ TransBytes (out ResetType, vBytes, NetDataType.BYTE);
+ TransBytes (out LimitLV, vBytes, NetDataType.WORD);
+ TransBytes (out DayCnt, vBytes, NetDataType.BYTE);
+ DayInfoList = new tagMCFeastWeekPartyDayInfo[DayCnt];
+ for (int i = 0; i < DayCnt; i ++) {
+ DayInfoList[i] = new tagMCFeastWeekPartyDayInfo();
+ TransBytes (out DayInfoList[i].ActCnt, vBytes, NetDataType.BYTE);
+ TransBytes (out DayInfoList[i].TemplateList, vBytes, NetDataType.WORD, DayInfoList[i].ActCnt);
+ TransBytes (out DayInfoList[i].PCount, vBytes, NetDataType.BYTE);
+ DayInfoList[i].PItemInfo = new tagMCFeastWeekPartyItem[DayInfoList[i].PCount];
+ for (int j = 0; j < DayInfoList[i].PCount; j ++) {
+ DayInfoList[i].PItemInfo[j] = new tagMCFeastWeekPartyItem();
+ TransBytes (out DayInfoList[i].PItemInfo[j].NeedPoint, vBytes, NetDataType.WORD);
+ TransBytes (out DayInfoList[i].PItemInfo[j].ItemID, vBytes, NetDataType.DWORD);
+ TransBytes (out DayInfoList[i].PItemInfo[j].ItemCnt, vBytes, NetDataType.WORD);
+ TransBytes (out DayInfoList[i].PItemInfo[j].IsBind, vBytes, NetDataType.BYTE);
+ }
+ }
+ TransBytes (out TCount, vBytes, NetDataType.BYTE);
+ ActionInfo = new tagMCFeastWeekPartyAction[TCount];
+ for (int i = 0; i < TCount; i ++) {
+ ActionInfo[i] = new tagMCFeastWeekPartyAction();
+ TransBytes (out ActionInfo[i].TemplateID, vBytes, NetDataType.DWORD);
+ TransBytes (out ActionInfo[i].ActionType, vBytes, NetDataType.WORD);
+ TransBytes (out ActionInfo[i].TotalTimes, vBytes, NetDataType.DWORD);
+ TransBytes (out ActionInfo[i].SingleTimes, vBytes, NetDataType.DWORD);
+ TransBytes (out ActionInfo[i].Point, vBytes, NetDataType.DWORD);
+ TransBytes (out ActionInfo[i].Count, vBytes, NetDataType.BYTE);
+ ActionInfo[i].ItemInfo = new tagMCFeastWeekPartyItem[ActionInfo[i].Count];
+ for (int j = 0; j < ActionInfo[i].Count; j ++) {
+ ActionInfo[i].ItemInfo[j] = new tagMCFeastWeekPartyItem();
+ TransBytes (out ActionInfo[i].ItemInfo[j].NeedPoint, vBytes, NetDataType.WORD);
+ TransBytes (out ActionInfo[i].ItemInfo[j].ItemID, vBytes, NetDataType.DWORD);
+ TransBytes (out ActionInfo[i].ItemInfo[j].ItemCnt, vBytes, NetDataType.WORD);
+ TransBytes (out ActionInfo[i].ItemInfo[j].IsBind, vBytes, NetDataType.BYTE);
+ }
+ }
+ }
+
+ public struct tagMCFeastWeekPartyAction {
+ public uint TemplateID; // 模板ID
+ public ushort ActionType; // 活动类别
+ public uint TotalTimes; // 可完成的总次数，0表示不限次数
+ public uint SingleTimes; // 单次领奖需要的次数
+ public uint Point; // 单次领奖积分
+ public byte Count; // 物品数
+ public tagMCFeastWeekPartyItem[] ItemInfo; // 物品信息
+ }
+
+ public struct tagMCFeastWeekPartyItem {
+ public ushort NeedPoint; // 领奖需要积分
+ public uint ItemID; // 物品ID
+ public ushort ItemCnt; // 物品数量
+ public byte IsBind; // 是否绑定
+ }
+
+ public struct tagMCFeastWeekPartyDayInfo {
+ public byte ActCnt; // 数量
+ public ushort[] TemplateList; // 模板列表
+ public byte PCount; // 物品数
+ public tagMCFeastWeekPartyItem[] PItemInfo; // 物品信息
+ }
+
+}
diff --git a/Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA20_tagMCFeastWeekPartyInfo.cs.meta b/Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA20_tagMCFeastWeekPartyInfo.cs.meta
new file mode 100644
index 0000000..09376e6
--- /dev/null
+++ b/Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA20_tagMCFeastWeekPartyInfo.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: eeaeb20e0eb5d8c47a368fa5b96cfc98
+timeCreated: 1548641524
+licenseType: Free
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA21_tagMCFeastWeekPartyPlayerInfo.cs b/Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA21_tagMCFeastWeekPartyPlayerInfo.cs
new file mode 100644
index 0000000..6d566bf
--- /dev/null
+++ b/Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA21_tagMCFeastWeekPartyPlayerInfo.cs
@@ -0,0 +1,47 @@
+using UnityEngine;
+using System.Collections;
+
+// AA 21 节日巡礼玩家活动信息 #tagMCFeastWeekPartyPlayerInfo
+
+public class HAA21_tagMCFeastWeekPartyPlayerInfo : GameNetPackBasic {
+ public byte Count;
+ public tagMCFeastWeekPartyDayPlayerInfo[] DayInfoList; //活动完成次数信息
+
+ public HAA21_tagMCFeastWeekPartyPlayerInfo () {
+ _cmd = (ushort)0xAA21;
+ }
+
+ public override void ReadFromBytes (byte[] vBytes) {
+ TransBytes (out Count, vBytes, NetDataType.BYTE);
+ DayInfoList = new tagMCFeastWeekPartyDayPlayerInfo[Count];
+ for (int i = 0; i < Count; i ++) {
+ DayInfoList[i] = new tagMCFeastWeekPartyDayPlayerInfo();
+ TransBytes (out DayInfoList[i].DayIndex, vBytes, NetDataType.DWORD);
+ TransBytes (out DayInfoList[i].Point, vBytes, NetDataType.DWORD);
+ TransBytes (out DayInfoList[i].AwardRecord, vBytes, NetDataType.DWORD);
+ TransBytes (out DayInfoList[i].ACount, vBytes, NetDataType.DWORD);
+ DayInfoList[i].TaskList = new tagMCFeastWeekPartyTaskInfo[DayInfoList[i].ACount];
+ for (int j = 0; j < DayInfoList[i].ACount; j ++) {
+ DayInfoList[i].TaskList[j] = new tagMCFeastWeekPartyTaskInfo();
+ TransBytes (out DayInfoList[i].TaskList[j].TemplateID, vBytes, NetDataType.WORD);
+ TransBytes (out DayInfoList[i].TaskList[j].CurTimes, vBytes, NetDataType.DWORD);
+ TransBytes (out DayInfoList[i].TaskList[j].GotTimes, vBytes, NetDataType.DWORD);
+ }
+ }
+ }
+
+ public struct tagMCFeastWeekPartyDayPlayerInfo {
+ public uint DayIndex; //第X天
+ public uint Point; //积分
+ public uint AwardRecord; //积分领奖记录
+ public uint ACount; //任务条目数
+ public tagMCFeastWeekPartyTaskInfo[] TaskList; //活动完成次数信息
+ }
+
+ public struct tagMCFeastWeekPartyTaskInfo {
+ public ushort TemplateID; // 模板ID
+ public uint CurTimes; //已完成次数
+ public uint GotTimes; //已领取次数
+ }
+
+}
diff --git a/Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA21_tagMCFeastWeekPartyPlayerInfo.cs.meta b/Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA21_tagMCFeastWeekPartyPlayerInfo.cs.meta
new file mode 100644
index 0000000..398931a
--- /dev/null
+++ b/Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA21_tagMCFeastWeekPartyPlayerInfo.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 726d8302a026f8941aa12b1844e92b1c
+timeCreated: 1548641524
+licenseType: Free
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/System/OpenServerActivity/AchievementActivityWin.cs b/System/OpenServerActivity/AchievementActivityWin.cs
index daaca01..4868842 100644
--- a/System/OpenServerActivity/AchievementActivityWin.cs
+++ b/System/OpenServerActivity/AchievementActivityWin.cs
@@ -39,6 +39,7 @@
protected override void OnPreOpen()
{
+ IsButtonNumber();
if (WindowCenter.Instance.IsOpen<MainInterfaceWin>())
{
WindowCenter.Instance.Close<MainInterfaceWin>();
@@ -51,8 +52,6 @@
{
functionOrder = 1;
}
-
-
}
protected override void OnActived()
@@ -105,11 +104,6 @@
private void OpenServiceAchievementButton()
{
- if (!openServiceAchievementModel.IsOpen)
- {
- SysNotifyMgr.Instance.ShowTip("OutofActivityTime");
- return;
- }
CloseChild();
if (windowState == WindowState.Opened)
{
@@ -123,11 +117,6 @@
}
private void SpringFestivalButton()
{
- if (!springFestivalModel.IsOpenFeatures())
- {
- SysNotifyMgr.Instance.ShowTip("OutofActivityTime");
- return;
- }
CloseChild();
if (windowState == WindowState.Opened)
{
@@ -138,10 +127,27 @@
WindowCenter.Instance.Open<SpringFestivalWin>(true);
}
functionOrder = 1;
-
}
#endregion
-
+ private void IsButtonNumber()
+ {
+ if (openServiceAchievementModel.IsOpen)
+ {
+ m_OpenServiceAchievementBtn.gameObject.SetActive(true);
+ }
+ else
+ {
+ m_OpenServiceAchievementBtn.gameObject.SetActive(false);
+ }
+ if (springFestivalModel.IsOpenFeatures())
+ {
+ m_SpringFestival.gameObject.SetActive(true);
+ }
+ else
+ {
+ m_SpringFestival.gameObject.SetActive(false);
+ }
+ }
}
}
diff --git a/System/OpenServerActivity/SpringFestivalCell.cs b/System/OpenServerActivity/SpringFestivalCell.cs
index bba4e42..ca510c3 100644
--- a/System/OpenServerActivity/SpringFestivalCell.cs
+++ b/System/OpenServerActivity/SpringFestivalCell.cs
@@ -218,7 +218,7 @@
int rewardNum = model.GetRewardNumber(model.SelectedNow, ID);//宸查濂栨鏁�
int carryOutNum = model.GetCarryOutNum(model.SelectedNow, ID);//宸插畬鎴愭鏁�
var config = Config.Instance.Get<WeekPartyConfig>(ID);
- if (config != null && config.ActionType == 13)
+ if (config != null && config.SpecialDisplayType == 1)
{
if (carryOutNum > 0)
diff --git a/System/OpenServerActivity/SpringFestivalItem.cs b/System/OpenServerActivity/SpringFestivalItem.cs
index 320c99a..454abb2 100644
--- a/System/OpenServerActivity/SpringFestivalItem.cs
+++ b/System/OpenServerActivity/SpringFestivalItem.cs
@@ -24,17 +24,17 @@
SpringFestivalModel model { get { return ModelCenter.Instance.GetModel<SpringFestivalModel>(); } }
public void SetReward(int day, WeekPartyItemClass item, int index, int Type)
{
- var weekPartPointConfig = Config.Instance.Get<WeekPartyPointConfig>(item.ItemID);
- if (weekPartPointConfig != null)
+ var holidayHomingPointConfig = Config.Instance.Get<HolidayHomingPointConfig>(item.ItemID);
+ if (holidayHomingPointConfig != null)
{
- m_Text_A.text = weekPartPointConfig.name;
+ m_Text_A.text = holidayHomingPointConfig.name;
if (Type == 1)
{
- m_ImageShow.SetSprite(weekPartPointConfig.ImageType1);
+ m_ImageShow.SetSprite(holidayHomingPointConfig.ImageType1);
}
else
{
- m_ImageShow.SetSprite(weekPartPointConfig.ImageType2);
+ m_ImageShow.SetSprite(holidayHomingPointConfig.ImageType2);
}
m_ImageShow.SetNativeSize();
}
diff --git a/System/OpenServerActivity/SpringFestivalModel.cs b/System/OpenServerActivity/SpringFestivalModel.cs
index a11c807..29651df 100644
--- a/System/OpenServerActivity/SpringFestivalModel.cs
+++ b/System/OpenServerActivity/SpringFestivalModel.cs
@@ -54,7 +54,7 @@
}
- public void SpringFestivalInfo(HAA0B_tagMCWeekPartyPlayerInfo info)//姣忓ぉ棰嗗淇℃伅
+ public void SpringFestivalInfo(HAA21_tagMCFeastWeekPartyPlayerInfo info)//姣忓ぉ棰嗗淇℃伅
{
for (int i = 0; i < info.Count; i++)
{
@@ -112,7 +112,7 @@
}
}
- public void SpringFestivalTemplate(HAA0A_tagMCWeekPartyInfo info)//姣忓ぉ妯℃澘淇℃伅
+ public void SpringFestivalTemplate(HAA20_tagMCFeastWeekPartyInfo info)//姣忓ぉ妯℃澘淇℃伅
{
LimitLV = info.LimitLV;
for (int i = 0; i < info.DayCnt; i++)
diff --git a/System/OpenServerActivity/SpringFestivalWin.cs b/System/OpenServerActivity/SpringFestivalWin.cs
index 57d25f5..3e6fafe 100644
--- a/System/OpenServerActivity/SpringFestivalWin.cs
+++ b/System/OpenServerActivity/SpringFestivalWin.cs
@@ -211,7 +211,7 @@
for (int i = 0; i < model.SpringFestivalDayDic[key].TemplateList.Length; i++)
{
var TemplateId = model.SpringFestivalDayDic[key].TemplateList[i];
- var config = Config.Instance.Get<WeekPartyConfig>(TemplateId);
+ var config = Config.Instance.Get<HolidayHomingConfig>(TemplateId);
if (config == null)
{
continue;
@@ -315,7 +315,7 @@
private int SizeId(int ID)
{
int index = 1;
- var config = Config.Instance.Get<WeekPartyConfig>(ID);
+ var config = Config.Instance.Get<HolidayHomingConfig>(ID);
if (config != null)
{
index = config.order;
diff --git a/System/Welfare/OperationTimeHepler.cs b/System/Welfare/OperationTimeHepler.cs
index 7046b5d..44edb93 100644
--- a/System/Welfare/OperationTimeHepler.cs
+++ b/System/Welfare/OperationTimeHepler.cs
@@ -493,7 +493,7 @@
/// 鏄ヨ妭宸＄ぜ
/// </summary>
/// <param name="package"></param>
- public void SpringFestival(HAA0A_tagMCWeekPartyInfo package)
+ public void SpringFestival(HAA20_tagMCFeastWeekPartyInfo package)
{
OperationBase operation = null;
operationDict.TryGetValue(Operation.SpringFestival, out operation);
@@ -520,6 +520,35 @@
operationTimeUpdateEvent(Operation.SpringFestival);
}
}
+ }
+ public void OpenServiceAchievement(HAA0A_tagMCWeekPartyInfo package)
+ {
+ OperationBase operation = null;
+ operationDict.TryGetValue(Operation.OpenServiceAchievement, out operation);
+ if (string.IsNullOrEmpty(package.StartDate) || string.IsNullOrEmpty(package.EndtDate))
+ {
+ ForceStopOperation(Operation.OpenServiceAchievement);
+ }
+ else
+ {
+ if (operation == null)
+ {
+ operation = new EventDaysTime();
+ operationDict.Add(Operation.OpenServiceAchievement, operation);
+ }
+ operation.Reset();
+ operation.startDate = ParseOperationDate(package.StartDate);
+ operation.endDate = ParseOperationDate(package.EndtDate);
+ operation.limitLv = package.LimitLV;
+ operation.dayReset = package.IsDayReset == 1;
+ operation.resetType = package.ResetType;
+ operation.inAdvanceMinute = package.AdvanceMinutes;
+ if (operationTimeUpdateEvent != null)
+ {
+ operationTimeUpdateEvent(Operation.OpenServiceAchievement);
+ }
+ }
+
}
void ForceStopOperation(Operation operationType)
{
@@ -825,6 +854,7 @@
AccumulateRecharge,//绱鍏呭��
LoginReward,//鐧诲綍濂栧姳
SpringFestival,//鏄ヨ妭宸＄ぜ
+ OpenServiceAchievement,//涓冩棩宸＄ぜ
max,
}
}
--
Gitblit v1.8.0