<串好神明插香跟修正問題19.21>

Assets/Scenes/Client/ClientWorkMessageResultExitScene.unity

@@ -637,6 +637,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1517595439450411210, guid: 417fcf62987878e44bd784ea552f37bd, type: 3}
+      propertyPath: m_PresetInfoIsWorld
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1871740932565074069, guid: 417fcf62987878e44bd784ea552f37bd, type: 3}
       propertyPath: m_Text
       value: "\u6709\u4EFB\u4F55\u5EFA\u8B70\u55CE?\u597D\u58DE\u90FD\u6B61\u8FCE"
@@ -723,7 +727,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4662508893445052427, guid: 417fcf62987878e44bd784ea552f37bd, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 1945
+      value: 238
+      objectReference: {fileID: 0}
+    - target: {fileID: 4662508893445052427, guid: 417fcf62987878e44bd784ea552f37bd, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -170.2522
       objectReference: {fileID: 0}
     - target: {fileID: 4739635702114211264, guid: 417fcf62987878e44bd784ea552f37bd, type: 3}
       propertyPath: m_AnchorMax.y

Assets/Scenes/Server/ServerWorkScene.unity

@@ -4557,7 +4557,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &275645661
 RectTransform:
   m_ObjectHideFlags: 0
@@ -5599,7 +5599,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &378959847
 RectTransform:
   m_ObjectHideFlags: 0
@@ -6055,6 +6055,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1887351187}
   m_HandleRect: {fileID: 1887351186}
   m_Direction: 2
+<<<<<<< HEAD
   m_Value: 1.0000005
   m_Size: 0.79486334
   m_NumberOfSteps: 0
@@ -13946,6 +13947,8 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 994591509}
   m_CullTransparentMesh: 1
+<<<<<<< HEAD
+
 --- !u!1 &1005195137
 GameObject:
   m_ObjectHideFlags: 0
@@ -14304,8 +14307,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1558618296}
   m_HandleRect: {fileID: 1558618295}
   m_Direction: 2
-  m_Value: 1.0000002
-  m_Size: 0.45957997
+  m_Value: 1
+  m_Size: 0.45958003
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -18863,7 +18866,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1473517359
 RectTransform:
   m_ObjectHideFlags: 0
@@ -19795,7 +19798,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1521836357
 RectTransform:
   m_ObjectHideFlags: 0
@@ -22735,7 +22738,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 810756926}
   m_Direction: 0
   m_Value: 0
-  m_Size: 0.9999999
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:

Assets/Scripts/Client/ClientGameTypingSceneController.cs

@@ -67,7 +67,7 @@ public class ClientGameTypingSceneController : MonoBehaviour
             introPanel.SetActive(step == 1);
             if (step == 1)
             {
-                playCountdownSecVal = 10;
+                playCountdownSecVal = 60;
                 StartCoroutine(NextStep(2, 3));
             }
         }