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

client_linchunjie

2019-01-04 65343c619da5baaf425deb4d84a7b1e6620beb8f

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

 System/FairyAu/WarehouseTipsWin.cs

@@ -70,8 +70,6 @@
        [SerializeField] Toggle _Togle_13;//十三阶

        [SerializeField] Toggle _Togle_14;//十四阶

        [SerializeField] Toggle _Togle_15;//十五阶

        [SerializeField] Toggle m_Toggle_Start;



        [SerializeField] Text _CountText;//获取当前的积分值

        [SerializeField] GameObject _Dropdown2;//阶数界面

        [SerializeField] GameObject _Dropdown;//装备颜色

@@ -105,7 +103,7 @@
        protected override void AddListeners()

        {

            AddListen();

            m_BtnAdd.AddListener(()=> 
            m_BtnAdd.AddListener(() =>

            {

                GetItemPath.SetChinItemModel(2150);

            });

@@ -129,7 +127,6 @@
            QueryFamilyAction();//家族行为信息查询

            _Dropdown.SetActive(false);

            _Dropdown2.SetActive(false);

            m_Toggle_Start.gameObject.SetActive(false);

            _ExitBtn.gameObject.SetActive(false);

            _DeleteBtn.gameObject.SetActive(false);

            _DonateBtn.gameObject.SetActive(true);

@@ -143,7 +140,7 @@


        protected override void OnAfterOpen()

        {

            if (RedPointUpdate!=null && playerFairyAuTreasureData.IsShowPoint)

            if (RedPointUpdate != null && playerFairyAuTreasureData.IsShowPoint)

            {

                playerFairyAuTreasureData.IsShowPoint = false;

                RedPointUpdate();

@@ -154,7 +151,7 @@


        protected override void OnPreClose()

        {

            if (playerFairyAuTreasureData.JumpItemID!=null && playerFairyAuTreasureData.JumpItemID.Count>0)

            if (playerFairyAuTreasureData.JumpItemID != null && playerFairyAuTreasureData.JumpItemID.Count > 0)

            {

                playerFairyAuTreasureData.JumpItemID.Clear();

            }

@@ -212,7 +209,7 @@
                            AchievementGuideEffect1.transform.SetParentEx(warehouseGrid.ItemCell.transform, Vector3.zero, Vector3.zero, Vector3.one);

                        }

                    }

                    


                    LightUpJudgment(warehouseGrid.Lllume, _bool, playerFairyAuTreasureData._DicfamilyStoreItem[_IndexKey].Index);

                    warehouseGrid.ItemCell.cellBtn.RemoveAllListeners();

                    warehouseGrid.ItemCell.cellBtn.AddListener(() =>

@@ -346,7 +343,6 @@
            _Togle_13.onValueChanged.AddListener(delegate (bool _bool) { Togle_13(_bool); });

            _Togle_14.onValueChanged.AddListener(delegate (bool _bool) { Togle_14(_bool); });

            _Togle_15.onValueChanged.AddListener(delegate (bool _bool) { Togle_15(_bool); });

            m_Toggle_Start.onValueChanged.AddListener(ToggleStar);

        }



        void CloseButton()//关闭按钮

@@ -379,7 +375,6 @@
            {

                ScrollViewFirst.SetActive(false);

                ScrollViewSecond.SetActive(false);

                m_Toggle_Start.gameObject.SetActive(true);

                _ExitBtn.gameObject.SetActive(false);

                _CleanBtn.gameObject.SetActive(false);

                _Dropdown.SetActive(true);

@@ -404,7 +399,6 @@
            _WarehouseCountBG.SetActive(true);

            _Dropdown.SetActive(false);

            _Dropdown2.SetActive(false);

            m_Toggle_Start.gameObject.SetActive(false);

            _ExitBtn.gameObject.SetActive(false);

            _DeleteBtn.gameObject.SetActive(false);

            _bool = false;

@@ -835,29 +829,15 @@
            Item_lv = type_B;

            Item_Color = type_A;

            _EquipmentArray.Clear();

            if (m_Toggle_Start.isOn)

            foreach (int key in playerFairyAuTreasureData._DicfamilyStoreItem.Keys)

            {

                foreach (int key in playerFairyAuTreasureData._DicfamilyStoreItem.Keys)

                var itemConfig = Config.Instance.Get<ItemConfig>(playerFairyAuTreasureData._DicfamilyStoreItem[key].ItemID);

                if ((Item_lv >= itemConfig.LV && Item_Color >= itemConfig.ItemColor && playerFairyAuTreasureData._DicfamilyStoreItem[key].Index != 0))

                {

                    var itemConfig = Config.Instance.Get<ItemConfig>(playerFairyAuTreasureData._DicfamilyStoreItem[key].ItemID);

                    if ((Item_lv >= itemConfig.LV && Item_Color >= itemConfig.ItemColor && playerFairyAuTreasureData._DicfamilyStoreItem[key].Index != 0 && itemConfig.StarLevel <= 1))

                    {

                        _EquipmentArray.Add(playerFairyAuTreasureData._DicfamilyStoreItem[key].Index, true);

                    }

                    _EquipmentArray.Add(playerFairyAuTreasureData._DicfamilyStoreItem[key].Index, true);

                }

            }

            else

            {

                foreach (int key in playerFairyAuTreasureData._DicfamilyStoreItem.Keys)

                {

                    var itemConfig = Config.Instance.Get<ItemConfig>(playerFairyAuTreasureData._DicfamilyStoreItem[key].ItemID);

                    if ((Item_lv >= itemConfig.LV && Item_Color >= itemConfig.ItemColor && playerFairyAuTreasureData._DicfamilyStoreItem[key].Index != 0 && itemConfig.StarLevel<=0))

                    {

                        _EquipmentArray.Add(playerFairyAuTreasureData._DicfamilyStoreItem[key].Index, true);

                    }

                }

            }

            


            _GridlineCtrl.m_Scorller.RefreshActiveCellViews();//刷新当前可见       

        }

        int Color_T()//返回值1

@@ -1058,7 +1038,7 @@
            int Color = 0;//颜色

            int Star = 0;//颜色

            int EquipPlace = 0;//装备位置

            if (playerFairyAuTreasureData.JumpItemID==null || playerFairyAuTreasureData.JumpItemID.Count <= 0)

            if (playerFairyAuTreasureData.JumpItemID == null || playerFairyAuTreasureData.JumpItemID.Count <= 0)

            {

                return;

            }

@@ -1089,10 +1069,10 @@
                        if (!DicHighlight.ContainsKey(key))

                        {

                            DicHighlight.Add(key, 1);

                        }                  
                        }

                    }

                }

            }                   
            }

        }



        private void ClearItemID(int Index)


 System/Vip/VipInvest/WheelOfFortuneWin.cs

@@ -37,7 +37,10 @@
        VipModel vipmodel { get { return m_Vipmodel ?? (m_Vipmodel = ModelCenter.Instance.GetModel<VipModel>()); } }
        WheelOfFortuneModel wheelOfFortuneModel { get { return ModelCenter.Instance.GetModel<WheelOfFortuneModel>(); } }

        private int remainingTimes = 0;//剩余次数
        private int FairyJade = 0;//获取当前绑玉
        private int FairyJade = 0;//获取当前绑玉

        bool IsSend = true;

        public float Second = 1f;

        private float timeType = 0f;
        #region Built-in
        protected override void BindController()
        {
@@ -51,7 +54,8 @@
        }

        protected override void OnPreOpen()
        {        
        {

            IsSend = true;

            FairyJade = (int)UIHelper.GetMoneyCnt(2);

            Money1_Text.text = FairyJade.ToString();

            Money2_Text.text = UIHelper.GetMoneyCnt(1).ToString();

@@ -123,9 +127,17 @@
            RemainingTimes();//剩余次数

            IncreaseInFrequency();//次数提升

        }



        protected override void LateUpdate()

        {

            base.LateUpdate();

        }

        protected override void OnAfterClose()
        {
        {

            timeType += Time.deltaTime;
            if (timeType >= Second && !IsSend)

            {

                IsSend = true;

            }
        }

        private void OnClickButton()

@@ -151,10 +163,14 @@
            }

            else if (LotteryNumber > wheelOfFortuneModel.Number && (int)UIHelper.GetMoneyCnt(1) >= wheelOfFortuneModel.NeedJade)

            {

                m_CheckDisplay.CloseAll();

                FairyJade = (int)UIHelper.GetMoneyCnt(2);

                Money1_Text.text = FairyJade.ToString();

                wheelOfFortuneModel.StartTheDraw();//开始抽奖

                if (IsSend)

                {

                    m_CheckDisplay.CloseAll();

                    FairyJade = (int)UIHelper.GetMoneyCnt(2);

                    Money1_Text.text = FairyJade.ToString();

                    wheelOfFortuneModel.StartTheDraw();//开始抽奖

                    IsSend = false;

                }         
            }

        }
        private void OnClickToggle(bool _bool)