0312 修复 textex 编辑器会被默认重置白色问题；日常任务界面完成后不排序

hch

2025-01-06 28f3a0194c5f1d28a3e71b615fbe56b6af76438e

0312 修复 textex 编辑器会被默认重置白色问题；日常任务界面完成后不排序

 System/DailyQuest/DailyQuestModel.cs

@@ -1090,41 +1090,42 @@
            var config1 = DailyQuestConfig.Get(_lhs);

            var config2 = DailyQuestConfig.Get(_rhs);



            if (state1 == state2)

            {

                return config1.order < config2.order ? -1 : 1;

            }

            else

            {

                if (state1 == DailyQuestState.Completed)

                {

                    return 1;

                }

                else if (state2 == DailyQuestState.Completed)

                {

                    return -1;

                }

                else if (state1 == DailyQuestState.Locked)

                {

                    return 1;

                }

                else if (state2 == DailyQuestState.Locked)

                {

                    return -1;

                }

                else if (state1 == DailyQuestState.CanBuyTimes)

                {

                    return 1;

                }

                else if (state2 == DailyQuestState.CanBuyTimes)

                {

                    return -1;

                }

                else

                {

                    return config1.order < config2.order ? -1 : 1;

                }

            }

            return config1.order.CompareTo(config2.order);

            //if (state1 == state2)

            //{

            //    return config1.order < config2.order ? -1 : 1;

            //}

            //else

            //{

            //    if (state1 == DailyQuestState.Completed)

            //    {

            //        return 1;

            //    }

            //    else if (state2 == DailyQuestState.Completed)

            //    {

            //        return -1;

            //    }

            //    else if (state1 == DailyQuestState.Locked)

            //    {

            //        return 1;

            //    }

            //    else if (state2 == DailyQuestState.Locked)

            //    {

            //        return -1;

            //    }

            //    else if (state1 == DailyQuestState.CanBuyTimes)

            //    {

            //        return 1;

            //    }

            //    else if (state2 == DailyQuestState.CanBuyTimes)

            //    {

            //        return -1;

            //    }

            //    else

            //    {

            //        return config1.order < config2.order ? -1 : 1;

            //    }

            //}



        }




 UI/Core/TextEx.cs

@@ -36,6 +36,8 @@
            if (m_ColorType != value)
            {
                m_ColorType = value;
                if (m_ColorType == TextColType.None)
                    return;
                this.color = UIHelper.GetUIColor(value, bgColorType == BackGroundColorType.Bright);
            }
        }
@@ -48,6 +50,8 @@
        get { return m_BGColorType; }

        set { 

            m_BGColorType = value;

            if (m_ColorType == TextColType.None)

                return;

            this.color = UIHelper.GetUIColor(colorType, m_BGColorType == BackGroundColorType.Bright);

        }

    }