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

Client_PangDeRong

2018-11-12 71399989aad57409db247eb2443db436d58b9e59

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

 Core/GameEngine/Model/Config/DungeonOpenTimeConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Monday, October 15, 2018
//    [  Date ]:           Monday, November 12, 2018
//--------------------------------------------------------

using UnityEngine;
@@ -13,7 +13,6 @@

        public int DataMapID { get ; private set ; }
        public string FBName { get ; private set; } 
        public int OpenServerDay { get ; private set ; }
        public int CanEnterTime { get ; private set ; }
        public int DayTimes { get ; private set ; }
        public int DayReKind { get ; private set ; }
@@ -47,52 +46,50 @@
            
                FBName = rawContents[1].Trim();
            
                OpenServerDay=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0; 
                CanEnterTime=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0; 
            
                CanEnterTime=IsNumeric(rawContents[3]) ? int.Parse(rawContents[3]):0; 
                DayTimes=IsNumeric(rawContents[3]) ? int.Parse(rawContents[3]):0; 
            
                DayTimes=IsNumeric(rawContents[4]) ? int.Parse(rawContents[4]):0; 
                DayReKind=IsNumeric(rawContents[4]) ? int.Parse(rawContents[4]):0; 
            
                DayReKind=IsNumeric(rawContents[5]) ? int.Parse(rawContents[5]):0; 
                WeekTimes=IsNumeric(rawContents[5]) ? int.Parse(rawContents[5]):0; 
            
                WeekTimes=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0; 
                WeekReKind=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0; 
            
                WeekReKind=IsNumeric(rawContents[7]) ? int.Parse(rawContents[7]):0; 
                FBType=IsNumeric(rawContents[7]) ? int.Parse(rawContents[7]):0; 
            
                FBType=IsNumeric(rawContents[8]) ? int.Parse(rawContents[8]):0; 
			
                string[] RewardRateStringArray = rawContents[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                string[] RewardRateStringArray = rawContents[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                RewardRate = new int[RewardRateStringArray.Length];
                for (int i=0;i<RewardRateStringArray.Length;i++)
                {
                     int.TryParse(RewardRateStringArray[i],out RewardRate[i]);
                }
            
                BuyTimesID=IsNumeric(rawContents[10]) ? int.Parse(rawContents[10]):0; 
                BuyTimesID=IsNumeric(rawContents[9]) ? int.Parse(rawContents[9]):0; 
            
                ExtraTimesID=IsNumeric(rawContents[11]) ? int.Parse(rawContents[11]):0; 
                ExtraTimesID=IsNumeric(rawContents[10]) ? int.Parse(rawContents[10]):0; 
            
                DeathTime=IsNumeric(rawContents[12]) ? int.Parse(rawContents[12]):0; 
                DeathTime=IsNumeric(rawContents[11]) ? int.Parse(rawContents[11]):0; 
            
                GuardPick=IsNumeric(rawContents[13]) ? int.Parse(rawContents[13]):0; 
                GuardPick=IsNumeric(rawContents[12]) ? int.Parse(rawContents[12]):0; 
            
                DoFight=IsNumeric(rawContents[14]) ? int.Parse(rawContents[14]):0; 
                DoFight=IsNumeric(rawContents[13]) ? int.Parse(rawContents[13]):0; 
            
                HelpPoint=IsNumeric(rawContents[15]) ? int.Parse(rawContents[15]):0; 
                HelpPoint=IsNumeric(rawContents[14]) ? int.Parse(rawContents[14]):0; 
            
                DelayTime=IsNumeric(rawContents[16]) ? int.Parse(rawContents[16]):0; 
                DelayTime=IsNumeric(rawContents[15]) ? int.Parse(rawContents[15]):0; 
            
                Movable=IsNumeric(rawContents[17]) ? int.Parse(rawContents[17]):0; 
                Movable=IsNumeric(rawContents[16]) ? int.Parse(rawContents[16]):0; 
            
                Skillable=IsNumeric(rawContents[18]) ? int.Parse(rawContents[18]):0; 
                Skillable=IsNumeric(rawContents[17]) ? int.Parse(rawContents[17]):0; 
            
                SelectPlayerable=IsNumeric(rawContents[19]) ? int.Parse(rawContents[19]):0; 
                SelectPlayerable=IsNumeric(rawContents[18]) ? int.Parse(rawContents[18]):0; 
            
                ExitDescription = rawContents[20].Trim();
                ExitDescription = rawContents[19].Trim();
            
                PanelImg = rawContents[21].Trim();
                PanelImg = rawContents[20].Trim();
            
                string[] ElixirHintStringArray = rawContents[22].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                string[] ElixirHintStringArray = rawContents[21].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                ElixirHint = new int[ElixirHintStringArray.Length];
                for (int i=0;i<ElixirHintStringArray.Length;i++)
                {

 Core/GameEngine/Model/Config/DungeonOpenTimeConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: bf6b02af80ae8d84c9c211ed6753c6b6
timeCreated: 1539589748
timeCreated: 1542014433
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Core/GameEngine/Model/Config/DungeonStateTimeConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Tuesday, January 30, 2018
//    [  Date ]:           Monday, November 12, 2018
//--------------------------------------------------------

using UnityEngine;
@@ -13,8 +13,6 @@

        public int ID { get ; private set ; }
        public int DataMapID { get ; private set ; }
        public int OpenServerWeek { get ; private set ; }
        public int OpenServerDay { get ; private set ; }
        public int StartWeekday { get ; private set ; }
        public int StartHour { get ; private set ; }
        public int StartMinute { get ; private set ; }
@@ -36,25 +34,21 @@
            
                DataMapID=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0; 
            
                OpenServerWeek=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0; 
                StartWeekday=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0; 
            
                OpenServerDay=IsNumeric(rawContents[3]) ? int.Parse(rawContents[3]):0; 
                StartHour=IsNumeric(rawContents[3]) ? int.Parse(rawContents[3]):0; 
            
                StartWeekday=IsNumeric(rawContents[4]) ? int.Parse(rawContents[4]):0; 
                StartMinute=IsNumeric(rawContents[4]) ? int.Parse(rawContents[4]):0; 
            
                StartHour=IsNumeric(rawContents[5]) ? int.Parse(rawContents[5]):0; 
                EndWeekday=IsNumeric(rawContents[5]) ? int.Parse(rawContents[5]):0; 
            
                StartMinute=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0; 
                EndHour=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0; 
            
                EndWeekday=IsNumeric(rawContents[7]) ? int.Parse(rawContents[7]):0; 
                EndMinute=IsNumeric(rawContents[7]) ? int.Parse(rawContents[7]):0; 
            
                EndHour=IsNumeric(rawContents[8]) ? int.Parse(rawContents[8]):0; 
                CanEnter=IsNumeric(rawContents[8]) ? int.Parse(rawContents[8]):0; 
            
                EndMinute=IsNumeric(rawContents[9]) ? int.Parse(rawContents[9]):0; 
			
                CanEnter=IsNumeric(rawContents[10]) ? int.Parse(rawContents[10]):0; 
			
                StateValue=IsNumeric(rawContents[11]) ? int.Parse(rawContents[11]):0; 
                StateValue=IsNumeric(rawContents[9]) ? int.Parse(rawContents[9]):0; 
            }
            catch (Exception ex)
            {

 Core/GameEngine/Model/Config/DungeonStateTimeConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 129779f57e965b04ea321a2a004eb9ba
timeCreated: 1517296599
timeCreated: 1542014691
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/Skill/TalentModel.cs

@@ -217,6 +217,21 @@
            return point;

        }



        public int GetAllTalentPoint()

        {

            var point = 0;

            var job = (int)Math.Pow(2, PlayerDatas.Instance.baseData.Job);

            if (jobTalentTypeDict.ContainsKey(job))

            {

                var list = jobTalentTypeDict[job];

                for (int i = 0; i < list.Count; i++)

                {

                    point += GetTalentTypePoint(list[i]);

                }

            }

            return point;

        }



        public int GetSeriesPoint(int talentType, int talentSeries)

        {

            var job = PlayerDatas.Instance.baseData.Job;


 System/Skill/TalentWin.cs

@@ -293,6 +293,7 @@
                m_SelectSkillIcon.SetSprite(config.IconName);

                m_SelectSkillLevel.text = StringUtility.Contact(Language.Get("TalentLevel"), talent.level, "/", talent.maxLevel);

                m_SelectSkillName.text = config.SkillName;

                m_SelectSkillLevel.color = UIHelper.GetUIColor(talent.level >= talent.maxLevel ? TextColType.Green : TextColType.NavyBrown, true);

            }

        }



@@ -414,6 +415,11 @@


        private void ResetPoint()

        {

            if (model.GetAllTalentPoint() <= 0)

            {

                SysNotifyMgr.Instance.ShowTip("NoNeedResetTalentPoint");

                return;

            }

            var count = pack.GetItemCountByID(PackType.rptItem, model.talentResetBook);

            var config = Config.Instance.Get<ItemConfig>(model.talentResetBook);

            if (count > 0)