From 260d8edac949b63e86a3d7b981c54b6cb997882e Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期二, 31 十二月 2024 10:34:06 +0800
Subject: [PATCH] Merge branch 'lang_en' of http://192.168.1.20:10010/r/snxxz_resourcesout into lang_en
---
UI/Window/CycleHallWin.prefab | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/UI/Window/CycleHallWin.prefab b/UI/Window/CycleHallWin.prefab
index 6bb1de1..c2ce362 100644
--- a/UI/Window/CycleHallWin.prefab
+++ b/UI/Window/CycleHallWin.prefab
@@ -1637,8 +1637,8 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
- m_AnchoredPosition: {x: -56.392, y: -0.00000081787}
- m_SizeDelta: {x: 100.18, y: 42.5798}
+ m_AnchoredPosition: {x: -77.64859, y: -0.00000081787}
+ m_SizeDelta: {x: 140, y: 42.5798}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &309624520312659983
CanvasRenderer:
@@ -1683,7 +1683,7 @@
m_LineSpacing: 1
m_Text: "\u524D\u5F80"
m_IsKey: 1
- m_KeyName: RealmPractice108
+ m_KeyName: CycleHall02
m_ColorType: 15
--- !u!1 &2133558955171861849
GameObject:
@@ -1719,8 +1719,8 @@
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: -31.7419, y: 0}
- m_SizeDelta: {x: 316.5163, y: 44}
+ m_AnchoredPosition: {x: -41.9973, y: 0}
+ m_SizeDelta: {x: 230, y: 44}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8773310788237555793
CanvasRenderer:
@@ -2197,11 +2197,11 @@
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1813163298946718103}
- m_Father: {fileID: 8807465708568957464}
+ m_Father: {fileID: 4045587454328595780}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
- m_AnchoredPosition: {x: 17, y: -262}
+ m_AnchoredPosition: {x: 69.31, y: 0}
m_SizeDelta: {x: 40, y: 38}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &3547048466216991292
@@ -3755,7 +3755,6 @@
- {fileID: 2899195692343871467}
- {fileID: 5153568805162451792}
- {fileID: 4045587454328595780}
- - {fileID: 3862994956259869583}
m_Father: {fileID: 224937298338023920}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -5005,6 +5004,7 @@
m_Children:
- {fileID: 3626435957843860270}
- {fileID: 5899022335625503569}
+ - {fileID: 3862994956259869583}
m_Father: {fileID: 8807465708568957464}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
--
Gitblit v1.8.0