版本信息添加short字段,上报房间版本格式从code改为short,微调房间列表界面ui
This commit is contained in:
1
conf.lua
1
conf.lua
@@ -1,5 +1,6 @@
|
|||||||
VERSION={
|
VERSION={
|
||||||
code=1409,
|
code=1409,
|
||||||
|
short="V0.14.9",
|
||||||
string="Alpha V0.14.9",
|
string="Alpha V0.14.9",
|
||||||
name="下午茶 Teatime",
|
name="下午茶 Teatime",
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -228,7 +228,7 @@ function NET.createRoom(roomName,capacity,roomType,password)
|
|||||||
roomInfo={
|
roomInfo={
|
||||||
name=roomName,
|
name=roomName,
|
||||||
type=roomType,
|
type=roomType,
|
||||||
version=VERSION.code,
|
version=VERSION.short,
|
||||||
},
|
},
|
||||||
roomData={_=0},
|
roomData={_=0},
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ function scene.wheelMoved(_,y)
|
|||||||
end
|
end
|
||||||
function scene.keyDown(k)
|
function scene.keyDown(k)
|
||||||
if k=="r"then
|
if k=="r"then
|
||||||
if fetchTimer<=6 then
|
if fetchTimer<=7 then
|
||||||
fetchRoom()
|
fetchRoom()
|
||||||
end
|
end
|
||||||
elseif k=="s"then
|
elseif k=="s"then
|
||||||
@@ -87,7 +87,7 @@ function scene.keyDown(k)
|
|||||||
elseif k=="return"then
|
elseif k=="return"then
|
||||||
if NET.getlock('fetchRoom')or not NET.roomList[selected]then return end
|
if NET.getlock('fetchRoom')or not NET.roomList[selected]then return end
|
||||||
local R=NET.roomList[selected]
|
local R=NET.roomList[selected]
|
||||||
if R.roomInfo.version~=VERSION.code then LOG.print("Version doesn't match",'message')return end
|
if R.roomInfo.version~=VERSION.short then LOG.print("Version doesn't match",'message')return end
|
||||||
if R.private then LOG.print("Can't enter private room now",'message')return end
|
if R.private then LOG.print("Can't enter private room now",'message')return end
|
||||||
NET.enterRoom(R)--,password
|
NET.enterRoom(R)--,password
|
||||||
end
|
end
|
||||||
@@ -95,23 +95,24 @@ function scene.keyDown(k)
|
|||||||
end
|
end
|
||||||
|
|
||||||
function scene.mouseMove(x,y,_,dy)
|
function scene.mouseMove(x,y,_,dy)
|
||||||
if ms.isDown(1)and x>50 and x<1110 and y>110 and y<510 then
|
if ms.isDown(1)and x>50 and x<850 and y>110 and y<510 then
|
||||||
scene.wheelMoved(0,dy/40)
|
scene.wheelMoved(0,dy/40)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
function scene.touchMove(x,y,_,dy)
|
function scene.touchMove(x,y,_,dy)
|
||||||
if x>50 and x<1110 and y>110 and y<510 then
|
if x>50 and x<850 and y>110 and y<510 then
|
||||||
scene.wheelMoved(0,dy/40)
|
scene.wheelMoved(0,dy/40)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
function scene.mouseClick(x,y)
|
function scene.mouseClick(x,y)
|
||||||
if x>50 and x<1110 then
|
if x>50 and x<850 then
|
||||||
y=int((y-70)/40)
|
y=int((y-70)/40)
|
||||||
if y>=1 and y<=10 then
|
if y>=1 and y<=10 then
|
||||||
local s=int(y+scrollPos)
|
local s=int(y+scrollPos)
|
||||||
if NET.roomList[s]then
|
if NET.roomList[s]then
|
||||||
if selected~=s then
|
if selected~=s then
|
||||||
selected=s
|
selected=s
|
||||||
|
print(1)
|
||||||
SFX.play('click',.4)
|
SFX.play('click',.4)
|
||||||
else
|
else
|
||||||
scene.keyDown("return")
|
scene.keyDown("return")
|
||||||
@@ -186,17 +187,17 @@ function scene.draw()
|
|||||||
if NET.roomList[selected]then
|
if NET.roomList[selected]then
|
||||||
local R=NET.roomList[selected]
|
local R=NET.roomList[selected]
|
||||||
setFont(25)
|
setFont(25)
|
||||||
gc.print(R.roomInfo.type,870,280)
|
gc.print(R.roomInfo.type,870,265)
|
||||||
gc.setColor(1,1,.7)
|
gc.setColor(1,1,.7)
|
||||||
gc.printf(R.roomInfo.name,870,240,365)
|
gc.printf(R.roomInfo.name,870,240,365)
|
||||||
setFont(20)
|
setFont(20)
|
||||||
if R.start then
|
if R.start then
|
||||||
gc.setColor(0,1,.2)
|
gc.setColor(0,1,.2)
|
||||||
gc.print(text.started,870,470)
|
gc.print(text.started,870,475)
|
||||||
end
|
end
|
||||||
if R.roomInfo.version~=VERSION.code then
|
if R.roomInfo.version~=VERSION.short then
|
||||||
gc.setColor(1,.2,0)
|
gc.setColor(1,.2,0)
|
||||||
gc.printf("Ver:"..R.roomInfo.version,870,470,365,'right')
|
gc.printf(R.roomInfo.version,870,475,365,'right')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -210,9 +211,9 @@ end
|
|||||||
|
|
||||||
scene.widgetList={
|
scene.widgetList={
|
||||||
WIDGET.newKey{name="setting",fText=TEXTURE.setting,x=1200,y=160,w=90,h=90,code=pressKey"s"},
|
WIDGET.newKey{name="setting",fText=TEXTURE.setting,x=1200,y=160,w=90,h=90,code=pressKey"s"},
|
||||||
WIDGET.newText{name="refreshing",x=425,y=255,font=45,hideF=function()return not NET.getlock('fetchRoom')end},
|
WIDGET.newText{name="refreshing",x=450,y=255,font=45,hideF=function()return not NET.getlock('fetchRoom')end},
|
||||||
WIDGET.newText{name="noRoom", x=425,y=260,font=40,hideF=function()return #NET.roomList>0 or NET.getlock('fetchRoom')end},
|
WIDGET.newText{name="noRoom", x=450,y=260,font=40,hideF=function()return #NET.roomList>0 or NET.getlock('fetchRoom')end},
|
||||||
WIDGET.newKey{name="refresh", x=300,y=620,w=140,h=140,font=35,code=fetchRoom,hideF=function()return fetchTimer>6 end},
|
WIDGET.newKey{name="refresh", x=300,y=620,w=140,h=140,font=35,code=fetchRoom,hideF=function()return fetchTimer>7 end},
|
||||||
WIDGET.newKey{name="new", x=500,y=620,w=140,h=140,font=20,code=pressKey"n"},
|
WIDGET.newKey{name="new", x=500,y=620,w=140,h=140,font=20,code=pressKey"n"},
|
||||||
WIDGET.newKey{name="new2", x=700,y=620,w=140,h=140,font=20,code=pressKey"m"},
|
WIDGET.newKey{name="new2", x=700,y=620,w=140,h=140,font=20,code=pressKey"m"},
|
||||||
WIDGET.newKey{name="join", x=900,y=620,w=140,h=140,font=40,code=pressKey"return",hideF=function()return #NET.roomList==0 or NET.getlock('enterRoom')end},
|
WIDGET.newKey{name="join", x=900,y=620,w=140,h=140,font=40,code=pressKey"return",hideF=function()return #NET.roomList==0 or NET.getlock('enterRoom')end},
|
||||||
|
|||||||
Reference in New Issue
Block a user