2 Revize 70512de0b0 ... a00a907ccc

Autor SHA1 Zpráva Datum
  DESKTOP-5BUCSUT\LSR a00a907ccc Merge branch 'main' of http://139.155.244.27:822/LSR/gouhuo před 1 rokem
  DESKTOP-5BUCSUT\LSR ebbfdfd527 倒计时逻辑 před 1 rokem

+ 1 - 1
SFGgouhuo/Assets/Bundles/Model/player1.prefab

@@ -9493,7 +9493,7 @@ Transform:
   m_GameObject: {fileID: 8652409392458568970}
   m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
   m_LocalPosition: {x: 24.13, y: 0.64, z: 88.8}
-  m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
+  m_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
   m_Children:
   - {fileID: 3723992400915137970}
   - {fileID: 4961255820563013161}

+ 1 - 0
SFGgouhuo/Assets/Bundles/Scenes/MainScene.unity

@@ -94206,6 +94206,7 @@ MonoBehaviour:
   - {fileID: 2545337257317020870}
   - {fileID: 5617784220094612664}
   - {fileID: 4284569451592763258}
+  door: {fileID: 138905738}
 --- !u!1 &919132149083932746
 GameObject:
   m_ObjectHideFlags: 0

+ 5 - 5
SFGgouhuo/Assets/Bundles/UI/Prefab/GuidePanel.prefab

@@ -28,15 +28,15 @@ RectTransform:
   m_GameObject: {fileID: 1531410259990517724}
   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_LocalScale: {x: 0.81172, y: 0.81172, z: 0.81172}
   m_Children: []
   m_Father: {fileID: 592131115250203524}
   m_RootOrder: 1
   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: 69.5}
-  m_SizeDelta: {x: 1306, y: 941}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -409}
+  m_SizeDelta: {x: 1316, y: 941}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7040397790251409120
 CanvasRenderer:

+ 8 - 1
SFGgouhuo/Assets/Scripts/TimeCounting.cs

@@ -10,7 +10,8 @@ public class TimeCounting : MonoBehaviour
     public List<GameObject> numPrefabs;
     public List<GameObject> tempNum;
     public List<Transform> pos;
-    private long finishTime = 1705741200;
+    public GameObject door;
+    private long finishTime = 1705644720;
     private long nowTime;
     private double sum;
     private int hours;
@@ -48,6 +49,12 @@ public class TimeCounting : MonoBehaviour
     private void Countdown() 
     {
         sum -= (double)Time.deltaTime;
+        if (sum <= 0) 
+        {
+            door.SetActive(false);
+            gameObject.SetActive(false);
+            return;
+        }
         DateTime dateTime = DateTimeOffset.FromUnixTimeSeconds((long)sum).DateTime;
         int day = dateTime.Day;
         hours = dateTime.Hour + (day - 1) * 24;

+ 83 - 83
SFGgouhuo/Assets/Scripts/UI/Component/MainPanel.cs

@@ -1,87 +1,87 @@
-using Cysharp.Threading.Tasks.Triggers;
-using System.Collections;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using TMPro;
-using UnityEngine;
-using UnityEngine.EventSystems;
-using UnityEngine.UI;
-
-public class MainPanel : BasePanel
-{
-    public Button BagButtonBG;
-    public Image BagButton;
-    public Button GuideButton;
-    public Button LanguageButton;
-    public Button ExitBtn;
-    public Image HashImage;
-    public TextMeshPro HashText;
-
-    private void Awake()
-    {
-        BagButtonBG.onClick.AddListener(async () =>
-        {
-            await UIManager.Instance.ShowUI(WindowID.FaceBuildPanel);
-            CharacterManager.UICam.gameObject.SetActive(true);
-            UIManager.Instance.HideUI(WindowID.MainPanel);
-            BagButtonBG.GetComponent<BagButtonChangeUI>().ResetUI();
-            GuideButton.GetComponent<GuideButtonChangeUI>().ResetUI();
-#if UNITY_STANDALONE_WIN
-#elif UNITY_ANDROID
-            UIManager.Instance.HideUI(WindowID.MobilePanel);
-#elif UNITY_WEBGL
-#endif
-        });
+using Cysharp.Threading.Tasks.Triggers;
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using TMPro;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+
+public class MainPanel : BasePanel
+{
+    public Button BagButtonBG;
+    public Image BagButton;
+    public Button GuideButton;
+    public Button LanguageButton;
+    public Button ExitBtn;
+    public Image HashImage;
+    public TextMeshPro HashText;
+
+    private void Awake()
+    {
+        BagButtonBG.onClick.AddListener(async () =>
+        {
+            await UIManager.Instance.ShowUI(WindowID.FaceBuildPanel);
+            CharacterManager.UICam.gameObject.SetActive(true);
+            UIManager.Instance.HideUI(WindowID.MainPanel);
+            BagButtonBG.GetComponent<BagButtonChangeUI>().ResetUI();
+            GuideButton.GetComponent<GuideButtonChangeUI>().ResetUI();
+#if UNITY_STANDALONE_WIN
+#elif UNITY_ANDROID
+            UIManager.Instance.HideUI(WindowID.MobilePanel);
+#elif UNITY_WEBGL
+#endif
+        });
         ExitBtn.onClick.AddListener(async () =>
         {
             await UIManager.Instance.ShowUI(WindowID.DlgExitPop);
-        });
-        GuideButton.onClick.AddListener(async () =>
+        });
+        GuideButton.onClick.AddListener(async () =>
+        {
+#if UNITY_STANDALONE_WIN
+            await UIManager.Instance.ShowUI(WindowID.GuidePanel);
+#elif UNITY_ANDROID
+            await UIManager.Instance.ShowUI(WindowID.GuidePanel_Mobile);
+#elif UNITY_WEBGL
+#endif
+        });
+
+    }
+    private async void Update()
+    {
+        if(Input.GetKeyDown(KeyCode.B))
+        {
+            await UIManager.Instance.ShowUI(WindowID.FaceBuildPanel);
+            CharacterManager.UICam.gameObject.SetActive(true);
+            UIManager.Instance.HideUI(WindowID.MainPanel);
+            BagButtonBG.GetComponent<BagButtonChangeUI>().ResetUI();
+            GuideButton.GetComponent<GuideButtonChangeUI>().ResetUI();
+#if UNITY_STANDALONE_WIN
+#elif UNITY_ANDROID
+            UIManager.Instance.HideUI(WindowID.MobilePanel);
+#elif UNITY_WEBGL
+#endif
+        }
+        if (Input.GetKeyDown(KeyCode.X))
         {
-#if UNITY_STANDALONE_WIN
-            await UIManager.Instance.ShowUI(WindowID.GuidePanel);
-#elif UNITY_ANDROID
-            await UIManager.Instance.ShowUI(WindowID.GuidePanel_Mobile);
-#elif UNITY_WEBGL
-#endif
-        });
-
-    }
-    private async void Update()
-    {
-        if(Input.GetKeyDown(KeyCode.B))
-        {
-            await UIManager.Instance.ShowUI(WindowID.FaceBuildPanel);
-            CharacterManager.UICam.gameObject.SetActive(true);
-            UIManager.Instance.HideUI(WindowID.MainPanel);
-            BagButtonBG.GetComponent<BagButtonChangeUI>().ResetUI();
-            GuideButton.GetComponent<GuideButtonChangeUI>().ResetUI();
-#if UNITY_STANDALONE_WIN
-#elif UNITY_ANDROID
-            UIManager.Instance.HideUI(WindowID.MobilePanel);
-#elif UNITY_WEBGL
-#endif
-        }
-        if (Input.GetKeyDown(KeyCode.X))
-        {
-            await UIManager.Instance.ShowUI(WindowID.GuidePanel);
-        }
-
-        if (Input.GetKeyDown(KeyCode.Escape))
-        {
-            await UIManager.Instance.ShowUI(WindowID.DlgExitPop);
-        }
-    }
-    public override void OnCloseWindow() { }
-
-    public override void OnDestroyWindow() { }
-
-    public override void OnInitWindow() {}
-
-    public override void OnShowWindow()
-    {
-        //HashText.text = "ID: " + StepManager.userID;
-        BagButtonBG.GetComponent<BagButtonChangeUI>().ResetUI();
-        GuideButton.GetComponent<GuideButtonChangeUI>().ResetUI();
-    }
-}
+            await UIManager.Instance.ShowUI(WindowID.GuidePanel);
+        }
+
+        if (Input.GetKeyDown(KeyCode.Escape))
+        {
+            await UIManager.Instance.ShowUI(WindowID.DlgExitPop);
+        }
+    }
+    public override void OnCloseWindow() { }
+
+    public override void OnDestroyWindow() { }
+
+    public override void OnInitWindow() {}
+
+    public override void OnShowWindow()
+    {
+        //HashText.text = "ID: " + StepManager.userID;
+        BagButtonBG.GetComponent<BagButtonChangeUI>().ResetUI();
+        GuideButton.GetComponent<GuideButtonChangeUI>().ResetUI();
+    }
+}