diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index 2c48d53d9..da84a2205 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -1869,7 +1869,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 333, y: -45} + m_AnchoredPosition: {x: 413, y: -52} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8910885521100194526 @@ -27030,10 +27030,10 @@ RectTransform: - {fileID: 6851159317450151906} m_Father: {fileID: 78291557027970721} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 320, y: -40} - m_SizeDelta: {x: -640, y: -80} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -477.34, y: -56.27} + m_SizeDelta: {x: 954.68, y: 967.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3954418700408642931 CanvasRenderer: @@ -49350,7 +49350,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4832275993286904625 RectTransform: m_ObjectHideFlags: 0 @@ -49371,8 +49371,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -295, y: 50} - m_SizeDelta: {x: 250, y: 80} + m_AnchoredPosition: {x: -584.07, y: 70.84} + m_SizeDelta: {x: 444.83, y: 65.52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7608755707262153338 CanvasRenderer: @@ -49395,15 +49395,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.58431375, g: 0.7137255, b: 0.18823531, a: 1} + 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: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: dd90e66f8e2c28e4ea2a7d7af3546124, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -71154,8 +71154,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7252766335628868112} - - {fileID: 8723988577833780254} - - {fileID: 2297423079176535965} m_Father: {fileID: 968397854553593359} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -74105,8 +74103,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 30 - m_fontSizeBase: 30 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -75844,19 +75842,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6603123108965180640} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 4576711918822311861} - {fileID: 4255494324154321450} - m_Father: {fileID: 7826739922638405975} + m_Father: {fileID: 7252766335628868112} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 320, y: -129.98999} - m_SizeDelta: {x: -640, y: 98} + m_AnchoredPosition: {x: 0, y: -49.98999} + m_SizeDelta: {x: 0, y: 98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &986970527985743045 CanvasRenderer: @@ -79459,7 +79457,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1969818477082571141 RectTransform: m_ObjectHideFlags: 0 @@ -79477,8 +79475,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -64, y: 50} - m_SizeDelta: {x: 100, y: 80} + m_AnchoredPosition: {x: -160, y: 70.84} + m_SizeDelta: {x: 188.88, y: 65.52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &63042043578719960 CanvasRenderer: @@ -79501,15 +79499,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.08627451, g: 0.37647063, b: 0.5176471, a: 1} + 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: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: dd90e66f8e2c28e4ea2a7d7af3546124, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -89959,13 +89957,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 8723988577833780254} + - {fileID: 2297423079176535965} m_Father: {fileID: 7826739922638405975} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 320, y: -40} - m_SizeDelta: {x: -640, y: -80} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -477.34, y: -56.27} + m_SizeDelta: {x: 954.68, y: 967.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8783830600407032421 CanvasRenderer: @@ -95143,12 +95143,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 406017089737684796} - m_Father: {fileID: 7826739922638405975} + m_Father: {fileID: 7252766335628868112} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 320, y: -89.49512} - m_SizeDelta: {x: -640, y: -178.99} + m_AnchoredPosition: {x: 0, y: -49.49512} + m_SizeDelta: {x: 0, y: -98.990005} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6343725519827542680 CanvasRenderer: @@ -105013,7 +105013,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -16} + m_AnchoredPosition: {x: 107.3, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7630174154619901943 @@ -105072,8 +105072,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -113684,11 +113684,45 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4832275993286904625} m_Modifications: + - target: {fileID: 2913569658229331, guid: 150bed98d110cb24292c78f18534decd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 11.8 + objectReference: {fileID: 0} - target: {fileID: 3590403063326329916, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_Name value: MoneyForm objectReference: {fileID: 0} + - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_text + value: 00/00 + objectReference: {fileID: 0} + - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_fontSize + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_fontSizeBase + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6864738522005250112, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_SizeDelta.x + value: 37 + objectReference: {fileID: 0} + - target: {fileID: 6864738522005250112, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_SizeDelta.y + value: 26 + objectReference: {fileID: 0} + - target: {fileID: 6864738522005250112, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 27.8 + objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_Pivot.x @@ -113722,7 +113756,7 @@ PrefabInstance: - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 125 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} @@ -113767,12 +113801,12 @@ PrefabInstance: - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_AnchoredPosition.x - value: -67 + value: -154.4 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_AnchoredPosition.y - value: 18 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} @@ -113789,6 +113823,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9168172215786797966, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -122703,11 +122742,45 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4832275993286904625} m_Modifications: + - target: {fileID: 2913569658229331, guid: 150bed98d110cb24292c78f18534decd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 16.7 + objectReference: {fileID: 0} - target: {fileID: 3590403063326329916, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_Name value: MoneyForm (1) objectReference: {fileID: 0} + - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_fontSize + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_fontSizeBase + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_characterSpacing + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6864738522005250112, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_SizeDelta.x + value: 37 + objectReference: {fileID: 0} + - target: {fileID: 6864738522005250112, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_SizeDelta.y + value: 26 + objectReference: {fileID: 0} + - target: {fileID: 6864738522005250112, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 27.8 + objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_Pivot.x @@ -122741,7 +122814,7 @@ PrefabInstance: - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 125 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} @@ -122786,12 +122859,12 @@ PrefabInstance: - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_AnchoredPosition.x - value: 63 + value: -14.5 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_AnchoredPosition.y - value: 18 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3}