[engine] [cocos2d-x] [jsb-adapter] 适配引擎 v2.4.13 版本

cocos2d-x/tools/cocos2d-console/.gitignore

@@ -46,6 +46,15 @@ xcuserdata/
 DerivedData/
 .idea/*
 
+# Ignore the files from download
+bin/sdkbox*
+plugins/plugin_compile/build_web/bin
+plugins/plugin_jscompile/
+plugins/plugin_luacompile/bin/msvcr110.dll
+plugins/plugin_generate/proj_modifier/plutil-win32/
+version.json
+v*-console-*.zip
+
 # vim
 *~
 

cocos2d-x/tools/cocos2d-console/bin/cocos.py

@@ -404,7 +404,7 @@ class CCPlugin(object):
         if os.path.isdir(cocos2dx_path):
             return cocos2dx_path
 
-        if cls.get_cocos2d_mode() is not "distro":
+        if cls.get_cocos2d_mode() != "distro":
             # In 'distro' mode this is not a warning since
             # the source code is not expected to be installed
             Logging.warning(MultiLanguage.get_string('COCOS_WARNING_ENGINE_NOT_FOUND'))
@@ -940,7 +940,7 @@ def _check_python_version():
         ret = False
 
     if not ret:
-        print(MultiLanguage.get_string('COCOS_PYTHON_VERSION_TIP_FMT') % (major_ver, minor_ver))
+        print(str('COCOS PYTHON VERSION DOES NOT MATCH: %d.%d, WHILE 2.7+ IS REQUIRED') % (major_ver, minor_ver))
 
     return ret
 

cocos2d-x/tools/cocos2d-console/plugins/plugin_compile/build_android.py

@@ -525,6 +525,12 @@ class AndroidBuilder(object):
                 if match:
                     package = match.group(1)
                     break
+                else :
+                    pattern = r'namespace[ \t]+[\'\"](.*)[\'\"]'
+                    match = re.match(pattern, line_str)
+                    if match:
+                        package = match.group(1)
+                        break
         if package is None:
             # get package name from AndroidManifest.xml
             package = self._xml_attr(manifest_path, 'AndroidManifest.xml', 'manifest', 'package')

cocos2d-x/tools/simulator/libsimulator/lib/platform/win32/PlayerWin.h

@@ -38,7 +38,7 @@
 
 PLAYER_NS_BEGIN
 
-class CC_LIBSIM_DLL PlayerWin : public PlayerProtocol, public cocos2d::Ref
+class CC_LIBSIM_DLL PlayerWin : public cocos2d::Ref, public PlayerProtocol
 {
 public:
     static PlayerWin *createWithHwnd(HWND hWnd);