diff --git a/Assets/Scenes/序章-家中.unity b/Assets/Scenes/序章-家中.unity index ea10b56..5436d9a 100644 --- a/Assets/Scenes/序章-家中.unity +++ b/Assets/Scenes/序章-家中.unity @@ -4812,7 +4812,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1861856986} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -11.039029, y: 0.08661765, z: -10} + m_LocalPosition: {x: -10.217708, y: 0.083872736, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 716192431} diff --git a/Assets/Scenes/第二关.unity b/Assets/Scenes/第二关.unity index 458051b..0fc34ab 100644 --- a/Assets/Scenes/第二关.unity +++ b/Assets/Scenes/第二关.unity @@ -176,7 +176,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6148935034079004064, guid: b034a6d27e737a9438c2164815880846, type: 3} propertyPath: m_RootOrder - value: 10 + value: 3 objectReference: {fileID: 0} - target: {fileID: 6148935034079004064, guid: b034a6d27e737a9438c2164815880846, type: 3} propertyPath: m_LocalPosition.x @@ -242,7 +242,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3118168874406839344, guid: a33f3ee35358b11469af30e9a746a630, type: 3} propertyPath: m_RootOrder - value: 8 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3118168874406839344, guid: a33f3ee35358b11469af30e9a746a630, type: 3} propertyPath: m_LocalPosition.x @@ -599,6 +599,8 @@ Transform: - {fileID: 98779984} - {fileID: 1677599719} - {fileID: 42157489} + - {fileID: 1341601829} + - {fileID: 1309876877} m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -648,8 +650,8 @@ MonoBehaviour: m_LightType: 4 m_BlendStyleIndex: 0 m_FalloffIntensity: 0.52 - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 1 + m_Color: {r: 0.43867922, g: 0.6095479, b: 1, a: 1} + m_Intensity: 0.42 m_LightVolumeOpacity: 0 m_ApplyToSortingLayers: 00000000 m_LightCookieSprite: {fileID: 0} @@ -1370,6 +1372,78 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1244141158} m_CullTransparentMesh: 1 +--- !u!1 &1309876876 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1309876877} + - component: {fileID: 1309876878} + m_Layer: 0 + m_Name: "\u53F3\u63A2\u7167" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1309876877 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1309876876} + m_LocalRotation: {x: -0, y: -0, z: 0.99998784, w: 0.0049352767} + m_LocalPosition: {x: 98.82, y: 5.04, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 405730575} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -180} +--- !u!114 &1309876878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1309876876} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_LightType: 3 + m_BlendStyleIndex: 0 + m_FalloffIntensity: 0.266 + m_Color: {r: 1, g: 0.9018647, b: 0.3726415, a: 1} + m_Intensity: 0.91 + m_LightVolumeOpacity: 0 + m_ApplyToSortingLayers: 00000000 + m_LightCookieSprite: {fileID: 0} + m_UseNormalMap: 0 + m_LightOrder: 0 + m_AlphaBlendOnOverlap: 0 + m_ShadowIntensity: 0 + m_ShadowVolumeIntensity: 0 + m_PointLightInnerAngle: 70 + m_PointLightOuterAngle: 77 + m_PointLightInnerRadius: 0 + m_PointLightOuterRadius: 8.271632 + m_PointLightDistance: 3 + m_PointLightQuality: 1 + m_ShapeLightParametricSides: 5 + m_ShapeLightParametricAngleOffset: 0 + m_ShapeLightParametricRadius: 1 + m_ShapeLightFalloffSize: 0.5 + m_ShapeLightFalloffOffset: {x: 0, y: 0} + m_ShapePath: + - {x: -0.5, y: -0.5, z: 0} + - {x: 0.5, y: -0.5, z: 0} + - {x: 0.5, y: 0.5, z: 0} + - {x: -0.5, y: 0.5, z: 0} --- !u!1 &1328743941 GameObject: m_ObjectHideFlags: 0 @@ -1421,6 +1495,78 @@ MonoBehaviour: portraitsFace: 0 setSayDialog: {fileID: 0} description: +--- !u!1 &1341601828 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1341601829} + - component: {fileID: 1341601830} + m_Layer: 0 + m_Name: "\u5DE6\u63A2\u7167" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1341601829 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1341601828} + m_LocalRotation: {x: -0, y: -0, z: 0.99998784, w: 0.0049352767} + m_LocalPosition: {x: 85.89, y: 5.17, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 405730575} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -180} +--- !u!114 &1341601830 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1341601828} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_LightType: 3 + m_BlendStyleIndex: 0 + m_FalloffIntensity: 0.266 + m_Color: {r: 1, g: 0.9018647, b: 0.3726415, a: 1} + m_Intensity: 0.91 + m_LightVolumeOpacity: 0 + m_ApplyToSortingLayers: 00000000 + m_LightCookieSprite: {fileID: 0} + m_UseNormalMap: 0 + m_LightOrder: 0 + m_AlphaBlendOnOverlap: 0 + m_ShadowIntensity: 0 + m_ShadowVolumeIntensity: 0 + m_PointLightInnerAngle: 70 + m_PointLightOuterAngle: 77 + m_PointLightInnerRadius: 0 + m_PointLightOuterRadius: 8.271632 + m_PointLightDistance: 3 + m_PointLightQuality: 1 + m_ShapeLightParametricSides: 5 + m_ShapeLightParametricAngleOffset: 0 + m_ShapeLightParametricRadius: 1 + m_ShapeLightFalloffSize: 0.5 + m_ShapeLightFalloffOffset: {x: 0, y: 0} + m_ShapePath: + - {x: -0.5, y: -0.5, z: 0} + - {x: 0.5, y: -0.5, z: 0} + - {x: 0.5, y: 0.5, z: 0} + - {x: -0.5, y: 0.5, z: 0} --- !u!1 &1490143047 GameObject: m_ObjectHideFlags: 0 @@ -2541,7 +2687,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6516117755271630970, guid: 5ad2f573d77b68149b5b3270cac7842f, type: 3} propertyPath: m_RootOrder - value: 9 + value: 2 objectReference: {fileID: 0} - target: {fileID: 6516117755271630970, guid: 5ad2f573d77b68149b5b3270cac7842f, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Shader.meta b/Assets/Shader.meta deleted file mode 100644 index f67ae13..0000000 --- a/Assets/Shader.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 29af985829b48094fb08a2663024a254 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 7241a1e..0c61487 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,14 +6,44 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d + value: 22424703114646680e0b0227036cdacaf990d3ea61adddcea8f6fb7df7ee3d2cfb flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb + value: 22424703114646680e0b0227036cdacaf990d3ea61adddcea8f6fb73663ffabe163e78fce9332b25 flags: 0 RecentlyUsedScenePath-2: + value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d + flags: 0 + RecentlyUsedScenePath-3: + value: 22424703114646680e0b0227036cdafade90ecf1aafdcdb8e2dc99eb0c69f6dc6a20dea7f234362820 + flags: 0 + RecentlyUsedScenePath-4: + value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18 + flags: 0 + RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb + flags: 0 + RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb + flags: 0 + RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18 + flags: 0 + RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb + flags: 0 + RecentlyUsedScenePath-9: value: 22424703114646680e0b0227036cd8dcda93c2c6a9cdf57e38271427fb flags: 0 + UnityEditor.ShaderGraph.Blackboard: + value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba85e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b0968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7 + flags: 0 + UnityEditor.ShaderGraph.FloatingWindowsLayout2: + value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8e97ddbd90bf + flags: 0 + UnityEditor.ShaderGraph.InspectorWindow: + value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed969b938797a7cf + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0