Test_Project_Cocos/cocos-enhance-kit
1
0
Fork 0
mirror of https://github.com/smallmain/cocos-enhance-kit.git synced 2024-12-25 19:28:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

更新编译文件与 Mac 模拟器

Browse Source
This commit is contained in:
SmallMain 2022-10-01 18:09:31 +08:00
parent e2077e59b5
commit 8fdcf9eda4
11 changed files with 89 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos2d-x/simulator/mac/Simulator.app/Contents/Info.plist
View File

@ -3,7 +3,7 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>BuildMachineOSBuild</key> <key>BuildMachineOSBuild</key>
<string>21A559</string> <string>21E230</string>
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>en</string> <string>en</string>
<key>CFBundleDocumentTypes</key> <key>CFBundleDocumentTypes</key>
@ -42,6 +42,8 @@
<string>Cocos Simulator</string> <string>Cocos Simulator</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleSupportedPlatforms</key> <key>CFBundleSupportedPlatforms</key>
@ -49,7 +51,7 @@
<string>MacOSX</string> <string>MacOSX</string>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>20220705</string> <string>20221001</string>
<key>DTCompiler</key> <key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string> <string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key> <key>DTPlatformBuild</key>

BIN
cocos2d-x/simulator/mac/Simulator.app/Contents/MacOS/Simulator
View File

Binary file not shown.

BIN
cocos2d-x/simulator/mac/Simulator.app/Contents/Resources/Base.lproj/ConsoleWindow.nib/keyedobjects-101300.nib generated
View File

Binary file not shown.

BIN
cocos2d-x/simulator/mac/Simulator.app/Contents/Resources/Base.lproj/ConsoleWindow.nib/keyedobjects.nib generated
View File

Binary file not shown.

0
cocos2d-x/simulator/mac/Simulator.app/Contents/Resources/Icon.icns Normal file → Executable file
View File

0
cocos2d-x/simulator/mac/Simulator.app/Contents/Resources/lang Normal file → Executable file
View File

0
cocos2d-x/simulator/mac/Simulator.app/Contents/Resources/zh-Hans.lproj/ConsoleWindow.strings Normal file → Executable file
View File

12
cocos2d-x/simulator/mac/Simulator.app/Contents/_CodeSignature/CodeResources
View File

@ -6,11 +6,11 @@
<dict> <dict>
<key>Resources/Base.lproj/ConsoleWindow.nib/keyedobjects-101300.nib</key> <key>Resources/Base.lproj/ConsoleWindow.nib/keyedobjects-101300.nib</key>
<data> <data>
ujLJkh4IAdlf9wwaFb+liu01ezo= P2vLrRbjxw5vwWheD4fqpwXz0OQ=
</data> </data>
<key>Resources/Base.lproj/ConsoleWindow.nib/keyedobjects.nib</key> <key>Resources/Base.lproj/ConsoleWindow.nib/keyedobjects.nib</key>
<data> <data>
z0dpzUAcFMs8snODqhySYZ/n9KM= YpbS4HzudjSTyJTIkUwHl2ypEBY=
</data> </data>
<key>Resources/Base.lproj/MainMenu.nib/keyedobjects-101300.nib</key> <key>Resources/Base.lproj/MainMenu.nib/keyedobjects-101300.nib</key>
<data> <data>
@ -66,22 +66,22 @@
<dict> <dict>
<key>hash</key> <key>hash</key>
<data> <data>
ujLJkh4IAdlf9wwaFb+liu01ezo= P2vLrRbjxw5vwWheD4fqpwXz0OQ=
</data> </data>
<key>hash2</key> <key>hash2</key>
<data> <data>
LJyFJImQF1ZCzXDbWIM+f/Z9UvVQw/1595moI8Yv6mY= 47yjou67T5EJytLVj+p3Wk4T5/5oEureDbuJQ2zxDtE=
</data> </data>
</dict> </dict>
<key>Resources/Base.lproj/ConsoleWindow.nib/keyedobjects.nib</key> <key>Resources/Base.lproj/ConsoleWindow.nib/keyedobjects.nib</key>
<dict> <dict>
<key>hash</key> <key>hash</key>
<data> <data>
z0dpzUAcFMs8snODqhySYZ/n9KM= YpbS4HzudjSTyJTIkUwHl2ypEBY=
</data> </data>
<key>hash2</key> <key>hash2</key>
<data> <data>
qg3ofTF0sqkSDHDsvE4ZsKjx389zQKJwxmTbZNvCSyA= pU19odfcUGhJQcDw9JWOFtefl+oTJBN+QWCGQ0MsRGw=
</data> </data>
</dict> </dict>
<key>Resources/Base.lproj/MainMenu.nib/keyedobjects-101300.nib</key> <key>Resources/Base.lproj/MainMenu.nib/keyedobjects-101300.nib</key>

64
engine/bin/cocos2d-js-for-preview.js
View File

@ -3295,7 +3295,10 @@
return this; return this;
}; };
Tween.prototype.stop = function() { Tween.prototype.stop = function() {
this._finalAction && cc.director.getActionManager().removeAction(this._finalAction); if (this._finalAction) {
cc.director.getActionManager().removeAction(this._finalAction);
this._finalAction = null;
}
return this; return this;
}; };
Tween.prototype.tag = function(tag) { Tween.prototype.tag = function(tag) {
@ -18073,18 +18076,19 @@
this.purgeDirector(); this.purgeDirector();
} else { } else {
this.calculateDeltaTime(now); this.calculateDeltaTime(now);
var deltaTime = this._deltaTime;
if (!this._paused) { if (!this._paused) {
this.emit(cc.Director.EVENT_BEFORE_UPDATE); this.emit(cc.Director.EVENT_BEFORE_UPDATE, deltaTime);
this._compScheduler.startPhase(); this._compScheduler.startPhase();
this._compScheduler.updatePhase(this._deltaTime); this._compScheduler.updatePhase(deltaTime);
this._scheduler.update(this._deltaTime); this._scheduler.update(deltaTime);
this._compScheduler.lateUpdatePhase(this._deltaTime); this._compScheduler.lateUpdatePhase(deltaTime);
this.emit(cc.Director.EVENT_AFTER_UPDATE); this.emit(cc.Director.EVENT_AFTER_UPDATE, deltaTime);
Obj._deferredDestroy(); Obj._deferredDestroy();
} }
this.emit(cc.Director.EVENT_BEFORE_DRAW); this.emit(cc.Director.EVENT_BEFORE_DRAW, deltaTime);
renderer.render(this._scene, this._deltaTime); renderer.render(this._scene, deltaTime);
this.emit(cc.Director.EVENT_AFTER_DRAW); this.emit(cc.Director.EVENT_AFTER_DRAW, deltaTime);
eventManager.frameUpdateListeners(); eventManager.frameUpdateListeners();
this._totalFrames++; this._totalFrames++;
} }
@ -21967,7 +21971,7 @@
true; true;
if (onceWarns.loader) { if (onceWarns.loader) {
onceWarns.loader = false; onceWarns.loader = false;
cc.log("cc.loader is deprecated, use cc.assetManager instead please. See https://docs.cocos.com/creator/manual/zh/release-notes/asset-manager-upgrade-guide.html"); cc.log("cc.loader is deprecated, use cc.assetManager instead please. See https://docs.cocos.com/creator/2.4/manual/zh/release-notes/asset-manager-upgrade-guide.html");
} }
return loader; return loader;
} }
@ -24885,8 +24889,8 @@
if (!texture) return; if (!texture) return;
var w = texture.width, h = texture.height; var w = texture.width, h = texture.height;
self._rect ? self._checkRect(self._texture) : self._rect = cc.rect(0, 0, w, h); self._rect ? self._checkRect(self._texture) : self._rect = cc.rect(0, 0, w, h);
self._originalSize || self.setOriginalSize(cc.size(w, h)); self._originalSize || (self._originalSize = cc.size(w, h));
self._offset || self.setOffset(cc.v2(0, 0)); self._offset || (self._offset = cc.v2(0, 0));
self._calculateUV(); self._calculateUV();
self.emit("load"); self.emit("load");
}, },
@ -29922,6 +29926,7 @@
this._resetFrame(); this._resetFrame();
this._super(); this._super();
}, },
onRestore: false,
_nodeSizeChanged: function _nodeSizeChanged() { _nodeSizeChanged: function _nodeSizeChanged() {
(false, this.overflow !== Overflow.NONE) && this.setVertsDirty(); (false, this.overflow !== Overflow.NONE) && this.setVertsDirty();
}, },
@ -31000,6 +31005,7 @@
ctor: function ctor() { ctor: function ctor() {
this._points = []; this._points = [];
this._lastWPos = new cc.Vec2(); this._lastWPos = new cc.Vec2();
this._lastWPosUpdated = false;
}, },
properties: { properties: {
preview: { preview: {
@ -31138,8 +31144,7 @@
reset: function reset() { reset: function reset() {
this._points.length = 0; this._points.length = 0;
this._assembler && this._assembler._renderData.clear(); this._assembler && this._assembler._renderData.clear();
this._lastWPos.x = 0; this._lastWPosUpdated = false;
this._lastWPos.y = 0;
false; false;
}, },
lateUpdate: function lateUpdate(dt) { lateUpdate: function lateUpdate(dt) {
@ -40658,12 +40663,12 @@
var list = []; var list = [];
var d, lowerDist, upperDist; var d, lowerDist, upperDist;
var p; var p;
var lowerInt = cc.v2(); var lowerInt = null;
var upperInt = cc.v2(); var upperInt = null;
var lowerIndex = 0, upperIndex = 0; var lowerIndex = 0, upperIndex = 0;
var lowerPoly, upperPoly; var lowerPoly, upperPoly;
for (var i = 0; i < vertices.length; ++i) if (Reflex(i, vertices)) { for (var i = 0; i < vertices.length; ++i) if (Reflex(i, vertices)) {
lowerDist = upperDist = 1e8; lowerDist = upperDist = Number.MAX_SAFE_INTEGER || 9999999999999;
for (var j = 0; j < vertices.length; ++j) { for (var j = 0; j < vertices.length; ++j) {
if (Left(At(i - 1, vertices), At(i, vertices), At(j, vertices)) && RightOn(At(i - 1, vertices), At(i, vertices), At(j - 1, vertices))) { if (Left(At(i - 1, vertices), At(i, vertices), At(j, vertices)) && RightOn(At(i - 1, vertices), At(i, vertices), At(j - 1, vertices))) {
p = LineIntersect(At(i - 1, vertices), At(i, vertices), At(j, vertices), At(j - 1, vertices)); p = LineIntersect(At(i - 1, vertices), At(i, vertices), At(j, vertices), At(j - 1, vertices));
@ -53972,6 +53977,7 @@
exports["default"] = void 0; exports["default"] = void 0;
var _motionStreak = _interopRequireDefault(require("./motion-streak")); var _motionStreak = _interopRequireDefault(require("./motion-streak"));
var _vertexFormat = require("../../webgl/vertex-format"); var _vertexFormat = require("../../webgl/vertex-format");
var _mat = _interopRequireDefault(require("../../../value-types/mat4"));
function _interopRequireDefault(obj) { function _interopRequireDefault(obj) {
return obj && obj.__esModule ? obj : { return obj && obj.__esModule ? obj : {
default: obj default: obj
@ -54007,6 +54013,7 @@
}; };
var _normal = cc.v2(); var _normal = cc.v2();
var _vec2 = cc.v2(); var _vec2 = cc.v2();
var _worldMat = new _mat["default"]();
function normal(out, dir) { function normal(out, dir) {
out.x = -dir.y; out.x = -dir.y;
out.y = dir.x; out.y = dir.x;
@ -54031,12 +54038,12 @@
false; false;
var stroke = comp._stroke / 2; var stroke = comp._stroke / 2;
var node = comp.node; var node = comp.node;
var matrix = node._worldMatrix.m; node.getWorldMatrix(_worldMat);
var tx = matrix[12], ty = matrix[13]; var tx = _worldMat.m[12], ty = _worldMat.m[13];
var points = comp._points; var points = comp._points;
var lastPos = comp._lastWPos; var lastPos = comp._lastWPos;
var fadeTime = comp._fadeTime; var fadeTime = comp._fadeTime;
var moved = lastPos.x !== tx || lastPos.y !== ty; var moved = comp._lastWPosUpdated && (lastPos.x !== tx || lastPos.y !== ty);
if (moved) { if (moved) {
var cur; var cur;
var newHead = false; var newHead = false;
@ -54071,6 +54078,7 @@
} }
lastPos.x = tx; lastPos.x = tx;
lastPos.y = ty; lastPos.y = ty;
comp._lastWPosUpdated = true;
if (points.length < 2) return; if (points.length < 2) return;
var color = comp._color, ca = color.a; var color = comp._color, ca = color.a;
var crgb = color.b << 16 | color.g << 8 | color.r; var crgb = color.b << 16 | color.g << 8 | color.r;
@ -54166,6 +54174,7 @@
module.exports = exports["default"]; module.exports = exports["default"];
}), { }), {
"../../../components/CCMotionStreak": 188, "../../../components/CCMotionStreak": 188,
"../../../value-types/mat4": 405,
"../../render-flow": 323, "../../render-flow": 323,
"../../webgl/vertex-format": 373, "../../webgl/vertex-format": 373,
"./motion-streak": 347 "./motion-streak": 347
@ -54175,6 +54184,7 @@
exports.__esModule = true; exports.__esModule = true;
exports["default"] = void 0; exports["default"] = void 0;
var _assembler2d = _interopRequireDefault(require("../../assembler-2d")); var _assembler2d = _interopRequireDefault(require("../../assembler-2d"));
var _mat = _interopRequireDefault(require("../../../value-types/mat4"));
function _interopRequireDefault(obj) { function _interopRequireDefault(obj) {
return obj && obj.__esModule ? obj : { return obj && obj.__esModule ? obj : {
default: obj default: obj
@ -54211,6 +54221,7 @@
var _miter = cc.v2(); var _miter = cc.v2();
var _normal = cc.v2(); var _normal = cc.v2();
var _vec2 = cc.v2(); var _vec2 = cc.v2();
var _worldMat = new _mat["default"]();
function normal(out, dir) { function normal(out, dir) {
out.x = -dir.y; out.x = -dir.y;
out.y = dir.x; out.y = dir.x;
@ -54243,12 +54254,12 @@
false; false;
var stroke = comp._stroke / 2; var stroke = comp._stroke / 2;
var node = comp.node; var node = comp.node;
var matrix = node._worldMatrix.m; node.getWorldMatrix(_worldMat);
var tx = matrix[12], ty = matrix[13]; var tx = _worldMat.m[12], ty = _worldMat.m[13];
var points = comp._points; var points = comp._points;
var lastPos = comp._lastWPos; var lastPos = comp._lastWPos;
var fadeTime = comp._fadeTime; var fadeTime = comp._fadeTime;
var moved = lastPos.x !== tx || lastPos.y !== ty; var moved = comp._lastWPosUpdated && (lastPos.x !== tx || lastPos.y !== ty);
if (moved) { if (moved) {
var cur; var cur;
var newHead = false; var newHead = false;
@ -54283,6 +54294,7 @@
} }
lastPos.x = tx; lastPos.x = tx;
lastPos.y = ty; lastPos.y = ty;
comp._lastWPosUpdated = true;
if (points.length < 2) return; if (points.length < 2) return;
var color = comp._color, ca = color.a; var color = comp._color, ca = color.a;
var crgb = color.b << 16 | color.g << 8 | color.r; var crgb = color.b << 16 | color.g << 8 | color.r;
@ -54363,6 +54375,7 @@
exports["default"] = MotionStreakAssembler; exports["default"] = MotionStreakAssembler;
module.exports = exports["default"]; module.exports = exports["default"];
}), { }), {
"../../../value-types/mat4": 405,
"../../assembler-2d": 299, "../../assembler-2d": 299,
"../../render-flow": 323 "../../render-flow": 323
} ], } ],
@ -57116,7 +57129,7 @@
"use strict"; "use strict";
cc.sp = { cc.sp = {
inited: false, inited: false,
version: "1.1.0", version: "1.2.0",
MAX_MULTITEXTURE_NUM: -1, MAX_MULTITEXTURE_NUM: -1,
autoSwitchMaterial: true, autoSwitchMaterial: true,
allowDynamicAtlas: true, allowDynamicAtlas: true,
@ -65343,6 +65356,7 @@
}, },
onFocusInEditor: false, onFocusInEditor: false,
onLostFocusInEditor: false, onLostFocusInEditor: false,
onRestore: false,
_startPreview: false, _startPreview: false,
_stopPreview: false, _stopPreview: false,
_convertTextureToSpriteFrame: false, _convertTextureToSpriteFrame: false,
@ -119422,7 +119436,7 @@
defineDeprecatedMacroGetter("CC_QQPLAY", QQPLAY); defineDeprecatedMacroGetter("CC_QQPLAY", QQPLAY);
true; true;
cc._Test = {}; cc._Test = {};
var engineVersion = "2.4.9"; var engineVersion = "2.4.10";
_global["CocosEngine"] = cc.ENGINE_VERSION = engineVersion; _global["CocosEngine"] = cc.ENGINE_VERSION = engineVersion;
}), {} ] }), {} ]
}, {}, [ 501 ]); }, {}, [ 501 ]);

2
engine/bin/cocos2d-js-for-preview.js.map
View File

File diff suppressed because one or more lines are too long

64
engine/bin/cocos2d-jsb-for-preview.js
View File

@ -3295,7 +3295,10 @@
return this; return this;
}; };
Tween.prototype.stop = function() { Tween.prototype.stop = function() {
this._finalAction && cc.director.getActionManager().removeAction(this._finalAction); if (this._finalAction) {
cc.director.getActionManager().removeAction(this._finalAction);
this._finalAction = null;
}
return this; return this;
}; };
Tween.prototype.tag = function(tag) { Tween.prototype.tag = function(tag) {
@ -18066,18 +18069,19 @@
this.purgeDirector(); this.purgeDirector();
} else { } else {
this.calculateDeltaTime(now); this.calculateDeltaTime(now);
var deltaTime = this._deltaTime;
if (!this._paused) { if (!this._paused) {
this.emit(cc.Director.EVENT_BEFORE_UPDATE); this.emit(cc.Director.EVENT_BEFORE_UPDATE, deltaTime);
this._compScheduler.startPhase(); this._compScheduler.startPhase();
this._compScheduler.updatePhase(this._deltaTime); this._compScheduler.updatePhase(deltaTime);
this._scheduler.update(this._deltaTime); this._scheduler.update(deltaTime);
this._compScheduler.lateUpdatePhase(this._deltaTime); this._compScheduler.lateUpdatePhase(deltaTime);
this.emit(cc.Director.EVENT_AFTER_UPDATE); this.emit(cc.Director.EVENT_AFTER_UPDATE, deltaTime);
Obj._deferredDestroy(); Obj._deferredDestroy();
} }
this.emit(cc.Director.EVENT_BEFORE_DRAW); this.emit(cc.Director.EVENT_BEFORE_DRAW, deltaTime);
renderer.render(this._scene, this._deltaTime); renderer.render(this._scene, deltaTime);
this.emit(cc.Director.EVENT_AFTER_DRAW); this.emit(cc.Director.EVENT_AFTER_DRAW, deltaTime);
eventManager.frameUpdateListeners(); eventManager.frameUpdateListeners();
this._totalFrames++; this._totalFrames++;
} }
@ -21947,7 +21951,7 @@
true; true;
if (onceWarns.loader) { if (onceWarns.loader) {
onceWarns.loader = false; onceWarns.loader = false;
cc.log("cc.loader is deprecated, use cc.assetManager instead please. See https://docs.cocos.com/creator/manual/zh/release-notes/asset-manager-upgrade-guide.html"); cc.log("cc.loader is deprecated, use cc.assetManager instead please. See https://docs.cocos.com/creator/2.4/manual/zh/release-notes/asset-manager-upgrade-guide.html");
} }
return loader; return loader;
} }
@ -24865,8 +24869,8 @@
if (!texture) return; if (!texture) return;
var w = texture.width, h = texture.height; var w = texture.width, h = texture.height;
self._rect ? self._checkRect(self._texture) : self._rect = cc.rect(0, 0, w, h); self._rect ? self._checkRect(self._texture) : self._rect = cc.rect(0, 0, w, h);
self._originalSize || self.setOriginalSize(cc.size(w, h)); self._originalSize || (self._originalSize = cc.size(w, h));
self._offset || self.setOffset(cc.v2(0, 0)); self._offset || (self._offset = cc.v2(0, 0));
self._calculateUV(); self._calculateUV();
self.emit("load"); self.emit("load");
}, },
@ -29906,6 +29910,7 @@
this._resetFrame(); this._resetFrame();
this._super(); this._super();
}, },
onRestore: false,
_nodeSizeChanged: function _nodeSizeChanged() { _nodeSizeChanged: function _nodeSizeChanged() {
(false, this.overflow !== Overflow.NONE) && this.setVertsDirty(); (false, this.overflow !== Overflow.NONE) && this.setVertsDirty();
}, },
@ -30984,6 +30989,7 @@
ctor: function ctor() { ctor: function ctor() {
this._points = []; this._points = [];
this._lastWPos = new cc.Vec2(); this._lastWPos = new cc.Vec2();
this._lastWPosUpdated = false;
}, },
properties: { properties: {
preview: { preview: {
@ -31122,8 +31128,7 @@
reset: function reset() { reset: function reset() {
this._points.length = 0; this._points.length = 0;
this._assembler && this._assembler._renderData.clear(); this._assembler && this._assembler._renderData.clear();
this._lastWPos.x = 0; this._lastWPosUpdated = false;
this._lastWPos.y = 0;
false; false;
}, },
lateUpdate: function lateUpdate(dt) { lateUpdate: function lateUpdate(dt) {
@ -40647,12 +40652,12 @@
var list = []; var list = [];
var d, lowerDist, upperDist; var d, lowerDist, upperDist;
var p; var p;
var lowerInt = cc.v2(); var lowerInt = null;
var upperInt = cc.v2(); var upperInt = null;
var lowerIndex = 0, upperIndex = 0; var lowerIndex = 0, upperIndex = 0;
var lowerPoly, upperPoly; var lowerPoly, upperPoly;
for (var i = 0; i < vertices.length; ++i) if (Reflex(i, vertices)) { for (var i = 0; i < vertices.length; ++i) if (Reflex(i, vertices)) {
lowerDist = upperDist = 1e8; lowerDist = upperDist = Number.MAX_SAFE_INTEGER || 9999999999999;
for (var j = 0; j < vertices.length; ++j) { for (var j = 0; j < vertices.length; ++j) {
if (Left(At(i - 1, vertices), At(i, vertices), At(j, vertices)) && RightOn(At(i - 1, vertices), At(i, vertices), At(j - 1, vertices))) { if (Left(At(i - 1, vertices), At(i, vertices), At(j, vertices)) && RightOn(At(i - 1, vertices), At(i, vertices), At(j - 1, vertices))) {
p = LineIntersect(At(i - 1, vertices), At(i, vertices), At(j, vertices), At(j - 1, vertices)); p = LineIntersect(At(i - 1, vertices), At(i, vertices), At(j, vertices), At(j - 1, vertices));
@ -53845,6 +53850,7 @@
exports["default"] = void 0; exports["default"] = void 0;
var _motionStreak = _interopRequireDefault(require("./motion-streak")); var _motionStreak = _interopRequireDefault(require("./motion-streak"));
var _vertexFormat = require("../../webgl/vertex-format"); var _vertexFormat = require("../../webgl/vertex-format");
var _mat = _interopRequireDefault(require("../../../value-types/mat4"));
function _interopRequireDefault(obj) { function _interopRequireDefault(obj) {
return obj && obj.__esModule ? obj : { return obj && obj.__esModule ? obj : {
default: obj default: obj
@ -53880,6 +53886,7 @@
}; };
var _normal = cc.v2(); var _normal = cc.v2();
var _vec2 = cc.v2(); var _vec2 = cc.v2();
var _worldMat = new _mat["default"]();
function normal(out, dir) { function normal(out, dir) {
out.x = -dir.y; out.x = -dir.y;
out.y = dir.x; out.y = dir.x;
@ -53904,12 +53911,12 @@
false; false;
var stroke = comp._stroke / 2; var stroke = comp._stroke / 2;
var node = comp.node; var node = comp.node;
var matrix = node._worldMatrix.m; node.getWorldMatrix(_worldMat);
var tx = matrix[12], ty = matrix[13]; var tx = _worldMat.m[12], ty = _worldMat.m[13];
var points = comp._points; var points = comp._points;
var lastPos = comp._lastWPos; var lastPos = comp._lastWPos;
var fadeTime = comp._fadeTime; var fadeTime = comp._fadeTime;
var moved = lastPos.x !== tx || lastPos.y !== ty; var moved = comp._lastWPosUpdated && (lastPos.x !== tx || lastPos.y !== ty);
if (moved) { if (moved) {
var cur; var cur;
var newHead = false; var newHead = false;
@ -53944,6 +53951,7 @@
} }
lastPos.x = tx; lastPos.x = tx;
lastPos.y = ty; lastPos.y = ty;
comp._lastWPosUpdated = true;
if (points.length < 2) return; if (points.length < 2) return;
var color = comp._color, ca = color.a; var color = comp._color, ca = color.a;
var crgb = color.b << 16 | color.g << 8 | color.r; var crgb = color.b << 16 | color.g << 8 | color.r;
@ -54039,6 +54047,7 @@
module.exports = exports["default"]; module.exports = exports["default"];
}), { }), {
"../../../components/CCMotionStreak": 188, "../../../components/CCMotionStreak": 188,
"../../../value-types/mat4": 403,
"../../render-flow": 323, "../../render-flow": 323,
"../../webgl/vertex-format": 371, "../../webgl/vertex-format": 371,
"./motion-streak": 347 "./motion-streak": 347
@ -54048,6 +54057,7 @@
exports.__esModule = true; exports.__esModule = true;
exports["default"] = void 0; exports["default"] = void 0;
var _assembler2d = _interopRequireDefault(require("../../assembler-2d")); var _assembler2d = _interopRequireDefault(require("../../assembler-2d"));
var _mat = _interopRequireDefault(require("../../../value-types/mat4"));
function _interopRequireDefault(obj) { function _interopRequireDefault(obj) {
return obj && obj.__esModule ? obj : { return obj && obj.__esModule ? obj : {
default: obj default: obj
@ -54084,6 +54094,7 @@
var _miter = cc.v2(); var _miter = cc.v2();
var _normal = cc.v2(); var _normal = cc.v2();
var _vec2 = cc.v2(); var _vec2 = cc.v2();
var _worldMat = new _mat["default"]();
function normal(out, dir) { function normal(out, dir) {
out.x = -dir.y; out.x = -dir.y;
out.y = dir.x; out.y = dir.x;
@ -54116,12 +54127,12 @@
false; false;
var stroke = comp._stroke / 2; var stroke = comp._stroke / 2;
var node = comp.node; var node = comp.node;
var matrix = node._worldMatrix.m; node.getWorldMatrix(_worldMat);
var tx = matrix[12], ty = matrix[13]; var tx = _worldMat.m[12], ty = _worldMat.m[13];
var points = comp._points; var points = comp._points;
var lastPos = comp._lastWPos; var lastPos = comp._lastWPos;
var fadeTime = comp._fadeTime; var fadeTime = comp._fadeTime;
var moved = lastPos.x !== tx || lastPos.y !== ty; var moved = comp._lastWPosUpdated && (lastPos.x !== tx || lastPos.y !== ty);
if (moved) { if (moved) {
var cur; var cur;
var newHead = false; var newHead = false;
@ -54156,6 +54167,7 @@
} }
lastPos.x = tx; lastPos.x = tx;
lastPos.y = ty; lastPos.y = ty;
comp._lastWPosUpdated = true;
if (points.length < 2) return; if (points.length < 2) return;
var color = comp._color, ca = color.a; var color = comp._color, ca = color.a;
var crgb = color.b << 16 | color.g << 8 | color.r; var crgb = color.b << 16 | color.g << 8 | color.r;
@ -54236,6 +54248,7 @@
exports["default"] = MotionStreakAssembler; exports["default"] = MotionStreakAssembler;
module.exports = exports["default"]; module.exports = exports["default"];
}), { }), {
"../../../value-types/mat4": 403,
"../../assembler-2d": 299, "../../assembler-2d": 299,
"../../render-flow": 323 "../../render-flow": 323
} ], } ],
@ -56809,7 +56822,7 @@
"use strict"; "use strict";
cc.sp = { cc.sp = {
inited: false, inited: false,
version: "1.1.0", version: "1.2.0",
MAX_MULTITEXTURE_NUM: -1, MAX_MULTITEXTURE_NUM: -1,
autoSwitchMaterial: true, autoSwitchMaterial: true,
allowDynamicAtlas: true, allowDynamicAtlas: true,
@ -65058,6 +65071,7 @@
}, },
onFocusInEditor: false, onFocusInEditor: false,
onLostFocusInEditor: false, onLostFocusInEditor: false,
onRestore: false,
_startPreview: false, _startPreview: false,
_stopPreview: false, _stopPreview: false,
_convertTextureToSpriteFrame: false, _convertTextureToSpriteFrame: false,
@ -97884,7 +97898,7 @@
defineDeprecatedMacroGetter("CC_QQPLAY", QQPLAY); defineDeprecatedMacroGetter("CC_QQPLAY", QQPLAY);
true; true;
cc._Test = {}; cc._Test = {};
var engineVersion = "2.4.9"; var engineVersion = "2.4.10";
_global["CocosEngine"] = cc.ENGINE_VERSION = engineVersion; _global["CocosEngine"] = cc.ENGINE_VERSION = engineVersion;
}), {} ] }), {} ]
}, {}, [ 464 ]); }, {}, [ 464 ]);