MES消息增加error图标,减淡边框
This commit is contained in:
@@ -4,7 +4,7 @@ return function(name,libName)
|
|||||||
if r1 and r2 then
|
if r1 and r2 then
|
||||||
return r2
|
return r2
|
||||||
else
|
else
|
||||||
MES.new('warn',"Cannot load "..name..": "..(r2 or r3))
|
MES.new('error',"Cannot load "..name..": "..(r2 or r3))
|
||||||
end
|
end
|
||||||
elseif SYSTEM=="Android"then
|
elseif SYSTEM=="Android"then
|
||||||
local fs=love.filesystem
|
local fs=love.filesystem
|
||||||
@@ -20,7 +20,7 @@ return function(name,libName)
|
|||||||
MES.new(name.." lib loaded")
|
MES.new(name.." lib loaded")
|
||||||
break
|
break
|
||||||
else
|
else
|
||||||
MES.new('warn',"Cannot load "..name..": "..mes2)
|
MES.new('error',"Cannot load "..name..": "..mes2)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
MES.new(("Write %s-%s to saving failed: %s"):format(name,platform[i],mes2))
|
MES.new(("Write %s-%s to saving failed: %s"):format(name,platform[i],mes2))
|
||||||
@@ -30,12 +30,12 @@ return function(name,libName)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
if not libFunc then
|
if not libFunc then
|
||||||
MES.new('warn',"Cannot load "..name)
|
MES.new('error',"Cannot load "..name)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
return libFunc()
|
return libFunc()
|
||||||
else
|
else
|
||||||
MES.new('warn',"No "..name.." for "..SYSTEM)
|
MES.new('error',"No "..name.." for "..SYSTEM)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
return true
|
return true
|
||||||
|
|||||||
@@ -17,6 +17,19 @@ local mesIcon={
|
|||||||
{'fRect',18,11,5,16},
|
{'fRect',18,11,5,16},
|
||||||
{'fRect',18,30,5,5},
|
{'fRect',18,30,5,5},
|
||||||
},
|
},
|
||||||
|
error=DOGC{40,40,
|
||||||
|
{'setCL',.95,.3,.3},
|
||||||
|
{'fCirc',20,20,19},
|
||||||
|
{'setCL',0,0,0},
|
||||||
|
{'dCirc',20,20,19},
|
||||||
|
{'setLW',6},
|
||||||
|
{'line',20-9.8,20-9.8,20+9.8,20+9.8},
|
||||||
|
{'line',20-9.8,20+9.8,20+9.8,20-9.8},
|
||||||
|
{'setLW',4},
|
||||||
|
{'setCL',1,1,1},
|
||||||
|
{'line',20-9,20-9,20+9,20+9},
|
||||||
|
{'line',20-9,20+9,20+9,20-9},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
local MES={}
|
local MES={}
|
||||||
@@ -34,7 +47,7 @@ function MES.new(...)
|
|||||||
local L={w+20,48,
|
local L={w+20,48,
|
||||||
{'setCL',.5,.5,.5,.7},
|
{'setCL',.5,.5,.5,.7},
|
||||||
{'fRect',0,0,w+20,48},
|
{'fRect',0,0,w+20,48},
|
||||||
{'setCL',.9,.9,.9},
|
{'setCL',.7,.7,.7},
|
||||||
{'setLW',2},
|
{'setLW',2},
|
||||||
{'dRect',1,1,w+18,46},
|
{'dRect',1,1,w+18,46},
|
||||||
{'setCL',1,1,1},
|
{'setCL',1,1,1},
|
||||||
|
|||||||
@@ -617,7 +617,7 @@ function selector:reset()
|
|||||||
self.selText=self.list[i]
|
self.selText=self.list[i]
|
||||||
else
|
else
|
||||||
self.hide=true
|
self.hide=true
|
||||||
MES.new('warn',"Selector "..self.name.." dead, disp= "..tostring(V))
|
MES.new('error',"Selector "..self.name.." dead, disp= "..tostring(V))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
function selector:isAbove(x,y)
|
function selector:isAbove(x,y)
|
||||||
@@ -771,7 +771,7 @@ function inputBox:addText(str)
|
|||||||
if type(str)=='string'then
|
if type(str)=='string'then
|
||||||
self.value=self.value..str
|
self.value=self.value..str
|
||||||
else
|
else
|
||||||
MES.new('warn',"inputBox "..self.name.." dead, addText("..type(str)..")")
|
MES.new('error',"inputBox "..self.name.." dead, addText("..type(str)..")")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
function inputBox:clear()
|
function inputBox:clear()
|
||||||
|
|||||||
@@ -376,7 +376,7 @@ do--function DATA.saveRecording()
|
|||||||
FILE.save(REPLAY,'conf/replay')
|
FILE.save(REPLAY,'conf/replay')
|
||||||
return true
|
return true
|
||||||
else
|
else
|
||||||
MES.new('warn',"Save failed: File already exists")
|
MES.new('error',"Save failed: File already exists")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -484,7 +484,7 @@ do--function resetGameData(args)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
MES.new('warn',"Wrong task type")
|
MES.new('error',"Wrong task type")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
BG.set(GAME.modeEnv.bg)
|
BG.set(GAME.modeEnv.bg)
|
||||||
|
|||||||
@@ -122,7 +122,7 @@ local function pumpStream(d)
|
|||||||
if res then
|
if res then
|
||||||
DATA.pumpRecording(stream,P.stream)
|
DATA.pumpRecording(stream,P.stream)
|
||||||
else
|
else
|
||||||
MES.new('warn',"Bad stream from "..P.username.."#"..P.uid,.2)
|
MES.new('error',"Bad stream from "..P.username.."#"..P.uid,.2)
|
||||||
end
|
end
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user