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

client_linchunjie

2018-09-17 b8f56070e35503272bb387b5d62476cda3d22b96

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

 Core/GameEngine/Login/Launch.cs

@@ -13,11 +13,9 @@
    static public LaunchStage currentStage { get { return m_CurrentStage; } }



    static float m_Progress = 0f;

    static public float progress

    {

    static public float progress {

        get { return m_Progress; }

        set

        {

        set {

            if (m_Progress != value)

            {

                m_Progress = value;

@@ -185,7 +183,6 @@
        OperationLogCollect.Instance.RecordEvent(2);



        m_CurrentStage = LaunchStage.ClientVersion;



        if (!Application.isEditor || InGameDownTestUtility.enable)

        {

            VersionUtility.Instance.RequestVersionCheck();

@@ -201,6 +198,8 @@
            }

        }



        if (VersionUtility.Instance.versionInfo != null && VersionUtility.Instance.versionInfo.downAsset == 1)

        {

        m_CurrentStage = LaunchStage.DownLoad;

        switch (VersionConfig.Get().assetAccess)

        {

@@ -214,7 +213,6 @@
                progressBuf = progress;

                timer = 0f;

                duration = 1.5f;



                while (!AssetVersionUtility.checkAssetCompleted)

                {

                    timer += Time.deltaTime;

@@ -239,6 +237,7 @@
                }

                break;

        }

        }



        if (!AssetSource.allFromEditor)

        {


 Core/GameEngine/Model/Config/FunctionForecastConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Wednesday, September 12, 2018
//    [  Date ]:           Monday, September 17, 2018
//--------------------------------------------------------

using UnityEngine;
@@ -25,6 +25,7 @@
        public int RedPointLV { get ; private set ; }

        public int RedPointPercentage { get ; private set ; }

        public int FrameLevel { get ; private set ; }
        public int OpenNumber { get ; private set ; }

        public override string getKey()
        {
@@ -61,6 +62,8 @@
                RedPointPercentage=IsNumeric(rawContents[12]) ? int.Parse(rawContents[12]):0; 

            

                FrameLevel=IsNumeric(rawContents[13]) ? int.Parse(rawContents[13]):0; 
			
                OpenNumber=IsNumeric(rawContents[14]) ? int.Parse(rawContents[14]):0; 
            }
            catch (Exception ex)
            {

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

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: bced258647f0fa940b752dd56e6a27e0
timeCreated: 1536737693
timeCreated: 1537175111
licenseType: Free
MonoImporter:
  serializedVersion: 2

 System/ClientVersion/VersionUtility.cs

@@ -181,6 +181,7 @@
        public JsonData resource_url;

        public JsonData notice_flag;

        public Version[] versions;

        public int downAsset =1;



        public Version GetLatestVersion()

        {


 System/FairyAu/PlayerMethodData.cs

@@ -28,11 +28,20 @@
    public Dictionary<int, int> MethodDataNeedLVDic = new Dictionary<int, int>();//心法下表对应的所需学习等级



    FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }

    private int FairyHallMax = 0;

    public override void Init()

    {

        string str = Config.Instance.Get<FuncConfigConfig>("FamilyTechNeedLV").Numerical1;

        MethodDataNeedLVDic = ConfigParse.GetDic<int, int>(str);

        var fairy = Config.Instance.GetAllValues<FamilyConfig>();

        foreach (var value in fairy)

        {

            if (value.familyLV > FairyHallMax)

            {

                FairyHallMax = value.familyLV;

            }



        }



    }



@@ -151,7 +160,7 @@
        {

            return;

        }

        if ((int)PlayerDatas.Instance.fairyData.mine.FamilyLV >= 2)

        if ((int)PlayerDatas.Instance.fairyData.mine.FamilyLV >= 2 && (int)PlayerDatas.Instance.fairyData.mine.FamilyLV < FairyHallMax)

        {

            int _familyLV = (int)PlayerDatas.Instance.fairyData.fairy.FamilyLV;

            if ((int)PlayerDatas.Instance.fairyData.fairy.FamilyMoney >= Config.Instance.Get<FamilyConfig>(_familyLV).needMoney)


 System/MainInterfacePanel/FeatureNoticeModel.cs

@@ -19,6 +19,7 @@
    private int OpenFuncId = 0;

    private bool RedPointChange = false;

    private bool IsRedPoint = false;

    public int FunctionForecastIndex = 0;

    public override void Init()

    {

        AddList();


 System/MainInterfacePanel/FeatureNoticeWin.cs

@@ -192,6 +192,7 @@
                if (!FuncOpen.Instance.IsFuncOpen(openTag))

                {

                    ClickFuncID = openTag;

                    featureNoticeModel.FunctionForecastIndex = config.OpenNumber;

                    return;

                }

            }

@@ -217,6 +218,20 @@
            if (functionForecastConfig == null)

            {

                return;

            }

            if (!FuncOpen.Instance.IsFuncOpen(ClickFuncID) && functionForecastConfig.OpenNumber > featureNoticeModel.FunctionForecastIndex)

            {

                m_Text_ShowA.gameObject.SetActive(false);

                m_TextShowB.gameObject.SetActive(false);

                m_TextShowC.gameObject.SetActive(false);

                m_TextShowD.gameObject.SetActive(false);

            }

            else

            {

                m_Text_ShowA.gameObject.SetActive(true);

                m_TextShowB.gameObject.SetActive(true);

                m_TextShowC.gameObject.SetActive(true);

                m_TextShowD.gameObject.SetActive(true);

            }

            m_TextAdvanceName.text = functionForecastConfig.FuncName;

            DisplayIcon(ClickFuncID);

@@ -253,6 +268,13 @@
            UI3DModelExhibition.Instance.StopShowWing();

            UI3DTreasureExhibition.Instance.StopShow();

            var functionForecastConfig = Config.Instance.Get<FunctionForecastConfig>(ClickFuncID);

            if (!FuncOpen.Instance.IsFuncOpen(ClickFuncID) && functionForecastConfig.OpenNumber > featureNoticeModel.FunctionForecastIndex)

            {

                m_FeaturesImage.gameObject.SetActive(true);

                m_FeaturesImage.SetSprite("YGWENHAO");

                m_FeaturesImage.SetNativeSize();

                return;

            }

            switch (funcID)

            {

                case (int)FeatureNoticeEnum.Pet:                  

@@ -301,6 +323,22 @@
            m_Textschedule.gameObject.SetActive(false);

            m_ButtonGoto.gameObject.SetActive(false);

            FuncOpenLVConfig funcoPenConfig = Config.Instance.Get<FuncOpenLVConfig>(funcID);

            var functionForecastConfig = Config.Instance.Get<FunctionForecastConfig>(ClickFuncID);

            if (!FuncOpen.Instance.IsFuncOpen(ClickFuncID) && functionForecastConfig.OpenNumber > featureNoticeModel.FunctionForecastIndex)

            {

                var functionForecastValue = Config.Instance.GetAllValues<FunctionForecastConfig>();

                string StrNanme = string.Empty;

                foreach (var value in functionForecastValue)

                {

                    if (value.OpenNumber == functionForecastConfig.OpenNumber - 1)

                    {

                        StrNanme = value.FuncName;

                    }                   
                }

                m_TextUnopened.gameObject.SetActive(true);

                m_TextUnopened.text = string.Format(Language.Get("NextYGLimit"), StrNanme, functionForecastConfig.FuncName);

                return;

            }

            if (funcoPenConfig.LimitMagicWeapon != 0 || funcoPenConfig.LimitMissionID != 0)

            {

                if (funcoPenConfig.LimitMagicWeapon != 0)//法宝


 System/MainInterfacePanel/FeaturesType1.cs

@@ -30,7 +30,7 @@
            get { return m_Button; }

            set { m_Button = value; }

        }

        FeatureNoticeModel featureNoticeModel { get { return ModelCenter.Instance.GetModel<FeatureNoticeModel>(); } }
        public void GetTheFeatureID(int funcId)

        {

            var functionForecastConfig = Config.Instance.Get<FunctionForecastConfig>(funcId);

@@ -40,7 +40,15 @@
            }

            m_FunctionName.text = functionForecastConfig.FuncName;

            m_FunctionalLevel.text = functionForecastConfig.DisplayLevel.ToString()+ Language.Get("Z1041");

            if (!FuncOpen.Instance.IsFuncOpen(funcId) && functionForecastConfig.OpenNumber > featureNoticeModel.FunctionForecastIndex)

            {

                m_FeaturesTypeIcon.SetSprite("UnKnowIcon");

            }

            else

            {

            m_FeaturesTypeIcon.SetSprite(functionForecastConfig.FuncIconKey);

            }

           
            if (PlayerDatas.Instance.baseData.LV >= functionForecastConfig.DisplayLevel)

            {

                m_FunctionalLevel.color = new Color32(141,220,17,255);


 System/MainInterfacePanel/FeaturesType2.cs

@@ -29,7 +29,7 @@
            get { return m_Button; }

            set { m_Button = value; }

        }

        FeatureNoticeModel featureNoticeModel { get { return ModelCenter.Instance.GetModel<FeatureNoticeModel>(); } }
        public void GetTheFeatureID(int funcId)

        {

            var functionForecastConfig = Config.Instance.Get<FunctionForecastConfig>(funcId);

@@ -39,7 +39,14 @@
            }

            m_FunctionName.text = functionForecastConfig.FuncName;

            m_FunctionalLevel.text = functionForecastConfig.DisplayLevel.ToString()+Language.Get("Z1041");

            if (!FuncOpen.Instance.IsFuncOpen(funcId) && functionForecastConfig.OpenNumber > featureNoticeModel.FunctionForecastIndex)

            {

                m_FeaturesTypeIcon.SetSprite("UnKnowIcon");

            }

            else

            {

            m_FeaturesTypeIcon.SetSprite(functionForecastConfig.FuncIconKey);

            }

            if (PlayerDatas.Instance.baseData.LV >= functionForecastConfig.DisplayLevel)

            {

                m_FunctionalLevel.color = new Color32(141, 220, 17,255);