Merge branch 'develop'

KT-Yeh · Mar 23, 2024 · 6480161 · 6480161
2 parents d0e284a + 4a3f3c7
commit 6480161
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 36 deletions.
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/cogs/showcase/ui_genshin.py b/cogs/showcase/ui_genshin.py
@@ -145,7 +145,7 @@ async def showcase(
                 title="找不到角色UID",
             )
         )
-    elif len(str(uid)) != 9 or str(uid)[0] not in ["1", "2", "5", "6", "7", "8", "9"]:
+    elif len(str(uid)) < 9 or len(str(uid)) > 10 or str(uid)[0] not in ["1", "2", "5", "6", "7", "8", "9"]:
         await interaction.edit_original_response(embed=EmbedTemplate.error("輸入的UID格式錯誤"))
     else:
         showcase = Showcase(uid)

diff --git a/cogs/uid_setting/ui.py b/cogs/uid_setting/ui.py
@@ -16,10 +16,10 @@ def __init__(self, game: genshin.Game) -> None:
 
     uid: discord.ui.TextInput[discord.ui.Modal] = discord.ui.TextInput(
         label="UID",
-        placeholder="請輸入遊戲內的UID(9位數字)",
+        placeholder="請輸入遊戲內的UID(9或10位數字)",
         required=True,
         min_length=9,
-        max_length=9,
+        max_length=10,
     )
 
     async def on_submit(self, interaction: discord.Interaction):

diff --git a/star_rail/showcase.py b/star_rail/showcase.py
@@ -139,8 +139,8 @@ def get_character_stat_embed(self, index: int) -> discord.Embed:
             "攻擊力": [0.0, 0.0],
             "防禦力": [0.0, 0.0],
             "速度": [0.0, 0.0],
-            "暴擊率": [5.0, 0.0],
-            "暴擊傷害": [50.0, 0.0],
+            "暴擊率": [0.0, 0.0],
+            "暴擊傷害": [0.0, 0.0],
             "能量恢復效率": [100.0, 0.0],
         }
         for stat in character.attributes: