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

client_Zxw

2018-09-30 6e06713184840bbf60e9d4994ab919212dca4eb1

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

 System/ClientVersion/VersionConfig.cs

@@ -95,12 +95,6 @@
    [SerializeField] string m_BanHao;

    public string banHao { get { return m_BanHao; } }



    [SerializeField] string m_AuditOutTime;

    public string auditOutTime {

        get { return m_AuditOutTime; }

        set { m_AuditOutTime = value; }

    }



    public void Read(string _data)

    {

        var dataStrings = _data.Split('\t');

@@ -183,7 +177,6 @@
        _to.m_ClientPackageFlag = _from.m_ClientPackageFlag;

        _to.m_LogoPosition = _from.m_LogoPosition;

        _to.m_BanHao = _from.m_BanHao;

        _to.m_AuditOutTime = _from.m_AuditOutTime;

    }



    /// <summary>


 System/ClientVersion/VersionUtility.cs

@@ -285,7 +285,11 @@


        try

        {

            if (DateTime.TryParse(VersionConfig.Get().auditOutTime, out dateTime))

            var textAsset = Resources.Load<UnityEngine.TextAsset>("Config/AuditTime");

            var content = string.Empty;

            if (textAsset != null)

            {

                if (DateTime.TryParse(content, out dateTime))

            {

                return DateTime.Now < dateTime;

            }

@@ -294,6 +298,11 @@
                return false;

            }

        }

            else

            {

                return false;

            }

        }

        catch (System.Exception ex)

        {

            return false;


 System/FairylandCeremony/FairylandCeremonyWin.cs

@@ -15,6 +15,8 @@
        [SerializeField] Button rightBtn;

        [SerializeField] Button closeBtn;



        FairylandCeremonyModel ceremonyModel { get { return ModelCenter.Instance.GetModel<FairylandCeremonyModel>(); } }



        protected override void BindController()

        {



@@ -38,6 +40,17 @@
        protected override void OnActived()

        {

            base.OnActived();

            if(!WindowJumpMgr.Instance.IsJumpState && functionOrder == 0)

            {

                if(ceremonyModel.rechargeRedp.state == RedPointState.Simple)

                {

                    functionOrder = rechargeFunc.order;

                }

                else if(ceremonyModel.peopleRedp.state == RedPointState.Simple)

                {

                    functionOrder = peopleToHiFunc.order;

                }

            }

            funcBtnGroup.TriggerByOrder(functionOrder);

        }




 System/FriendSystem/MailAllModel.cs

@@ -63,20 +63,28 @@
    }



    AwardExchangeModel exchangeModel { get { return ModelCenter.Instance.GetModel<AwardExchangeModel>(); } }



    bool isLogin = true;

    public MailAllModel()

    {

        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += BeforePlayerDataInit;

        DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent += OnPlayerLoginOk;

    }



    private void BeforePlayerDataInit()

    {

        isLogin = true;

        funcType = MailFuncType.Mail;

        mailModelDict.Clear();

        timeOrderMailInfo.Clear();

        mailTitleStr = "";

        mailContentstr = "";

        mailSendPersonStr = "";

    }





    private void OnPlayerLoginOk()

    {

        isLogin = false;

    }



    public MailFuncType funcType = MailFuncType.Mail;

@@ -171,6 +179,16 @@
                    {

                        exchangeModel.SetAwardExchangeModel(info.Items);

                    }



                    if(!isLogin)

                    {

                       if (info.Count > 0 || info.Gold > 0 || info.GoldPaper > 0

                          || info.Silver > 0)

                        {

                            SoundPlayer.Instance.PlayUIAudio(740);

                        }

                    }

                 
                }

            }

            addMailCnt = mailModelDict.Count - preMailCnt;


 System/MainInterfacePanel/TopRightTip.cs

@@ -27,10 +27,8 @@


        private void OpenMapWin()

        {

            var mapResConfig = DTCA127_tagMCStartChangeMap.GetMapResourcesConfig();

            var config = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);

            if (string.IsNullOrEmpty(mapResConfig.BigMap)

                || PlayerDatas.Instance.baseData.MapID == FairyLeagueModel.FAIRY_LEAGUE_DUNGEON)

            var canOpen = ModelCenter.Instance.GetModel<MapModel>().CanOpenLocalMapWin(PlayerDatas.Instance.baseData.MapID);

            if (!canOpen)

            {

                SysNotifyMgr.Instance.ShowTip("MapInfo1");

            }


 System/Tip/ItemConfirmWin.cs

@@ -77,8 +77,22 @@


        private void ShowItemGetPath()

        {

            ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(ConfirmCancel.generalItemId);

            if(itemConfig != null)

            {

                if(itemConfig.GetWay != null && itemConfig.GetWay.Length > 0)

                {

            ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(ConfirmCancel.generalItemId);

        }

                else

                {

                    ItemAttrData attrData = new ItemAttrData(ConfirmCancel.generalItemId);

                    var tipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>();

                    tipsModel.SetItemTipsModel(attrData);

                }

            }

          
        }

    }



}


 System/WindowJump/WindowJumpMgr.cs

@@ -46,7 +46,7 @@
    TrialDungeonModel trialDungeonModel { get { return ModelCenter.Instance.GetModel<TrialDungeonModel>(); } }

    ImpactRankModel rankModel { get { return ModelCenter.Instance.GetModel<ImpactRankModel>(); } }

    ComposeWinModel composeModel { get { return ModelCenter.Instance.GetModel<ComposeWinModel>(); } }



    MapModel mapModel { get { return ModelCenter.Instance.GetModel<MapModel>(); } }

    public bool IsJumpState { get; private set; }

    public int jumpPhase { get; private set;}

    public int jumpType { get; private set; }

@@ -131,6 +131,13 @@
                    return;

                }

                break;

            case JumpUIType.BigMap:

                if(!mapModel.CanOpenLocalMapWin(PlayerDatas.Instance.baseData.MapID))

                {

                    SysNotifyMgr.Instance.ShowTip("MapInfo1");

                    return;

                }

                break;

            case JumpUIType.TreasureFindHostFunc1:

            case JumpUIType.TreasureFindHostFunc2:

            case JumpUIType.TreasureFindHostFunc3:


 System/WorldMap/MapModel.cs

@@ -293,6 +293,21 @@
            return null;

        }



        public bool CanOpenLocalMapWin(int mapId)

        {

            var mapResConfig = DTCA127_tagMCStartChangeMap.GetMapResourcesConfig();

            var config = Config.Instance.Get<MapConfig>(mapId);

            if (string.IsNullOrEmpty(mapResConfig.BigMap)

                || mapId == FairyLeagueModel.FAIRY_LEAGUE_DUNGEON)

            {

                return false;

            }

            else

            {

                return true;

            }

        }



        public int GetRecommendHangPoint(int _mapId)

        {

            var eventPoints = new List<int>(GetMapEventPoints(_mapId));