From 268bb61d51cb9ed2e9f7493472e0555e32a0a832 Mon Sep 17 00:00:00 2001 From: yentong Date: Wed, 19 Nov 2025 14:58:25 +0800 Subject: [PATCH] =?UTF-8?q?<=E8=A7=A3=E6=B1=BAQ25.27.28.29>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExportStick/Scripts/Incensegamemanager.cs | 46 ++ Assets/Scenes/Server/ServerWorkScene.unity | 495 +++++++++++++----- .../Scripts/Server/ServerGameTypingPanel.cs | 4 +- 3 files changed, 401 insertions(+), 144 deletions(-) diff --git a/Assets/ExportStick/Scripts/Incensegamemanager.cs b/Assets/ExportStick/Scripts/Incensegamemanager.cs index a79e146..89fc190 100644 --- a/Assets/ExportStick/Scripts/Incensegamemanager.cs +++ b/Assets/ExportStick/Scripts/Incensegamemanager.cs @@ -21,6 +21,7 @@ public class IncenseGameManager : MonoBehaviour public GameObject gameOverUI; // 遊戲結束後的UI public GameObject resultIncense; // 結果畫面的香 public TextMeshProUGUI angleDisplayText; // 顯示角度的文字 + public TextMeshProUGUI gameOverTimerText; // ✅ 新增：GameOver倒計時文字 [Header("Game Settings")] public float gameTime = 30f; @@ -28,6 +29,7 @@ public class IncenseGameManager : MonoBehaviour public int correctIncenseReward = 5; public int wrongIncensePenalty = 5; public float popupDuration = 1f; + public int gameOverCountdownSec = 10; // ✅ 新增：GameOver倒計時秒數 [Header("Result Settings")] public float receivedAngle = 87.5f; // 假的接收角度，之後會從另一台電腦接收 @@ -43,6 +45,7 @@ public class IncenseGameManager : MonoBehaviour private int correctIncenseCount = 5; private int totalIncenseCount = 20; private bool gameActive = true; + private int gameOverCountdownVal; // ✅ 新增：當前倒計時數值 void Start() { @@ -301,6 +304,46 @@ public class IncenseGameManager : MonoBehaviour // 更新系統訊息 systemMessageText.text = "系統提示：這是客戶為您插的香的數值，請根據結果評估調整客戶報表。"; + + // ✅ 啟動GameOver倒計時 + gameOverCountdownVal = gameOverCountdownSec; + StartCoroutine(GameOverCountdown()); + } + + // ✅ 新增：GameOver倒計時協程 + IEnumerator GameOverCountdown() + { + while (gameOverCountdownVal > 0) + { + // 更新倒計時文字 + if (gameOverTimerText != null) + { + gameOverTimerText.text = $"倒計時 : {gameOverCountdownVal}秒"; + } + + yield return new WaitForSeconds(1f); + gameOverCountdownVal--; + } + + // 倒計時結束後的處理 + if (gameOverTimerText != null) + { + gameOverTimerText.text = "時間到！"; + } + + // ✅ 這裡可以添加倒計時結束後要執行的動作 + // 例如：跳轉場景、顯示下一個畫面等 + OnGameOverCountdownFinished(); + } + + // ✅ 新增：倒計時結束後的處理方法 + void OnGameOverCountdownFinished() + { + // 在這裡添加倒計時結束後要做的事 + // 例如： + // SceneManager.LoadScene("NextScene"); + // 或者呼叫其他控制器的方法 + Debug.Log("GameOver倒計時結束！"); } void ClearAllIncense() @@ -348,6 +391,9 @@ public class IncenseGameManager : MonoBehaviour public void RestartGame() { + // ✅ 停止倒計時協程 + StopAllCoroutines(); + // 清除現有的香 ClearAllIncense(); diff --git a/Assets/Scenes/Server/ServerWorkScene.unity b/Assets/Scenes/Server/ServerWorkScene.unity index ac64287..f6b7a00 100644 --- a/Assets/Scenes/Server/ServerWorkScene.unity +++ b/Assets/Scenes/Server/ServerWorkScene.unity @@ -3955,9 +3955,9 @@ RectTransform: m_Father: {fileID: 856404095} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -17, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &209353858 MonoBehaviour: @@ -4557,7 +4557,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &275645661 RectTransform: m_ObjectHideFlags: 0 @@ -6055,8 +6055,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1887351187} m_HandleRect: {fileID: 1887351186} m_Direction: 2 - m_Value: 1.0000005 - m_Size: 0.79486334 + m_Value: 1.0000014 + m_Size: 0.7948634 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -6099,126 +6099,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 399836002} m_CullTransparentMesh: 1 ---- !u!1 &406328983 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 406328984} - - component: {fileID: 406328987} - - component: {fileID: 406328986} - - component: {fileID: 406328985} - m_Layer: 5 - m_Name: GameTypingPlaySendButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &406328984 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 406328983} - 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: 1724854930} - 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: 698.18176, y: -23.667181} - m_SizeDelta: {x: 160, y: 80} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &406328985 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 406328983} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Button - 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: 406328986} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &406328986 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 406328983} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image - 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: 5722358079080299248, guid: c8d39cf382d405146831dc8aacddc3cb, 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 &406328987 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 406328983} - m_CullTransparentMesh: 1 --- !u!1 &416352417 GameObject: m_ObjectHideFlags: 0 @@ -8212,10 +8092,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 631945161} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 458.341, y: -150} + m_SizeDelta: {x: 916.682, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &542996589 MonoBehaviour: @@ -8621,13 +8501,109 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1321235256} m_Modifications: + - target: {fileID: 47965284271854679, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_SizeDelta.x + value: 331.239 + objectReference: {fileID: 0} + - target: {fileID: 47965284271854679, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_SizeDelta.y + value: 92.998 + objectReference: {fileID: 0} + - target: {fileID: 47965284271854679, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_LocalScale.x + value: 1.145778 + objectReference: {fileID: 0} + - target: {fileID: 47965284271854679, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_LocalScale.y + value: 1.145778 + objectReference: {fileID: 0} + - target: {fileID: 47965284271854679, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_LocalScale.z + value: 1.145778 + objectReference: {fileID: 0} + - target: {fileID: 47965284271854679, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_AnchoredPosition.x + value: -189.77032 + objectReference: {fileID: 0} + - target: {fileID: 47965284271854679, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_AnchoredPosition.y + value: 53.277 + objectReference: {fileID: 0} + - target: {fileID: 72629545184370155, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_LocalScale.x + value: 1.5229579 + objectReference: {fileID: 0} + - target: {fileID: 72629545184370155, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_LocalScale.y + value: 1.5229579 + objectReference: {fileID: 0} + - target: {fileID: 72629545184370155, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_LocalScale.z + value: 1.5229579 + objectReference: {fileID: 0} + - target: {fileID: 329179080053991906, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_AnchoredPosition.y + value: 307 + objectReference: {fileID: 0} + - target: {fileID: 581072598101537572, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 651126437277436024, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 919034681456071045, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 1131574319569529153, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 1180834307518303390, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_Color.a + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1742061934084195943, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} propertyPath: m_Name value: GameStickPanel objectReference: {fileID: 0} - target: {fileID: 1742061934084195943, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2133268950409196476, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2231067725782904524, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 2405170022166248671, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 3871801641403187888, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_LocalScale.x + value: 0.87999 + objectReference: {fileID: 0} + - target: {fileID: 3871801641403187888, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_LocalScale.y + value: 1.1136 + objectReference: {fileID: 0} + - target: {fileID: 3871801641403187888, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_AnchoredPosition.x + value: 67 + objectReference: {fileID: 0} + - target: {fileID: 3871801641403187888, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_AnchoredPosition.y + value: 252 + objectReference: {fileID: 0} + - target: {fileID: 4463233489734115392, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} - target: {fileID: 4601243148530083897, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} propertyPath: m_Pivot.x @@ -8663,7 +8639,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4601243148530083897, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 1.06 objectReference: {fileID: 0} - target: {fileID: 4601243148530083897, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} propertyPath: m_LocalScale.y @@ -8703,11 +8679,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4601243148530083897, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} propertyPath: m_AnchoredPosition.x - value: 434 + value: 403 objectReference: {fileID: 0} - target: {fileID: 4601243148530083897, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} propertyPath: m_AnchoredPosition.y - value: -94 + value: -100 objectReference: {fileID: 0} - target: {fileID: 4601243148530083897, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -8725,6 +8701,10 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 0 objectReference: {fileID: 0} + - target: {fileID: 5283137251124831651, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5304771535841513772, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size value: 1 @@ -8753,6 +8733,54 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 5305778023674258060, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 5540915354820252016, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_LocalScale.x + value: 0.91515 + objectReference: {fileID: 0} + - target: {fileID: 5540915354820252016, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_LocalScale.y + value: 0.91515 + objectReference: {fileID: 0} + - target: {fileID: 5540915354820252016, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_LocalScale.z + value: 0.91515 + objectReference: {fileID: 0} + - target: {fileID: 5661357980448630154, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5914365852029555227, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6824779407304782342, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_LocalScale.x + value: 1.5736984 + objectReference: {fileID: 0} + - target: {fileID: 6824779407304782342, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_LocalScale.y + value: 1.5736984 + objectReference: {fileID: 0} + - target: {fileID: 6824779407304782342, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_LocalScale.z + value: 1.5736984 + objectReference: {fileID: 0} + - target: {fileID: 7071522574065366770, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7071522574065366770, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_SizeDelta.y + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 7071522574065366770, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_AnchoredPosition.y + value: -2 + objectReference: {fileID: 0} - target: {fileID: 7262278810949874146, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -8793,9 +8821,53 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} + - target: {fileID: 7749027616564682098, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 8172632796512038102, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_LocalScale.x + value: 0.91499263 + objectReference: {fileID: 0} + - target: {fileID: 8172632796512038102, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_LocalScale.y + value: 0.8973966 + objectReference: {fileID: 0} + - target: {fileID: 8172632796512038102, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_LocalScale.z + value: 0.8798006 + objectReference: {fileID: 0} + - target: {fileID: 8172632796512038102, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_AnchoredPosition.y + value: 135 + objectReference: {fileID: 0} + - target: {fileID: 8188445172156617709, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 8383107561747378758, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 8526259783313736827, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: backgroundImage + value: + objectReference: {fileID: 0} + - target: {fileID: 8526259783313736827, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: gameOverTimerText + value: + objectReference: {fileID: 1917579884} + - target: {fileID: 8928120160175026008, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 1441288847039178224, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3217752302056467553, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + insertIndex: -1 + addedObject: {fileID: 1917579883} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} --- !u!224 &584122157 stripped @@ -10451,7 +10523,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &732267258 RectTransform: m_ObjectHideFlags: 0 @@ -13946,7 +14018,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 994591509} m_CullTransparentMesh: 1 - --- !u!1 &1005195137 GameObject: m_ObjectHideFlags: 0 @@ -17864,7 +17935,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1374783641 RectTransform: m_ObjectHideFlags: 0 @@ -21527,6 +21598,11 @@ MonoBehaviour: audioSource: {fileID: 0} buttonClickSound: {fileID: 0} confirmSound: {fileID: 0} +--- !u!224 &1648794898 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3217752302056467553, guid: 8c3e8d5430f6ce145b97407a9411b8a2, type: 3} + m_PrefabInstance: {fileID: 584122156} + m_PrefabAsset: {fileID: 0} --- !u!1 &1658875712 GameObject: m_ObjectHideFlags: 0 @@ -22395,7 +22471,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1864503258} - - {fileID: 406328984} m_Father: {fileID: 275645661} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -25039,8 +25114,8 @@ RectTransform: m_Children: [] m_Father: {fileID: 1980493388} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0.20513667} + m_AnchorMax: {x: 1, y: 0.9999999} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -25355,6 +25430,142 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1917579882 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1917579883} + - component: {fileID: 1917579885} + - component: {fileID: 1917579884} + m_Layer: 5 + m_Name: TimerText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1917579883 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1917579882} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.91515136, y: 0.91515726, z: 0.91515726} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1648794898} + 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.000030517578, y: 416} + m_SizeDelta: {x: 500, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1917579884 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1917579882} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\u5012\u8A08\u6642 : 10" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: da50ad6a8c256b045a7ca0652ca50fe4, type: 2} + m_sharedMaterial: {fileID: -4452521722326114606, guid: da50ad6a8c256b045a7ca0652ca50fe4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190335 + m_fontColor: {r: 1, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 55 + m_fontSizeBase: 55 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1917579885 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1917579882} + m_CullTransparentMesh: 1 --- !u!1 &1920360844 GameObject: m_ObjectHideFlags: 0 @@ -27553,7 +27764,7 @@ VideoPlayer: m_ControlledAudioTrackCount: 1 m_PlayOnAwake: 0 m_SkipOnDrop: 1 - m_Looping: 0 + m_Looping: 1 m_WaitForFirstFrame: 1 m_FrameReadyEventEnabled: 0 m_VideoShaders: [] diff --git a/Assets/Scripts/Server/ServerGameTypingPanel.cs b/Assets/Scripts/Server/ServerGameTypingPanel.cs index 09d013c..08b6612 100644 --- a/Assets/Scripts/Server/ServerGameTypingPanel.cs +++ b/Assets/Scripts/Server/ServerGameTypingPanel.cs @@ -26,7 +26,7 @@ public class ServerGameTypingPanel : MonoBehaviour private CustomerReportSystem customReportScript; - private int gameTimeCountdownSecVal = 60; + private int gameTimeCountdownSecVal = 10; private void Awake() { @@ -41,7 +41,7 @@ public class ServerGameTypingPanel : MonoBehaviour introPanel.SetActive(step == 1); if (step == 1) { - gameTimeCountdownSecVal = 60; + gameTimeCountdownSecVal = 10; if (introVideoPlayer) { introVideoPlayer.Play();