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

client_linchunjie

2018-11-01 53bd36c6373c3dd6a335162cb3dbbc1f81bed616

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

 System/BetterItemGet/BetterEquipGetModel.cs

@@ -45,6 +45,18 @@
            currentEquipGuid = string.Empty;

        }



        #region 解析本地表

        public int autoEquipLvLimit { get; private set; }

        public int autoEquipCoolTime { get; private set; }



        public void ParseConfig()

        {

            FuncConfigConfig equipAutoEquip = Config.Instance.Get<FuncConfigConfig>("EquipAutoEquip");

            autoEquipLvLimit = int.Parse(equipAutoEquip.Numerical1);

            autoEquipCoolTime = int.Parse(equipAutoEquip.Numerical2);



        }

        #endregion

        public bool TryGetBetterEquip(string _guid, out ItemModel _equip)

        {

            return betterEquipModels.TryGetValue(_guid, out _equip);

@@ -135,6 +147,10 @@
                        {

                            showEquipRefreshEvent();

                        }

                        if(betterModel.chinItemModel.ItemColor < 3)

                        {

                          
                        }

                    }

                }

                else

@@ -146,6 +162,8 @@
                    }

                }

            }





        }



        IEnumerator Co_DelayRefreshBetterEquip(string _guid)


 System/Dogz/DogzModel.cs

@@ -937,7 +937,6 @@
                    Redpoint assistRedpoint = GetDogzAssistRedpointById(maxDogzId);

                    if(assistRedpoint.state == RedPointState.None)

                    {

                        dogzPutRedId = 0;

                        assistRedpoint.state = RedPointState.Simple;

                    }

                }

@@ -954,7 +953,6 @@
                        Redpoint assistRedpoint = GetDogzAssistRedpointById(dogzId);

                        if (assistRedpoint.state == RedPointState.None)

                        {

                            dogzPutRedId = 0;

                            assistRedpoint.state = RedPointState.Simple;

                        }

                        break;

@@ -983,6 +981,10 @@
            {

                if(value.state == RedPointState.Simple)

                {

                    if (UpdateDogzPutRedEvent != null)

                    {

                        UpdateDogzPutRedEvent();

                    }

                    return;

                }

            }