少年修仙传客户端代码仓库
client_Hale
2019-07-02 9d2a77976a203738f230003899b3ec8a886de11e
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
3个文件已修改
47 ■■■■■ 已修改文件
System/Dungeon/DungeonBossBriefInfoBehaviour.cs 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/EquipStar/EquipStarUpgradeMaterialBehaviour.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI/Common/InputSpecialWordLimit.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dungeon/DungeonBossBriefInfoBehaviour.cs
@@ -14,10 +14,13 @@
    public class DungeonBossBriefInfoBehaviour : MonoBehaviour
    {
        [SerializeField] Button m_MoveTo;
        [SerializeField] Text m_Level;
        [SerializeField] Text m_RebornTime;
        [SerializeField] Text m_Alive;
        [SerializeField] Text m_RebornAtOnce;
        [SerializeField] Text m_Locked;
        [SerializeField] RebornRightNowBossInfoQuery m_BossInfoQuery;
        int bossId = 0;
@@ -57,6 +60,17 @@
        private void MoveToNpc()
        {
            var bossState = CalculateBossState();
            if (bossState == BossState.Locked)
            {
                var config = NPCConfig.Get(bossId);
                if (config != null)
                {
                    SysNotifyMgr.Instance.ShowTip("BossRealmHint2", config.Realm);
                }
                return;
            }
            if (PlayerDatas.Instance.hero != null)
            {
                PlayerDatas.Instance.hero.StopPathFind();
@@ -75,6 +89,11 @@
            if (!model.TryGetBossInfo(bossId, out bossInfo))
            {
                return BossState.None;
            }
            if (!model.IsBossUnlock(bossId))
            {
                return BossState.Locked;
            }
            var isAlive = bossInfo.IsBossAlive();
@@ -98,6 +117,7 @@
            m_Alive.SetActive(bossState == BossState.Alive);
            m_RebornTime.SetActive(bossState == BossState.Dead);
            m_RebornAtOnce.SetActive(bossState == BossState.RebornSoon);
            m_Locked.SetActive(bossState == BossState.Locked);
            if (bossState == BossState.Dead)
            {
@@ -111,6 +131,7 @@
        public enum BossState
        {
            None,
            Locked,
            Alive,
            Dead,
            RebornSoon,
System/EquipStar/EquipStarUpgradeMaterialBehaviour.cs
@@ -53,10 +53,18 @@
                m_Hint.gameObject.SetActive(isUnLocked && !hasMaterial);
                if (hasMaterial)
                {
                    m_Empty.gameObject.SetActive(false);
                    var item = packModel.GetItemByGuid(material);
                    m_Item.gameObject.SetActive(true);
                    m_Item.SetItem(item.itemId, 1);
                    if (item != null)
                    {
                        m_Empty.gameObject.SetActive(false);
                        m_Item.gameObject.SetActive(true);
                        m_Item.SetItem(item.itemId, 1);
                    }
                    else
                    {
                        m_Item.gameObject.SetActive(false);
                        m_Empty.gameObject.SetActive(true);
                    }
                }
                else
                {
UI/Common/InputSpecialWordLimit.cs
@@ -23,11 +23,19 @@
                || char.GetUnicodeCategory(addedChar) == UnicodeCategory.OtherNumber
                || char.GetUnicodeCategory(addedChar) == UnicodeCategory.MathSymbol
                || char.GetUnicodeCategory(addedChar) == UnicodeCategory.OtherNotAssigned
                || addedChar == '\n'
                || (m_SpaceLimit && (addedChar == ' ') || (addedChar == ' ')))
                || addedChar == '\n')
            {
                return (char)0;
            }
            if (m_SpaceLimit)
            {
                if (addedChar == ' '
                 || addedChar == ' '
                 || char.GetUnicodeCategory(addedChar) == UnicodeCategory.SpaceSeparator)
                {
                    return (char)0;
                }
            }
            return addedChar;
        }
    }