From bbfe9796f7bf135588708eb81d18638890ed1b0d Mon Sep 17 00:00:00 2001 From: yojohanshinwataikei Date: Fri, 10 Nov 2023 15:46:42 +0800 Subject: [PATCH] Fix error when canceling operation --- Assets/Materials/Player/TrackBorderLeft.mat | 2 +- Assets/Materials/Player/TrackBorderRight.mat | 2 +- Assets/Materials/Player/TrackMain.mat | 2 +- Assets/Misc/ChangeLog.txt | 7 + .../Compose/Editing/AdeOperationManager.cs | 2 +- Assets/_Scenes/ArcEditor.unity | 495 ++++++++++++++++-- 6 files changed, 454 insertions(+), 56 deletions(-) diff --git a/Assets/Materials/Player/TrackBorderLeft.mat b/Assets/Materials/Player/TrackBorderLeft.mat index 6f6bbfcc..11c0b143 100644 --- a/Assets/Materials/Player/TrackBorderLeft.mat +++ b/Assets/Materials/Player/TrackBorderLeft.mat @@ -72,7 +72,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Phase: 0.26213914 + - _Phase: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Materials/Player/TrackBorderRight.mat b/Assets/Materials/Player/TrackBorderRight.mat index 0620c06f..51b1af22 100644 --- a/Assets/Materials/Player/TrackBorderRight.mat +++ b/Assets/Materials/Player/TrackBorderRight.mat @@ -72,7 +72,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Phase: 0.26213914 + - _Phase: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Materials/Player/TrackMain.mat b/Assets/Materials/Player/TrackMain.mat index eb2f725a..2b00330e 100644 --- a/Assets/Materials/Player/TrackMain.mat +++ b/Assets/Materials/Player/TrackMain.mat @@ -72,7 +72,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Phase: 0.26213914 + - _Phase: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Misc/ChangeLog.txt b/Assets/Misc/ChangeLog.txt index 06a3af05..29af8a2b 100644 --- a/Assets/Misc/ChangeLog.txt +++ b/Assets/Misc/ChangeLog.txt @@ -1,3 +1,10 @@ +0.5.2 + +- 强制音画同步现在默认关闭， 可以在设置窗口内重新打开 +- 修复用快捷键取消部分操作时会报错的问题 + +--- + 0.5.1 - 轨道的速度现在会随着谱面流速变化了 diff --git a/Assets/Scripts/Compose/Editing/AdeOperationManager.cs b/Assets/Scripts/Compose/Editing/AdeOperationManager.cs index b1c1590f..eefd974f 100644 --- a/Assets/Scripts/Compose/Editing/AdeOperationManager.cs +++ b/Assets/Scripts/Compose/Editing/AdeOperationManager.cs @@ -62,7 +62,7 @@ void Update() { CancelOngoingOperation(); } - if (ongoingOperation.Value.task.Status != UniTaskStatus.Pending) + if (ongoingOperation?.task.Status != UniTaskStatus.Pending) { ongoingOperation = null; } diff --git a/Assets/_Scenes/ArcEditor.unity b/Assets/_Scenes/ArcEditor.unity index 677cf7a2..d2c979fa 100644 --- a/Assets/_Scenes/ArcEditor.unity +++ b/Assets/_Scenes/ArcEditor.unity @@ -7829,8 +7829,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: 59.614563, y: -112.1713} - m_SizeDelta: {x: 435.22913, y: 40.08565} + m_AnchoredPosition: {x: 59.87097, y: -112.51613} + m_SizeDelta: {x: 435.74194, y: 40.258064} m_Pivot: {x: 0, y: 1} --- !u!114 &194505191 MonoBehaviour: @@ -8787,8 +8787,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: 411.19595, y: -401.31903} - m_SizeDelta: {x: 51.391865, y: 19.528908} + m_AnchoredPosition: {x: 411.30646, y: -458.58066} + m_SizeDelta: {x: 51.612904, y: 19.612904} m_Pivot: {x: 1, y: 0} --- !u!114 &223742993 MonoBehaviour: @@ -9235,7 +9235,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 178.84369, y: 40.08565} + m_SizeDelta: {x: 179.6129, y: 40.258064} m_Pivot: {x: 0, y: 1} --- !u!114 &236864983 MonoBehaviour: @@ -12643,7 +12643,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 433.31903} + m_SizeDelta: {x: 0, y: 490.58066} m_Pivot: {x: 0, y: 1} --- !u!114 &326402800 MonoBehaviour: @@ -12813,6 +12813,112 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 334607650} m_CullTransparentMesh: 0 +--- !u!1 &337597991 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 337597993} + - component: {fileID: 337597992} + - component: {fileID: 337597994} + m_Layer: 10 + m_Name: PlaybackSync + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &337597992 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 337597991} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, 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: Highlighted + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1028300391} + toggleTransition: 1 + graphic: {fileID: 505867082} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_IsOn: 0 +--- !u!224 &337597993 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 337597991} + 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: 1028300389} + m_Father: {fileID: 626200782} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 235.6129, y: -20.129032} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &337597994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 337597991} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 40 + m_PreferredHeight: 40 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 100 --- !u!1 &338554260 GameObject: m_ObjectHideFlags: 0 @@ -14888,6 +14994,7 @@ Transform: - {fileID: 396507446} - {fileID: 1084033885} - {fileID: 796215120} + - {fileID: 1679130888} m_Father: {fileID: 990230354} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &413236560 @@ -14940,6 +15047,7 @@ MonoBehaviour: TargetFrameRate: -1 Velocity: 30 UndoBufferSize: 200 + PlaybackSync: 0 Auto: 0 ChartSortMode: 0 Version: {fileID: 223742993} @@ -14947,6 +15055,7 @@ MonoBehaviour: FullscreenToggle: {fileID: 1390104979} TargetFramerateDropdown: {fileID: 513508526} UndoBufferSizeInput: {fileID: 1848678546} + PlaybackSyncToggle: {fileID: 337597992} ChangeLog: {fileID: 4900000, guid: 609224af15c38cb4ab6e8827121d56e8, type: 3} BuildTimestampText: {fileID: 4900000, guid: fafb7c5112952114396aa1d607d28d76, type: 3} --- !u!1 &414479945 @@ -19159,6 +19268,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 501142765} m_CullTransparentMesh: 0 +--- !u!1 &505867081 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 505867084} + - component: {fileID: 505867083} + - component: {fileID: 505867082} + m_Layer: 10 + m_Name: Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &505867082 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505867081} + 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: 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: 10901, guid: 0000000000000000f000000000000000, type: 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!222 &505867083 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505867081} + m_CullTransparentMesh: 0 +--- !u!224 &505867084 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505867081} + 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: 1028300389} + 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: 35, y: 35} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &510360236 GameObject: m_ObjectHideFlags: 0 @@ -19550,7 +19734,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: 285.22913, y: -20.042826} + m_AnchoredPosition: {x: 285.74194, y: -20.129032} m_SizeDelta: {x: 300, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &513508525 @@ -20031,9 +20215,9 @@ Camera: m_NormalizedViewPortRect: serializedVersion: 2 x: 0.052083332 - y: 0.059259266 + y: 0.059245102 width: 0.8958333 - height: 0.88148147 + height: 0.8815098 near clip plane: 1 far clip plane: 10000 field of view: 50 @@ -22221,7 +22405,7 @@ RectTransform: m_Children: [] m_Father: {fileID: 996447228} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.000000059604645} + m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} @@ -23894,6 +24078,70 @@ Transform: - {fileID: 1057236767} m_Father: {fileID: 990230354} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &626200781 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 626200782} + - component: {fileID: 626200783} + m_Layer: 10 + m_Name: PlaybackSync + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &626200782 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 626200781} + 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: 1157141714} + - {fileID: 337597993} + m_Father: {fileID: 947033402} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -225.03226} + m_SizeDelta: {x: 495.6129, y: 40.258064} + m_Pivot: {x: 0, y: 1} +--- !u!114 &626200783 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 626200781} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 260 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 16 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &626806431 GameObject: m_ObjectHideFlags: 0 @@ -25600,8 +25848,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: 119.229126, y: -56.085648} - m_SizeDelta: {x: 375.61456, y: 40.08565} + m_AnchoredPosition: {x: 119.74194, y: -56.258064} + m_SizeDelta: {x: 375.87097, y: 40.258064} m_Pivot: {x: 0, y: 1} --- !u!114 &675394591 MonoBehaviour: @@ -29282,7 +29530,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: 194.84369, y: -224.3426} + m_AnchoredPosition: {x: 195.61292, y: -281.2903} m_SizeDelta: {x: 300, y: 40} m_Pivot: {x: 0, y: 1} --- !u!114 &766522949 @@ -31573,7 +31821,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 59.614563, y: 40.08565} + m_SizeDelta: {x: 59.870968, y: 40.258064} m_Pivot: {x: 0, y: 1} --- !u!114 &842186433 MonoBehaviour: @@ -36858,13 +37106,14 @@ RectTransform: - {fileID: 675394590} - {fileID: 194505190} - {fileID: 1748575957} + - {fileID: 626200782} - {fileID: 766522948} m_Father: {fileID: 326402799} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 385.5, y: -164.1713} - m_SizeDelta: {x: 494.8437, y: 264.3426} + m_AnchoredPosition: {x: 385.5, y: -192.64516} + m_SizeDelta: {x: 495.6129, y: 321.2903} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &947033403 MonoBehaviour: @@ -39803,6 +40052,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1027535676} m_CullTransparentMesh: 1 +--- !u!1 &1028300388 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1028300389} + - component: {fileID: 1028300390} + - component: {fileID: 1028300391} + m_Layer: 10 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1028300389 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1028300388} + 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: 505867084} + m_Father: {fileID: 337597993} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000045776367, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1028300390 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1028300388} + m_CullTransparentMesh: 0 +--- !u!114 &1028300391 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1028300388} + 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: 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: 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!1 &1031108829 GameObject: m_ObjectHideFlags: 0 @@ -44993,6 +45318,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1156165828} m_CullTransparentMesh: 1 +--- !u!1 &1157141713 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1157141714} + - component: {fileID: 1157141716} + - component: {fileID: 1157141715} + m_Layer: 10 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1157141714 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1157141713} + 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: 626200782} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 179.6129, y: 40.258064} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1157141715 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1157141713} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: + m_Font: {fileID: 12800000, guid: 31dca927ee076e7438245e0861215965, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5F3A\u5236\u97F3\u753B\u540C\u6B65" +--- !u!222 &1157141716 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1157141713} + m_CullTransparentMesh: 0 --- !u!1 &1160553131 GameObject: m_ObjectHideFlags: 0 @@ -51935,7 +52339,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: 398, y: -540.31903} + m_AnchoredPosition: {x: 398, y: -597.5807} m_SizeDelta: {x: 788, y: 66} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1328530196 @@ -52753,8 +53157,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.807281, y: 0} - m_SizeDelta: {x: 465.0364, y: 40.08565} + m_AnchoredPosition: {x: 29.935486, y: 0} + m_SizeDelta: {x: 465.67743, y: 40.258064} m_Pivot: {x: 0, y: 1} --- !u!114 &1353636441 MonoBehaviour: @@ -54492,8 +54896,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: 398, y: -290.65952} - m_SizeDelta: {x: 788, y: 433.31903} + m_AnchoredPosition: {x: 398, y: -319.29034} + m_SizeDelta: {x: 788, y: 490.58066} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1381980877 MonoBehaviour: @@ -54869,7 +55273,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: 115.61456, y: -20.042826} + m_AnchoredPosition: {x: 115.87097, y: -20.129032} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1390104978 @@ -54938,19 +55342,7 @@ MonoBehaviour: m_Group: {fileID: 0} onValueChanged: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 928958754} - m_TargetAssemblyTypeName: UnityEngine.Object, UnityEngine - m_MethodName: OnIsVoid - m_Mode: 2 - m_Arguments: - m_ObjectArgument: {fileID: 1390104979} - m_ObjectArgumentAssemblyTypeName: UnityEngine.UI.Toggle, UnityEngine.UI - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] m_IsOn: 1 --- !u!1 &1390699651 GameObject: @@ -56553,7 +56945,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: 315.0364, y: -20.042826} + m_AnchoredPosition: {x: 315.67743, y: -20.129032} m_SizeDelta: {x: 300, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1419306893 @@ -59431,8 +59823,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 585714319} m_HandleRect: {fileID: 585714318} m_Direction: 2 - m_Value: 1 - m_Size: 0.99999994 + m_Value: 0 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -66279,7 +66671,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 413236559} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1679130889 MonoBehaviour: @@ -68748,8 +69140,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: 0, y: -168.25696} - m_SizeDelta: {x: 494.8437, y: 40.08565} + m_AnchoredPosition: {x: 0, y: -168.7742} + m_SizeDelta: {x: 495.6129, y: 40.258064} m_Pivot: {x: 0, y: 1} --- !u!114 &1748575958 MonoBehaviour: @@ -71714,7 +72106,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 119.229126, y: 40.08565} + m_SizeDelta: {x: 119.741936, y: 40.258064} m_Pivot: {x: 0, y: 1} --- !u!114 &1819022545 MonoBehaviour: @@ -72227,7 +72619,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: 194.84369, y: -0.0428257} + m_AnchoredPosition: {x: 195.6129, y: -0.12903214} m_SizeDelta: {x: 300, y: 40} m_Pivot: {x: 0, y: 1} --- !u!114 &1848678548 @@ -72655,7 +73047,7 @@ RectTransform: 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: 795, y: 573.31903} + m_SizeDelta: {x: 795, y: 630.5807} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1852846295 GameObject: @@ -73520,7 +73912,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 149.0364, y: 40.08565} + m_SizeDelta: {x: 149.67741, y: 40.258064} m_Pivot: {x: 0, y: 1} --- !u!114 &1869992287 MonoBehaviour: @@ -74725,8 +75117,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: 385.5, y: -339.06635} - m_SizeDelta: {x: 408.0514, y: 53.447536} + m_AnchoredPosition: {x: 385.5, y: -396.12903} + m_SizeDelta: {x: 409.80646, y: 53.677418} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1914979118 MonoBehaviour: @@ -81191,10 +81583,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1707394408} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 400.5, y: -72.258064} - m_SizeDelta: {x: 705, y: 40.258064} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0} --- !u!114 &2105888210 MonoBehaviour: @@ -82435,6 +82827,5 @@ SceneRoots: - {fileID: 534669905} - {fileID: 1049938806} - {fileID: 409941037} - - {fileID: 1679130888} - {fileID: 1699867664} - {fileID: 784619473}