From 2d73bdd8db403925d1de566550361ceed6ec5693 Mon Sep 17 00:00:00 2001 From: zhangaotian <8474238@qq.com> Date: Fri, 21 Jun 2024 15:48:19 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=A8=E7=94=BB=E3=80=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E7=99=BD=E4=BA=91=E5=8A=A8=E7=94=BB=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Art/Animation/Loading_Cloud1.anim | 50 +++++++-------- .../Assets/Art/Animation/Loading_Cloud2.anim | 50 +++++++-------- Forest/Assets/Art/UI/Prefab/ImgLoading.prefab | 57 +++++++++++++++-- Forest/Assets/Art/UI/Prefab/UILoading.prefab | 61 ++++++++++++++++--- .../Art/UI/Prefab/UIUserAgreement.prefab | 4 +- 5 files changed, 156 insertions(+), 66 deletions(-) diff --git a/Forest/Assets/Art/Animation/Loading_Cloud1.anim b/Forest/Assets/Art/Animation/Loading_Cloud1.anim index 5d31200..4a4e303 100644 --- a/Forest/Assets/Art/Animation/Loading_Cloud1.anim +++ b/Forest/Assets/Art/Animation/Loading_Cloud1.anim @@ -31,25 +31,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.3333334 + time: 2 value: 250 - inSlope: -37.5 - outSlope: -37.5 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.6666667 - value: 200 - inSlope: -37.500004 - outSlope: -37.500004 + inSlope: -25 + outSlope: -25 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 4 + value: 200 + inSlope: -24.793388 + outSlope: -24.793388 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 6.0333333 value: 150 inSlope: 0 outSlope: 0 @@ -88,7 +88,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 4 + m_StopTime: 6.0333333 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -118,25 +118,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.3333334 + time: 2 value: 250 - inSlope: -37.5 - outSlope: -37.5 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.6666667 - value: 200 - inSlope: -37.500004 - outSlope: -37.500004 + inSlope: -25 + outSlope: -25 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 4 + value: 200 + inSlope: -24.793388 + outSlope: -24.793388 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 6.0333333 value: 150 inSlope: 0 outSlope: 0 diff --git a/Forest/Assets/Art/Animation/Loading_Cloud2.anim b/Forest/Assets/Art/Animation/Loading_Cloud2.anim index 0496196..df93287 100644 --- a/Forest/Assets/Art/Animation/Loading_Cloud2.anim +++ b/Forest/Assets/Art/Animation/Loading_Cloud2.anim @@ -31,25 +31,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.3333334 + time: 2 value: -230 - inSlope: -37.5 - outSlope: -37.5 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.6666667 - value: -280 - inSlope: -37.500004 - outSlope: -37.500004 + inSlope: -25 + outSlope: -25 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 4 + value: -280 + inSlope: -25 + outSlope: -25 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 6 value: -330 inSlope: 0 outSlope: 0 @@ -88,7 +88,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 4 + m_StopTime: 6 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -118,25 +118,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.3333334 + time: 2 value: -230 - inSlope: -37.5 - outSlope: -37.5 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.6666667 - value: -280 - inSlope: -37.500004 - outSlope: -37.500004 + inSlope: -25 + outSlope: -25 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 4 + value: -280 + inSlope: -25 + outSlope: -25 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 6 value: -330 inSlope: 0 outSlope: 0 diff --git a/Forest/Assets/Art/UI/Prefab/ImgLoading.prefab b/Forest/Assets/Art/UI/Prefab/ImgLoading.prefab index c77457a..6600035 100644 --- a/Forest/Assets/Art/UI/Prefab/ImgLoading.prefab +++ b/Forest/Assets/Art/UI/Prefab/ImgLoading.prefab @@ -225,6 +225,52 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1602014252197624731 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6362085510093879284} + - component: {fileID: 487313737551658211} + m_Layer: 5 + m_Name: Cloud + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6362085510093879284 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1602014252197624731} + 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: 1323573263329252673} + - {fileID: 2868473947859667889} + m_Father: {fileID: 4402512804792742859} + 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: 0} + m_SizeDelta: {x: 0, y: 500} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &487313737551658211 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1602014252197624731} + m_CullTransparentMesh: 1 --- !u!1 &4787851616663762751 GameObject: m_ObjectHideFlags: 0 @@ -331,11 +377,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4402512804792742859} + m_Father: {fileID: 6362085510093879284} 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: -180, y: 780} + m_AnchoredPosition: {x: -180, y: 70} m_SizeDelta: {x: 447, y: 195} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1756846317035433962 @@ -428,11 +474,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4402512804792742859} + m_Father: {fileID: 6362085510093879284} 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: 300, y: 650} + m_AnchoredPosition: {x: 300, y: -60} m_SizeDelta: {x: 292, y: 178} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1443623194263954931 @@ -523,8 +569,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4084552968541142805} - - {fileID: 1323573263329252673} - - {fileID: 2868473947859667889} + - {fileID: 6362085510093879284} - {fileID: 4123199830391474881} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Forest/Assets/Art/UI/Prefab/UILoading.prefab b/Forest/Assets/Art/UI/Prefab/UILoading.prefab index e1befd9..bffe64e 100644 --- a/Forest/Assets/Art/UI/Prefab/UILoading.prefab +++ b/Forest/Assets/Art/UI/Prefab/UILoading.prefab @@ -212,16 +212,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2513971175236167545} - 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: [] - m_Father: {fileID: 4402512804792742859} + m_Father: {fileID: 6284310749672224075} 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: 300, y: 650} + m_AnchoredPosition: {x: 300, y: -60} m_SizeDelta: {x: 292, y: 178} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4898411898534375042 @@ -283,6 +283,52 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &3956163895782458981 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6284310749672224075} + - component: {fileID: 5402195381162014407} + m_Layer: 5 + m_Name: Cloud + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6284310749672224075 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3956163895782458981} + 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: 5830642741762837337} + - {fileID: 7060487939167412747} + m_Father: {fileID: 4402512804792742859} + 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: 0} + m_SizeDelta: {x: 0, y: 500} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &5402195381162014407 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3956163895782458981} + m_CullTransparentMesh: 1 --- !u!1 &5900830966354617370 GameObject: m_ObjectHideFlags: 0 @@ -510,16 +556,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7752858189703771133} - 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: [] - m_Father: {fileID: 4402512804792742859} + m_Father: {fileID: 6284310749672224075} 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: -180, y: 780} + m_AnchoredPosition: {x: -180, y: 70} m_SizeDelta: {x: 447, y: 195} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3871474064861985527 @@ -611,8 +657,7 @@ RectTransform: m_Children: - {fileID: 4084552968541142805} - {fileID: 3558846005941668724} - - {fileID: 5830642741762837337} - - {fileID: 7060487939167412747} + - {fileID: 6284310749672224075} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} diff --git a/Forest/Assets/Art/UI/Prefab/UIUserAgreement.prefab b/Forest/Assets/Art/UI/Prefab/UIUserAgreement.prefab index 2cc9e9c..4b3cf95 100644 --- a/Forest/Assets/Art/UI/Prefab/UIUserAgreement.prefab +++ b/Forest/Assets/Art/UI/Prefab/UIUserAgreement.prefab @@ -676,7 +676,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3456924040618370902 RectTransform: m_ObjectHideFlags: 0 @@ -981,7 +981,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4688993728741780507 RectTransform: m_ObjectHideFlags: 0