From cf04b64bb79caec2dac1fe7fd4b70d757fb9b409 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 24 二月 2021 13:11:33 +0800
Subject: [PATCH] 0312 节日祝福同步封包 增加跳转
---
Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA40_tagMCActCollectWordsInfo.cs | 4 ++--
System/Welfare/OperationTimeHepler.cs | 2 +-
System/WindowJump/WindowJumpMgr.cs | 13 +++++++++++++
Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA46_tagMCFeastTravelInfo.cs | 12 ++++++------
4 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA40_tagMCActCollectWordsInfo.cs b/Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA40_tagMCActCollectWordsInfo.cs
index c7c5c19..f3369d2 100644
--- a/Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA40_tagMCActCollectWordsInfo.cs
+++ b/Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA40_tagMCActCollectWordsInfo.cs
@@ -27,7 +27,7 @@
for (int i = 0; i < ExchangeCount; i ++) {
ExchangeItemList[i] = new tagMCActCollectWordsExchangeItem();
TransBytes (out ExchangeItemList[i].ExchangeNum, vBytes, NetDataType.BYTE);
- TransBytes (out ExchangeItemList[i].ExchangeCountMax, vBytes, NetDataType.BYTE);
+ TransBytes (out ExchangeItemList[i].ExchangeCountMax, vBytes, NetDataType.WORD);
TransBytes (out ExchangeItemList[i].ItemID, vBytes, NetDataType.DWORD);
TransBytes (out ExchangeItemList[i].ItemCount, vBytes, NetDataType.WORD);
TransBytes (out ExchangeItemList[i].IsBind, vBytes, NetDataType.BYTE);
@@ -50,7 +50,7 @@
public struct tagMCActCollectWordsExchangeItem {
public byte ExchangeNum; //鍏戞崲缂栧彿
- public byte ExchangeCountMax; //鏈�澶у厬鎹㈡鏁帮紝0涓嶉檺鍒�
+ public ushort ExchangeCountMax; //鏈�澶у厬鎹㈡鏁帮紝0涓嶉檺鍒�
public uint ItemID; //鐩爣鐗╁搧
public ushort ItemCount;
public byte IsBind;
diff --git a/Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA46_tagMCFeastTravelInfo.cs b/Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA46_tagMCFeastTravelInfo.cs
index 87f012a..cac256b 100644
--- a/Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA46_tagMCFeastTravelInfo.cs
+++ b/Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA46_tagMCFeastTravelInfo.cs
@@ -26,8 +26,8 @@
TravelTaskList[i] = new tagMCFeastTravelTask();
TransBytes (out TravelTaskList[i].TravelTaskID, vBytes, NetDataType.BYTE);
TransBytes (out TravelTaskList[i].FinishNeedValue, vBytes, NetDataType.WORD);
- TransBytes (out TravelTaskList[i].FinishTimeMax, vBytes, NetDataType.BYTE);
- TransBytes (out TravelTaskList[i].AddTravelPoint, vBytes, NetDataType.BYTE);
+ TransBytes (out TravelTaskList[i].FinishTimeMax, vBytes, NetDataType.WORD);
+ TransBytes (out TravelTaskList[i].AddTravelPoint, vBytes, NetDataType.WORD);
}
TransBytes (out TravelAwardCount, vBytes, NetDataType.BYTE);
TravelAwardList = new tagMCFeastTravelAward[TravelAwardCount];
@@ -35,7 +35,7 @@
TravelAwardList[i] = new tagMCFeastTravelAward();
TransBytes (out TravelAwardList[i].AwardIndex, vBytes, NetDataType.BYTE);
TransBytes (out TravelAwardList[i].NeedTravelPoint, vBytes, NetDataType.WORD);
- TransBytes (out TravelAwardList[i].AwardCountMax, vBytes, NetDataType.BYTE);
+ TransBytes (out TravelAwardList[i].AwardCountMax, vBytes, NetDataType.WORD);
TransBytes (out TravelAwardList[i].AwardItemCount, vBytes, NetDataType.BYTE);
TravelAwardList[i].AwardItemList = new tagMCFeastTravelAwardItem[TravelAwardList[i].AwardItemCount];
for (int j = 0; j < TravelAwardList[i].AwardItemCount; j ++) {
@@ -50,8 +50,8 @@
public struct tagMCFeastTravelTask {
public byte TravelTaskID; //娓稿巻浠诲姟ID
public ushort FinishNeedValue; //鍗曟瀹屾垚鎵�闇�杩涘害
- public byte FinishTimeMax; //鏈�澶у彲瀹屾垚娆℃暟锛�0浠ｈ〃涓嶉檺
- public byte AddTravelPoint; //鍗曟瀹屾垚鑾峰緱娓稿巻鍊�
+ public ushort FinishTimeMax; //鏈�澶у彲瀹屾垚娆℃暟锛�0浠ｈ〃涓嶉檺
+ public ushort AddTravelPoint; //鍗曟瀹屾垚鑾峰緱娓稿巻鍊�
}
public struct tagMCFeastTravelAwardItem {
@@ -63,7 +63,7 @@
public struct tagMCFeastTravelAward {
public byte AwardIndex; //娓稿巻濂栧姳绱㈠紩
public ushort NeedTravelPoint; //鍗曟棰嗗鎵�闇�娓稿巻鍊�
- public byte AwardCountMax; //鏈�澶у彲棰嗗彇娆℃暟锛�0浠ｈ〃涓嶉檺
+ public ushort AwardCountMax; //鏈�澶у彲棰嗗彇娆℃暟锛�0浠ｈ〃涓嶉檺
public byte AwardItemCount; //濂栧姳鐗╁搧鏁�
public tagMCFeastTravelAwardItem[] AwardItemList; //濂栧姳鐗╁搧鍒楄〃
}
diff --git a/System/Welfare/OperationTimeHepler.cs b/System/Welfare/OperationTimeHepler.cs
index 067ddc7..da673ee 100644
--- a/System/Welfare/OperationTimeHepler.cs
+++ b/System/Welfare/OperationTimeHepler.cs
@@ -1174,7 +1174,7 @@
DaysAccumulateRecharge, //绱鍏呭�硷紝澶氭棩
CollectWords, //鏀堕泦鏂囧瓧
HolidayLogin, //鑺傛棩鐧诲綍
- HolidayWish, //鑺傛棩绁濈
+ HolidayWish, //鑺傛棩绁濈鐏
HolidayMultiRecharge,//鑺傛棩绁濈鐨勫鏃ョ疮璁″厖鍊�
HolidayTravel, //鑺傛棩娓稿巻
max,
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index ff202c3..7f44261 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -685,6 +685,9 @@
ModelCenter.Instance.GetModel<ImpactRankModel>().gotoImpactRankType = type;
SetJumpLogic<OpenServerActivityRankWin>(_tagWinSearchModel.TABID);
break;
+ case JumpUIType.HolidayWishBottle:
+ SetJumpLogic<HolidayWishesWin>(_tagWinSearchModel.TABID);
+ break;
case JumpUIType.OpenServerActivityFunc2_1:
case JumpUIType.OpenServerActivityFunc2_2:
ModelCenter.Instance.GetModel<OSRedEnvelopeModel>().JumpType = int.Parse(_tagWinSearchModel.SelectActive) + 1;
@@ -1127,6 +1130,15 @@
if (!OpenServerActivityCenter.Instance.IsActivityOpen(_tagWinSearchModel.TABID))
{
OperationTimeHepler.Instance.ProcessConditionError(Operation.DaysAccumulateRecharge);
+ return false;
+ }
+ }
+ break;
+ case JumpUIType.HolidayWishBottle:
+ {
+ if (!OpenServerActivityCenter.Instance.IsActivityOpen(_tagWinSearchModel.TABID, (int)OpenServerActivityCenter.ActivityType.AT_JRZF))
+ {
+ OperationTimeHepler.Instance.ProcessConditionError(Operation.HolidayWish);
return false;
}
}
@@ -1963,6 +1975,7 @@
OpenServer_JZYY = 400, //闆嗗瓧 娲诲姩鐣岄潰
OpenServer_JZHF = 401, //闆嗗瓧 鍚堟湇鐣岄潰
+ HolidayWishBottle = 402, //鑺傛棩绁濈-鐏
DhszTs = 1001,//瀹氭捣绁為拡鍔熸硶鎻愬崌鐣岄潰
HyqTs = 1002,//鐨撴湀鏋姛娉曟彁鍗囩晫闈�
--
Gitblit v1.8.0