diff --git a/assets/Scripts/chat18x/data/GirlChatData.ts b/assets/Scripts/chat18x/data/GirlChatData.ts index f7f98a23..9bc3557d 100644 --- a/assets/Scripts/chat18x/data/GirlChatData.ts +++ b/assets/Scripts/chat18x/data/GirlChatData.ts @@ -132,7 +132,7 @@ export class GirlChatData extends BaseData { const existingMsgIds = new Set(this.chatRecordIds); // 过滤掉已经存在的消息(通过 msgId) - const newChatRecords = allData.filter(msg => !existingMsgIds.has(msg.msgId)); + const newChatRecords = allData.filter(msg => !existingMsgIds.has(Number(msg.msgId))); // 将新的聊天记录添加到 Map 中 newChatRecords.forEach(msg => { diff --git a/assets/Scripts/proto/proto.pb.d.ts b/assets/Scripts/proto/proto.pb.d.ts index 13800188..c400b257 100644 --- a/assets/Scripts/proto/proto.pb.d.ts +++ b/assets/Scripts/proto/proto.pb.d.ts @@ -2082,7 +2082,7 @@ static getTypeUrl(typeUrlPrefix?: string): string; isAi?: (boolean|null); /** ChatMsg msgId */ - msgId?: (number|Long|null); + msgId?: (string|null); } /** Represents a ChatMsg. */ @@ -2101,7 +2101,7 @@ msg: string; isAi: boolean; /** ChatMsg msgId. */ -msgId: (number|Long); +msgId: string; /** * Creates a new ChatMsg instance using the specified properties. @@ -3622,8 +3622,8 @@ static getTypeUrl(typeUrlPrefix?: string): string; /** GlobalConfig GameName */ GameName?: (string|null); - /** GlobalConfig EmotionRating */ - EmotionRating?: (string|null); + /** GlobalConfig EmotionBasePrompt */ + EmotionBasePrompt?: (string|null); /** GlobalConfig girlBasePrompt */ girlBasePrompt?: (string|null); @@ -3668,8 +3668,8 @@ ScoreExchangeStarLevel: number; /** GlobalConfig GameName. */ GameName: string; - /** GlobalConfig EmotionRating. */ -EmotionRating: string; + /** GlobalConfig EmotionBasePrompt. */ +EmotionBasePrompt: string; /** GlobalConfig girlBasePrompt. */ girlBasePrompt: string; diff --git a/assets/Scripts/proto/proto.pb.js b/assets/Scripts/proto/proto.pb.js index f2b4b0ac..cb234e94 100644 --- a/assets/Scripts/proto/proto.pb.js +++ b/assets/Scripts/proto/proto.pb.js @@ -4818,7 +4818,7 @@ $root.cs = (function() { * @interface IChatMsg * @property {string|null} [msg] ChatMsg msg * @property {boolean|null} [isAi] ChatMsg isAi - * @property {number|Long|null} [msgId] ChatMsg msgId + * @property {string|null} [msgId] ChatMsg msgId */ /** @@ -4854,11 +4854,11 @@ $root.cs = (function() { /** * ChatMsg msgId. - * @member {number|Long} msgId + * @member {string} msgId * @memberof cs.ChatMsg * @instance */ - ChatMsg.prototype.msgId = $util.Long ? $util.Long.fromBits(0,0,false) : 0; + ChatMsg.prototype.msgId = ""; /** * Creates a new ChatMsg instance using the specified properties. @@ -4889,7 +4889,7 @@ $root.cs = (function() { if (message.isAi != null && Object.hasOwnProperty.call(message, "isAi")) writer.uint32(/* id 2, wireType 0 =*/16).bool(message.isAi); if (message.msgId != null && Object.hasOwnProperty.call(message, "msgId")) - writer.uint32(/* id 3, wireType 0 =*/24).int64(message.msgId); + writer.uint32(/* id 3, wireType 2 =*/26).string(message.msgId); return writer; }; @@ -4935,7 +4935,7 @@ $root.cs = (function() { break; } case 3: { - message.msgId = reader.int64(); + message.msgId = reader.string(); break; } default: @@ -4980,8 +4980,8 @@ $root.cs = (function() { if (typeof message.isAi !== "boolean") return "isAi: boolean expected"; if (message.msgId != null && message.hasOwnProperty("msgId")) - if (!$util.isInteger(message.msgId) && !(message.msgId && $util.isInteger(message.msgId.low) && $util.isInteger(message.msgId.high))) - return "msgId: integer|Long expected"; + if (!$util.isString(message.msgId)) + return "msgId: string expected"; return null; }; @@ -5002,14 +5002,7 @@ $root.cs = (function() { if (object.isAi != null) message.isAi = Boolean(object.isAi); if (object.msgId != null) - if ($util.Long) - (message.msgId = $util.Long.fromValue(object.msgId)).unsigned = false; - else if (typeof object.msgId === "string") - message.msgId = parseInt(object.msgId, 10); - else if (typeof object.msgId === "number") - message.msgId = object.msgId; - else if (typeof object.msgId === "object") - message.msgId = new $util.LongBits(object.msgId.low >>> 0, object.msgId.high >>> 0).toNumber(); + message.msgId = String(object.msgId); return message; }; @@ -5029,21 +5022,14 @@ $root.cs = (function() { if (options.defaults) { object.msg = ""; object.isAi = false; - if ($util.Long) { - var long = new $util.Long(0, 0, false); - object.msgId = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; - } else - object.msgId = options.longs === String ? "0" : 0; + object.msgId = ""; } if (message.msg != null && message.hasOwnProperty("msg")) object.msg = message.msg; if (message.isAi != null && message.hasOwnProperty("isAi")) object.isAi = message.isAi; if (message.msgId != null && message.hasOwnProperty("msgId")) - if (typeof message.msgId === "number") - object.msgId = options.longs === String ? String(message.msgId) : message.msgId; - else - object.msgId = options.longs === String ? $util.Long.prototype.toString.call(message.msgId) : options.longs === Number ? new $util.LongBits(message.msgId.low >>> 0, message.msgId.high >>> 0).toNumber() : message.msgId; + object.msgId = message.msgId; return object; }; @@ -8456,7 +8442,7 @@ $root.cs = (function() { * @property {number|null} [OnceChatAddScore] GlobalConfig OnceChatAddScore * @property {number|null} [ScoreExchangeStarLevel] GlobalConfig ScoreExchangeStarLevel * @property {string|null} [GameName] GlobalConfig GameName - * @property {string|null} [EmotionRating] GlobalConfig EmotionRating + * @property {string|null} [EmotionBasePrompt] GlobalConfig EmotionBasePrompt * @property {string|null} [girlBasePrompt] GlobalConfig girlBasePrompt */ @@ -8556,12 +8542,12 @@ $root.cs = (function() { GlobalConfig.prototype.GameName = ""; /** - * GlobalConfig EmotionRating. - * @member {string} EmotionRating + * GlobalConfig EmotionBasePrompt. + * @member {string} EmotionBasePrompt * @memberof cs.GlobalConfig * @instance */ - GlobalConfig.prototype.EmotionRating = ""; + GlobalConfig.prototype.EmotionBasePrompt = ""; /** * GlobalConfig girlBasePrompt. @@ -8615,8 +8601,8 @@ $root.cs = (function() { writer.uint32(/* id 9, wireType 0 =*/72).int32(message.ScoreExchangeStarLevel); if (message.GameName != null && Object.hasOwnProperty.call(message, "GameName")) writer.uint32(/* id 10, wireType 2 =*/82).string(message.GameName); - if (message.EmotionRating != null && Object.hasOwnProperty.call(message, "EmotionRating")) - writer.uint32(/* id 11, wireType 2 =*/90).string(message.EmotionRating); + if (message.EmotionBasePrompt != null && Object.hasOwnProperty.call(message, "EmotionBasePrompt")) + writer.uint32(/* id 11, wireType 2 =*/90).string(message.EmotionBasePrompt); if (message.girlBasePrompt != null && Object.hasOwnProperty.call(message, "girlBasePrompt")) writer.uint32(/* id 12, wireType 2 =*/98).string(message.girlBasePrompt); return writer; @@ -8696,7 +8682,7 @@ $root.cs = (function() { break; } case 11: { - message.EmotionRating = reader.string(); + message.EmotionBasePrompt = reader.string(); break; } case 12: { @@ -8768,9 +8754,9 @@ $root.cs = (function() { if (message.GameName != null && message.hasOwnProperty("GameName")) if (!$util.isString(message.GameName)) return "GameName: string expected"; - if (message.EmotionRating != null && message.hasOwnProperty("EmotionRating")) - if (!$util.isString(message.EmotionRating)) - return "EmotionRating: string expected"; + if (message.EmotionBasePrompt != null && message.hasOwnProperty("EmotionBasePrompt")) + if (!$util.isString(message.EmotionBasePrompt)) + return "EmotionBasePrompt: string expected"; if (message.girlBasePrompt != null && message.hasOwnProperty("girlBasePrompt")) if (!$util.isString(message.girlBasePrompt)) return "girlBasePrompt: string expected"; @@ -8809,8 +8795,8 @@ $root.cs = (function() { message.ScoreExchangeStarLevel = object.ScoreExchangeStarLevel | 0; if (object.GameName != null) message.GameName = String(object.GameName); - if (object.EmotionRating != null) - message.EmotionRating = String(object.EmotionRating); + if (object.EmotionBasePrompt != null) + message.EmotionBasePrompt = String(object.EmotionBasePrompt); if (object.girlBasePrompt != null) message.girlBasePrompt = String(object.girlBasePrompt); return message; @@ -8840,7 +8826,7 @@ $root.cs = (function() { object.OnceChatAddScore = 0; object.ScoreExchangeStarLevel = 0; object.GameName = ""; - object.EmotionRating = ""; + object.EmotionBasePrompt = ""; object.girlBasePrompt = ""; } if (message.ApiKey != null && message.hasOwnProperty("ApiKey")) @@ -8863,8 +8849,8 @@ $root.cs = (function() { object.ScoreExchangeStarLevel = message.ScoreExchangeStarLevel; if (message.GameName != null && message.hasOwnProperty("GameName")) object.GameName = message.GameName; - if (message.EmotionRating != null && message.hasOwnProperty("EmotionRating")) - object.EmotionRating = message.EmotionRating; + if (message.EmotionBasePrompt != null && message.hasOwnProperty("EmotionBasePrompt")) + object.EmotionBasePrompt = message.EmotionBasePrompt; if (message.girlBasePrompt != null && message.hasOwnProperty("girlBasePrompt")) object.girlBasePrompt = message.girlBasePrompt; return object; diff --git a/proto_cs b/proto_cs index 5a82a609..7efc83e0 160000 --- a/proto_cs +++ b/proto_cs @@ -1 +1 @@ -Subproject commit 5a82a609b0dc5778ebb7afe701d424ed1d97bd4a +Subproject commit 7efc83e05bbfa19557e9415f75158d9044a80b58