Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14740 from xiaofeng11/v3.10 

Bug Fix & h5 engine ref update
This commit is contained in:
pandamicro 2015-12-19 14:13:37 +08:00
parent b480e9191d a139221618
commit 6481a0f3c1
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos/scripting/js-bindings/script/studio/parsers/action-1.x.js
View File

@ -233,6 +233,7 @@
});
});
load.registerParser("action", "0.*", parser);
load.registerParser("action", "1.*", parser);
})(ccs._load, ccs._parser);

1
cocos/scripting/js-bindings/script/studio/parsers/timelineParser-1.x.js
View File

@ -287,6 +287,7 @@
});
});
load.registerParser("timeline", "0.*", parser);
load.registerParser("timeline", "1.*", parser);
})(ccs._load, ccs._parser);

4
tests/lua-tests/src/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua
View File

@ -1722,13 +1722,11 @@ add_new_testcase(function()
local pageView = ccui.PageView:create()
pageView:setTouchEnabled(true)
pageView:setContentSize(cc.size(240, 130))
pageView:setDirection(ccui.PageViewDirection.HORIZONTAL)
local backgroundSize = background:getContentSize()
pageView:setPosition(cc.p((widgetSize.width - backgroundSize.width) / 2 +
(backgroundSize.width - pageView:getContentSize().width) / 2,
(widgetSize.height - backgroundSize.height) / 2 +
(backgroundSize.height - pageView:getContentSize().height) / 2))
for i = 1 , 3 do
local layout = ccui.Layout:create()
layout:setContentSize(cc.size(240, 130))
@ -1788,7 +1786,7 @@ add_new_testcase(function()
local pageView = ccui.PageView:create()
pageView:setTouchEnabled(true)
pageView:setDirection(ccui.PageViewDirection.VERTICAL)
pageView:setDirection(ccui.ScrollViewDir.vertical)
pageView:setContentSize(cc.size(240, 130))
local backgroundSize = background:getContentSize()
pageView:setPosition(cc.p((widgetSize.width - backgroundSize.width) / 2 +

2
web

@ -1 +1 @@
Subproject commit f91d7a39e72c271e6e87ea269e2428c00f3c07cc
Subproject commit 8586470e65d43f60b06d2846bde72b384e884e5d