Merge branch 'develop' into feature/UI更新&安卓适配

This commit is contained in:
2026-07-02 10:49:12 +08:00
65 changed files with 2285 additions and 1584 deletions
+3 -3
View File
@@ -299,7 +299,7 @@ MonoBehaviour:
typewriterStartsAutomatically: 1
animationLoop: 0
timeScale: 0
_text: "\u5BF9\u8BDD\u5185\u5BB9\u663E\u793A\u5728\u8FD9\u91CC<sub>\u652F\u6301\u5BCC\u6587\u672C</sub>"
_text:
useDynamicScaling: 1
referenceFontSize: 10
isResettingTimeOnNewText: 1
@@ -7211,7 +7211,7 @@ RectTransform:
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_AnchoredPosition: {x: -0.016, y: -0.008}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1977401368
@@ -8256,7 +8256,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8352794458094198668, guid: 60f4427b2070be04f90c1486bb86062c, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []