Merge pull request #3208 from planetarium/hotfix/70.1.2

merge hotfix/70.1.2 into development
planetarium · Oct 18, 2023 · 247803d · 247803d
2 parents 8c950a2 + bf59507
commit 247803d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/nekoyume/Assets/StreamingAssets/Localization/tutorial.csv b/nekoyume/Assets/StreamingAssets/Localization/tutorial.csv
@@ -65,19 +65,19 @@ TUTORIAL_05_001,You're doing great,잘 하고 있는걸,Você está indo bem,あ
 TUTORIAL_05_002,"If you clear certain quests, you can get rewards on the portal.",특정 퀘스트를 클리어하면 포털에서 보상을 받을 수 있어!,"Se você limpar certas missões, poderá obter recompensas no portal.",特定のクエストをクリアすると、ポータルで報酬を得ることができます。,"Si limpia ciertas misiones, puede obtener recompensas en el portal.",หากคุณล้างเควสบางอย่างคุณสามารถรับรางวัลบนพอร์ทัล,"Jika Anda menghapus pencarian tertentu, Anda bisa mendapatkan hadiah di portal.","Если вы очистите определенные квесты, вы можете получить награды на портале.",如果您清除某些任务，则可以在门户网站上获得奖励。,如果您清除某些任務，則可以在門戶網站上獲得獎勵。,"Kung nilinaw mo ang ilang mga pakikipagsapalaran, maaari kang makakuha ng mga gantimpala sa portal."
 TUTORIAL_05_003,Let's touch here! You may have to visit here often from now on.,여길 터치해봐! 앞으로 자주 방문해야 할거야!,Vamos tocar aqui! Você pode ter que visitar aqui com frequência a partir de agora.,ここで触れましょう！これから頻繁にここに訪問する必要があるかもしれません。,¡Tocemos aquí! Es posible que tenga que visitar aquí a menudo de ahora en adelante.,มาสัมผัสกันเถอะ! คุณอาจต้องไปที่นี่บ่อยครั้งนับจากนี้,Ayo Sentuh Di Sini! Anda mungkin harus sering berkunjung ke sini mulai sekarang.,"Давай прикоснитесь сюда! Возможно, вам придется посещать здесь часто.",让我们在这里触摸吧！从现在开始，您可能必须经常在这里访问。,讓我們在這裡觸摸吧！從現在開始，您可能必須經常在這裡訪問。,Hawakan natin dito! Maaaring kailanganin mong bisitahin dito madalas mula ngayon.
 TUTORIAL_05_004,Shall we go straight to the next stage?,다음스테이지로 가볼까?,Vamos direto para o próximo estágio?,次の段階に直行しますか？,¿Vamos directamente a la siguiente etapa?,เราจะตรงไปยังขั้นตอนต่อไปหรือไม่?,Haruskah kita langsung menuju tahap berikutnya?,Пойдем прямо на следующий этап?,我们可以直接进入下一阶段吗？,我們可以直接進入下一階段嗎？,Dumiretso ba tayo sa susunod na yugto?
-TUTORIAL_10_001,"You won <color=#FFA78B>SilverDust</color> as a reward?
+TUTORIAL_10_001,"You won  <b> SilverDust </b> as a reward?
 It's an important ingredient! Let's try it!","보상으로 실버더스트를 획득했구나?
-중요한 재료지! 한번 사용해보도록 하자!","Você ganhou <color =#ffa78b> Silverdust </ro Color> como uma recompensa?
-É um ingrediente importante! Vamos tentar!","あなたは報酬として<color =＃ffa78b> silverdust </color>を獲得しましたか？
-それは重要な成分です！試してみよう！","Ganaste <color =#ffa78b> silverdust </ color> como recompensa?
-¡Es un ingrediente importante! ¡Vamos a intentarlo!","คุณชนะ <color =#ffa78b> SilverDust </color> เป็นรางวัล?
-เป็นส่วนผสมที่สำคัญ! มาลองดูกัน!","Anda memenangkan <color =#ffa78b> silverDust </jang> sebagai hadiah?
-Ini bahan penting! Ayo coba!","Вы выиграли <color =#ffa78b> silverdust </color> в качестве награды?
-Это важный ингредиент! Давай попробуем!","您赢了<color =＃ffa78b> silverdust </color>作为奖励吗？
-这是重要的成分！让我们尝试一下！","您贏了<color =＃ffa78b> silverdust </color>作為獎勵嗎？
-這是重要的成分！讓我們嘗試一下！","Nanalo ka ng <color =#ffa78b> SilverDust </solor> bilang gantimpala?
+중요한 재료지! 한번 사용해보도록 하자!","Você ganhou  <b> SilverDust </b> como uma recompensa?
+É um ingrediente importante! Vamos tentar!","あなたは報酬として <b> SilverDust </b>を獲得しましたか？
+それは重要な成分です！試してみよう！","Ganaste  <b> SilverDust </b> como recompensa?
+¡Es un ingrediente importante! ¡Vamos a intentarlo!","คุณชนะ  <b> SilverDust </b> เป็นรางวัล?
+เป็นส่วนผสมที่สำคัญ! มาลองดูกัน!","Anda memenangkan  <b> SilverDust </b> sebagai hadiah?
+Ini bahan penting! Ayo coba!","Вы выиграли  <b> SilverDust </b> в качестве награды?
+Это важный ингредиент! Давай попробуем!","您赢了 <b> SilverDust </b>作为奖励吗？
+这是重要的成分！让我们尝试一下！","您贏了 <b> SilverDust </b>作為獎勵嗎？
+這是重要的成分！讓我們嘗試一下！","Nanalo ka ng <b> SilverDust </b> bilang gantimpala?
 Ito ay isang mahalagang sangkap! Subukan Natin!"
-TUTORIAL_10_002,<color=#FFA78B>SilverDust</color> is a material that can acquire very powerful equipment.,실버더스트는 아주 강력한 장비를 획득할 수 있는 재료야.,<color =#ffa78b> Silverdust </ro Color> é um material que pode adquirir equipamentos muito poderosos.,<color =＃ffa78b> silverdust </color>は、非常に強力な機器を取得できる材料です。,<color =#ffa78b> Silverdust </ color> es un material que puede adquirir equipos muy potentes.,<color =#ffa78b> SilverDust </color> เป็นวัสดุที่สามารถรับอุปกรณ์ที่ทรงพลังมาก,<color =#ffa78b> silverDust </olol> adalah bahan yang dapat memperoleh peralatan yang sangat kuat.,"<color =#ffa78b> silverdust </color> - это материал, который может приобрести очень мощное оборудование.",<color =＃ffa78b> silverdust </color>是一种可以获取非常强大的设备的材料。,<color =＃ffa78b> silverdust </color>是一種可以獲取非常強大的設備的材料。,Ang <color =#ffa78b> SilverDust </color> ay isang materyal na maaaring makakuha ng napakalakas na kagamitan.
+TUTORIAL_10_002, <b> SilverDust </b> is a material that can acquire very powerful equipment.,실버더스트는 아주 강력한 장비를 획득할 수 있는 재료야., <b> SilverDust </b> é um material que pode adquirir equipamentos muito poderosos., <b> SilverDust </b> は、非常に強力な機器を取得できる材料です。, <b> SilverDust </b> es un material que puede adquirir equipos muy potentes., <b> SilverDust </b> เป็นวัสดุที่สามารถรับอุปกรณ์ที่ทรงพลังมาก, <b> SilverDust </b> adalah bahan yang dapat memperoleh peralatan yang sangat kuat.," <b> SilverDust </b> - это материал, который может приобрести очень мощное оборудование.", <b> SilverDust </b> 是一种可以获取非常强大的设备的材料。, <b> SilverDust </b> 是一種可以獲取非常強大的設備的材料。,Ang  <b> SilverDust </b>  ay isang materyal na maaaring makakuha ng napakalakas na kagamitan.
 TUTORIAL_10_003,"You can get it from neglect compensation.
 Available on AURA SUMMON!","방치보상에서도 얻을 수 있지.
 AURA SUMMON 에서 사용할 수 있어!","Você pode obtê -lo de compensação por negligência.

diff --git a/nekoyume/Assets/_Scripts/UI/Widget/StageLoadingEffect.cs b/nekoyume/Assets/_Scripts/UI/Widget/StageLoadingEffect.cs
@@ -137,10 +137,10 @@ private IEnumerator ShowSequence(
                 {
                     switch (stageId)
                     {
-                        case VideoPlayStage:
-                            coroutine = PlayVideo;
-                            LoadingEnd = false;
-                            break;
+                        // case VideoPlayStage:
+                        //     coroutine = PlayVideo;
+                        //     LoadingEnd = false;
+                        //     break;
                         case WorkshopDialogStage:
                             coroutine = PlaySmallDialog;
                             LoadingEnd = false;

diff --git a/nekoyume/ProjectSettings/ProjectSettings.asset b/nekoyume/ProjectSettings/ProjectSettings.asset
@@ -136,7 +136,7 @@ PlayerSettings:
     16:10: 0
     16:9: 1
     Others: 0
-  bundleVersion: 70.1.1
+  bundleVersion: 70.1.2
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -165,7 +165,7 @@ PlayerSettings:
     iPhone: 0
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
-  AndroidBundleVersionCode: 73
+  AndroidBundleVersionCode: 74
   AndroidMinSdkVersion: 22
   AndroidTargetSdkVersion: 33
   AndroidPreferredInstallLocation: 2