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

client_Zxw

2018-12-06 937393c74ad3e713bf0cbbeeedba062ce9e58a44

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

 Core/NetworkPackage/DTCFile/ClientPack.meta

File was deleted

 Fight/GameActor/GActorNpcNoFight.cs

@@ -185,18 +185,42 @@
                else

                {

                    string _name = NpcConfig.MODE;

                    var _configName = string.Empty;



                    if (_name.Contains("A_Zs"))

                    {

                        _configName = _name.Substring(_name.LastIndexOf("A_"));

                        _name = "A_Zs";

                        GameObjectPoolManager.Instance.AddDontDestroyGoInstID(m_Model.GetInstanceID());

                    }

                    else if (_name.Contains("A_Fs"))

                    {

                        _configName = _name.Substring(_name.LastIndexOf("A_"));

                        _name = "A_Fs";

                        GameObjectPoolManager.Instance.AddDontDestroyGoInstID(m_Model.GetInstanceID());

                    }



                    if (_name.Contains("A_Zs") || _name.Contains("A_Fs"))

                    {

                        if (!string.IsNullOrEmpty(_configName))

                        {

                            var _renderer = m_Model.GetComponentInChildren<SkinnedMeshRenderer>();

                            if (_renderer)

                            {

                                MaterialLoader.Release(_renderer.material);



                                var _modelResConfig = ModelResConfig.GetClothesConfig(_configName);

                                if (_modelResConfig != null)

                                {

                                    _renderer.material = MaterialLoader.LoadClothesMaterial(_modelResConfig.ID, false, false);

                                }

                            }

                        }

                    }



                    _controller = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, _name);

                }



                if (_controller)

                {

                    m_Animator.runtimeAnimatorController = _controller;


 Fight/GameActor/GActorPlayerBase.cs

@@ -333,6 +333,7 @@
        {

            MaterialLoader.Release(m_SMRenderer.material);

            m_SMRenderer.material = null;

            m_SMRenderer.materials = m_SMRenderer.sharedMaterials = new Material[0];

        }

        m_Material = null;




 Fight/GameActor/PartialModelResConfig.cs

New file
@@ -0,0 +1,33 @@
using UnityEngine;
using System.Collections.Generic;

namespace TableConfig
{
    public partial class ModelResConfig : ConfigBase, IConfigPostProcess
    {
        private static readonly Dictionary<string, ModelResConfig> dict = new Dictionary<string, ModelResConfig>();

        public void OnConfigParseCompleted()
        {
            if (Type == (int)E_ModelResType.Suit)
            {
                string _name = ResourcesName;
                int _index = _name.IndexOf('/');
                if (_index != -1)
                {
                    _name = _name.Substring(_index + 1);
                }
                dict[_name] = this;
            }
        }

        public static ModelResConfig GetClothesConfig(string name)
        {
            if(dict.ContainsKey(name))
            {
                return dict[name];
            }
            return null;
        }
    }
}

 Fight/GameActor/PartialModelResConfig.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 715e00ac94f99e048bf256c1812177e4
timeCreated: 1544002326
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Lua/Gen/Resources.meta

File was deleted

 System/KnapSack/Logic/ItemTipsModel.cs

@@ -451,7 +451,8 @@
                    petAndMountQualityDict.Add(qualitys[i],qualityNames[i]);

                }

            }

        


            ParseFuncConfig();

        }



        public void OnBeforePlayerDataInitialize()

@@ -463,6 +464,47 @@
        {



        }

        #region 解析本地数据

        public Dictionary<string,List<int>> atkSpeedColorDict { get; private set; }

        private void ParseFuncConfig()

        {

            atkSpeedColorDict = new Dictionary<string, List<int>>();

            var equipYPAtkSpeedColor = Config.Instance.Get<FuncConfigConfig>("EquipYPAtkSpeedColor");

            JsonData atkSpeedData = JsonMapper.ToObject(equipYPAtkSpeedColor.Numerical1);

            foreach(var color in atkSpeedData.Keys)

            {

                List<int> list = new List<int>();

                atkSpeedColorDict.Add(color,list);

                if(atkSpeedData[color].IsArray)

                {

                    for(int i = 0; i < atkSpeedData[color].Count; i++)

                    {

                        int range = 0;

                        int.TryParse(atkSpeedData[color][i].ToString(),out range);

                        list.Add(range);

                    }

                }

            }

        }



        public bool TryGetAtkSpeedColor(int atkSpeed,out string color)

        {

            color = string.Empty;

            foreach(var key in atkSpeedColorDict.Keys)

            {

                var rangelist = atkSpeedColorDict[key];

                if(rangelist.Count > 1)

                {

                    if(atkSpeed >= rangelist[0] && atkSpeed <= rangelist[1])

                    {

                        color = key;

                        return true;

                    }

                }

            }

            return false;

        }

        #endregion



        /// <summary>

        /// 刷新脱机外挂时间

@@ -1071,6 +1113,12 @@
                            }

                        }



                        if(key == (int)AttrEnum.ATKSPEED)

                        {

                            int attrValue = GetProValueType(playerProModel.ISPercentage, itemEffectDict[key]);

                            otherStr = SetAttrColor(otherStr,attrValue,attrData.itemConfig.EquipPlace);

                        }



                        if (attrSB.Length <= 0)

                        {

                            attrSB.Append(otherStr);

@@ -1177,6 +1225,35 @@
            }

            return s;

        }



        private string SetAttrColor(string attrStr,int atkSpeed,int equipPlace)

        {

            if ((RoleEquipType)equipPlace != RoleEquipType.retFairyCan

                && (RoleEquipType)equipPlace != RoleEquipType.retFairyCan2)

            {

                return attrStr;

            }



            string color = string.Empty;

            bool isColor = TryGetAtkSpeedColor(atkSpeed,out color);

            if(isColor)

            {

                return StringUtility.Contact("<color=#",color, ">", attrStr, "</color>");

            }

            return attrStr;

        }



        public int GetProValueType(int precentType, int value)

        {

            switch(precentType)

            {

                case 1:

                case 2:

                    return Mathf.RoundToInt(value / 100);

                default:

                    return value;

            }

        }

        #endregion



        #region 设置传奇属性