A temp broken commit except for OfflineMap - drafted basic cancellable skills.

This commit is contained in:
genxium
2023-01-01 20:18:35 +08:00
parent 8b80117d3d
commit 325dbfb79c
18 changed files with 7682 additions and 399 deletions

File diff suppressed because one or more lines are too long

View File

@@ -3,7 +3,7 @@
"_name": "Atk1",
"_objFlags": 0,
"_native": "",
"_duration": 0.36666666666666664,
"_duration": 0.2833333333333333,
"sample": 60,
"speed": 1,
"wrapMode": 1,
@@ -18,25 +18,25 @@
}
},
{
"frame": 0.03333333333333333,
"frame": 0.05,
"value": {
"__uuid__": "12b90556-58b9-4311-b5d9-820fb76d659b"
}
},
{
"frame": 0.11666666666666667,
"frame": 0.1,
"value": {
"__uuid__": "72bc74a1-6e8c-48bb-9ab2-9b8f502ceffb"
}
},
{
"frame": 0.31666666666666665,
"frame": 0.25,
"value": {
"__uuid__": "7e619896-100d-4903-b256-e30ddb5ad397"
}
},
{
"frame": 0.35,
"frame": 0.26666666666666666,
"value": {
"__uuid__": "4a35e0f5-95c4-445b-8f9b-6514a060a72d"
}

View File

@@ -0,0 +1,79 @@
{
"__type__": "cc.AnimationClip",
"_name": "Atk2",
"_objFlags": 0,
"_native": "",
"_duration": 0.6,
"sample": 60,
"speed": 1,
"wrapMode": 1,
"curveData": {
"comps": {
"cc.Sprite": {
"spriteFrame": [
{
"frame": 0,
"value": {
"__uuid__": "0e3b6c28-f265-457d-b000-aeea66d05428"
}
},
{
"frame": 0.03333333333333333,
"value": {
"__uuid__": "1d9c010b-3209-4672-9f78-96527d62f4e0"
}
},
{
"frame": 0.08333333333333333,
"value": {
"__uuid__": "1fd3ca4d-ec4d-4858-a3d2-fe274e22d4be"
}
},
{
"frame": 0.11666666666666667,
"value": {
"__uuid__": "b0aaf216-b8d7-4247-be61-df9f3146ce46"
}
},
{
"frame": 0.15,
"value": {
"__uuid__": "f12c5713-540f-4874-a6b0-0162f0ffb544"
}
},
{
"frame": 0.2,
"value": {
"__uuid__": "b9a4cd85-53d1-4280-bc9e-35a8dd482fa4"
}
},
{
"frame": 0.23333333333333334,
"value": {
"__uuid__": "74e9fcd1-11dc-478e-b90a-d4c5cf551aad"
}
},
{
"frame": 0.3,
"value": {
"__uuid__": "e6c3bdcd-9ba8-4c5b-910d-2d93d9068abd"
}
},
{
"frame": 0.5166666666666667,
"value": {
"__uuid__": "c359790f-bbd1-4869-a37b-7f1c0bd91578"
}
},
{
"frame": 0.5833333333333334,
"value": {
"__uuid__": "1b9074dd-d0b0-4129-8d72-8f356bf7f68c"
}
}
]
}
}
},
"events": []
}

View File

@@ -0,0 +1,5 @@
{
"ver": "2.1.0",
"uuid": "e6e1d62a-de7d-4fe7-858c-2d2725b7c2e8",
"subMetas": {}
}

View File

@@ -0,0 +1,85 @@
{
"__type__": "cc.AnimationClip",
"_name": "Atk3",
"_objFlags": 0,
"_native": "",
"_duration": 1,
"sample": 60,
"speed": 1,
"wrapMode": 1,
"curveData": {
"comps": {
"cc.Sprite": {
"spriteFrame": [
{
"frame": 0,
"value": {
"__uuid__": "4e1a3e61-dc3e-4de1-9385-bce2c5f54764"
}
},
{
"frame": 0.05,
"value": {
"__uuid__": "39ba4413-6f4a-49a5-a7ca-d11140dfe7dd"
}
},
{
"frame": 0.11666666666666667,
"value": {
"__uuid__": "26b646c7-bdbc-495e-adaf-9d52ef1b5c84"
}
},
{
"frame": 0.21666666666666667,
"value": {
"__uuid__": "5a5208a0-1c29-446f-8375-739aef09fe65"
}
},
{
"frame": 0.3,
"value": {
"__uuid__": "414628f0-13ec-4f01-83a0-b94f6a13fff1"
}
},
{
"frame": 0.43333333333333335,
"value": {
"__uuid__": "c494965a-e7e6-4c99-ac61-60642e6247dc"
}
},
{
"frame": 0.5666666666666667,
"value": {
"__uuid__": "04cafb17-39ab-4f2b-9830-3eaf42cab254"
}
},
{
"frame": 0.7166666666666667,
"value": {
"__uuid__": "fd9c7d8a-1038-4cab-a0e6-699e404701db"
}
},
{
"frame": 0.8333333333333334,
"value": {
"__uuid__": "2447c6b3-292b-43b4-84e5-acc35df0c1f5"
}
},
{
"frame": 0.9333333333333333,
"value": {
"__uuid__": "00275818-b9b6-41ab-a792-f21ff10747fa"
}
},
{
"frame": 0.9833333333333333,
"value": {
"__uuid__": "11a06f33-cdfa-46cf-aae4-41e72a6711c2"
}
}
]
}
}
},
"events": []
}

View File

@@ -0,0 +1,5 @@
{
"ver": "2.1.0",
"uuid": "e8247e2a-1b5b-4618-86f8-224b25246b55",
"subMetas": {}
}

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 93 KiB

View File

@@ -9,10 +9,10 @@
</data>
</layer>
<objectgroup id="1" name="PlayerStartingPos">
<object id="135" x="901" y="1579">
<object id="135" x="865" y="1447">
<point/>
</object>
<object id="137" x="861" y="1540">
<object id="137" x="909" y="1447">
<point/>
</object>
</objectgroup>

View File

@@ -933,7 +933,7 @@
"__id__": 11
},
"_children": [],
"_active": false,
"_active": true,
"_components": [
{
"__id__": 23
@@ -1034,6 +1034,12 @@
},
{
"__uuid__": "7cb4d395-c68f-4643-9e2e-8cb8e200d3a5"
},
{
"__uuid__": "e6e1d62a-de7d-4fe7-858c-2d2725b7c2e8"
},
{
"__uuid__": "e8247e2a-1b5b-4618-86f8-224b25246b55"
}
],
"playOnLoad": false,

View File

@@ -12,6 +12,8 @@ window.ATK_CHARACTER_STATE = {
BlownUp1: [8, "BlownUp1"],
LayDown1: [9, "LayDown1"],
GetUp1: [10, "GetUp1"],
Atk2: [11, "Atk2"],
Atk3: [12, "Atk3"],
};
window.ATK_CHARACTER_STATE_ARR = [];

View File

@@ -586,13 +586,13 @@ cc.Class({
const jsPlayersArr = new Array().fill(null);
for (let k in pbRdf.playersArr) {
const pbPlayer = pbRdf.playersArr[k];
const jsPlayer = gopkgs.NewPlayerDownsyncJs(pbPlayer.id, pbPlayer.virtualGridX, pbPlayer.virtualGridY, pbPlayer.dirX, pbPlayer.dirY, pbPlayer.velX, pbPlayer.velY, pbPlayer.framesToRecover, pbPlayer.framesInChState, pbPlayer.speed, pbPlayer.battleState, pbPlayer.characterState, pbPlayer.joinIndex, pbPlayer.hp, pbPlayer.maxHp, pbPlayer.inAir, pbPlayer.colliderRadius);
const jsPlayer = gopkgs.NewPlayerDownsyncJs(pbPlayer.id, pbPlayer.virtualGridX, pbPlayer.virtualGridY, pbPlayer.dirX, pbPlayer.dirY, pbPlayer.velX, pbPlayer.velY, pbPlayer.framesToRecover, pbPlayer.framesInChState, pbPlayer.speed, pbPlayer.battleState, pbPlayer.characterState, pbPlayer.joinIndex, pbPlayer.hp, pbPlayer.maxHp, pbPlayer.colliderRadius, pbPlayer.inAir);
jsPlayersArr[k] = jsPlayer;
}
const jsMeleeBulletsArr = [];
for (let k in pbRdf.meleeBullets) {
const pbBullet = pbRdf.meleeBullets[k];
const jsBullet = gopkgs.NewMeleeBulletJs(pbBullet.originatedRenderFrameId, pbBullet.offenderJoinIndex, pbBullet.startupFrames, pbBullet.cancellableStFrame, pbBullet.cancellableEdFrame, pbBullet.activeFrames, pbBullet.hitStunFrames, pbBullet.blockStunFrames, pbBullet.pushbackX, pbBullet.pushbackY, pbBullet.damage, pbBullet.selfLockVelX, pbBullet.selfLockVelY, pbBullet.hitboxOffsetX, pbBullet.hitboxOffsetY, pbBullet.hitboxSizeX, pbBullet.hitboxSizeY, pbBullet.blowUp);
const jsBullet = gopkgs.NewMeleeBulletJs(pbBullet.originatedRenderFrameId, pbBullet.offenderJoinIndex, pbBullet.startupFrames, pbBullet.cancellableStFrame, pbBullet.cancellableEdFrame, pbBullet.activeFrames, pbBullet.hitStunFrames, pbBullet.blockStunFrames, pbBullet.pushbackVelX, pbBullet.pushbackVelY, pbBullet.damage, pbBullet.selfLockVelX, pbBullet.selfLockVelY, pbBullet.hitboxOffsetX, pbBullet.hitboxOffsetY, pbBullet.hitboxSizeX, pbBullet.hitboxSizeY, pbBullet.blowUp);
jsMeleeBulletsArr.push(jsBullet);
}
@@ -832,12 +832,17 @@ batchInputFrameIdRange=[${batch[0].inputFrameId}, ${batch[batch.length - 1].inpu
const chConfig = self.chConfigsOrderedByJoinIndex[joinIndex - 1];
playerScriptIns.setSpecies(chConfig.SpeciesName);
if (1 == joinIndex) {
newPlayerNode.color = cc.Color.RED;
} else {
newPlayerNode.color = cc.Color.BLUE;
}
const [wx, wy] = gopkgs.VirtualGridToWorldPos(vx, vy);
newPlayerNode.setPosition(wx, wy);
playerScriptIns.mapNode = self.node;
const colliderRadius = playerDownsyncInfo.ColliderRadius;
const halfColliderWidth = colliderRadius,
halfColliderHeight = colliderRadius + colliderRadius; // avoid multiplying
const [halfColliderWidth, halfColliderHeight] = gopkgs.VirtualGridToWorldPos(colliderRadius, colliderRadius + colliderRadius); // avoid multiplying
const colliderWidth = halfColliderWidth + halfColliderWidth,
colliderHeight = halfColliderHeight + halfColliderHeight; // avoid multiplying
@@ -846,7 +851,7 @@ batchInputFrameIdRange=[${batch[0].inputFrameId}, ${batch[batch.length - 1].inpu
const collisionPlayerIndex = self.collisionPlayerIndexPrefix + joinIndex;
self.gopkgsCollisionSysMap[collisionPlayerIndex] = newPlayerCollider;
console.log(`Created new player collider: joinIndex=${joinIndex}, colliderRadius=${playerDownsyncInfo.ColliderRadius}`);
console.log(`Created new player collider: joinIndex=${joinIndex}`);
safelyAddChild(self.node, newPlayerNode);
setLocalZOrder(newPlayerNode, 5);

View File

@@ -123,7 +123,9 @@ cc.Class({
}
const p1Vpos = gopkgs.WorldToVirtualGridPos(boundaryObjs.playerStartingPositions[0].x, boundaryObjs.playerStartingPositions[0].y);
const p2Vpos = gopkgs.WorldToVirtualGridPos(boundaryObjs.playerStartingPositions[1].x, boundaryObjs.playerStartingPositions[1].y);
const speedV = gopkgs.WorldToVirtualGridPos(1.0, 0);
const colliderRadiusV = gopkgs.WorldToVirtualGridPos(12.0, 0);
const startRdf = window.pb.protos.RoomDownsyncFrame.create({
id: window.MAGIC_ROOM_DOWNSYNC_FRAME_ID.BATTLE_START,
@@ -134,17 +136,32 @@ cc.Class({
virtualGridX: p1Vpos[0],
virtualGridY: p1Vpos[1],
speed: speedV[0],
colliderRadius: 12,
colliderRadius: colliderRadiusV[0],
characterState: window.ATK_CHARACTER_STATE.InAirIdle1NoJump[0],
framesToRecover: 0,
dirX: 0,
dirX: +2,
dirY: 0,
velX: 0,
velY: 0,
inAir: true,
}),
window.pb.protos.PlayerDownsync.create({
id: 11,
joinIndex: 2,
virtualGridX: p2Vpos[0],
virtualGridY: p2Vpos[1],
speed: speedV[0],
colliderRadius: colliderRadiusV[0],
characterState: window.ATK_CHARACTER_STATE.InAirIdle1NoJump[0],
framesToRecover: 0,
dirX: -2,
dirY: 0,
velX: 0,
velY: 0,
inAir: true,
}),
],
speciesIdList: [0],
speciesIdList: [0, 0],
});
self.selfPlayerInfo = {