Skip to content

Commit 87624ac

Browse files
committed
Merge pull request #2721 from VisualSJ/develop-loading
IPhone‘s WebView does not default use the webgl
2 parents 7887ba7 + e15c3ea commit 87624ac

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

CCBoot.js

+2
Original file line numberDiff line numberDiff line change
@@ -1560,6 +1560,8 @@ cc._initSys = function (config, CONFIG_KEY) {
15601560
browserType = sys.BROWSER_TYPE_ANDROID;
15611561
else if (browserType == "trident") browserType = sys.BROWSER_TYPE_IE;
15621562
else if (browserType == "360 aphone") browserType = sys.BROWSER_TYPE_360;
1563+
}else if(ua.indexOf("iphone") && ua.indexOf("mobile")){
1564+
browserType = "safari";
15631565
}
15641566
/**
15651567
* Indicate the running browser type

tools/build.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
classpath="./compiler/compiler.jar"/>
66
<target name="compile">
77
<jscomp compilationLevel="simple" warning="quiet"
8-
debug="false" output="./../lib/cocos2d-js-v3.3-beta0-min.js">
8+
debug="false" output="./../lib/cocos2d-js-v3.3-min.js">
99
<!--sourceMapOutputFile="./../lib/cocos2d-js-v3.3-beta0-sourcemap" sourceMapFormat="V3" -->
1010
<sources dir="./../">
1111
<file name="Base64Images.js"/>
@@ -298,7 +298,7 @@
298298

299299
<target name="compile_core">
300300
<jscomp compilationLevel="simple" warning="quiet"
301-
debug="false" output="./../lib/cocos2d-js-v3.3-beta0-core-min.js">
301+
debug="false" output="./../lib/cocos2d-js-v3.3-core-min.js">
302302
<!--sourceMapOutputFile="./../lib/cocos2d-js-v3.3-beta0-core-sourcemap" sourceMapFormat="V3" -->
303303
<sources dir="./../">
304304
<file name="CCBoot.js"/>

0 commit comments

Comments
 (0)