bug修复，水印修改，20G上级调平

Zframework/init.lua

@@ -455,21 +455,13 @@ function keyDown.draw(key)
 end
 
 function mouseDown.setting_sound(x,y,k)
-	if x>780 and x<980 and y>470 and sceneTemp.jump==0 then
-		sceneTemp.jump=10
-		local t=Timer()-sceneTemp.last
+	local s=sceneTemp
+	if x>780 and x<980 and y>470 and s.jump==0 then
+		s.jump=10
+		local t=Timer()-s.last
 		if t>1 then
 			VOC.play((t<1.5 or t>15)and"doubt"or rnd()<.8 and"happy"or"egg")
-			sceneTemp.last=Timer()
-			if rnd()<.0626 then
-				for name,M in next,Modes do
-					if not modeRanks[name]then
-						modeRanks[name]=M.score and 0 or 6
-					end
-				end
-				FILE.saveUnlock()
-				TEXT.show("DEVModes:UNLOCKALL",640,360,50,"stretch",.6)
-			end
+			s.last=Timer()
 		end
 	end
 end
@@ -734,8 +726,10 @@ function keyDown.staff(key,RESET)
 				TEXT.show("What are you up to?",640,200,40,"appear",.5)
 			elseif sceneTemp.ct==10 then
 				TEXT.show("Stop what you are doing.",640,200,40,"flicker",.5)
-			elseif sceneTemp.ct==20 then
+			elseif sceneTemp.ct==16 then
 				TEXT.show("RESET ALL DATA?",640,200,40,"appear",.3,.2)
+			elseif sceneTemp.ct==20 then
+				TEXT.show("SURE?????",640,200,40,"beat",.3,.2)
 			elseif sceneTemp.ct==26 then
 				local L=love.filesystem.getDirectoryItems("")
 				for i=1,#L do
@@ -762,6 +756,26 @@ function touchDown.staff(id,x,y)
 	end
 end
 
+function keyDown.stat(key)
+	if key=="u"and kb.isDown("lshift","rshift")then
+		touchDown.stat()
+	end
+end
+function touchDown.stat(id,x,y)
+	local s=sceneTemp
+	s.count=s.count+1
+	if rnd()<.0626 and s.count>26 then
+		for name,M in next,Modes do
+			if not modeRanks[name]then
+				modeRanks[name]=M.score and 0 or 6
+			end
+		end
+		FILE.saveUnlock()
+		TEXT.show("DEV:\85\78\76\79\67\75\65\76\76",640,360,60,"stretch",.6)
+		SFX.play("clear_4")
+	end
+end
+
 function wheelMoved.history(x,y)
 	wheelScroll(y)
 end

Zframework/languages.lua

@@ -2,7 +2,7 @@ local langList={
 	{
 		anykey="按任意键继续",
 		newVersion="检测到更新!存档格式可能更新,设置已重置",
-		marking="游戏作者:MrZ_26\n任何视频/直播不得出现此水印\n任何视频内声明无效",
+		marking="游戏作者:MrZ_26\n任何视频/直播不得出现此水印\n任何转述声明无效",
 		lang="中文",
 		atkModeName={"随机","徽章","击杀","反击"},
 		royale_remain=function(n)return"剩余 "..n.." 名玩家"end,
@@ -443,7 +443,7 @@ local langList={
 	{
 		anykey="按任意键继续",
 		newVersion="检测到更新!存档格式可能更新,设置已重置",
-		marking="游戏作者:MrZ_26\n任何视频/直播不得出现此水印\n任何视频内声明无效",
+		marking="游戏作者:MrZ_26\n任何视频/直播不得出现此水印\n任何转述声明无效",
 		lang="全中文",
 		atkModeName={"随机","徽章","击杀","反击"},
 		royale_remain=function(n)return"剩余 "..n.." 名玩家"end,
@@ -881,7 +881,7 @@ local langList={
 	{
 		anykey="Press any button",
 		newVersion="Updating detected! Save format may have been updated, settings reseted",
-		marking="Author:MrZ_26\nIllegal recording if see this\nAny explanation invalid",
+		marking="Game Author:MrZ_26\nIllegal recording if see this\nAny explanation invalid",
 		lang="English",
 		atkModeName={"Random","Badges","K.O.s","Attackers"},
 		royale_remain=function(n)return n.." Players Remaining"end,
@@ -1308,7 +1308,7 @@ local langList={
 	{
 		anykey="↓□↓",
 		newVersion="&!!! ___/_?_ R",
-		marking="Author:MrZ_26\nIllegal recording if see this\nAny explanation invalid",
+		marking="Game Author:MrZ_26\nIllegal recording if see this\nAny explanation invalid",
 		lang="?????",
 		atkModeName={"?","(  )","!","←→"},
 		royale_remain=function(n)return n.."~"end,

Zframework/paint.lua

@@ -404,12 +404,9 @@ end
 function Pnt.play()
 	if marking then
 		setFont(26)
-		local x=Timer()*46%1680-200
-		gc.setColor(1,1,1,abs(.26*(1-x/640)))
-		mStr(text.marking,x,260+62*sin(Timer()))
-		-- gc.setColor(1,1,1,.0626)
-		-- mStr(text.marking,260,62+26*sin(Timer()))
-		-- mStr(text.marking,1100,460+62*sin(Timer()*1.2))
+		local t=Timer()
+		gc.setColor(1,1,1,.2+.1*(sin(3*t)+sin(2.6*t)))
+		mStr(text.marking,190,60+26*sin(t))
 	end
 	for p=1,#players do
 		players[p]:draw()

Zframework/scene.lua

@@ -224,6 +224,7 @@ end
 function sceneInit.stat()
 	local S=stat
 	sceneTemp={
+		count=0,
 		chart={
 			A1=S.spin,A2=S.clear,
 			X1=S.spin_S,X2=S.clear_S,
@@ -241,7 +242,7 @@ function sceneInit.stat()
 			format("%d/%.3f%%",S.extraPiece,100*max(1-S.extraRate/S.piece,0)),
 			S.b2b.."  "..S.b3b,
 			S.pc.."  "..S.hpc,
-		}
+		},
 	}
 	for i=1,11 do
 		sceneTemp.item[i]=text.stat[i].."\t"..sceneTemp.item[i]

Zframework/timer.lua

@@ -20,7 +20,7 @@ function Tmr.load()
 		elseif S.phase==5 then
 			local m=Modes[S.cur]--mode template
 			local M=require("modes/"..m.name)--mode file
-			Modes[m.name]=M
+			Modes[m.name],Modes[S.cur]=M
 			for k,v in next,m do
 				M[k]=v
 			end