Revert "Merge remote-tracking branch 'origin/2960仙盟抢Boss活动'"

Client_PangDeRong

2018-08-28 b21516e7f3101b9c8d124f056ec6878ad3083753

Revert "Merge remote-tracking branch 'origin/2960仙盟抢Boss活动'"

This reverts commit 6d4729bc4b9226c041ef335f8c186a02fd96f4da, reversing
changes made to be401aa80aef930f754c3f3d3bdd51600081f5f8.

 Core/GameEngine/Model/Config/FairyGrabBossConfig.cs

File was deleted

 Core/GameEngine/Model/Config/FairyGrabBossConfig.cs.meta

File was deleted

 Core/GameEngine/Model/ConfigManager.cs

@@ -187,7 +187,6 @@
        AddAsyncTask<TrialExchangeConfig>();

        AddAsyncTask<TrialRewardsConfig>();

        AddAsyncTask<DogzEquipPlusConfig>();

        AddAsyncTask<FairyGrabBossConfig>();

        while (!AllCompleted())

        {

            var completedCount = 0;


 System/FairyAu/FairyGrabBossBehaviour.cs

File was deleted

 System/FairyAu/FairyGrabBossBehaviour.cs.meta

File was deleted

 System/FairyAu/FairyGrabBossModel.cs

File was deleted

 System/FairyAu/FairyGrabBossModel.cs.meta

File was deleted

 System/FairyAu/FairyGrabBossWin.cs

File was deleted

 System/FairyAu/FairyGrabBossWin.cs.meta

File was deleted

 System/FindPrecious/LootPreciousFrameWin.cs

@@ -5,8 +5,7 @@
using UnityEngine;
using System.Collections;
using UnityEngine.UI;
using System;




namespace Snxxz.UI
{

@@ -15,13 +14,10 @@

        [SerializeField] FunctionButtonGroup m_FunctionGroup;
        [SerializeField] FunctionButton m_DemonJar;
        [SerializeField] FunctionButton m_FairyGrabBoss;

        [SerializeField] Button m_Left;
        [SerializeField] Button m_Right;
        [SerializeField] Button m_Close;

        FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }

        #region Built-in
        protected override void BindController()
@@ -31,17 +27,15 @@
        protected override void AddListeners()
        {
            m_DemonJar.AddListener(ShowDemonJar);
            m_FairyGrabBoss.AddListener(FairyGrabBoss);

            m_Left.AddListener(ShowLastFunction);
            m_Right.AddListener(ShowNextFunction);
            m_Close.AddListener(CloseClick);
        }



        }

        protected override void OnPreOpen()
        {
            fairyGrabBossModel.stateUpdate += FairyGrabBossUpdate;
            m_FairyGrabBoss.state = fairyGrabBossModel.IsOpen ? TitleBtnState.Normal : TitleBtnState.Locked;

        }

        protected override void OnAfterOpen()
@@ -49,16 +43,14 @@
        }

        protected override void OnPreClose()
        {

            fairyGrabBossModel.stateUpdate -= FairyGrabBossUpdate;

        {
            CloseSubWindows();
            if (!WindowJumpMgr.Instance.IsJumpState)
            {
                WindowCenter.Instance.Open<MainInterfaceWin>();
            }
        }



        }

        protected override void OnAfterClose()
        {

@@ -82,22 +74,9 @@
            functionOrder = m_DemonJar.order;
        }

        private void FairyGrabBoss()

        {

            CloseSubWindows();
            WindowCenter.Instance.Open<FairyGrabBossWin>();
            functionOrder = m_FairyGrabBoss.order;

        }

        private void FairyGrabBossUpdate()

        {

            m_FairyGrabBoss.state = fairyGrabBossModel.IsOpen ? TitleBtnState.Normal : TitleBtnState.Locked;
        }

        private void CloseSubWindows()
        {
            WindowCenter.Instance.CloseImmediately<DemonJarWin>();
            WindowCenter.Instance.CloseImmediately<FairyGrabBossWin>();
        }

        private void ShowLastFunction()

 System/WindowBase/ModelCenter.cs

@@ -189,7 +189,6 @@
            RegisterModel<MultipleRealmPointModel>();

            RegisterModel<DogzModel>();

            RegisterModel<TreasureSoulModel>();

            RegisterModel<FairyGrabBossModel>();

            inited = true;

        }




 Utility/EnumHelper.cs

@@ -308,7 +308,6 @@
    BossHome = 24,

    PersonalBoss = 25,

    ElderGodArea = 26,

    FairyGrabBoss = 27,

}



public enum ActivityPrepareType