From c14814bd3df07503abd51f0c8b0219da3ade52c6 Mon Sep 17 00:00:00 2001 From: ksh999000 <740612340@qq.com> Date: Sat, 4 Jul 2026 16:26:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=BB=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E7=89=B9=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Light/shaders/WaterReflection.shader | 191 +++++++++ .../Light/shaders/WaterReflection.shader.meta | 9 + unity/Assets/Materials/WaterReflection.mat | 48 +++ .../Assets/Materials/WaterReflection.mat.meta | 8 + unity/Assets/Scenes/MainMenu.unity | 370 +----------------- unity/UserSettings/EditorUserSettings.asset | 4 +- 6 files changed, 263 insertions(+), 367 deletions(-) create mode 100644 unity/Assets/Light/shaders/WaterReflection.shader create mode 100644 unity/Assets/Light/shaders/WaterReflection.shader.meta create mode 100644 unity/Assets/Materials/WaterReflection.mat create mode 100644 unity/Assets/Materials/WaterReflection.mat.meta diff --git a/unity/Assets/Light/shaders/WaterReflection.shader b/unity/Assets/Light/shaders/WaterReflection.shader new file mode 100644 index 0000000..b4c20e1 --- /dev/null +++ b/unity/Assets/Light/shaders/WaterReflection.shader @@ -0,0 +1,191 @@ +Shader "IndianOcean/WaterReflection" +{ + // 水面倒影 Shader + // 上方 (1-R) 正常显示原图，下方 R 区域为原图整体垂直翻转 + 扰动 + 淡出， + // 分界线处绘制一条水面亮线。 + + Properties + { + _MainTex ("主贴图", 2D) = "white" {} + _Waterline ("水面线位置（UV.y）", Range(0.05, 0.95)) = 0.7 + _DistortStrength("水平扰动强度", Range(0, 0.08)) = 0.015 + _DistortSpeed ("扰动速度", Range(0, 5)) = 1.5 + _DistortFreq ("扰动频率", Range(1, 20)) = 8.0 + _ReflDarken ("倒影变暗系数", Range(0, 1)) = 0.5 + _ReflFadeLen ("倒影向下淡出长度", Range(0, 0.5)) = 0.25 + _LineBrightness ("水面线亮度", Range(0, 3)) = 1.5 + _LineThickness ("水面线粗细", Range(0, 0.02)) = 0.004 + _WaveAmplitude ("水面线波浪振幅", Range(0, 0.05)) = 0.012 + _WaveFreq ("水面线波浪频率", Range(1, 15)) = 4.0 + _WaveSpeed ("水面线波浪速度", Range(0, 5)) = 1.0 + } + + SubShader + { + Tags + { + "RenderType" = "Transparent" + "Queue" = "Transparent" + "RenderPipeline" = "UniversalPipeline" + } + Blend SrcAlpha OneMinusSrcAlpha + ZWrite Off + Cull Off + + Pass + { + Name "WaterReflection" + HLSLPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma multi_compile_instancing + + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl" + + struct Attributes + { + float4 positionOS : POSITION; + float2 uv : TEXCOORD0; + float4 color : COLOR; + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + struct Varyings + { + float4 positionCS : SV_POSITION; + float2 uv : TEXCOORD0; + float4 color : COLOR; + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + CBUFFER_START(UnityPerMaterial) + float4 _MainTex_ST; + float _Waterline; + float _DistortStrength; + float _DistortSpeed; + float _DistortFreq; + float _ReflDarken; + float _ReflFadeLen; + float _LineBrightness; + float _LineThickness; + float _WaveAmplitude; + float _WaveFreq; + float _WaveSpeed; + CBUFFER_END + + TEXTURE2D(_MainTex); + SAMPLER(sampler_MainTex); + + /* ---------- noise ---------- */ + float hash(float n) + { + return frac(sin(n) * 43758.5453); + } + + float noise1D(float x) + { + float i = floor(x); + float f = frac(x); + f = f * f * (3.0 - 2.0 * f); + return lerp(hash(i), hash(i + 1.0), f); + } + + // 多层叠加 → 类随机水面波纹，返回 [-1, 1] + float waterNoise(float x, float t) + { + float n = 0.0; + n += noise1D(x * _DistortFreq + t * _DistortSpeed) * 0.50; + n += noise1D(x * _DistortFreq * 2.3 - t * _DistortSpeed * 1.7) * 0.25; + n += noise1D(x * _DistortFreq * 4.7 + t * _DistortSpeed * 0.8) * 0.125; + return n * 2.0 - 1.0; + } + + // 计算某 uv.x 处的局部水面线 Y 坐标（波浪起伏） + // 多层正弦叠加 + noise，产生自然的不规则波形 + float localWaterline(float x, float t) + { + float wave = 0.0; + wave += sin(x * _WaveFreq * 6.2832 + t * _WaveSpeed) * 0.50; + wave += sin(x * _WaveFreq * 6.2832 * 2.3 - t * _WaveSpeed * 1.4) * 0.25; + wave += sin(x * _WaveFreq * 6.2832 * 4.1 + t * _WaveSpeed * 0.7) * 0.15; + wave += noise1D(x * _WaveFreq * 3.0 + t * _WaveSpeed * 0.5) * 0.10; + return _Waterline + wave * _WaveAmplitude; + } + + Varyings vert(Attributes input) + { + Varyings output; + UNITY_SETUP_INSTANCE_ID(input); + UNITY_TRANSFER_INSTANCE_ID(input, output); + output.positionCS = TransformObjectToHClip(input.positionOS.xyz); + output.uv = TRANSFORM_TEX(input.uv, _MainTex); + output.color = input.color; + return output; + } + + half4 frag(Varyings input) : SV_Target + { + float2 uv = input.uv; + float time = _Time.y; + + // ========== 1. 原图采样（上方区域直接使用） ========== + half4 baseColor = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, uv); + + // ========== 2. 局部水面线（波浪起伏） ========== + float wl = localWaterline(uv.x, time); + + // ========== 3. 判断是否在倒影区 ========== + float inRefl = 1.0 - step(wl, uv.y); + + // ========== 4. 倒影 UV：整体垂直翻转 ========== + float2 reflUV = uv; + reflUV.y = 2.0 * wl - uv.y; // 以局部水面线为轴镜像 + + // 水平扰动 + float distort = waterNoise(uv.x, time) * _DistortStrength; + // 越远离水面线（越往下）扰动越大 + float depthRatio = 1.0 - uv.y / wl; // 0=水面, 1=最底 + depthRatio = clamp(depthRatio, 0.0, 1.0); + distort *= (0.3 + 0.7 * depthRatio); + reflUV.x += distort; + + // 夹紧，防止越界 + reflUV = clamp(reflUV, 0.0, 1.0); + + half4 reflColor = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, reflUV); + + // ========== 5. 倒影衰减 ========== + // 5a. 整体变暗 + reflColor.rgb *= (1.0 - _ReflDarken); + + // 5b. 从水面线往下逐渐淡出（消散） + float fadeStart = wl - _ReflFadeLen; + float fadeFactor = smoothstep(fadeStart, wl, uv.y); + reflColor.a *= fadeFactor; + + // ========== 6. 水面亮线（沿波浪曲线绘制） ========== + float distToLine = abs(uv.y - wl); + float lineFactor = 1.0 - smoothstep(0.0, _LineThickness, distToLine); + + // ========== 7. 合成 ========== + half3 finalRGB = baseColor.rgb; + + // 倒影区：用倒影色替换 + finalRGB = lerp(finalRGB, reflColor.rgb, inRefl); + + // 水面线：叠加高亮 + finalRGB += lineFactor * _LineBrightness * half3(0.7, 0.85, 1.0); + + float finalA = baseColor.a; + // 倒影区 alpha 也跟随淡出 + finalA = lerp(finalA, reflColor.a, inRefl); + + half4 finalColor = half4(finalRGB, finalA); + finalColor *= input.color; + return finalColor; + } + ENDHLSL + } + } + FallBack Off +} diff --git a/unity/Assets/Light/shaders/WaterReflection.shader.meta b/unity/Assets/Light/shaders/WaterReflection.shader.meta new file mode 100644 index 0000000..2dea807 --- /dev/null +++ b/unity/Assets/Light/shaders/WaterReflection.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: DXMWtyP7WnrsqNYfQ4qRbumB1rEbQMf+zA0ez0AWy0EDrVMnTdCK+2A= +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/Assets/Materials/WaterReflection.mat b/unity/Assets/Materials/WaterReflection.mat new file mode 100644 index 0000000..b5cbd07 --- /dev/null +++ b/unity/Assets/Materials/WaterReflection.mat @@ -0,0 +1,48 @@ +%YAML 1.1 +%TAG !u! tag:yousandi.cn,2023: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: WaterReflection + m_Shader: {fileID: 4800000, guid: 29929f917b9f87c4e8178e21b8afa5b4, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _DistortFreq: 13.86 + - _DistortFrequency: 8 + - _DistortSpeed: 0.39 + - _DistortStrength: 0.0242 + - _FadeTop: 0.05 + - _LineBrightness: 1.5 + - _LineThickness: 0 + - _ReflDarken: 0.677 + - _ReflFadeLen: 0.308 + - _ReflectionRatio: 0.3 + - _TintAlpha: 0.6 + - _Waterline: 0.3 + - _WaveAmplitude: 0.012 + - _WaveFreq: 4 + - _WaveSpeed: 1 + m_Colors: [] + m_BuildTextureStacks: [] diff --git a/unity/Assets/Materials/WaterReflection.mat.meta b/unity/Assets/Materials/WaterReflection.mat.meta new file mode 100644 index 0000000..71ed8c0 --- /dev/null +++ b/unity/Assets/Materials/WaterReflection.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: XHMZtC/5VXP5+2bZrRVKRBhQEUzbt1gkO3Mz18gnhue/liZIgc7/vRg= +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/Assets/Scenes/MainMenu.unity b/unity/Assets/Scenes/MainMenu.unity index 1c06a18..97a1f8f 100644 --- a/unity/Assets/Scenes/MainMenu.unity +++ b/unity/Assets/Scenes/MainMenu.unity @@ -694,6 +694,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: gameState: 0 + lightExpandDuration: 1.5 + lightExpandTargetRadius: 20 + fadeOutDuration: 1 --- !u!1 &437831457 GameObject: m_ObjectHideFlags: 0 @@ -850,166 +853,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &507353342 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 7 - m_Component: - - component: {fileID: 507353343} - - component: {fileID: 507353345} - - component: {fileID: 507353344} - m_Layer: 0 - m_HasEditorInfo: 1 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &507353343 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 507353342} - 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: 848816880} - 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 &507353344 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 507353342} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 18 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u6682\u505C" ---- !u!222 &507353345 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 507353342} - m_CullTransparentMesh: 1 ---- !u!1 &539478340 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 7 - m_Component: - - component: {fileID: 539478341} - - component: {fileID: 539478343} - - component: {fileID: 539478342} - m_Layer: 0 - m_HasEditorInfo: 1 - m_Name: TopRight - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &539478341 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 539478340} - 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: 736723785} - - {fileID: 848816880} - m_Father: {fileID: 1852443092} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -20, y: -20} - m_SizeDelta: {x: 100, y: 0} - m_Pivot: {x: 1, y: 1} ---- !u!114 &539478342 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 539478340} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 ---- !u!114 &539478343 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 539478340} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 2 - m_Spacing: 8 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 --- !u!1 &574406655 GameObject: m_ObjectHideFlags: 0 @@ -1230,86 +1073,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &736723784 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 7 - m_Component: - - component: {fileID: 736723785} - - component: {fileID: 736723787} - - component: {fileID: 736723786} - m_Layer: 0 - m_HasEditorInfo: 1 - m_Name: ScoreText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &736723785 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 736723784} - 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: 539478341} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 200, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &736723786 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 736723784} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 20 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 5 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u5206\u6570: 0" ---- !u!222 &736723787 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 736723784} - m_CullTransparentMesh: 1 --- !u!1 &774721828 GameObject: m_ObjectHideFlags: 0 @@ -1451,128 +1214,6 @@ MonoBehaviour: submitSFX: audioClip: {fileID: 8300000, guid: 6940b0d02566470418c2e593a6ff04c7, type: 3} volume: 1 ---- !u!1 &848816876 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 7 - m_Component: - - component: {fileID: 848816880} - - component: {fileID: 848816879} - - component: {fileID: 848816878} - - component: {fileID: 848816877} - m_Layer: 0 - m_HasEditorInfo: 1 - m_Name: PauseButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &848816877 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 848816876} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 848816878} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &848816878 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 848816876} - 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: 0.3, g: 0.3, b: 0.3, a: 0.9} - 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: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &848816879 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 848816876} - m_CullTransparentMesh: 1 ---- !u!224 &848816880 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 848816876} - 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: 507353343} - m_Father: {fileID: 539478341} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 35} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &875024152 GameObject: m_ObjectHideFlags: 0 @@ -3267,7 +2908,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: c9615d68fea7739419d3bea2290dd5fc, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -3627,7 +3268,7 @@ MonoBehaviour: skillBellCD: {fileID: 0} skillLanternIcon: {fileID: 0} skillLanternCD: {fileID: 0} - pauseButton: {fileID: 848816877} + pauseButton: {fileID: 0} --- !u!114 &1852443089 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3705,7 +3346,6 @@ RectTransform: m_Children: - {fileID: 1961157547} - {fileID: 334549344} - - {fileID: 539478341} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} diff --git a/unity/UserSettings/EditorUserSettings.asset b/unity/UserSettings/EditorUserSettings.asset index a6fe91f..865866b 100644 --- a/unity/UserSettings/EditorUserSettings.asset +++ b/unity/UserSettings/EditorUserSettings.asset @@ -30,10 +30,10 @@ EditorUserSettings: value: 5a55515156575a0b0f56592346260f444f16197c7e7f24697d2a4a32b1b0353e flags: 0 RecentlyUsedSceneGuid-8: - value: 0209025f575750595c57092149765d444e4e49727e7c7068757b1c65b6e36c3b + value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 RecentlyUsedSceneGuid-9: - value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a + value: 0209025f575750595c57092149765d444e4e49727e7c7068757b1c65b6e36c3b flags: 0 UnityEditor.ShaderGraph.Blackboard: value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7