更改string调用位置

Classes/gframe/game.cpp

@@ -426,7 +426,7 @@ bool Game::Initialize() {
 	chkWaitChain = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), tabHelper, -1, dataManager.GetSysString(1277));
 	chkWaitChain->setChecked(gameConf.chkWaitChain != 0);
 	posY += 60;
-	chkEnableSound = env->addCheckBox(gameConf.enable_sound, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), tabHelper, CHECKBOX_ENABLE_SOUND, dataManager.GetSysString(1282));
+	chkEnableSound = env->addCheckBox(gameConf.enable_sound, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), tabHelper, CHECKBOX_ENABLE_SOUND, dataManager.GetSysString(1279));
 	chkEnableSound->setChecked(gameConf.enable_sound);
 	scrSoundVolume = env->addScrollBar(true, rect<s32>(posX + 110 * xScale, posY, posX + 250 * xScale, posY + 30 * yScale), tabHelper, SCROLL_VOLUME);
 	scrSoundVolume->setMax(100);
@@ -435,7 +435,7 @@ bool Game::Initialize() {
 	scrSoundVolume->setLargeStep(1);
 	scrSoundVolume->setSmallStep(1);
 	posY += 60;
-	chkEnableMusic = env->addCheckBox(gameConf.enable_music, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), tabHelper, CHECKBOX_ENABLE_MUSIC, dataManager.GetSysString(1283));
+	chkEnableMusic = env->addCheckBox(gameConf.enable_music, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), tabHelper, CHECKBOX_ENABLE_MUSIC, dataManager.GetSysString(1280));
 	chkEnableMusic->setChecked(gameConf.enable_music);
 	scrMusicVolume = env->addScrollBar(true, rect<s32>(posX + 110 * xScale, posY, posX + 250 * xScale, posY + 30 * yScale), tabHelper, SCROLL_VOLUME);
 	scrMusicVolume->setMax(100);
@@ -444,7 +444,7 @@ bool Game::Initialize() {
 	scrMusicVolume->setLargeStep(1);
 	scrMusicVolume->setSmallStep(1);
 	posY += 60;
-	chkMusicMode = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), tabHelper, -1, dataManager.GetSysString(1284));
+	chkMusicMode = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), tabHelper, -1, dataManager.GetSysString(1281));
 	chkMusicMode->setChecked(gameConf.music_mode != 0);
 	elmTabHelperLast = chkMusicMode;
 	//show scroll
@@ -482,7 +482,7 @@ bool Game::Initialize() {
 	chkAutoSaveReplay = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), tabSystem, -1, dataManager.GetSysString(1366));
 	chkAutoSaveReplay->setChecked(gameConf.auto_save_replay != 0);
 	posY += 60;
-    chkDrawFieldSpell = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), tabSystem, CHECKBOX_DRAW_FIELD_SPELL, dataManager.GetSysString(1279));
+    chkDrawFieldSpell = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), tabSystem, CHECKBOX_DRAW_FIELD_SPELL, dataManager.GetSysString(1283));
     chkDrawFieldSpell->setChecked(gameConf.draw_field_spell != 0);
     posY += 60;
     chkQuickAnimation = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260 * xScale, posY + 30 * yScale), tabSystem, CHECKBOX_QUICK_ANIMATION, dataManager.GetSysString(1299));
@@ -883,7 +883,7 @@ bool Game::Initialize() {
 	env->addStaticText(dataManager.GetSysString(1353), rect<s32>(360 * xScale, 240 * yScale, 570 * xScale, 260 * yScale), false, true, wReplay);
 	ebRepStartTurn = CAndroidGUIEditBox::addAndroidEditBox(L"", true, env, rect<s32>(360 * xScale, 270 * yScale, 460 * xScale, 310 * yScale), wReplay, -1);
 	ebRepStartTurn->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
-	btnExportDeck = env->addButton(rect<s32>(470 * xScale, 270 * yScale, 570 * xScale, 310 * yScale), wReplay, BUTTON_EXPORT_DECK, dataManager.GetSysString(1281));
+	btnExportDeck = env->addButton(rect<s32>(470 * xScale, 270 * yScale, 570 * xScale, 310 * yScale), wReplay, BUTTON_EXPORT_DECK, dataManager.GetSysString(1282));
 	//single play window
 	wSinglePlay = env->addWindow(rect<s32>(220 * xScale, 100 * yScale, 800 * xScale, 520 * yScale), false, dataManager.GetSysString(1201));
 	wSinglePlay->getCloseButton()->setVisible(false);

mobile/assets/data/conf/strings.conf

@@ -321,12 +321,11 @@
 !system 1276 自动发动并排序必发效果
 !system 1277 没有可连锁的卡时延迟回应
 !system 1278 自动选择魔法/陷阱卡位置
-!system 1279 显示场地背景
-!system 1280 重命名成功后请重新选择卡组
-!system 1281 提取卡组
-!system 1282 开启音效
-!system 1283 开启音乐
-!system 1284 按场景切换音乐
+!system 1279 开启音效
+!system 1280 开启音乐
+!system 1281 按场景切换音乐
+!system 1282 提取卡组
+!system 1283 显示场地背景
 !system 1290 停用聊天功能
 !system 1291 忽略观战者发言
 !system 1292 □忽略时点

mobile/assets_en/data/conf/strings.conf

@@ -321,9 +321,11 @@
 !system 1276 Auto Chain order
 !system 1277 No delay for Chain
 !system 1278 Auto spell/trap placing
-!system 1279 Drawing field spell
-!system 1280 Please rechoose deck after rename.
-!system 1281 Export Deck
+!system 1279 SE
+!system 1280 BGM
+!system 1281 Automatically switch BGM
+!system 1282 Export Deck
+!system 1283 Drawing field spell
 !system 1290 Disable Chatting
 !system 1291 Mute spectators
 !system 1292 Ignore chain

mobile/assets_ko/data/conf/strings.conf

@@ -321,9 +321,11 @@
 !system 1276 자동 체인
 !system 1277 딜레이 없이 체인
 !system 1278 카드 위치 자동 (마법&함정)
-!system 1279 필드 이미지 활성화
-!system 1280 이름을 변경후 덱을 다시 선택해주세요.
-!system 1281 추출물 선택
+!system 1279 SE
+!system 1280 BGM
+!system 1281 장면별로 음악 전환
+!system 1282 추출물 선택
+!system 1283 필드 이미지 활성화
 !system 1290 상대방 메시지 무시
 !system 1291 관전자 메시지 무시
 !system 1292 체인 무시