diff --git a/Assets/Models/Materials/MT_PM_V38_Sorghum_bicolor_Leaf_01_albedo.mat b/Assets/Models/Materials/MT_PM_V38_Sorghum_bicolor_Leaf_01_albedo.mat index 74588ec..3762f92 100644 --- a/Assets/Models/Materials/MT_PM_V38_Sorghum_bicolor_Leaf_01_albedo.mat +++ b/Assets/Models/Materials/MT_PM_V38_Sorghum_bicolor_Leaf_01_albedo.mat @@ -8,19 +8,20 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: MT_PM_V38_Sorghum_bicolor_Leaf_01_albedo - m_Shader: {fileID: 10511, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: + - _ALPHATEST_ON - _EMISSION - m_InvalidKeywords: - - _ALPHABLEND_ON - _NORMALMAP + m_InvalidKeywords: - _REQUIRE_UV2 - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout disabledShaderPasses: - GRABPASS m_SavedProperties: @@ -134,7 +135,7 @@ Material: - _DistortionEnabled: 0 - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - - _DstBlend: 10 + - _DstBlend: 0 - _EmissionEnabled: 0 - _Farm_Step1: 0 - _FlipbookMode: 1 @@ -144,7 +145,7 @@ Material: - _InvFade: 1 - _LightingEnabled: 1 - _Metallic: 0 - - _Mode: 2 + - _Mode: 1 - _N1Int: 1 - _N2Int: 1 - _N3Int: 1 @@ -161,11 +162,11 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SquashAmount: 1 - - _SrcBlend: 5 + - _SrcBlend: 1 - _Tex_D1pow: 1 - _TranslucencyViewDependency: 0.7 - _UVSec: 0 - - _ZWrite: 0 + - _ZWrite: 1 - __dirty: 1 m_Colors: - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} diff --git a/Assets/Models/Materials/MT_PM_V38_Sorghum_bicolor_Stem_02_albedo_01.mat b/Assets/Models/Materials/MT_PM_V38_Sorghum_bicolor_Stem_02_albedo_01.mat index ab157b1..cf2d7a5 100644 --- a/Assets/Models/Materials/MT_PM_V38_Sorghum_bicolor_Stem_02_albedo_01.mat +++ b/Assets/Models/Materials/MT_PM_V38_Sorghum_bicolor_Stem_02_albedo_01.mat @@ -10,16 +10,16 @@ Material: m_Name: MT_PM_V38_Sorghum_bicolor_Stem_02_albedo_01 m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - - _ALPHABLEND_ON + - _ALPHATEST_ON - _EMISSION - _NORMALMAP m_InvalidKeywords: [] m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 + m_CustomRenderQueue: 2450 stringTagMap: - RenderType: Transparent + RenderType: TransparentCutout disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -69,19 +69,19 @@ Material: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 10 + - _DstBlend: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 - _Metallic: 0 - - _Mode: 2 + - _Mode: 1 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 5 + - _SrcBlend: 1 - _UVSec: 0 - - _ZWrite: 0 + - _ZWrite: 1 m_Colors: - _Color: {r: 0.78764683, g: 0.9433962, b: 0.8282066, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Resources/UI/UIPanel/UI_StepsPanel.prefab b/Assets/Resources/UI/UIPanel/UI_StepsPanel.prefab index 426059d..a3a2a97 100644 --- a/Assets/Resources/UI/UIPanel/UI_StepsPanel.prefab +++ b/Assets/Resources/UI/UIPanel/UI_StepsPanel.prefab @@ -32,8 +32,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2527944883655481645} - - {fileID: 7835042658044891768} - - {fileID: 8640685201192089303} - {fileID: 6034407815697293955} m_Father: {fileID: 496968027908146854} m_RootOrder: 0 @@ -124,12 +122,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1078803496746026190} - m_RootOrder: 2 + m_Father: {fileID: 7835042658044891768} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -120} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 178.0773, y: 79.1229} m_Pivot: {x: 0, y: 1} --- !u!114 &235241195840539889 @@ -184,7 +182,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3} m_Name: m_EditorClassIdentifier: - m_AllowSwitchOff: 1 + m_AllowSwitchOff: 0 --- !u!1 &1274212127849608913 GameObject: m_ObjectHideFlags: 0 @@ -215,7 +213,8 @@ 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: 7835042658044891768} m_Father: {fileID: 1078803496746026190} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -322,14 +321,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1078803496746026190} - m_RootOrder: 1 + m_Children: + - {fileID: 8640685201192089303} + m_Father: {fileID: 2527944883655481645} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -814, y: -50} - m_SizeDelta: {x: -1668, y: -140} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5615064996399791523 CanvasRenderer: @@ -473,7 +473,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1078803496746026190} - m_RootOrder: 3 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} diff --git a/Assets/Resources/UI/UI_Item/TipItem/TipItem.prefab b/Assets/Resources/UI/UI_Item/TipItem/TipItem.prefab index 0da2795..8959908 100644 --- a/Assets/Resources/UI/UI_Item/TipItem/TipItem.prefab +++ b/Assets/Resources/UI/UI_Item/TipItem/TipItem.prefab @@ -68,8 +68,8 @@ MonoBehaviour: m_Calls: [] m_text: "\u9676\u82CF\u5947" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: f8ef5cb2ab4d4da4093d3fe60f978c99, type: 2} - m_sharedMaterial: {fileID: -4829118149068189727, guid: f8ef5cb2ab4d4da4093d3fe60f978c99, type: 2} + m_fontAsset: {fileID: 11400000, guid: 1c4004df1d65ff944b6e23e3af757df7, type: 2} + m_sharedMaterial: {fileID: 1751944718996602668, guid: 1c4004df1d65ff944b6e23e3af757df7, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] diff --git a/Assets/Resources/UI/UI_Item/UI_StepsPanel/UI_StepsPanelItem.prefab b/Assets/Resources/UI/UI_Item/UI_StepsPanel/UI_StepsPanelItem.prefab index 79078fd..1561b20 100644 --- a/Assets/Resources/UI/UI_Item/UI_StepsPanel/UI_StepsPanelItem.prefab +++ b/Assets/Resources/UI/UI_Item/UI_StepsPanel/UI_StepsPanelItem.prefab @@ -51,7 +51,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Step_Text: {fileID: 0} - Step_Btn: {fileID: 1289757197091827501} + Step_Tog: {fileID: 0} --- !u!1001 &2089264783224982108 PrefabInstance: m_ObjectHideFlags: 0 @@ -147,15 +147,72 @@ PrefabInstance: propertyPath: m_Name value: Toggle objectReference: {fileID: 0} + - target: {fileID: 1306552775554788202, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1306552775554788202, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1306552775554788202, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1306552775554788202, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1306552775554788202, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1306552775554788202, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1306552775554788202, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4998242105333091570, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4998242105333091570, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4998242105333091570, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4998242105333091570, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4998242105333091570, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4998242105333091570, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6182105416291993448, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3} propertyPath: Step_Text value: - objectReference: {fileID: 41023103306623673} + objectReference: {fileID: 4469221108332849687} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3} ---- !u!114 &41023103306623673 stripped +--- !u!224 &2198809122457756518 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 179355083306199354, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3} + m_PrefabInstance: {fileID: 2089264783224982108} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4469221108332849687 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2048910281777029349, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3} + m_CorrespondingSourceObject: {fileID: 2520700412311412811, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3} m_PrefabInstance: {fileID: 2089264783224982108} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -164,19 +221,3 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1289757197091827501 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 943693334150554993, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3} - m_PrefabInstance: {fileID: 2089264783224982108} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &2198809122457756518 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 179355083306199354, guid: 41e9498c7db6ded41b7066567ccd59a1, type: 3} - m_PrefabInstance: {fileID: 2089264783224982108} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/LiveScene.unity b/Assets/Scenes/LiveScene.unity index 3f60003..942453c 100644 --- a/Assets/Scenes/LiveScene.unity +++ b/Assets/Scenes/LiveScene.unity @@ -136,6 +136,67 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 0.0058172205, y: 0.005594401, z: 0.0036827647} m_Center: {x: 0.00017047202, y: 0.000058763555, z: 0.000005133452} +--- !u!1001 &8078010 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: b70e0e3f5c32d954e8cd07a71107960a, type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b70e0e3f5c32d954e8cd07a71107960a, type: 3} + propertyPath: m_LocalPosition.x + value: -28.88 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b70e0e3f5c32d954e8cd07a71107960a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b70e0e3f5c32d954e8cd07a71107960a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b70e0e3f5c32d954e8cd07a71107960a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b70e0e3f5c32d954e8cd07a71107960a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b70e0e3f5c32d954e8cd07a71107960a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b70e0e3f5c32d954e8cd07a71107960a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b70e0e3f5c32d954e8cd07a71107960a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b70e0e3f5c32d954e8cd07a71107960a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b70e0e3f5c32d954e8cd07a71107960a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -1534958224600865198, guid: b70e0e3f5c32d954e8cd07a71107960a, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: ba19f87343b4bf5479bb1bc3b59eaf19, type: 2} + - target: {fileID: 919132149155446097, guid: b70e0e3f5c32d954e8cd07a71107960a, type: 3} + propertyPath: m_Name + value: "\u5BB3\u866B\u9632\u6CBB" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b70e0e3f5c32d954e8cd07a71107960a, type: 3} --- !u!1 &73689985 GameObject: m_ObjectHideFlags: 0 @@ -604,6 +665,141 @@ MonoBehaviour: hitFxFadeOutDuration: 0.25 hitFxColor: {r: 1, g: 1, b: 1, a: 1} hitFxRadius: 0.5 +--- !u!1 &263582637 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 263582638} + - component: {fileID: 263582640} + - component: {fileID: 263582639} + m_Layer: 5 + m_Name: Text (TMP) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &263582638 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 263582637} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.000024487} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2117971064} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.000061853, y: -60.7} + m_SizeDelta: {x: 142.97, y: 51.93} + m_Pivot: {x: 1, y: 1} +--- !u!114 &263582639 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 263582637} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 13.5 + m_fontSizeBase: 13.5 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &263582640 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 263582637} + m_CullTransparentMesh: 1 --- !u!1 &272165213 GameObject: m_ObjectHideFlags: 0 @@ -695,8 +891,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 17 + m_Father: {fileID: 516323291} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &294730051 PrefabInstance: @@ -864,8 +1060,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 19 + m_Father: {fileID: 516323291} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &315754695 GameObject: @@ -1009,8 +1205,110 @@ Transform: - {fileID: 294730052} - {fileID: 589490384} m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &359673526 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 359673530} + - component: {fileID: 359673529} + - component: {fileID: 359673528} + - component: {fileID: 359673527} + m_Layer: 5 + m_Name: "\u8D2A\u591C\u86FE\u4ECB\u7ECD" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &359673527 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359673526} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &359673528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359673526} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!223 &359673529 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359673526} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &359673530 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359673526} + m_LocalRotation: {x: -0, y: -0.8608004, z: -0, w: 0.5089427} + m_LocalPosition: {x: 0, y: 0, z: 1.09} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2117971064} + m_Father: {fileID: 0} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: -118.813, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -30.167, y: 3.265} + m_SizeDelta: {x: 142.973, y: 112.8426} + m_Pivot: {x: 0.5, y: 0.5} --- !u!4 &381720349 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 99fa4c3183f234f428c0237cbc08df22, type: 3} @@ -1144,6 +1442,108 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 393553461} m_Mesh: {fileID: -4237342004306926581, guid: 6c7cbc6b210e1c7419bfdf5bcfb65606, type: 3} +--- !u!1 &426943867 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 426943871} + - component: {fileID: 426943870} + - component: {fileID: 426943869} + - component: {fileID: 426943868} + m_Layer: 5 + m_Name: "\u7389\u7C73\u879F\u4ECB\u7ECD " + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &426943868 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 426943867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &426943869 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 426943867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!223 &426943870 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 426943867} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &426943871 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 426943867} + m_LocalRotation: {x: -0, y: -0.24699543, z: -0, w: 0.9690167} + m_LocalPosition: {x: 0, y: 0, z: 0.032} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 834122782} + m_Father: {fileID: 0} + m_RootOrder: 18 + m_LocalEulerAnglesHint: {x: 0, y: -28.6, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -28.101, y: 2.809} + m_SizeDelta: {x: 142.973, y: 112.8426} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &464471369 PrefabInstance: m_ObjectHideFlags: 0 @@ -1594,14 +1994,49 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 509559512} - 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: - {fileID: 844396416} - m_Father: {fileID: 0} - m_RootOrder: 13 + m_Father: {fileID: 555685461} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &516323290 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 516323291} + m_Layer: 0 + m_Name: "\u5927\u68DA\u706F\u5149" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &516323291 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 516323290} + 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: 272165215} + - {fileID: 1306502434} + - {fileID: 296513974} + - {fileID: 579066719} + m_Father: {fileID: 1632480800} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &516522383 GameObject: @@ -2526,6 +2961,37 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 544144323} m_Mesh: {fileID: 7518002509562544373, guid: 6c7cbc6b210e1c7419bfdf5bcfb65606, type: 3} +--- !u!1 &551003926 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 551003927} + m_Layer: 0 + m_Name: "\u7389\u7C73\u879FPoint" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &551003927 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 551003926} + m_LocalRotation: {x: 0.10750668, y: -0.8876806, z: 0.26378575, w: 0.36177695} + m_LocalPosition: {x: -27.959332, y: 2.515, z: 0.505} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 15 + m_LocalEulerAnglesHint: {x: 33.1, y: -135.653, z: 0} --- !u!1 &555685460 GameObject: m_ObjectHideFlags: 0 @@ -2558,6 +3024,9 @@ Transform: - {fileID: 381720349} - {fileID: 464471374} - {fileID: 176841265} + - {fileID: 509559514} + - {fileID: 1288202041} + - {fileID: 2041719385} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3023,9 +3492,144 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 20 + m_Father: {fileID: 516323291} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &583586832 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 583586833} + - component: {fileID: 583586835} + - component: {fileID: 583586834} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &583586833 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 583586832} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00004172325} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2117971064} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.000030517578, y: -8.899998} + m_SizeDelta: {x: 65.69, y: 51.93} + m_Pivot: {x: 1, y: 1} +--- !u!114 &583586834 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 583586832} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 13.5 + m_fontSizeBase: 13.5 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &583586835 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 583586832} + m_CullTransparentMesh: 1 --- !u!1001 &589490383 PrefabInstance: m_ObjectHideFlags: 0 @@ -3191,6 +3795,141 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 603834562} m_Mesh: {fileID: 1315986640755213873, guid: 8f0e34bddc76ebe45b7955ad8b4cf4fb, type: 3} +--- !u!1 &622923309 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 622923310} + - component: {fileID: 622923312} + - component: {fileID: 622923311} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &622923310 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 622923309} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00004172325} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 834122782} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.000030517578, y: -8.899998} + m_SizeDelta: {x: 65.69, y: 51.93} + m_Pivot: {x: 1, y: 1} +--- !u!114 &622923311 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 622923309} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 13.5 + m_fontSizeBase: 13.5 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &622923312 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 622923309} + m_CullTransparentMesh: 1 --- !u!1 &636892784 GameObject: m_ObjectHideFlags: 0 @@ -3274,6 +4013,141 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 636892784} m_Mesh: {fileID: 5394307321372251602, guid: 8f0e34bddc76ebe45b7955ad8b4cf4fb, type: 3} +--- !u!1 &663959019 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 663959020} + - component: {fileID: 663959022} + - component: {fileID: 663959021} + m_Layer: 5 + m_Name: Text (TMP) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &663959020 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 663959019} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.000024487} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 834122782} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.000061035156, y: -60.7} + m_SizeDelta: {x: 142.97, y: 51.93} + m_Pivot: {x: 1, y: 1} +--- !u!114 &663959021 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 663959019} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 13.5 + m_fontSizeBase: 13.5 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &663959022 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 663959019} + m_CullTransparentMesh: 1 --- !u!1001 &666408816 PrefabInstance: m_ObjectHideFlags: 0 @@ -4269,6 +5143,85 @@ MonoBehaviour: hitFxFadeOutDuration: 0.25 hitFxColor: {r: 1, g: 1, b: 1, a: 1} hitFxRadius: 0.5 +--- !u!1 &834122781 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 834122782} + - component: {fileID: 834122784} + - component: {fileID: 834122783} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &834122782 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 834122781} + 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: 1038256040} + - {fileID: 622923310} + - {fileID: 663959020} + m_Father: {fileID: 426943871} + m_RootOrder: 0 + 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!114 &834122783 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 834122781} + 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: 21300000, guid: b9abcf3c3b2a5a64b876a85bf4aaacf3, type: 3} + 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 &834122784 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 834122781} + m_CullTransparentMesh: 1 --- !u!114 &836639306 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6206,6 +7159,82 @@ MonoBehaviour: hitFxFadeOutDuration: 0.25 hitFxColor: {r: 1, g: 1, b: 1, a: 1} hitFxRadius: 0.5 +--- !u!1 &1038256039 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1038256040} + - component: {fileID: 1038256042} + - component: {fileID: 1038256041} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1038256040 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1038256039} + 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: 834122782} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 15.4, y: -8.9} + m_SizeDelta: {x: 55.02, y: 51.93} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1038256041 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1038256039} + 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: 21300000, guid: 143af1190a62af74a807ce5259dc3a48, type: 3} + 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 &1038256042 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1038256039} + m_CullTransparentMesh: 1 --- !u!1 &1102949653 GameObject: m_ObjectHideFlags: 0 @@ -7095,14 +8124,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1288202039} - 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: - {fileID: 1687634120} - m_Father: {fileID: 0} - m_RootOrder: 14 + m_Father: {fileID: 555685461} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1306502432 GameObject: @@ -7195,8 +8224,76 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] + m_Father: {fileID: 516323291} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1446183976 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1446183979} + - component: {fileID: 1446183978} + - component: {fileID: 1446183977} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1446183977 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1446183976} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1446183978 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1446183976} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1446183979 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1446183976} + 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: 0} - m_RootOrder: 18 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1484776787 GameObject: @@ -7274,14 +8371,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1484776787} - m_LocalRotation: {x: -0.06956328, y: -0.9208235, z: 0.19320883, w: -0.33153504} - m_LocalPosition: {x: 70.74, y: 9.41, z: 4.255} + m_LocalRotation: {x: 0.10750668, y: -0.8876806, z: 0.26378575, w: 0.36177695} + m_LocalPosition: {x: -29.57, y: 3.006, z: 1.151} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 23.7, y: -219.602, z: 0} + m_LocalEulerAnglesHint: {x: 33.1, y: -135.653, z: 0} --- !u!1 &1486458850 GameObject: m_ObjectHideFlags: 0 @@ -8266,12 +9363,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1584651137} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.648827, y: 16.490767, z: 12.070108} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1584651139 MonoBehaviour: @@ -8323,6 +9420,8 @@ MonoBehaviour: - {fileID: 205664800} - {fileID: 542223485} - {fileID: 1037344551} + - {fileID: 551003927} + - {fileID: 1739541783} Seed_Obj: {fileID: 1221198028} water_Obj: {fileID: 1515684198} pesticide_Trans: {fileID: 672756066} @@ -9033,6 +10132,7 @@ Transform: - {fileID: 1636558445} - {fileID: 1285974577} - {fileID: 1861526680} + - {fileID: 516323291} m_Father: {fileID: 0} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -9462,6 +10562,37 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 99fa4c3183f234f428c0237cbc08df22, type: 3} +--- !u!1 &1739541782 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1739541783} + m_Layer: 0 + m_Name: "\u8D2A\u591C\u86FEPoint" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1739541783 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1739541782} + m_LocalRotation: {x: 0.10750668, y: -0.8876806, z: 0.26378575, w: 0.36177695} + m_LocalPosition: {x: -29.57, y: 3.006, z: 1.151} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 16 + m_LocalEulerAnglesHint: {x: 33.1, y: -135.653, z: 0} --- !u!1 &1753241722 GameObject: m_ObjectHideFlags: 0 @@ -9736,6 +10867,82 @@ Transform: m_Father: {fileID: 1632480800} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1921360562 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1921360563} + - component: {fileID: 1921360565} + - component: {fileID: 1921360564} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1921360563 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1921360562} + 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: 2117971064} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 15.4, y: -8.9} + m_SizeDelta: {x: 55.02, y: 51.93} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1921360564 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1921360562} + 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: 21300000, guid: 143af1190a62af74a807ce5259dc3a48, type: 3} + 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 &1921360565 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1921360562} + m_CullTransparentMesh: 1 --- !u!65 &1928131724 BoxCollider: m_ObjectHideFlags: 0 @@ -10363,15 +11570,94 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2041719383} - 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: - {fileID: 177275431} - m_Father: {fileID: 0} - m_RootOrder: 15 + m_Father: {fileID: 555685461} + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2117971063 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2117971064} + - component: {fileID: 2117971066} + - component: {fileID: 2117971065} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2117971064 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2117971063} + 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: 1921360563} + - {fileID: 583586833} + - {fileID: 263582638} + m_Father: {fileID: 359673530} + m_RootOrder: 0 + 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!114 &2117971065 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2117971063} + 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: 21300000, guid: b9abcf3c3b2a5a64b876a85bf4aaacf3, type: 3} + 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 &2117971066 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2117971063} + m_CullTransparentMesh: 1 --- !u!1 &2122065432 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UI/UIItem/UI_StepsPanelItem.cs b/Assets/Scripts/UI/UIItem/UI_StepsPanelItem.cs index 76c4caf..89b7523 100644 --- a/Assets/Scripts/UI/UIItem/UI_StepsPanelItem.cs +++ b/Assets/Scripts/UI/UIItem/UI_StepsPanelItem.cs @@ -16,7 +16,7 @@ public class UI_StepsPanelItem : BaseItem /// public Toggle Step_Tog; - private ToggleGroup toggleGroup; + public ToggleGroup toggleGroup; public void Init(string LabelDate) { diff --git a/Assets/Scripts/UI/UIPanel/UI_ContentPanel.cs b/Assets/Scripts/UI/UIPanel/UI_ContentPanel.cs index 3e48fc6..4a8162b 100644 --- a/Assets/Scripts/UI/UIPanel/UI_ContentPanel.cs +++ b/Assets/Scripts/UI/UIPanel/UI_ContentPanel.cs @@ -82,10 +82,6 @@ public class UI_ContentPanel : BasePanel } public void fizhi() { - //for (int i = 0; i < Tips.Count; i++) - //{ - // ContentText.text += Tips[i]; - //} ContentText.text = Tips; } /// diff --git a/Assets/Scripts/UI/UIPanel/UI_ExamPanel.cs b/Assets/Scripts/UI/UIPanel/UI_ExamPanel.cs index 4fd51a9..091c038 100644 --- a/Assets/Scripts/UI/UIPanel/UI_ExamPanel.cs +++ b/Assets/Scripts/UI/UIPanel/UI_ExamPanel.cs @@ -68,7 +68,7 @@ public class UI_ExamPanel : BasePanel } - public override async void ShowMe(int time = 0) + public override async void ShowMe(int time = 0) { base.ShowMe(); await ToolManager.CanvasFadeIn(canvasGroup, 0.5f); diff --git a/Assets/Scripts/UI/UIPanel/UI_StepsPanel.cs b/Assets/Scripts/UI/UIPanel/UI_StepsPanel.cs index 6417cea..0e5a12a 100644 --- a/Assets/Scripts/UI/UIPanel/UI_StepsPanel.cs +++ b/Assets/Scripts/UI/UIPanel/UI_StepsPanel.cs @@ -44,8 +44,9 @@ public class UI_StepsPanel : BasePanel var item = Instantiate(StepsItem, StepsContent); item.Init(pptFile.fileName); var buttonText = item.GetComponentInChildren(); - Toggle button = item.GetComponentInChildren(); - button.name = pptFile.fileName; + Toggle toggle = item.GetComponentInChildren(); + toggle.name = pptFile.fileName; + toggle.isOn = false; if (buttonText != null) { buttonText.text = $"{pptFile.fileName}"; @@ -58,12 +59,20 @@ public class UI_StepsPanel : BasePanel public override async void ShowMe(int time = 0) { base.ShowMe(); + await ToolManager.CanvasFadeIn(canvasGroup, 0.5f); } public override async void HideMe(int time = 0) { base.HideMe(); + Toggle[] toggles = StepsContent.GetComponentsInChildren(); + foreach (var toggle in toggles) + { + toggle.isOn = false; + } + ToggleGroup toggleGroup = StepsContent.GetComponent(); + toggleGroup.enabled = false; await ToolManager.CanvasFadeOut(canvasGroup, 0.5f); } protected override async void OnClick(string btnName) @@ -93,7 +102,6 @@ public class UI_StepsPanel : BasePanel Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.ΝΟ³΅, false); }); }); - }); break; default: diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index e255180..8aa924c 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,27 +6,30 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 5452075006075b5f540c5c77497706444f4e4d2b2d7e27677d2b4b30b5b8316d - flags: 0 - RecentlyUsedSceneGuid-1: - value: 5006505e5c0c0a5e0e0b5a2746220b44174e1d292d7b74617c2b196be0b66168 - flags: 0 - RecentlyUsedSceneGuid-2: - value: 5754060550000c5e59580a2348270d44434e1b782a7b7633747e1e30e4b5616b - flags: 0 - RecentlyUsedSceneGuid-3: - value: 0609045307065a5d5a0d0874407b5944124f1e72787b2465287e1f36b0b8316f - flags: 0 - RecentlyUsedSceneGuid-4: - value: 5400065054540b095f0b5c7511255b4447151e787a2b253628794c37e7b6676e - flags: 0 - RecentlyUsedSceneGuid-5: - value: 0004025352565f0d0c0d5827167b09444f4f1c282a7877677b704536b6b36c6d - flags: 0 - RecentlyUsedSceneGuid-6: value: 55085253045108025c56097646265e44124f4f7b7e7a76312c2f4960e6b1363d flags: 0 + RecentlyUsedSceneGuid-1: + value: 5400065054540b095f0b5c7511255b4447151e787a2b253628794c37e7b6676e + flags: 0 + RecentlyUsedSceneGuid-2: + value: 0004025352565f0d0c0d5827167b09444f4f1c282a7877677b704536b6b36c6d + flags: 0 + RecentlyUsedSceneGuid-3: + value: 5452075006075b5f540c5c77497706444f4e4d2b2d7e27677d2b4b30b5b8316d + flags: 0 + RecentlyUsedSceneGuid-4: + value: 0609045307065a5d5a0d0874407b5944124f1e72787b2465287e1f36b0b8316f + flags: 0 + RecentlyUsedSceneGuid-5: + value: 5006505e5c0c0a5e0e0b5a2746220b44174e1d292d7b74617c2b196be0b66168 + flags: 0 + RecentlyUsedSceneGuid-6: + value: 5754060550000c5e59580a2348270d44434e1b782a7b7633747e1e30e4b5616b + flags: 0 RecentlyUsedSceneGuid-7: + value: 5050060057055a0a55575f761576594442151e7e7c79233429784f32b2e3673b + flags: 0 + RecentlyUsedSceneGuid-8: value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 vcSharedLogLevel: diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 0d137dd..af9ea3b 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -14,9 +14,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 3} - - {fileID: 8} - - {fileID: 10} - - {fileID: 12} + - {fileID: 9} + - {fileID: 11} + - {fileID: 13} m_Position: serializedVersion: 2 x: 0 @@ -26,7 +26,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 38455 + controlID: 117 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -48,9 +48,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 2560 - y: 595 - width: 1085 - height: 404 + y: 787 + width: 957 + height: 212 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -98,23 +98,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1085 - height: 383 - m_Scale: {x: 0.35462964, y: 0.35462964} - m_Translation: {x: 542.5, y: 191.5} + width: 957 + height: 191 + m_Scale: {x: 0.17685184, y: 0.17685185} + m_Translation: {x: 478.49997, y: 95.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1529.765 + x: -2705.6545 y: -540 - width: 3059.53 + width: 5411.309 height: 1080 m_MinimalGUI: 1 - m_defaultScale: 0.35462964 - m_LastWindowPixelSize: {x: 1085, y: 404} + m_defaultScale: 0.17685185 + m_LastWindowPixelSize: {x: 957, y: 212} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1086 + width: 958 height: 947 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 38456 + controlID: 118 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -162,16 +162,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1086 - height: 522 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + width: 958 + height: 714 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 5} m_Panes: - {fileID: 5} - {fileID: 6} m_Selected: 0 - m_LastSelected: 1 + m_LastSelected: 0 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -194,8 +194,8 @@ MonoBehaviour: serializedVersion: 2 x: 2560 y: 73 - width: 1085 - height: 501 + width: 957 + height: 693 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -271,7 +271,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 67.5, y: 86} + snapOffset: {x: 67.5, y: 11} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Orientation @@ -431,9 +431,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0.413744, y: 1.5585266, z: -8.855864} + m_Target: {x: -80.25846, y: 1.4750866, z: 13.238115} speed: 2 - m_Value: {x: 0.413744, y: 1.5585266, z: -8.855864} + m_Value: {x: -80.25846, y: 1.4750866, z: 13.238115} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -462,9 +462,9 @@ MonoBehaviour: m_Size: {x: 0, y: 0} yGrid: m_Fade: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -476,24 +476,24 @@ MonoBehaviour: m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} - m_ShowGrid: 1 + m_ShowGrid: 0 m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.043443494, y: 0.41116905, z: 0.019712692, w: 0.9103126} + m_Target: {x: 0.014600347, y: -0.698146, z: 0.015162865, w: 0.7156731} speed: 2 - m_Value: {x: -0.04344339, y: 0.41116807, z: 0.019712646, w: 0.91031045} + m_Value: {x: 0.014577303, y: -0.6992051, z: 0.015184453, w: 0.7146112} m_Size: - m_Target: 3.21372 + m_Target: 4.3437514 speed: 2 - m_Value: 3.21372 + m_Value: 4.548431 m_Ortho: m_Target: 0 speed: 2 m_Value: 0 m_CameraSettings: - m_Speed: 1 - m_SpeedNormalized: 0.5 + m_Speed: 0.9652 + m_SpeedNormalized: 0.48 m_SpeedMin: 0.01 m_SpeedMax: 2 m_EasingEnabled: 1 @@ -504,7 +504,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.043443494, y: 0.41116905, z: 0.019712692, w: 0.9103126} + m_LastSceneViewRotation: {x: 0.05496371, y: -0.9363174, z: 0.17352644, w: 0.30034402} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -573,17 +573,56 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 522 - width: 1086 - height: 425 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + y: 714 + width: 958 + height: 233 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} m_Panes: - {fileID: 2} + - {fileID: 8} m_Selected: 0 - m_LastSelected: 0 + m_LastSelected: 1 --- !u!114 &8 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f817a38900380be47942905e17e7d39b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Timeline + m_Image: {fileID: -9173288242387172643, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 2560 + y: 609 + width: 881 + height: 390 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_Preferences: + editType: 0 + timeReferenceMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_SequenceHierarchy: {fileID: 0} + m_SequencePath: + m_SelectionRoot: 0 + m_SubElements: [] +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -598,18 +637,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1086 + x: 958 y: 0 - width: 246 + width: 197 height: 947 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 9} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 10} m_Panes: - - {fileID: 9} + - {fileID: 10} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &9 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -629,9 +668,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 3646 + x: 3518 y: 73 - width: 244 + width: 195 height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -641,9 +680,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 225b0000 m_LastClickedID: 0 - m_ExpandedIDs: d007fdff7208fdff7608fdff7e08fdff8808fdffe483fdff608efdff40abfdff72acfdff82acfdff84acfdff98c4fdff84c5fdffd4c5fdffd8c5fdffdcc5fdffe0c5fdffeac5fdff9cc6fdfff6dbfdff1c39feff2639feffe26afeffb074fefffe74feffdc8dfeff268ffeff5695feff6095feff6a95feff9295feff9895fefffa9cfefffe9cfeff0c9dfeff72a6feff7ca6feff86a6feffaea6feffb4a6feff1aaefeff1eaefeff22aefeff2caefefff4ffffff88d0000042d100002ad80000e80d0100 + m_ExpandedIDs: 6a9effff36bdffff38bdffff1cd9ffff26d9ffff54e0ffff70edffffbcedffff0ceeffff5ceeffffc0eeffff38fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -659,7 +698,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 8} + m_ClientGUIView: {fileID: 9} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -667,7 +706,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: f1ab93efe301f1a4dac22a3d96f2c5b8 ---- !u!114 &10 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -682,18 +721,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1332 + x: 1155 y: 0 - width: 239 + width: 265 height: 947 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} - m_ActualView: {fileID: 11} + m_ActualView: {fileID: 12} m_Panes: - - {fileID: 11} + - {fileID: 12} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &11 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -713,9 +752,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 3892 + x: 3715 y: 73 - width: 237 + width: 263 height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -733,7 +772,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Anim/TSQ + - Assets/Scenes m_Globs: [] m_OriginalText: m_FilterByTypeIntersection: 0 @@ -749,7 +788,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: be5a0000 m_LastClickedID: 23230 - m_ExpandedIDs: ffffffff00000000be5a0000c05a0000c25a0000c45a0000c65a0000c85a0000ce5a0000d45a0000d65a0000da5a0000dc5a0000de5a0000e05a0000545b0000565b0000585b00006e5b0000705b0000725b0000a45b0000b85b0000c25b0000385e0000345f0000586800002c7b0000e2d200002ee8000034e8000038e800003ae800003ee80000180a01001a0a010000ca9a3b + m_ExpandedIDs: 00000000665a0000685a00006a5a00006c5a00006e5a0000705a0000725a0000745a0000765a0000785a00007a5a00007c5a00007e5a0000805a0000825a0000845a0000865a0000885a00008a5a00008c5a00008e5a0000905a0000925a0000945a0000965a0000985a00009a5a00009c5a00009e5a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -774,10 +813,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 672} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000be5a0000c05a0000c25a0000c45a0000c65a0000c85a0000ce5a0000d45a0000d65a0000da5a0000dc5a0000de5a0000e05a0000545b0000565b0000585b00006e5b0000705b0000725b0000a45b0000b85b0000c25b0000385e0000345f0000586800002c7b0000e2d200002ee8000034e8000038e800003ae800003ee80000180a01001a0a010000ca9a3b + scrollPos: {x: 0, y: 260} + m_SelectedIDs: 225b0000 + m_LastClickedID: 23330 + m_ExpandedIDs: ffffffff00000000665a0000685a00006a5a00006c5a00006e5a0000705a0000725a0000745a0000765a0000785a00007a5a00007c5a00007e5a0000805a0000825a0000845a0000865a0000885a00008a5a00008c5a00008e5a0000905a0000925a0000945a0000965a0000985a00009a5a00009c5a00009e5a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -793,7 +832,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 11} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -802,8 +841,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: 225b0000 + m_LastClickedInstanceID: 23330 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: m_RenameOverlay: @@ -821,7 +860,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 11} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -833,7 +872,7 @@ MonoBehaviour: m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 115 ---- !u!114 &12 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -848,18 +887,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1571 + x: 1420 y: 0 - width: 349 + width: 500 height: 947 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 13} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &13 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -879,9 +918,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 4131 + x: 3980 y: 73 - width: 348 + width: 499 height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -891,7 +930,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: -160 + m_CachedPref: -300 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index ed33773..70f43aa 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -14,69 +14,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 0 + x: 2560 y: 43 width: 1920 - height: 989 + height: 997 m_ShowMode: 4 m_Title: Project - m_RootView: {fileID: 4} - m_MinSize: {x: 875, y: 300} + m_RootView: {fileID: 2} + m_MinSize: {x: 875, y: 492} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 --- !u!114 &2 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 832 - width: 1003 - height: 107 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 19} - m_Panes: - - {fileID: 19} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneHierarchyWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 373 - height: 939 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 20} - m_Panes: - - {fileID: 20} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -89,22 +37,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: + - {fileID: 3} - {fileID: 5} - - {fileID: 6} - - {fileID: 7} + - {fileID: 4} m_Position: serializedVersion: 2 x: 0 y: 0 width: 1920 - height: 989 + height: 997 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &5 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -126,34 +74,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &6 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 3} - - {fileID: 8} - - {fileID: 9} - - {fileID: 10} - m_Position: - serializedVersion: 2 - x: 0 - y: 30 - width: 1920 - height: 939 - m_MinSize: {x: 400, y: 300} - m_MaxSize: {x: 32384, y: 24288} - vertical: 0 - controlID: 63 ---- !u!114 &7 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -169,12 +90,12 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 969 + y: 977 width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &8 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -187,20 +108,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: + - {fileID: 6} + - {fileID: 9} + - {fileID: 10} - {fileID: 11} - - {fileID: 12} - - {fileID: 2} m_Position: serializedVersion: 2 - x: 373 - y: 0 - width: 1003 - height: 939 - m_MinSize: {x: 100, y: 300} - m_MaxSize: {x: 8096, y: 24288} - vertical: 1 - controlID: 21 ---- !u!114 &9 + x: 0 + y: 30 + width: 1920 + height: 947 + m_MinSize: {x: 400, y: 200} + m_MaxSize: {x: 32384, y: 16192} + vertical: 0 + controlID: 133 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -209,51 +131,23 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_Children: [] + m_Children: + - {fileID: 7} + - {fileID: 8} m_Position: serializedVersion: 2 - x: 1376 + x: 0 y: 0 - width: 210 - height: 939 - m_MinSize: {x: 232, y: 271} - m_MaxSize: {x: 10002, y: 10021} - m_ActualView: {fileID: 22} - m_Panes: - - {fileID: 22} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &10 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: InspectorWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 1586 - y: 0 - width: 334 - height: 939 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 21} - m_Panes: - - {fileID: 21} - - {fileID: 17} - m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &11 + width: 958 + height: 947 + m_MinSize: {x: 100, y: 200} + m_MaxSize: {x: 8096, y: 16192} + vertical: 1 + controlID: 134 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -270,18 +164,17 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1003 - height: 614 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 14} + width: 958 + height: 310 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 14} - - {fileID: 23} - {fileID: 13} + - {fileID: 14} m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &12 + m_LastSelected: 0 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -291,24 +184,194 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AnimationWindow + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 614 - width: 1003 - height: 218 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 15} + y: 310 + width: 958 + height: 637 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 12} + m_Panes: + - {fileID: 12} + - {fileID: 15} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &9 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 958 + y: 0 + width: 197 + height: 947 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 16} + m_Panes: + - {fileID: 16} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &10 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1155 + y: 0 + width: 265 + height: 947 + m_MinSize: {x: 232, y: 271} + m_MaxSize: {x: 10002, y: 10021} + m_ActualView: {fileID: 17} + m_Panes: + - {fileID: 17} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &11 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1420 + y: 0 + width: 500 + height: 947 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} - - {fileID: 16} - - {fileID: 15} - m_Selected: 2 - m_LastSelected: 1 + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 2560 + y: 383 + width: 957 + height: 616 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1920, y: 1080} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -960 + m_HBaseRangeMax: 960 + m_VBaseRangeMin: -540 + m_VBaseRangeMax: 540 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 957 + height: 595 + m_Scale: {x: 0.4984375, y: 0.49843746} + m_Translation: {x: 478.5, y: 297.5} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -960 + y: -596.86523 + width: 1920 + height: 1193.7305 + m_MinimalGUI: 1 + m_defaultScale: 0.4984375 + m_LastWindowPixelSize: {x: 957, y: 616} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -317,11 +380,11 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 + m_EditorHideFlags: 1 m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} + m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene @@ -329,349 +392,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 373 + x: 2560 y: 73 - width: 1001 - height: 593 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: - - dockPosition: 0 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Tool Settings - index: 0 - layout: 1 - - dockPosition: 0 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 0, y: 149} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: unity-grid-and-snap-toolbar - index: 1 - layout: 1 - - dockPosition: 1 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: unity-scene-view-toolbar - index: 0 - layout: 1 - - dockPosition: 1 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: unity-search-toolbar - index: 1 - layout: 1 - - dockPosition: 0 - containerId: overlay-container--left - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: unity-transform-toolbar - index: 0 - layout: 2 - - dockPosition: 0 - containerId: overlay-container--left - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 0, y: 197} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: unity-component-tools - index: 1 - layout: 2 - - dockPosition: 0 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 67.5, y: 86} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Orientation - index: 0 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Light Settings - index: 0 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Camera - index: 1 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Cloth Constraints - index: 2 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Cloth Collisions - index: 3 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Navmesh Display - index: 4 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Agent Display - index: 5 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Obstacle Display - index: 6 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Occlusion Culling - index: 7 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Physics Debugger - index: 8 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Scene Visibility - index: 9 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Particles - index: 10 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Tilemap - index: 11 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Tilemap Palette Helper - index: 12 - layout: 4 - m_OverlaysVisible: 1 - m_WindowGUID: cfe772a39025f364586f97effaab0243 - m_Gizmos: 1 - m_OverrideSceneCullingMask: 6917529027641081856 - m_SceneIsLit: 1 - m_SceneLighting: 1 - m_2DMode: 0 - m_isRotationLocked: 0 - m_PlayAudio: 0 - m_AudioPlay: 0 - m_Position: - m_Target: {x: 29.481384, y: -1.9188652, z: -8.759298} - speed: 2 - m_Value: {x: 29.481384, y: -1.9188652, z: -8.759298} - m_RenderMode: 0 - m_CameraMode: - drawMode: 0 - name: Shaded - section: Shading Mode - m_ValidateTrueMetals: 0 - m_DoValidateTrueMetals: 0 - m_ExposureSliderValue: 0 - m_SceneViewState: - m_AlwaysRefresh: 0 - showFog: 1 - showSkybox: 1 - showFlares: 1 - showImageEffects: 1 - showParticleSystems: 1 - showVisualEffectGraphs: 1 - m_FxEnabled: 1 - m_Grid: - xGrid: - m_Fade: - m_Target: 0 - speed: 2 - m_Value: 0 - m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} - m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0} - yGrid: - m_Fade: - m_Target: 0 - speed: 2 - m_Value: 0 - m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} - m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 1, y: 1} - zGrid: - m_Fade: - m_Target: 0 - speed: 2 - m_Value: 0 - m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} - m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0} - m_ShowGrid: 0 - m_GridAxis: 1 - m_gridOpacity: 0.5 - m_Rotation: - m_Target: {x: 0.18494588, y: 0.6188209, z: -0.1530068, w: 0.74797374} - speed: 2 - m_Value: {x: 0.18471432, y: 0.619936, z: -0.15328252, w: 0.7470372} - m_Size: - m_Target: 10 - speed: 2 - m_Value: 10 - m_Ortho: - m_Target: 0 - speed: 2 - m_Value: 0 - m_CameraSettings: - m_Speed: 1.4030006 - m_SpeedNormalized: 0.7000003 - m_SpeedMin: 0.01 - m_SpeedMax: 2 - m_EasingEnabled: 1 - m_EasingDuration: 0.4 - m_AccelerationEnabled: 1 - m_FieldOfViewHorizontalOrVertical: 60 - m_NearClip: 0.03 - m_FarClip: 10000 - m_DynamicClip: 1 - m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0} - m_LastSceneViewOrtho: 0 - m_ReplacementShader: {fileID: 0} - m_ReplacementString: - m_SceneVisActive: 1 - m_LastLockedObject: {fileID: 0} - m_ViewIsLockedToObject: 0 ---- !u!114 &14 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Scene - m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 373 - y: 73 - width: 1001 - height: 593 + width: 957 + height: 289 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -683,7 +407,7 @@ MonoBehaviour: displayed: 1 snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: -101, y: -26} - snapCorner: 0 + snapCorner: 3 id: Tool Settings index: 0 layout: 1 @@ -692,9 +416,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 149} + snapOffset: {x: -141, y: 149} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 + snapCorner: 1 id: unity-grid-and-snap-toolbar index: 1 layout: 1 @@ -703,7 +427,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 0} + snapOffset: {x: 0, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-scene-view-toolbar @@ -713,10 +437,10 @@ MonoBehaviour: containerId: overlay-toolbar__top floating: 0 collapsed: 0 - displayed: 1 + displayed: 0 snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 + snapCorner: 1 id: unity-search-toolbar index: 1 layout: 1 @@ -747,7 +471,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 67.5, y: 86} + snapOffset: {x: 67.5, y: 11} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Orientation @@ -896,8 +620,8 @@ MonoBehaviour: id: Scene View/Tilemap Palette Helper index: 12 layout: 4 - m_OverlaysVisible: 0 - m_WindowGUID: aa1269d31259c5948915ea54a1e67888 + m_OverlaysVisible: 1 + m_WindowGUID: a9697ed3a2d206a4c994710037da5d8b m_Gizmos: 0 m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 @@ -907,9 +631,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 13.9024935, y: 6.715089, z: -34.758972} + m_Target: {x: -30.334602, y: 2.3952053, z: -0.3976792} speed: 2 - m_Value: {x: 13.9024935, y: 6.715089, z: -34.758972} + m_Value: {x: -30.334602, y: 2.3952053, z: -0.3976792} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -951,25 +675,25 @@ MonoBehaviour: m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0} + m_Size: {x: 1, y: 1} m_ShowGrid: 0 m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.054095294, y: -0.8359363, z: 0.0837865, w: 0.5397059} + m_Target: {x: 0.029119099, y: -0.9489466, z: 0.09449895, w: 0.29963443} speed: 2 - m_Value: {x: 0.054904267, y: -0.835802, z: 0.08503954, w: 0.5396192} + m_Value: {x: 0.029118247, y: -0.9489189, z: 0.09449619, w: 0.29962566} m_Size: - m_Target: 0.8660254 + m_Target: 2.251077 speed: 2 - m_Value: 0.86602676 + m_Value: 2.251077 m_Ortho: m_Target: 0 speed: 2 m_Value: 0 m_CameraSettings: - m_Speed: 1.4030006 - m_SpeedNormalized: 0.7000003 + m_Speed: 0.9652 + m_SpeedNormalized: 0.48 m_SpeedMin: 0.01 m_SpeedMax: 2 m_EasingEnabled: 1 @@ -980,113 +704,14 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0} + m_LastSceneViewRotation: {x: 0.05496371, y: -0.9363174, z: 0.17352644, w: 0.30034402} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: - m_SceneVisActive: 0 + m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &15 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Animation - m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 373 - y: 687 - width: 1001 - height: 197 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_LockTracker: - m_IsLocked: 0 - m_LastSelectedObjectID: -15112 ---- !u!114 &16 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f817a38900380be47942905e17e7d39b, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Timeline - m_Image: {fileID: -9173288242387172643, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 374 - y: 687 - width: 1001 - height: 197 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_Preferences: - editType: 0 - timeReferenceMode: 0 - m_LockTracker: - m_IsLocked: 0 - m_SequenceHierarchy: {fileID: 0} - m_SequencePath: - m_SelectionRoot: 0 - m_SubElements: [] ---- !u!114 &17 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12079, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 390, y: 390} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Lighting - m_Image: {fileID: -1347227620855488341, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 1570 - y: 73 - width: 349 - height: 918 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 ---- !u!114 &18 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1106,256 +731,33 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 374 - y: 687 - width: 1001 - height: 197 + x: 2560 + y: 73 + width: 1085 + height: 548 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 m_ViewTransforms: - m_KeySerializationHelper: - - {fileID: 1116224761700351988, guid: bc4a1baf496126b4dbc33b44615fb79f, type: 2} - - {fileID: -8443403702839426612, guid: b736582341c88c64b9a2f0471deaabde, type: 2} - - {fileID: 184743242595087612, guid: c06c7f8220f87544895f1e8546f4aed3, type: 2} - - {fileID: 3053574834037254230, guid: 80a85ff36e1ce304e9fb723bb3cfa0e1, type: 2} - - {fileID: 6146848380896332206, guid: 9b6537c0d8acea548b1d82dd445e1b9b, type: 2} - - {fileID: 300727828917886678, guid: 5b98460fef1600d44acf2a628c2b25c6, type: 2} - - {fileID: -2083348748338532648, guid: 63e8b684af68c434ebda8d386f9ef3e3, type: 2} - - {fileID: -6188909809408964177, guid: a995702527ea10f4db0f7e22752a8d7c, type: 2} - - {fileID: 354430940877373113, guid: bcff2bca5988b9e4e8e5c3c14e09a942, type: 2} - - {fileID: 4908939147606837390, guid: da601396f79dbe84693f5060ff9f7b7c, type: 2} - - {fileID: 4908939147606837390, guid: 62d35eb4ceb6da249a6df97dc0e3114f, type: 2} - - {fileID: 6974260988104824280, guid: 5581d58e6a1b3b543899fd7f0902fcb4, type: 2} - - {fileID: 5503625077538184191, guid: a02dae12a36473947935ffbf52df1f83, type: 2} - m_ValueSerializationHelper: - - e00: 0.6863158 - e01: 0 - e02: 0 - e03: -19.315796 - e10: 0 - e11: 0.6863158 - e12: 0 - e13: 86.23158 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.3727076 - e01: 0 - e02: 0 - e03: 101.32851 - e10: 0 - e11: 0.3727076 - e12: 0 - e13: 40.63971 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.47368422 - e01: 0 - e02: 0 - e03: 48.31578 - e10: 0 - e11: 0.47368422 - e12: 0 - e13: 5.526314 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.33333334 - e01: 0 - e02: 0 - e03: 122 - e10: 0 - e11: 0.33333334 - e12: 0 - e13: 25 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.6863158 - e01: 0 - e02: 0 - e03: -19.315796 - e10: 0 - e11: 0.6863158 - e12: 0 - e13: 42.300003 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.6863158 - e01: 0 - e02: 0 - e03: -19.315796 - e10: 0 - e11: 0.6863158 - e12: 0 - e13: 89.66316 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.6863158 - e01: 0 - e02: 0 - e03: -19.315796 - e10: 0 - e11: 0.6863158 - e12: 0 - e13: 82.8 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.67473686 - e01: 0 - e02: 0 - e03: -18.736847 - e10: 0 - e11: 0.67473686 - e12: 0 - e13: 134.07437 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.67473686 - e01: 0 - e02: 0 - e03: -18.736847 - e10: 0 - e11: 0.67473686 - e12: 0 - e13: 14.900002 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.6863158 - e01: 0 - e02: 0 - e03: -19.315796 - e10: 0 - e11: 0.6863158 - e12: 0 - e13: 52.800003 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.6863158 - e01: 0 - e02: 0 - e03: -19.315796 - e10: 0 - e11: 0.6863158 - e12: 0 - e13: 110.3 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.67473686 - e01: 0 - e02: 0 - e03: -18.736847 - e10: 0 - e11: 0.67473686 - e12: 0 - e13: 4.778946 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.67473686 - e01: 0 - e02: 0 - e03: -18.736847 - e10: 0 - e11: 0.67473686 - e12: 0 - e13: 41.647366 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 + m_KeySerializationHelper: [] + m_ValueSerializationHelper: [] m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 5581d58e6a1b3b543899fd7f0902fcb4, type: 2} - m_BreadCrumbs: - - m_Target: {fileID: 6974260988104824280, guid: 5581d58e6a1b3b543899fd7f0902fcb4, type: 2} - m_ScrollPosition: {x: 0, y: 0} + m_AnimatorController: {fileID: 9100000, guid: 916de72a09b43814097827f217505fbb, type: 2} + m_BreadCrumbs: [] stateMachineGraph: {fileID: 0} stateMachineGraphGUI: {fileID: 0} blendTreeGraph: {fileID: 0} blendTreeGraphGUI: {fileID: 0} - m_AutoLiveLink: 0 + m_AutoLiveLink: 1 m_MiniTool: 0 m_LockTracker: m_IsLocked: 0 m_CurrentEditor: 1 m_LayerEditor: - m_SelectedLayerIndex: 0 ---- !u!114 &19 + m_SelectedLayerIndex: -1 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1364,27 +766,36 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 11500000, guid: f817a38900380be47942905e17e7d39b, type: 3} m_Name: m_EditorClassIdentifier: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Console - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Timeline + m_Image: {fileID: -9173288242387172643, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 373 - y: 905 - width: 1001 - height: 86 + x: 2560 + y: 609 + width: 881 + height: 390 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &20 + m_Preferences: + editType: 0 + timeReferenceMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_SequenceHierarchy: {fileID: 0} + m_SequencePath: + m_SelectionRoot: 0 + m_SubElements: [] +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1404,10 +815,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 + x: 3518 y: 73 - width: 372 - height: 918 + width: 195 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1416,9 +827,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: fe610000 + m_SelectedIDs: 18630000 m_LastClickedID: 0 - m_ExpandedIDs: 7277fdff0664feff1c8affff3093fffff8c4ffff06cfffff4cf3ffff88f3ffff72f4ffffc0f7ffff3afbffff245a0000905a0000545b0000b45b0000 + m_ExpandedIDs: 48dbffff98dbfffff0dbffff40dcffffa0dcfffff0dcffff1ee3ffff58f0ffff7af2ffffd2f2ffff38fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1434,57 +845,15 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 3} + m_ClientGUIView: {fileID: 9} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 m_LockTracker: m_IsLocked: 0 m_CurrentSortingName: TransformSorting - m_WindowGUID: 013f56a3e77366a418f931e873d55dcd ---- !u!114 &21 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 1586 - y: 73 - width: 333 - height: 918 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_ObjectsLockedBeforeSerialization: [] - m_InstanceIDsLockedBeforeSerialization: - m_PreviewResizer: - m_CachedPref: 373 - m_ControlHash: -371814159 - m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 - m_GlobalObjectId: - m_InspectorMode: 0 - m_LockTracker: - m_IsLocked: 0 - m_PreviewWindow: {fileID: 0} ---- !u!114 &22 + m_WindowGUID: f1ab93efe301f1a4dac22a3d96f2c5b8 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1504,10 +873,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1376 + x: 3715 y: 73 - width: 208 - height: 918 + width: 263 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1522,24 +891,25 @@ MonoBehaviour: m_SceneHandles: m_ShowAllHits: 0 m_SkipHidden: 0 - m_SearchArea: 0 + m_SearchArea: 1 m_Folders: - - Assets + - Assets/Scenes m_Globs: [] m_OriginalText: m_FilterByTypeIntersection: 0 m_ViewMode: 0 - m_StartGridSize: 64 - m_LastFolders: [] + m_StartGridSize: 16 + m_LastFolders: + - Assets m_LastFoldersGridSize: -1 - m_LastProjectPath: D:\WangYang\CultivationOfBrewing + m_LastProjectPath: "E:\\\u9676\u82CF\u59472025\u9879\u76EE\u6587\u4EF6\u5939\\CultivationOfBrewing" m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: dcd20000 - m_LastClickedID: 53980 - m_ExpandedIDs: 00000000fe61000000620000026200000462000006620000086200000a6200000c6200000e62000010620000126200001462000016620000186200001a620000 + m_SelectedIDs: be5a0000 + m_LastClickedID: 23230 + m_ExpandedIDs: 00000000826200008462000086620000886200008a6200008c6200008e62000090620000926200009462000096620000986200009a6200009c6200009e620000a0620000a2620000a4620000a6620000a8620000aa620000ac620000ae620000b0620000b2620000b4620000b6620000b8620000ba620000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1564,10 +934,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 0} + scrollPos: {x: 0, y: 260} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000ea5b0000fe61000000620000026200000462000006620000086200000a6200000c6200000e620000106200001262000014620000166200001a620000be620000c6620000d0620000d4620000 + m_ExpandedIDs: ffffffff00000000826200008462000086620000886200008a6200008c6200008e62000090620000926200009462000096620000986200009a6200009c6200009e620000a0620000a2620000a4620000a6620000a8620000aa620000ac620000ae620000b0620000b2620000b4620000b6620000b8620000ba620000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1583,7 +953,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 9} + m_ClientGUIView: {fileID: 10} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -1611,7 +981,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 10} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -1620,10 +990,10 @@ MonoBehaviour: m_ResourceFile: m_NewAssetIndexInList: -1 m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 64 + m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 115 ---- !u!114 &23 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1632,87 +1002,36 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} + m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Inspector + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 373 + x: 3980 y: 73 - width: 1001 - height: 593 + width: 499 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 - m_SerializedViewNames: [] - m_SerializedViewValues: [] - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1001, y: 563} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 01000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -500.5 - m_HBaseRangeMax: 500.5 - m_VBaseRangeMin: -281.5 - m_VBaseRangeMax: 281.5 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 1001 - height: 572 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 500.5, y: 286} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -500.5 - y: -286 - width: 1001 - height: 572 - m_MinimalGUI: 1 - m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1001, y: 593} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: -300 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0}