diff --git a/.gitignore b/.gitignore
index a14cfb8..b5c8977 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,3 +98,4 @@ InitTestScene*.unity*
# Auto-generated scenes by play mode tests
/[Aa]ssets/[Ii]nit[Tt]est[Ss]cene*.unity*
+.idea/
diff --git a/Assets/Scenes/Server/ServerWorkScene.unity b/Assets/Scenes/Server/ServerWorkScene.unity
index b93aa43..d2dc6e7 100644
--- a/Assets/Scenes/Server/ServerWorkScene.unity
+++ b/Assets/Scenes/Server/ServerWorkScene.unity
@@ -680,6 +680,7 @@ RectTransform:
- {fileID: 669591507}
- {fileID: 1799202180}
- {fileID: 1586239280}
+ - {fileID: 210382441}
m_Father: {fileID: 85247803}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1674,11 +1675,13 @@ MonoBehaviour:
wordsLeftButton: {fileID: 1799202181}
wordsRightButton: {fileID: 1586239281}
wordsInputField: {fileID: 197304220}
- wordsMessageTypeText: {fileID: 392621887}
+ wordsMessageTypeText: {fileID: 505411232}
wordsMessageText: {fileID: 865729178}
wordsPresentText: {fileID: 700040132}
waittingVideoPlayer: {fileID: 1389573209}
waittingRawImage: {fileID: 1100893614}
+ countdownText: {fileID: 210382442}
+ wordsCountdownTime: 60
--- !u!1 &91459950
GameObject:
m_ObjectHideFlags: 0
@@ -3700,9 +3703,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:
@@ -3755,6 +3758,142 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 209353856}
m_CullTransparentMesh: 1
+--- !u!1 &210382440
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 210382441}
+ - component: {fileID: 210382443}
+ - component: {fileID: 210382442}
+ m_Layer: 5
+ m_Name: Status
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &210382441
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 210382440}
+ 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: 41462179}
+ 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: 480}
+ m_SizeDelta: {x: 200, y: 50}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &210382442
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 210382440}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI
+ 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: XXXXX
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: 2cfe2255ddbc8dc44b75239d2f654cd0, type: 2}
+ m_sharedMaterial: {fileID: -2170148179293471370, guid: 2cfe2255ddbc8dc44b75239d2f654cd0, type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4282532418
+ m_fontColor: {r: 0.25882354, g: 0.25882354, b: 0.25882354, 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: 36
+ m_fontSizeBase: 36
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 1
+ m_HorizontalAlignment: 1
+ m_VerticalAlignment: 256
+ 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: 0
+ 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: -115.43753, 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 &210382443
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 210382440}
+ m_CullTransparentMesh: 1
--- !u!1 &223687182
GameObject:
m_ObjectHideFlags: 0
@@ -7253,10 +7392,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:
@@ -9291,7 +9430,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
@@ -24020,8 +24159,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.20513666}
+ m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
diff --git a/Assets/Scripts/Client/ClientFinalSceneController.cs b/Assets/Scripts/Client/ClientFinalSceneController.cs
index ef84a5b..aa73103 100644
--- a/Assets/Scripts/Client/ClientFinalSceneController.cs
+++ b/Assets/Scripts/Client/ClientFinalSceneController.cs
@@ -20,11 +20,11 @@ public class ClientFinalSceneController : MonoBehaviour
{
SetupVideoPlayer();
- // 開始播放影片
+ // 憪剜曉蔣
if (videoPlayer != null)
{
videoPlayer.Play();
- Debug.Log("開始播放影片");
+ Debug.Log("憪剜曉蔣");
}
}
@@ -32,10 +32,10 @@ public class ClientFinalSceneController : MonoBehaviour
{
if (videoPlayer != null)
{
- // 設置影片結束事件
+ // 閮剔蔭敶梁蝯鈭隞
videoPlayer.loopPointReached += OnVideoFinished;
- // 設置影片顯示
+ // 閮剔蔭敶梁憿舐內
if (videoDisplay != null)
{
videoPlayer.targetTexture = null;
@@ -49,7 +49,7 @@ public class ClientFinalSceneController : MonoBehaviour
void OnVideoFinished(VideoPlayer vp)
{
- Debug.Log("影片播放完成,準備跳轉");
+ Debug.Log("敶梁剜曉嚗皞頝唾");
StartCoroutine(LoadNextScene());
}
diff --git a/Assets/Scripts/Client/ClientGameBackToRealSceneController.cs b/Assets/Scripts/Client/ClientGameBackToRealSceneController.cs
index 0e0ee6d..d01a95e 100644
--- a/Assets/Scripts/Client/ClientGameBackToRealSceneController.cs
+++ b/Assets/Scripts/Client/ClientGameBackToRealSceneController.cs
@@ -20,11 +20,11 @@ public class ClientGameBackToRealSceneController : MonoBehaviour
{
SetupVideoPlayer();
- // 開始播放影片
+ // 憪剜曉蔣
if (videoPlayer != null)
{
videoPlayer.Play();
- Debug.Log("開始播放影片");
+ Debug.Log("憪剜曉蔣");
}
}
@@ -32,10 +32,10 @@ public class ClientGameBackToRealSceneController : MonoBehaviour
{
if (videoPlayer != null)
{
- // 設置影片結束事件
+ // 閮剔蔭敶梁蝯鈭隞
videoPlayer.loopPointReached += OnVideoFinished;
- // 設置影片顯示
+ // 閮剔蔭敶梁憿舐內
if (videoDisplay != null)
{
videoPlayer.targetTexture = null;
@@ -49,7 +49,7 @@ public class ClientGameBackToRealSceneController : MonoBehaviour
void OnVideoFinished(VideoPlayer vp)
{
- Debug.Log("影片播放完成,準備跳轉");
+ Debug.Log("敶梁剜曉嚗皞頝唾");
if (!string.IsNullOrEmpty(ClientLastWordsSceneController.words))
{
StartCoroutine(LoadNextScene());
diff --git a/Assets/Scripts/Client/ClientGameTalkingSceneController.cs b/Assets/Scripts/Client/ClientGameTalkingSceneController.cs
index 6be7ac8..9fda9e1 100644
--- a/Assets/Scripts/Client/ClientGameTalkingSceneController.cs
+++ b/Assets/Scripts/Client/ClientGameTalkingSceneController.cs
@@ -23,7 +23,7 @@ public class ClientGameTalkingSceneController : MonoBehaviour
public Button finishGoToNextButton;
public Button finishBackToMenuButton;
- private int playCountdownSecVal = 120;
+ private int playCountdownSecVal = GlobalData.GAME_TALK_COUNTDOWN_TIME;
private void Awake()
{
@@ -57,7 +57,7 @@ public class ClientGameTalkingSceneController : MonoBehaviour
ClientMessageHandler.Instance.SendMessageToServer("gameTalkingPeopleSay", playMessageInputField.text);
}
- playChatText.text = "-信眾-
" + playMessageInputField.text + "
" + playChatText.text;
+ playChatText.text = "-靽∠-
" + playMessageInputField.text + "
" + playChatText.text;
playMessageInputField.text = "";
}
}
@@ -65,7 +65,7 @@ public class ClientGameTalkingSceneController : MonoBehaviour
public void onReceivedChatMessage(string message)
{
- playChatText.text = "-神明-
" + message + "
" + playChatText.text;
+ playChatText.text = "-蟡-
" + message + "
" + playChatText.text;
}
IEnumerator StatusCountdown()
@@ -74,7 +74,7 @@ public class ClientGameTalkingSceneController : MonoBehaviour
playCountdownSecVal--;
- playCountdownText.text = "時間倒數 " + playCountdownSecVal.ToString() + "秒";
+ playCountdownText.text = " " + playCountdownSecVal.ToString() + "蝘";
if (playCountdownSecVal > 0)
{
@@ -116,7 +116,7 @@ public class ClientGameTalkingSceneController : MonoBehaviour
if (step == 1)
{
playCount++;
- playCountdownSecVal = 120;
+ playCountdownSecVal = GlobalData.GAME_TALK_COUNTDOWN_TIME;
}
}
diff --git a/Assets/Scripts/Client/ClientGameTypingSceneController.cs b/Assets/Scripts/Client/ClientGameTypingSceneController.cs
index 882ec8d..3bb1fc4 100644
--- a/Assets/Scripts/Client/ClientGameTypingSceneController.cs
+++ b/Assets/Scripts/Client/ClientGameTypingSceneController.cs
@@ -35,7 +35,7 @@ public class ClientGameTypingSceneController : MonoBehaviour
playCountdownSecVal--;
- playCountdownText.text = "時間倒數 " + playCountdownSecVal.ToString() + "秒";
+ playCountdownText.text = " " + playCountdownSecVal.ToString() + "蝘";
if (playCountdownSecVal > 0)
{
diff --git a/Assets/Scripts/Client/ClientGlobalMenuManager.cs b/Assets/Scripts/Client/ClientGlobalMenuManager.cs
index 1dccba0..1600693 100644
--- a/Assets/Scripts/Client/ClientGlobalMenuManager.cs
+++ b/Assets/Scripts/Client/ClientGlobalMenuManager.cs
@@ -7,7 +7,7 @@ public class ClientGlobalMenuManager : MonoBehaviour
{
public static ClientGlobalMenuManager Instance;
- [Header("UI 元件")]
+ [Header("UI 隞")]
public GameObject menuButton;
public GameObject menuPanel;
public Button homeButton;
@@ -20,7 +20,7 @@ public class ClientGlobalMenuManager : MonoBehaviour
if (Instance == null)
{
Instance = this;
- // 將整個 Canvas 設為 DontDestroyOnLoad
+ // 撠游 Canvas 閮剔 DontDestroyOnLoad
if (transform.parent != null)
{
DontDestroyOnLoad(transform.root.gameObject);
@@ -44,11 +44,11 @@ public class ClientGlobalMenuManager : MonoBehaviour
void InitializeMenu()
{
- // 確保選單面板一開始是隱藏的
+ // 蝣箔詨桅X蹂憪舫梯
if (menuPanel != null)
menuPanel.SetActive(false);
- // 綁定按鈕事件
+ // 蝬摰鈭隞
if (menuButton != null)
{
Button btn = menuButton.GetComponent