0312 节日祝福同步封包 增加跳转

hch

2021-02-24 cf04b64bb79caec2dac1fe7fd4b70d757fb9b409

0312 节日祝福同步封包 增加跳转

 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;

 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;        //奖励物品列表
    }

 System/Welfare/OperationTimeHepler.cs

@@ -1174,7 +1174,7 @@
        DaysAccumulateRecharge, //累计充值，多日

        CollectWords,   //收集文字

        HolidayLogin,   //节日登录

        HolidayWish,   //节日祝福

        HolidayWish,   //节日祝福灯笼

        HolidayMultiRecharge,//节日祝福的多日累计充值

        HolidayTravel,      //节日游历

        max,


 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,//皓月枪功法提升界面