Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2019-01-14 003d879535560c7bf953eac7fadf8361321f9c10

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Core/NetworkPackage/DTCFile/ServerPack/HAA_SaleActivity/DTCAA0A_tagMCWeekPartyInfo.cs

@@ -6,8 +6,10 @@






public class DTCAA0A_tagMCWeekPartyInfo : DtcBasic {
    OpenServiceAchievementModel model { get { return ModelCenter.Instance.GetModel<OpenServiceAchievementModel>(); } }

    public override void Done(GameNetPackBasic vNetPack) {

public class DTCAA0A_tagMCWeekPartyInfo : DtcBasic

{
    OpenServiceAchievementModel model { get { return ModelCenter.Instance.GetModel<OpenServiceAchievementModel>(); } }

    public override void Done(GameNetPackBasic vNetPack)

    {

        base.Done(vNetPack);


        HAA0A_tagMCWeekPartyInfo vNetData = vNetPack as HAA0A_tagMCWeekPartyInfo;
        if (vNetData == null)

        {


 Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA0A_tagMCWeekPartyInfo.cs

@@ -6,6 +6,7 @@
public class HAA0A_tagMCWeekPartyInfo : 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;    // 限制等级


@@ -21,6 +22,7 @@
    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);


@@ -46,7 +48,7 @@
            ActionInfo[i] = new tagMCWeekPartyAction();


            TransBytes (out ActionInfo[i].TemplateID, vBytes, NetDataType.DWORD);


            TransBytes (out ActionInfo[i].ActionType, vBytes, NetDataType.WORD);


            TransBytes (out ActionInfo[i].TotalTimes, vBytes, NetDataType.BYTE);

            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);


@@ -71,7 +73,7 @@
    public struct tagMCWeekPartyAction {


        public uint TemplateID;        // 模板ID


        public ushort ActionType;        // 活动类别


        public byte TotalTimes;        // 可完成的总次数，0表示不限次数

        public uint TotalTimes;        // 可完成的总次数，0表示不限次数

        public uint SingleTimes;        // 单次领奖需要的次数


        public uint Point;        // 单次领奖积分


        public byte Count;        // 物品数



 System/KnapSack/Logic/ItemInfoWin.cs

@@ -185,6 +185,7 @@
                    mountSkillDict = itemTipsModel.GetMountSkillDict(itemTipsModel.curAttrData.itemConfig.EffectValueA1);

                    modelShow.SetModelShow(horseConfig.Model, ModelShowType.mount, Language.Get("TreasureEffect103"), horseConfig.ShowFightPower);

                    break;

                case 82:

                case 83:

                    bgObj.anchoredPosition3D = new Vector3(197, 0, 0);

                    modelShow.gameObject.SetActive(true);


 System/MainInterfacePanel/HighSettingFadeInFadeOut.cs

@@ -83,6 +83,7 @@
            limitedTimePackageItemModel.UpdateLimitedTimePackageItem += UpdateLimitedTimePackageItem;

            impactRankModel.inImpactRankUpdate += InImpactRankUpdate;

            OpenServerModel.IsOpenEvent += IsOpenEvent;

            OpenServerModel.IsPreviewTimeUpdate += IsOpenEvent;

        }



        public void Unit()

@@ -98,6 +99,7 @@
            limitedTimePackageItemModel.UpdateLimitedTimePackageItem -= UpdateLimitedTimePackageItem;

            impactRankModel.inImpactRankUpdate -= InImpactRankUpdate;

            OpenServerModel.IsOpenEvent -= IsOpenEvent;

            OpenServerModel.IsPreviewTimeUpdate -= IsOpenEvent;

        }



        private void IsOpenEvent()


 System/OpenServerActivity/OpenServiceAchievementCell.cs

@@ -71,9 +71,10 @@
                    Obj.SetActive(false);

                }

            }

            if (model.SelectedNow != model.DayNow)

            bool IsOpenPreviewTime = model.IsPreviewTime();

            if (model.SelectedNow != model.DayNow || IsOpenPreviewTime)

            {

                if (model.SelectedNow > model.DayNow)//还未到达的天数

                if (model.SelectedNow > model.DayNow || IsOpenPreviewTime)//还未到达的天数

                {

                    m_Btn.gameObject.SetActive(false);

                    m_TextNumber.gameObject.SetActive(false);


 System/OpenServerActivity/OpenServiceAchievementModel.cs

@@ -70,7 +70,11 @@
    public Redpoint redPointStre1 = new Redpoint(214, Redpoint_key1);

    private int _SelectedNow = 0;

    private int ResetType = 0;// 重置类型，0-0点重置；1-5点重置

    public event Action IsOpenEvent;

    private int AdvanceMinutes = 0;//提前显示分钟

    private bool isPreviewTime = false;

    private bool isOpenNow = false;

    public event Action IsOpenEvent;//功能是否开启

    public event Action IsPreviewTimeUpdate;//功能是否提前开启

    private int _JumpIndex = -1;//跳转选中值

    public int JumpIndex

    {

@@ -105,6 +109,8 @@


    public void OnBeforePlayerDataInitialize()

    {

        isOpenNow = false;

        isPreviewTime = false;

    }



    public void OnPlayerLoginOk()

@@ -115,7 +121,18 @@


    private void secondEvent()

    {

        bool _bool = IsPreviewTime();

        if (_bool && !isPreviewTime)

        {

            isPreviewTime = true;

            _IsOpen = true;

            if (IsPreviewTimeUpdate != null)

            {

                IsPreviewTimeUpdate();

            }

        }

        GetIsOpen();//判断功能是否开启



    }



    public override void UnInit()

@@ -132,22 +149,38 @@
            WeekPartyDayInfo.DayIndex = (int)DayInfo.DayIndex;

            WeekPartyDayInfo.Point = (int)DayInfo.Point;

            WeekPartyDayInfo.AwardRecord = (int)DayInfo.AwardRecord;

            WeekPartyDayInfo.ActionType = new ActionTypeClass[DayInfo.ACount];

            for (int k = 0; k < DayInfo.ACount; k++)

            {

                var Task = DayInfo.TaskList[k];

                ActionTypeClass ActionType = new ActionTypeClass();

                ActionType.TemplateID = Task.TemplateID;

                ActionType.CurTimes = Task.CurTimes;

                ActionType.GotTimes = Task.GotTimes;

                WeekPartyDayInfo.ActionType[k] = ActionType;

            }

          
            if (WeekPartyDayInfoDic.ContainsKey((int)DayInfo.DayIndex))

            {

                WeekPartyDayInfoDic[(int)DayInfo.DayIndex] = WeekPartyDayInfo;

                var dit = WeekPartyDayInfoDic[(int)DayInfo.DayIndex];

                dit.DayIndex= (int)DayInfo.DayIndex; 
                dit.Point = (int)DayInfo.Point; 
                dit.AwardRecord= (int)DayInfo.AwardRecord;

                for (int j = 0; j < dit.ActionType.Length; j++)

                {

                    if (dit.ActionType[j].TemplateID == DayInfo.TaskList[0].TemplateID)

                    {

                        ActionTypeClass ActionType = new ActionTypeClass();

                        ActionType.TemplateID = DayInfo.TaskList[0].TemplateID;

                        ActionType.CurTimes = DayInfo.TaskList[0].CurTimes;

                        ActionType.GotTimes = DayInfo.TaskList[0].GotTimes;

                        dit.ActionType[j] = ActionType;

                    }        
                }

                WeekPartyDayInfoDic[(int)DayInfo.DayIndex] = dit;

            }

            else

            {

                WeekPartyDayInfo.ActionType = new ActionTypeClass[DayInfo.ACount];

                for (int k = 0; k < DayInfo.ACount; k++)

                {

                    var Task = DayInfo.TaskList[k];

                    ActionTypeClass ActionType = new ActionTypeClass();

                    ActionType.TemplateID = Task.TemplateID;

                    ActionType.CurTimes = Task.CurTimes;

                    ActionType.GotTimes = Task.GotTimes;

                    WeekPartyDayInfo.ActionType[k] = ActionType;

                }

                WeekPartyDayInfoDic.Add((int)DayInfo.DayIndex, WeekPartyDayInfo);

            }

        }

@@ -183,7 +216,7 @@
            TimeDayBeginAndOver[1] = TimeDay;

        }

        LimitLV = info.LimitLV;



        AdvanceMinutes = info.AdvanceMinutes;

        for (int i = 0; i < info.DayCnt; i++)

        {

            int Index = i;

@@ -254,7 +287,7 @@
    }

    public int GetRewardNumber(int Day, int ID)//获取领奖次数

    {

        int Num = -1;

        int Num =0;

        if (WeekPartyDayInfoDic.ContainsKey(Day))

        {

            var WeekPartyDay = WeekPartyDayInfoDic[Day];

@@ -320,6 +353,10 @@
        DateTime time2 = new DateTime(TimeUtility.ServerNow.Year, TimeUtility.ServerNow.Month, TimeUtility.ServerNow.Day, TimeUtility.ServerNow.Hour, TimeUtility.ServerNow.Minute, TimeUtility.ServerNow.Second);

        TimeSpan ts = time2.Subtract(time1);

        Day = (int)ts.TotalDays;

        if (Day <= 0)

        {

            Day = 0;

        }

        DebugEx.LogError("输出当前的天数" + Day);

        DayNow = Day;

    }

@@ -496,8 +533,9 @@
        DateTime timeEnd = new DateTime(time2.Year, time2.Month, time2.Day, hour, 0, 0);

        DateTime timeNow= new DateTime(TimeUtility.ServerNow.Year, TimeUtility.ServerNow.Month, TimeUtility.ServerNow.Day, TimeUtility.ServerNow.Hour, TimeUtility.ServerNow.Minute, TimeUtility.ServerNow.Second);

        int PlayerLv = PlayerDatas.Instance.baseData.LV;

        if (PlayerLv >= LimitLV && timeNow >= timeStar && timeNow < timeEnd && !_IsOpen)

        if (PlayerLv >= LimitLV && timeNow >= timeStar && timeNow < timeEnd && !isOpenNow)

        {

            isOpenNow = true;

            _IsOpen = true;

            if (IsOpenEvent != null)

            {

@@ -505,8 +543,9 @@
            }



        }

        if (timeNow > timeEnd && _IsOpen)

        if (timeNow > timeEnd && isOpenNow)

        {

            isOpenNow = false;

            _IsOpen = false;

            if (IsOpenEvent != null)

            {

@@ -537,6 +576,35 @@
        }

        return Isbool;

    }



    public bool IsPreviewTime()//是否再预览时间

    {

        bool _bool = false;

        var time1 = TimeDayBeginAndOver[0];

        var time2 = TimeDayBeginAndOver[1];

        if (TimeDayBeginAndOver.Length <= 0 || time1 == null || time2 == null)

        {

            return _bool;

        }

        int hour = 0;

        if (ResetType == 0)

        {

            hour = 0;

        }

        else

        {

            hour = 5;

        }

        DateTime timeStar = new DateTime(time1.Year, time1.Month, time1.Day, hour, 0, 0);

        var TimeStar2 = timeStar.AddMinutes(-AdvanceMinutes);

        DateTime timeNow = new DateTime(TimeUtility.ServerNow.Year, TimeUtility.ServerNow.Month, TimeUtility.ServerNow.Day, TimeUtility.ServerNow.Hour, TimeUtility.ServerNow.Minute, TimeUtility.ServerNow.Second);



        if (timeNow >= TimeStar2 && timeNow < timeStar)

        {

            _bool = true;

        }

        return _bool;

    }

}



 System/OpenServerActivity/OpenServiceAchievementWin.cs

@@ -213,7 +213,7 @@
                        var config = Config.Instance.Get<WeekPartyConfig>(TemplateId);

                        if (config == null)

                        {

                            return;

                            continue;

                        }

                        if (config.DailyQusetId != 0)

                        {

@@ -298,7 +298,7 @@
                {

                    TaypeNumber = (carryOutNum - rewardNum) / WeekPartyAction.SingleTimes;

                }

                if (TaypeNumber <= 0)

                if (TaypeNumber <= 0 && number> rewardNum)

                {

                    Bool = true;

                }

@@ -314,7 +314,7 @@
                int number = WeekPartyAction.TotalTimes / WeekPartyAction.SingleTimes;

                int rewardNum = model.GetRewardNumber(model.SelectedNow, ID);//已领奖次数

                int carryOutNum = model.GetCarryOutNum(model.SelectedNow, ID);//已完成次数

                if (rewardNum > number)

                if (rewardNum >= number)

                {

                    Bool = true;

                }


 System/OpenServerActivity/OpenServiceItem.cs

@@ -41,6 +41,7 @@
            int Point = model.GetPoint(day);           

            m_TextPoint.text = Language.Get("OSA_3", item.NeedPoint);

            bool IsBool = model.IsDayReward(model.SelectedNow, index);

        
            if (model.SelectedNow > model.DayNow)

            {

                m_ReceiveBtn.gameObject.SetActive(false);


 System/SystemSetting/SettingEffectMgr.cs

@@ -201,6 +201,14 @@
    {

        if (playerPack.GetReaminGridCount(PackType.rptItem) < 5 && modelInterface.isPackResetOk)

        {

            if (HangUpSetModel.Instance.GetBool(HangUpAutoBoolType.isAutoSell)

             && !isStartOneKeySell

             && modelInterface.GetSellItemList().Count > 0)

            {

                modelInterface.SendOneKeySellQuest(modelInterface.GetSellItemList());

                return;

            }



            if (HangUpSetModel.Instance.GetBool(HangUpAutoBoolType.isAutoDevour) && !isStartDecompose)

            {

                if(playerPack.IsReachMinDecomposeNum())

@@ -208,14 +216,6 @@
                    playerPack.SendEquipdevourQuest();

                    return;

                }

            }



            if (HangUpSetModel.Instance.GetBool(HangUpAutoBoolType.isAutoSell) 
                && !isStartOneKeySell

                && modelInterface.GetSellItemList().Count > 0)

            {

                modelInterface.SendOneKeySellQuest(modelInterface.GetSellItemList());

                return;

            }

        }

    }