diff --git a/Assets/GameAssets/Models/泵房/Materials/jian.mat b/Assets/GameAssets/Models/泵房/Materials/jian.mat index badb8bc..c649e2c 100644 --- a/Assets/GameAssets/Models/泵房/Materials/jian.mat +++ b/Assets/GameAssets/Models/泵房/Materials/jian.mat @@ -20,6 +20,10 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _ArrowTex: + m_Texture: {fileID: 2800000, guid: 6fc6f354c2d17de4ca40c37df79fca39, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -62,6 +66,7 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _FlowSpeed: 1.2 - _GlossMapScale: 1 - _Glossiness: 0.25123277 - _GlossyReflections: 1 @@ -75,6 +80,9 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: + - _ArrowColor: {r: 1, g: 0, b: 0, a: 0.8} + - _ArrowScale: {r: 1, g: 1, b: 0, a: 1} - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WaterColor: {r: 1, g: 0.983102, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Models/空压机/空压机房2.fbx b/Assets/GameAssets/Models/空压机/空压机房2.fbx index 25124ac..89eb49a 100644 Binary files a/Assets/GameAssets/Models/空压机/空压机房2.fbx and b/Assets/GameAssets/Models/空压机/空压机房2.fbx differ diff --git a/Assets/GameAssets/Models/空调/空调组2.fbx b/Assets/GameAssets/Models/空调/空调组2.fbx index 0aa7aef..142248a 100644 Binary files a/Assets/GameAssets/Models/空调/空调组2.fbx and b/Assets/GameAssets/Models/空调/空调组2.fbx differ diff --git a/Assets/Resources/CZ/泵房/Custom_PipelineFlow_L 1.mat b/Assets/Resources/CZ/泵房/Custom_PipelineFlow_L 1.mat index dfa34a5..7ae055a 100644 --- a/Assets/Resources/CZ/泵房/Custom_PipelineFlow_L 1.mat +++ b/Assets/Resources/CZ/泵房/Custom_PipelineFlow_L 1.mat @@ -32,7 +32,7 @@ Material: m_Floats: - _FlowSpeed: 1.18 m_Colors: - - _ArrowColor: {r: 0.291, g: 1, b: 0.3354863, a: 0.8} + - _ArrowColor: {r: 0.29099998, g: 1, b: 0.33548623, a: 1} - _ArrowScale: {r: 1, g: 1, b: 0, a: 1} - _WaterColor: {r: 0.08627451, g: 0.7294118, b: 0.72156864, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Scenes/泵机.unity b/Assets/Scenes/泵机.unity index 8746258..e8c5080 100644 --- a/Assets/Scenes/泵机.unity +++ b/Assets/Scenes/泵机.unity @@ -788,6 +788,10 @@ PrefabInstance: propertyPath: m_Name value: "\u6CF5\u623F" objectReference: {fileID: 0} + - target: {fileID: 8264066327706692787, guid: bf9669f3a63916845baaba71da888c52, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: c93d29e23599e4641977dd338230aef1, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bf9669f3a63916845baaba71da888c52, type: 3} --- !u!1001 &7753502342142483282 diff --git a/Assets/Scenes/热成像测试 1.unity b/Assets/Scenes/热成像测试 1.unity index 2a5d862..27a05ea 100644 --- a/Assets/Scenes/热成像测试 1.unity +++ b/Assets/Scenes/热成像测试 1.unity @@ -288,22 +288,82 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} + - target: {fileID: -7646739597698752262, guid: 5b2ebaebe78c9ed4e8ee0fcc4f7bf342, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f0d401cd3e3c9174dad27a5b8c4e9dcb, type: 2} + - target: {fileID: -7491194682770035489, guid: 5b2ebaebe78c9ed4e8ee0fcc4f7bf342, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: c93d29e23599e4641977dd338230aef1, type: 2} + - target: {fileID: -4568028141214308446, guid: 5b2ebaebe78c9ed4e8ee0fcc4f7bf342, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f0d401cd3e3c9174dad27a5b8c4e9dcb, type: 2} + - target: {fileID: -4045731092689495795, guid: 5b2ebaebe78c9ed4e8ee0fcc4f7bf342, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f0d401cd3e3c9174dad27a5b8c4e9dcb, type: 2} + - target: {fileID: -3718823026436138242, guid: 5b2ebaebe78c9ed4e8ee0fcc4f7bf342, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f0d401cd3e3c9174dad27a5b8c4e9dcb, type: 2} - target: {fileID: -3528924868390877936, guid: 5b2ebaebe78c9ed4e8ee0fcc4f7bf342, type: 3} propertyPath: m_LocalPosition.y value: -0.6 objectReference: {fileID: 0} + - target: {fileID: -37445397394511822, guid: 5b2ebaebe78c9ed4e8ee0fcc4f7bf342, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f0d401cd3e3c9174dad27a5b8c4e9dcb, type: 2} - target: {fileID: 919132149155446097, guid: 5b2ebaebe78c9ed4e8ee0fcc4f7bf342, type: 3} propertyPath: m_Name value: "\u7A7A\u8C03\u7EC42" objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 5b2ebaebe78c9ed4e8ee0fcc4f7bf342, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} + - target: {fileID: 1171549304580213878, guid: 5b2ebaebe78c9ed4e8ee0fcc4f7bf342, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f0d401cd3e3c9174dad27a5b8c4e9dcb, type: 2} - target: {fileID: 2372101842476191254, guid: 5b2ebaebe78c9ed4e8ee0fcc4f7bf342, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 2687929404284388011, guid: 5b2ebaebe78c9ed4e8ee0fcc4f7bf342, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f0d401cd3e3c9174dad27a5b8c4e9dcb, type: 2} + - target: {fileID: 3136841376501902489, guid: 5b2ebaebe78c9ed4e8ee0fcc4f7bf342, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: f0d401cd3e3c9174dad27a5b8c4e9dcb, type: 2} + - target: {fileID: 3590086638062959488, guid: 5b2ebaebe78c9ed4e8ee0fcc4f7bf342, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f0d401cd3e3c9174dad27a5b8c4e9dcb, type: 2} + - target: {fileID: 4069010809961615293, guid: 5b2ebaebe78c9ed4e8ee0fcc4f7bf342, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f0d401cd3e3c9174dad27a5b8c4e9dcb, type: 2} + - target: {fileID: 4935700296026698555, guid: 5b2ebaebe78c9ed4e8ee0fcc4f7bf342, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f0d401cd3e3c9174dad27a5b8c4e9dcb, type: 2} + - target: {fileID: 6562889748348933850, guid: 5b2ebaebe78c9ed4e8ee0fcc4f7bf342, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8913987742362513620, guid: 5b2ebaebe78c9ed4e8ee0fcc4f7bf342, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f0d401cd3e3c9174dad27a5b8c4e9dcb, type: 2} + - target: {fileID: 9140302696541037975, guid: 5b2ebaebe78c9ed4e8ee0fcc4f7bf342, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f0d401cd3e3c9174dad27a5b8c4e9dcb, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5b2ebaebe78c9ed4e8ee0fcc4f7bf342, type: 3} --- !u!1 &571152767 @@ -518,7 +578,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 79f8900bbcd41504d8ed2f80d4e7150e, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 79f8900bbcd41504d8ed2f80d4e7150e, type: 3} @@ -710,6 +770,10 @@ PrefabInstance: propertyPath: m_Name value: "\u529F\u7387\u5206\u6790\u4EEA" objectReference: {fileID: 0} + - target: {fileID: 6295022328424747382, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 57094e98a7394fe4d9dcdbf241ce1153, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3} --- !u!1001 &1616211771 @@ -776,6 +840,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -8735361210126250282, guid: f5b58fd7c181d2e43bd420b95bd0a9b0, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f0d401cd3e3c9174dad27a5b8c4e9dcb, type: 2} - target: {fileID: -8679921383154817045, guid: f5b58fd7c181d2e43bd420b95bd0a9b0, type: 3} propertyPath: m_RootOrder value: 5 @@ -820,14 +888,54 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -7951393046223748275, guid: f5b58fd7c181d2e43bd420b95bd0a9b0, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: ca4c5e39544b5214c8e09c9bd889e1fd, type: 2} + - target: {fileID: -4559674171931809096, guid: f5b58fd7c181d2e43bd420b95bd0a9b0, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f0d401cd3e3c9174dad27a5b8c4e9dcb, type: 2} + - target: {fileID: -4401098216836411930, guid: f5b58fd7c181d2e43bd420b95bd0a9b0, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f0d401cd3e3c9174dad27a5b8c4e9dcb, type: 2} + - target: {fileID: -3515088063184818509, guid: f5b58fd7c181d2e43bd420b95bd0a9b0, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f0d401cd3e3c9174dad27a5b8c4e9dcb, type: 2} + - target: {fileID: -2734207797071728097, guid: f5b58fd7c181d2e43bd420b95bd0a9b0, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 54eaf08c87a5e26418d105d93df2160e, type: 2} + - target: {fileID: -2734207797071728097, guid: f5b58fd7c181d2e43bd420b95bd0a9b0, type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: f0d401cd3e3c9174dad27a5b8c4e9dcb, type: 2} + - target: {fileID: -1841606713541721350, guid: f5b58fd7c181d2e43bd420b95bd0a9b0, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f0d401cd3e3c9174dad27a5b8c4e9dcb, type: 2} - target: {fileID: 919132149155446097, guid: f5b58fd7c181d2e43bd420b95bd0a9b0, type: 3} propertyPath: m_Name value: "\u7A7A\u538B\u673A\u623F2" objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: f5b58fd7c181d2e43bd420b95bd0a9b0, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} + - target: {fileID: 2467931760190890775, guid: f5b58fd7c181d2e43bd420b95bd0a9b0, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 952b6fd5eb5f1254294ca89c29080256, type: 2} + - target: {fileID: 6989947580188055401, guid: f5b58fd7c181d2e43bd420b95bd0a9b0, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f0d401cd3e3c9174dad27a5b8c4e9dcb, type: 2} + - target: {fileID: 6990059551132025519, guid: f5b58fd7c181d2e43bd420b95bd0a9b0, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f0d401cd3e3c9174dad27a5b8c4e9dcb, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f5b58fd7c181d2e43bd420b95bd0a9b0, type: 3} --- !u!1001 &3369924416127045608 diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 07c4051..04e5656 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -5,21 +5,21 @@ "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.editorcoroutines": { "version": "1.0.0", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { "version": "1.0.6", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.feature.development": { "version": "1.0.1", @@ -42,7 +42,7 @@ "dependencies": { "com.unity.ext.nunit": "1.0.6" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { "version": "2.0.22", @@ -51,28 +51,28 @@ "dependencies": { "com.unity.test-framework": "1.1.9" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.performance.profile-analyzer": { "version": "1.2.2", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.settings-manager": { "version": "1.0.3", "depth": 2, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.test-framework": { "version": "1.1.33", @@ -83,7 +83,7 @@ "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.testtools.codecoverage": { "version": "1.2.5", @@ -93,7 +93,7 @@ "com.unity.test-framework": "1.0.16", "com.unity.settings-manager": "1.0.1" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { "version": "3.0.6", @@ -102,19 +102,19 @@ "dependencies": { "com.unity.ugui": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.timeline": { "version": "1.6.5", "depth": 0, "source": "registry", "dependencies": { + "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ugui": { "version": "1.0.0", @@ -133,7 +133,7 @@ "com.unity.ugui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.modules.ai": { "version": "1.0.0", diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index c414591..67b7227 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -21,7 +21,7 @@ MonoBehaviour: m_Registries: - m_Id: main m_Name: - m_Url: https://packages.unity.cn + m_Url: https://packages.unity.com m_Scopes: [] m_IsDefault: 1 m_Capabilities: 7 @@ -31,6 +31,6 @@ MonoBehaviour: m_RegistryInfoDraft: m_Modified: 0 m_ErrorMessage: - m_UserModificationsInstanceId: -844 - m_OriginalInstanceId: -846 + m_UserModificationsInstanceId: -822 + m_OriginalInstanceId: -824 m_LoadAssets: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 9a21aa3..c45af13 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.37f1c1 -m_EditorVersionWithRevision: 2021.3.37f1c1 (a8737bcc389d) +m_EditorVersion: 2021.3.37f1 +m_EditorVersionWithRevision: 2021.3.37f1 (3b6005ad5ad6) diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index ebbbf42..d2fe529 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,34 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 5154050006005f030f0b0d7643215a44144f1e7e782d7732282c4937bbe2606e - flags: 0 - RecentlyUsedSceneGuid-1: - value: 0001040353560b0c5c5d5520457506444e164e7f782973677e2c4435bab0316c - flags: 0 - RecentlyUsedSceneGuid-2: - value: 0009010551005859550d5c76417a0d44414e4b7e74297735742f1862e3b8673d - flags: 0 - RecentlyUsedSceneGuid-3: value: 5701055e57565e5e0f085d7344730644134f4b2e2d7a72322b784435b7b56c6b flags: 0 - RecentlyUsedSceneGuid-4: + RecentlyUsedSceneGuid-1: value: 05030d5151000d0e085e547446710d444e151c2c787a73677f7c4931b0b56d3d flags: 0 - RecentlyUsedSceneGuid-5: - value: 5a53520253010a0b0f5d5870157b5d4441154e7b7b2a23667c2c4830b1e2606d + RecentlyUsedSceneGuid-2: + value: 55070d50560d5e0f5c565e2147700e44414e1d737e2c27342e711e37b6e1676c flags: 0 - RecentlyUsedSceneGuid-6: + RecentlyUsedSceneGuid-3: + value: 0007075f57530f0d5e0a0f2311270b44404e1b737c7823667c7f1f63b0b06d3d + flags: 0 + RecentlyUsedSceneGuid-4: + value: 0202035457065d5e590d0f75477a0844144e4b727a7e76337e2b4560e7e16068 + flags: 0 + RecentlyUsedSceneGuid-5: value: 5a54035507010c03545c5a2048750e4440164c787e7823627d2a4561e0b73568 flags: 0 - RecentlyUsedSceneGuid-7: - value: 060607535d0d0a5d5b5a5e72497a0c44144e1a7c7b2e24647a7b4d32b7e56169 - flags: 0 - RecentlyUsedSceneGuid-8: + RecentlyUsedSceneGuid-6: value: 0655560204535c595b0c5a264975084447151a73747e22682c7a4536b7b46d6c flags: 0 + RecentlyUsedSceneGuid-7: + value: 5a53520253010a0b0f5d5870157b5d4441154e7b7b2a23667c2c4830b1e2606d + flags: 0 + RecentlyUsedSceneGuid-8: + value: 0009010551005859550d5c76417a0d44414e4b7e74297735742f1862e3b8673d + flags: 0 RecentlyUsedSceneGuid-9: - value: 0202035457065d5e590d0f75477a0844144e4b727a7e76337e2b4560e7e16068 + value: 060607535d0d0a5d5b5a5e72497a0c44144e1a7c7b2e24647a7b4d32b7e56169 flags: 0 vcSharedLogLevel: value: 0d5e400f0650 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 678446b..31fa393 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 997 m_ShowMode: 4 - m_Title: Project + m_Title: Scene m_RootView: {fileID: 4} m_MinSize: {x: 875, y: 371} m_MaxSize: {x: 10000, y: 10000} @@ -74,7 +74,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 18 + controlID: 67 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -171,7 +171,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 122 + controlID: 66 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -196,7 +196,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 113 + controlID: 112 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -596,9 +596,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0.16287416, y: 26.150864, z: 8.971962} + m_Target: {x: 8.91671, y: 25.144232, z: 7.6859536} speed: 2 - m_Value: {x: 0.16287416, y: 26.150864, z: 8.971962} + m_Value: {x: 8.91671, y: 25.144232, z: 7.6859536} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -645,13 +645,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.06383546, y: 0.7036308, z: -0.063719936, w: -0.7049641} + m_Target: {x: 0.031349093, y: 0.9523216, z: -0.28552577, w: 0.104018115} speed: 2 - m_Value: {x: -0.06382889, y: 0.70355844, z: -0.06371338, w: -0.70489156} + m_Value: {x: 0.03177347, y: 0.95204836, z: -0.2854436, w: 0.10543362} m_Size: - m_Target: 0.6795544 + m_Target: 1.3938498 speed: 2 - m_Value: 0.6795544 + m_Value: 1.3338276 m_Ortho: m_Target: 0 speed: 2 @@ -801,7 +801,7 @@ MonoBehaviour: m_VAllowExceedBaseRangeMax: 1 m_ScaleWithWindow: 0 m_HSlider: 0 - m_VSlider: 0 + m_VSlider: 1 m_IgnoreScrollWheelUntilClicked: 0 m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 @@ -814,7 +814,7 @@ MonoBehaviour: y: 21 width: 1276 height: 61 - m_Scale: {x: 0.056481477, y: 0.05648148} + m_Scale: {x: 0.075925924, y: 0.075925924} m_Translation: {x: 638, y: 30.5} m_MarginLeft: 0 m_MarginRight: 0 @@ -822,12 +822,12 @@ MonoBehaviour: m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -11295.738 - y: -540 - width: 22591.477 - height: 1080 + x: -8402.927 + y: -401.70734 + width: 16805.854 + height: 803.4147 m_MinimalGUI: 1 - m_defaultScale: 0.05648148 + m_defaultScale: 0.075925924 m_LastWindowPixelSize: {x: 1276, y: 82} m_ClearInEditMode: 1 m_NoCameraWarning: 1 @@ -866,9 +866,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: a8160100 - m_LastClickedID: 71336 - m_ExpandedIDs: 8ab7feffe8edfeff02a5ffffccf1ffffd0f1ffffdaf6ffff96160100a8160100 + m_SelectedIDs: ec44feff + m_LastClickedID: -113428 + m_ExpandedIDs: a440feff1c41feff7441feff4c42feffa042feffdc42feff5043feff7043feff8043feffb843feff2444feff2844feff2045feff2245fefffa4afeff7680feff92affeff9ab3feff06b6feff68b6feff68e5feffeeeafeff141affff9a1fffffc04effffee7dffff74adffff44c3ffff76f2ffff96f7fffff8faffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -931,7 +931,8 @@ MonoBehaviour: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 1 - m_Folders: [] + m_Folders: + - "Assets/GameAssets/Models/\u7A7A\u538B\u673A/Materials" m_Globs: [] m_OriginalText: m_FilterByTypeIntersection: 0 @@ -946,7 +947,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 287a0300 m_LastClickedID: 227880 - m_ExpandedIDs: 000000000a29000034a2000036a2000038a200003aa200003ca200003ea2000040a2000042a2000044a2000046a2000048a200004aa200004ca20000 + m_ExpandedIDs: 00000000d26f00008e77000090770000927700009477000096770000987700009a7700009c7700009e770000a0770000a2770000a4770000a6770000a8770000aa770000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -971,24 +972,24 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 120} + scrollPos: {x: 0, y: 884} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff000000000a29000034a2000036a2000038a200003aa200003ca2000040a2000044a2000046a2000048a200004aa200004ca2000092a20000dca20000 + m_ExpandedIDs: ffffffff00000000d26f00008e77000090770000927700009477000096770000987700009a7700009c7700009e770000a2770000a4770000a6770000a8770000d0770000ee770000f8770000fc7700001c78000026780000467800003cd200003ed20000ece30000fae3000004e4000024e40000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: "Models ppp \u5907\u4EFD" + m_OriginalName: "Models ppp \u5907\u4EFD" m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 30772 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 2} m_SearchString: @@ -1001,24 +1002,24 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Custom_PipelineFlow_H + m_OriginalName: Custom_PipelineFlow_H m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 11884 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 2} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -1026,7 +1027,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} + m_ScrollPosition: {x: 0, y: 1200} m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 115