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

client_Wu Xijin

2019-05-17 3ccde1c231f4146446fcdea87674bba9955a8bbb

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

 System/Alchemy/AlchemyModel.cs

@@ -340,7 +340,7 @@
            {

                var config = AlchemyConfig.Get(alchemyId);

                var startTime = TimeUtility.GetTime(tick);

                var seconds = (int)(config.NeedTime - (float)(TimeUtility.ServerNow - startTime).TotalSeconds);

                var seconds = config.NeedTime - (float)(TimeUtility.ServerNow - startTime).TotalSeconds;

                return seconds > 0 ? 1 : 2;

            }

            return 0;


 System/Alchemy/AlchemyStoveBehaviour.cs

@@ -13,6 +13,7 @@


        [SerializeField] Transform m_ContainerAlcheming;

        [SerializeField] Text m_AlchemyTime;

        [SerializeField] Slider m_TimeSlider;

        [SerializeField] Transform m_ContainerComplete;

        [SerializeField] Transform m_ContainerNormal;

        [SerializeField] Text m_StoveLevel;

@@ -281,6 +282,18 @@
                timer = 0f;

                PerSecond();

            }



            if (state == 1)

            {

                uint tick = 0;

                if (model.TryGetAlchemyStartTime(model.selectAlchemy, out tick))

                {

                    var config = AlchemyConfig.Get(model.selectAlchemy);

                    var startTime = TimeUtility.GetTime(tick);

                    var seconds = config.NeedTime - (float)(TimeUtility.ServerNow - startTime).TotalSeconds;

                    m_TimeSlider.value = Mathf.Clamp01(1 - seconds / config.NeedTime);

                }

            }

        }



        private void PerSecond()


 System/Alchemy/AlchemyUseDrugWin.cs

@@ -37,12 +37,16 @@
        {

            m_AlchemyTypeSort.Display();

            m_AlchemyQualitySort.Display();



            Display();

            

            AlchemySortBehaviour.onSortRefresh += OnSortRefresh;

            model.alchemyDrugUseRefresh += AlchemyDrugUseRefresh;

            packModel.refreshItemCountEvent += RefreshItemCountEvent;

        }



        protected override void OnActived()

        {

            base.OnActived();

            Display();

        }



        protected override void OnAfterOpen()

@@ -70,6 +74,10 @@
            {

                m_Controller.JumpIndex(index);

            }

            else

            {

                m_Controller.JumpIndex(0);

            }



            model.jumpAlchemy = 0;

        }


 System/BetterItemGet/PreciousItemGetModel.cs

@@ -22,11 +22,14 @@
        public PreciousItem currentShowItem { get; private set; }

        public event Action showItemRefreshEvent;

        public bool isGetNewItem { get;set; }



        bool isServerPrepare { get; set; }

        public override void Init()

        {

            ItemLogicUtility.Instance.GetPreciousItemEvent += OnGetPreciousItem;

            playerPack.refrechPackEvent += OnPackageRefresh;

            playerPack.refreshItemCountEvent += OnPackageItemRefresh;

            FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;

        }



        public override void UnInit()

@@ -34,11 +37,13 @@
            ItemLogicUtility.Instance.GetPreciousItemEvent -= OnGetPreciousItem;

            playerPack.refrechPackEvent -= OnPackageRefresh;

            playerPack.refreshItemCountEvent -= OnPackageItemRefresh;

            FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;

        }



        public void OnBeforePlayerDataInitialize()

        {

            isGetNewItem = false;

            isServerPrepare = false;

            PlayerDatas.Instance.playerDataRefreshEvent -= RefreshRealm;

            CrossServerOneVsOnePlayerInfo.Instance.UpdateMatchNumEvent -= UpdateCrossOneVsOneMatchNum;

        }

@@ -51,6 +56,7 @@


        public void OnPlayerLoginOk()

        {

            isServerPrepare = true;

            PlayerDatas.Instance.playerDataRefreshEvent += RefreshRealm;

            CrossServerOneVsOnePlayerInfo.Instance.UpdateMatchNumEvent += UpdateCrossOneVsOneMatchNum;

        }

@@ -158,6 +164,17 @@
            OnPackageRefresh(_type);

        }



        private void OnFuncStateChangeEvent(int id)

        {

            if (id == (int)FuncOpenEnum.BlastFurnace && FuncOpen.Instance.IsFuncOpen(id))

            {

                if (isServerPrepare)

                {

                    RecommandAlchemyDrugs();

                }

            }

        }



        private bool FindLatestItem(out PreciousItem _item)

        {

            if (itemGuids.Count == 0)

@@ -171,6 +188,22 @@
            return true;

        }



        private void RecommandAlchemyDrugs()

        {

            var items = playerPack.GetItems(PackType.Item, new SinglePack.FilterParams());

            if (items != null)

            {

                foreach (var item in items)

                {

                    var config = AttrFruitConfig.Get(item.itemId);

                    if (config != null && config.FuncID == 2)

                    {

                        ItemLogicUtility.Instance.RecommendItem(item);

                    }

                }

            }

        }



        private void Trim()

        {

            for (int i = itemGuids.Count - 1; i >= 0; i--)