Fixes for melee attack sync.

This commit is contained in:
genxium
2022-11-24 19:45:48 +08:00
parent 2290c57c1c
commit 04de4666d5
13 changed files with 271 additions and 238 deletions

File diff suppressed because one or more lines are too long

View File

@@ -1,7 +1,7 @@
{
"ver": "1.0.0",
"uuid": "2f5ba371-9006-4e2d-8dd4-df91fcea1df2",
"uuid": "e9e703e9-3589-4713-b889-28b23406d220",
"atlasJson": "{\"SubTexture\":[{\"y\":50,\"frameX\":-2,\"frameY\":-2,\"width\":19,\"frameWidth\":23,\"height\":19,\"name\":\"biu\",\"frameHeight\":22,\"x\":1},{\"width\":9,\"y\":50,\"height\":14,\"name\":\"rightArm\",\"x\":42},{\"y\":34,\"frameX\":-6,\"frameY\":0,\"width\":20,\"frameWidth\":29,\"height\":32,\"name\":\"yinmoqe00\",\"frameHeight\":32,\"x\":88},{\"y\":1,\"frameX\":0,\"frameY\":0,\"width\":33,\"frameWidth\":34,\"height\":39,\"name\":\"body\",\"frameHeight\":41,\"x\":53},{\"width\":9,\"y\":56,\"height\":13,\"name\":\"rightShoulder\",\"x\":74},{\"y\":50,\"frameX\":0,\"frameY\":0,\"width\":18,\"frameWidth\":19,\"height\":17,\"name\":\"rightFrontArm\",\"frameHeight\":18,\"x\":22},{\"width\":14,\"y\":50,\"height\":14,\"name\":\"rightHand\",\"x\":110},{\"width\":12,\"y\":42,\"height\":12,\"name\":\"leftArm\",\"x\":74},{\"width\":13,\"y\":66,\"height\":12,\"name\":\"leftShoulder\",\"x\":110},{\"y\":42,\"frameX\":-1,\"frameY\":0,\"width\":19,\"frameWidth\":20,\"height\":21,\"name\":\"leftFrontArm\",\"frameHeight\":21,\"x\":53},{\"width\":50,\"y\":1,\"height\":47,\"name\":\"head2\",\"x\":1},{\"y\":1,\"frameX\":-1,\"frameY\":0,\"width\":32,\"frameWidth\":33,\"height\":31,\"name\":\"head\",\"frameHeight\":32,\"x\":88},{\"width\":16,\"y\":34,\"height\":14,\"name\":\"leftHand\",\"x\":110},{\"y\":1,\"frameX\":-2,\"frameY\":-3,\"width\":2,\"frameWidth\":8,\"height\":2,\"name\":\"huomiao01\",\"frameHeight\":8,\"x\":122}],\"width\":128,\"height\":128,\"name\":\"SoldierWaterGhost\",\"imagePath\":\"SoldierWaterGhost_tex.png\"}",
"texture": "62ea1a78-b096-4b8c-afb4-8edd4be142f7",
"texture": "def168c3-3f07-43f9-a460-36b397c70a57",
"subMetas": {}
}

View File

@@ -1,6 +1,6 @@
{
"ver": "2.3.3",
"uuid": "62ea1a78-b096-4b8c-afb4-8edd4be142f7",
"uuid": "def168c3-3f07-43f9-a460-36b397c70a57",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
@@ -11,8 +11,8 @@
"subMetas": {
"SoldierWaterGhost_tex": {
"ver": "1.0.4",
"uuid": "e7b96c0e-a9b8-40eb-8568-73bd2803cd31",
"rawTextureUuid": "62ea1a78-b096-4b8c-afb4-8edd4be142f7",
"uuid": "52fb0606-bbea-433c-803b-bf5ce936a0df",
"rawTextureUuid": "def168c3-3f07-43f9-a460-36b397c70a57",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,

View File

@@ -108,24 +108,25 @@ message BattleColliderInfo {
int32 intervalToPing = 8;
int32 willKickIfInactiveFor = 9;
int32 boundRoomId = 10;
int64 battleDurationNanos = 11;
int32 serverFps = 12;
int32 inputDelayFrames = 13;
uint32 inputScaleFrames = 14;
int32 nstDelayFrames = 15;
int32 inputFrameUpsyncDelayTolerance = 16;
int32 maxChasingRenderFramesPerUpdate = 17;
int32 playerBattleState = 18;
double rollbackEstimatedDtMillis = 19;
int64 rollbackEstimatedDtNanos = 20;
int32 battleDurationFrames = 12;
int64 battleDurationNanos = 13;
int32 serverFps = 14;
int32 inputDelayFrames = 15; // in the count of render frames
uint32 inputScaleFrames = 16; // inputDelayedAndScaledFrameId = ((originalFrameId - InputDelayFrames) >> InputScaleFrames)
int32 nstDelayFrames = 17; // network-single-trip delay in the count of render frames, proposed to be (InputDelayFrames >> 1) because we expect a round-trip delay to be exactly "InputDelayFrames"
int32 inputFrameUpsyncDelayTolerance = 18;
int32 maxChasingRenderFramesPerUpdate = 19;
int32 playerBattleState = 20;
double rollbackEstimatedDtMillis = 21;
int64 rollbackEstimatedDtNanos = 22;
double worldToVirtualGridRatio = 21;
double virtualGridToWorldRatio = 22;
double worldToVirtualGridRatio = 23;
double virtualGridToWorldRatio = 24;
int32 spAtkLookupFrames = 23;
int32 renderCacheSize = 24;
int32 spAtkLookupFrames = 25;
int32 renderCacheSize = 26;
map<int32, MeleeBullet> meleeSkillConfig = 25; // skillId -> skill
map<int32, MeleeBullet> meleeSkillConfig = 27; // skillId -> skill
}
message RoomDownsyncFrame {

View File

@@ -860,7 +860,7 @@
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "73b7e7d4-6ad0-41ea-9d17-1104c463aad2#2f5ba371-9006-4e2d-8dd4-df91fcea1df2",
"_armatureKey": "a9d7bbc2-134b-4eb4-ba16-6541f3e51e06#e9e703e9-3589-4713-b889-28b23406d220",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
@@ -868,10 +868,10 @@
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "73b7e7d4-6ad0-41ea-9d17-1104c463aad2"
"__uuid__": "a9d7bbc2-134b-4eb4-ba16-6541f3e51e06"
},
"_N$dragonAtlasAsset": {
"__uuid__": "2f5ba371-9006-4e2d-8dd4-df91fcea1df2"
"__uuid__": "e9e703e9-3589-4713-b889-28b23406d220"
},
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 8,