From 25efce87dcd4f54fb20ea41987873574130ecce3 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Fri, 5 Mar 2021 13:05:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=A0=E4=B8=AA=E7=BB=98=E5=9B=BE=E7=94=A8?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0mXXX=E6=A8=A1=E5=9D=97=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Zframework/init.lua            |  7 +++++--
 Zframework/mDraw.lua           | 25 ++++++++++++++++++-------
 parts/backgrounds/lanterns.lua |  1 +
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/Zframework/init.lua b/Zframework/init.lua
index b019b324..3ffbd236 100644
--- a/Zframework/init.lua
+++ b/Zframework/init.lua
@@ -8,13 +8,16 @@ LOADLIB=require"Zframework/loadLib"
 WHEELMOV=require"Zframework/wheelScroll"
 
 require"Zframework/setFont"
-require"Zframework/mDraw"
+MDRAW=require"Zframework/mDraw"
+	mStr=MDRAW.str
+	mText=MDRAW.simpX
+	mDraw=MDRAW.draw
 
+-- UPPERCHAR=require"Zframework/upperChar"
 JSON=require"Zframework/json"
 DUMPTABLE=require"Zframework/dumpTable"
 URLENCODE=require"Zframework/urlEncode"
 
--- UPPERCHAR=require"Zframework/upperChar"
 TABLE=require"Zframework/tableExtend"
 SPLITSTR=require"Zframework/splitStr"
 TIMESTR=require"Zframework/timeStr"
diff --git a/Zframework/mDraw.lua b/Zframework/mDraw.lua
index 144ded22..f5f8b3d6 100644
--- a/Zframework/mDraw.lua
+++ b/Zframework/mDraw.lua
@@ -1,11 +1,22 @@
 local printf=love.graphics.printf
 local draw=love.graphics.draw
-function mStr(s,x,y)
-	printf(s,x-626,y,1252,"center")
+local mDraw={}
+function mDraw.str(str,x,y)
+	printf(str,x-626,y,1252,"center")
 end
-function mText(s,x,y)
-	draw(s,x-s:getWidth()*.5,y)
+function mDraw.simpX(str,x,y)
+	draw(str,x-str:getWidth()*.5,y)
 end
-function mDraw(s,x,y,a,k)
-	draw(s,x,y,a,k,nil,s:getWidth()*.5,s:getHeight()*.5)
-end
\ No newline at end of file
+function mDraw.simpY(str,x,y)
+	draw(str,x,y-str:getHeight()*.5)
+end
+function mDraw.X(str,x,y,a,k)
+	draw(str,x,y,a,k,nil,str:getWidth()*.5,0)
+end
+function mDraw.Y(str,x,y,a,k)
+	draw(str,x,y,a,k,nil,0,str:getHeight()*.5)
+end
+function mDraw.draw(str,x,y,a,k)
+	draw(str,x,y,a,k,nil,str:getWidth()*.5,str:getHeight()*.5)
+end
+return mDraw
\ No newline at end of file
diff --git a/parts/backgrounds/lanterns.lua b/parts/backgrounds/lanterns.lua
index 77f01110..e9e675ab 100644
--- a/parts/backgrounds/lanterns.lua
+++ b/parts/backgrounds/lanterns.lua
@@ -2,6 +2,7 @@
 local gc=love.graphics
 local int,rnd=math.floor,math.random
 local ins,rem=table.insert,table.remove
+local mDraw=mDraw
 local back={}
 local lanterns
 local t