diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25065e6..8d0f7d9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +3,8 @@
-
-
-
+
+
@@ -18,11 +17,11 @@
-
+
-
-
+
+
@@ -36,11 +35,6 @@
-
-
-
-
-
@@ -54,15 +48,17 @@
-
+
+
+
-
+
-
-
+
+
@@ -83,6 +79,15 @@
+
+
+
+
+
+
+
+
+
@@ -163,7 +168,6 @@
-
@@ -181,8 +185,9 @@
-
+
+
@@ -489,7 +494,21 @@
1539536337050
-
+
+ 1539796918850
+
+
+
+ 1539796918850
+
+
+ 1539797567057
+
+
+
+ 1539797567057
+
+
@@ -515,7 +534,7 @@
-
+
@@ -603,7 +622,8 @@
-
+
+
@@ -830,11 +850,6 @@
-
-
-
-
-
@@ -864,13 +879,6 @@
-
-
-
-
-
-
-
@@ -880,8 +888,29 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/globle.lua b/globle.lua
index 1f10c68..0e885a7 100644
--- a/globle.lua
+++ b/globle.lua
@@ -68,13 +68,14 @@ text_style['q3'] = quality_colors[3]
text_style['q2'] = quality_colors[2]
text_style['q1'] = quality_colors[1]
-text_style.font56 = assets.font.myfont(56)
-text_style.font48 = assets.font.myfont(48)
-text_style.font32 = assets.font.myfont(32)
-text_style.font28 = assets.font.myfont(28)
-text_style.font24 = assets.font.myfont(24)
-text_style.font20 = assets.font.myfont(20)
-text_style.font18 = assets.font.myfont(18)
+font80 = assets.font.myfont(80)
+font56 = assets.font.myfont(56)
+font48 = assets.font.myfont(48)
+font32 = assets.font.myfont(32)
+font28 = assets.font.myfont(28)
+font24 = assets.font.myfont(24)
+font20 = assets.font.myfont(20)
+font18 = assets.font.myfont(18)
diff --git a/objects/CreateStage.lua b/objects/CreateStage.lua
index 997349e..127ad37 100644
--- a/objects/CreateStage.lua
+++ b/objects/CreateStage.lua
@@ -8,9 +8,10 @@
CreateStage = Class("CreateStage",Stage)
local style = {
- font = assets.font.myfont(32),
+ font = assets.font.myfont(18),
showBorder = true,
bgColor = {0.208, 0.220, 0.222,0.222},
+ group = "CreatStage"
--fgColor = {1,0,0}
}
@@ -21,34 +22,30 @@ function CreateStage:init()
self.background = assets.graphics.Backgrounds.bg
local title_font = assets.font.myfont(80)
self.ui = gooi
- self.ui.desktopMode()
self.ui_group = "CreateStage"
- --self.ui.desktopMode()
- --self.ui.shadow()
- --self.ui.setStyle({font = title_font})
- self.ui.newLabel({group = self.ui_group,text = "创建侠客",x = gw/3,y=gh/6}):center():setStyle({font=title_font}):fg({0,0,0})
+ self.ui.newLabel({group = self.ui_group,text = "创建侠客",x = gw/3,y=gh/10})
+ :center():setStyle({font=title_font}):fg({0,0,0})
self.ui.setStyle(style)
- --gooi.glass()
- --self.panel = self.ui.newPanel({x = 500,y = 500,w = 150,h = 36,layout = "grid 4x1"})
-
- --self.ui.newButton({text = "新的穿越",x = 500,y = 500,w = 150,h = 36})
- --self.ui.newButton({text = "梦回武林",x = 500,y = 550,w = 150,h = 36})
- --self.ui.newButton({text = "侠客宝典",x = 500,y = 600,w = 150,h = 36})
- self.ui.newButton({group = self.ui_group,text = "返回太虚",x = gw - 200,y = gh - 100,w = 150,h = 36})
- :onRelease(
+ self.ui.desktopMode()
+ self.ui.shadow()
+---- no border bug
+ local font18 = assets.font.myfont(18)
+ self.panel = self.ui.newPanel({x = 10, y = 200, w = 200, h = 270, layout = "grid 10x3"})
+ self.panel:setStyle({bgColor = {0.208, 0.220, 0.222},fgColor = {0,0,0},font = font18 })
+ self.panel:add(self.ui.newLabel({group = self.ui_group,text = "姓名"}))
+ self.panel:add(self.ui.newLabel({group = self.ui_group,text = "悟道"}))
+ self.panel:add(self.ui.newButton({group = self.ui_group,text = "变更"}))
+ self.panel:add(self.ui.newLabel({group = self.ui_group,text = "性别"}))
+ self.panel:add(self.ui.newLabel({group = self.ui_group,text = "男"}))
+ self.panel:add(self.ui.newButton({group = self.ui_group,text = "变更"}))
+ self.panel:add(self.ui.newLabel({group = self.ui_group,text = "年龄"}))
+ self.panel:add(self.ui.newLabel({group = self.ui_group,text = "18"}))
+ self.panel:add(self.ui.newButton({group = self.ui_group,text = "变更"}))
+ self.ui.newButton({group = self.ui_group,text = "返回太虚",x = gw - 200,y = gh - 100})
+ :onRelease(
function ()
- p_print("goto main")
gotoRoom("MainStage","MainStage")
end)
- --function()
- -- self.ui.confirm({group = self.ui_group,text = "梦醒",okText = "是",cancelText = "否"
- -- ,ok = function ()
- -- p_print("goto main")
- -- gotoRoom("MainStage","MainStage")
- -- end})
- --end
- --)
- --gooi.setCanvas(self.main_canvas)
end
function CreateStage:activate()
diff --git a/objects/MainStage.lua b/objects/MainStage.lua
index 4140e0e..a3c5db8 100644
--- a/objects/MainStage.lua
+++ b/objects/MainStage.lua
@@ -9,9 +9,10 @@ MainStage = Class("MainStage",Stage)
--- init
local style = {
- font = assets.font.myfont(32),
+ font = font24,
showBorder = true,
bgColor = {0.208, 0.220, 0.222,0.222},
+ group = "MainStage"
--fgColor = {1,0,0}
}
@@ -21,32 +22,27 @@ function MainStage:init()
self.area:addPhysicsWorld()
self.main_canvas = love.graphics.newCanvas(gw,gh)
self.background = assets.graphics.Backgrounds.bg
- local title_font = assets.font.myfont(80)
self.ui = gooi
self.ui.desktopMode()
self.ui_group = "MainStage"
- self.ui.setStyle({font = title_font})
- --self.panel = self.ui.newPanel({x = gw/2,y = hg/2,w = 200,h = 120,layout = "grid 4x1"})
- self.ui.newLabel({text = "武侠与江湖",x = gw/3,y=gh/6,group = self.ui_group}):fg({0,0,0}):center()
self.ui.setStyle(style)
- --gooi.glass()
- --gooi.newPanel()
- self.ui.newButton({text = "新的穿越",x = 500,y = 500,w = 150,h = 36,group = self.ui_group})
- :onRelease(
+ self.ui.newLabel({text = "武侠与江湖",x = gw/2 - 320,y=gh/6,w = 320,group = self.ui_group}):setStyle({font = font80}):fg({0,0,0}):center()
+ self.panel = self.ui.newPanel({x = gw/2 - 80,y = gh/2,w = 160,h = 160,layout = "grid 4x1"})
+ self.panel:add(self.ui.newButton({text = "新的穿越",group = self.ui_group}):setStyle({font = font32})
+ :onRelease(
function()
gotoRoom("CreateStage","CreateStage")
end)
- self.ui.newButton({text = "梦回武林",x = 500,y = 550,w = 150,h = 36,group = self.ui_group})
- self.ui.newButton({text = "侠客宝典",x = 500,y = 600,w = 150,h = 36,group = self.ui_group})
- self.ui.newButton({text = "归隐山林",x = 500,y = 650,w = 150,h = 36,group = self.ui_group})
- :onRelease(
+ )
+ self.panel:add(self.ui.newButton({text = "梦回武林",group = self.ui_group})):setStyle({font = font32})
+ self.panel:add(self.ui.newButton({text = "侠客宝典",group = self.ui_group})):setStyle({font = font32})
+ self.panel:add(self.ui.newButton({text = "归隐山林",group = self.ui_group}):setStyle({font = font32})
+ :onRelease(
function()
- p_print("Main")
self.ui.confirm({group = self.ui_group,text = "梦醒",okText = "是",cancelText = "否",ok = function () love.event.quit() end})
end
- )
- --self.area:addObject()
- --gooi.setCanvas(self.main_canvas)
+ ))
+
end
function MainStage:activate()