Test_Project_Cocos/DelayNoMore
1
0
Fork 0
mirror of https://github.com/genxium/DelayNoMore synced 2024-12-26 03:39:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor fix.

Browse Source
This commit is contained in:
genxium 2023-02-17 14:35:42 +08:00
parent 2b304eaa75
commit a4941c1273
5 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/assets/scenes/offline_map.fire
View File

@ -518,7 +518,7 @@
"array": [ "array": [
0, 0,
0, 0,
210.4441731196186, 209.66956379694378,
0, 0,
0, 0,
0, 0,

2
frontend/assets/scripts/Map.js
View File

@ -462,7 +462,7 @@ cc.Class({
}, },
onLoad() { onLoad() {
cc.game.setFrameRate(60); cc.game.setFrameRate(59.9);
cc.view.setOrientation(cc.macro.ORIENTATION_LANDSCAPE); cc.view.setOrientation(cc.macro.ORIENTATION_LANDSCAPE);
cc.view.enableAutoFullScreen(true); cc.view.enableAutoFullScreen(true);

2
frontend/assets/scripts/OfflineMap.js
View File

@ -11,7 +11,7 @@ cc.Class({
}, },
onLoad() { onLoad() {
cc.game.setFrameRate(60); cc.game.setFrameRate(59.9);
cc.view.setOrientation(cc.macro.ORIENTATION_LANDSCAPE); cc.view.setOrientation(cc.macro.ORIENTATION_LANDSCAPE);
cc.view.enableAutoFullScreen(true); cc.view.enableAutoFullScreen(true);
const self = this; const self = this;

24
frontend/assets/scripts/modules/jsexport.js
View File

@ -6908,20 +6908,24 @@ $packages["jsexport/battle"] = (function() {
/* */ } return; } var $f = {$blk: generateRectColliderInCollisionSpace, $c: true, $r, blX, blY, collider, data, h, shape, tag, w, $s};return $f; /* */ } return; } var $f = {$blk: generateRectColliderInCollisionSpace, $c: true, $r, blX, blY, collider, data, h, shape, tag, w, $s};return $f;
}; };
UpdateRectCollider = function(collider, wx, wy, w, h, topPadding, bottomPadding, leftPadding, rightPadding, spaceOffsetX, spaceOffsetY, data, tag) { UpdateRectCollider = function(collider, wx, wy, w, h, topPadding, bottomPadding, leftPadding, rightPadding, spaceOffsetX, spaceOffsetY, data, tag) {
var _tmp, _tmp$1, _tmp$2, _tmp$3, _tuple, blX, blY, bottomPadding, collider, data, h, leftPadding, rectShape, rightPadding, spaceOffsetX, spaceOffsetY, tag, topPadding, w, wx, wy; var _tmp, _tmp$1, _tmp$2, _tmp$3, _tmp$4, _tmp$5, _tuple, blX, blY, bottomPadding, collider, data, effH, effW, h, leftPadding, rectShape, rightPadding, spaceOffsetX, spaceOffsetY, tag, topPadding, w, wx, wy;
_tuple = WorldToPolygonColliderBLPos(wx, wy, w * 0.5, h * 0.5, topPadding, bottomPadding, leftPadding, rightPadding, spaceOffsetX, spaceOffsetY); _tuple = WorldToPolygonColliderBLPos(wx, wy, w * 0.5, h * 0.5, topPadding, bottomPadding, leftPadding, rightPadding, spaceOffsetX, spaceOffsetY);
blX = _tuple[0]; blX = _tuple[0];
blY = _tuple[1]; blY = _tuple[1];
_tmp = blX; _tmp = leftPadding + w + rightPadding;
_tmp$1 = blY; _tmp$1 = bottomPadding + h + topPadding;
_tmp$2 = w; effW = _tmp;
_tmp$3 = h; effH = _tmp$1;
collider.X = _tmp; _tmp$2 = blX;
collider.Y = _tmp$1; _tmp$3 = blY;
collider.W = _tmp$2; _tmp$4 = effW;
collider.H = _tmp$3; _tmp$5 = effH;
collider.X = _tmp$2;
collider.Y = _tmp$3;
collider.W = _tmp$4;
collider.H = _tmp$5;
rectShape = $assertType(collider.Shape, ptrType$9); rectShape = $assertType(collider.Shape, ptrType$9);
rectShape.UpdateAsRectangle(0, 0, w, h); rectShape.UpdateAsRectangle(0, 0, effW, effH);
collider.Data = data; collider.Data = data;
}; };
$pkg.UpdateRectCollider = UpdateRectCollider; $pkg.UpdateRectCollider = UpdateRectCollider;

11
jsexport/battle/battle.go
View File

@ -1210,10 +1210,10 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *resolv.Rin
} }
} }
for i := 0; i < colliderCnt; i++ { for i := 0; i < colliderCnt; i++ {
dynamicCollider := dynamicRectangleColliders[i] dynamicCollider := dynamicRectangleColliders[i]
dynamicCollider.Space.RemoveSingle(dynamicCollider) dynamicCollider.Space.RemoveSingle(dynamicCollider)
} }
ret.Id = nextRenderFrameId ret.Id = nextRenderFrameId
ret.BulletLocalIdCounter = bulletLocalId ret.BulletLocalIdCounter = bulletLocalId
@ -1236,9 +1236,10 @@ func generateRectColliderInCollisionSpace(blX, blY, w, h float64, data interface
func UpdateRectCollider(collider *resolv.Object, wx, wy, w, h, topPadding, bottomPadding, leftPadding, rightPadding, spaceOffsetX, spaceOffsetY float64, data interface{}, tag string) { func UpdateRectCollider(collider *resolv.Object, wx, wy, w, h, topPadding, bottomPadding, leftPadding, rightPadding, spaceOffsetX, spaceOffsetY float64, data interface{}, tag string) {
blX, blY := WorldToPolygonColliderBLPos(wx, wy, w*0.5, h*0.5, topPadding, bottomPadding, leftPadding, rightPadding, spaceOffsetX, spaceOffsetY) blX, blY := WorldToPolygonColliderBLPos(wx, wy, w*0.5, h*0.5, topPadding, bottomPadding, leftPadding, rightPadding, spaceOffsetX, spaceOffsetY)
collider.X, collider.Y, collider.W, collider.H = blX, blY, w, h effW, effH := leftPadding+w+rightPadding, bottomPadding+h+topPadding
collider.X, collider.Y, collider.W, collider.H = blX, blY, effW, effH
rectShape := collider.Shape.(*resolv.ConvexPolygon) rectShape := collider.Shape.(*resolv.ConvexPolygon)
rectShape.UpdateAsRectangle(0, 0, w, h) rectShape.UpdateAsRectangle(0, 0, effW, effH)
collider.Data = data collider.Data = data
// Ignore "tag" for now // Ignore "tag" for now
} }