瀏覽代碼

Merge branch '3.8' into 4.0-beta

badlogic 5 年之前
父節點
當前提交
585a6f0e39
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      spine-cocos2dx/src/spine/SkeletonRenderer.cpp

+ 2 - 2
spine-cocos2dx/src/spine/SkeletonRenderer.cpp

@@ -851,7 +851,7 @@ bool SkeletonRenderer::getDebugBoundingRectEnabled() const {
 }
 }
 
 
 void SkeletonRenderer::onEnter () {
 void SkeletonRenderer::onEnter () {
-#if CC_ENABLE_SCRIPT_BINDING
+#if CC_ENABLE_SCRIPT_BINDING && COCOS2D_VERSION < 0x00040000
 	if (_scriptType == kScriptTypeJavascript && ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnEnter)) return;
 	if (_scriptType == kScriptTypeJavascript && ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnEnter)) return;
 #endif
 #endif
 	Node::onEnter();
 	Node::onEnter();
@@ -859,7 +859,7 @@ void SkeletonRenderer::onEnter () {
 }
 }
 
 
 void SkeletonRenderer::onExit () {
 void SkeletonRenderer::onExit () {
-#if CC_ENABLE_SCRIPT_BINDING
+#if CC_ENABLE_SCRIPT_BINDING && COCOS2D_VERSION < 0x00040000
 	if (_scriptType == kScriptTypeJavascript && ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnExit)) return;
 	if (_scriptType == kScriptTypeJavascript && ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnExit)) return;
 #endif
 #endif
 	Node::onExit();
 	Node::onExit();