Sync branch v2.1.2 to v2.2.0

cocos · May 28, 2019 · baa5aaf · baa5aaf
2 parents 9d6446b + 5dd20be
commit baa5aaf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cocos/platform/apple/CCCanvasRenderingContext2D-apple.mm b/cocos/platform/apple/CCCanvasRenderingContext2D-apple.mm
@@ -363,8 +363,6 @@ -(void) strokeText:(NSString*) text x:(CGFloat) x y:(CGFloat) y maxWidth:(CGFloa
     [_tokenAttributesDict removeObjectForKey:NSForegroundColorAttributeName];
 
     [_tokenAttributesDict setObject:paragraphStyle forKey:NSParagraphStyleAttributeName];
-    [_tokenAttributesDict setObject:[NSNumber numberWithFloat: _lineWidth * 2]
-                            forKey:NSStrokeWidthAttributeName];
     [_tokenAttributesDict setObject:[NSColor colorWithRed:_strokeStyle.r
                                                     green:_strokeStyle.g
                                                      blue:_strokeStyle.b
@@ -374,7 +372,8 @@ -(void) strokeText:(NSString*) text x:(CGFloat) x y:(CGFloat) y maxWidth:(CGFloa
 
     // text color
     CGContextSetRGBFillColor(_context, _fillStyle.r, _fillStyle.g, _fillStyle.b, _fillStyle.a);
-
+    CGContextSetLineWidth(_context, _lineWidth);
+    CGContextSetLineJoin(_context, kCGLineJoinRound);
     CGContextSetShouldSubpixelQuantizeFonts(_context, false);
     CGContextBeginTransparencyLayerWithRect(_context, CGRectMake(0, 0, _width, _height), nullptr);
 

diff --git a/gulpfile.js b/gulpfile.js
@@ -63,7 +63,8 @@ function downloadSimulatorDLL(callback) {
     Download('http://192.168.52.109/TestBuilds/Fireball/simulator/dlls/dll.zip', destPath, {
         mode: '755',
         extract: true,
-        strip: 0
+        strip: 0,
+        agent: null,
     }).then(function(res) {
         callback();
     }).catch(callback);