diff --git a/Assets/Res/ui/common/进度Loading/全屏框.png.meta b/Assets/Res/ui/common/进度Loading/全屏框.png.meta index 27aa1bf..8e62aef 100644 --- a/Assets/Res/ui/common/进度Loading/全屏框.png.meta +++ b/Assets/Res/ui/common/进度Loading/全屏框.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 30, y: 0, z: 30, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -113,7 +113,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/Res/ui/safetylearningpage/safetylearningPage.prefab b/Assets/Res/ui/safetylearningpage/safetylearningPage.prefab index 78c3191..08b4536 100644 --- a/Assets/Res/ui/safetylearningpage/safetylearningPage.prefab +++ b/Assets/Res/ui/safetylearningpage/safetylearningPage.prefab @@ -2725,8 +2725,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 132.5, y: -27} - m_SizeDelta: {x: 146, y: 28} + m_AnchoredPosition: {x: 187, y: -27} + m_SizeDelta: {x: 200, y: 28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4217088321203893506 CanvasRenderer: @@ -2769,7 +2769,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: maximized view + m_Text: Full-Screen Playback --- !u!114 &8919614104695921115 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3304,6 +3304,7 @@ GameObject: - component: {fileID: 3539121822618947783} - component: {fileID: 3788963795726498878} - component: {fileID: 951433194926611770} + - component: {fileID: 1543505372215773979} m_Layer: 5 m_Name: "\u5168\u5C4F" m_TagString: Untagged @@ -3330,7 +3331,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -725} - m_SizeDelta: {x: 228, y: 54} + m_SizeDelta: {x: 337, y: 54} m_Pivot: {x: 0.5, y: 1} --- !u!222 &453616341432893762 CanvasRenderer: @@ -3361,7 +3362,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: e1b4794d141853f42a3d20a00cedc8c1, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3439,8 +3440,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 - m_Right: 0 + m_Left: 50 + m_Right: 50 m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 @@ -3452,6 +3453,20 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!114 &1543505372215773979 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4649667449838688682} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &4698808495454500404 GameObject: m_ObjectHideFlags: 0 @@ -3837,7 +3852,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: 22.5, y: -27} + m_AnchoredPosition: {x: 50, y: -27} m_SizeDelta: {x: 27, y: 27} m_Pivot: {x: 0, y: 0.5} --- !u!222 &9182794380181841639 @@ -4452,7 +4467,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -60, y: 0} + m_SizeDelta: {x: -60, y: 30} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4434113769957374433 CanvasRenderer: @@ -5728,7 +5743,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3344115969272692373 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Res/ui/safetylearningpage/题目.prefab b/Assets/Res/ui/safetylearningpage/题目.prefab index ff392eb..6384a14 100644 --- a/Assets/Res/ui/safetylearningpage/题目.prefab +++ b/Assets/Res/ui/safetylearningpage/题目.prefab @@ -189,7 +189,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 27.5, y: 0} - m_SizeDelta: {x: -73, y: 45} + m_SizeDelta: {x: -73, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8846634239970840683 CanvasRenderer: diff --git a/Assets/Res/ui/selfpage/设备教学-中文.prefab b/Assets/Res/ui/selfpage/设备教学-中文.prefab index 3fcca22..29550e5 100644 --- a/Assets/Res/ui/selfpage/设备教学-中文.prefab +++ b/Assets/Res/ui/selfpage/设备教学-中文.prefab @@ -35,7 +35,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: 132.5, y: -27} + m_AnchoredPosition: {x: 160, y: -27} m_SizeDelta: {x: 146, y: 28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2816773054815488234 @@ -106,6 +106,7 @@ GameObject: - component: {fileID: 8315968523861224421} - component: {fileID: 3876977290176567205} - component: {fileID: 6226412110335655224} + - component: {fileID: 4448801568369486346} m_Layer: 5 m_Name: "\u5168\u5C4F" m_TagString: Untagged @@ -132,7 +133,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -900} - m_SizeDelta: {x: 228, y: 54} + m_SizeDelta: {x: 283, y: 54} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5916725389427580734 CanvasRenderer: @@ -163,7 +164,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: e1b4794d141853f42a3d20a00cedc8c1, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -241,8 +242,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 - m_Right: 0 + m_Left: 50 + m_Right: 50 m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 @@ -254,6 +255,20 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!114 &4448801568369486346 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 219515937779297871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &377262142876916419 GameObject: m_ObjectHideFlags: 0 @@ -1116,7 +1131,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: 22.5, y: -27} + m_AnchoredPosition: {x: 50, y: -27} m_SizeDelta: {x: 27, y: 27} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4675772009216240749 diff --git a/Assets/Res/ui/videopage/一条视频.prefab b/Assets/Res/ui/videopage/一条视频.prefab index 96b74dd..fd865ee 100644 --- a/Assets/Res/ui/videopage/一条视频.prefab +++ b/Assets/Res/ui/videopage/一条视频.prefab @@ -78,7 +78,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: + m_Text: asdasd --- !u!1 &3598736706289518838 GameObject: m_ObjectHideFlags: 0 @@ -235,7 +235,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &9188773615237041945 RectTransform: m_ObjectHideFlags: 0 @@ -253,7 +253,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -24, y: 0} - m_SizeDelta: {x: 95, y: 72} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 1, y: 0.5} --- !u!222 &6119825987542687625 CanvasRenderer: @@ -270,7 +270,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4411859370997722127} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -283,8 +283,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d75073a7184b4b143a4caa6bdaf7e971, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 80189f505f53ee342b879ed46956018c, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4