3335 代码维护，修改通用配置定义类型。

client_Wu Xijin

2018-10-18 1868bc632a9134b6891d4fc5f427e3f280b9e973

 System/Team/TeamModel.cs

@@ -140,7 +140,7 @@


                    if (m_IsMatching)

                    {

                        matchingEndTime = DateTime.Now + new TimeSpan(TimeSpan.TicksPerSecond * GeneralConfig.Instance.teamMatchingTimeOut);

                        matchingEndTime = DateTime.Now + new TimeSpan(TimeSpan.TicksPerSecond * GeneralDefine.teamMatchingTimeOut);

                        m_MatchingClock = Clock.Create(matchingEndTime, OnMatchingCoolDownEnd);

                    }



@@ -191,7 +191,7 @@


        public override void Init()

        {

            levelMaxBuf = GeneralConfig.Instance.playerMaxLevel;

            levelMaxBuf = GeneralDefine.playerMaxLevel;

            ParseTeamMission();

            DTCB309_tagGCAnswerPlayerShortInfo.OnPlayerShortInfoEvent += OnGetPlayerShortInfo;

            PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnUpdateFairyInfo;

@@ -271,7 +271,7 @@
            else

            {

                limitLevelMin = 1;

                limitLevelMax = GeneralConfig.Instance.playerMaxLevel;

                limitLevelMax = GeneralDefine.playerMaxLevel;

            }



            var createTeam = new CB901_tagCGCreateTeam();

@@ -366,14 +366,14 @@
                }



                var levelRequirement = string.Empty;

                var levelMax = StringUtility.GetLevelString(myTeam.levelMax, GeneralConfig.Instance.greatMasterStartLV);

                var levelMax = StringUtility.GetLevelString(myTeam.levelMax, GeneralDefine.greatMasterStartLV);

                if (myTeam.levelMin == myTeam.levelMax)

                {

                    levelRequirement = StringUtility.Contact(levelMax);

                }

                else

                {

                    var levelMin = StringUtility.GetLevelString(myTeam.levelMin, GeneralConfig.Instance.greatMasterStartLV);

                    var levelMin = StringUtility.GetLevelString(myTeam.levelMin, GeneralDefine.greatMasterStartLV);

                    levelRequirement = StringUtility.Contact(levelMin, "--", levelMax);

                }



@@ -381,12 +381,12 @@
                {

                    try

                    {

                        var json = JsonMapper.ToObject(GeneralConfig.Instance.teamWorldCall);

                        var json = JsonMapper.ToObject(GeneralDefine.teamWorldCall);

                        if (json.Keys.Contains(dungeonId.ToString()))

                        {

                            var invite = false;

                            var level = 1;

                            var count = GeneralConfig.Instance.teamWorldCallInviteCount;

                            var count = GeneralDefine.teamWorldCallInviteCount;



                            switch (dungeonId)

                            {

@@ -563,7 +563,7 @@
            }



            var minLevel = 1;

            var maxLevel = GeneralConfig.Instance.playerMaxLevel;

            var maxLevel = GeneralDefine.playerMaxLevel;



            if (_mission != myTeam.mission)

            {

@@ -573,7 +573,7 @@
                    if (mapConfig.MapFBType == (int)MapType.OpenCountry)

                    {

                        minLevel = 1;

                        maxLevel = GeneralConfig.Instance.playerMaxLevel;

                        maxLevel = GeneralDefine.playerMaxLevel;

                    }

                }

                else