Sync with cocos2d-x v3 branch ddb4dc8 commit.

This commit is contained in:
James Chen
2017-04-24 10:49:02 +08:00
parent 91cfd45ee9
commit fc98b4bdc0
115 changed files with 5389 additions and 2620 deletions
@@ -1,6 +1,6 @@
/****************************************************************************
Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2013-2017 Chukong Technologies Inc.
http://www.cocos2d-x.org
@@ -271,6 +271,10 @@ void AndroidJavaEngine::preloadEffect(const char* filePath)
std::string fullPath = CocosDenshion::android::getFullPathWithoutAssetsPrefix(filePath);
JniHelper::callStaticVoidMethod(helperClassName, "preloadEffect", fullPath);
}
else
{
AudioEngine::preload(filePath);
}
}
void AndroidJavaEngine::unloadEffect(const char* filePath)
@@ -280,4 +284,8 @@ void AndroidJavaEngine::unloadEffect(const char* filePath)
std::string fullPath = CocosDenshion::android::getFullPathWithoutAssetsPrefix(filePath);
JniHelper::callStaticVoidMethod(helperClassName, "unloadEffect", fullPath);
}
else
{
AudioEngine::uncache(filePath);
}
}