4384 【前端】【1.2.0】绑玉转盘入口移到精彩活动里面

client_Zxw

2018-10-27 627237eaf7d006e6edaadc2d2ddfcadbf3153500

4384 【前端】【1.2.0】绑玉转盘入口移到精彩活动里面

 System/OpenServerActivity/ImpactRankModel.cs

@@ -789,6 +789,8 @@
            FlashRushToBuy,

            [Header("许愿池")]

            WishingPool,

            [Header("绑玉转盘")]

            WheelOfrtune,

        }

    }




 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -558,6 +558,9 @@
                case 15:

                    WindowCenter.Instance.Open<WishingPoolWin>(true);

                    break;

                case 16:

                    WindowCenter.Instance.Open<WheelOfFortuneWin>(true);

                    break;

            }

        }



@@ -595,6 +598,7 @@
            WindowCenter.Instance.CloseImmediately<FairyGrabBossNoticeWin>();

            WindowCenter.Instance.CloseImmediately<FlashRushToBuyWin>();

            WindowCenter.Instance.CloseImmediately<WishingPoolWin>();

            WindowCenter.Instance.CloseImmediately<WheelOfFortuneWin>();

        }



        private int Compare(int order_x, int order_y)


 System/Vip/VipInvest/WheelOfFortuneModel.cs

@@ -12,7 +12,7 @@
namespace Snxxz.UI
{

    public class WheelOfFortuneModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
    public class WheelOfFortuneModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity
    {
        public class AngleClass
        {
@@ -26,16 +26,50 @@
        public float AngleSave = 0f;//角度记录
        public Dictionary<int, AngleClass> AngleDic = new Dictionary<int, AngleClass>();
        private double[][] AngleList;
        public event Action<float> WheelOfFortuneUpdate;

        public event Action<float> WheelOfFortuneUpdate;

        public event Action<int> onStateUpate;



        private string StrKey = string.Empty;
        private bool IsOk = false;
        private const int Redpoint_key1 = 20106;//幸运转盘红点
        public Redpoint redPointStre1 = new Redpoint(201, Redpoint_key1);
        private const int Redpoint_key1 = 20916;//幸运转盘红点
        public Redpoint redPointStre1 = new Redpoint(209, Redpoint_key1);
        VipModel m_Vipmodel;
        VipModel vipmodel { get { return m_Vipmodel ?? (m_Vipmodel = ModelCenter.Instance.GetModel<VipModel>()); } }
        VipModel vipmodel { get { return m_Vipmodel ?? (m_Vipmodel = ModelCenter.Instance.GetModel<VipModel>()); } }



        public bool IsOpen

        {

            get

            {

                return FuncOpen.Instance.IsFuncOpen(144);

            }

        }



        public bool IsAdvance

        {

            get

            {

                return false;

            }

        }



        public bool priorityOpen

        {

            get

            {

                if (redPointStre1.state == RedPointState.Simple)

                {

                    return true;

                }

                else

                {

                    return false;

                }

            }

        }



        public override void Init()
        {
        {

            OpenServerActivityCenter.Instance.Register(16, this);
            var BindJadewheel = Config.Instance.Get<FuncConfigConfig>("BindJadeWheelCfg");
            NeedJade = int.Parse(BindJadewheel.Numerical1);
            AngleList = JsonMapper.ToObject<double[][]>(BindJadewheel.Numerical5);
@@ -81,6 +115,10 @@
        {
            if (obj == 144)
            {
                if (onStateUpate != null)

                {

                    onStateUpate(16);

                }
                RedPoint();
            }
        }

 System/Welfare/WelfareWin.cs

@@ -19,7 +19,6 @@
        [SerializeField] FunctionButton Btn_InSeven;

        [SerializeField] FunctionButton m_LevelGiftBtn;

        [SerializeField] FunctionButton m_ExchangeBtn;

        [SerializeField] FunctionButton m_TurntableBtn;

        [SerializeField] FunctionButtonGroup buttonGroup;

        [SerializeField] Button closeBtn;



@@ -40,7 +39,6 @@
            Btn_InSeven.AddListener(InSeven);

            m_LevelGiftBtn.onClick.AddListener(OnLevelGift);

            m_ExchangeBtn.onClick.AddListener(OnExchange);

            m_TurntableBtn.onClick.AddListener(OnTurntableBtn);

            closeBtn.onClick.AddListener(CloseClick);

        }



@@ -98,20 +96,6 @@
            }

            functionOrder = 4;

        }

        private void OnTurntableBtn()

        {

            CloseChildWin();

            if (windowState == WindowState.Opened)

            {

                WindowCenter.Instance.OpenWithoutAnimation<WheelOfFortuneWin>();

            }

            else

            {

                WindowCenter.Instance.Open<WheelOfFortuneWin>();

            }

            functionOrder = 5;



        }

        private void OnSignIn()

        {

            CloseChildWin();

@@ -137,14 +121,6 @@
            else

            {

                Btn_InSeven.gameObject.SetActive(true);

            }

            if (FuncOpen.Instance.IsFuncOpen(144))

            {

                m_TurntableBtn.gameObject.SetActive(true);

            }

            else

            {

                m_TurntableBtn.gameObject.SetActive(false);

            }

            CheckOperationOpen();



@@ -203,10 +179,6 @@
            if (WindowCenter.Instance.IsOpen<AwardExchangeWin>())

            {

                WindowCenter.Instance.CloseImmediately<AwardExchangeWin>();

            }

            if (WindowCenter.Instance.IsOpen<WheelOfFortuneWin>())

            {

                WindowCenter.Instance.CloseImmediately<WheelOfFortuneWin>();

            }

        }