diff --git a/cocos/editor-support/cocostudio/CocoLoader.cpp b/cocos/editor-support/cocostudio/CocoLoader.cpp index 38e0fb1d2f..334858fe0c 100644 --- a/cocos/editor-support/cocostudio/CocoLoader.cpp +++ b/cocos/editor-support/cocostudio/CocoLoader.cpp @@ -130,10 +130,19 @@ char* stExpCocoNode::GetName(CocoLoader* pCoco) } -char* stExpCocoNode::GetValue(CocoLoader* pCoco) -{ - return ( pCoco->GetMemoryAddr_String() + m_szValue ); -} + char* stExpCocoNode::GetValue(CocoLoader* pCoco) + { + char* szValue = ( pCoco->GetMemoryAddr_String() + m_szValue ); + if(GetType(pCoco) == kStringType ) + { + if(szValue && 0==strcmp(szValue,"null")) + { + strcpy(szValue,""); + } + } + return szValue; + } + int stExpCocoNode::GetChildNum() { diff --git a/tests/cpp-tests/Resources/ccs-res b/tests/cpp-tests/Resources/ccs-res index 6b28e94848..c307f62357 160000 --- a/tests/cpp-tests/Resources/ccs-res +++ b/tests/cpp-tests/Resources/ccs-res @@ -1 +1 @@ -Subproject commit 6b28e948482ca7ed44c31daf3fef2e42ad6b59fb +Subproject commit c307f62357e42d2e7e671f4741f855dc8a5fde3a