diff --git a/src/common/ClientConnection.ts b/src/common/ClientConnection.ts index 32dd11b..ecd2a08 100644 --- a/src/common/ClientConnection.ts +++ b/src/common/ClientConnection.ts @@ -1410,7 +1410,7 @@ export default class ClientConnection { public async SetBlendingOverlap( row: number, column: number, - location: number, + location: number, enable: boolean, width: number ) { @@ -1418,7 +1418,7 @@ export default class ClientConnection { new Protocol.SetBlendingOverlapRequestEntity( row, column, - location, + location, enable, width ) diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts index 2a653dc..f691063 100644 --- a/src/entities/WSProtocol.ts +++ b/src/entities/WSProtocol.ts @@ -3304,7 +3304,7 @@ export namespace Protocol { super.flag = PacketEntity.FLAG_REQUEST; super.rpc_id = rpc_id; - this.enable = row ?? false; + this.enable = enable ?? false; } enable = false; } @@ -3326,12 +3326,12 @@ export namespace Protocol { this.row = row ?? 0; this.column = column ?? 0; this.location = location ?? 0; - this.enable = row ?? false; + this.enable = enable ?? false; this.width = width ?? 0; } row = 0; column = 0; - location = 0; //0:左融合带,1:上融合带,2:右融合带,3:下融合带 + location = 0; //0:左融合带,1:上融合带,2:右融合带,3:下融合带 enable = false; width = 0; }