diff --git a/Assets/Art/UIPrefab/UIInput.prefab b/Assets/Art/UIPrefab/UIInput.prefab index b6377379..09cd3329 100644 --- a/Assets/Art/UIPrefab/UIInput.prefab +++ b/Assets/Art/UIPrefab/UIInput.prefab @@ -299,6 +299,81 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &1727493116410382314 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6122543080368052066} + - component: {fileID: 7941921085967005853} + - component: {fileID: 2486815824107476197} + m_Layer: 0 + m_Name: Mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6122543080368052066 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1727493116410382314} + 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: 7964080183519823441} + 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 &7941921085967005853 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1727493116410382314} + m_CullTransparentMesh: 1 +--- !u!114 &2486815824107476197 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1727493116410382314} + 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, g: 0, b: 0, 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: 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 &2614676936766323208 GameObject: m_ObjectHideFlags: 0 @@ -1217,6 +1292,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 6122543080368052066} - {fileID: 4545114239560184396} - {fileID: 4314000628692641735} m_Father: {fileID: 0} diff --git a/Assets/Art/UIPrefab/UITextTip.prefab b/Assets/Art/UIPrefab/UITextTip.prefab index c05b77a4..0055e7f4 100644 --- a/Assets/Art/UIPrefab/UITextTip.prefab +++ b/Assets/Art/UIPrefab/UITextTip.prefab @@ -669,13 +669,13 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4085354983340029108} - m_Enabled: 0 + 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, g: 0, b: 0, a: 0.5019608} + m_Color: {r: 0, g: 0, b: 0, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 diff --git a/Assets/Scenes/ExameScene/ShuiReFaHeCheng.unity b/Assets/Scenes/ExameScene/ShuiReFaHeCheng.unity index 7a37af07..3dd5a11e 100644 --- a/Assets/Scenes/ExameScene/ShuiReFaHeCheng.unity +++ b/Assets/Scenes/ExameScene/ShuiReFaHeCheng.unity @@ -501,7 +501,7 @@ MonoBehaviour: m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 1 - m_FillAmount: 0.6 + m_FillAmount: 0.52 m_FillClockwise: 1 m_FillOrigin: 1 m_UseSpriteMesh: 0 @@ -4542,7 +4542,7 @@ MonoBehaviour: m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 1 - m_FillAmount: 0.66 + m_FillAmount: 0.54 m_FillClockwise: 1 m_FillOrigin: 1 m_UseSpriteMesh: 0 @@ -6018,7 +6018,7 @@ MonoBehaviour: m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 1 - m_FillAmount: 0.65 + m_FillAmount: 0.52 m_FillClockwise: 1 m_FillOrigin: 1 m_UseSpriteMesh: 0 @@ -7352,9 +7352,11 @@ PlayableDirector: m_InitialTime: 0 m_SceneBindings: - key: {fileID: -8896583756985351548, guid: 08c8ba9f4df283642be17b13b0b66e8e, type: 2} - value: {fileID: 0} + value: {fileID: 236931598} - key: {fileID: -5396303937980345622, guid: 08c8ba9f4df283642be17b13b0b66e8e, type: 2} - value: {fileID: 0} + value: {fileID: 1495653728} + - key: {fileID: 2503104651524110036, guid: 08c8ba9f4df283642be17b13b0b66e8e, type: 2} + value: {fileID: 680014621} m_ExposedReferences: m_References: [] --- !u!1 &1194893377 @@ -7646,6 +7648,7 @@ GameObject: - component: {fileID: 1239417690} - component: {fileID: 1239417689} - component: {fileID: 1239417688} + - component: {fileID: 1239417691} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -7741,6 +7744,18 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!225 &1239417691 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1239417686} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 0 + m_BlocksRaycasts: 0 + m_IgnoreParentGroups: 0 --- !u!1001 &1241371436 PrefabInstance: m_ObjectHideFlags: 0 @@ -8512,7 +8527,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 5a491c682770cf44fa7894d9d74a5f1b, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8797953184618555582, guid: 5a491c682770cf44fa7894d9d74a5f1b, type: 3} propertyPath: m_LocalRotation.w @@ -9420,7 +9435,7 @@ MonoBehaviour: m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 1 - m_FillAmount: 0.6 + m_FillAmount: 0.5 m_FillClockwise: 1 m_FillOrigin: 1 m_UseSpriteMesh: 0 @@ -10798,7 +10813,7 @@ MonoBehaviour: m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 1 - m_FillAmount: 0.63 + m_FillAmount: 0.5 m_FillClockwise: 1 m_FillOrigin: 1 m_UseSpriteMesh: 0 diff --git a/Data/Xml/ShuiReFaHeCheng.xml b/Data/Xml/ShuiReFaHeCheng.xml index 7f341451..9bdccfbe 100644 --- a/Data/Xml/ShuiReFaHeCheng.xml +++ b/Data/Xml/ShuiReFaHeCheng.xml @@ -101,6 +101,9 @@ + + + @@ -210,10 +213,11 @@ - - - - + + + + + @@ -348,13 +352,14 @@ + + + + + + + - - - - - - @@ -391,6 +396,12 @@ + + + + + +