修改水印相关

2021-02-22 21:51:20 +08:00
parent 898a6cf567
commit c6f408ff82
12 changed files with 35 additions and 28 deletions
--- a/Zframework/init.lua
+++ b/Zframework/init.lua
@@ -210,7 +210,7 @@ function love.keypressed(i)
 		elseif i=="f10"then	devMode=2	LOG.print("DEBUG 2",COLOR.yellow)
 		elseif i=="f11"then	devMode=3	LOG.print("DEBUG 3",COLOR.yellow)
 		elseif i=="f12"then	devMode=4	LOG.print("DEBUG 4",COLOR.yellow)
-		elseif i=="\\"then	MARKING=nil
+		elseif i=="\\"then	_G["\100\114\97\119\70\87\77"]=NULL
 		elseif devMode==2 then
 			if WIDGET.sel then
 				local W=WIDGET.sel
--- a/main.lua
+++ b/main.lua
@@ -19,7 +19,6 @@ MOBILE=SYSTEM=="Android"or SYSTEM=="iOS"
 SAVEDIR=fs.getSaveDirectory()

 --Global Vars & Settings
-MARKING=true
 LOADED=false
 NOGAME=false
 LOGIN=false
--- a/parts/gametoolfunc.lua
+++ b/parts/gametoolfunc.lua
@@ -7,6 +7,7 @@ local gc_setColor,gc_setLineWidth,gc_setShader=gc.setColor,gc.setLineWidth,gc.se
 local gc_push,gc_pop,gc_origin=gc.push,gc.pop,gc.origin
 local gc_draw,gc_rectangle,gc_circle=gc.draw,gc.rectangle,gc.circle
 local max,int,rnd=math.max,math.floor,math.random
+local sin=math.sin
 local sub=string.sub
 local char,byte=string.char,string.byte
 local ins,rem=table.insert,table.remove
@@ -975,6 +976,34 @@ end


 --Game draw
+do--function drawFWM()
+	local zh=table.concat{"游","戏作","者:Mr","Z_2","6\n任","何视","频/直","播不","得出","现此水","印\n任","何转","述声","明无","效"}
+	local marks={
+		zh,
+		zh,
+		zh,
+		"Author: MrZ_26\nIllegal recording if you can see this\nAny explanation is invalid",
+		"Créateur du jeu: MrZ_26\nSi vous pouvez voir ceci, cet enregistrement est illégal\nToute explication est fausse et invalide",
+		"Autor: MrZ_26\nEsta grabación es ilegal si ves esto\nNo se aceptan excusas",
+		"Autor do jogo: MrZ_26\nSe puder ver isso a gravação e illegal\nQualquer explicação é invalida",
+		"Author: MrZ_26\nIllegal recording if you can see this\nAny explanation is invalid",
+	}
+	function drawFWM()
+		local t=TIME()
+		setFont(25)
+		gc_setColor(1,1,1,.2+.1*(sin(3*t)+sin(2.6*t)))
+		mStr(marks[SETTING.lang],240,60+26*sin(t))
+		--你竟然找到了这里！那么在动手之前读读下面这些吧。
+		--千万不要因为想在网络公共场合发视频而擅自删除这部分代码！
+		--录制视频上传到公共场合(包括但不限于任何视频平台/论坛/几十个人以上的社区群等)很可能会对Techmino未来的发展有负面影响
+		--如果被TTC发现，TTC随时可以用DMCA从法律层面强迫游戏停止开发，到时候谁都没得玩。这是真的，已经有几个方块游戏这么死了…
+		--水印限制可以减少低质量视频泛滥，也能减轻过多不是真的感兴趣路人玩家入坑可能带来的压力
+		--想发视频的话请先向作者申请，描述录制的大致内容，同意了才可以去关闭水印
+		--在techmino发展到一定程度之后会解除这个限制(啧啧…)
+		--最后，别把这里藏的这些话截图/复制出去哦~
+		--最后的最后，感谢您对Techmino的支持！！！
+	end
+end
 function drawWarning()
 	if SETTING.warn and GAME.warnLVL>0 then
 		gc_push("transform")
--- a/parts/language/lang_en.lua
+++ b/parts/language/lang_en.lua
@@ -5,7 +5,6 @@ return{
 	sureQuit="Press again to exit",
 	newVersion="Thanks for updating! Check out the updates below.",
 	httpTimeout="Network connection timed out",
-	marking="Game Author: MrZ_26\nIllegal recording if you can see this\nAny explanation is invalid",
 	newDay="[Anti-addiction] New day, new beginning!",
 	playedLong="[Anti-addiction] You've been playing quite a bit today. Make sure to take breaks.",
 	playedTooMuch="[Anti-addiction] You've been playing too much today! You can't play any more.",
--- a/parts/language/lang_fr.lua
+++ b/parts/language/lang_fr.lua
@@ -5,7 +5,6 @@ return{
 	-- sureQuit="Press again to exit",
 	newVersion="Merci d'avoir mis le jeu à jour ! Les nouvelles fonctionnalités sont listées ci-dessous.",
 	httpTimeout="La connexion au réseau ne s'est pas faite à temps.",
-	marking="Créateur du jeu: MrZ_26\nSi vous pouvez voir ceci, cet enregistrement est illégal\nToute explication est fausse et invalide.",
 	-- newDay="[Anti-addiction] New day, new beginning!",
 	-- playedLong="[Anti-addiction] You've been playing quite a bit today. Make sure to take breaks.",
 	-- playedTooMuch="[Anti-addiction] You've been playing too much today! You can't play any more.",
--- a/parts/language/lang_pt.lua
+++ b/parts/language/lang_pt.lua
@@ -5,7 +5,6 @@ return{
 	sureQuit="Aparte novamente para sair",
 	newVersion="Obrigado por atualizar! Veja as mudanças abaixo.",
 	httpTimeout="Conexão de rede expirou",
-	marking="Autor do jogo: MrZ_26\nSe puder ver isso a gravação e illegal\nQualquer explicação é invalida",
 	newDay="[Anti-vício] Novo dia, um começo novo!",
 	playedLong="[Anti-vício] Você andou jogando bastante hoje. Certifique-se de fazer pausas.",
 	playedTooMuch="[Anti-vício] Você esteve jogando demais hoje! Você não pode jogar mais.",
--- a/parts/language/lang_sp.lua
+++ b/parts/language/lang_sp.lua
@@ -5,7 +5,6 @@ return{
 	-- sureQuit="Press again to exit",
 	newVersion="¡Gracias por actualizar! Detalles a continuación:",
 	httpTimeout="¡Tiempo de espera de conexión agotado!",
-	marking="Autor:MrZ_26\nEsta grabación es ilegal si ves esto\nNo se aceptan excusas",
 	-- newDay="[Anti-addiction] New day, new beginning!",
 	-- playedLong="[Anti-addiction] You've been playing quite a bit today. Make sure to take breaks.",
 	-- playedTooMuch="[Anti-addiction] You've been playing too much today! You can't play any more.",
--- a/parts/language/lang_zh.lua
+++ b/parts/language/lang_zh.lua
@@ -5,7 +5,6 @@ return{
 	sureQuit="再按一次退出",
 	newVersion="感谢更新!更新内容如下",
 	httpTimeout="网络连接超时!",
-	marking="游戏作者:MrZ_26\n任何视频/直播不得出现此水印\n任何转述声明无效",
 	newDay="新的一天,新的开始~",
 	playedLong="已经玩很久了!注意休息!",
 	playedTooMuch="今天玩太久啦!打块好玩但也要适可而止哦~",
--- a/parts/player/player.lua
+++ b/parts/player/player.lua
@@ -1645,9 +1645,6 @@ function Player.win(P,result)
 	if P.type=="human"then
 		gameOver()
 		TASK.new(tick_autoPause)
-		if MARKING then
-			P:showTextF(text.marking,0,-226,25,"appear",.4,.0626)
-		end
 	end
 	P:newTask(tick_finish)
 end
@@ -1756,9 +1753,6 @@ function Player.lose(P,force)
 		else
 			TASK.new(tick_autoPause)
 		end
-		if MARKING then
-			P:showTextF(text.marking,0,-226,25,"appear",.4,.0626)
-		end
 	else
 		P:newTask(tick_lose)
 	end
--- a/parts/scenes/calculator.lua
+++ b/parts/scenes/calculator.lua
@@ -76,7 +76,8 @@ function scene.keyDown(k)
 		local v=tonumber(val)
 		if v==600+26 then pass=true
 		elseif v==190000+6022 then
-			pass,MARKING=true
+			pass=true
+			_G["\100\114\97\119\70\87\77"]=NULL
 			LOG.print("\68\69\86\58\87\97\116\101\114\109\97\114\107\32\82\101\109\111\118\101\100","message")
 			SFX.play("clear")
 		elseif v==7294e4+3816 then
--- a/parts/scenes/net_game.lua
+++ b/parts/scenes/net_game.lua
@@ -4,7 +4,6 @@ local tc=love.touch

 local playerData
 local ins,rem=table.insert,table.remove
-local sin=math.sin

 local SCR=SCR
 local VK=virtualkey
@@ -302,12 +301,7 @@ function scene.update(dt)
 end

 function scene.draw()
-	local t=TIME()
-	if MARKING then
-		setFont(25)
-		gc.setColor(1,1,1,.2+.1*(sin(3*t)+sin(2.6*t)))
-		mStr(text.marking,190,60+26*sin(t))
-	end
+	drawFWM()

 	--Players
 	for p=hideChatBox and 1 or 2,#PLAYERS do
--- a/parts/scenes/play.lua
+++ b/parts/scenes/play.lua
@@ -178,12 +178,7 @@ local function drawAtkPointer(x,y)
 	gc.circle("line",x,y,30*(1+a),6)
 end
 function scene.draw()
-	local t=TIME()
-	if MARKING then
-		setFont(25)
-		gc_setColor(1,1,1,.2+.1*(sin(3*t)+sin(2.6*t)))
-		mStr(text.marking,190,60+26*sin(t))
-	end
+	drawFWM()

 	--Players
 	for p=1,#PLAYERS do
@@ -221,7 +216,7 @@ function scene.draw()

 	--Replaying
 	if GAME.replaying then
-		gc_setColor(1,1,t%1>.5 and 1 or 0)
+		gc_setColor(1,1,TIME()%1>.5 and 1 or 0)
 		mText(drawableText.replaying,770,17)
 	end