From 493fcb2f05702ecc902615216cadb1cb9cd31235 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Mon, 20 Sep 2021 19:35:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=9B=BE=E7=BB=8F=E8=AF=AD?=
 =?UTF-8?q?=E9=9F=B3=E5=92=8C=E9=9F=B3=E6=95=88=E6=9C=AA=E5=8C=BA=E5=88=86?=
 =?UTF-8?q?=E6=97=B6=E6=AC=A2=E8=BF=8E=E9=9F=B3=E6=95=88=E5=92=8C=E6=AC=A2?=
 =?UTF-8?q?=E8=BF=8E=E8=AF=AD=E9=9F=B3=E6=96=87=E4=BB=B6=E5=90=8D=E4=B8=8D?=
 =?UTF-8?q?=E5=90=8C=E5=AF=BC=E8=87=B4=E5=88=86=E5=BC=80=E5=90=8E=E7=9C=8B?=
 =?UTF-8?q?=E8=B5=B7=E6=9D=A5=E5=BE=88=E5=A5=87=E6=80=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.lua                                            |   2 +-
 .../chiptune/{welcome_sfx.ogg => welcome.ogg}       | Bin
 media/vocal/miya/{welcome_voc.ogg => welcome.ogg}   | Bin
 .../vocal/mono/{welcome_voc_1.ogg => welcome_1.ogg} | Bin
 .../vocal/mono/{welcome_voc_2.ogg => welcome_2.ogg} | Bin
 .../vocal/mono/{welcome_voc_3.ogg => welcome_3.ogg} | Bin
 .../xiaoya/{welcome_voc_1.ogg => welcome_1.ogg}     | Bin
 .../xiaoya/{welcome_voc_2.ogg => welcome_2.ogg}     | Bin
 .../xiaoya/{welcome_voc_3.ogg => welcome_3.ogg}     | Bin
 parts/scenes/load.lua                               |   4 ++--
 10 files changed, 3 insertions(+), 3 deletions(-)
 rename media/effect/chiptune/{welcome_sfx.ogg => welcome.ogg} (100%)
 rename media/vocal/miya/{welcome_voc.ogg => welcome.ogg} (100%)
 rename media/vocal/mono/{welcome_voc_1.ogg => welcome_1.ogg} (100%)
 rename media/vocal/mono/{welcome_voc_2.ogg => welcome_2.ogg} (100%)
 rename media/vocal/mono/{welcome_voc_3.ogg => welcome_3.ogg} (100%)
 rename media/vocal/xiaoya/{welcome_voc_1.ogg => welcome_1.ogg} (100%)
 rename media/vocal/xiaoya/{welcome_voc_2.ogg => welcome_2.ogg} (100%)
 rename media/vocal/xiaoya/{welcome_voc_3.ogg => welcome_3.ogg} (100%)

diff --git a/main.lua b/main.lua
index 3793b7ba..972d3cc5 100644
--- a/main.lua
+++ b/main.lua
@@ -247,7 +247,7 @@ VOC.init{
     'perfect_clear','half_clear',
     'win','lose','bye',
     'test','happy','doubt',
-    'welcome_voc',
+    'welcome',
 }
 
 --Initialize language lib
diff --git a/media/effect/chiptune/welcome_sfx.ogg b/media/effect/chiptune/welcome.ogg
similarity index 100%
rename from media/effect/chiptune/welcome_sfx.ogg
rename to media/effect/chiptune/welcome.ogg
diff --git a/media/vocal/miya/welcome_voc.ogg b/media/vocal/miya/welcome.ogg
similarity index 100%
rename from media/vocal/miya/welcome_voc.ogg
rename to media/vocal/miya/welcome.ogg
diff --git a/media/vocal/mono/welcome_voc_1.ogg b/media/vocal/mono/welcome_1.ogg
similarity index 100%
rename from media/vocal/mono/welcome_voc_1.ogg
rename to media/vocal/mono/welcome_1.ogg
diff --git a/media/vocal/mono/welcome_voc_2.ogg b/media/vocal/mono/welcome_2.ogg
similarity index 100%
rename from media/vocal/mono/welcome_voc_2.ogg
rename to media/vocal/mono/welcome_2.ogg
diff --git a/media/vocal/mono/welcome_voc_3.ogg b/media/vocal/mono/welcome_3.ogg
similarity index 100%
rename from media/vocal/mono/welcome_voc_3.ogg
rename to media/vocal/mono/welcome_3.ogg
diff --git a/media/vocal/xiaoya/welcome_voc_1.ogg b/media/vocal/xiaoya/welcome_1.ogg
similarity index 100%
rename from media/vocal/xiaoya/welcome_voc_1.ogg
rename to media/vocal/xiaoya/welcome_1.ogg
diff --git a/media/vocal/xiaoya/welcome_voc_2.ogg b/media/vocal/xiaoya/welcome_2.ogg
similarity index 100%
rename from media/vocal/xiaoya/welcome_voc_2.ogg
rename to media/vocal/xiaoya/welcome_2.ogg
diff --git a/media/vocal/xiaoya/welcome_voc_3.ogg b/media/vocal/xiaoya/welcome_3.ogg
similarity index 100%
rename from media/vocal/xiaoya/welcome_voc_3.ogg
rename to media/vocal/xiaoya/welcome_3.ogg
diff --git a/parts/scenes/load.lua b/parts/scenes/load.lua
index 389bbff7..b8426bf6 100644
--- a/parts/scenes/load.lua
+++ b/parts/scenes/load.lua
@@ -126,8 +126,8 @@ local loadingThread=coroutine.wrap(function()
     NET.wsconn_app()
 
     SFX.play('enter',.8)
-    SFX.play('welcome_sfx')
-    VOC.play('welcome_voc')
+    SFX.play('welcome')
+    VOC.play('welcome')
     THEME.fresh()
     LOADED=true
     return'finish'