Skip to content

解析 ccs2 中的 visible属性和Fileutils bug修复 #435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhaolihang wants to merge 3 commits into
base: quick3.6
Choose a base branch
from
Open

解析 ccs2 中的 visible属性和Fileutils bug修复 #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7c833b
ccs2 support Visible
zhaolihang Jun 16, 2015
b51c5eb
the _defaultResRootPath should addSearchPath
zhaolihang Jun 18, 2015
5652812
Merge branch 'quick3.6' of github.com:zhaolihang/v3quick into quick3.6
zhaolihang Jun 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cocos/platform/CCFileUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,6 +846,7 @@ void FileUtils::setWritablePath(const std::string& writablePath)
void FileUtils::setDefaultResourceRootPath(const std::string& path)
{
_defaultResRootPath = path;
this->addSearchPath(_defaultResRootPath,true);
}

void FileUtils::setSearchPaths(const std::vector<std::string>& searchPaths)
Expand Down
10 changes: 8 additions & 2 deletions quick/framework/cc/uiloader/CCSUILoader2.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,14 @@ function CCSUILoader:generateUINode(jsonNode, parent)
uiNode:setRotation(jsonNode.Rotation or 0)
uiNode:setSkewX(jsonNode.RotationSkewX or 0)
uiNode:setSkewY(jsonNode.RotationSkewY or 0)

-- uiNode:setVisible(jsonNode.visible) -- ccs havn't export visible attribute


if jsonNode.VisibleForFrame==nil then --增加 visible 参数
jsonNode.visible=true
else
jsonNode.visible=jsonNode.VisibleForFrame
end
uiNode:setVisible(jsonNode.visible) -- ccs visible attribute
if jsonNode.Scale then
uiNode:setScaleX((jsonNode.Scale.ScaleX or 1) * uiNode:getScaleX())
uiNode:setScaleY((jsonNode.Scale.ScaleY or 1) * uiNode:getScaleY())
Expand Down