diff --git a/.vs/CultivationOfBrewing-2/FileContentIndex/bb9d4358-b84a-43f6-a5ae-1935aa3a9c56.vsidx b/.vs/CultivationOfBrewing-2/FileContentIndex/7abfa31d-5f8a-4f2b-b12e-afba0b7c76fb.vsidx similarity index 67% rename from .vs/CultivationOfBrewing-2/FileContentIndex/bb9d4358-b84a-43f6-a5ae-1935aa3a9c56.vsidx rename to .vs/CultivationOfBrewing-2/FileContentIndex/7abfa31d-5f8a-4f2b-b12e-afba0b7c76fb.vsidx index 2384c7b..6affa12 100644 Binary files a/.vs/CultivationOfBrewing-2/FileContentIndex/bb9d4358-b84a-43f6-a5ae-1935aa3a9c56.vsidx and b/.vs/CultivationOfBrewing-2/FileContentIndex/7abfa31d-5f8a-4f2b-b12e-afba0b7c76fb.vsidx differ diff --git a/.vs/CultivationOfBrewing-2/v17/.suo b/.vs/CultivationOfBrewing-2/v17/.suo index 13da9ab..bbdacd8 100644 Binary files a/.vs/CultivationOfBrewing-2/v17/.suo and b/.vs/CultivationOfBrewing-2/v17/.suo differ diff --git a/Assets/ArtRes/Animation/教师（带伸手动画）.controller b/Assets/ArtRes/Animation/教师（带伸手动画）.controller index 4c1a5e8..84326af 100644 --- a/Assets/ArtRes/Animation/教师（带伸手动画）.controller +++ b/Assets/ArtRes/Animation/教师（带伸手动画）.controller @@ -1,5 +1,53 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-8108725917897274150 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -2418284421514328816} + m_Position: {x: 390, y: 50, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 90, y: 140, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -2418284421514328816} +--- !u!1102 &-2418284421514328816 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Take 001 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 1827226128182048838, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -9,4 +57,16 @@ AnimatorController: m_Name: "\u6559\u5E08\uFF08\u5E26\u4F38\u624B\u52A8\u753B\uFF09" serializedVersion: 5 m_AnimatorParameters: [] - m_AnimatorLayers: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -8108725917897274150} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} diff --git a/Assets/Resources/UI/UIPanel/UI_LoadingPanel.prefab b/Assets/Resources/UI/UIPanel/UI_LoadingPanel.prefab index 950c47a..fd49573 100644 --- a/Assets/Resources/UI/UIPanel/UI_LoadingPanel.prefab +++ b/Assets/Resources/UI/UIPanel/UI_LoadingPanel.prefab @@ -317,8 +317,112 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: loadSlider: {fileID: 0} + canvasGroup: {fileID: 2745790405366485961} speed: 0 isLoading: 0 + Slider_Text: {fileID: 0} + frames: + - {fileID: 21300000, guid: 0df853a2090528d4ba5e0fb70261fa9b, type: 3} + - {fileID: 21300000, guid: 54f65d2442f5f8449974cd2b1af33b69, type: 3} + - {fileID: 21300000, guid: 575bef481051e7749bbc0b7613050c07, type: 3} + - {fileID: 21300000, guid: 143af1190a62af74a807ce5259dc3a48, type: 3} + - {fileID: 21300000, guid: 85a3980a07ddf9641b45306dce41d958, type: 3} + - {fileID: 21300000, guid: 26827149e28d0414eb1c732620eefd5f, type: 3} + - {fileID: 21300000, guid: dcd4e070deab228459c6113185acfb31, type: 3} + - {fileID: 21300000, guid: 299696b8fc076df46925d65a53a023b0, type: 3} + - {fileID: 21300000, guid: 6bd5548c05699c14abd69287fbc70d30, type: 3} + - {fileID: 21300000, guid: c2b84a9dfd7bae74f99ff134725a56f1, type: 3} + - {fileID: 21300000, guid: 52bdc0825d15f874da18c750d8987818, type: 3} + - {fileID: 21300000, guid: a6f8b94d78c71304eb6467346d389976, type: 3} + - {fileID: 21300000, guid: f5946e282feb3ab4eb4fcc7f566d22af, type: 3} + - {fileID: 21300000, guid: d0a0537b45b860e4a9636461a0f5c615, type: 3} + - {fileID: 21300000, guid: c373fcc89f2622e49a504ad893a0f3ad, type: 3} + - {fileID: 21300000, guid: 3bfb11b3c823f3646ac74cd6af9c3e89, type: 3} + - {fileID: 21300000, guid: 61da14c1f0820f949905f78ae6d2f28e, type: 3} + - {fileID: 21300000, guid: 5fb130af70fea1c4c88a740a5c9763cf, type: 3} + - {fileID: 21300000, guid: 3e63017231a7c2c4e8bf6364025b86b8, type: 3} + - {fileID: 21300000, guid: 25d84097739788b4d8d384ddf21d871d, type: 3} + - {fileID: 21300000, guid: 00d671c9af1e9404798eea02be729f38, type: 3} + - {fileID: 21300000, guid: 9b39595be9f324c4e8694af49afe3c2d, type: 3} + - {fileID: 21300000, guid: 1eb8d6062955c704ba58925475c4e7f0, type: 3} + - {fileID: 21300000, guid: f9dd008dc1600ff4f83cdb8b4603d743, type: 3} + - {fileID: 21300000, guid: 19454a0e43941e841972287a7bcd2f97, type: 3} + - {fileID: 21300000, guid: c5c1e4da27b631145956642c25517ee2, type: 3} + - {fileID: 21300000, guid: 22b52b9e3e2b9d4419f405e7072582cf, type: 3} + - {fileID: 21300000, guid: 0517d296471e4ba49971bc4923df2353, type: 3} + - {fileID: 21300000, guid: c30cd0fff658b004e8a7d270104b7136, type: 3} + - {fileID: 21300000, guid: 0a5afa54295ce974aac6230076b04aec, type: 3} + - {fileID: 21300000, guid: 30df0980bbe1a494baf75d7ca9a69ed7, type: 3} + - {fileID: 21300000, guid: 6454d22ddf0ebde49b4a98ae4d56b058, type: 3} + - {fileID: 21300000, guid: a19124f5bb0b3ee46965dd39e184c029, type: 3} + - {fileID: 21300000, guid: 8a24332a63da24f4a812f9a21da0c297, type: 3} + - {fileID: 21300000, guid: d647948a18807a94185e0155c770ec55, type: 3} + - {fileID: 21300000, guid: 5bb671e8f8e637e49a086c32655aa213, type: 3} + - {fileID: 21300000, guid: 988a5a971eb843341b62a837e30a41cc, type: 3} + - {fileID: 21300000, guid: 97755458e263be84798236af734292f5, type: 3} + - {fileID: 21300000, guid: 1813834ad9abb194b89b05f3fea5d475, type: 3} + - {fileID: 21300000, guid: 2b6868b8209750f49bb901471b0f1fd6, type: 3} + - {fileID: 21300000, guid: 4e7710c62c7ec794a84b2a949602cd3e, type: 3} + - {fileID: 21300000, guid: 83aa4ef6cbcb286419fc56a9a6e81863, type: 3} + - {fileID: 21300000, guid: 99897258e29b51b488a0fbf8474dabc9, type: 3} + - {fileID: 21300000, guid: 1faa164a856ec3746b3de926a3a1a32b, type: 3} + - {fileID: 21300000, guid: 149dd4cd2ebc0bf4ebe8e0ae76bfa4d8, type: 3} + - {fileID: 21300000, guid: 04ea51467a81ff340b2e40c70874cf69, type: 3} + - {fileID: 21300000, guid: 3050c4ad40a3c044a8ea5d73a6be766c, type: 3} + - {fileID: 21300000, guid: af6b4602a42870a4c8faca8c75551ebf, type: 3} + - {fileID: 21300000, guid: 610e611555149284aafc6729f3fdeeac, type: 3} + - {fileID: 21300000, guid: 3fdd7d14d88eeb042810d026a399bf19, type: 3} + - {fileID: 21300000, guid: 837fbd844d9fc754cba024da9db7b23f, type: 3} + - {fileID: 21300000, guid: d356cff1c1e9f7141bfd1494eb6cb649, type: 3} + - {fileID: 21300000, guid: 3b66e47ba219b5b45a86b152309b86a5, type: 3} + - {fileID: 21300000, guid: 7c19aa2a399b90549be22c2988cebfbb, type: 3} + - {fileID: 21300000, guid: 4f851d991c6b554408c7048f13a69f1e, type: 3} + - {fileID: 21300000, guid: fda7e781c6d9bdd4089fcf94bdb4b888, type: 3} + - {fileID: 21300000, guid: cb56807d2bb3b9e4589fde7406a7e3b1, type: 3} + - {fileID: 21300000, guid: ddcbefdec10ee444e8d4fa3726d19ecf, type: 3} + - {fileID: 21300000, guid: af4bd0656138c364ea75a22479efc826, type: 3} + - {fileID: 21300000, guid: 4122c09a24be48c4f9009cec909c8b94, type: 3} + - {fileID: 21300000, guid: d6b70b2bf0790d4488db99034854518a, type: 3} + - {fileID: 21300000, guid: d86aa1a49edf29a4198c279a851c9d18, type: 3} + - {fileID: 21300000, guid: c6b10d64a420efe49af85c325b6f4d76, type: 3} + - {fileID: 21300000, guid: 8a2e89a042a49a340b1d46067aa327b9, type: 3} + - {fileID: 21300000, guid: ddd34f6206bce17479a2fba5730c2a6f, type: 3} + - {fileID: 21300000, guid: b3f6c16f536ff6d4698f4798a74ba88b, type: 3} + - {fileID: 21300000, guid: 066f7fdef88f74242aa7ea7a952e90d7, type: 3} + - {fileID: 21300000, guid: 7c0dd62a52ebba34a850d9a684e8e2af, type: 3} + - {fileID: 21300000, guid: 5049a10a5cd724a429a6579552b1b946, type: 3} + - {fileID: 21300000, guid: 319cf2656dcdfa8469dcff7fbf750304, type: 3} + - {fileID: 21300000, guid: 7a8271eedf159e54484f4475ab28905f, type: 3} + - {fileID: 21300000, guid: 14b64c707fe989445b294fa67099b8c1, type: 3} + - {fileID: 21300000, guid: 6e1e5120086b30144b450594d341de71, type: 3} + - {fileID: 21300000, guid: 8cdbc19d02e21af43a247aa5d2ceda29, type: 3} + - {fileID: 21300000, guid: 36c87594fa089994db5fe49a6b41dab8, type: 3} + - {fileID: 21300000, guid: 0f1d9e2e5869dff489d5f5020e72a7a0, type: 3} + - {fileID: 21300000, guid: bcd74af40cfb069469d4cdc8af60a7e3, type: 3} + - {fileID: 21300000, guid: 64ccffd5e5ba0db45bde9407a10ce11a, type: 3} + - {fileID: 21300000, guid: e119463d4bf8ef94992638c40d116853, type: 3} + - {fileID: 21300000, guid: 1d8e565bbe9c37d4d98df7129e817420, type: 3} + - {fileID: 21300000, guid: 776f09c74d840124dabc18c96cbad580, type: 3} + - {fileID: 21300000, guid: eb196bca2630f55438b80da083f5f9bb, type: 3} + - {fileID: 21300000, guid: 754c8f41a11ce9741a04eb3d387c5031, type: 3} + - {fileID: 21300000, guid: 63b7a272b974791469d091bdf1fb46dd, type: 3} + - {fileID: 21300000, guid: 44013cbdfcd413045a1e593704f86e23, type: 3} + - {fileID: 21300000, guid: 25d781bda1f1e764f994dcb5899799ae, type: 3} + - {fileID: 21300000, guid: 20bbad8dfb501cb42b8eb533392f641e, type: 3} + - {fileID: 21300000, guid: fd4e6347c820f4540b757e1ca136f4cc, type: 3} + - {fileID: 21300000, guid: 3603599dbe6ca9f4681631c0136d9198, type: 3} + - {fileID: 21300000, guid: 5e834ca9ac2dae644a772f082565b955, type: 3} + - {fileID: 21300000, guid: 6e31967f8667fe04eb6e0abbc6073971, type: 3} + - {fileID: 21300000, guid: 1ab7358e319ec68448fad8c26f357357, type: 3} + - {fileID: 21300000, guid: a46702e4cd5c67b4eaed1c7d19b9fd27, type: 3} + - {fileID: 21300000, guid: 51283f204639a91469af70e2da6718b6, type: 3} + - {fileID: 21300000, guid: 609410f35c577d04389e940a19640395, type: 3} + - {fileID: 21300000, guid: 2b14bdca11d7a2a4da6f81cf735b00a6, type: 3} + - {fileID: 21300000, guid: 9e8417d2dccd0a0448374c23d8cb8a0a, type: 3} + - {fileID: 21300000, guid: 1113fd23a79112e41b362d3bda192350, type: 3} + - {fileID: 21300000, guid: f41058f402b0bae4495fa18b34943777, type: 3} + - {fileID: 21300000, guid: f31ca625465971848a8168984f65681f, type: 3} + index: 0 --- !u!1 &4393350400885313073 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/TestScenes/LiveScene-Test.unity b/Assets/Scenes/TestScenes/LiveScene-Test.unity index bcf5d5c..a0ae751 100644 --- a/Assets/Scenes/TestScenes/LiveScene-Test.unity +++ b/Assets/Scenes/TestScenes/LiveScene-Test.unity @@ -23,9 +23,9 @@ RenderSettings: m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 + m_AmbientIntensity: 1.15 m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SubtractiveShadowColor: {r: 0.9622642, g: 0.9539029, b: 0.9395693, a: 1} m_SkyboxMaterial: {fileID: 2100000, guid: e2f3d7f569772ed449488663577dc7a7, type: 2} m_HaloStrength: 0.5 m_FlareStrength: 1 @@ -33,12 +33,12 @@ RenderSettings: m_HaloTexture: {fileID: 0} m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 + m_DefaultReflectionResolution: 256 m_ReflectionBounces: 1 m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.20464736, g: 0.26801568, b: 0.30485883, a: 1} + m_Sun: {fileID: 482758754} + m_IndirectSpecularColor: {r: 0.20464769, g: 0.268016, b: 0.30485913, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -303,65 +303,102 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &515038138 -PrefabInstance: +--- !u!1 &482758753 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} - propertyPath: m_LocalPosition.x - value: 7.14 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} - propertyPath: m_LocalPosition.y - value: 2.19 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} - propertyPath: m_LocalPosition.z - value: -139.15 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} - propertyPath: m_Name - value: "\u6559\u5E08\uFF08\u5E26\u4F38\u624B\u52A8\u753B\uFF09" - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 482758755} + - component: {fileID: 482758754} + m_Layer: 0 + m_Name: Directional Light (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &482758754 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 482758753} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &482758755 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 482758753} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 7.1327467, y: 4.6804514, z: -129.39088} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &530964177 stripped GameObject: m_CorrespondingSourceObject: {fileID: -8109040287526821490, guid: bb9c532ae1143d34d8245bbea5f5ce9b, type: 3} @@ -393,7 +430,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} propertyPath: m_LocalPosition.x @@ -458,6 +495,63 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1764.4271, y: 0.00015628338, z: 1506.3827} m_Center: {x: 189.43243, y: 1.0300586, z: -83.80817} +--- !u!1001 &1847977107 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_LocalPosition.x + value: 7.19 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_LocalPosition.y + value: 2.189 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_LocalPosition.z + value: -140.62 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_Name + value: "\u6559\u5E08\uFF08\u5F85\u673A\u52A8\u753B\uFF09" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} --- !u!1 &1993064896 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Bootstrap.cs b/Assets/Scripts/Bootstrap.cs index 5f1f62d..fc5ae98 100644 --- a/Assets/Scripts/Bootstrap.cs +++ b/Assets/Scripts/Bootstrap.cs @@ -26,27 +26,18 @@ public class Bootstrap : SingletonMono eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 0.1f); scenesManager.LoadSceneAsyn("MenuScene", () => { - uiManager.ShowPanel(this, E_UI_Layer.Top, (panel) => { uiManager.ShowPanel(this, E_UI_Layer.Mid, (panel) => { - uiManager.ShowPanel(this, E_UI_Layer.Bot, (panel) => - { - - - Debug.Log("UI_SelectModePanel"); - }); + { + Debug.Log("UI_SelectModePanel"); + }); }); }); eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 2f); }); }); } - - // Update is called once per frame - void Update() - { - } } diff --git a/Assets/Scripts/UI/UIPanel/UI_LoadingPanel.cs b/Assets/Scripts/UI/UIPanel/UI_LoadingPanel.cs index 5712105..b7fd1a5 100644 --- a/Assets/Scripts/UI/UIPanel/UI_LoadingPanel.cs +++ b/Assets/Scripts/UI/UIPanel/UI_LoadingPanel.cs @@ -1,24 +1,37 @@ +using Cysharp.Threading.Tasks; +using System; using System.Collections; using System.Collections.Generic; +using TMPro; using UnityEngine; using UnityEngine.UI; +using static TMPro.SpriteAssetUtilities.TexturePacker_JsonArray; public class UI_LoadingPanel : BasePanel { public Slider loadSlider; + public CanvasGroup canvasGroup; private float currentProgress = 0; public float speed; public bool isLoading = false; + public TextMeshProUGUI Slider_Text; + public Sprite[] frames; // ÿһ֡µÄSpriteͼƬ + private Image image; + public int index = 0; protected override void Awake() { base.Awake(); loadSlider = GetControl("loadSlider"); + Slider_Text = GetControl("%"); + image = GetControl("middleImage"); // Ñ­»·²¥·Å } public override void ShowMe() { base.ShowMe(); + index = 0; + Slider_Text.text = "0%"; Bootstrap.Instance.eventCenter.AddEventListener(Enum_EventType.UpdateProgress, UpdateProgress); } @@ -41,6 +54,8 @@ public class UI_LoadingPanel : BasePanel { currentProgress += Time.deltaTime * speed; loadSlider.value = currentProgress; + float percent = loadSlider.value * 100f; + Slider_Text.text = Mathf.RoundToInt(percent) + "%"; } else { @@ -50,10 +65,26 @@ public class UI_LoadingPanel : BasePanel } } - private void UpdateProgress(float speed) + public async UniTask Loading() + { + while (isLoading) + { + index++; + //Debug.Log(index+"°¡°¡°¡°¡°¡°¡°¡°¡°¡"); + await UniTask.Delay(50); + if (index >= frames.Length) + { + index = 0; + } + image.sprite = frames[index]; + } + + } + private async void UpdateProgress(float speed) { isLoading = true; this.speed = speed; + await Loading(); } } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 47fe79b..317965e 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -16,7 +16,17 @@ EditorUserSettings: flags: 0 RecentlyUsedSceneGuid-3: value: 54090c025006080809565e7249740e444015492f297f7565287d1b65b7b2323a +<<<<<<< HEAD flags: 0 +======= + flags: 0 + RecentlyUsedSceneGuid-4: + value: 0550025e01010c0c0f5d54704175074444154073752d7733757d4a30b2e2366a + flags: 0 + RecentlyUsedSceneGuid-5: + value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a + flags: 0 +>>>>>>> 6798c5c18edb4652934f59b9691ebd340c98ceba vcSharedLogLevel: value: 0d5e400f0650 flags: 0 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index bf01449..7dd99f4 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -26,7 +26,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 33367 + controlID: 42478 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -48,9 +48,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 2560 - y: 591 + y: 585 width: 1050 - height: 408 + height: 414 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -99,22 +99,22 @@ MonoBehaviour: x: 0 y: 21 width: 1050 - height: 387 - m_Scale: {x: 0.35833332, y: 0.35833332} - m_Translation: {x: 525, y: 193.5} + height: 393 + m_Scale: {x: 0.3638889, y: 0.3638889} + m_Translation: {x: 525, y: 196.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1465.1163 + x: -1442.748 y: -540 - width: 2930.2327 + width: 2885.496 height: 1080 m_MinimalGUI: 1 - m_defaultScale: 0.35833332 - m_LastWindowPixelSize: {x: 1050, y: 408} + m_defaultScale: 0.3638889 + m_LastWindowPixelSize: {x: 1050, y: 414} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 @@ -144,7 +144,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 33368 + controlID: 42479 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -163,7 +163,7 @@ MonoBehaviour: x: 0 y: 0 width: 1051 - height: 518 + height: 512 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 5} @@ -194,7 +194,7 @@ MonoBehaviour: x: 2560 y: 73 width: 1050 - height: 497 + height: 491 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -270,7 +270,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 67.5, y: 86} + snapOffset: {x: 67.5, y: 56} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Orientation @@ -430,9 +430,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 9.951586, y: 6.911087, z: -132.58203} + m_Target: {x: 6.5974827, y: 3.2819297, z: -138.52733} speed: 2 - m_Value: {x: 9.951586, y: 6.911087, z: -132.58203} + m_Value: {x: 6.5974827, y: 3.2819297, z: -138.52733} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -479,13 +479,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.108421326, y: 0.5196688, z: -0.075145, w: -0.8441338} + m_Target: {x: 0.031766064, y: -0.92547786, z: 0.100243986, w: 0.36395088} speed: 2 - m_Value: {x: -0.10842027, y: 0.51966375, z: -0.07514426, w: -0.84412557} + m_Value: {x: -0.03176563, y: 0.92546517, z: -0.100242615, w: -0.3639459} m_Size: - m_Target: 1.0210265 + m_Target: 1.0966064 speed: 2 - m_Value: 1.0210265 + m_Value: 1.0966064 m_Ortho: m_Target: 0 speed: 2 @@ -503,7 +503,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.108421326, y: 0.5196688, z: -0.075145, w: -0.8441338} + m_LastSceneViewRotation: {x: 0.031766064, y: -0.92547786, z: 0.100243986, w: 0.36395088} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -526,9 +526,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 518 + y: 512 width: 1051 - height: 429 + height: 435 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 2} @@ -553,7 +553,7 @@ MonoBehaviour: serializedVersion: 2 x: 1051 y: 0 - width: 241 + width: 230 height: 947 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -584,7 +584,7 @@ MonoBehaviour: serializedVersion: 2 x: 3611 y: 73 - width: 239 + width: 228 height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -596,7 +596,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0aa8feff16a8feff20a8feff92c0feffaac7feff52c9feff30f7feff34f7feff3ef7feff46f7feff52f7fefff829fffffc29ffff062affff0e2affff1a2afffff2b0fffff4b0fffff6b0fffff8b0fffffab0fffffcb0ffff00b1ffff02b1ffff04b1ffff06b1ffff0ab1ffff0eb1ffff10b1ffff12b1ffff16b1ffff18b1ffff1ab1ffff1cb1ffff1eb1ffff22b1ffff2cb1ffff2eb1ffff30b1ffff32b1ffff34b1ffff36b1ffff3ab1ffff3cb1ffff3eb1ffff40b1ffff42b1ffff44b1ffff46b1ffff48b1ffff4ab1ffff4cb1ffff50b1ffff52b1ffffe6b1ffffe2b8ffff32b9ffff82b9ffffd2b9ffff3ebaffff8ac1ffff70edffffccedffff1ceeffff6ceeffffbceeffff0cefffff5cefffff22f1ffff72f1ffff3ef6ffff38fbfffff4ffffff + m_ExpandedIDs: 8c6ffeffce86feffd086feffd286feffd486feff3487feff3687feff3887feff3a87feff3c87feffd887feffcc8ffeff1a90feff0aa8feff16a8feff20a8feff92c0feffaac7feff52c9feff30f7feff34f7feff3ef7feff46f7feff52f7fefff829fffffc29ffff062affff0e2affff1a2afffff2b0fffff4b0fffff6b0fffff8b0fffffab0fffffcb0ffff00b1ffff02b1ffff04b1ffff06b1ffff0ab1ffff0eb1ffff10b1ffff12b1ffff16b1ffff18b1ffff1ab1ffff1cb1ffff1eb1ffff22b1ffff2cb1ffff2eb1ffff30b1ffff32b1ffff34b1ffff36b1ffff3ab1ffff3cb1ffff3eb1ffff40b1ffff42b1ffff44b1ffff46b1ffff48b1ffff4ab1ffff4cb1ffff50b1ffff52b1ffffe6b1ffffe2b8ffff32b9ffff82b9ffffd2b9ffff3ebaffff8ac1ffff70edffffccedffff1ceeffff6ceeffffbceeffff0cefffff5cefffff22f1ffff72f1ffff3ef6ffff38fbfffff4ffffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -635,9 +635,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1292 + x: 1281 y: 0 - width: 316 + width: 198 height: 947 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -666,9 +666,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 3852 + x: 3841 y: 73 - width: 314 + width: 196 height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -686,7 +686,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Resources/UI/Base + - Assets/ArtRes/Animation/Loading m_Globs: [] m_OriginalText: m_FilterByTypeIntersection: 0 @@ -701,7 +701,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 42780000 m_LastClickedID: 30786 - m_ExpandedIDs: 20bdfeffffffffff00000000ce590000d2590000d4590000d6590000d8590000da590000dc590000de590000e0590000e2590000e4590000e6590000e85900000c5a00002c5a0000305a0000325a00007a650000606c0000626c00006e6c0000766c0000f46d0000ce720000d8720000e4720000e6720000aa730000ac730000b0730000b8730000ba730000c0730000c2730000da730000248d0000049100004a980000049a0000bc9b000072a10000cea2000014a400001ce000001ee000009ae800009ce80000 + m_ExpandedIDs: 20bdfeffffffffff00000000ce590000d2590000d4590000d6590000d8590000da590000dc590000de590000e0590000e2590000e4590000e6590000e85900000c5a00002c5a0000325a00007a650000a6670000606c0000626c00006e6c0000766c00007a6d0000806d0000f46d0000386e0000ce720000d8720000e4720000e6720000aa730000ac730000b0730000b8730000ba730000c0730000c2730000c4730000c8730000da730000248d0000049100004a980000049a0000bc9b000072a10000cea2000014a400001ce000001ee000009ae800009ce80000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -726,10 +726,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 296} + scrollPos: {x: 0, y: 1380} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 20bdfeffffffffff00000000ce590000d2590000d4590000d6590000d8590000da590000dc590000de590000e0590000e2590000e4590000e6590000e85900000c5a00002c5a0000325a00007a650000a6670000606c0000626c00006e6c0000766c0000f46d0000ce720000d8720000e4720000e6720000aa730000ac730000b0730000b8730000ba730000c0730000c2730000da730000248d0000049100004a980000049a0000bc9b000072a10000cea2000014a400001ce000001ee000009ae800009ce80000 + m_ExpandedIDs: 20bdfeffffffffff00000000ce590000d2590000d4590000d6590000d8590000da590000dc590000de590000e0590000e2590000e4590000e6590000e85900000c5a00002c5a0000325a00007a650000a6670000606c0000626c00006e6c0000766c00007a6d0000806d0000f46d0000386e0000ce720000d8720000e4720000e6720000aa730000ac730000b0730000b8730000ba730000c0730000c2730000c4730000c8730000da730000248d0000049100004a980000049a0000bc9b000072a10000cea2000014a400001ce000001ee000009ae800009ce80000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -800,9 +800,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1608 + x: 1479 y: 0 - width: 312 + width: 441 height: 947 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} @@ -832,9 +832,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 4168 + x: 4039 y: 73 - width: 311 + width: 440 height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -844,7 +844,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 316 + m_CachedPref: 611 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1