少年修仙传客户端代码仓库
client_Wu Xijin
2019-05-09 6bce2732e29c5939de0e5dbb0587af66eef413f0
6706 【前端】【2.0】天星塔功能
5个文件已修改
55 ■■■■■ 已修改文件
System/SkyTower/SkyTowerBehaviour.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/SkyTower/SkyTowerHintWin.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/SkyTower/SkyTowerVictoryWin.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/SkyTower/SkyTowerWin.cs 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI/Common/FunctionButton.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/SkyTower/SkyTowerBehaviour.cs
@@ -122,13 +122,13 @@
                return;
            }
            towerTop = UIUtility.CreateWidget("JadeDynastyTower_Top", "Top");
            towerTop = UIUtility.CreateWidget("SkyTower_Top", "Top");
            towerTop.transform.SetParentEx(m_Tower.content, Vector3.zero, Quaternion.identity, Vector3.one);
            towerTop.transform.SetAsFirstSibling();
            topHeight = ((RectTransform)towerTop.transform).rect.height;
            towerTopBehaviour = towerTop.AddMissingComponent<SkyTowerFloorBehaviour>();
            var floorPrefab = UILoader.LoadPrefab("JadeDynastyTower_Floor");
            var floorPrefab = UILoader.LoadPrefab("SkyTower_Floor");
            floorHeight = ((RectTransform)floorPrefab.transform).rect.height;
            for (int i = 0; i < 5; i++)
@@ -139,7 +139,7 @@
                floorBehaviours.Add(floorBehaviour);
            }
            towerBottom = UIUtility.CreateWidget("JadeDynastyTower_Bottom", "Bottom");
            towerBottom = UIUtility.CreateWidget("SkyTower_Bottom", "Bottom");
            towerBottom.transform.SetParentEx(m_Tower.content, Vector3.zero, Quaternion.identity, Vector3.one);
            towerBottom.transform.SetAsLastSibling();
            bottomHeight = ((RectTransform)towerBottom.transform).rect.height;
System/SkyTower/SkyTowerHintWin.cs
@@ -17,7 +17,6 @@
    {
        [SerializeField] Text m_Floor;
        [SerializeField] RewardPreviewGroup m_Rewards;
        [SerializeField] Text m_Description;
        SkyTowerModel model { get { return ModelCenter.Instance.GetModel<SkyTowerModel>(); } }
@@ -52,14 +51,7 @@
        {
            var config = SkyTowerConfig.Get(model.currentFloor);
            m_Floor.text = config.floorName;
            var rewards = new List<Item>();
            foreach (var reward in config.rewards)
            {
                rewards.Add(new Item(reward.x, reward.y));
            }
            m_Rewards.Display(rewards);
            m_Rewards.Display(config.rewards);
        }
    }
System/SkyTower/SkyTowerVictoryWin.cs
@@ -64,7 +64,7 @@
        protected override void DrawExitTimer(int seconds)
        {
            m_NextLevelTimer.text = Language.Get("JadeDynastyRewardTime", Mathf.Clamp(seconds, 0, int.MaxValue));
            m_NextLevelTimer.text = Language.Get("SkyTowerNextLevel", Mathf.Clamp(seconds, 0, int.MaxValue));
            m_ExitTimer.text = Language.Get("DemonDungeonExit");
        }
System/SkyTower/SkyTowerWin.cs
@@ -31,6 +31,7 @@
        [SerializeField] RectTransform m_RewardContainer;
        [SerializeField] PositionTween m_RewardShowTween;
        [SerializeField] Text m_RewardTitle;
        [SerializeField] RewardPreviewGroup m_RewardBehaviour;
        [SerializeField] TextEx m_LevelLimit;
        [SerializeField] TextEx m_FightPower;
@@ -40,6 +41,8 @@
        [SerializeField] ImageEx m_ChallengeImage;
        SkyTowerModel model { get { return ModelCenter.Instance.GetModel<SkyTowerModel>(); } }
        ShowType showType = ShowType.None;
        #region Built-in
        protected override void BindController()
@@ -55,6 +58,7 @@
        protected override void OnPreOpen()
        {
            showType = ShowType.None;
            model.ConfirmRedpoint02();
        }
@@ -87,13 +91,21 @@
        private void DisplayBossInfo(bool immediately)
        {
            if (showType == ShowType.Boss)
            {
                return;
            }
            showType = ShowType.Boss;
            m_BossContainer.gameObject.SetActive(true);
            m_RewardContainer.gameObject.SetActive(false);
            m_ViewBoss.transform.localScale = Vector3.one;
            m_ViewReward.transform.localScale = Vector3.one * 0.8f;
            m_ViewBossEffect.
            m_ViewBossEffect.Play();
            m_ViewRewardEffect.Stop();
            var towerConfig = SkyTowerConfig.Get(model.currentFloor);
            var npcConfig = NPCConfig.Get(towerConfig.bossId);
@@ -125,13 +137,24 @@
        private void DisplayRewardInfo(bool immediately)
        {
            if (showType == ShowType.Reward)
            {
                return;
            }
            showType = ShowType.Reward;
            m_BossContainer.gameObject.SetActive(false);
            m_RewardContainer.gameObject.SetActive(true);
            m_ViewBoss.transform.localScale = Vector3.one * 0.8f;
            m_ViewReward.transform.localScale = Vector3.one;
            m_ViewBossEffect.Stop();
            m_ViewRewardEffect.Play();
            var config = SkyTowerConfig.Get(model.currentFloor);
            m_RewardTitle.text = Language.Get("SkyTower2", config.floorName);
            m_RewardBehaviour.Display(config.rewards);
            m_FightPower.text = config.fightPower.ToString();
@@ -162,10 +185,11 @@
            model.RequestChallenge();
        }
        enum ChallengeButtonShowState
        public enum ShowType
        {
            Normal,
            CoolDown,
            None,
            Boss,
            Reward,
        }
    }
UI/Common/FunctionButton.cs
@@ -27,7 +27,10 @@
        [SerializeField] int m_FunctionId = -1;
        public int functionId {
            get { return m_FunctionId; }
            set { m_FunctionId = value; }
            set {
                m_FunctionId = value;
                OnFunctionUnLockStateChange();
            }
        }
        [SerializeField] TitleBtnState m_State = TitleBtnState.Normal;