Merge branch 'main' of https://github.com/cytsai1008/PixelRPG-Python

Author: tysonyu0304

Error_Window.py

@@ -49,6 +49,7 @@ def setupUi(self, Form):
         self.retranslateUi(Form)
 
         QMetaObject.connectSlotsByName(Form)
+
     # setupUi
 
     def retranslateUi(self, Form):

YouLose.py

@@ -1,7 +1,7 @@
 import argparse
 import sys
 
-from PySide2 import QtWidgets
+from PySide2 import QtWidgets, QtGui, QtCore
 from PySide2.QtCore import Qt
 from PySide2.QtGui import QFontDatabase, QPixmap
 from PySide2.QtWidgets import QSplashScreen
@@ -35,8 +35,17 @@ def __init__(self):
     app = QtWidgets.QApplication()
     pixmap = QPixmap("Launcher Asset/Logo_Splash.png")
     splash = QSplashScreen(pixmap)
+    splashlabel = QtWidgets.QLabel(splash)
+    splashgif = QtGui.QMovie("Launcher Asset/Logo_Splash.gif")
+    splashlabel.setMovie(splashgif)
+    splashgif.start()
     splash.show()
     splash.showMessage("Thanks for playing", Qt.AlignBottom, Qt.black)
+    delayTime = 1.3
+    timer = QtCore.QElapsedTimer()
+    timer.start()
+    while timer.elapsed() < delayTime * 1000:
+        app.processEvents()
     window = MainWindow()
     window.show()
     splash.finish(window)

cc_main.py

@@ -224,9 +224,9 @@ def play(self):
     splash.show()
     splash.showMessage("Magician makes our game suck...", Qt.AlignBottom, Qt.black)
     delayTime = 1.3
-    timer=QtCore.QElapsedTimer()
+    timer = QtCore.QElapsedTimer()
     timer.start()
-    while timer.elapsed()<delayTime * 1000:
+    while timer.elapsed() < delayTime * 1000:
         app.processEvents()
     window = MainWindow_cc()
     window.show()

cc_main_localization.py

@@ -1,6 +1,6 @@
 def set_hant(self):
-    self.ui.cc1.setText("選弓箭手")
-    self.ui.cc2.setText("選騎士")
+    self.ui.cc1.setText("弓箭手")
+    self.ui.cc2.setText("騎士")
     self.ui.play.setText("開始遊戲")
     self.ui.cc3.setText("法師")
     self.ui.cc4.setText("刺客")
@@ -15,11 +15,11 @@ def set_hant(self):
 
 
 def set_hans(self):
-    self.ui.cc1.setText("选弓箭手")
-    self.ui.cc2.setText("选骑士")
+    self.ui.cc1.setText("弓箭手")
+    self.ui.cc2.setText("骑士")
     self.ui.play.setText("开始游戏")
-    self.ui.cc3.setText("选法师")
-    self.ui.cc4.setText("选刺客")
+    self.ui.cc3.setText("法师")
+    self.ui.cc4.setText("刺客")
     self.ui.Archer.setText("弓箭手")
     self.ui.Knight.setText("骑士")
     self.ui.Magician.setText("法师")

main.py

@@ -71,7 +71,7 @@ def CheckPyInstaller():
         else:
             print("pass")
 
-except Exception:
+except:
     print("[ERROR] Unknown game error, please report to developer.")
     import pygame
 
@@ -81,7 +81,8 @@ def CheckPyInstaller():
     date = datetime.utcnow().strftime("%Y-%m-%d_%H.%M.%S")
     if not os.path.exists("ErrorLog"):
         os.mkdir("ErrorLog")
-    with open("ErrorLog/traceback_{}_lv.{}.txt".format(date, lvl), "w") as f:
+    with open("ErrorLog/traceback_{}_lv.{}.txt".format(date, lvl), "a") as f:
+        f.write("Error Occurred on lv." + str(lvl) + "\n\n")
         f.write(error_data)
     if CheckPyInstaller():
         subprocess.call("ErrorWindow.exe")