少年修仙传客户端代码仓库
7688 子 【开发】【主干】娲皇遗迹增加首次S级奖励 / 【前端】【主干】娲皇遗迹增加首次S级奖励
3个文件已修改
85 ■■■■■ 已修改文件
System/Dungeon/DungeonData.cs 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dungeon/DungeonNuwaVictoryWin.cs 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dungeon/DungeonRewardItem.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dungeon/DungeonData.cs
@@ -56,6 +56,7 @@
        public ServerItem[] itemInfo;
        public ServerItem[] succItemInfo;
        public ServerItem[] AuctionItem;
        public ServerItem[] firstPassItem;
        public int[] xianyuanCoin;
        public int sp;
        public int startRewardLineID;
System/Dungeon/DungeonNuwaVictoryWin.cs
@@ -128,7 +128,10 @@
                }
            }
            if (dungeonNuwaModel.SatisfyChallengeFloor(result.lineID + 2))
            var satisfyChallengeNext = dungeonNuwaModel.SatisfyChallengeFloor(result.lineID + 2);
            if (satisfyChallengeNext &&
                (result.firstPassItem == null || result.firstPassItem.Length == 0))
            {
                m_ContainerReward.gameObject.SetActive(false);
            }
@@ -136,7 +139,9 @@
            {
                m_ContainerReward.gameObject.SetActive(true);
                m_ChallengeRemind.gameObject.SetActive(result.grade >= 5
                    && result.lineID + 1 < dungeonNuwaModel.floorCount);
                    && result.lineID + 1 < dungeonNuwaModel.floorCount
                    && !satisfyChallengeNext);
                DrawItemRewards();
                if (hasAssistPoint)
@@ -150,22 +155,28 @@
            }
        }
        List<ServerItem> Serveritem = new List<ServerItem>();
        List<ServerItem> displayItems = new List<ServerItem>();
        protected override void DrawItemRewards()
        {
            Serveritem.Clear();
            var merged = false;
            displayItems.Clear();
            var serveritems = dungeonModel.dungeonResult.itemInfo;
            if (serveritems == null)
            if (serveritems != null && serveritems.Length > 0)
            {
                return;
                List<ServerItem> items = new List<ServerItem>(serveritems);
                items.Sort(Compare);
                displayItems.AddRange(items);
            }
            for (int i = 0; i < serveritems.Length; i++)
            var firstPassItems = dungeonModel.dungeonResult.firstPassItem;
            if (firstPassItems != null && firstPassItems.Length > 0)
            {
                Serveritem.Add(serveritems[i]);
                List<ServerItem> items = new List<ServerItem>(firstPassItems);
                items.Sort(Compare);
                displayItems.AddRange(items);
            }
            Serveritem.Sort(Compare);
            var hasReward = (serveritems != null && serveritems.Length > 0) || dungeonModel.specialItemCollectRecord.count > 0;
            var hasReward = displayItems.Count > 0;
            m_RewardIndexs.Clear();
            if (m_RewardTweens != null && m_RewardTweens.Length > 0)
@@ -175,27 +186,20 @@
                    m_RewardTweens[i].SetEndState();
                }
            }
            m_ContainerReward.gameObject.SetActive(hasReward);
            if (Serveritem != null)
            if (displayItems != null)
            {
                var items = new List<ItemModel>();
                for (int i = 0; i < Serveritem.Count; i++)
                for (int i = 0; i < displayItems.Count; i++)
                {
                    var serverItem = Serveritem[i];
                    var serverItem = displayItems[i];
                    var itemInfo = new ItemInfo();
                    itemInfo.itemId = serverItem.ItemID;
                    itemInfo.userData = serverItem.UserData;
                    if (!merged && itemInfo.itemId == dungeonModel.specialItemCollectRecord.id)
                    {
                        itemInfo.count = serverItem.Count + dungeonModel.specialItemCollectRecord.count;
                        merged = true;
                    }
                    else
                    {
                        itemInfo.count = serverItem.Count;
                    }
                    itemInfo.count = serverItem.Count;
                    items.Add(new ItemModel(PackType.Item, itemInfo));
                }
@@ -207,9 +211,10 @@
                    {
                        behaviour.transform.parent.gameObject.SetActive(true);
                        behaviour.gameObject.SetActive(false);
                        behaviour.serverItem = Serveritem[i];
                        behaviour.firstPassItem = serveritems == null || i >= serveritems.Length;
                        behaviour.serverItem = displayItems[i];
                        behaviour.Init(items[i]);
                        m_RewardIndexs.Add(m_SpecialItemCollect == null ? i : i + 1);
                        m_RewardIndexs.Add(i);
                    }
                    else
                    {
@@ -217,22 +222,6 @@
                        behaviour.gameObject.SetActive(false);
                    }
                }
                if (m_SpecialItemCollect != null)
                {
                    if (!merged && dungeonModel.specialItemCollectRecord.count > 0)
                    {
                        m_SpecialItemCollect.transform.parent.gameObject.SetActive(true);
                        m_SpecialItemCollect.gameObject.SetActive(false);
                        m_SpecialItemCollect.SetItem(dungeonModel.specialItemCollectRecord);
                    }
                    else
                    {
                        m_SpecialItemCollect.transform.parent.gameObject.SetActive(false);
                        m_SpecialItemCollect.gameObject.SetActive(false);
                    }
                }
            }
            if (m_RewardIndexs.Count > 0 && m_RewardTweens != null && m_RewardTweens.Length > 0)
            {
@@ -245,7 +234,9 @@
            ItemConfig itemConfigx = ItemConfig.Get(x.ItemID);
            ItemConfig itemConfigy = ItemConfig.Get(y.ItemID);
            if (itemConfigx.ItemColor.CompareTo(itemConfigy.ItemColor) != 0)
            {
                return -itemConfigx.ItemColor.CompareTo(itemConfigy.ItemColor);
            }
            return 1;
        }
    }
System/Dungeon/DungeonRewardItem.cs
@@ -12,7 +12,9 @@
    public class DungeonRewardItem : CommonItemBaisc
    {
        [SerializeField] UIEffect m_FirstPass;
        public ServerItem serverItem { get; set; }
        public bool firstPassItem { get; set; }
        
        UIEffect itemColorSfx = null;
@@ -21,6 +23,7 @@
        {
            button.AddListener(ShowItemTip);
            RequestSfx();
            RequestFirstPassSfx();
        }
        private void OnDisable()
@@ -58,6 +61,14 @@
                itemColorSfx = null;
            }
        }
        private void RequestFirstPassSfx()
        {
            if (firstPassItem && m_FirstPass != null)
            {
                m_FirstPass.Play();
            }
        }
    }
}