diff --git a/cocos/3d/CCBundle3D.cpp b/cocos/3d/CCBundle3D.cpp index 8be4e25243..2f033cefd0 100644 --- a/cocos/3d/CCBundle3D.cpp +++ b/cocos/3d/CCBundle3D.cpp @@ -1048,7 +1048,7 @@ bool Bundle3D::loadJson(const std::string& path) if (_jsonReader.ParseInsitu<0>(_jsonBuffer).HasParseError()) { clear(); - CCASSERT(false, "Parse json failed"); + CCLOG("Parse json failed in Bundle3D::loadJson function"); return false; } diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp index 125b649936..4413c02ac1 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp @@ -618,44 +618,35 @@ void InnerActionFrame::onEnter(Frame *nextFrame, int currentFrameIndex) void InnerActionFrame::setStartFrameIndex(int frameIndex) { -#ifdef CC_STUDIO_ENABLED_VIEW // for cocostudio only if (_enterWithName) { CCLOG(" cannot set start when enter frame with name. setEnterWithName false firstly!"); - throw std::exception(); + return; } -#else - CCASSERT(!_enterWithName, " cannot setStartFrameIndex when enterWithName is set"); -#endif + _startFrameIndex = frameIndex; } void InnerActionFrame::setEndFrameIndex(int frameIndex) { -#ifdef CC_STUDIO_ENABLED_VIEW // for cocostudio only if (_enterWithName) { CCLOG(" cannot set end when enter frame with name. setEnterWithName false firstly!"); - throw std::exception(); + return; } -#else - CCASSERT(!_enterWithName, " cannot setEndFrameIndex when enterWithName is set"); -#endif + _endFrameIndex = frameIndex; } void InnerActionFrame::setAnimationName(const std::string& animationName) { -#ifdef CC_STUDIO_ENABLED_VIEW // for cocostudio only if (!_enterWithName) { CCLOG(" cannot set aniamtioname when enter frame with index. setEnterWithName true firstly!"); - throw std::exception(); + return; } -#else - CCASSERT(_enterWithName, " cannot set aniamtioname when enter frame with index. setEnterWithName true firstly!"); -#endif + _animationName = animationName; }