files update~

Author: Taromatibot

Taromati2/ghost/master/dic/aya/master/shiori.dic

@@ -8,8 +8,6 @@
 #globaldefine	}}CHAIN		} CHAIN.Index++ }
 
 #define			CHAIN_DELIM		':chain='
-#define			EVAL_DELIM		':eval='
-
 
 ERASEALLVARBEGINAS {
 	_L= GETVARLIST(_argv[0])
@@ -689,7 +687,7 @@ SHIORI_FW.RaiseIDEvent {
 
 	if _result != '' {//トークあり
 		//遅延EVAL
-		_talk = RE_SPLIT(_result,'(' + EVAL_DELIM + '|' + CHAIN_DELIM + ')')
+		_talk = RE_SPLIT(_result,'(' + CHAIN_DELIM + ')')
 		_delim = RE_GETSTR
 		_n = ARRAYSIZE(_delim)
 
@@ -709,11 +707,7 @@ SHIORI_FW.RaiseIDEvent {
 
 		//後から遅延設定
 		for _i = 0 ; _i < _n ; _i += 1 {
-			if _delim[_i] == EVAL_DELIM {
-				//遅延EVAL
-				void EVAL(_talk[_i + 1])
-			}
-			elseif _delim[_i] == CHAIN_DELIM {
+			if _delim[_i] == CHAIN_DELIM {
 				//チェイン処理
 				SHIORI_FW.StartChainTalk(_talk[_i + 1])
 			}

Taromati2/ghost/master/dic/other/playwithlrc.dic

@@ -381,9 +381,9 @@ OnMusicPlayer:all{
 	_status =('play]\f[color,108,129,182]◇播放','pause]\f[color,229,134,82]◇暂停','resume]\f[color,108,129,182]◇继续')[playingmusic]
 	"\_l[60,-]\f[color,93,188,91]\q[◄上一首,OnLastMusic]  \_l[120,-]\q[►下一首,OnNextMusic]\f[color,default]       %(_now)%(_totol)\n/
 	\__q[OnMusicPlayerCmd,%(_status)\f[color,default]\__q"
-	"    \f[color,238,50,95]\q[◇停止,OnMusicPlayerCmd,stop]\f[color,default]    /
-	\f[color,93,188,91]\q[◇播放列表,OnMusicPlayerList,openlist]\f[color,default]    /
-	\f[color,128,66,255]\q[◇音量,OnMusicPlayerVolume]  \q[△,OnMusicVolumeChange,1]\q[▲,OnMusicVolumeChange,10] %(musicvolume)\_l[255]\q[▼,OnMusicVolumeChange,-10]\q[▽,OnMusicVolumeChange,-1]\f[color,default]\n"
+	"   \f[color,238,50,95]\q[◇停止,OnMusicPlayerCmd,stop]\f[color,default]  /
+	\f[color,93,188,91]\q[◇播放列表,OnMusicPlayerList,openlist]\f[color,default]  /
+	\f[color,128,66,255]\q[◇音量,OnMusicPlayerVolume] \q[△,OnMusicVolumeChange,1]\q[▲,OnMusicVolumeChange,10]%(musicvolume)\_l[255]\q[▼,OnMusicVolumeChange,-10]\q[▽,OnMusicVolumeChange,-1]\f[color,default]\n"
 	"\q[◇模式:%(_mode),OnMusicPlayMode]    \_l[110]\q[◇歌词卡:,OnMusicLrc]\q[%(_lrcenable),OnMusicSetLrc]\_l[195]\q[◇歌词目录,OnLrcfolder]\n"
 	'\s[10]\0'
 	if musicplayerlist

Taromati2/ghost/master/dic/system/internet.dic

@@ -161,7 +161,7 @@ OnCheckWeather{
 	}
 }
 OnChangeCity{
-	"请输入你要查询的城市名称（留空以自动推断）：\![open,inputbox,OnChangeCityComplete,-1,%(city)]"
+	"请输入你要查询的城市名称：\![open,inputbox,OnChangeCityComplete,-1,%(city)]"
 }
 OnChangeCityComplete{
 	if city != reference0 || !city
@@ -229,9 +229,8 @@ OnWeatherUpdate.Success{
 	_city=TextBetween(_str,'city":"','",',0)
 	if _city{
 		weather.lastcity=_city
-		if !ISVAR('city'){
+		if !ISVAR('city')
 			city=weather.lastcity
-		}
 		//get last update time
 		weather.lasttime=GETSECCOUNT
 		//get weather
@@ -254,10 +253,12 @@ OnWeatherUpdate.Success{
 			OnWeatherUpdate.Success.boot.Talk
 		}
 	}
-	else{
+	elseif city{
 		ERASEVAR('city')
 		OnWeatherUpdate
 	}
+	else
+		OnWeatherUpdate.Failure
 }
 OnWeatherUpdate.Failure.menu.Talk{
 	"\0\s[3]连线失败了……\nError：%(reference4)\n要查看本地信息吗？\n\q[◇确定,OnWeatherUpdate.Success.Talk]"