From 5287d0b403ca849fe7e559f95b0a8aab09689468 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 10 六月 2025 23:51:18 +0800
Subject: [PATCH] 0312 版本号统一显示格式
---
Assets/Launch/UI/LaunchWins/LaunchExWin.cs | 5 ++++-
Assets/Editor/UIPattern/CommonButton.prefab | 14 +++++++++-----
Assets/Editor/Tool/PrefabCreateTool.cs | 9 +++++++--
Assets/Resources/Prefabs/ScreenMask.prefab | 2 +-
4 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/Assets/Editor/Tool/PrefabCreateTool.cs b/Assets/Editor/Tool/PrefabCreateTool.cs
index 37100df..2cf810a 100644
--- a/Assets/Editor/Tool/PrefabCreateTool.cs
+++ b/Assets/Editor/Tool/PrefabCreateTool.cs
@@ -134,7 +134,11 @@
public static void CreateTextEx()
{
var instance = new GameObject("TextEx");
- instance.AddComponent<TextEx>();
+ var text = instance.AddComponent<TextEx>();
+ text.font = FontUtility.preferred;
+ text.fontSize = 22;
+ text.alignment = TextAnchor.MiddleCenter;
+ text.raycastTarget = false;
SetParent(instance);
}
@@ -142,7 +146,8 @@
public static void CreateImageEx()
{
var instance = new GameObject("ImageEx");
- instance.AddComponent<ImageEx>();
+ var image = instance.AddComponent<ImageEx>();
+ image.raycastTarget = false;
SetParent(instance);
}
diff --git a/Assets/Editor/UIPattern/CommonButton.prefab b/Assets/Editor/UIPattern/CommonButton.prefab
index 92f4aa5..785d0e3 100644
--- a/Assets/Editor/UIPattern/CommonButton.prefab
+++ b/Assets/Editor/UIPattern/CommonButton.prefab
@@ -29,10 +29,10 @@
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:
- {fileID: 8818173244328049919}
m_Father: {fileID: 0}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -53,6 +53,7 @@
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
+ m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
@@ -110,6 +111,7 @@
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -154,14 +156,14 @@
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: 6799213541382060757}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 144.9, y: 39.02}
+ m_SizeDelta: {x: 148, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3214953141854913601
CanvasRenderer:
@@ -185,7 +187,8 @@
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.2509804, g: 0.10980392, b: 0.023529412, a: 1}
- m_RaycastTarget: 1
+ m_RaycastTarget: 0
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -194,7 +197,7 @@
m_Font: {fileID: 12800000, guid: 7cd825c6867461a4090871836190730f, type: 3}
m_FontSize: 30
m_FontStyle: 0
- m_BestFit: 1
+ m_BestFit: 0
m_MinSize: 2
m_MaxSize: 30
m_Alignment: 4
@@ -207,3 +210,4 @@
m_IsKey: 0
m_KeyName:
m_ColorType: 7
+ m_BGColorType: 0
diff --git a/Assets/Launch/UI/LaunchWins/LaunchExWin.cs b/Assets/Launch/UI/LaunchWins/LaunchExWin.cs
index 7d60d68..af4f2a1 100644
--- a/Assets/Launch/UI/LaunchWins/LaunchExWin.cs
+++ b/Assets/Launch/UI/LaunchWins/LaunchExWin.cs
@@ -63,7 +63,10 @@
{
m_AndroidProgressContainer.gameObject.SetActive(true);
m_IosProgressContainer.gameObject.SetActive(false);
- m_Version.text = StringUtility.Contact(VersionConfigEx.Get().version, "_", VersionConfigEx.Get().buildIndex, LocalResManager.Id);
+
+ //鎵撳寘鐗堟湰 + 鍔熻兘鐗堟湰 + 璇█ID
+ m_Version.text = StringUtility.Contact(VersionConfigEx.Get().version, "_", VersionConfigEx.Get().buildIndex,
+ "_", InitialFunctionConfig.Get("version").Numerical1, " ", LocalResManager.Id);
}
diff --git a/Assets/Resources/Prefabs/ScreenMask.prefab b/Assets/Resources/Prefabs/ScreenMask.prefab
index 3af57f7..d13cfcc 100644
--- a/Assets/Resources/Prefabs/ScreenMask.prefab
+++ b/Assets/Resources/Prefabs/ScreenMask.prefab
@@ -35,7 +35,7 @@
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 15000, y: 26680}
+ m_SizeDelta: {x: 2000, y: 4000}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5139521211198942054
CanvasRenderer:
--
Gitblit v1.8.0