From ad661707ecfe5aba50c13c3839122df08e7c235c Mon Sep 17 00:00:00 2001 From: Joywayer Date: Sun, 28 Jun 2026 20:33:53 +0800 Subject: [PATCH] =?UTF-8?q?fix(framework):=20player=5Flogin.version=20?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=95=B0=E5=AD=97=20versionCode(=E8=81=94?= =?UTF-8?q?=E8=B0=83=E7=99=BB=E5=BD=95=E6=88=90=E5=8A=9F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 真机联调发现：协议 version 字段=数字 versionCode（源码 8 处 data.version=GameData.versionCode）， 框架原发字符串 '1.1' 被服务器版本校验拒绝(kick_server 检查到新版本)。改为数字后登录成功 (state:0 playerid:430511)。 - ChannelIdentity/LoginRequestData.version: string→number，去掉冗余 versionCode 与未发送的 '1.1' 串 - query-string version 解析为数字；测试 fixture 同步 Co-Authored-By: Claude Opus 4.8 (1M context) --- .../YouleNexus/assets/framework/config/identity.ts | 3 +-- .../YouleNexus/assets/framework/config/sources/defaults.ts | 3 +-- .../assets/framework/config/sources/query-string.ts | 2 +- .../YouleNexus/assets/framework/core/types/login.ts | 2 +- cocoscreator_projects/framework-tests/config/identity.test.ts | 3 +-- .../framework-tests/config/remote-config.test.ts | 2 +- .../framework-tests/config/sources/query-string.test.ts | 4 ++-- cocoscreator_projects/framework-tests/core/types.typetest.ts | 2 +- .../framework-tests/integration/login-flow.test.ts | 2 +- cocoscreator_projects/framework-tests/net/net-client.test.ts | 2 +- cocoscreator_projects/framework-tests/protocol/login.test.ts | 2 +- 11 files changed, 12 insertions(+), 15 deletions(-) diff --git a/cocoscreator_projects/YouleNexus/assets/framework/config/identity.ts b/cocoscreator_projects/YouleNexus/assets/framework/config/identity.ts index e7431ea..f416033 100644 --- a/cocoscreator_projects/YouleNexus/assets/framework/config/identity.ts +++ b/cocoscreator_projects/YouleNexus/assets/framework/config/identity.ts @@ -4,8 +4,7 @@ export interface ChannelIdentity { channelid: string | number; gameid: string; marketid: string | number; - version: string; // 旧 GameData.Version - versionCode: number; // 旧 GameData.versionCode + version: number; // 协议 player_login.version 字段 = 数字 versionCode（非 "1.1" 显示串，逐字对齐源码 data.version=GameData.versionCode） } /** 身份来源：返回部分字段覆盖。 */ diff --git a/cocoscreator_projects/YouleNexus/assets/framework/config/sources/defaults.ts b/cocoscreator_projects/YouleNexus/assets/framework/config/sources/defaults.ts index 3dd237c..2ce50e8 100644 --- a/cocoscreator_projects/YouleNexus/assets/framework/config/sources/defaults.ts +++ b/cocoscreator_projects/YouleNexus/assets/framework/config/sources/defaults.ts @@ -9,6 +9,5 @@ export const BUILD_IDENTITY: ChannelIdentity = { channelid: 'FtJf073aa0d6rI1xD8J1Y42fINTm0ziK', gameid: 'jzWe0kzmN0tAcZ5MLks3rFWcxNecogyu', marketid: 4, - version: '1.1', - versionCode: 10000, + version: 10000, // 数字 versionCode（联调时改成本地服要求的版本号） }; diff --git a/cocoscreator_projects/YouleNexus/assets/framework/config/sources/query-string.ts b/cocoscreator_projects/YouleNexus/assets/framework/config/sources/query-string.ts index 22a6fc6..8492a1c 100644 --- a/cocoscreator_projects/YouleNexus/assets/framework/config/sources/query-string.ts +++ b/cocoscreator_projects/YouleNexus/assets/framework/config/sources/query-string.ts @@ -8,7 +8,7 @@ export function queryStringSource(search: string): IdentitySource { const agentid = q.get('agentid'); if (agentid) out.agentid = agentid; const channelid = q.get('channelid'); if (channelid) out.channelid = channelid; const marketid = q.get('marketid'); if (marketid) out.marketid = marketid; - const version = q.get('version'); if (version) out.version = version; + const version = q.get('version'); if (version) out.version = Number(version); // 协议 version 为数字 return out; }; } diff --git a/cocoscreator_projects/YouleNexus/assets/framework/core/types/login.ts b/cocoscreator_projects/YouleNexus/assets/framework/core/types/login.ts index 846b0be..17a1b35 100644 --- a/cocoscreator_projects/YouleNexus/assets/framework/core/types/login.ts +++ b/cocoscreator_projects/YouleNexus/assets/framework/core/types/login.ts @@ -12,7 +12,7 @@ export interface LoginRequestData { province: string; city: string; unionid: string | number; - version: string; + version: number; // 数字 versionCode（源码 data.version=GameData.versionCode） channelid: number | string; marketid: number | string; [extra: string]: unknown; // location/ip/machineid/telphone 等由 Send_login 注入，见 docs/protocol/01 §6 diff --git a/cocoscreator_projects/framework-tests/config/identity.test.ts b/cocoscreator_projects/framework-tests/config/identity.test.ts index d165b57..63f9378 100644 --- a/cocoscreator_projects/framework-tests/config/identity.test.ts +++ b/cocoscreator_projects/framework-tests/config/identity.test.ts @@ -8,8 +8,7 @@ test('BUILD_IDENTITY 含全部字段且 gameid 为固定 token', () => { assert.ok('agentid' in BUILD_IDENTITY); assert.ok('channelid' in BUILD_IDENTITY); assert.ok('marketid' in BUILD_IDENTITY); - assert.equal(typeof BUILD_IDENTITY.version, 'string'); - assert.equal(typeof BUILD_IDENTITY.versionCode, 'number'); + assert.equal(typeof BUILD_IDENTITY.version, 'number'); // 协议 version = 数字 versionCode }); test('resolveIdentity：后面的 source 覆盖前面的', () => { diff --git a/cocoscreator_projects/framework-tests/config/remote-config.test.ts b/cocoscreator_projects/framework-tests/config/remote-config.test.ts index 99fa95a..35e70e8 100644 --- a/cocoscreator_projects/framework-tests/config/remote-config.test.ts +++ b/cocoscreator_projects/framework-tests/config/remote-config.test.ts @@ -3,7 +3,7 @@ import assert from 'node:assert/strict'; import { getParam, resolveServers, type RemoteConfig } from '../../YouleNexus/assets/framework/config/remote-config.ts'; import type { ChannelIdentity } from '../../YouleNexus/assets/framework/config/identity.ts'; -const ID: ChannelIdentity = { agentid: 'A', channelid: 'C', gameid: 'G', marketid: 2, version: '1', versionCode: 1 }; +const ID: ChannelIdentity = { agentid: 'A', channelid: 'C', gameid: 'G', marketid: 2, version: 1 }; const CONFIG: RemoteConfig = { data: { diff --git a/cocoscreator_projects/framework-tests/config/sources/query-string.test.ts b/cocoscreator_projects/framework-tests/config/sources/query-string.test.ts index 40657bb..df92a54 100644 --- a/cocoscreator_projects/framework-tests/config/sources/query-string.test.ts +++ b/cocoscreator_projects/framework-tests/config/sources/query-string.test.ts @@ -3,8 +3,8 @@ import assert from 'node:assert/strict'; import { queryStringSource } from '../../../YouleNexus/assets/framework/config/sources/query-string.ts'; test('解析 agentid/channelid/marketid/version', () => { - const src = queryStringSource('?agentid=A1&channelid=C1&marketid=2&version=9.9'); - assert.deepEqual(src(), { agentid: 'A1', channelid: 'C1', marketid: '2', version: '9.9' }); + const src = queryStringSource('?agentid=A1&channelid=C1&marketid=2&version=10001'); + assert.deepEqual(src(), { agentid: 'A1', channelid: 'C1', marketid: '2', version: 10001 }); // version 解析为数字 }); test('缺省键不出现在结果里', () => { diff --git a/cocoscreator_projects/framework-tests/core/types.typetest.ts b/cocoscreator_projects/framework-tests/core/types.typetest.ts index ba4b5b3..c038037 100644 --- a/cocoscreator_projects/framework-tests/core/types.typetest.ts +++ b/cocoscreator_projects/framework-tests/core/types.typetest.ts @@ -3,7 +3,7 @@ import type { LoginRequestData, LoginResponseData } from '../../YouleNexus/asset const out: OutboundEnvelope = { app: 'youle', route: 'agent', rpc: 'player_login', - data: { agentid: 1, gameid: 2, openid: 'o', nickname: 'n', avatar: 'a', sex: 0, province: '', city: '', unionid: 'u', version: '1', channelid: 0, marketid: 0 }, + data: { agentid: 1, gameid: 2, openid: 'o', nickname: 'n', avatar: 'a', sex: 0, province: '', city: '', unionid: 'u', version: 1, channelid: 0, marketid: 0 }, }; const inb: InboundMessage = { route: 'agent', rpc: 'player_login', data: { state: 0, playerid: 9 } }; void out; void inb; diff --git a/cocoscreator_projects/framework-tests/integration/login-flow.test.ts b/cocoscreator_projects/framework-tests/integration/login-flow.test.ts index ada7471..346699f 100644 --- a/cocoscreator_projects/framework-tests/integration/login-flow.test.ts +++ b/cocoscreator_projects/framework-tests/integration/login-flow.test.ts @@ -6,7 +6,7 @@ import { parseLoginResponse } from '../../YouleNexus/assets/framework/protocol/l import type { Clock } from '../../YouleNexus/assets/framework/net/heartbeat.ts'; const realishClock: Clock = { setTimeout: (fn, ms) => setTimeout(fn, ms), clearTimeout: (h: any) => clearTimeout(h) }; -const IDENTITY = { agentid: 1, gameid: 2, openid: 'o', nickname: 'n', avatar: 'a', sex: 0, province: '', city: '', unionid: 'u', version: '1', channelid: 0, marketid: 0 }; +const IDENTITY = { agentid: 1, gameid: 2, openid: 'o', nickname: 'n', avatar: 'a', sex: 0, province: '', city: '', unionid: 'u', version: 1, channelid: 0, marketid: 0 }; test('login 全流程：握手→登录→业务包，且 parseLoginResponse 识别房间恢复', async () => { const t = new FakeTransport(); diff --git a/cocoscreator_projects/framework-tests/net/net-client.test.ts b/cocoscreator_projects/framework-tests/net/net-client.test.ts index d733363..83ae4d8 100644 --- a/cocoscreator_projects/framework-tests/net/net-client.test.ts +++ b/cocoscreator_projects/framework-tests/net/net-client.test.ts @@ -15,7 +15,7 @@ function fakeClock() { return { clock, advance }; } -const IDENTITY = { agentid: 1, gameid: 2, openid: 'o', nickname: 'n', avatar: 'a', sex: 0, province: '', city: '', unionid: 'u', version: '1', channelid: 0, marketid: 0 }; +const IDENTITY = { agentid: 1, gameid: 2, openid: 'o', nickname: 'n', avatar: 'a', sex: 0, province: '', city: '', unionid: 'u', version: 1, channelid: 0, marketid: 0 }; function makeClient(transports: FakeTransport[], clock: Clock) { let i = 0; diff --git a/cocoscreator_projects/framework-tests/protocol/login.test.ts b/cocoscreator_projects/framework-tests/protocol/login.test.ts index f04fced..8123b38 100644 --- a/cocoscreator_projects/framework-tests/protocol/login.test.ts +++ b/cocoscreator_projects/framework-tests/protocol/login.test.ts @@ -2,7 +2,7 @@ import { test } from 'node:test'; import assert from 'node:assert/strict'; import { buildLoginRequest, parseLoginResponse } from '../../YouleNexus/assets/framework/protocol/login.ts'; -const IDENTITY = { agentid: 1, gameid: 2, openid: 'o', nickname: 'n', avatar: 'a', sex: 1, province: 'p', city: 'c', unionid: 'u', version: '1.0', channelid: 7, marketid: 9 }; +const IDENTITY = { agentid: 1, gameid: 2, openid: 'o', nickname: 'n', avatar: 'a', sex: 1, province: 'p', city: 'c', unionid: 'u', version: 10001, channelid: 7, marketid: 9 }; test('buildLoginRequest 透传必备身份字段', () => { const d = buildLoginRequest(IDENTITY);