From 1cda0abb3f65d7e37b84b8c492d1f0f29f0af02b Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Thu, 16 Oct 2025 10:03:18 +0800 Subject: [PATCH] fix bug --- .../arts/textures/ui/common/common_time.png | Bin 1919 -> 2142 bytes .../act_sevenday/act_sevenday_ui.prefab | 135 +++++++++++++++++- .../ui/arena/arena_season_reward_ui.prefab | 6 +- Assets/prefabs/ui/tips/help_tips.prefab | 2 +- 4 files changed, 133 insertions(+), 10 deletions(-) diff --git a/Assets/arts/textures/ui/common/common_time.png b/Assets/arts/textures/ui/common/common_time.png index 0f6632e57bbeded55d3df827744daa84b34f46c8..83274bc7a63a5646b42cb0ac16fdc791e5c20548 100644 GIT binary patch literal 2142 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 diff --git a/Assets/prefabs/ui/activity/act_sevenday/act_sevenday_ui.prefab b/Assets/prefabs/ui/activity/act_sevenday/act_sevenday_ui.prefab index 2377a8e8d..2f6020bb7 100644 --- a/Assets/prefabs/ui/activity/act_sevenday/act_sevenday_ui.prefab +++ b/Assets/prefabs/ui/activity/act_sevenday/act_sevenday_ui.prefab @@ -1453,7 +1453,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1408983396960576097} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3047,7 +3047,7 @@ RectTransform: m_Children: - {fileID: 8419305142630255545} m_Father: {fileID: 1408983396960576097} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4334,7 +4334,7 @@ RectTransform: - {fileID: 5115397819080707427} - {fileID: 5617546324997617039} m_Father: {fileID: 1408983396960576097} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6300,6 +6300,7 @@ RectTransform: - {fileID: 2162131995018180340} - {fileID: 8490482566696598267} - {fileID: 5478043047307682528} + - {fileID: 7165356781993311003} - {fileID: 3365938937158743796} - {fileID: 1547742922862932451} - {fileID: 5165081512832862684} @@ -8397,7 +8398,7 @@ RectTransform: - {fileID: 4233375563365296628} - {fileID: 3716903478799651169} m_Father: {fileID: 1408983396960576097} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -10983,7 +10984,7 @@ RectTransform: - {fileID: 8256067434223647778} - {fileID: 3727037466166933418} m_Father: {fileID: 1408983396960576097} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -11405,7 +11406,7 @@ RectTransform: - {fileID: 4391850503084619461} - {fileID: 2387591175067064096} m_Father: {fileID: 1408983396960576097} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -14572,6 +14573,128 @@ GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 4277397603874285572} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5442435024978792581 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1408983396960576097} + m_Modifications: + - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Name + value: ui_spine_obj + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: startingLoop + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: skeletonDataAsset + value: + objectReference: {fileID: 11400000, guid: f558947e8d834544b81701dd8682dfea, type: 2} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: startingAnimation + value: idle + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchoredPosition.x + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchoredPosition.y + value: 450 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} +--- !u!224 &7165356781993311003 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 5442435024978792581} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7362037230632659175 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/prefabs/ui/arena/arena_season_reward_ui.prefab b/Assets/prefabs/ui/arena/arena_season_reward_ui.prefab index 718643123..08f93b0b7 100644 --- a/Assets/prefabs/ui/arena/arena_season_reward_ui.prefab +++ b/Assets/prefabs/ui/arena/arena_season_reward_ui.prefab @@ -1003,7 +1003,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 876299a9b17a67c46be2a48ecad9bdb0, type: 3} + m_Sprite: {fileID: 21300000, guid: cc14e3e6431d3be4cab00cbc97131f86, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1291,7 +1291,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 42, y: 42} + m_SizeDelta: {x: 36, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8965477421599216992 CanvasRenderer: @@ -1469,7 +1469,7 @@ MonoBehaviour: direction: 0 reverse: 0 cellWidth: 550 - cellHeight: 160 + cellHeight: 134 perLineNum: 1 --- !u!114 &7358477984503824765 MonoBehaviour: diff --git a/Assets/prefabs/ui/tips/help_tips.prefab b/Assets/prefabs/ui/tips/help_tips.prefab index efa4ed39f..f7e3e8fe1 100644 --- a/Assets/prefabs/ui/tips/help_tips.prefab +++ b/Assets/prefabs/ui/tips/help_tips.prefab @@ -614,7 +614,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_fontColor: {r: 0.18039216, g: 0.24705882, b: 0.26666668, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: