整 理 代 码
(应该没有改到字符串里面的东西吧…)起码不直接影响运行
This commit is contained in:
Submodule Zframework updated: b48282a5f4...779c841f1a
@@ -825,23 +825,6 @@ end
|
|||||||
|
|
||||||
--Game draw
|
--Game draw
|
||||||
do--function drawSelfProfile()
|
do--function drawSelfProfile()
|
||||||
local lvColor={COLOR.J,COLOR.A,COLOR.C,COLOR.N,COLOR.S,COLOR.V,COLOR.P,COLOR.M,COLOR.W,COLOR.R,COLOR.O,COLOR.Y}
|
|
||||||
local lvIcon=setmetatable({},{__index=function(self,lv)
|
|
||||||
local c=lvColor[int((lv-1)/26)+1]or COLOR.Z
|
|
||||||
|
|
||||||
local img=GC.DO{25,25,
|
|
||||||
{"clear",0,0,0,0},
|
|
||||||
{"setLW",2},
|
|
||||||
{"setCL",c[1],c[2],c[3],.6},
|
|
||||||
{"fRect",2,2,21,21,2},
|
|
||||||
{"setCL",c},
|
|
||||||
{"dRect",2,2,21,21,2},
|
|
||||||
{"setCL",COLOR.Z},
|
|
||||||
{"mText",(lv-1)%26+1,13,-1},
|
|
||||||
}
|
|
||||||
rawset(self,lv,img)
|
|
||||||
return img
|
|
||||||
end})
|
|
||||||
local name
|
local name
|
||||||
local textObj,scaleK,width,offY
|
local textObj,scaleK,width,offY
|
||||||
function drawSelfProfile()
|
function drawSelfProfile()
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
local WS=WS
|
local WS=WS
|
||||||
local PLAYERS=PLAYERS
|
|
||||||
|
|
||||||
local NET={
|
local NET={
|
||||||
allow_online=false,
|
allow_online=false,
|
||||||
@@ -303,7 +302,7 @@ function NET.room.chat(mes,rid)
|
|||||||
})
|
})
|
||||||
end
|
end
|
||||||
function NET.room.create(roomName,description,capacity,roomType,roomData,password)
|
function NET.room.create(roomName,description,capacity,roomType,roomData,password)
|
||||||
if TASK.lock('enterRoom',2)then
|
if not TASK.lock('enterRoom',2) then return end
|
||||||
NET.roomState.private=not not password
|
NET.roomState.private=not not password
|
||||||
NET.roomState.capacity=capacity
|
NET.roomState.capacity=capacity
|
||||||
wsSend(1301,{
|
wsSend(1301,{
|
||||||
@@ -319,7 +318,6 @@ function NET.room.create(roomName,description,capacity,roomType,roomData,passwor
|
|||||||
password=password,
|
password=password,
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
end
|
|
||||||
function NET.room.getData(rid)
|
function NET.room.getData(rid)
|
||||||
wsSend(1302,{
|
wsSend(1302,{
|
||||||
roomId=rid,--Admin
|
roomId=rid,--Admin
|
||||||
|
|||||||
@@ -109,14 +109,6 @@ function scene.draw()
|
|||||||
gc_setColor(1,1,1,.12)
|
gc_setColor(1,1,1,.12)
|
||||||
gc_arc('fill','pie',250,630,40,-1.5708,-1.5708-.6283*fetchTimer)
|
gc_arc('fill','pie',250,630,40,-1.5708,-1.5708-.6283*fetchTimer)
|
||||||
|
|
||||||
--Joining mark
|
|
||||||
if TASK.getLock('enterRoom')then
|
|
||||||
gc.setColor(COLOR.Z)
|
|
||||||
gc.setLineWidth(15)
|
|
||||||
local t=TIME()*6.26%6.2832
|
|
||||||
gc.arc('line','open',640,360,80,t,t+4.26)
|
|
||||||
end
|
|
||||||
|
|
||||||
--Room list
|
--Room list
|
||||||
local R=roomList:getSel()
|
local R=roomList:getSel()
|
||||||
if R then
|
if R then
|
||||||
|
|||||||
Reference in New Issue
Block a user