From 20893f337c092b7030a5bc6fa910298bd1772fd8 Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Wed, 19 Feb 2025 17:48:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0RGB=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Prototype/佩佩/Scripts/EyeTarget.cs | 2 ++ Assets/Scenes/PeipeiFixScene.unity | 18 ++++++++++++------ Assets/Scenes/Persistence.unity | 4 ++-- .../FixSystem/Effect/MouseFollowEffect.cs | 2 +- Assets/Scripts/FixSystemNew/FixStateMachine.cs | 2 +- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/Assets/Prototype/佩佩/Scripts/EyeTarget.cs b/Assets/Prototype/佩佩/Scripts/EyeTarget.cs index 958e54bb5..e85c9baad 100644 --- a/Assets/Prototype/佩佩/Scripts/EyeTarget.cs +++ b/Assets/Prototype/佩佩/Scripts/EyeTarget.cs @@ -27,6 +27,8 @@ public class EyeTarget : MonoBehaviour private Material backMaterial; private Material wrongColorMaterial; + public Color _color; + private void Awake() { // 获取此对象的材质 diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index e593c4352..7a780a398 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -3459,6 +3459,7 @@ MonoBehaviour: backSpriteRenderer: {fileID: 1036194065} wrongColorSpriteRenderer: {fileID: 1211051073} imageSpriteRender: {fileID: 163241097} + _color: {r: 0.35922036, g: 0.8773585, b: 0.38555345, a: 0} --- !u!212 &171926895 SpriteRenderer: m_ObjectHideFlags: 0 @@ -6192,6 +6193,7 @@ MonoBehaviour: backSpriteRenderer: {fileID: 1181555071} wrongColorSpriteRenderer: {fileID: 55672861} imageSpriteRender: {fileID: 818458647} + _color: {r: 0.21336798, g: 0.26664272, b: 0.29799998, a: 0} --- !u!212 &247366037 SpriteRenderer: m_ObjectHideFlags: 0 @@ -13825,10 +13827,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 @@ -22354,6 +22356,7 @@ MonoBehaviour: backSpriteRenderer: {fileID: 983645283} wrongColorSpriteRenderer: {fileID: 533663232} imageSpriteRender: {fileID: 0} + _color: {r: 0, g: 0, b: 0, a: 0} --- !u!212 &1271136870 SpriteRenderer: m_ObjectHideFlags: 0 @@ -22630,7 +22633,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -25} + m_AnchoredPosition: {x: 100, y: 25.1} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1307071591 @@ -22680,8 +22683,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -22716,7 +22719,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 0, y: 0, z: -104.036865, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -23917,6 +23920,7 @@ MonoBehaviour: backSpriteRenderer: {fileID: 795246566} wrongColorSpriteRenderer: {fileID: 2074510898} imageSpriteRender: {fileID: 299472613} + _color: {r: 0.29697397, g: 0.40030593, b: 0.9150943, a: 0} --- !u!212 &1437519564 SpriteRenderer: m_ObjectHideFlags: 0 @@ -25059,6 +25063,7 @@ MonoBehaviour: backSpriteRenderer: {fileID: 1593142682} wrongColorSpriteRenderer: {fileID: 1635219591} imageSpriteRender: {fileID: 0} + _color: {r: 0, g: 0, b: 0, a: 0} --- !u!212 &1468799207 SpriteRenderer: m_ObjectHideFlags: 0 @@ -26911,6 +26916,7 @@ MonoBehaviour: backSpriteRenderer: {fileID: 905842942} wrongColorSpriteRenderer: {fileID: 101672554} imageSpriteRender: {fileID: 1875449745} + _color: {r: 0.8207547, g: 0.3515308, b: 0.3515308, a: 0} --- !u!212 &1589824318 SpriteRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index ec97e9980..1ecbad51b 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -6343,7 +6343,7 @@ Transform: m_GameObject: {fileID: 519420028} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.66, y: 0, z: -10} + m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -6392,7 +6392,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - m_CustomBlends: {fileID: 0} + m_CustomBlends: {fileID: 11400000, guid: 97ddad596c0b5f94e8bb6e86e444a1cc, type: 2} m_CameraCutEvent: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs b/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs index c886843bc..0786b887d 100644 --- a/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs +++ b/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs @@ -157,7 +157,7 @@ public class MouseFollowAndZoom : MonoBehaviour indicatorRectTransform.sizeDelta = screenSize; // 设置目标名称 - targetNameText.text = currentTarget.name; + targetNameText.text = currentTarget.name+" "+"R"+currentTarget._color.r.ToString("F1") +" G"+currentTarget._color.g.ToString("F1")+" B"+currentTarget._color.b.ToString("F1") ; // 显示指示器 targetIndicator.SetActive(true); diff --git a/Assets/Scripts/FixSystemNew/FixStateMachine.cs b/Assets/Scripts/FixSystemNew/FixStateMachine.cs index 4a435a574..dcb1264ea 100644 --- a/Assets/Scripts/FixSystemNew/FixStateMachine.cs +++ b/Assets/Scripts/FixSystemNew/FixStateMachine.cs @@ -27,7 +27,7 @@ namespace AibisDream.FixSystem { // 仅在从 Clinic 到 BodyModule 时执行这两行 yield return CameraKit.Instance.SwitchCamera(CameraEnum.CoolingMachine); - //yield return TimelineManager.Instance.PlayTimeline("ToBodyModule"); + yield return TimelineManager.Instance.PlayTimeline("ToBodyModule"); } GameLoopManager.Instance?.UpdateFixState(nextState, _curArgs);