diff --git a/Assets/Script/Game/Loli War/Control.lua b/Assets/Script/Game/Loli War/Control.lua index 9ce9cd3ad..df848009d 100644 --- a/Assets/Script/Game/Loli War/Control.lua +++ b/Assets/Script/Game/Loli War/Control.lua @@ -32,13 +32,13 @@ local root = AlignNode(true) -- 23 root:css('flex-direction: column; justify-content: space-between') -- 24 root:addChild((function() -- 25 local _with_0 = AlignNode() -- 25 - _with_0:css('width: 10; height: 10; margin-top: 75; margin-left: 75') -- 26 + _with_0:css('width: 10; height: 10; margin-top: 50; margin-left: 60') -- 26 _with_0:addChild(HPWheel()) -- 27 return _with_0 -- 25 end)()) -- 25 root:addChild((function() -- 28 local _with_0 = AlignNode() -- 28 - _with_0:css('margin-bottom: 10; height: 104; flex-direction: row; justify-content: space-between') -- 29 + _with_0:css('margin: 0, 10, 40; height: 104; flex-direction: row; justify-content: space-between') -- 29 local _exp_0 = App.platform -- 30 if "iOS" == _exp_0 or "Android" == _exp_0 then -- 31 _with_0:addChild((function() -- 32 diff --git a/Assets/Script/Game/Loli War/Control.yue b/Assets/Script/Game/Loli War/Control.yue index aaf199a13..9853fc452 100644 --- a/Assets/Script/Game/Loli War/Control.yue +++ b/Assets/Script/Game/Loli War/Control.yue @@ -23,10 +23,10 @@ updatePlayerControl = (key, flag) -> with root = AlignNode true \css 'flex-direction: column; justify-content: space-between' \addChild with AlignNode! - \css 'width: 10; height: 10; margin-top: 75; margin-left: 75' + \css 'width: 10; height: 10; margin-top: 50; margin-left: 60' \addChild HPWheel! \addChild with AlignNode! - \css 'margin-bottom: 10; height: 104; flex-direction: row; justify-content: space-between' + \css 'margin: 0, 10, 40; height: 104; flex-direction: row; justify-content: space-between' switch App.platform when "iOS", "Android" \addChild with AlignNode! diff --git a/Assets/Script/Game/Loli War/UI/View/HPWheel.lua b/Assets/Script/Game/Loli War/UI/View/HPWheel.lua index 9819283c7..1061de3bf 100644 --- a/Assets/Script/Game/Loli War/UI/View/HPWheel.lua +++ b/Assets/Script/Game/Loli War/UI/View/HPWheel.lua @@ -3,6 +3,8 @@ local Digit = require("UI.Control.Digit") -- 2 return function(args) -- 1 local _ENV = Dora(args) -- 1 local node1 = Node() -- 4 +node1.scaleX = 0.75 -- 4 +node1.scaleY = 0.75 -- 4 local hpShow = Playable("model:Model/hpshow") -- 5 hpShow.scaleX = 2 -- 5 hpShow.scaleY = 2 -- 5 diff --git a/Assets/Script/Game/Loli War/UI/View/HPWheel.xml b/Assets/Script/Game/Loli War/UI/View/HPWheel.xml index 33194ea03..dad9d5e3f 100644 --- a/Assets/Script/Game/Loli War/UI/View/HPWheel.xml +++ b/Assets/Script/Game/Loli War/UI/View/HPWheel.xml @@ -1,7 +1,7 @@ - + diff --git a/Assets/Script/Game/Loli War/UI/View/LeftTouchPad.lua b/Assets/Script/Game/Loli War/UI/View/LeftTouchPad.lua index 54e645edb..d9595a533 100644 --- a/Assets/Script/Game/Loli War/UI/View/LeftTouchPad.lua +++ b/Assets/Script/Game/Loli War/UI/View/LeftTouchPad.lua @@ -4,8 +4,8 @@ return function(args) -- 1 local _ENV = Dora(args) -- 1 local pad = Menu() -- 4 pad.anchor = Vec2(0,0) -- 4 -pad.scaleX = 2 -- 4 -pad.scaleY = 2 -- 4 +pad.scaleX = 1.5 -- 4 +pad.scaleY = 1.5 -- 4 pad.size = Size(114,52) -- 4 local item1 = Button{height = 52, width = 52, imageDown = 'keyleft_down', imageUp = 'keyleft_up'} -- 5 pad:addChild(item1) -- 5 diff --git a/Assets/Script/Game/Loli War/UI/View/LeftTouchPad.xml b/Assets/Script/Game/Loli War/UI/View/LeftTouchPad.xml index 549550215..cebe02c03 100644 --- a/Assets/Script/Game/Loli War/UI/View/LeftTouchPad.xml +++ b/Assets/Script/Game/Loli War/UI/View/LeftTouchPad.xml @@ -1,7 +1,7 @@ - +