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

client_linchunjie

2018-11-26 00d2b9e879d54e0b4edab78faa86651299313e77

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

 System/Dungeon/DungeonAssistModel.cs

@@ -4,6 +4,7 @@
using System.Text;

using TableConfig;

using LitJson;

using UnityEngine;



namespace Snxxz.UI

{

@@ -313,7 +314,7 @@
                string[] infos = helpInfolist[i].Split('|');

                if(infos != null && infos.Length >= 3)

                {

                    infos[2] = false.ToString();

                    helpInfolist[i] = StringUtility.Contact(infos[0], "|", infos[1], "|", false);

                }

            }

            LocalSave.DeleteKey(helpInfoLocalSave);

@@ -477,7 +478,7 @@
        {

            var severTime = TimeUtility.ServerNow;

            return StringUtility.Contact(severTime.Year.ToString("D2"), ":", severTime.Month.ToString("D2"), ":"

                , severTime.Day.ToString("D2"), severTime.Hour.ToString("D2"), severTime.Minute.ToString("D2")

                , severTime.Day.ToString("D2"), ":",severTime.Hour.ToString("D2"), ":",severTime.Minute.ToString("D2"),":"

                , severTime.Second.ToString("D2"));

        }




 System/Dungeon/DungeonAssistWin.cs

@@ -53,6 +53,7 @@
        {

            assistModel.UpdateResultEvent -= UpdateResult;

            assistModel.UpdateCheckInResultEvent -= UpdateCheckInResult;

            assistModel.SetHelpInfoRead();

        }



        protected override void OnAfterClose()


 System/Dungeon/DungeonGetXianYuanCoinsBehvaiour.cs

@@ -1,4 +1,5 @@
using TableConfig;

using System;

using TableConfig;

using UnityEngine;

using UnityEngine.UI;



@@ -15,10 +16,16 @@
                return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<DungeonModel>());

            }

        }



        Window window = null;

        private void OnEnable()

        {

            SetDisplay();

            GetParentWindow(this.transform);

            WindowCenter.Instance.windowBeforeOpenEvent += BeforeOpen;

        }

        private void OnDisable()

        {

            WindowCenter.Instance.windowBeforeOpenEvent -= BeforeOpen;

        }



        public void SetDisplay()

@@ -65,5 +72,26 @@
            }

          

        }



        public void GetParentWindow(Transform obj)

        {

           var _window = obj.GetComponent<Window>();

            if(_window == null)

            {

                var parent = obj.transform.parent;

                GetParentWindow(parent);

            }

            else

            {

                this.window = _window;

            }

        }



        private void BeforeOpen(Window win)

        {

            if (window == null || win != window) return;



            SetDisplay();

        }

    }

}