MES模块支持带内部图标(目前只有warn)
This commit is contained in:
@@ -352,7 +352,7 @@ do--function DATA.saveRecording()
|
||||
--Filtering modes that cannot be saved
|
||||
for _,v in next,noRecList do
|
||||
if GAME.curModeName:find(v)then
|
||||
MES.new("Cannot save recording of this mode now!")
|
||||
MES.new('warn',"Cannot save recording of this mode now!")
|
||||
return
|
||||
end
|
||||
end
|
||||
@@ -376,7 +376,7 @@ do--function DATA.saveRecording()
|
||||
FILE.save(REPLAY,'conf/replay')
|
||||
return true
|
||||
else
|
||||
MES.new("Save failed: File already exists")
|
||||
MES.new('warn',"Save failed: File already exists")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -484,7 +484,7 @@ do--function resetGameData(args)
|
||||
end
|
||||
end
|
||||
else
|
||||
MES.new("Wrong task type")
|
||||
MES.new('warn',"Wrong task type")
|
||||
end
|
||||
end
|
||||
BG.set(GAME.modeEnv.bg)
|
||||
|
||||
@@ -122,7 +122,7 @@ local function pumpStream(d)
|
||||
if res then
|
||||
DATA.pumpRecording(stream,P.stream)
|
||||
else
|
||||
MES.new("Bad stream from "..P.username.."#"..P.uid,.2)
|
||||
MES.new('warn',"Bad stream from "..P.username.."#"..P.uid,.2)
|
||||
end
|
||||
break
|
||||
end
|
||||
|
||||
@@ -244,7 +244,7 @@ local function loadRemoteEnv(P,confStr)--Load gameEnv
|
||||
confStr=JSON.decode(confStr)
|
||||
if not confStr then
|
||||
confStr={}
|
||||
MES.new("Bad conf from "..P.username.."#"..P.uid)
|
||||
MES.new('warn',"Bad conf from "..P.username.."#"..P.uid)
|
||||
end
|
||||
|
||||
P.gameEnv={}--Current game setting environment
|
||||
|
||||
@@ -220,7 +220,7 @@ function scene.socketRead(cmd,d)
|
||||
resetGameData('n',NET.seed)
|
||||
netPLY.mouseMove(0,0)
|
||||
else
|
||||
MES.new("Redundant [Go]")
|
||||
MES.new('warn',"Redundant [Go]")
|
||||
end
|
||||
elseif cmd=='finish'then
|
||||
playing=false
|
||||
|
||||
@@ -16,7 +16,7 @@ function scene.draw()
|
||||
end
|
||||
scene.widgetList={
|
||||
WIDGET.newKey{name="setting",fText=TEXTURE.setting,x=1200,y=160,w=90,h=90,code=goScene'setting_game'},
|
||||
WIDGET.newKey{name="match",x=640,y=500,w=760,h=140,font=60,code=function()MES.new("Coming soon 开发中,敬请期待")end},
|
||||
WIDGET.newKey{name="match",x=640,y=500,w=760,h=140,font=60,code=function()MES.new('warn',"Coming soon 开发中,敬请期待")end},
|
||||
WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
|
||||
}
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ end
|
||||
scene.widgetList={
|
||||
WIDGET.newKey{name="setting",fText=TEXTURE.setting,x=1200,y=160,w=90,h=90,code=goScene'setting_game'},
|
||||
WIDGET.newButton{name="league", x=640, y=180,w=350,h=120,font=40,color='D',code=goScene'net_league'},
|
||||
WIDGET.newButton{name="ffa", x=640, y=360,w=350,h=120,font=40,color='D',code=function()MES.new("Coming soon 开发中,敬请期待")--[[NET.enterRoom({name="ffa"})]]end},
|
||||
WIDGET.newButton{name="ffa", x=640, y=360,w=350,h=120,font=40,color='D',code=function()MES.new('warn',"Coming soon 开发中,敬请期待")--[[NET.enterRoom({name="ffa"})]]end},
|
||||
WIDGET.newButton{name="rooms", x=640, y=540,w=350,h=120,font=40,code=goScene'net_rooms'},
|
||||
WIDGET.newButton{name="logout", x=880, y=40,w=180,h=60,color='dR',
|
||||
code=function()
|
||||
|
||||
@@ -85,7 +85,7 @@ scene.widgetList={
|
||||
ROOMENV.capacity=i
|
||||
WIDGET.active.capacity.color=COLOR.lY
|
||||
else
|
||||
MES.new("没有权限 Permission Denied")
|
||||
MES.new('warn',"没有权限 Permission Denied")
|
||||
WIDGET.active.capacity.color=COLOR.R
|
||||
end
|
||||
end},
|
||||
|
||||
@@ -61,8 +61,8 @@ function scene.keyDown(k)
|
||||
elseif k=="return"then
|
||||
if NET.getlock('fetchRoom')or not NET.roomList[selected]then return end
|
||||
local R=NET.roomList[selected]
|
||||
if R.roomInfo.version~=VERSION.short then MES.new("Version doesn't match")return end
|
||||
if R.private then MES.new("Can't enter private room now")return end
|
||||
if R.roomInfo.version~=VERSION.short then MES.new('warn',"Version doesn't match")return end
|
||||
if R.private then MES.new('warn',"Can't enter private room now")return end
|
||||
NET.enterRoom(R)--,password
|
||||
end
|
||||
end
|
||||
|
||||
@@ -32,7 +32,7 @@ function SKIN.init(list)
|
||||
I=gc.newImage(N)
|
||||
else
|
||||
I=gc.newImage("media/image/skin/"..list[1]..".png")
|
||||
MES.new("No skin file: "..list[i])
|
||||
MES.new('warn',"No skin file: "..list[i])
|
||||
end
|
||||
gc.setDefaultFilter('linear','linear')
|
||||
for y=0,2 do
|
||||
|
||||
Reference in New Issue
Block a user