From f6ec90cfc99f55992194df4eead1a0e43f089906 Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Wed, 14 May 2025 17:03:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=8E=A5=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/HuoShanEmoSceneTest.unity | 15 +- Assets/Scenes/HuoShanFixScene.unity | 730 +++++++++++++++++- .../Scripts/FixSystemNew/FixStateMachine.cs | 2 +- .../Scripts/Framework/OtherKit/CameraKit.cs | 15 +- .../MiniGame/HuoShan/Emo/EmoManager.cs | 7 +- .../MiniGame/HuoShan/Emo/LakeLineDrawer.cs | 21 +- 6 files changed, 747 insertions(+), 43 deletions(-) diff --git a/Assets/Scenes/HuoShanEmoSceneTest.unity b/Assets/Scenes/HuoShanEmoSceneTest.unity index 154e51553..1dd82edbc 100644 --- a/Assets/Scenes/HuoShanEmoSceneTest.unity +++ b/Assets/Scenes/HuoShanEmoSceneTest.unity @@ -123,6 +123,11 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!4 &120915747 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3464828912861393548, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + m_PrefabInstance: {fileID: 4077561020806840184} + m_PrefabAsset: {fileID: 0} --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -255,11 +260,11 @@ Transform: m_GameObject: {fileID: 519420028} serializedVersion: 2 m_LocalRotation: {x: 0.46243212, y: -0.0066541713, z: 0.0034705873, w: 0.88662297} - m_LocalPosition: {x: -0.19, y: 11.26, z: -8.4} + m_LocalPosition: {x: -0.46, y: 11.26, z: -8.4} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 120915747} m_LocalEulerAnglesHint: {x: 55.09, y: -0.86, z: 0} --- !u!114 &519420033 MonoBehaviour: @@ -439,7 +444,10 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3464828912861393548, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + insertIndex: 0 + addedObject: {fileID: 519420032} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} --- !u!1 &5854754705337305700 @@ -545,7 +553,6 @@ MonoBehaviour: SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 519420032} - {fileID: 4077561020806840184} - {fileID: 2185051783577957245} - {fileID: 1078204968} diff --git a/Assets/Scenes/HuoShanFixScene.unity b/Assets/Scenes/HuoShanFixScene.unity index fe2f11ed8..736a8e45e 100644 --- a/Assets/Scenes/HuoShanFixScene.unity +++ b/Assets/Scenes/HuoShanFixScene.unity @@ -3869,6 +3869,126 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d61ec1d045b2bfc4bb2db8718f017f2b, type: 3} +--- !u!1 &475644043 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 475644044} + - component: {fileID: 475644047} + - component: {fileID: 475644046} + - component: {fileID: 475644045} + m_Layer: 0 + m_Name: D + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &475644044 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 475644043} + 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: 534781475} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -55} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &475644045 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 475644043} + 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: 475644046} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &475644046 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 475644043} + 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: 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_Sprite: {fileID: 21300000, guid: 53057565dcc94f14c96d30d1c3c099ba, type: 3} + 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 &475644047 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 475644043} + m_CullTransparentMesh: 1 --- !u!1 &488327739 GameObject: m_ObjectHideFlags: 0 @@ -4255,9 +4375,25 @@ PrefabInstance: m_TransformParent: {fileID: 1774281545} m_Modifications: - target: {fileID: 1064932125706210448, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} - propertyPath: followTarget + propertyPath: upButton value: - objectReference: {fileID: 499093176} + objectReference: {fileID: 475644045} + - target: {fileID: 1064932125706210448, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: downButton + value: + objectReference: {fileID: 1167274218} + - target: {fileID: 1064932125706210448, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: leftButton + value: + objectReference: {fileID: 2114306088} + - target: {fileID: 1064932125706210448, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: rightButton + value: + objectReference: {fileID: 1299174046} + - target: {fileID: 2582932363959290390, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3464828912861393548, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} propertyPath: m_LocalPosition.x value: 1.0322266 @@ -4298,37 +4434,40 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3707600716635553228, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} - propertyPath: m_LocalPosition.z + - target: {fileID: 5071397793460778817, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 3707600716635553228, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} - propertyPath: m_AnchoredPosition.y - value: 4.6 + - target: {fileID: 7300576051277766729, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4923765435343198473, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} - propertyPath: m_AnchoredPosition.x - value: -9.2 + - target: {fileID: 7307623802353835339, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: m_Name + value: LocalCanvas objectReference: {fileID: 0} - - target: {fileID: 5160144299344876289, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} - propertyPath: m_LocalPosition.z - value: 0.4 + - target: {fileID: 7307623802353835339, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} - - target: {fileID: 5160144299344876289, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} - propertyPath: m_AnchoredPosition.y - value: -10.7 - objectReference: {fileID: 0} - - target: {fileID: 8940115791731250026, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} - propertyPath: m_AnchoredPosition.x - value: 7.9 + - target: {fileID: 7312302861184159397, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 9153305584215853973, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} propertyPath: m_Name value: Emo View objectReference: {fileID: 0} + - target: {fileID: 9153305584215853973, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3464828912861393548, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} + insertIndex: 0 + addedObject: {fileID: 1126721863} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 67658af7714634d45a2aa8f958ea21fd, type: 3} --- !u!4 &499093176 stripped @@ -5668,6 +5807,85 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &534781474 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 534781475} + - component: {fileID: 534781477} + - component: {fileID: 534781476} + m_Layer: 0 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &534781475 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 534781474} + 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: 1299174045} + - {fileID: 2114306087} + - {fileID: 1167274217} + - {fileID: 475644044} + m_Father: {fileID: 1126721863} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 150, y: 150} + m_SizeDelta: {x: 300, y: 300} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &534781476 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 534781474} + 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.2735849, g: 0.2735849, b: 0.2735849, a: 0.392} + 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &534781477 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 534781474} + m_CullTransparentMesh: 1 --- !u!1 &545277546 GameObject: m_ObjectHideFlags: 0 @@ -10827,6 +11045,108 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1126721862 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1126721863} + - component: {fileID: 1126721866} + - component: {fileID: 1126721865} + - component: {fileID: 1126721864} + m_Layer: 0 + m_Name: GlobalCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1126721863 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1126721862} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 534781475} + m_Father: {fileID: 499093176} + 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: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &1126721864 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1126721862} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1126721865 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1126721862} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1126721866 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1126721862} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1 &1130794394 GameObject: m_ObjectHideFlags: 0 @@ -11564,6 +11884,126 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 1 +--- !u!1 &1167274216 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1167274217} + - component: {fileID: 1167274220} + - component: {fileID: 1167274219} + - component: {fileID: 1167274218} + m_Layer: 0 + m_Name: U + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1167274217 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167274216} + 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: 534781475} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 55} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1167274218 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167274216} + 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: 1167274219} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1167274219 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167274216} + 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: 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_Sprite: {fileID: 21300000, guid: a5328ae9ea6fe4d48a2cbfa2b011b5b4, type: 3} + 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 &1167274220 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167274216} + m_CullTransparentMesh: 1 --- !u!1 &1174535081 GameObject: m_ObjectHideFlags: 0 @@ -12417,6 +12857,126 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1274839201} m_CullTransparentMesh: 1 +--- !u!1 &1299174044 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1299174045} + - component: {fileID: 1299174048} + - component: {fileID: 1299174047} + - component: {fileID: 1299174046} + m_Layer: 0 + m_Name: L + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1299174045 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1299174044} + 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: 534781475} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -55, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1299174046 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1299174044} + 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: 1299174047} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1299174047 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1299174044} + 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: 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_Sprite: {fileID: 21300000, guid: e304980e12f3b354aa81a4d4876f1341, type: 3} + 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 &1299174048 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1299174044} + m_CullTransparentMesh: 1 --- !u!1 &1305312187 GameObject: m_ObjectHideFlags: 0 @@ -18047,14 +18607,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1830922714} serializedVersion: 2 - m_LocalRotation: {x: 0, y: -0.8966411, z: 0.44275823, w: 0} - m_LocalPosition: {x: 1.02, y: 2.55, z: 2.03} + m_LocalRotation: {x: 0.46173564, y: -0.0066568954, z: 0.0034653603, w: 0.8869859} + m_LocalPosition: {x: 0.5722256, y: 2.6035023, z: -15.422157} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1043612503} m_Father: {fileID: 1774281545} - m_LocalEulerAnglesHint: {x: 52.56, y: -180, z: 0} + m_LocalEulerAnglesHint: {x: 55, y: -0.86, z: 0} --- !u!114 &1830922716 MonoBehaviour: m_ObjectHideFlags: 0 @@ -18076,7 +18636,7 @@ MonoBehaviour: m_LookAt: {fileID: 0} m_Follow: {fileID: 0} m_Lens: - FieldOfView: 34 + FieldOfView: 32.42 OrthographicSize: 3.44 NearClipPlane: 0.29 FarClipPlane: 1000 @@ -21255,6 +21815,126 @@ Material: - _ShadowColor: {r: 0, g: 0, b: 0, a: 1} - _ShineColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] +--- !u!1 &2114306086 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2114306087} + - component: {fileID: 2114306090} + - component: {fileID: 2114306089} + - component: {fileID: 2114306088} + m_Layer: 0 + m_Name: R + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2114306087 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2114306086} + 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: 534781475} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 55, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2114306088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2114306086} + 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: 2114306089} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &2114306089 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2114306086} + 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: 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_Sprite: {fileID: 21300000, guid: 58775309110eafa4cbd4e815fa8274ea, type: 3} + 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 &2114306090 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2114306086} + m_CullTransparentMesh: 1 --- !u!1 &2114957729 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/FixSystemNew/FixStateMachine.cs b/Assets/Scripts/FixSystemNew/FixStateMachine.cs index 606fcc576..1cfbe2052 100644 --- a/Assets/Scripts/FixSystemNew/FixStateMachine.cs +++ b/Assets/Scripts/FixSystemNew/FixStateMachine.cs @@ -427,8 +427,8 @@ namespace AibisDream.FixSystem } yield return CameraKit.Instance.SwitchCamera(CameraEnum.Emo); - emoManager.OpenView(); yield return UIManager.Instance.GetPanel().FadeInAsync(0.5f); + emoManager.OpenView(); yield return CameraKit.Instance.SwitchCamera(CameraEnum.EmoDeep); yield return UIManager.Instance.GetPanel().FadeOutAsync(0.5f); } diff --git a/Assets/Scripts/Framework/OtherKit/CameraKit.cs b/Assets/Scripts/Framework/OtherKit/CameraKit.cs index 4bfcf0afc..62babc49f 100644 --- a/Assets/Scripts/Framework/OtherKit/CameraKit.cs +++ b/Assets/Scripts/Framework/OtherKit/CameraKit.cs @@ -56,10 +56,19 @@ namespace AibisDream.Framework _curCameraEnum = CameraEnum.Default; // 获取UICamera - if (_orthoMainCamera && _orthoMainCamera.TryGetComponent(out var cameraData)) + if (_orthoMainCamera && _orthoMainCamera.TryGetComponent(out var orthoMaincameraData)) { // 获取Stack Cameras - var stackCameras = cameraData.cameraStack; + var stackCameras = orthoMaincameraData.cameraStack; + + // 获取UICamera + uiCamera = stackCameras.Find(cam => cam && cam.name == "UI Camera"); + } + + if (_perspectiveMainCamera && _perspectiveMainCamera.TryGetComponent(out var perspectiveMaincameraData)) + { + // 获取Stack Cameras + var stackCameras = perspectiveMaincameraData.cameraStack; // 获取UICamera uiCamera = stackCameras.Find(cam => cam && cam.name == "UI Camera"); @@ -221,7 +230,7 @@ namespace AibisDream.Framework /// /// 获取当前激活的相机 - /// + /// public Camera GetCurrentCamera() { return _camInitStateDict.TryGetValue(_curCameraEnum, out var state) && state.isPerspective ? diff --git a/Assets/Scripts/MiniGame/HuoShan/Emo/EmoManager.cs b/Assets/Scripts/MiniGame/HuoShan/Emo/EmoManager.cs index 5ea189e62..adfbd5673 100644 --- a/Assets/Scripts/MiniGame/HuoShan/Emo/EmoManager.cs +++ b/Assets/Scripts/MiniGame/HuoShan/Emo/EmoManager.cs @@ -13,6 +13,7 @@ namespace AibisDream { FixSystemCenter.SystemDic.Register(this); emoView = transform.Find("Emo View").gameObject; + emoView.SetActive(false); var virtualCam = transform.Find("Emo Camera").GetComponent(); var virtualCam2 = transform.Find("Emo Deep Camera").GetComponent(); CameraKit.Instance.RegisterCamera(CameraEnum.Emo, virtualCam); @@ -21,12 +22,14 @@ namespace AibisDream public void OpenView() { - gameObject.SetActive(true); + //gameObject.SetActive(true); + emoView.SetActive(true); } public void CloseView() { - gameObject.SetActive(false); + //gameObject.SetActive(false); + emoView.SetActive(false); } } } \ No newline at end of file diff --git a/Assets/Scripts/MiniGame/HuoShan/Emo/LakeLineDrawer.cs b/Assets/Scripts/MiniGame/HuoShan/Emo/LakeLineDrawer.cs index a9d4856fa..77994ae10 100644 --- a/Assets/Scripts/MiniGame/HuoShan/Emo/LakeLineDrawer.cs +++ b/Assets/Scripts/MiniGame/HuoShan/Emo/LakeLineDrawer.cs @@ -436,15 +436,17 @@ public class LakeLineDrawer : ImmediateModeShapeDrawer { if (Application.isPlaying && Input.GetMouseButtonDown(0)) { - Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); + Camera currentCamera = CameraKit.Instance.GetCurrentCamera(); + Ray ray = currentCamera.ScreenPointToRay(Input.mousePosition); if (Physics.Raycast(ray, out RaycastHit hit)) { Vector3 hitPos = hit.point; - + // 考虑followOffset的影响 + Vector3 localHitPos = hitPos - transform.position; ripples.Add(new Ripple { - position = new Vector2(hitPos.x, hitPos.z), + position = new Vector2(localHitPos.x, localHitPos.z), startTime = Time.time }); } @@ -1348,7 +1350,7 @@ public class LakeLineDrawer : ImmediateModeShapeDrawer // 更新位置 float floatOffset = elapsed * textFloatSpeed; - Vector3 targetPosition = text.startPosition + Vector3.up * floatOffset; + Vector3 targetPosition = text.originalPosition + Vector3.up * floatOffset; // 处理震动效果 if (text.shouldShake) @@ -1363,7 +1365,8 @@ public class LakeLineDrawer : ImmediateModeShapeDrawer } } - text.textComponent.transform.position = targetPosition; + // 应用父物体的变换 + text.textComponent.transform.position = transform.TransformPoint(targetPosition); // 更新透明度 if (elapsed < textFadeInDuration) @@ -1408,8 +1411,8 @@ public class LakeLineDrawer : ImmediateModeShapeDrawer tmp.text = text; tmp.color = new Color(color.r, color.g, color.b, 0f); // 初始透明 - // 设置世界空间位置 - textObj.transform.position = position; + // 设置世界空间位置，考虑父物体的变换 + textObj.transform.position = transform.TransformPoint(position); floatingTexts.Add(new FloatingText { @@ -1417,7 +1420,9 @@ public class LakeLineDrawer : ImmediateModeShapeDrawer startTime = Time.time, startPosition = position, targetColor = color, - shouldShake = shouldShake + shouldShake = shouldShake, + shakeStartTime = shouldShake ? Time.time : 0f, + originalPosition = position }); } }