デフォルトゲームのタイトル画面を修正

You-App · Jan 25, 2018 · ecec6aa · ecec6aa
1 parent 58bda3a
commit ecec6aa
Show file tree

Hide file tree

Showing 16 changed files with 65 additions and 44 deletions.
diff --git a/data/bgimage/title.png b/data/bgimage/title.png
diff --git a/data/image/title/button_cg.gif b/data/image/title/button_cg.gif
diff --git a/data/image/title/button_config.gif b/data/image/title/button_config.gif
diff --git a/data/image/title/button_load.gif b/data/image/title/button_load.gif
diff --git a/data/image/title/button_replay.gif b/data/image/title/button_replay.gif
diff --git a/data/image/title/button_start.gif b/data/image/title/button_start.gif
diff --git a/data/scenario/config.ks b/data/scenario/config.ks
@@ -9,6 +9,10 @@
 ;	fixボタン消し
 	[clearfix]
 
+;ゲーム中に効果が設定されている場合は無効
+[free_layermode time=0 ]
+[reset_camera time=0]
+
 ;　イメージ消去
 
 [iscript]
@@ -20,15 +24,15 @@ $(".layer_camera").empty();
 
 [iscript]
 
-	tf.current_bgm_vol = parseInt(TG.config.defaultBgmVolume);
-	tf.current_se_vol = parseInt(TG.config.defaultSeVolume);
+	tf.current_bgm_vol=parseInt(TG.config.defaultBgmVolume);
+	tf.current_se_vol=parseInt(TG.config.defaultSeVolume);
 
-	tf.current_ch_speed = parseInt(TG.config.chSpeed);
-	tf.current_auto_speed = parseInt(TG.config.autoSpeed);
+	tf.current_ch_speed=parseInt(TG.config.chSpeed);
+	tf.current_auto_speed=parseInt(TG.config.autoSpeed);
 
 	tf.text_skip ="ON";
 
-	if(TG.config.unReadTextSkip != true){
+	if(TG.config.unReadTextSkip != "true"){
 		tf.text_skip ="OFF";
 	} 
 
@@ -43,7 +47,7 @@ $(".layer_camera").empty();
 	[bg storage="../../tyrano/images/system/bg_config.jpg" time=100]
 
 ;	画面右上の「Back」ボタン
-	[button graphic="config/c_btn_back.png" enterimg="config/c_btn_back2.png" target="*backtitle" x=840 y=20]
+	[button graphic="config/c_btn_back.png" fix=true enterimg="config/c_btn_back2.png" target="*backtitle" x=840 y=20]
 
 [jump target="*config_page"]
 
@@ -57,46 +61,46 @@ $(".layer_camera").empty();
 ;▼BGM音量
 ;------------------------------------------------------------------------------------------------------
 ;BGM音量-1０
-[button name="bgmvol,bgmvol_10"  fix="true" target="*vol_bgm_change" graphic="config/c_btn.png" width=35 height=35 x=300 y=170 exp="tf.current_bgm_vol = 10"]
+[button name="bgmvol,bgmvol_10"  fix="true" target="*vol_bgm_change" graphic="config/c_btn.png" width=35 height=35 x=300 y=170 exp="tf.current_bgm_vol=10"]
 ;BGM音量-20
-[button name="bgmvol,bgmvol_20"  fix="true" target="*vol_bgm_change" graphic="config/c_btn.png" width=35 height=35 x=340 y=170 exp="tf.current_bgm_vol = 20"]
+[button name="bgmvol,bgmvol_20"  fix="true" target="*vol_bgm_change" graphic="config/c_btn.png" width=35 height=35 x=340 y=170 exp="tf.current_bgm_vol=20"]
 ;BGM音量-30
-[button name="bgmvol,bgmvol_30"  fix="true" target="*vol_bgm_change" graphic="config/c_btn.png" width=35 height=35 x=380 y=170 exp="tf.current_bgm_vol = 30"]
+[button name="bgmvol,bgmvol_30"  fix="true" target="*vol_bgm_change" graphic="config/c_btn.png" width=35 height=35 x=380 y=170 exp="tf.current_bgm_vol=30"]
 ;BGM音量-40
-[button name="bgmvol,bgmvol_40"  fix="true" target="*vol_bgm_change" graphic="config/c_btn.png" width=35 height=35 x=420 y=170 exp="tf.current_bgm_vol = 40"]
+[button name="bgmvol,bgmvol_40"  fix="true" target="*vol_bgm_change" graphic="config/c_btn.png" width=35 height=35 x=420 y=170 exp="tf.current_bgm_vol=40"]
 ;BGM音量-50
-[button name="bgmvol,bgmvol_50"  fix="true" target="*vol_bgm_change" graphic="config/c_btn.png" width=35 height=35 x=460 y=170 exp="tf.current_bgm_vol = 50"]
+[button name="bgmvol,bgmvol_50"  fix="true" target="*vol_bgm_change" graphic="config/c_btn.png" width=35 height=35 x=460 y=170 exp="tf.current_bgm_vol=50"]
 ;BGM音量-60
-[button name="bgmvol,bgmvol_60"  fix="true" target="*vol_bgm_change" graphic="config/c_btn.png" width=35 height=35 x=500 y=170 exp="tf.current_bgm_vol = 60"]
+[button name="bgmvol,bgmvol_60"  fix="true" target="*vol_bgm_change" graphic="config/c_btn.png" width=35 height=35 x=500 y=170 exp="tf.current_bgm_vol=60"]
 ;BGM音量-70
-[button name="bgmvol,bgmvol_70"  fix="true" target="*vol_bgm_change" graphic="config/c_btn.png" width=35 height=35 x=540 y=170 exp="tf.current_bgm_vol = 70"]
+[button name="bgmvol,bgmvol_70"  fix="true" target="*vol_bgm_change" graphic="config/c_btn.png" width=35 height=35 x=540 y=170 exp="tf.current_bgm_vol=70"]
 ;BGM音量-80
-[button name="bgmvol,bgmvol_80"  fix="true" target="*vol_bgm_change" graphic="config/c_btn.png" width=35 height=35 x=580 y=170 exp="tf.current_bgm_vol = 80"]
+[button name="bgmvol,bgmvol_80"  fix="true" target="*vol_bgm_change" graphic="config/c_btn.png" width=35 height=35 x=580 y=170 exp="tf.current_bgm_vol=80"]
 ;BGM音量-90
-[button name="bgmvol,bgmvol_90"  fix="true" target="*vol_bgm_change" graphic="config/c_btn.png" width=35 height=35 x=620 y=170 exp="tf.current_bgm_vol = 90"]
+[button name="bgmvol,bgmvol_90"  fix="true" target="*vol_bgm_change" graphic="config/c_btn.png" width=35 height=35 x=620 y=170 exp="tf.current_bgm_vol=90"]
 ;BGM音量-100
-[button name="bgmvol,bgmvol_100" fix="true" target="*vol_bgm_change" graphic="config/c_btn.png" width=35 height=35 x=660 y=170 exp="tf.current_bgm_vol = 100"]
+[button name="bgmvol,bgmvol_100" fix="true" target="*vol_bgm_change" graphic="config/c_btn.png" width=35 height=35 x=660 y=170 exp="tf.current_bgm_vol=100"]
 
 ;BGM音量-ミュート（音量=0）
-[button name="bgmvol,bgmvol_0"    fix="true" target="*vol_bgm_change" graphic="config/c_btn.png" width=35 height=35 x=780 y=170 exp="tf.current_bgm_vol = 0"]
+[button name="bgmvol,bgmvol_0"    fix="true" target="*vol_bgm_change" graphic="config/c_btn.png" width=35 height=35 x=780 y=170 exp="tf.current_bgm_vol=0"]
 
 
 ;------------------------------------------------------------------------------------------------------
 ;▼SE音量
 ;------------------------------------------------------------------------------------------------------
-[button name="sevol,sevol_10"   fix="true" target="*vol_se_change" graphic="config/c_btn.png" width=35 height=35 x=300 y=220 exp="tf.current_se_vol = 10"]
-[button name="sevol,sevol_20"   fix="true" target="*vol_se_change" graphic="config/c_btn.png" width=35 height=35 x=340 y=220 exp="tf.current_se_vol = 20"]
-[button name="sevol,sevol_30"   fix="true" target="*vol_se_change" graphic="config/c_btn.png" width=35 height=35 x=380 y=220 exp="tf.current_se_vol = 30"]
-[button name="sevol,sevol_40"   fix="true" target="*vol_se_change" graphic="config/c_btn.png" width=35 height=35 x=420 y=220 exp="tf.current_se_vol = 40"]
-[button name="sevol,sevol_50"   fix="true" target="*vol_se_change" graphic="config/c_btn.png" width=35 height=35 x=460 y=220 exp="tf.current_se_vol = 50"]
-[button name="sevol,sevol_60"   fix="true" target="*vol_se_change" graphic="config/c_btn.png" width=35 height=35 x=500 y=220 exp="tf.current_se_vol = 60"]
-[button name="sevol,sevol_70"   fix="true" target="*vol_se_change" graphic="config/c_btn.png" width=35 height=35 x=540 y=220 exp="tf.current_se_vol = 70"]
-[button name="sevol,sevol_80"   fix="true" target="*vol_se_change" graphic="config/c_btn.png" width=35 height=35 x=580 y=220 exp="tf.current_se_vol = 80"]
-[button name="sevol,sevol_90"   fix="true" target="*vol_se_change" graphic="config/c_btn.png" width=35 height=35 x=620 y=220 exp="tf.current_se_vol = 90"]
-[button name="sevol,sevol_100" fix="true" target="*vol_se_change" graphic="config/c_btn.png" width=35 height=35 x=660 y=220 exp="tf.current_se_vol = 100"]
+[button name="sevol,sevol_10"   fix="true" target="*vol_se_change" graphic="config/c_btn.png" width=35 height=35 x=300 y=220 exp="tf.current_se_vol=10"]
+[button name="sevol,sevol_20"   fix="true" target="*vol_se_change" graphic="config/c_btn.png" width=35 height=35 x=340 y=220 exp="tf.current_se_vol=20"]
+[button name="sevol,sevol_30"   fix="true" target="*vol_se_change" graphic="config/c_btn.png" width=35 height=35 x=380 y=220 exp="tf.current_se_vol=30"]
+[button name="sevol,sevol_40"   fix="true" target="*vol_se_change" graphic="config/c_btn.png" width=35 height=35 x=420 y=220 exp="tf.current_se_vol=40"]
+[button name="sevol,sevol_50"   fix="true" target="*vol_se_change" graphic="config/c_btn.png" width=35 height=35 x=460 y=220 exp="tf.current_se_vol=50"]
+[button name="sevol,sevol_60"   fix="true" target="*vol_se_change" graphic="config/c_btn.png" width=35 height=35 x=500 y=220 exp="tf.current_se_vol=60"]
+[button name="sevol,sevol_70"   fix="true" target="*vol_se_change" graphic="config/c_btn.png" width=35 height=35 x=540 y=220 exp="tf.current_se_vol=70"]
+[button name="sevol,sevol_80"   fix="true" target="*vol_se_change" graphic="config/c_btn.png" width=35 height=35 x=580 y=220 exp="tf.current_se_vol=80"]
+[button name="sevol,sevol_90"   fix="true" target="*vol_se_change" graphic="config/c_btn.png" width=35 height=35 x=620 y=220 exp="tf.current_se_vol=90"]
+[button name="sevol,sevol_100" fix="true" target="*vol_se_change" graphic="config/c_btn.png" width=35 height=35 x=660 y=220 exp="tf.current_se_vol=100"]
 
 ;SEミュート
-[button name="sevol,sevol_0"     fix="true" target="*vol_se_change" graphic="config/c_btn.png" width=35 height=35 x=780 y=220 exp="tf.current_se_vol = 0"]
+[button name="sevol,sevol_0"     fix="true" target="*vol_se_change" graphic="config/c_btn.png" width=35 height=35 x=780 y=220 exp="tf.current_se_vol=0"]
 
 ;------------------------------------------------------------------------------------------------------
 ;▼テキスト速度
@@ -164,13 +168,25 @@ $(".layer_camera").empty();
 ; タイトルに戻る
 ;--------------------------------------------------------------------------------
 *backtitle
+
+[iscript]
+tf.flag_back=$(".message1_fore").css("display");
+[endscript]
+
+[if exp="tf.flag_back=='none'"]
+
 [cm]
 [layopt layer=message1 visible=false]
 [freeimage layer=1]
 [clearfix]
 ;コンフィグの呼び出しに sleepgame を使っているので、必ず awakegame で戻してやってください
 [awakegame]
 
+[endif]
+
+[return]
+
+
 ;===================================================
 
 ;★ボタンクリック時の処理
@@ -242,7 +258,7 @@ $(".layer_camera").empty();
 [iscript]
 	$(".unread_off").attr("src","data/image/config/c_uts_off.png");
 	$(".unread_on").attr("src","data/image/config/c_btn.png");
-	tf.text_skip = "OFF";
+	tf.text_skip="OFF";
 [endscript]
 [config_record_label skip=false]
 [return]
@@ -254,7 +270,7 @@ $(".layer_camera").empty();
 [iscript]
 	$(".unread_off").attr("src","data/image/config/c_btn.png");
 	$(".unread_on").attr("src","data/image/config/c_uts_on.png");
-	tf.text_skip = "ON";
+	tf.text_skip="ON";
 [endscript]
 [config_record_label skip=true]
 [return]

diff --git a/data/scenario/title.ks b/data/scenario/title.ks
@@ -2,16 +2,16 @@
 [cm]
 
 @clearstack
-@bg storage ="title.png" time=100
+@bg storage ="title.jpg" time=100
 @wait time = 200
 
 *start 
 
-[button x=166 y=304 graphic="title/button_start.gif" target="gamestart"]
-[button x=166 y=408 graphic="title/button_cg.gif"  storage="cg.ks"]
-[button x=166 y=507 graphic="title/button_config.gif" role="sleepgame" storage="config.ks"]
-[button x=486 y=304 graphic="title/button_load.gif" role="load"]
-[button x=486 y=408 graphic="title/button_replay.gif" storage="replay.ks"]
+[button x=100 y=250 graphic="title/button_start.png" target="gamestart"]
+[button x=100 y=320 graphic="title/button_load.png"  role="load" ]
+[button x=100 y=390 graphic="title/button_cg.png" storage="cg.ks" ]
+[button x=100 y=460 graphic="title/button_replay.png" storage="replay.ks" ]
+[button x=100 y=530 graphic="title/button_config.png" role="sleepgame" storage="config.ks" ]
 
 [s]
 

diff --git a/data/scenario/tyrano.ks b/data/scenario/tyrano.ks
@@ -100,17 +100,22 @@ tf.savetext = "<span style='font-size:10px'>"+tf.save_date+"</span><br />"+tf.ti
 	[iscript]
 
 		mp.graphic = mp.graphic.split(',');
-
+		mp.tmp_graphic = mp.graphic.concat();
 		tf.is_cg_open = false;
 		if(sf.cg_view[mp.graphic[0]]){
 			tf.is_cg_open = true;
 		}
+
+        if(typeof mp.thumb !="undefined"){
+            mp.tmp_graphic[0] = mp.thumb;
+        }
+
 
 	[endscript]
 
 	;渡された値を元に、CG状態を確認していく
 	[if exp="tf.is_cg_open==true"]
-		[button graphic=&mp.graphic[0] x=&mp.x y=&mp.y width=&mp.width height=&mp.height preexp="mp.graphic" exp="tf.selected_cg_image = preexp" storage="cg.ks" target="*clickcg" folder="bgimage" ]
+		[button graphic=&mp.tmp_graphic[0] x=&mp.x y=&mp.y width=&mp.width height=&mp.height preexp="mp.graphic" exp="tf.selected_cg_image = preexp" storage="cg.ks" target="*clickcg" folder="bgimage" ]
 	[else]
 		[button graphic=&mp.no_graphic x=&mp.x y=&mp.y width=&mp.width height=&mp.height storage="cg.ks" target="*no_image" folder="bgimage" ]
 	[endif]

diff --git a/release/master_tyrano/data/bgimage/title.png b/release/master_tyrano/data/bgimage/title.png
diff --git a/release/master_tyrano/data/image/title/button_cg.gif b/release/master_tyrano/data/image/title/button_cg.gif
diff --git a/release/master_tyrano/data/image/title/button_config.gif b/release/master_tyrano/data/image/title/button_config.gif
diff --git a/release/master_tyrano/data/image/title/button_load.gif b/release/master_tyrano/data/image/title/button_load.gif
diff --git a/release/master_tyrano/data/image/title/button_replay.gif b/release/master_tyrano/data/image/title/button_replay.gif
diff --git a/release/master_tyrano/data/image/title/button_start.gif b/release/master_tyrano/data/image/title/button_start.gif
diff --git a/release/master_tyrano/data/scenario/title.ks b/release/master_tyrano/data/scenario/title.ks
@@ -2,16 +2,16 @@
 [cm]
 
 @clearstack
-@bg storage ="title.png" time=100
+@bg storage ="title.jpg" time=100
 @wait time = 200
 
 *start 
 
-[button x=166 y=304 graphic="title/button_start.gif" target="gamestart"]
-[button x=166 y=408 graphic="title/button_cg.gif"  storage="cg.ks"]
-[button x=166 y=507 graphic="title/button_config.gif" role="sleepgame" storage="config.ks"]
-[button x=486 y=304 graphic="title/button_load.gif" role="load"]
-[button x=486 y=408 graphic="title/button_replay.gif" storage="replay.ks"]
+[button x=100 y=250 graphic="title/button_start.png" target="gamestart"]
+[button x=100 y=320 graphic="title/button_load.png"  role="load" ]
+[button x=100 y=390 graphic="title/button_cg.png" storage="cg.ks" ]
+[button x=100 y=460 graphic="title/button_replay.png" storage="replay.ks" ]
+[button x=100 y=530 graphic="title/button_config.png" role="sleepgame" storage="config.ks" ]
 
 [s]