Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-10-10 c6bc396fe264cd53ba594e7430011c623cc26c4a

 Core/GameEngine/Model/TelPartialConfig/RandomNameConfig.cs

@@ -16,6 +16,7 @@
    public partial class RandomNameConfig : ConfigBase, IConfigPostProcess

    {

        private static Dictionary<int, List<RandomNameConfig>> m_RandomNameCfgs = new Dictionary<int, List<RandomNameConfig>>();

        private static List<RandomNameConfig> m_RandomFirstNames = new List<RandomNameConfig>();



        public void OnConfigParseCompleted()

        {

@@ -38,12 +39,17 @@
                    }

                }

            }



            if (!string.IsNullOrEmpty(RandomName1))

            {

                m_RandomFirstNames.Add(this);

            }

        }



        public static string GetFirstName(int occupa)

        {

            List<RandomNameConfig> list = null;

            m_RandomNameCfgs.TryGetValue(occupa, out list);

            List<RandomNameConfig> list = m_RandomFirstNames;

            //m_RandomNameCfgs.TryGetValue(occupa, out list);

            int cnt = list.Count;

            string str = list[Random.Range(0, cnt)].RandomName1;

            return str;