refactor: 优化视频播放控件与UI界面
1. 新增竖屏全屏显示适配，支持横竖屏视频自动适配 2. 重构视频窗口适配逻辑，保持比例避免画面变形 3. 修复多个UI预制体的布局与绑定问题 4. 删除废弃的多语言变体预制体 5. 优化播放加载与结束时的UI状态重置逻辑
This commit is contained in:
“虞渠成”
parent
89a05951f4
commit
3703d3a233
@ -360,9 +360,9 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4568515400396789170}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 55, y: -20}
|
||||
m_SizeDelta: {x: 0, y: 40}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &244985182926712396
|
||||
@ -1912,6 +1912,138 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: --
|
||||
--- !u!1 &804162773124727907
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2623885229130289561}
|
||||
- component: {fileID: 720217854241633618}
|
||||
- component: {fileID: 8770789839128847380}
|
||||
- component: {fileID: 7219676404798309697}
|
||||
m_Layer: 5
|
||||
m_Name: Button (Legacy) (2)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2623885229130289561
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 804162773124727907}
|
||||
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: []
|
||||
m_Father: {fileID: 1152357092138734130}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -2263.2}
|
||||
m_SizeDelta: {x: 0, y: 141.4}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &720217854241633618
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 804162773124727907}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &8770789839128847380
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 804162773124727907}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0}
|
||||
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &7219676404798309697
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 804162773124727907}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 8770789839128847380}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 5883796059177318917}
|
||||
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
|
||||
m_MethodName: SetActive
|
||||
m_Mode: 6
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 1
|
||||
m_CallState: 2
|
||||
--- !u!1 &829927500715508774
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -5758,8 +5890,6 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 1152357092138734130}
|
||||
- component: {fileID: 7711445771700121596}
|
||||
- component: {fileID: 7401403385694358156}
|
||||
- component: {fileID: 8366824941899161540}
|
||||
m_Layer: 5
|
||||
m_Name: "\u9501\u5B9A"
|
||||
m_TagString: Untagged
|
||||
@ -5778,13 +5908,16 @@ 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: 5970195858430563402}
|
||||
- {fileID: 7785413799022885783}
|
||||
- {fileID: 2623885229130289561}
|
||||
m_Father: {fileID: 7638874767064481406}
|
||||
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: 92.4397}
|
||||
m_SizeDelta: {x: 0, y: -184.88068}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7711445771700121596
|
||||
CanvasRenderer:
|
||||
@ -5794,92 +5927,6 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2474256133367177989}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &7401403385694358156
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2474256133367177989}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0}
|
||||
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &8366824941899161540
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2474256133367177989}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 7401403385694358156}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 5883796059177318917}
|
||||
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
|
||||
m_MethodName: SetActive
|
||||
m_Mode: 6
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 1
|
||||
m_CallState: 2
|
||||
--- !u!1 &2514654173823597678
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -5912,10 +5959,10 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1846093831662304367}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 45}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 120, y: 10}
|
||||
m_SizeDelta: {x: 36, y: 45}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &3749378162026232689
|
||||
CanvasRenderer:
|
||||
@ -6253,10 +6300,10 @@ RectTransform:
|
||||
- {fileID: 4929160862756643459}
|
||||
m_Father: {fileID: 1069437048745146005}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 60}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 6, y: -35.5}
|
||||
m_SizeDelta: {x: 155.5, y: 60}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &6545400438610870076
|
||||
CanvasRenderer:
|
||||
@ -8222,10 +8269,10 @@ RectTransform:
|
||||
- {fileID: 327602628975355249}
|
||||
m_Father: {fileID: 1069437048745146005}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 60}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 472.5, y: -35.5}
|
||||
m_SizeDelta: {x: 155.5, y: 60}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &1430460842267038712
|
||||
CanvasRenderer:
|
||||
@ -9278,10 +9325,10 @@ RectTransform:
|
||||
- {fileID: 1666632072748462393}
|
||||
m_Father: {fileID: 3113186033587881318}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 111}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 79.875, y: -55.5}
|
||||
m_SizeDelta: {x: 159.75, y: 111}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1208559727036824385
|
||||
CanvasRenderer:
|
||||
@ -9879,10 +9926,10 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4568515400396789170}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 40}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 20, y: -20}
|
||||
m_SizeDelta: {x: 40, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5333284508431453442
|
||||
CanvasRenderer:
|
||||
@ -10718,10 +10765,10 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4568515400396789170}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 36}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 70, y: -20}
|
||||
m_SizeDelta: {x: 36, y: 36}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &2163933620157744377
|
||||
CanvasRenderer:
|
||||
@ -12284,10 +12331,10 @@ RectTransform:
|
||||
- {fileID: 2975297560480716843}
|
||||
m_Father: {fileID: 1069437048745146005}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 60}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 317, y: -35.5}
|
||||
m_SizeDelta: {x: 155.5, y: 60}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &1781978324875051918
|
||||
CanvasRenderer:
|
||||
@ -13152,10 +13199,10 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1846093831662304367}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 45}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 51, y: 10}
|
||||
m_SizeDelta: {x: 102, y: 45}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &1255502245993973393
|
||||
CanvasRenderer:
|
||||
@ -14090,6 +14137,138 @@ MonoBehaviour:
|
||||
image: {fileID: 1875474690396437517}
|
||||
line1: {fileID: 7554758258340748911}
|
||||
line2: {fileID: 929995843985065520}
|
||||
--- !u!1 &6451837257308297684
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5970195858430563402}
|
||||
- component: {fileID: 6980934293306639473}
|
||||
- component: {fileID: 5842590972513989284}
|
||||
- component: {fileID: 6198097357045876488}
|
||||
m_Layer: 5
|
||||
m_Name: Button (Legacy)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5970195858430563402
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6451837257308297684}
|
||||
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: []
|
||||
m_Father: {fileID: 1152357092138734130}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -80}
|
||||
m_SizeDelta: {x: 0, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6980934293306639473
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6451837257308297684}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &5842590972513989284
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6451837257308297684}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0}
|
||||
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &6198097357045876488
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6451837257308297684}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 5842590972513989284}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 5883796059177318917}
|
||||
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
|
||||
m_MethodName: SetActive
|
||||
m_Mode: 6
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 1
|
||||
m_CallState: 2
|
||||
--- !u!1 &6479566951748908004
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -14395,10 +14574,10 @@ RectTransform:
|
||||
- {fileID: 6020472513220436764}
|
||||
m_Father: {fileID: 1069437048745146005}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 60}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 161.5, y: -35.5}
|
||||
m_SizeDelta: {x: 155.5, y: 60}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &7222490346232352863
|
||||
CanvasRenderer:
|
||||
@ -15234,10 +15413,10 @@ RectTransform:
|
||||
- {fileID: 3973224289061388720}
|
||||
m_Father: {fileID: 3113186033587881318}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 111}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 256.625, y: -55.5}
|
||||
m_SizeDelta: {x: 159.75, y: 111}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5747587932164273453
|
||||
CanvasRenderer:
|
||||
@ -16201,6 +16380,138 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text:
|
||||
--- !u!1 &7710709625372041947
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7785413799022885783}
|
||||
- component: {fileID: 1497430960786125695}
|
||||
- component: {fileID: 6570015030473444205}
|
||||
- component: {fileID: 8626727142580506850}
|
||||
m_Layer: 5
|
||||
m_Name: Button (Legacy) (1)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7785413799022885783
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7710709625372041947}
|
||||
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: []
|
||||
m_Father: {fileID: 1152357092138734130}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -668}
|
||||
m_SizeDelta: {x: 0, y: 554.5}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &1497430960786125695
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7710709625372041947}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &6570015030473444205
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7710709625372041947}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0}
|
||||
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &8626727142580506850
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7710709625372041947}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 6570015030473444205}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 5883796059177318917}
|
||||
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
|
||||
m_MethodName: SetActive
|
||||
m_Mode: 6
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 1
|
||||
m_CallState: 2
|
||||
--- !u!1 &7759029372006338540
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -16812,7 +17123,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &7190469845234229913
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -17628,10 +17939,10 @@ RectTransform:
|
||||
- {fileID: 4828275562546024043}
|
||||
m_Father: {fileID: 3113186033587881318}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 111}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 433.375, y: -55.5}
|
||||
m_SizeDelta: {x: 159.75, y: 111}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2323428145332649792
|
||||
CanvasRenderer:
|
||||
@ -19626,10 +19937,10 @@ RectTransform:
|
||||
- {fileID: 1538898088399718538}
|
||||
m_Father: {fileID: 3113186033587881318}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 111}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 610.125, y: -55.5}
|
||||
m_SizeDelta: {x: 159.75, y: 111}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4295980959046441324
|
||||
CanvasRenderer:
|
||||
|
||||
@ -1769,6 +1769,82 @@ MonoBehaviour:
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
--- !u!1 &1677362095097599264
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4547612117367756728}
|
||||
- component: {fileID: 8205852201108637264}
|
||||
- component: {fileID: 7735135647403452519}
|
||||
m_Layer: 5
|
||||
m_Name: "\u7AD6\u5C4F\u5168\u5C4F"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &4547612117367756728
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1677362095097599264}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1.0003841, y: 1.0003841, z: 1.0003841}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 7598767707978404129}
|
||||
m_Father: {fileID: 3132605764276053906}
|
||||
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: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8205852201108637264
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1677362095097599264}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &7735135647403452519
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1677362095097599264}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.09019608, g: 0.09019608, b: 0.09019608, 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: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1803279752540932300
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1801,6 +1877,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 329487014358523528}
|
||||
- {fileID: 2273952858735001378}
|
||||
- {fileID: 8983024546806734054}
|
||||
- {fileID: 5351304866871563596}
|
||||
@ -1832,7 +1909,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Color: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
@ -1898,8 +1975,9 @@ MonoBehaviour:
|
||||
videoPlayer: {fileID: 4856113742057013127}
|
||||
needFullScreen: 1
|
||||
renderTextures: []
|
||||
windowImage: {fileID: 7550220910865602741}
|
||||
windowImage: {fileID: 1860943572165635645}
|
||||
fullImage: {fileID: 7168137698315978265}
|
||||
portraitFullImage: {fileID: 3799778016193007702}
|
||||
playButton: {fileID: 7930001109488727034}
|
||||
pauseButton: {fileID: 4088203277372269658}
|
||||
totalTimeText: {fileID: 2412586677529980043}
|
||||
@ -4155,6 +4233,78 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
textKey: 100044
|
||||
--- !u!1 &6697841481541655528
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 329487014358523528}
|
||||
- component: {fileID: 6978425453531134674}
|
||||
- component: {fileID: 1860943572165635645}
|
||||
m_Layer: 5
|
||||
m_Name: RawImage
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &329487014358523528
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6697841481541655528}
|
||||
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: []
|
||||
m_Father: {fileID: 2695878419222109905}
|
||||
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: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6978425453531134674
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6697841481541655528}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &1860943572165635645
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6697841481541655528}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
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_Texture: {fileID: 0}
|
||||
m_UVRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1
|
||||
height: 1
|
||||
--- !u!1 &7260685101985023964
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -4701,6 +4851,135 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &8156515508334958931
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7598767707978404129}
|
||||
- component: {fileID: 1409885901771827041}
|
||||
- component: {fileID: 3799778016193007702}
|
||||
- component: {fileID: 6115876631781297009}
|
||||
m_Layer: 5
|
||||
m_Name: "\u5168\u5C4F\u89C6\u9891"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7598767707978404129
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8156515508334958931}
|
||||
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: []
|
||||
m_Father: {fileID: 4547612117367756728}
|
||||
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_SizeDelta: {x: 750, y: 1624}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1409885901771827041
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8156515508334958931}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &3799778016193007702
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8156515508334958931}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
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_Texture: {fileID: 0}
|
||||
m_UVRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1
|
||||
height: 1
|
||||
--- !u!114 &6115876631781297009
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8156515508334958931}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 0
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 3799778016193007702}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 0}
|
||||
m_TargetAssemblyTypeName: Kill.UI.Components.VideoCtrl, Assembly-CSharp
|
||||
m_MethodName: SetFullScreen
|
||||
m_Mode: 6
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
--- !u!1 &8206254071126659060
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -5265,6 +5544,7 @@ RectTransform:
|
||||
- {fileID: 3344115969272692373}
|
||||
- {fileID: 4979664660209189838}
|
||||
- {fileID: 1852129750215414410}
|
||||
- {fileID: 4547612117367756728}
|
||||
- {fileID: 8390716373871088365}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
||||
@ -667,6 +667,78 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &4057130628414683067
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 324322855297489332}
|
||||
- component: {fileID: 8106879553507992516}
|
||||
- component: {fileID: 8246798701288580602}
|
||||
m_Layer: 5
|
||||
m_Name: RawImage
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &324322855297489332
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4057130628414683067}
|
||||
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: []
|
||||
m_Father: {fileID: 7865365684044416939}
|
||||
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: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8106879553507992516
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4057130628414683067}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &8246798701288580602
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4057130628414683067}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
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_Texture: {fileID: 0}
|
||||
m_UVRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1
|
||||
height: 1
|
||||
--- !u!1 &4210076282718539222
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -993,6 +1065,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 324322855297489332}
|
||||
- {fileID: 5462435735231203694}
|
||||
- {fileID: 8551965603479146318}
|
||||
- {fileID: 2057292114001815}
|
||||
@ -1024,7 +1097,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Color: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
@ -1090,8 +1163,9 @@ MonoBehaviour:
|
||||
videoPlayer: {fileID: 2368219640381925722}
|
||||
needFullScreen: 0
|
||||
renderTextures: []
|
||||
windowImage: {fileID: 1223595675788359395}
|
||||
windowImage: {fileID: 8246798701288580602}
|
||||
fullImage: {fileID: 0}
|
||||
portraitFullImage: {fileID: 0}
|
||||
playButton: {fileID: 7559232020140784229}
|
||||
pauseButton: {fileID: 9015139745383244789}
|
||||
totalTimeText: {fileID: 9059311134471446788}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,195 +0,0 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1001 &1132022464020788486
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1764281631429263721, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: "\u8BBE\u5907\u6559\u5B66-\u82F1\u6587 Variant"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2612444578583020479, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2612444578583020479, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2612444578583020479, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2612444578583020479, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2612444578583020479, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3278147582056545111, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3326060271119370178, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_Text
|
||||
value: 01:30
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5669603823921312513, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_Text
|
||||
value: Device Teaching
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7463895375398417216, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7463895375398417216, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7463895375398417216, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7463895375398417216, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7463895375398417216, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7463895375398417216, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7463895375398417216, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7463895375398417216, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7463895375398417216, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7463895375398417216, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7463895375398417216, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7463895375398417216, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7463895375398417216, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7463895375398417216, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7463895375398417216, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7463895375398417216, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7463895375398417216, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7463895375398417216, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7463895375398417216, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7463895375398417216, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8203177055044514214, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_Text
|
||||
value: User Registration & Login
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8704267670630684736, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8704267670630684736, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8704267670630684736, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8704267670630684736, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8704267670630684736, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8862780764517352254, guid: 246adf78ac3d6124bb946741f1faa8d2,
|
||||
type: 3}
|
||||
propertyPath: m_Text
|
||||
value: 'Device Installation '
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 246adf78ac3d6124bb946741f1faa8d2, type: 3}
|
||||
7775
Assets/Res/ui/selfpage/设备教学-英文.prefab
Normal file
7775
Assets/Res/ui/selfpage/设备教学-英文.prefab
Normal file
File diff suppressed because it is too large
Load Diff
@ -1060,6 +1060,78 @@ MonoBehaviour:
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
m_ReverseArrangement: 0
|
||||
--- !u!1 &3379652236335690675
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7090274427206732928}
|
||||
- component: {fileID: 590114471292109410}
|
||||
- component: {fileID: 7042887812155508765}
|
||||
m_Layer: 5
|
||||
m_Name: RawImage
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &7090274427206732928
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3379652236335690675}
|
||||
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: []
|
||||
m_Father: {fileID: 6002609856637895191}
|
||||
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: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &590114471292109410
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3379652236335690675}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &7042887812155508765
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3379652236335690675}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
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_Texture: {fileID: 0}
|
||||
m_UVRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1
|
||||
height: 1
|
||||
--- !u!1 &3501299200074722782
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1483,8 +1555,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: 29.5, y: -25}
|
||||
m_SizeDelta: {x: 7, y: 27}
|
||||
m_AnchoredPosition: {x: 34, y: -25}
|
||||
m_SizeDelta: {x: 12, y: 33}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7651326578310032666
|
||||
CanvasRenderer:
|
||||
@ -1562,8 +1634,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: 62.5, y: -25}
|
||||
m_SizeDelta: {x: 59, y: 27}
|
||||
m_AnchoredPosition: {x: 71, y: -25}
|
||||
m_SizeDelta: {x: 62, y: 33}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5439455909549482936
|
||||
CanvasRenderer:
|
||||
@ -1641,8 +1713,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: 13, y: -25}
|
||||
m_SizeDelta: {x: 26, y: 27}
|
||||
m_AnchoredPosition: {x: 14, y: -25}
|
||||
m_SizeDelta: {x: 28, y: 33}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &9138258466124955313
|
||||
CanvasRenderer:
|
||||
@ -2100,6 +2172,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 7090274427206732928}
|
||||
- {fileID: 3557874817526632307}
|
||||
- {fileID: 5353770316649156691}
|
||||
- {fileID: 3611844215657059240}
|
||||
@ -2132,7 +2205,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Color: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
@ -2198,8 +2271,9 @@ MonoBehaviour:
|
||||
videoPlayer: {fileID: 4887332217861471811}
|
||||
needFullScreen: 0
|
||||
renderTextures: []
|
||||
windowImage: {fileID: 2067507301732238036}
|
||||
windowImage: {fileID: 7042887812155508765}
|
||||
fullImage: {fileID: 0}
|
||||
portraitFullImage: {fileID: 0}
|
||||
playButton: {fileID: 2692639765547676628}
|
||||
pauseButton: {fileID: 2570449486971237984}
|
||||
totalTimeText: {fileID: 6958991286985597639}
|
||||
@ -2333,7 +2407,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: 265, y: -45}
|
||||
m_AnchoredPosition: {x: 263.5, y: -45}
|
||||
m_SizeDelta: {x: 48, y: 48}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1825978237086955098
|
||||
@ -3126,7 +3200,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 381, y: -45}
|
||||
m_SizeDelta: {x: 136, y: 90}
|
||||
m_SizeDelta: {x: 139, y: 90}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3173438462998470296
|
||||
CanvasRenderer:
|
||||
@ -3458,6 +3532,11 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 3526220891912601925}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1441895065771257600, guid: 9ce9f270466e1fa4fb36c31993178ad8,
|
||||
type: 3}
|
||||
propertyPath: m_Text
|
||||
value: No Records
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1808760399123499493, guid: 9ce9f270466e1fa4fb36c31993178ad8,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
@ -3606,7 +3685,7 @@ PrefabInstance:
|
||||
- target: {fileID: 7609355920085510758, guid: f835c9139c45b254face164dfd1b0ca9,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9,
|
||||
type: 3}
|
||||
|
||||
@ -20,6 +20,10 @@ namespace Kill.UI.Components
|
||||
public List<RenderTexture> renderTextures;
|
||||
public RawImage windowImage;
|
||||
public RawImage fullImage;
|
||||
/// <summary>竖屏全屏UI（竖屏视频全屏时使用，在场景中配置）</summary>
|
||||
public RawImage portraitFullImage;
|
||||
/// <summary>当前使用的全屏显示目标（根据视频宽高比选择）</summary>
|
||||
RawImage currentFullImage;
|
||||
public GameObject playButton;
|
||||
public GameObject pauseButton;
|
||||
public Text totalTimeText;
|
||||
@ -43,7 +47,19 @@ namespace Kill.UI.Components
|
||||
{
|
||||
if(loading)
|
||||
loading.SetActive(true);
|
||||
// 视频加载完成前隐藏窗口画面，避免显示上一个视频残留
|
||||
if (windowImage != null)
|
||||
windowImage.gameObject.SetActive(false);
|
||||
// 停止播放状态与进度记录，避免加载期间用旧数据刷新进度条/时间
|
||||
isplaying = false;
|
||||
lastFrame = 0;
|
||||
// 重置时间显示，避免加载期间显示上一个视频的旧时长
|
||||
totalTime = 0;
|
||||
nowTime.text=SecondToHour(0);
|
||||
if (totalTimeText != null)
|
||||
totalTimeText.text=SecondToHour(0);
|
||||
if (slider != null)
|
||||
slider.value=0;
|
||||
this.playOver = playOver;
|
||||
this.url = url;
|
||||
SetVideo(url);
|
||||
@ -115,7 +131,15 @@ namespace Kill.UI.Components
|
||||
{
|
||||
videoPlayer.Stop();
|
||||
videoPlayer.url = "";
|
||||
isplaying = false;
|
||||
lastFrame = 0;
|
||||
nowTime.text=SecondToHour(0);
|
||||
// 停止时清空总时长与进度条，避免残留上一个视频的显示
|
||||
totalTime = 0;
|
||||
if (totalTimeText != null)
|
||||
totalTimeText.text=SecondToHour(0);
|
||||
if (slider != null)
|
||||
slider.value=0;
|
||||
}
|
||||
int totalTime = 0;
|
||||
public void VideoPrepared(VideoPlayer player)
|
||||
@ -127,24 +151,88 @@ namespace Kill.UI.Components
|
||||
renderTextures.Clear();
|
||||
}
|
||||
renderTextures=new List<RenderTexture>();
|
||||
// 窗口视图：完整显示视频并居中，保持比例，多余部分留黑（竖屏视频占满高度、两侧留黑）
|
||||
RenderTexture texture = new RenderTexture((int)player.width, (int)player.height, 1);
|
||||
renderTextures.Add(texture);
|
||||
player.targetTexture = texture;
|
||||
windowImage.texture = texture;
|
||||
// 视频加载完成，重新显示窗口画面
|
||||
if (windowImage != null)
|
||||
windowImage.gameObject.SetActive(true);
|
||||
FitWindowAspect(windowImage, player.width / (float)Mathf.Max(1, (int)player.height));
|
||||
if (needFullScreen)
|
||||
{
|
||||
var size = fullImage.GetComponentInParent<RectTransform>().rect;
|
||||
RenderTexture fullTexture = new RenderTexture((int)size.height, (int)size.width, 1);
|
||||
fullImage.GetComponent<RectTransform>().sizeDelta = new Vector2(size.height, size.width);
|
||||
// 根据视频宽高比选择全屏UI：竖屏视频用竖屏全屏UI，否则用默认全屏UI
|
||||
currentFullImage = (player.width < player.height && portraitFullImage != null) ? portraitFullImage : fullImage;
|
||||
// 全屏纹理按视频分辨率创建，保证宽高比正确、不变形
|
||||
RenderTexture fullTexture = new RenderTexture((int)player.width, (int)player.height, 1);
|
||||
renderTextures.Add(fullTexture);
|
||||
fullImage.texture = fullTexture;
|
||||
currentFullImage.texture = fullTexture;
|
||||
// 显示区域铺满屏幕，保持视频比例，超出部分裁剪（cover模式：尽量铺满屏幕）
|
||||
float videoAspect = player.width / (float)Mathf.Max(1, (int)player.height);
|
||||
var fullRt = currentFullImage.rectTransform;
|
||||
var fullParent = fullRt.parent as RectTransform;
|
||||
currentFullImage.uvRect = new Rect(0, 0, 1, 1);
|
||||
if (fullParent != null && fullParent.rect.width > 0 && fullParent.rect.height > 0)
|
||||
{
|
||||
float parentW = fullParent.rect.width;
|
||||
float parentH = fullParent.rect.height;
|
||||
// 检测全屏UI是否旋转了90°（横屏视频旋转90°后铺满竖屏手机屏幕）
|
||||
float rotZ = Mathf.Abs(Mathf.DeltaAngle(fullRt.localEulerAngles.z, 0f));
|
||||
bool rotated90 = rotZ >= 45f && rotZ <= 135f;
|
||||
if (rotated90)
|
||||
{
|
||||
// 旋转90°的UI：矩形宽高互换，旋转后视觉铺满屏幕
|
||||
fullRt.anchorMin = new Vector2(0.5f, 0.5f);
|
||||
fullRt.anchorMax = new Vector2(0.5f, 0.5f);
|
||||
fullRt.pivot = new Vector2(0.5f, 0.5f);
|
||||
fullRt.sizeDelta = new Vector2(parentH, parentW);
|
||||
}
|
||||
else
|
||||
{
|
||||
fullRt.anchorMin = Vector2.zero;
|
||||
fullRt.anchorMax = Vector2.one;
|
||||
fullRt.pivot = new Vector2(0.5f, 0.5f);
|
||||
fullRt.sizeDelta = Vector2.zero;
|
||||
}
|
||||
// 按视频比例裁剪（cover）：旋转后视频宽对应屏幕高，显示比例需取反
|
||||
float frameAspect = rotated90 ? parentH / parentW : parentW / parentH;
|
||||
if (Mathf.Abs(frameAspect - videoAspect) >= 0.001f)
|
||||
{
|
||||
if (videoAspect > frameAspect)
|
||||
{
|
||||
// 视频相对更宽：裁剪左右
|
||||
float uvW = frameAspect / videoAspect;
|
||||
currentFullImage.uvRect = new Rect((1 - uvW) / 2f, 0, uvW, 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
// 视频相对更窄：裁剪上下
|
||||
float uvH = videoAspect / frameAspect;
|
||||
currentFullImage.uvRect = new Rect(0, (1 - uvH) / 2f, 1, uvH);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
videoPlayer.frame = 0;
|
||||
if (slider != null)
|
||||
slider.value = 0;
|
||||
// 总时长计算：优先用 length（秒）；切换视频时 frameCount 可能残留旧视频的帧数，作为兜底
|
||||
float duration = (float)player.length;
|
||||
if (duration > 0)
|
||||
{
|
||||
totalTime = (int)(duration + 0.5f);
|
||||
}
|
||||
else if (player.frameCount > 0 && player.frameRate > 0)
|
||||
{
|
||||
totalTime = (int)(player.frameCount / player.frameRate + 0.5f);
|
||||
totalTimeText.text = SecondToHour(totalTime);
|
||||
}
|
||||
else
|
||||
{
|
||||
totalTime = 0;
|
||||
}
|
||||
if (totalTimeText != null)
|
||||
totalTimeText.text = SecondToHour(totalTime);
|
||||
|
||||
videoPlayer.prepareCompleted -= VideoPrepared;
|
||||
|
||||
@ -155,6 +243,40 @@ namespace Kill.UI.Components
|
||||
if(loading)
|
||||
loading.SetActive(false);
|
||||
}
|
||||
/// <summary>
|
||||
/// 窗口显示适配：在窗口内完整显示视频（contain模式）并居中，保持比例，多余部分留黑
|
||||
/// 竖屏视频占满高度、两侧留黑；横屏视频占满宽度、上下留黑
|
||||
/// 仅调整windowImage（铺满窗口的RawImage）自身的尺寸，不影响窗口UI位置
|
||||
/// </summary>
|
||||
private void FitWindowAspect(RawImage image, float videoAspect)
|
||||
{
|
||||
if (image == null) return;
|
||||
var rt = image.rectTransform;
|
||||
var parent = rt.parent as RectTransform;
|
||||
float parentW = parent != null ? parent.rect.width : Screen.width;
|
||||
float parentH = parent != null ? parent.rect.height : Screen.height;
|
||||
|
||||
float targetW, targetH;
|
||||
if (videoAspect >= parentW / parentH)
|
||||
{
|
||||
// 视频更宽：宽度铺满，高度按比例缩小，上下留黑
|
||||
targetW = parentW;
|
||||
targetH = parentW / videoAspect;
|
||||
}
|
||||
else
|
||||
{
|
||||
// 视频更高：高度铺满，宽度按比例缩小，左右留黑
|
||||
targetH = parentH;
|
||||
targetW = parentH * videoAspect;
|
||||
}
|
||||
|
||||
rt.anchorMin = new Vector2(0.5f, 0.5f);
|
||||
rt.anchorMax = new Vector2(0.5f, 0.5f);
|
||||
rt.pivot = new Vector2(0.5f, 0.5f);
|
||||
rt.sizeDelta = new Vector2(targetW, targetH);
|
||||
rt.anchoredPosition = Vector2.zero;
|
||||
image.uvRect = new Rect(0, 0, 1, 1);
|
||||
}
|
||||
public void ShowAnimation(int dir)
|
||||
{
|
||||
Animation Anim = GetComponent<Animation>();
|
||||
@ -183,6 +305,9 @@ namespace Kill.UI.Components
|
||||
{
|
||||
if (slider == null)
|
||||
return;
|
||||
// 帧数据未就绪（重新播放/切换视频的瞬间 frameCount 可能为0），跳过本次刷新，避免除零产生 Infinity/NaN
|
||||
if (videoPlayer.frameCount <= 0)
|
||||
return;
|
||||
if (Mathf.Abs(videoPlayer.frame - lastFrame) < 1)
|
||||
return;
|
||||
slider.value = (videoPlayer.frame + 1) / (float)videoPlayer.frameCount;
|
||||
@ -236,19 +361,32 @@ namespace Kill.UI.Components
|
||||
{
|
||||
pauseButton.SetActive(false);
|
||||
}
|
||||
// 全屏播放结束后自动退出全屏
|
||||
if (isFullScreen)
|
||||
SetFullScreen(false);
|
||||
playOver?.Invoke();
|
||||
Init(url, playOver);
|
||||
// 播放结束不重新加载视频：停止并回到开头，重置UI，等待再次播放
|
||||
videoPlayer.Stop();
|
||||
videoPlayer.frame = 0;
|
||||
lastFrame = 0;
|
||||
nowTime.text = SecondToHour(0);
|
||||
if (slider != null) slider.value = 0;
|
||||
ispause = true;
|
||||
// 重新订阅播放结束事件，保证再次播放结束后仍能触发
|
||||
vp.loopPointReached += VideoOver;
|
||||
}
|
||||
public void SetFullScreen(bool isFullScreen)
|
||||
{
|
||||
this.isFullScreen = isFullScreen;
|
||||
// 未设置过全屏目标时兜底用默认全屏UI
|
||||
if (currentFullImage == null) currentFullImage = fullImage;
|
||||
if (isFullScreen)
|
||||
{
|
||||
#if UNITY_ANDROID
|
||||
AndroidStatusBar.statusBarState = AndroidStatusBar.States.Hidden;
|
||||
#endif
|
||||
videoPlayer.targetTexture = renderTextures[1];
|
||||
fullImage.transform.parent.gameObject.SetActive(true);
|
||||
currentFullImage.transform.parent.gameObject.SetActive(true);
|
||||
UIManager.Instance.AddBackAction(() => SetFullScreen(false));
|
||||
if (ispause)
|
||||
PlayVideo();
|
||||
@ -259,7 +397,7 @@ namespace Kill.UI.Components
|
||||
AndroidStatusBar.statusBarState = AndroidStatusBar.States.TranslucentOverContent;
|
||||
#endif
|
||||
videoPlayer.targetTexture = renderTextures[0];
|
||||
fullImage.transform.parent.gameObject.SetActive(false);
|
||||
currentFullImage.transform.parent.gameObject.SetActive(false);
|
||||
UIManager.Instance.RecoverBackAction();
|
||||
}
|
||||
}
|
||||
@ -275,12 +413,12 @@ namespace Kill.UI.Components
|
||||
int second = 0;
|
||||
second = (int)time;
|
||||
|
||||
if (second > 60)
|
||||
if (second >= 60)
|
||||
{
|
||||
minute = second / 60;
|
||||
second = second % 60;
|
||||
}
|
||||
if (minute > 60)
|
||||
if (minute >= 60)
|
||||
{
|
||||
hour = minute / 60;
|
||||
minute = minute % 60;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user