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

client_Zxw

2018-08-13 cbe69478b19b0a1fe272e0ec90b4fad9c3994ef2

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

 Core/NetworkPackage/ClientPack/ClientToMapServer/A3_Item.meta

File was deleted

 System/BlastFurnace/GetEquipPathTips.cs

@@ -280,30 +280,34 @@


                        break;

                    case 1:

                        realmTitleText.gameObject.SetActive(true);

                        realmImg.gameObject.SetActive(true);

                        realmTitleText.text = Language.Get("RealmLimit1");

                        RealmConfig realmConfig = ConfigManager.Instance.GetTemplate<RealmConfig>(itemAttrData.itemConfig.RealmLimit);

                        if (itemAttrData.itemConfig.RealmLimit <= 0)

                        if(itemAttrData.isHavePutLimit)

                        {

                            realmImg.SetSprite("NoRealm");

                        }

                        else

                        {

                            if (realmConfig != null)

                            realmTitleText.gameObject.SetActive(true);

                            realmImg.gameObject.SetActive(true);

                            realmTitleText.text = Language.Get("RealmLimit1");

                            RealmConfig realmConfig = ConfigManager.Instance.GetTemplate<RealmConfig>(itemAttrData.itemConfig.RealmLimit);

                            if (itemAttrData.itemConfig.RealmLimit <= 0)

                            {

                                realmImg.SetSprite(realmConfig.Img);

                                realmImg.SetSprite("NoRealm");

                            }

                            else

                            {

                                if (realmConfig != null)

                                {

                                    realmImg.SetSprite(realmConfig.Img);

                                }

                            }



                            if (PlayerDatas.Instance.baseData.realmLevel >= itemAttrData.itemConfig.RealmLimit)

                            {

                                realmTitleText.color = conditionColor;

                            }

                            else

                            {

                                realmTitleText.color = UIHelper.GetUIColor(TextColType.Red);

                            }

                        }



                        if (PlayerDatas.Instance.baseData.realmLevel >= itemAttrData.itemConfig.RealmLimit)

                        {

                            realmTitleText.color = conditionColor;

                        }

                        else

                        {

                            realmTitleText.color = UIHelper.GetUIColor(TextColType.Red);

                        }

                      
                        break;

                    case 2:

                        RefreshNeedPointUI();


 System/FindPrecious/FindPreciousBossBriefInfoBehaviour.cs

@@ -171,7 +171,7 @@
            }



            m_Selected.gameObject.SetActive(selected);

            m_BackGround.SetSprite(selected ? "DemonJarSelectFrame" : "DemonJarNormalFrame");

            //m_BackGround.SetSprite(selected ? "DemonJarSelectFrame" : "DemonJarNormalFrame");



            var fontPattern = string.Empty;

            switch (_state)


 System/KnapSack/Logic/EquipTip.cs

@@ -321,30 +321,34 @@


                        break;

                    case 1:

                        realmTitleText.gameObject.SetActive(true);

                        realmImg.gameObject.SetActive(true);

                        realmTitleText.text = Language.Get("RealmLimit1");

                        RealmConfig realmConfig = ConfigManager.Instance.GetTemplate<RealmConfig>(itemAttrData.itemConfig.RealmLimit);

                        if (itemAttrData.itemConfig.RealmLimit <= 0)

                        if(itemAttrData.isHavePutLimit)

                        {

                            realmImg.SetSprite("NoRealm");

                        }

                        else

                        {

                            if (realmConfig != null)

                            realmTitleText.gameObject.SetActive(true);

                            realmImg.gameObject.SetActive(true);

                            realmTitleText.text = Language.Get("RealmLimit1");

                            RealmConfig realmConfig = ConfigManager.Instance.GetTemplate<RealmConfig>(itemAttrData.itemConfig.RealmLimit);

                            if (itemAttrData.itemConfig.RealmLimit <= 0)

                            {

                                realmImg.SetSprite(realmConfig.Img);

                                realmImg.SetSprite("NoRealm");

                            }

                            else

                            {

                                if (realmConfig != null)

                                {

                                    realmImg.SetSprite(realmConfig.Img);

                                }

                            }



                            if (PlayerDatas.Instance.baseData.realmLevel >= itemAttrData.itemConfig.RealmLimit)

                            {

                                realmTitleText.color = conditionColor;

                            }

                            else

                            {

                                realmTitleText.color = UIHelper.GetUIColor(TextColType.Red);

                            }

                        }



                        if (PlayerDatas.Instance.baseData.realmLevel >= itemAttrData.itemConfig.RealmLimit)

                        {

                            realmTitleText.color = conditionColor;

                        }

                        else

                        {

                            realmTitleText.color = UIHelper.GetUIColor(TextColType.Red);

                        }

                       
                        break;

                    case 2:

                        RefreshNeedPointUI();


 System/KnapSack/Logic/UnionWarehouseEquipTip.cs

@@ -291,30 +291,34 @@


                        break;

                    case 1:

                        realmTitleText.gameObject.SetActive(true);

                        realmImg.gameObject.SetActive(true);

                        realmTitleText.text = Language.Get("RealmLimit1");

                        RealmConfig realmConfig = ConfigManager.Instance.GetTemplate<RealmConfig>(itemAttrData.itemConfig.RealmLimit);

                        if (itemAttrData.itemConfig.RealmLimit <= 0)

                        if(itemAttrData.isHavePutLimit)

                        {

                            realmImg.SetSprite("NoRealm");

                        }

                        else

                        {

                            if (realmConfig != null)

                            realmTitleText.gameObject.SetActive(true);

                            realmImg.gameObject.SetActive(true);

                            realmTitleText.text = Language.Get("RealmLimit1");

                            RealmConfig realmConfig = ConfigManager.Instance.GetTemplate<RealmConfig>(itemAttrData.itemConfig.RealmLimit);

                            if (itemAttrData.itemConfig.RealmLimit <= 0)

                            {

                                realmImg.SetSprite(realmConfig.Img);

                                realmImg.SetSprite("NoRealm");

                            }

                            else

                            {

                                if (realmConfig != null)

                                {

                                    realmImg.SetSprite(realmConfig.Img);

                                }

                            }



                            if (PlayerDatas.Instance.baseData.realmLevel >= itemAttrData.itemConfig.RealmLimit)

                            {

                                realmTitleText.color = conditionColor;

                            }

                            else

                            {

                                realmTitleText.color = UIHelper.GetUIColor(TextColType.Red);

                            }

                        }



                        if (PlayerDatas.Instance.baseData.realmLevel >= itemAttrData.itemConfig.RealmLimit)

                        {

                            realmTitleText.color = conditionColor;

                        }

                        else

                        {

                            realmTitleText.color = UIHelper.GetUIColor(TextColType.Red);

                        }

                     
                        break;

                    case 2:

                        RefreshNeedPointUI();


 System/Message/BattleHint.cs

New file
@@ -0,0 +1,64 @@
using System;

using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace Snxxz.UI

{

    public class BattleHint : Singleton<BattleHint>

    {

        public BattleHint()

        {

            StageManager.Instance.onStageLoadFinish += OnStageLoadFinish;

        }



        private void OnStageLoadFinish()

        {

            Clear();

        }



        public event Action battleHintUpdate;



        Queue<string> battleHints = new Queue<string>();



        public void Receive(string msg)

        {

            if (!(StageManager.Instance.CurrentStage is DungeonStage))

            {

                return;

            }

            battleHints.Enqueue(msg);

            if (StageManager.Instance.isLoading)

            {

                return;

            }

            if (!WindowCenter.Instance.CheckOpen<BattleHintWin>())

            {

                WindowCenter.Instance.Open<BattleHintWin>();

            }

            else

            {

                if (battleHintUpdate != null)

                {

                    battleHintUpdate();

                }

            }

        }



        public bool TryGetBattleHint(out string msg)

        {

            msg = string.Empty;

            if (battleHints.Count > 0)

            {

                msg = battleHints.Dequeue();

                return true;

            }

            return false;

        }



        public void Clear()

        {

            battleHints.Clear();

        }

    }

}


 System/Message/BattleHint.cs.meta

File was renamed from Utility/PostProcessingUtility.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 0917d0a6492151f4387e5ebf2d690004
timeCreated: 1527818719
guid: 2638bbc281bae6b459b24b1b6400b0d4
timeCreated: 1533972386
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/Message/BattleHintWin.cs

New file
@@ -0,0 +1,97 @@
//--------------------------------------------------------

//    [Author]:           第二世界

//    [  Date ]:           Saturday, August 11, 2018

//--------------------------------------------------------



using System;

using System.Collections;

using System.Collections.Generic;

using UnityEngine;

using UnityEngine.UI;



namespace Snxxz.UI

{



    public class BattleHintWin : Window

    {

        [SerializeField] Image m_BattleHint;

        [SerializeField] ScaleTween m_BattleHintTween;

        [SerializeField, Header("保留时间")] float m_KeepTime = 2f;



        bool inBattleHint = false;

        #region Built-in

        protected override void BindController()

        {

        }



        protected override void AddListeners()

        {

        }



        protected override void OnPreOpen()

        {

            inBattleHint = false;

            m_BattleHintTween.gameObject.SetActive(false);

        }



        protected override void OnActived()

        {

            base.OnActived();

            DisplayBattleHint();

            BattleHint.Instance.battleHintUpdate += BattleHintUpdate;

        }



        protected override void OnAfterOpen()

        {

        }



        protected override void OnPreClose()

        {

            BattleHint.Instance.battleHintUpdate -= BattleHintUpdate;

        }



        protected override void OnAfterClose()

        {

        }

        #endregion



        private void BattleHintUpdate()

        {

            if (!inBattleHint)

            {

                DisplayBattleHint();

            }

        }



        void DisplayBattleHint()

        {

            string iconKey = string.Empty;

            if (BattleHint.Instance.TryGetBattleHint(out iconKey))

            {

                inBattleHint = true;

                m_BattleHint.SetSprite(iconKey);

                m_BattleHint.SetNativeSize();

                m_BattleHintTween.gameObject.SetActive(true);

                m_BattleHintTween.SetStartState();

                m_BattleHintTween.Play(OnBattleHintTweenComplete);

            }

        }



        void OnBattleHintTweenComplete()

        {

            StartCoroutine(Co_Complete());

        }



        IEnumerator Co_Complete()

        {

            yield return WaitingForSecondConst.GetWaitForSeconds(m_KeepTime);

            inBattleHint = false;

            m_BattleHintTween.gameObject.SetActive(false);

            DisplayBattleHint();

        }

    }

}










 System/Message/BattleHintWin.cs.meta

copy from Utility/PostProcessingUtility.cs.meta
copy to System/Message/BattleHintWin.cs.meta
File was copied from Utility/PostProcessingUtility.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 0917d0a6492151f4387e5ebf2d690004
timeCreated: 1527818719
guid: 6a0e546fd3e74454595529a5928ad314
timeCreated: 1533971784
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/Message/SysNotifyMgr.cs

@@ -204,6 +204,9 @@
                        OnSysTipEvent(type[i], msg, tipInfoList);

                    }

                    break;

                case SysNotifyType.SysBattleHint:

                    BattleHint.Instance.Receive(msg);

                    break;

            }

        }



@@ -225,6 +228,7 @@
        SysTeamTip = 41,//队伍频道提示

        SysRealmTip = 100,//境界提示

        SysFixedTip1 = 11,//固定提示2

        SysBattleHint = 6,//上古战场提示

    }



    public int Compare(SystemHintData x, SystemHintData y)


 System/Store/Logic/BuyEquipTip.cs

@@ -312,30 +312,34 @@


                        break;

                    case 1:

                        realmTitleText.gameObject.SetActive(true);

                        realmImg.gameObject.SetActive(true);

                        realmTitleText.text = Language.Get("RealmLimit1");

                        RealmConfig realmConfig = ConfigManager.Instance.GetTemplate<RealmConfig>(itemAttrData.itemConfig.RealmLimit);

                        if (itemAttrData.itemConfig.RealmLimit <= 0)

                        if(itemAttrData.isHavePutLimit)

                        {

                            realmImg.SetSprite("NoRealm");

                        }

                        else

                        {

                            if (realmConfig != null)

                            realmTitleText.gameObject.SetActive(true);

                            realmImg.gameObject.SetActive(true);

                            realmTitleText.text = Language.Get("RealmLimit1");

                            RealmConfig realmConfig = ConfigManager.Instance.GetTemplate<RealmConfig>(itemAttrData.itemConfig.RealmLimit);

                            if (itemAttrData.itemConfig.RealmLimit <= 0)

                            {

                                realmImg.SetSprite(realmConfig.Img);

                                realmImg.SetSprite("NoRealm");

                            }

                            else

                            {

                                if (realmConfig != null)

                                {

                                    realmImg.SetSprite(realmConfig.Img);

                                }

                            }



                            if (PlayerDatas.Instance.baseData.realmLevel >= itemAttrData.itemConfig.RealmLimit)

                            {

                                realmTitleText.color = conditionColor;

                            }

                            else

                            {

                                realmTitleText.color = UIHelper.GetUIColor(TextColType.Red);

                            }

                        }



                        if (PlayerDatas.Instance.baseData.realmLevel >= itemAttrData.itemConfig.RealmLimit)

                        {

                            realmTitleText.color = conditionColor;

                        }

                        else

                        {

                            realmTitleText.color = UIHelper.GetUIColor(TextColType.Red);

                        }

                     
                        break;

                    case 2:

                        RefreshNeedPointUI();


 System/SystemSetting/ActivitiesPushMgr.cs

@@ -84,7 +84,7 @@
                    {

                        PlayerRankData.RankType rankType = impactRank.GetRankType(rankTypelist[i]);

                        string rankName = StringUtility.Contact("OSCBillRankTitle_", rankType);

                        SendPushInfo(GetPushJsonData(rankStartId, remainSecond, Language.Get("SetUpPrivate106"), Language.Get("SetUpPrivate107", rankName)));

                        SendPushInfo(GetPushJsonData(rankStartId, remainSecond, Language.Get("SetUpPrivate106"), Language.Get("SetUpPrivate107",Language.Get(rankName))));

                    }

                }

            }

@@ -109,7 +109,7 @@
                    {

                        PlayerRankData.RankType rankType = impactRank.GetRankType(rankTypelist[i]);

                        string rankName = StringUtility.Contact("OSCBillRankTitle_", rankType);

                        SendPushInfo(GetPushJsonData(rankEndId, remainSecond, Language.Get("SetUpPrivate106"), Language.Get("SetUpPrivate108", rankName)));

                        SendPushInfo(GetPushJsonData(rankEndId, remainSecond, Language.Get("SetUpPrivate106"), Language.Get("SetUpPrivate108", Language.Get(rankName))));

                    }

                }

            }


 System/SystemSetting/SystemSetting.cs

@@ -131,21 +131,18 @@
                Shader.DisableKeyword("QUALITY_HGH");

                Shader.DisableKeyword("QUALITY_MED");

                Shader.EnableKeyword("QUALITY_LOW");

                PostProcessingUtility.TogglePostProcessing(false);

                break;

            case GameQuality.Medium:

                Shader.globalMaximumLOD = 250;

                Shader.DisableKeyword("QUALITY_HGH");

                Shader.EnableKeyword("QUALITY_MED");

                Shader.DisableKeyword("QUALITY_LOW");

                PostProcessingUtility.TogglePostProcessing(false);

                break;

            case GameQuality.High:

                Shader.globalMaximumLOD = 500;

                Shader.EnableKeyword("QUALITY_HGH");

                Shader.DisableKeyword("QUALITY_MED");

                Shader.DisableKeyword("QUALITY_LOW");

                PostProcessingUtility.TogglePostProcessing(false);

                break;

        }




 System/WindowBase/WindowCenter.cs

@@ -13,7 +13,7 @@
        public event Action<Window> jumpWindowCloseEvent;

        List<string> closeAllIgnoreWindows = new List<string>() {

            "MessageWin", "NewBieWin", "NewItemGetWin", "AttributePromoteShowWin" ,"DungeonBeginCoolDownWin","DungeonFightWin","StatusTipWin"

            ,"ScrollTipWin","MarqueeWin","ExperienceOpenWin","TrumpetWin","BattlePrepareCoolDownWin","DungeonGradeWin"

            ,"ScrollTipWin","MarqueeWin","ExperienceOpenWin","TrumpetWin","BattlePrepareCoolDownWin","DungeonGradeWin","BattleHintWin"

        };



        UIRoot m_UIRoot;


 Utility/PostProcessingIniter.cs

File was deleted

 Utility/PostProcessingIniter.cs.meta

File was deleted

 Utility/PostProcessingUtility.cs

File was deleted