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

Client_PangDeRong

2018-08-22 32e548861974148a835a55026705a7ac454099e6

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

 Core/GameEngine/Login/Launch.cs

@@ -13,11 +13,9 @@
    static public LaunchStage currentStage { get { return m_CurrentStage; } }



    static float m_Progress = 0f;

    static public float progress

    {

    static public float progress {

        get { return m_Progress; }

        set

        {

        set {

            if (m_Progress != value)

            {

                m_Progress = value;

@@ -254,7 +252,7 @@
        while (!LaunchPostProcess.Instance.completed

            && LaunchPostProcess.Instance.progress < (Application.platform == RuntimePlatform.WindowsEditor ? 1f : 0.8f))

        {

            progress = Mathf.Clamp(progressBuf + LaunchPostProcess.Instance.progress * 1.25f, progressBuf, 1f);

            progress = Mathf.Clamp(progressBuf + LaunchPostProcess.Instance.progress * (1 - progressBuf) , progressBuf, 1f);

            yield return null;

        }




 System/Realm/RealmUpWin.cs

@@ -56,13 +56,16 @@
        [SerializeField, Header("下一境界位置")] Vector3[] m_RealmNextwPositions;

        [SerializeField, Header("Boss位置")] Vector3[] m_BossPositions;

        [SerializeField, Header("Boss出现延长")] float m_DelayEnterTime = 1f;



        [SerializeField, Header("出场总时长")] float m_BossEnterDuration = 3f;

        int cacheRealmPoint = 0;

        Coroutine cacheCoroutine = null;

        const string State_EnterHash = "Show";

        const string State_IdleHash = "Idle";

        DateTime overdueTime = DateTime.Now;



        RealmModel realmModel { get { return ModelCenter.Instance.GetModel<RealmModel>(); } }







        protected override void BindController()

        {

@@ -81,6 +84,7 @@
            cacheRealmPoint = PlayerDatas.Instance.extersion.realmPoint;

            m_RawBoss.gameObject.SetActive(false);

            m_RawPlayer.gameObject.SetActive(false);

            overdueTime = DateTime.Now;

            Display();

        }



@@ -109,6 +113,7 @@
            if (realmModel.realmDungeonState)

            {

                m_RealmDungeonSfx.Play();

                overdueTime = DateTime.Now.AddSeconds(m_BossEnterDuration);

                StartCoroutine(Co_DisplayBossShow());

            }

            realmModel.realmDungeonState = false;

@@ -336,6 +341,10 @@
            var config = Config.Instance.Get<RealmConfig>(PlayerDatas.Instance.baseData.realmLevel);

            if (_realmPoint >= config.NeedPoint)

            {

                if (DateTime.Now < overdueTime)

                {

                    return;

                }

                PlayerDatas.Instance.realm.realmHelpList.Clear();

                if (config.IsBigRealm == 1)

                {