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

client_Zxw

2018-10-31 85ea0c104fae8c41965a5bc160ed0490e274a6c6

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

 Core/GameEngine/Model/Config/OSCBillTagAwardConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Monday, March 05, 2018
//    [  Date ]:           Wednesday, October 31, 2018
//--------------------------------------------------------

using UnityEngine;
@@ -11,11 +11,10 @@
    
    public partial class OSCBillTagAwardConfig : ConfigBase {

        public int ID { get ; private set ; }
        public int RangListType { get ; private set ; }
        public int Condition { get ; private set ; }
        public int ID { get ; private set ; }

        public int RangListType { get ; private set ; }

        public int Condition { get ; private set ; }

        public string Gift { get ; private set; } 
        public string Tip { get ; private set; } 

        public override string getKey()
        {
@@ -25,15 +24,13 @@
        public override void Parse() {
            try
            {
                ID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 
			
                RangListType=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0; 
			
                Condition=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0; 
			
                ID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 
			
                RangListType=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0; 
			
                Condition=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0; 
			
                Gift = rawContents[3].Trim();
			
                Tip = rawContents[4].Trim();
            }
            catch (Exception ex)
            {

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

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: a581b3603c294cb4f875c5ff8676252d
timeCreated: 1520238949
timeCreated: 1540966614
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/MainInterfacePanel/HighSettingTip.cs

@@ -286,8 +286,13 @@
        }

        void OpenTreasure()

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            var _model = ModelCenter.Instance.GetModel<TreasureModel>();

            if (!_model.SatisfyEntranceOpen())

            {

                _model.DisplayEntranceLimitHint();

                return;

            }

            WindowCenter.Instance.Close<MainInterfaceWin>();

            if (_model.GetTreasureUnlockShow(TreasureCategory.Human) != 0)

            {

                _model.currentCategory = TreasureCategory.Human;


 System/Treasure/TreasureComponent.cs

@@ -719,7 +719,7 @@
            RecycleHighestEffect();

            Treasure _treasure;

            if (category == TreasureCategory.Human &&

                model.TryGetTreasure(treasureId, out _treasure) && _treasure.IsHighestStage

                model.TryGetTreasure(treasureId, out _treasure) && _treasure.IsHighestStage && _treasure.state == TreasureState.Collected

                && !model.GetTreasureFinishAnim(treasureId) && model.GetTreasureUnlockShow(TreasureCategory.Human) != treasureId)

            {

                highestSfx = SFXPlayUtility.Instance.Play(5197, root);


 System/Treasure/TreasureModel.cs

@@ -213,6 +213,7 @@
        public float treasureBackPercent { get; private set; }

        public int treasureExitLvLimit { get; private set; }

        public int exitRecord { get; set; }

        public int entranceOpenCondition { get; private set; }



        public List<int> cacheGotAchievements {

            get { return m_CacheGotAchievements; }

@@ -1448,6 +1449,9 @@


            funcConfig = Config.Instance.Get<FuncConfigConfig>("TreasureNoOpen");

            treasureUnOpens.AddRange(ConfigParse.GetMultipleStr<int>(funcConfig.Numerical1));



            funcConfig = Config.Instance.Get<FuncConfigConfig>("OpenFabao");

            entranceOpenCondition = int.Parse(funcConfig.Numerical1);

        }



        const string pattern = "\\\"[0-9]+\\\":\\[[0-9|,]*\\]";

@@ -1573,6 +1577,48 @@
            }

            return 0;

        }



        public bool SatisfyEntranceOpen()

        {

            var list = GetTreasureCategory(TreasureCategory.Human);

            if (list != null && list.Count > 1)

            {

                if (treasures.ContainsKey(list[1]))

                {

                    if (treasures[list[1]].state != TreasureState.Locked)

                    {

                        return true;

                    }

                }

            }

            var taskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>();

            var missions = taskModel.MainTaskDic;

            if (missions != null)

            {

                foreach (var missionId in missions.Keys)

                {

                    if (missionId > entranceOpenCondition)

                    {

                        return true;

                    }

                    else if (missionId == entranceOpenCondition)

                    {

                        return missions[missionId].MissionState == 3;

                    }

                }

                return false;

            }

            return true;

        }



        public void DisplayEntranceLimitHint()

        {

            var taskConfig = Config.Instance.Get<PyTaskConfig>(entranceOpenCondition);

            if (taskConfig != null)

            {

                SysNotifyMgr.Instance.ShowTip("OpenFabaoHint", taskConfig.lv);

            }

        }

    }



}