1

UnityProject/Assets/AssetRaw/Fonts/douyuFont-2 tsettt2.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b4dfa96cc33e78f42ad3b1f8d287a1ff
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Assets/AssetRaw/UI/UIGameWorldRankForm.prefab

@@ -235,7 +235,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 284344981703633305}
-  - {fileID: 3063878028879792242}
   - {fileID: 2062335933049116140}
   m_Father: {fileID: 1253434479454431306}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1277,7 +1276,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7609834963487381497}
-  - {fileID: 4300252688463602288}
   - {fileID: 2535378267999883320}
   m_Father: {fileID: 1253434479454431306}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1636,7 +1634,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.00010880414, y: -0.0021868043}
+  m_AnchoredPosition: {x: -0.00010880414, y: -0.000965728}
   m_SizeDelta: {x: 0, y: 1292.4}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &6944785608262845692
@@ -3245,85 +3243,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &2353629731165882798
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4300252688463602288}
-  - component: {fileID: 4189406281391591810}
-  - component: {fileID: 5859233238820084974}
-  m_Layer: 5
-  m_Name: Label
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &4300252688463602288
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2353629731165882798}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2605311265197448084}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 2.092102, y: 2.780201}
-  m_SizeDelta: {x: -71.9134, y: -56.7932}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4189406281391591810
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2353629731165882798}
-  m_CullTransparentMesh: 1
---- !u!114 &5859233238820084974
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2353629731165882798}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 49
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 49
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u5BB6\u65CF\u699C"
 --- !u!1 &2361033708549205730
 GameObject:
   m_ObjectHideFlags: 0
@@ -3583,85 +3502,6 @@ MonoBehaviour:
     y: 0
     width: 1
     height: 1
---- !u!1 &2732567687680650508
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3063878028879792242}
-  - component: {fileID: 5698852707877253819}
-  - component: {fileID: 1363024823901103980}
-  m_Layer: 5
-  m_Name: Label
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &3063878028879792242
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2732567687680650508}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2432618909036398695}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 2.092102, y: 2.780201}
-  m_SizeDelta: {x: -71.9134, y: -56.7932}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5698852707877253819
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2732567687680650508}
-  m_CullTransparentMesh: 1
---- !u!114 &1363024823901103980
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2732567687680650508}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 49
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 49
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u79EF\u5206\u5468\u699C"
 --- !u!1 &2778700927803437541
 GameObject:
   m_ObjectHideFlags: 0
@@ -5596,7 +5436,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.000033585555, y: -0.004335842}
+  m_AnchoredPosition: {x: -0.000033585555, y: -0.00019185928}
   m_SizeDelta: {x: 0, y: 1292.4}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &5343428874745105376
@@ -6578,8 +6418,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: "\u6587\u660E\u699C"
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2d5dde65126cce44fa5766b27b429272, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: b4dfa96cc33e78f42ad3b1f8d287a1ff, type: 2}
-  m_sharedMaterial: {fileID: -4557169464251847458, guid: 2d5dde65126cce44fa5766b27b429272, type: 2}
+  m_sharedMaterial: {fileID: -4557169464251847458, guid: b4dfa96cc33e78f42ad3b1f8d287a1ff, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -6645,85 +6485,6 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &4838036310045239639
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7347979677426496679}
-  - component: {fileID: 4273565244923817053}
-  - component: {fileID: 275151273143794417}
-  m_Layer: 5
-  m_Name: Label
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &7347979677426496679
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4838036310045239639}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 6768390674830271073}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 2.092102, y: 2.780201}
-  m_SizeDelta: {x: -71.9134, y: -56.7932}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4273565244923817053
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4838036310045239639}
-  m_CullTransparentMesh: 1
---- !u!114 &275151273143794417
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4838036310045239639}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 49
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 49
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u79EF\u5206\u6708\u699C"
 --- !u!1 &4926351222985852038
 GameObject:
   m_ObjectHideFlags: 0
@@ -7168,7 +6929,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4912316768576301694}
-  - {fileID: 7347979677426496679}
   - {fileID: 5885401902927845497}
   m_Father: {fileID: 1253434479454431306}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -7888,15 +7648,15 @@ MonoBehaviour:
       m_Calls: []
   m_text: "\u79EF\u5206\u5468\u699C"
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2d5dde65126cce44fa5766b27b429272, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: b4dfa96cc33e78f42ad3b1f8d287a1ff, type: 2}
-  m_sharedMaterial: {fileID: -4557169464251847458, guid: 2d5dde65126cce44fa5766b27b429272, type: 2}
+  m_sharedMaterial: {fileID: -4557169464251847458, guid: b4dfa96cc33e78f42ad3b1f8d287a1ff, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
     rgba: 4278526027
-  m_fontColor: {r: 0.2924528, g: 0.1265345, b: 0.017933436, a: 1}
+  m_fontColor: {r: 0.29411766, g: 0.1254902, b: 0.019607844, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -10393,8 +10153,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: "\u79EF\u5206\u6708\u699C"
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2d5dde65126cce44fa5766b27b429272, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: b4dfa96cc33e78f42ad3b1f8d287a1ff, type: 2}
-  m_sharedMaterial: {fileID: -4557169464251847458, guid: 2d5dde65126cce44fa5766b27b429272, type: 2}
+  m_sharedMaterial: {fileID: -4557169464251847458, guid: b4dfa96cc33e78f42ad3b1f8d287a1ff, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []

UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameWorldRankForm.cs

@@ -39,27 +39,62 @@ namespace GameLogic
         #region ʼþ
         private void OnToggle_weekRankChange(bool isOn)
         {
+            var lab = m_toggle_weekRank.transform.Find("Label").GetComponent<TextMeshProUGUI>();
+
             if (isOn)
             {
+                Color color;
+                if (ColorUtility.TryParseHtmlString("#4B2005", out color))
+                {
+                    lab.color = color;
+                }
+
                 rankType = 1;
                 GetRankData();
             }
+            else
+            {
+                lab.color = Color.white;
+            }
         }
         private void OnToggle_RankChange(bool isOn)
         {
+            var lab = m_toggle_Rank.transform.Find("Label").GetComponent<TextMeshProUGUI>();
             if (isOn)
             {
                 rankType = 2;
                 GetRankData();
 
+                Color color;
+                if (ColorUtility.TryParseHtmlString("#4B2005", out color))
+                {
+                    lab.color = color;
+                }
             }
+            else
+            {
+                lab.color = Color.white;
+            }
+
+
         }
         private void OnToggle_gongXianRankChange(bool isOn)
         {
+            var lab = m_toggle_gongXianRank.transform.Find("Label").GetComponent<TextMeshProUGUI>();
             if (isOn)
             {
                 rankType = 3;
                 GetRankData();
+
+                Color color;
+                if (ColorUtility.TryParseHtmlString("#4B2005", out color))
+                {
+                    lab.color = color;
+                }
+            }
+            else
+            {
+                lab.color = Color.white;
             }
         }
         private void OnClick_CloseBtn()