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

client_Zxw

2018-11-22 3db0551a547745bf0cb98bc21c8489f4ef98a514

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

 Core/GameEngine/Login/Launch.cs

@@ -13,9 +13,11 @@
    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;

@@ -138,16 +140,27 @@
        }

    }



    private byte m_Step = 0;



    void Start()

    {

        m_Step = 0;

        SoundPlayer.Instance.PlayLoginMusic();

        Config.Instance.PreLoadConfigs();

        ServerListCenter.Instance.RequestJumpUrl();



        WindowCenter.Instance.OpenFromLocal<LaunchWin>();

        DebugUtility.Instance.CreateDebugRoot();



        StartCoroutine(Co_Lanuch());

    }



    void Update()

    {

        if (m_Step == 1)

        {

            ServerListCenter.Instance.RequestJumpUrl();

            m_Step = 2;

        }

    }



    IEnumerator Co_Lanuch()

@@ -158,6 +171,8 @@
            yield return null;

        }

#endif



        m_Step = 1;

        var cpu = 2;

        var memory = 2048;

        DeviceUtility.GetCpuAndMemory(out cpu, out memory);


 Fight/Actor/Status/Status_Base.cs

@@ -60,7 +60,7 @@


                    if (_playEffect)

                    {

                        m_Effect = SFXPlayUtility.Instance.PlayEffectAsync(m_SkillConfig.BuffEffectID, _target);

                        m_Effect = SFXPlayUtility.Instance.PlayBattleEffect(m_SkillConfig.BuffEffectID, _target);

                        if (m_Effect)

                        {

                            m_Effect.m_OnFinished += OnEffectOver;


 System/Dungeon/DungeonFightWin.cs

@@ -102,6 +102,7 @@


            model.dungeonCoolDownEvent += OnLeaveMapTimeEvent;

            MainInterfaceWin.Event_Duplicates += OnChangeFuncBtnPosEvent;

            WindowCenter.Instance.windowAfterCloseEvent += WindowAfterCloseEvent;

            if (WHYJBool())

            {

                m_Container_WHYJ.SetActive(true);

@@ -139,6 +140,7 @@
            DropItemManager.pickUpCallBack -= OnPickItem;

            MainInterfaceWin.Event_Duplicates -= OnChangeFuncBtnPosEvent;

            model.dungeonCoolDownEvent -= OnLeaveMapTimeEvent;

            WindowCenter.Instance.windowAfterCloseEvent -= WindowAfterCloseEvent;

        }



        protected override void OnAfterClose()

@@ -154,6 +156,19 @@
        }

        #endregion



        private void WindowAfterCloseEvent(Window window)

        {

            if (window is TreasureBaseWin)

            {

                if (m_Tweener != null)

                {

                    m_Tweener.Kill(false);

                    m_Tweener = null;

                }

                m_ContainerFuncBtn.localPosition = MainInterfaceWin.recordPositionBool ?

                    m_ContainerFuncBottom.localPosition : m_ContainerFuncUp.localPosition;

            }

        }



        private void OnLeaveMapTimeEvent(DungeonCoolDownType _type)

        {


 System/Dungeon/DungeonInspireBehaviour.cs

@@ -72,7 +72,7 @@
            if (m_InspireProgress != null)

            {

                m_InspireProgress.gameObject.SetActive(PlayerDatas.Instance.baseData.MapID == DemonJarModel.DEMONJAR_MAPID);

                m_InspireProgress.text = StringUtility.Contact(level * 10, "%");

                m_InspireProgress.text = StringUtility.Contact(level * model.GetDungeonInspireUpper(mapId), "%");

            }

            if (!m_Waggle)

            {


 System/Dungeon/DungeonInspireWin.cs

@@ -24,6 +24,7 @@
        [SerializeField] Text m_InspireLevel;

        [SerializeField] Text m_Remind;

        [SerializeField] Text m_DemonJarDoubleRemind;

        [SerializeField] Text m_InspireHurt;

        [SerializeField] Button m_Confirm;

        [SerializeField] Button m_Cancel;

        [SerializeField] Button m_Close;

@@ -52,7 +53,8 @@


        protected override void OnPreOpen()

        {

            var _list = model.GetDungeonInspire(PlayerDatas.Instance.baseData.MapID);

            var mapId = PlayerDatas.Instance.baseData.MapID;

            var _list = model.GetDungeonInspire(mapId);

            if (_list == null)

            {

                return;

@@ -82,6 +84,9 @@
            UpdateInspireType();

            DisplayRemind();



            var singleHurt = model.GetDungeonInspireUpper(mapId);

            m_InspireHurt.text = Language.Get("InspireRemind", singleHurt, model.GetInspireMaxCount(mapId) * singleHurt);



            model.dungeonInspireLvEvent += DungeonEncourageEvent;

        }