Merge commit 'f1dbc310ba6e7743b33e70354739270138bad4be' into scgamex-v3

* commit 'f1dbc310ba6e7743b33e70354739270138bad4be':
  fix a mistake of "V3 multisampling support cocos2d#18632" (cocos2d#18674)
  [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#18665)

Author: stevetranby

templates/cocos2dx_files.json

@@ -528,9 +528,7 @@
         "cocos/base/utlist.h", 
         "cocos/cc_dummy.c", 
         "cocos/cocos2d.cpp", 
-        "cocos/cocos2d.h",
-        "cocos/precheader.cpp",
-        "cocos/precheader.h",
+        "cocos/cocos2d.h", 
         "cocos/deprecated/CCArray.cpp", 
         "cocos/deprecated/CCArray.h", 
         "cocos/deprecated/CCBool.h", 
@@ -1227,6 +1225,8 @@
         "cocos/platform/winrt/sha1.h", 
         "cocos/platform/winrt/shaders/precompiledshaders.h", 
         "cocos/platform/winrt/targetver.h", 
+        "cocos/precheader.cpp", 
+        "cocos/precheader.h", 
         "cocos/renderer/CCBatchCommand.cpp", 
         "cocos/renderer/CCBatchCommand.h", 
         "cocos/renderer/CCCustomCommand.cpp", 
@@ -4315,6 +4315,8 @@
         "cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.h", 
         "cocos/scripting/js-bindings/manual/ui/jsb_cocos2dx_ui_manual.cpp", 
         "cocos/scripting/js-bindings/manual/ui/jsb_cocos2dx_ui_manual.h", 
+        "cocos/scripting/js-bindings/precheader.cpp", 
+        "cocos/scripting/js-bindings/precheader.h", 
         "cocos/scripting/js-bindings/proj.android/Android.mk", 
         "cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj", 
         "cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj", 

templates/cpp-template-default/proj.ios_mac/ios/RootViewController.mm

@@ -49,8 +49,8 @@ - (void)loadView {
                                          depthFormat: cocos2d::GLViewImpl::_depthFormat
                                   preserveBackbuffer: NO
                                           sharegroup: nil
-                                       multiSampling: cocos2d::GLViewImpl::_multisamling
-                                     numberOfSamples: cocos2d::GLViewImpl::_samples ];
+                                       multiSampling: cocos2d::GLViewImpl::_multisamplingCount > 0 ? YES : NO
+                                     numberOfSamples: cocos2d::GLViewImpl::_multisamplingCount ];
 
     // Enable or disable multiple touches
     [eaglView setMultipleTouchEnabled:NO];