SweetSea/Techmino
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整字体相关的一些东西

Browse Source 
整理代码
This commit is contained in:
MrZ626
2021-08-29 16:08:51 +08:00
parent 16c377427a
commit bd9ee49255
6 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/release.yml vendored
View File

@@ -50,7 +50,7 @@ jobs:
7z x .\resource_hacker.zip
- name: Pack Techmino
run: |
7z a -tzip .\Techmino.love .\document .\font .\media .\parts .\Zframework .\conf.lua .\main.lua .\version.lua
7z a -tzip .\Techmino.love .\document .\media .\parts .\Zframework .\conf.lua .\main.lua .\version.lua
cmd /c copy /b .\love-11.3-win64\love.exe + .\Techmino.love .\love-11.3-win64\Techmino.exe
del .\love-11.3-win64\love.exe
del .\love-11.3-win64\lovec.exe
@@ -116,7 +116,7 @@ jobs:
7z x .\resource_hacker.zip
- name: Pack Techmino
run: |
7z a -tzip .\Techmino.love .\document .\font .\media .\parts .\Zframework .\conf.lua .\main.lua .\version.lua
7z a -tzip .\Techmino.love .\document .\media .\parts .\Zframework .\conf.lua .\main.lua .\version.lua
cmd /c copy /b .\love-11.3-win32\love.exe + .\Techmino.love .\love-11.3-win32\Techmino.exe
del .\love-11.3-win32\love.exe
del .\love-11.3-win32\lovec.exe
@@ -184,7 +184,7 @@ jobs:
cp ./squashfs-root/icon.png ./squashfs-root/.DirIcon
chmod 777 ./squashfs-root/love
mkdir -p ./squashfs-root/usr/share/Techmino
mv ./document ./font ./media ./parts ./Zframework ./conf.lua ./main.lua ./version.lua ./squashfs-root/usr/share/Techmino
mv ./document ./media ./parts ./Zframework ./conf.lua ./main.lua ./version.lua ./squashfs-root/usr/share/Techmino
mv ./ColdClear/CCloader.so ./squashfs-root/usr/share/Techmino
mv ./ColdClear/libcold_clear.so ./squashfs-root/usr/lib
chmod 777 ./appimagetool-x86_64.AppImage
@@ -255,7 +255,7 @@ jobs:
mkdir -p ./libAndroid/armeabi-v7a
mv ./ColdClear/android_aarch64/libs/arm64-v8a/libCCloader.so ./libAndroid/arm64-v8a
mv ./ColdClear/android_armv7/libs/armeabi-v7a/libCCloader.so ./libAndroid/armeabi-v7a
7z a -tzip ./love-android/app/src/main/assets/game.love ./document ./font ./media ./parts ./Zframework ./libAndroid ./conf.lua ./main.lua ./version.lua
7z a -tzip ./love-android/app/src/main/assets/game.love ./document ./media ./parts ./Zframework ./libAndroid ./conf.lua ./main.lua ./version.lua
echo "${{ secrets.SIGNING_KEY }}" | base64 -d > ./love-android/app/android.keystore
python3 ./.github/workflows/updateVersion.py -T AndroidRelease -C $(lua ./.github/workflows/getVersion.lua -code) -N $(lua ./.github/workflows/getVersion.lua -name) -S ${{ secrets.KEY_STORE_PASSWORD }} -A ${{ secrets.ALIAS }} -K ${{ secrets.KEY_PASSWORD }}
chmod 777 ./love-android/gradlew
@@ -329,7 +329,7 @@ jobs:
mv ./ColdClear/android_aarch64/libs/arm64-v8a/libCCloader.so ./libAndroid/arm64-v8a
mv ./ColdClear/android_armv7/libs/armeabi-v7a/libCCloader.so ./libAndroid/armeabi-v7a
rm -rf ./media/BGM ./media/SFX ./media/VOICE
7z a -tzip ./love-android/app/src/main/assets/game.love ./document ./font ./media ./parts ./Zframework ./libAndroid ./conf.lua ./main.lua ./version.lua
7z a -tzip ./love-android/app/src/main/assets/game.love ./document ./media ./parts ./Zframework ./libAndroid ./conf.lua ./main.lua ./version.lua
echo "${{ secrets.SIGNING_KEY }}" | base64 -d > ./love-android/app/android.keystore
python3 ./.github/workflows/updateVersion.py -T AndroidRelease -C $(lua ./.github/workflows/getVersion.lua -code) -N $(lua ./.github/workflows/getVersion.lua -name) -S ${{ secrets.KEY_STORE_PASSWORD }} -A ${{ secrets.ALIAS }} -K ${{ secrets.KEY_PASSWORD }}
chmod 777 ./love-android/gradlew
@@ -366,7 +366,7 @@ jobs:
echo "Title=${Title}" >> $GITHUB_ENV
- name: Pack love
run: |
7z a -tzip ./Techmino.love ./document ./font ./media ./parts ./Zframework ./conf.lua ./main.lua ./version.lua
7z a -tzip ./Techmino.love ./document ./media ./parts ./Zframework ./conf.lua ./main.lua ./version.lua
- name: Download template
run: |
curl -OL https://github.com/26F-Studio/Techmino/releases/download/v0.15.1/Techmino.app.zip
@@ -430,7 +430,7 @@ jobs:
echo "Title=${Title}" >> $GITHUB_ENV
- name: Pack Techmino
run: |
7z a -tzip ./Techmino.a${{ env.Version }}.love ./document ./font ./media ./parts ./Zframework ./conf.lua ./main.lua ./version.lua
7z a -tzip ./Techmino.a${{ env.Version }}.love ./document ./media ./parts ./Zframework ./conf.lua ./main.lua ./version.lua
- name: Release
uses: softprops/action-gh-release@v1
with:

5
Zframework/font.lua
View File

@@ -1,4 +1,5 @@
local gc=love.graphics
local set=gc.setFont
local fontCache={}
local currentFontSize
@@ -8,7 +9,7 @@ function FONT.set(s)
if not fontCache[s]then
fontCache[s]=gc.setNewFont(s,'light',gc.getDPIScale()*SCR.k*2)
end
gc.setFont(fontCache[s])
set(fontCache[s])
currentFontSize=s
end
end
@@ -33,7 +34,7 @@ function FONT.init(mainFont,secFont)
fontCache[s]=gc.setNewFont(mainFont,s,'light',gc.getDPIScale()*SCR.k*2)
fontCache[s]:setFallbacks(gc.setNewFont(secFont,s,'light',gc.getDPIScale()*SCR.k*2))
end
gc.setFont(fontCache[s])
set(fontCache[s])
currentFontSize=s
end
end

20
Zframework/init.lua
View File

@@ -91,7 +91,7 @@ local batteryImg=GC.DO{31,20,
{'fRect',26,1,2,18},
{'fRect',29,3,2,14},
}
local infoCanvas=gc.newCanvas(108,27)
local infoCanvas=gc.newCanvas(93,27)
local function updatePowerInfo()
local state,pow=love.system.getPowerInfo()
gc.setCanvas(infoCanvas)
@@ -104,7 +104,7 @@ local function updatePowerInfo()
if state=='nobattery'then
gc_setColor(1,1,1)
gc_setLineWidth(2)
gc_line(74,SCR.safeX+5,100,22)
gc_line(59,SCR.safeX+5,100,22)
elseif pow then
if charging then gc_setColor(0,1,0)
elseif pow>50 then gc_setColor(1,1,1)
@@ -112,22 +112,22 @@ local function updatePowerInfo()
elseif pow==26 then gc_setColor(.5,0,1)
else gc_setColor(1,0,0)
end
gc.rectangle('fill',76,6,pow*.22,14)
gc.rectangle('fill',61,6,pow*.22,14)
if pow<100 then
FONT.set(15)
gc.setColor(COLOR.D)
gc_print(pow,77,1)
gc_print(pow,77,3)
gc_print(pow,79,1)
gc_print(pow,79,3)
gc_print(pow,62.5,2.5)
gc_print(pow,62.5,4.5)
gc_print(pow,64.5,2.5)
gc_print(pow,64.5,4.5)
gc_setColor(COLOR.Z)
gc_print(pow,78,2)
gc_print(pow,63.5,3.5)
end
end
gc_draw(batteryImg,73,3)
gc_draw(batteryImg,58,3)
end
FONT.set(25)
gc_print(os.date("%H:%M"),3,-5)
gc_print(os.date("%H:%M"),5,-2)
gc_pop()
gc.setCanvas()
end

11
Zframework/widget.lua
View File

@@ -17,6 +17,7 @@ local max,min=math.max,math.min
local sub,ins,rem=string.sub,table.insert,table.remove
local mDraw,mDraw_X,mDraw_Y=GC.draw,GC.simpX,GC.simpY
local xOy=SCR.xOy
local FONT=FONT
local mStr=mStr
local downArrowIcon=GC.DO{40,25,{'fPoly',0,0,20,25,40,0}}
@@ -850,19 +851,21 @@ function inputBox:draw()
gc_rectangle('line',x,y,w,h,3)
--Drawable
FONT.set(self.font)
local f=self.font
FONT.set(f)
if self.obj then
mDraw_Y(self.obj,x-12-self.obj:getWidth(),y+h*.5)
end
if self.secret then
y=y+h*.5-f*.2
for i=1,#self.value do
gc_print("*",x-5+self.font*.5*i,y+h*.5-self.font*.7)
gc_rectangle("fill",x+f*.6*i,y,f*.4,f*.4)
end
else
gc_printf(self.value,x+10,y,self.w)
FONT.set(self.font-10)
FONT.set(f-10)
if WIDGET.sel==self then
gc_print(EDITING,x+10,y+12-self.font*1.4)
gc_print(EDITING,x+10,y+12-f*1.4)
end
end
end

22
main.lua
View File

@@ -79,26 +79,26 @@ require'parts.globalTables'
require'parts.gametoolfunc'
FREEROW= require'parts.freeRow'
DATA= require'parts.data'
DATA= require'parts.data'
TEXTURE= require'parts.texture'
SKIN= require'parts.skin'
USERS= require'parts.users'
SKIN= require'parts.skin'
USERS= require'parts.users'
NET= require'parts.net'
VK= require'parts.virtualKey'
VK= require'parts.virtualKey'
BOT= require'parts.bot'
RSlist= require'parts.RSlist'DSCP=RSlist.TRS.centerPos
RSlist= require'parts.RSlist'DSCP=RSlist.TRS.centerPos
PLY= require'parts.player'
netPLY= require'parts.netPlayer'
MODES= require'parts.modes'
netPLY= require'parts.netPlayer'
MODES= require'parts.modes'
--Load settings and statistics
TABLE.cover(FILE.load('conf/user')or{},USER)
TABLE.cover(FILE.load('conf/unlock')or{},RANKS)
TABLE.cover (FILE.load('conf/user')or{},USER)
TABLE.cover (FILE.load('conf/unlock')or{},RANKS)
TABLE.update(FILE.load('conf/settings')or{},SETTING)
TABLE.update(FILE.load('conf/data')or{},STAT)
TABLE.cover(FILE.load('conf/key')or{},keyMap)
TABLE.cover(FILE.load('conf/virtualkey')or{},VK_org)
TABLE.cover (FILE.load('conf/key')or{},keyMap)
TABLE.cover (FILE.load('conf/virtualkey')or{},VK_org)
--Initialize fields, sequence, missions, gameEnv for cutsom game
local fieldData=FILE.load('conf/customBoards')

2
parts/scenes/about.lua
View File

@@ -22,7 +22,7 @@ function scene.draw()
--Lib used
setFont(15)
gc.print(text.used,30,320)
gc.print(text.used,50,340)
--Logo
local t=TIME()