Merge branch 'master' into Skill_Polymorph_BeatBackPlayer

client_Hale

2018-08-24 3b09dd69cba46ea8e25a037385c57624730989d8

Merge branch 'master' into Skill_Polymorph_BeatBackPlayer

 Core/GameEngine/Model/ConfigManager.cs

@@ -478,6 +478,7 @@
    {

        if (isPlaying && _task.state == TaskState.ReadFileFailure)

        {

            Thread.Sleep(30);

            ReadFile(_task, OnEndReadFile<T>);

        }

        else

@@ -493,6 +494,7 @@
        if (isPlaying && _task.state == TaskState.ParseFailure)

        {

            Debug.LogFormat("配置表解析失败：{0}", _task.taskName);

            Thread.Sleep(30);

            ReadFile(_task, OnEndReadFile<T>);

        }

    }


 System/NewBieGuidance/NewBieCenter.cs

@@ -193,7 +193,10 @@
            currentGuide = 0;

            WindowCenter.Instance.CloseImmediately<NewBieWin>();



            completeGuidesBuf.Add(guideRecord);

            if (!completeGuidesBuf.Contains(guideRecord))

            {

                completeGuidesBuf.Add(guideRecord);

            }



            var send = new CA222_tagCMSetGuideOK();

            send.GuideIndex = (byte)_id;


 System/Team/TeamPrepareWin.cs

@@ -34,6 +34,7 @@
        bool rejectManual = false;



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



        #region Built-in

        protected override void BindController()

        {

@@ -48,6 +49,11 @@


        protected override void OnPreOpen()

        {

            if (NewBieCenter.Instance.inGuiding)

            {

                NewBieCenter.Instance.FinishNewBieGuide(NewBieCenter.Instance.currentGuide);

            }



            rejectManual = false;

            if (!model.myTeam.iamCaptainer)

            {

@@ -187,7 +193,7 @@
        IEnumerator Co_DelayCloseWin()

        {

            yield return null;

            WindowCenter.Instance.Open<TeamPrepareWin>();

            WindowCenter.Instance.Close<TeamPrepareWin>();

        }



    }


 System/Treasure/TreasureCyclicScroll.cs

@@ -136,9 +136,15 @@
                    achievementBehaviour.linerMove.from = achievementBehaviour.rectTransform.anchoredPosition;

                    var toY = achievementBehaviour.rectTransform.anchoredPosition.y + cellSize.y + spacing.y;

                    achievementBehaviour.linerMove.to = achievementBehaviour.rectTransform.anchoredPosition.SetY(toY);



                    achievementBehaviour.linerMove.duration = relocationTime;

                    achievementBehaviour.linerMove.Begin();

                    if (achievementBehaviour.linerMove.gameObject.activeInHierarchy)

                    {

                        achievementBehaviour.linerMove.Begin();

                    }

                    else

                    {

                        achievementBehaviour.linerMove.Stop();

                    }

                }

            }

        }


 System/Welfare/MultipleRealmPointModel.cs

@@ -6,7 +6,7 @@
    public class MultipleRealmPointModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity

    {

        public Redpoint multipleRed = new Redpoint(MainRedDot.REDPOINT_OPENSERVER, 20908);

        public string LocalRecord_Key = "MultipleRealmRecord";

        public string LocalRecord_Key;

        bool isNewDay = false;



        public event Action<int> onStateUpate;

@@ -14,7 +14,7 @@
        public override void Init()

        {

            OpenServerActivityCenter.Instance.Register(8, this);

          
            //StageManager.Instance.onStageLoadFinish += CheckReconnect;

        }



        public void OnBeforePlayerDataInitialize()

@@ -29,19 +29,19 @@


        public void OnPlayerLoginOk()

        {

            LocalRecord_Key = StringUtility.Contact(LocalRecord_Key, PlayerDatas.Instance.baseData.PlayerID);

            CheckShowRed();

            LocalRecord_Key = StringUtility.Contact("MultipleRealmRecord", PlayerDatas.Instance.baseData.PlayerID);

            OperationTimeHepler.Instance.operationStartEvent -= RefreshOperationState;

            OperationTimeHepler.Instance.operationStartEvent += RefreshOperationState;

            OperationTimeHepler.Instance.operationEndEvent -= RefreshOperationState;

            OperationTimeHepler.Instance.operationEndEvent += RefreshOperationState;

            OperationTimeHepler.Instance.operationServerCloseEvent -= RefreshOperationClose;

            OperationTimeHepler.Instance.operationServerCloseEvent += RefreshOperationClose;

            CheckShowRed();

        }



        public override void UnInit()

        {

          
            StageManager.Instance.onStageLoadFinish -= CheckReconnect;

        }



        public bool IsOpen

@@ -61,6 +61,15 @@
                return multipleRed.state == RedPointState.Simple;

            }

        }



        private void CheckReconnect()

        {

            if (!(StageManager.Instance.CurrentStage is DungeonStage))

            {

                CheckShowRed();

            }

        }





        private void RefreshOperationClose(Operation type)

        {

@@ -89,16 +98,20 @@


            if(!isNewDay)

            {

              
                if (!PlayerPrefs.HasKey(LocalRecord_Key))

                {

                    DebugEx.Log("设置记录时间：" + TimeUtility.ServerNow.Day);

                    LocalSave.SetInt(LocalRecord_Key, TimeUtility.ServerNow.Day);

                    isNewDay = true;

                }

                else

                {

                    DebugEx.Log("得到记录时间：" + LocalSave.GetInt(LocalRecord_Key));

                    if (TimeUtility.ServerNow.Day != LocalSave.GetInt(LocalRecord_Key))

                    {

                        isNewDay = true;

                        DebugEx.Log("设置记录时间：" + TimeUtility.ServerNow.Day);

                        LocalSave.SetInt(LocalRecord_Key, TimeUtility.ServerNow.Day);

                    }

                }


 System/WindowBase/WindowCenter.cs

@@ -13,7 +13,8 @@
        public event Action<Window> jumpWindowCloseEvent;

        List<string> closeAllIgnoreWindows = new List<string>() {

            "MessageWin", "NewBieWin", "NewItemGetWin", "AttributePromoteShowWin" ,"DungeonBeginCoolDownWin","DungeonFightWin","StatusTipWin"

            ,"ScrollTipWin","MarqueeWin","ExperienceOpenWin","TrumpetWin","BattlePrepareCoolDownWin","DungeonGradeWin","BattleHintWin"

            ,"ScrollTipWin","MarqueeWin","ExperienceOpenWin","TrumpetWin","BattlePrepareCoolDownWin","DungeonGradeWin","BattleHintWin",

            "TreasureDungeonMissionHintWin",

        };



        UIRoot m_UIRoot;


 Utility/ResolutionUtility.cs

@@ -20,7 +20,7 @@
                currentResolution = ConvertResolution(new Vector2(1280, 720));

                break;

            case GameQuality.Medium:

                currentResolution = ConvertResolution(new Vector2(1280, 720));

                currentResolution = ConvertResolution(new Vector2(1920, 1080));

                break;

            case GameQuality.High:

                currentResolution = ConvertResolution(new Vector2(1920, 1080));