少年修仙传客户端代码仓库
hch
2024-12-25 61c04e9aa3aa73b025d92f86c0d0138bbc49b556
0312 优化界面

# Conflicts:
# System/MainInterfacePanel/OffLineOnHookModel.cs
2个文件已删除
3个文件已修改
69 ■■■■■ 已修改文件
System/KnapSack/Logic/CommonGetItemRichTextWin.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/CommonGetItemRichTextWin.cs.meta 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/ItemLogicUtility.cs 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/OffLineOnHookWin.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Treasure/TreasureCollectBriefInfoBehaviour.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/CommonGetItemRichTextWin.cs
File was deleted
System/KnapSack/Logic/CommonGetItemRichTextWin.cs.meta
File was deleted
System/KnapSack/Logic/ItemLogicUtility.cs
@@ -1812,43 +1812,7 @@
                WindowCenter.Instance.Open<CommonGetItemWin>();
        }
        //通用显示获得的物品 和 更多的文本显示
        public void ShowGetItemRichText(List<Item> items, string info = "", int seconds = 3, string btnName = "", Action func = null, bool isNameShow = true, string eventName = "default")
        {
            if (getItemEventName != eventName)
            {
                if (WindowCenter.Instance.IsOpen<CommonGetItemRichTextWin>())
                    WindowCenter.Instance.Close<CommonGetItemRichTextWin>();
                totalShowItems.Clear();
                getItemEventName = eventName;
            }
            //相同ID 合并数量显示
            for (int i = 0; i < items.Count; i++)
            {
                var id = items[i].id;
                if (totalShowItems.ContainsKey(id))
                {
                    totalShowItems[id] = new Item(id, items[i].countEx + totalShowItems[id].countEx, items[i].bind, items[i].quality);
                }
                else
                {
                    totalShowItems.Add(id, items[i]);
                }
            }
            getItemInfo = info;
            OnGetItem = func;
            if (btnName == "")
                btnName = Language.Get("PopConfirmWin_OK");
            getItemBtnText = btnName;
            closeSeconds = seconds;
            this.isNameShow = isNameShow;
            OnGetItemShowEvent?.Invoke();
            if (!WindowCenter.Instance.IsOpen<CommonGetItemRichTextWin>())
                WindowCenter.Instance.Open<CommonGetItemRichTextWin>();
        }
        public void ClearGetItem()
        {
System/MainInterfacePanel/OffLineOnHookWin.cs
@@ -41,10 +41,12 @@
            m_CloseBtn.AddListener(OnClickCloseButton);
            getBtn.AddListener(() =>
            {
                if (onHookModel.mCTJGInfoClass.Exp < 0)
                CloseClick();
                var seconds = TimeUtility.AllSeconds - onHookModel.startSeconds + onHookModel.mCTJGInfoClass.AwardSeconds;
                //时间太短不结算
                if (seconds < 65)
                    return;
                onHookModel.GetAward(0);
                CloseClick();
            });
            buyBtn.AddListener(QuickBuy);
        }
System/Treasure/TreasureCollectBriefInfoBehaviour.cs
@@ -91,7 +91,7 @@
                if (model.m_jumpAwardID == -1)
                    return;
                if (model.quickGetAward)
                if (model.quickGetAward || PlayerDatas.Instance.baseData.LV > 100)
                {
                    roleModel.GetCustomAward(model.m_jumpAwardID);
                    m_AwardEffect.Play();