From e4a6aa55d7b9bda4614434825e15c27a4496465b Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Mon, 9 Sep 2024 01:15:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=89=E5=8F=8A=E8=B5=84=E6=BA=90=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../佩佩/Scripts/EyeTransitionManager.cs | 4 +-- Assets/Prototype/佩佩/佩佩视觉模块.unity | 36 +++++++++---------- .../Materials/EyeMaterials/PosterColor.mat | 2 +- .../Materials/EyeMaterials/computerColor.mat | 2 +- .../Materials/EyeMaterials/plantColor.mat | 2 +- .../Materials/EyeMaterials/skyColor.mat | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Assets/Prototype/佩佩/Scripts/EyeTransitionManager.cs b/Assets/Prototype/佩佩/Scripts/EyeTransitionManager.cs index d7115963d..0ec453e38 100644 --- a/Assets/Prototype/佩佩/Scripts/EyeTransitionManager.cs +++ b/Assets/Prototype/佩佩/Scripts/EyeTransitionManager.cs @@ -364,7 +364,7 @@ public void SetViewAvailability(string viewStateName, bool isAvailable) float FadeTiming=zoomDuration/2; if (targetViewState == ViewState.MemoryView) { - FadeTiming*=2; + FadeTiming*=4f; zoomInSequence.Append(projector.DOLocalMove(new UnityEngine.Vector2(0,0f), zoomDuration).SetEase(Ease.OutCubic)); //zoomInSequence.Insert(zoomDuration, rotateTween); @@ -381,7 +381,7 @@ public void SetViewAvailability(string viewStateName, bool isAvailable) zoomInSequence.Join( Camera.main.transform.DOMove(new UnityEngine.Vector3(targetConfig.cameraPos.x,targetConfig.cameraPos.y,-10), zoomDuration).SetEase(Ease.OutCubic)); // 在 Zoom 到一半时开始黑屏过渡 - zoomInSequence.Insert(FadeTiming*2.3f, blackScreenImage.DOFade(1f, zoomDuration / 2).OnStart(() => blackScreenImage.gameObject.SetActive(true))); + zoomInSequence.Insert(FadeTiming, blackScreenImage.DOFade(1f, zoomDuration / 2).OnStart(() => blackScreenImage.gameObject.SetActive(true))); // 在整个 Zoom 完成后激活 Eye View diff --git a/Assets/Prototype/佩佩/佩佩视觉模块.unity b/Assets/Prototype/佩佩/佩佩视觉模块.unity index cabdce63a..608f234d0 100644 --- a/Assets/Prototype/佩佩/佩佩视觉模块.unity +++ b/Assets/Prototype/佩佩/佩佩视觉模块.unity @@ -2362,8 +2362,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: targetTransform: {fileID: 0} - burnRadiusMin: 18 - burnRadiusMax: 22 + burnRadiusMin: 28 + burnRadiusMax: 32 backSpriteRenderer: {fileID: 1813954929} wrongColorSpriteRenderer: {fileID: 588332639} --- !u!212 &179062445 @@ -3847,9 +3847,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 349519991 - m_SortingLayer: 6 - m_SortingOrder: 13 + m_SortingLayerID: 959782197 + m_SortingLayer: 7 + m_SortingOrder: 14 m_Sprite: {fileID: 9108158408238159327, guid: d8489dc41f8c4c9479ba48d5bf39e02e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -10427,9 +10427,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 349519991 - m_SortingLayer: 6 - m_SortingOrder: 12 + m_SortingLayerID: 959782197 + m_SortingLayer: 7 + m_SortingOrder: 13 m_Sprite: {fileID: 1318361906174632987, guid: d8489dc41f8c4c9479ba48d5bf39e02e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -11007,9 +11007,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 349519991 - m_SortingLayer: 6 - m_SortingOrder: 14 + m_SortingLayerID: 959782197 + m_SortingLayer: 7 + m_SortingOrder: 15 m_Sprite: {fileID: 4324661265435402524, guid: d8489dc41f8c4c9479ba48d5bf39e02e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -12093,8 +12093,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: targetTransform: {fileID: 0} - burnRadiusMin: 13 - burnRadiusMax: 17 + burnRadiusMin: 25 + burnRadiusMax: 31 backSpriteRenderer: {fileID: 1505625441} wrongColorSpriteRenderer: {fileID: 1213839932} --- !u!212 &887059454 @@ -12836,7 +12836,7 @@ Transform: m_GameObject: {fileID: 951186776} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.575001, y: 8.19, z: 0} + m_LocalPosition: {x: -2.62, y: 8.17, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -18014,8 +18014,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: targetTransform: {fileID: 0} - burnRadiusMin: 18 - burnRadiusMax: 20 + burnRadiusMin: 30 + burnRadiusMax: 33 backSpriteRenderer: {fileID: 1150517993} wrongColorSpriteRenderer: {fileID: 1699679381} --- !u!212 &1323611050 @@ -27335,8 +27335,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: targetTransform: {fileID: 0} - burnRadiusMin: 18 - burnRadiusMax: 20 + burnRadiusMin: 26 + burnRadiusMax: 29 backSpriteRenderer: {fileID: 754425920} wrongColorSpriteRenderer: {fileID: 238151918} --- !u!212 &1921249781 diff --git a/Assets/Resources/Materials/EyeMaterials/PosterColor.mat b/Assets/Resources/Materials/EyeMaterials/PosterColor.mat index ddec41503..f853037d6 100644 --- a/Assets/Resources/Materials/EyeMaterials/PosterColor.mat +++ b/Assets/Resources/Materials/EyeMaterials/PosterColor.mat @@ -386,7 +386,7 @@ Material: - _SourceAlphaDissolveInvert: 0 - _SourceAlphaDissolveNoiseFactor: 3.4 - _SourceAlphaDissolveWidth: 0.73 - - _SourceGlowDissolveFade: 18 + - _SourceGlowDissolveFade: 26 - _SourceGlowDissolveInvert: 0 - _SourceGlowDissolveNoiseFactor: 0.4 - _SourceGlowDissolveWidth: 0.15 diff --git a/Assets/Resources/Materials/EyeMaterials/computerColor.mat b/Assets/Resources/Materials/EyeMaterials/computerColor.mat index 4a5e09ae7..053ab401d 100644 --- a/Assets/Resources/Materials/EyeMaterials/computerColor.mat +++ b/Assets/Resources/Materials/EyeMaterials/computerColor.mat @@ -386,7 +386,7 @@ Material: - _SourceAlphaDissolveInvert: 0 - _SourceAlphaDissolveNoiseFactor: 3.4 - _SourceAlphaDissolveWidth: 0.73 - - _SourceGlowDissolveFade: 13 + - _SourceGlowDissolveFade: 25 - _SourceGlowDissolveInvert: 0 - _SourceGlowDissolveNoiseFactor: 0.2 - _SourceGlowDissolveWidth: 0.15 diff --git a/Assets/Resources/Materials/EyeMaterials/plantColor.mat b/Assets/Resources/Materials/EyeMaterials/plantColor.mat index 45ba84a8b..47d810d56 100644 --- a/Assets/Resources/Materials/EyeMaterials/plantColor.mat +++ b/Assets/Resources/Materials/EyeMaterials/plantColor.mat @@ -386,7 +386,7 @@ Material: - _SourceAlphaDissolveInvert: 0 - _SourceAlphaDissolveNoiseFactor: 3.4 - _SourceAlphaDissolveWidth: 0.73 - - _SourceGlowDissolveFade: 18 + - _SourceGlowDissolveFade: 30 - _SourceGlowDissolveInvert: 0 - _SourceGlowDissolveNoiseFactor: 0.2 - _SourceGlowDissolveWidth: 0.1 diff --git a/Assets/Resources/Materials/EyeMaterials/skyColor.mat b/Assets/Resources/Materials/EyeMaterials/skyColor.mat index 0cd40ffb4..8c520676d 100644 --- a/Assets/Resources/Materials/EyeMaterials/skyColor.mat +++ b/Assets/Resources/Materials/EyeMaterials/skyColor.mat @@ -386,7 +386,7 @@ Material: - _SourceAlphaDissolveInvert: 0 - _SourceAlphaDissolveNoiseFactor: 3.4 - _SourceAlphaDissolveWidth: 0.73 - - _SourceGlowDissolveFade: 18 + - _SourceGlowDissolveFade: 28 - _SourceGlowDissolveInvert: 0 - _SourceGlowDissolveNoiseFactor: 2 - _SourceGlowDissolveWidth: 0.3