diff --git a/Assets/Scenes/main.unity b/Assets/Scenes/main.unity index ed335e0..15a82f9 100644 --- a/Assets/Scenes/main.unity +++ b/Assets/Scenes/main.unity @@ -1336,8 +1336,8 @@ Transform: m_GameObject: {fileID: 30774412} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -8.382, y: 0.184, z: -8.86} - m_LocalScale: {x: 0.14200392, y: 0.14200392, z: 0.14200392} + m_LocalPosition: {x: -8.512, y: 0.581, z: -8.954} + m_LocalScale: {x: 0.17588606, y: 0.17588606, z: 0.17588606} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 959961359} @@ -3285,7 +3285,7 @@ MonoBehaviour: _idleDuration: 2 _fadeDuration: 1 _fallHoldDuration: 1.5 - _enableOpeningFlow: 1 + _enableOpeningFlow: 0 _basketballClip: {fileID: 8300000, guid: 25ff553be9c84452ab0a39fbfd06be77, type: 3} _manCallClip: {fileID: 8300000, guid: bc5816d37e79f4461a243f63cd20c925, type: 3} --- !u!114 &441640517 @@ -3302,7 +3302,7 @@ MonoBehaviour: m_EditorClassIdentifier: _homeBg: {fileID: 8300000, guid: 28a93a41087664f1d9f83a456d17928f, type: 3} _experimentBg: {fileID: 8300000, guid: 4f431e6ae1b9f4b94a61c31fe630647a, type: 3} - BgVolume: 0.5 + BgVolume: 0.239 _basketballSfx: {fileID: 8300000, guid: 25ff553be9c84452ab0a39fbfd06be77, type: 3} _manCallSfx: {fileID: 8300000, guid: bc5816d37e79f4461a243f63cd20c925, type: 3} --- !u!1 &458363765 @@ -6572,7 +6572,7 @@ MonoBehaviour: m_EditorClassIdentifier: chanraoObject: {fileID: 922948973} nextPing: {fileID: 1491444205} - pingIndex: 0 + pingIndex: 2 --- !u!1 &1127144482 GameObject: m_ObjectHideFlags: 0 @@ -9231,7 +9231,7 @@ MonoBehaviour: m_EditorClassIdentifier: chanraoObject: {fileID: 439600668} nextPing: {fileID: 0} - pingIndex: 0 + pingIndex: 3 --- !u!1 &1579053217 GameObject: m_ObjectHideFlags: 0 @@ -11164,7 +11164,7 @@ MonoBehaviour: m_EditorClassIdentifier: chanraoObject: {fileID: 381534988} nextPing: {fileID: 1122165351} - pingIndex: 0 + pingIndex: 1 --- !u!1 &1870948488 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Interaction/PingClickHandler.cs b/Assets/Scripts/Interaction/PingClickHandler.cs index cd1545e..83f1008 100644 --- a/Assets/Scripts/Interaction/PingClickHandler.cs +++ b/Assets/Scripts/Interaction/PingClickHandler.cs @@ -45,8 +45,8 @@ public class PingClickHandler : MonoBehaviour _outlineRenderer = ringGo.AddComponent(); _outlineRenderer.useWorldSpace = true; _outlineRenderer.loop = true; - _outlineRenderer.startWidth = 0.04f; - _outlineRenderer.endWidth = 0.04f; + _outlineRenderer.startWidth = 0.015f; + _outlineRenderer.endWidth = 0.015f; _outlineRenderer.material = new Material(Shader.Find("Unlit/Color")); _outlineRenderer.material.color = new Color(0.2f, 0.5f, 1f); _outlineRenderer.startColor = new Color(0.2f, 0.5f, 1f); diff --git a/Assets/Scripts/Interaction/TouchPositionHandler.cs b/Assets/Scripts/Interaction/TouchPositionHandler.cs index c092705..4f0e090 100644 --- a/Assets/Scripts/Interaction/TouchPositionHandler.cs +++ b/Assets/Scripts/Interaction/TouchPositionHandler.cs @@ -72,6 +72,18 @@ public class TouchPositionHandler : MonoBehaviour var sm = FindObjectOfType(); if (sm != null) sm.RecordWomanStep(stepIndex); + // point1 点击后激活第一个 ping + if (stepIndex == 1) + { + var mi = GameObject.Find("manInjury"); + if (mi != null) + { + var ping4 = mi.transform.Find("ping.004"); + if (ping4 != null) { ping4.gameObject.SetActive(true); Debug.Log("[TouchPosition] ping.004 已激活"); } + FindObjectOfType()?.InitPingSteps(); + } + } + StopAllCoroutines(); if (_meshRenderer != null) _meshRenderer.enabled = false; diff --git a/Assets/Scripts/UI/PageController.cs b/Assets/Scripts/UI/PageController.cs index 0572432..6f5d97a 100644 --- a/Assets/Scripts/UI/PageController.cs +++ b/Assets/Scripts/UI/PageController.cs @@ -283,6 +283,15 @@ public class PageController : MonoBehaviour var touch = GameObject.Find("touchArray"); if (touch != null && touch.transform.childCount > 0) { touch.transform.GetChild(0).gameObject.SetActive(true); Debug.Log("PageController: touchArray/point1 已显示"); + // 自动播放第一段 woman 语音 + var am = FindObjectOfType(); + if (am != null) { +#if UNITY_EDITOR + var autoClip = UnityEditor.AssetDatabase.LoadAssetAtPath("Assets/Audio/people/周围环境安全,我是救护志愿者,我可以帮助您吗.mp3"); + if (autoClip != null) am.PlayVoice(autoClip); +#endif + } + // 激活第一个 ping (ping.004) var mi = GameObject.Find("manInjury"); if (mi != null) {