Merge branch 'master' into Cross_Server

client_Wu Xijin

2018-12-17 44f37651391a48c21b367a74902a3bc7ecbb4ce0

Merge branch 'master' into Cross_Server

 Fight/GameActor/GA_NpcCollect.cs

@@ -156,17 +156,18 @@
        WindowCenter.Instance.windowAfterOpenEvent += CheckOpenCollectIcon;

        WindowCenter.Instance.windowAfterCloseEvent += AfterCloseMainWin;



        if (GeneralDefine.NpcPosOffset.ContainsKey(NpcConfig.NPCID))

        {

            Pos = GeneralDefine.NpcPosOffset[NpcConfig.NPCID];

            //Debug.Log("矫正位置: " + Pos);

        }



        // 执行挖洞逻辑

        if (NpcConfig.Dig == 1)

        {

            m_Dig = SoMap.CreateImpasse.GeneralCircle(Pos, NpcConfig.ModelRadius);

        }



        if (GeneralDefine.NpcPosOffset.ContainsKey(NpcConfig.NPCID))

        {

            Pos = GeneralDefine.NpcPosOffset[NpcConfig.NPCID];

            //Debug.Log("矫正位置: " + Pos);

        }

    }



    private void AfterCloseMainWin(Window obj)


 System/FindPrecious/DemonJarAutoDoubleSettingWin.cs

@@ -63,7 +63,7 @@
        private void SetAutoChallenge()
        {
            var autoable = vipModel.GetVipPrivilegeCnt(VipPrivilegeType.DemonJarAuto) >= 1;
            if (autoable || model.oldDouble)
            if (autoable)
            {
                model.autoChallenge = !model.autoChallenge;
            }
@@ -77,7 +77,7 @@
        private void SetDoubleChallenge()
        {
            var candouble = vipModel.GetVipPrivilegeCnt(VipPrivilegeType.DemonJarDouble) >= 1;
            if (candouble)
            if (candouble || model.oldDouble)
            {
                model.RequestSetDoubleAward(!model.isDoubleAward);
            }

 System/Mount/MountStoneTipsWin.cs

@@ -184,20 +184,24 @@
                foreach (var item in _dic.Keys)

                {

                    textNumber += 1;

                    val += Config.Instance.Get<PlayerPropertyConfig>(item).Name;

                    if (item == 15 || item == 16)

                    var propertyConfig = Config.Instance.Get<PlayerPropertyConfig>(item);

                    val += propertyConfig.Name;

                    switch (propertyConfig.ISPercentage)

                    {

                        val += "<color=#109d06>  +" + (_dic[item] * _max) / 100 + "%   </color>";

                    }

                    else

                    {

                        val += "<color=#109d06>  +" + (_dic[item] * _max).ToString() + "   </color>";

                        case 0:

                            val += "<color=#109d06>  +" + (_dic[item] * _max) + "   </color>";

                            break;

                        case 1:

                            val += "<color=#109d06> +" + (_dic[item] * _max) / 100 + "%   </color>";

                            break;

                        case 2:

                            val += "<color=#109d06> +" + (_dic[item] * _max) + "%   </color>";

                            break;

                    }

                    if (textNumber == 3)

                    {

                        val += "\n";

                    }



                }

                _text.text = val;

            }


 System/Pet/PetAttributeMethods.cs

@@ -399,13 +399,15 @@
                            }

                        }

                    }

                    _scoreNumAll = Mathf.FloorToInt(_tagPetClass.AtkAdd * 2.5f) + _scoreNum;

                    Dictionary<int, int> Dic = new Dictionary<int, int>();

                    Dic.Add(78, _tagPetClass.AtkAdd);

                    Dic.Add(77, _tagPetClass.AtkAdd);

                    _scoreNumAll = UIHelper.GetFightPower(Dic) + _scoreNum;

                    sumFight += _scoreNumAll;

                }

                allFightText.text = (sumFight + InitFightPower).ToString();

                attackSpeed.text = ((float)UIHelper.GetPropertyMapPlayerData(AttrEnum.ATKSPEED) / 100).ToString();

            }



        }



        public void RefreshPetUpgradeCostUI(bool isRefresh = false)