diff --git a/ProjectNLD/Assets/Art/UI/Fonts/SourceHanSansCN-Medium SDF.asset b/ProjectNLD/Assets/Art/UI/Fonts/SourceHanSansCN-Medium SDF.asset index 9127b5d1039..cccf2f2dec5 100644 --- a/ProjectNLD/Assets/Art/UI/Fonts/SourceHanSansCN-Medium SDF.asset +++ b/ProjectNLD/Assets/Art/UI/Fonts/SourceHanSansCN-Medium SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53e4f7f49b9f9354210d6ad4018ccaa1dbb145318a16edc0418e97ab2ba67015 -size 8544789 +oid sha256:65695780e0f44f01824f66c6d9b9c60b919b523368d6c8e6f5bdd6b83f4a32df +size 8547975 diff --git a/ProjectNLD/Assets/Editor/UIEditor/UIEditorScene.unity b/ProjectNLD/Assets/Editor/UIEditor/UIEditorScene.unity index 491b30f28be..73a4e6987fd 100644 --- a/ProjectNLD/Assets/Editor/UIEditor/UIEditorScene.unity +++ b/ProjectNLD/Assets/Editor/UIEditor/UIEditorScene.unity @@ -353,7 +353,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1425700230} m_Father: {fileID: 957804731} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -361,6 +362,135 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1001 &1425700229 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1324946120} + m_Modifications: + - target: {fileID: 388655147188396053, guid: e3c748fe92218fd418981e236b0c2e6a, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.014203852 + objectReference: {fileID: 0} + - target: {fileID: 4424948702481457615, guid: e3c748fe92218fd418981e236b0c2e6a, + type: 3} + propertyPath: m_Name + value: TeamAndSkillSelect + objectReference: {fileID: 0} + - target: {fileID: 5792466229674412060, guid: e3c748fe92218fd418981e236b0c2e6a, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5792466229674412060, guid: e3c748fe92218fd418981e236b0c2e6a, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5792466229674412060, guid: e3c748fe92218fd418981e236b0c2e6a, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5792466229674412060, guid: e3c748fe92218fd418981e236b0c2e6a, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5792466229674412060, guid: e3c748fe92218fd418981e236b0c2e6a, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5792466229674412060, guid: e3c748fe92218fd418981e236b0c2e6a, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5792466229674412060, guid: e3c748fe92218fd418981e236b0c2e6a, + type: 3} + propertyPath: m_SizeDelta.x + value: -1820 + objectReference: {fileID: 0} + - target: {fileID: 5792466229674412060, guid: e3c748fe92218fd418981e236b0c2e6a, + type: 3} + propertyPath: m_SizeDelta.y + value: -980 + objectReference: {fileID: 0} + - target: {fileID: 5792466229674412060, guid: e3c748fe92218fd418981e236b0c2e6a, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5792466229674412060, guid: e3c748fe92218fd418981e236b0c2e6a, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5792466229674412060, guid: e3c748fe92218fd418981e236b0c2e6a, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5792466229674412060, guid: e3c748fe92218fd418981e236b0c2e6a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5792466229674412060, guid: e3c748fe92218fd418981e236b0c2e6a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5792466229674412060, guid: e3c748fe92218fd418981e236b0c2e6a, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5792466229674412060, guid: e3c748fe92218fd418981e236b0c2e6a, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5792466229674412060, guid: e3c748fe92218fd418981e236b0c2e6a, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5792466229674412060, guid: e3c748fe92218fd418981e236b0c2e6a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5792466229674412060, guid: e3c748fe92218fd418981e236b0c2e6a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5792466229674412060, guid: e3c748fe92218fd418981e236b0c2e6a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5792466229674412060, guid: e3c748fe92218fd418981e236b0c2e6a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e3c748fe92218fd418981e236b0c2e6a, type: 3} +--- !u!224 &1425700230 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5792466229674412060, guid: e3c748fe92218fd418981e236b0c2e6a, + type: 3} + m_PrefabInstance: {fileID: 1425700229} + m_PrefabAsset: {fileID: 0} --- !u!81 &559749080927694279 AudioListener: m_ObjectHideFlags: 0 diff --git a/ProjectNLD/Packages/manifest.json b/ProjectNLD/Packages/manifest.json index 9f88b26a975..26e82149d2f 100644 --- a/ProjectNLD/Packages/manifest.json +++ b/ProjectNLD/Packages/manifest.json @@ -21,7 +21,7 @@ "com.unity.render-pipelines.universal": "14.0.9", "com.unity.scriptablebuildpipeline": "1.21.22", "com.unity.test-framework": "1.1.33", - "com.unity.textmeshpro": "3.0.6", + "com.unity.textmeshpro": "3.0.8", "com.unity.timeline": "1.7.6", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0",