diff --git a/assets/Scripts/chat18x/manager/ChatHistoryManager.ts b/assets/Scripts/chat18x/manager/ChatHistoryManager.ts
index 5844ffed..0cd71a23 100644
--- a/assets/Scripts/chat18x/manager/ChatHistoryManager.ts
+++ b/assets/Scripts/chat18x/manager/ChatHistoryManager.ts
@@ -5,16 +5,16 @@ import proto from "db://assets/Scripts/proto/proto.pb.js";
 import { ChatService } from "../network/services/ChatService";
 
 export interface ChatMessage {
-    role: "user" | "model";
-    parts: { text: string }[];
-    timestamp?: number;
+  role: "user" | "model";
+  parts: { text: string }[];
+  timestamp?: number;
 }
 
 export interface ChatHistory {
-    roleId: number;
-    messages: ChatMessage[];
-    createdAt: number;
-    updatedAt: number;
+  roleId: number;
+  messages: ChatMessage[];
+  createdAt: number;
+  updatedAt: number;
 }
 
 /**
@@ -22,357 +22,399 @@ export interface ChatHistory {
  * 负责聊天记录的本地存储、加载和管理
  */
 export class ChatHistoryManager {
-    private static _instance: ChatHistoryManager;
-    
-    public static get Instance(): ChatHistoryManager {
-        if (!this._instance) {
-            this._instance = new ChatHistoryManager();
-        }
-        return this._instance;
+  private static _instance: ChatHistoryManager;
+
+  public static get Instance(): ChatHistoryManager {
+    if (!this._instance) {
+      this._instance = new ChatHistoryManager();
     }
-    
-    private constructor() {}
-    
-    /**
-     * 保存聊天历史到本地
-     * @param roleId 角色ID
-     * @param messages 消息列表
-     */
-    public saveHistory(roleId: number, messages: ChatMessage[]): void {
-        const key = `chat_history_${roleId}`;
-        try {
-            const history: ChatHistory = {
-                roleId: roleId,
-                messages: messages,
-                createdAt: Date.now(),
-                updatedAt: Date.now()
-            };
-            
-            sys.localStorage.setItem(key, JSON.stringify(history));
-            console.log(`Saved chat history for role ${roleId}, ${messages.length} messages`);
-        } catch (error) {
-            console.error(`Failed to save chat history for role ${roleId}:`, error);
-        }
+    return this._instance;
+  }
+
+  private constructor() {}
+
+  /**
+   * 保存聊天历史到本地
+   * @param roleId 角色ID
+   * @param messages 消息列表
+   */
+  public saveHistory(roleId: number, messages: ChatMessage[]): void {
+    const key = `chat_history_${roleId}`;
+    try {
+      const history: ChatHistory = {
+        roleId: roleId,
+        messages: messages,
+        createdAt: Date.now(),
+        updatedAt: Date.now(),
+      };
+
+      sys.localStorage.setItem(key, JSON.stringify(history));
+      console.log(
+        `Saved chat history for role ${roleId}, ${messages.length} messages`
+      );
+    } catch (error) {
+      console.error(`Failed to save chat history for role ${roleId}:`, error);
     }
-    
-    /**
-     * 从本地加载聊天历史
-     * @param roleId 角色ID
-     * @returns 消息列表，如果没有历史记录则返回空数组
-     */
-    public loadHistory(roleId: number): ChatMessage[] {
-        const key = `chat_history_${roleId}`;
-        try {
-            const data = sys.localStorage.getItem(key);
-            if (data) {
-                const history: ChatHistory = JSON.parse(data);
-                console.log(`Loaded chat history for role ${roleId}: ${history.messages.length} messages`);
-                return history.messages;
-            }
-        } catch (error) {
-            console.error(`Failed to load chat history for role ${roleId}:`, error);
-            // 如果数据损坏，清除错误的数据
-            this.clearHistory(roleId);
-        }
-        return [];
+  }
+
+  /**
+   * 从本地加载聊天历史
+   * @param roleId 角色ID
+   * @returns 消息列表，如果没有历史记录则返回空数组
+   */
+  public loadHistory(roleId: number): ChatMessage[] {
+    const key = `chat_history_${roleId}`;
+    try {
+      const data = sys.localStorage.getItem(key);
+      if (data) {
+        const history: ChatHistory = JSON.parse(data);
+        console.log(
+          `Loaded chat history for role ${roleId}: ${history.messages.length} messages`
+        );
+        return history.messages;
+      }
+    } catch (error) {
+      console.error(`Failed to load chat history for role ${roleId}:`, error);
+      // 如果数据损坏，清除错误的数据
+      this.clearHistory(roleId);
     }
-    
-    /**
-     * 清除指定角色的聊天历史
-     * @param roleId 角色ID
-     */
-    public clearHistory(roleId: number): void {
-        const key = `chat_history_${roleId}`;
-        sys.localStorage.removeItem(key);
-        console.log(`Cleared chat history for role ${roleId}`);
-    }
-    
-    /**
-     * 追加消息到历史记录
-     * @param roleId 角色ID
-     * @param message 消息对象
-     */
-    public appendMessage(roleId: number, message: ChatMessage): void {
-        const history = this.loadHistory(roleId);
-        
-        // 添加时间戳
-        message.timestamp = Date.now();
-        history.push(message);
-        
-        // 限制历史长度，保留最近100条消息
-        if (history.length > 100) {
-            history.splice(0, history.length - 100);
-            console.log(`Trimmed chat history for role ${roleId} to 100 messages`);
-        }
-        
-        this.saveHistory(roleId, history);
-    }
-    
-    /**
-     * 获取指定角色的消息数量
-     * @param roleId 角色ID
-     * @returns 消息数量
-     */
-    public getMessageCount(roleId: number): number {
-        const history = this.loadHistory(roleId);
-        return history.length;
-    }
-    
-    /**
-     * 获取最近的N条消息
-     * @param roleId 角色ID
-     * @param count 消息数量
-     * @returns 最近的消息列表
-     */
-    public getRecentMessages(roleId: number, count: number = 10): ChatMessage[] {
-        const history = this.loadHistory(roleId);
-        return history.slice(-count);
-    }
-    
-    /**
-     * 清除所有聊天历史
-     */
-    public clearAllHistory(): void {
-        // 查找所有chat_history_开头的key
-        const keysToRemove: string[] = [];
-        for (let i = 0; i < sys.localStorage.length; i++) {
-            const key = sys.localStorage.key(i);
-            if (key && key.startsWith('chat_history_')) {
-                keysToRemove.push(key);
-            }
-        }
-        
-        // 删除找到的所有聊天历史
-        keysToRemove.forEach(key => {
-            sys.localStorage.removeItem(key);
-        });
-        
-        console.log(`Cleared all chat histories, ${keysToRemove.length} records removed`);
-    }
-    
-    /**
-     * 获取所有有历史记录的角色ID列表
-     * @returns 角色ID数组
-     */
-    public getAllHistoryRoleIds(): number[] {
-        const roleIds: number[] = [];
-        for (let i = 0; i < sys.localStorage.length; i++) {
-            const key = sys.localStorage.key(i);
-            if (key && key.startsWith('chat_history_')) {
-                const roleId = parseInt(key.replace('chat_history_', ''));
-                if (!isNaN(roleId)) {
-                    roleIds.push(roleId);
-                }
-            }
-        }
-        return roleIds;
-    }
-    
-    /**
-     * 准备上传到远程服务器（预留接口）
-     * @param roleId 角色ID
-     */
-    public async syncToRemote(roleId: number): Promise<void> {
-        const history = this.loadHistory(roleId);
-        if (history.length === 0) {
-            console.log(`No history to sync for role ${roleId}`);
-            return;
-        }
-        
-        try {
-            // TODO: 调用 HttpUnit.ins.api 上传到服务器
-            // await HttpUnit.ins.api("chat/save_history", {
-            //     role_id: roleId,
-            //     messages: history
-            // }, "POST");
-            
-            console.log(`Ready to sync ${history.length} messages for role ${roleId} to remote server`);
-        } catch (error) {
-            console.error(`Failed to sync history for role ${roleId}:`, error);
-        }
-    }
-    
-    /**
-     * 从远程服务器下载历史（预留接口）
-     * @param roleId 角色ID
-     */
-    public async syncFromRemote(roleId: number): Promise<void> {
-        try {
-            // TODO: 调用 HttpUnit.ins.api 从服务器获取历史
-            // const response = await HttpUnit.ins.api("chat/get_history", {
-            //     role_id: roleId
-            // }, "GET");
-            
-            // if (response && response.messages) {
-            //     this.saveHistory(roleId, response.messages);
-            //     console.log(`Synced ${response.messages.length} messages from remote for role ${roleId}`);
-            // }
-            
-            console.log(`Ready to sync history from remote server for role ${roleId}`);
-        } catch (error) {
-            console.error(`Failed to sync from remote for role ${roleId}:`, error);
-        }
+    return [];
+  }
+
+  /**
+   * 清除指定角色的聊天历史
+   * @param roleId 角色ID
+   */
+  public clearHistory(roleId: number): void {
+    const key = `chat_history_${roleId}`;
+    sys.localStorage.removeItem(key);
+    console.log(`Cleared chat history for role ${roleId}`);
+  }
+
+  /**
+   * 追加消息到历史记录
+   * @param roleId 角色ID
+   * @param message 消息对象
+   */
+  public appendMessage(roleId: number, message: ChatMessage): void {
+    const history = this.loadHistory(roleId);
+
+    // 添加时间戳
+    message.timestamp = Date.now();
+    history.push(message);
+
+    // 限制历史长度，保留最近100条消息
+    if (history.length > 100) {
+      history.splice(0, history.length - 100);
+      console.log(`Trimmed chat history for role ${roleId} to 100 messages`);
     }
 
-    /**
-     * 转换服务端聊天数据为本地格式
-     * @param serverMessages 服务端聊天消息数组
-     * @returns 本地格式的聊天消息数组
-     */
-    private convertServerDataToLocalFormat(serverMessages: proto.cs.IChatMsg[]): ChatMessage[] {
-        if (!serverMessages || serverMessages.length === 0) {
-            return [];
-        }
+    this.saveHistory(roleId, history);
+  }
 
-        const messages: ChatMessage[] = [];
-        for (const serverMsg of serverMessages) {
-            if (serverMsg.msg) {
-                const message: ChatMessage = {
-                    role: serverMsg.isAi ? "model" : "user",
-                    parts: [{ text: serverMsg.msg }],
-                    timestamp: serverMsg.msgId || Date.now()
-                };
-                messages.push(message);
-            }
-        }
+  /**
+   * 获取指定角色的消息数量
+   * @param roleId 角色ID
+   * @returns 消息数量
+   */
+  public getMessageCount(roleId: number): number {
+    const history = this.loadHistory(roleId);
+    return history.length;
+  }
 
-        // 按时间戳排序，确保消息顺序正确
-        messages.sort((a, b) => (a.timestamp || 0) - (b.timestamp || 0));
-        
-        console.log(`Converted ${serverMessages.length} server messages to ${messages.length} local messages`);
-        return messages;
+  /**
+   * 获取最近的N条消息
+   * @param roleId 角色ID
+   * @param count 消息数量
+   * @returns 最近的消息列表
+   */
+  public getRecentMessages(roleId: number, count: number = 10): ChatMessage[] {
+    const history = this.loadHistory(roleId);
+    return history.slice(-count);
+  }
+
+  /**
+   * 清除所有聊天历史
+   */
+  public clearAllHistory(): void {
+    // 查找所有chat_history_开头的key
+    const keysToRemove: string[] = [];
+    for (let i = 0; i < sys.localStorage.length; i++) {
+      const key = sys.localStorage.key(i);
+      if (key && key.startsWith("chat_history_")) {
+        keysToRemove.push(key);
+      }
     }
 
-    /**
-     * 从服务端获取聊天记录
-     * @param roleId 角色ID
-     * @param page 页码
-     * @param limit 每页数量
-     * @returns 是否成功获取数据
-     */
-    private async fetchServerChatHistory(roleId: number, page: number = 1, limit: number = 20): Promise<boolean> {
-        try {
-            const reqData = {
-                GirlId: roleId,
-                page,
-                limit,
-            };
-            
-            console.log("获取服务端聊天记录:", reqData);
-            const res = await ChatService.I.reqGetChatMsg(reqData);
-            
-            if (res && res.code === proto.cs.EnmRetCode.SUCCESS) {
-                const resData = res.data;
-                // 保存到 GirlData
-                const girlData = DataManager.I.getDataById<GirlData>(DataId.Girl);
-                const category = girlData.getGrilCategoryById(roleId);
-                girlData.setChatRecord(category.toString(), roleId, resData.msgs);
-                girlData.setChatTotalCount(category.toString(), roleId, resData.chatTotalCount);
-                girlData.setChatRemainCount(category.toString(), roleId, resData.chatRemainCount);
-                
-                console.log(`成功从服务端获取聊天记录，roleId: ${roleId}, 消息数: ${resData.msgs?.length || 0}`);
-                return true;
-            } else {
-                console.warn(`从服务端获取聊天记录失败，roleId: ${roleId}, code: ${res?.code}`);
-                return false;
-            }
-        } catch (error) {
-            console.error(`获取服务端聊天记录异常，roleId: ${roleId}:`, error);
-            return false;
+    // 删除找到的所有聊天历史
+    keysToRemove.forEach((key) => {
+      sys.localStorage.removeItem(key);
+    });
+
+    console.log(
+      `Cleared all chat histories, ${keysToRemove.length} records removed`
+    );
+  }
+
+  /**
+   * 获取所有有历史记录的角色ID列表
+   * @returns 角色ID数组
+   */
+  public getAllHistoryRoleIds(): number[] {
+    const roleIds: number[] = [];
+    for (let i = 0; i < sys.localStorage.length; i++) {
+      const key = sys.localStorage.key(i);
+      if (key && key.startsWith("chat_history_")) {
+        const roleId = parseInt(key.replace("chat_history_", ""));
+        if (!isNaN(roleId)) {
+          roleIds.push(roleId);
         }
+      }
+    }
+    return roleIds;
+  }
+
+  /**
+   * 准备上传到远程服务器（预留接口）
+   * @param roleId 角色ID
+   */
+  public async syncToRemote(roleId: number): Promise<void> {
+    const history = this.loadHistory(roleId);
+    if (history.length === 0) {
+      console.log(`No history to sync for role ${roleId}`);
+      return;
     }
 
-    /**
-     * 合并本地和服务端聊天记录
-     * @param localMessages 本地消息
-     * @param serverMessages 服务端消息
-     * @returns 合并后的消息数组
-     */
-    private mergeHistories(localMessages: ChatMessage[], serverMessages: ChatMessage[]): ChatMessage[] {
-        if (!localMessages || localMessages.length === 0) {
-            return serverMessages || [];
-        }
-        
-        if (!serverMessages || serverMessages.length === 0) {
-            return localMessages;
-        }
+    try {
+      // TODO: 调用 HttpUnit.ins.api 上传到服务器
+      // await HttpUnit.ins.api("chat/save_history", {
+      //     role_id: roleId,
+      //     messages: history
+      // }, "POST");
 
-        // 使用 Map 进行去重，以时间戳为键
-        const messageMap = new Map<number, ChatMessage>();
-        
-        // 先添加本地消息（优先级更高）
-        localMessages.forEach(msg => {
-            if (msg.timestamp) {
-                messageMap.set(msg.timestamp, msg);
-            }
-        });
-        
-        // 添加服务端消息（如果时间戳不冲突）
-        serverMessages.forEach(msg => {
-            if (msg.timestamp && !messageMap.has(msg.timestamp)) {
-                messageMap.set(msg.timestamp, msg);
-            }
-        });
-        
-        // 转换回数组并排序
-        const mergedMessages = Array.from(messageMap.values());
-        mergedMessages.sort((a, b) => (a.timestamp || 0) - (b.timestamp || 0));
-        
-        console.log(`合并聊天记录: 本地 ${localMessages.length} 条, 服务端 ${serverMessages.length} 条, 合并后 ${mergedMessages.length} 条`);
-        return mergedMessages;
+      console.log(
+        `Ready to sync ${history.length} messages for role ${roleId} to remote server`
+      );
+    } catch (error) {
+      console.error(`Failed to sync history for role ${roleId}:`, error);
+    }
+  }
+
+  /**
+   * 从远程服务器下载历史（预留接口）
+   * @param roleId 角色ID
+   */
+  public async syncFromRemote(roleId: number): Promise<void> {
+    try {
+      // TODO: 调用 HttpUnit.ins.api 从服务器获取历史
+      // const response = await HttpUnit.ins.api("chat/get_history", {
+      //     role_id: roleId
+      // }, "GET");
+
+      // if (response && response.messages) {
+      //     this.saveHistory(roleId, response.messages);
+      //     console.log(`Synced ${response.messages.length} messages from remote for role ${roleId}`);
+      // }
+
+      console.log(
+        `Ready to sync history from remote server for role ${roleId}`
+      );
+    } catch (error) {
+      console.error(`Failed to sync from remote for role ${roleId}:`, error);
+    }
+  }
+
+  /**
+   * 转换服务端聊天数据为本地格式
+   * @param serverMessages 服务端聊天消息数组
+   * @returns 本地格式的聊天消息数组
+   */
+  private convertServerDataToLocalFormat(
+    serverMessages: proto.cs.IChatMsg[]
+  ): ChatMessage[] {
+    if (!serverMessages || serverMessages.length === 0) {
+      return [];
     }
 
-    /**
-     * 整合的聊天记录加载方法：优先加载本地数据，如果本地没有再获取服务端数据
-     * @param roleId 角色ID
-     * @returns 聊天消息数组
-     */
-    public async loadChatHistory(roleId: number): Promise<ChatMessage[]> {
-        // 1. 首先尝试从本地加载
-        const localHistory = this.loadHistory(roleId);
-        
-        // 2. 如果本地有数据，直接返回
-        if (localHistory && localHistory.length > 0) {
-            console.log(`使用本地聊天记录，roleId: ${roleId}, 消息数: ${localHistory.length}`);
-            return localHistory;
-        }
-        
-        // 3. 本地没有数据，尝试从服务端获取
-        console.log(`本地无聊天记录，尝试从服务端获取，roleId: ${roleId}`);
-        const serverSuccess = await this.fetchServerChatHistory(roleId);
-        
-        if (!serverSuccess) {
-            console.log(`服务端获取失败，返回空记录，roleId: ${roleId}`);
-            return [];
-        }
-        
-        // 4. 从 GirlData 读取服务端数据并转换格式
+    const messages: ChatMessage[] = [];
+    for (const serverMsg of serverMessages) {
+      if (serverMsg.msg) {
+        const message: ChatMessage = {
+          role: serverMsg.isAi ? "model" : "user",
+          parts: [{ text: serverMsg.msg }],
+          timestamp: serverMsg.msgId || Date.now(),
+        };
+        messages.push(message);
+      }
+    }
+
+    // 按时间戳排序，确保消息顺序正确
+    messages.sort((a, b) => (a.timestamp || 0) - (b.timestamp || 0));
+
+    console.log(
+      `Converted ${serverMessages.length} server messages to ${messages.length} local messages`
+    );
+    return messages;
+  }
+
+  /**
+   * 从服务端获取聊天记录
+   * @param roleId 角色ID
+   * @param page 页码
+   * @param limit 每页数量
+   * @returns 是否成功获取数据
+   */
+  private async fetchServerChatHistory(
+    roleId: number,
+    page: number = 1,
+    limit: number = 20
+  ): Promise<boolean> {
+    try {
+      const reqData = {
+        GirlId: roleId,
+        page,
+        limit,
+      };
+
+      console.log("获取服务端聊天记录:", reqData);
+      const res = await ChatService.I.reqGetChatMsg(reqData);
+
+      if (res && res.code === proto.cs.EnmRetCode.SUCCESS) {
+        const resData = res.data;
+        // 保存到 GirlData
         const girlData = DataManager.I.getDataById<GirlData>(DataId.Girl);
         const category = girlData.getGrilCategoryById(roleId);
-        const serverMsgIds = girlData.getChatRecordIds(category.toString(), roleId);
-        
-        const serverMessages: proto.cs.IChatMsg[] = [];
-        for (const id of serverMsgIds) {
-            const isAi = girlData.getChatRecordIsAi(category.toString(), roleId, id);
-            const msg = girlData.getChatRecordMsg(category.toString(), roleId, id);
-            if (msg) {
-                serverMessages.push({
-                    msgId: id,
-                    msg: msg,
-                    isAi: isAi
-                });
-            }
-        }
-        
-        // 5. 转换服务端数据格式
-        const convertedMessages = this.convertServerDataToLocalFormat(serverMessages);
-        
-        // 6. 保存到本地存储
-        if (convertedMessages.length > 0) {
-            this.saveHistory(roleId, convertedMessages);
-            console.log(`从服务端获取并保存聊天记录，roleId: ${roleId}, 消息数: ${convertedMessages.length}`);
-        }
-        
-        return convertedMessages;
+        girlData.setChatRecord(category.toString(), roleId, resData.msgs);
+        girlData.setChatTotalCount(
+          category.toString(),
+          roleId,
+          resData.chatTotalCount
+        );
+        girlData.setChatRemainCount(
+          category.toString(),
+          roleId,
+          resData.chatRemainCount
+        );
+
+        console.log(
+          `成功从服务端获取聊天记录，roleId: ${roleId}, 消息数: ${
+            resData.msgs?.length || 0
+          }`
+        );
+        return true;
+      } else {
+        console.warn(
+          `从服务端获取聊天记录失败，roleId: ${roleId}, code: ${res?.code}`
+        );
+        return false;
+      }
+    } catch (error) {
+      console.error(`获取服务端聊天记录异常，roleId: ${roleId}:`, error);
+      return false;
     }
-}
\ No newline at end of file
+  }
+
+  /**
+   * 合并本地和服务端聊天记录
+   * @param localMessages 本地消息
+   * @param serverMessages 服务端消息
+   * @returns 合并后的消息数组
+   */
+  private mergeHistories(
+    localMessages: ChatMessage[],
+    serverMessages: ChatMessage[]
+  ): ChatMessage[] {
+    if (!localMessages || localMessages.length === 0) {
+      return serverMessages || [];
+    }
+
+    if (!serverMessages || serverMessages.length === 0) {
+      return localMessages;
+    }
+
+    // 使用 Map 进行去重，以时间戳为键
+    const messageMap = new Map<number, ChatMessage>();
+
+    // 先添加本地消息（优先级更高）
+    localMessages.forEach((msg) => {
+      if (msg.timestamp) {
+        messageMap.set(msg.timestamp, msg);
+      }
+    });
+
+    // 添加服务端消息（如果时间戳不冲突）
+    serverMessages.forEach((msg) => {
+      if (msg.timestamp && !messageMap.has(msg.timestamp)) {
+        messageMap.set(msg.timestamp, msg);
+      }
+    });
+
+    // 转换回数组并排序
+    const mergedMessages = Array.from(messageMap.values());
+    mergedMessages.sort((a, b) => (a.timestamp || 0) - (b.timestamp || 0));
+
+    console.log(
+      `合并聊天记录: 本地 ${localMessages.length} 条, 服务端 ${serverMessages.length} 条, 合并后 ${mergedMessages.length} 条`
+    );
+    return mergedMessages;
+  }
+
+  /**
+   * 整合的聊天记录加载方法：优先加载本地数据，如果本地没有再获取服务端数据
+   * @param roleId 角色ID
+   * @returns 聊天消息数组
+   */
+  public async loadChatHistory(roleId: number): Promise<ChatMessage[]> {
+    // 1. 首先尝试从本地加载
+    const localHistory = this.loadHistory(roleId);
+
+    // 2. 如果本地有数据，直接返回
+    if (localHistory && localHistory.length > 0) {
+      console.log(
+        `使用本地聊天记录，roleId: ${roleId}, 消息数: ${localHistory.length}`
+      );
+      return localHistory;
+    }
+
+    // 3. 本地没有数据，尝试从服务端获取
+    console.log(`本地无聊天记录，尝试从服务端获取，roleId: ${roleId}`);
+    const serverSuccess = await this.fetchServerChatHistory(roleId);
+
+    if (!serverSuccess) {
+      console.log(`服务端获取失败，返回空记录，roleId: ${roleId}`);
+      return [];
+    }
+
+    // 4. 从 GirlData 读取服务端数据并转换格式
+    const girlData = DataManager.I.getDataById<GirlData>(DataId.Girl);
+    const category = girlData.getGrilCategoryById(roleId);
+    const serverMsgIds = girlData.getChatRecordIds(category.toString(), roleId);
+
+    const serverMessages: proto.cs.IChatMsg[] = [];
+    for (const id of serverMsgIds) {
+      const isAi = girlData.getChatRecordIsAi(category.toString(), roleId, id);
+      const msg = girlData.getChatRecordMsg(category.toString(), roleId, id);
+      if (msg) {
+        serverMessages.push({
+          msgId: id,
+          msg: msg,
+          isAi: isAi,
+        });
+      }
+    }
+
+    // 5. 转换服务端数据格式
+    const convertedMessages =
+      this.convertServerDataToLocalFormat(serverMessages);
+
+    // 6. 保存到本地存储
+    if (convertedMessages.length > 0) {
+      this.saveHistory(roleId, convertedMessages);
+      console.log(
+        `从服务端获取并保存聊天记录，roleId: ${roleId}, 消息数: ${convertedMessages.length}`
+      );
+    }
+
+    return convertedMessages;
+  }
+}
diff --git a/assets/Scripts/chat18x/ui/components/ImagePopup.ts b/assets/Scripts/chat18x/ui/components/ImagePopup.ts
index a79c0e1a..beaa8b47 100644
--- a/assets/Scripts/chat18x/ui/components/ImagePopup.ts
+++ b/assets/Scripts/chat18x/ui/components/ImagePopup.ts
@@ -1,52 +1,104 @@
-import { _decorator, Component, Node,Sprite,Vec3 ,tween, UITransform} from 'cc';
+import {
+  _decorator,
+  Component,
+  Node,
+  Sprite,
+  Vec3,
+  tween,
+  UITransform,
+  path,
+} from "cc";
 import ResManager from "db://assets/Scripts/Main/Manager/ResManager";
 import Utils from "db://assets/Scripts/Main/Common/Utils";
-import {ViewManager} from "db://assets/Scripts/Main/Manager/ViewManager";
+import { ViewManager } from "db://assets/Scripts/Main/Manager/ViewManager";
+import { DataId, DataManager } from "../../data/DataManager";
+import { GirlData } from "../../data/GirlData";
+import proto from "db://assets/Scripts/proto/proto.pb.js";
+import { GButton } from "../../../Main/Common/GButton";
 const { ccclass, property } = _decorator;
 
-@ccclass('ImagePopup')
+@ccclass("ImagePopup")
 export class ImagePopup extends Component {
-    @property(Sprite)
-    image:Sprite;
+  @property(Sprite)
+  image: Sprite;
 
+  start() {
+    this.node.setPosition(new Vec3(-1500, 493, 0));
+    GButton.BandClick(this.image.node, this.openImage, this);
+  }
 
-    start()
-    {
-        this.node.setPosition(new Vec3(-1500,493,0));
-        this.image.node.on(Node.EventType.TOUCH_START,this.openImage);
+  onDestroy() {
+    //this.image.node.off(Node.EventType.TOUCH_START,this.openImage);
+  }
+
+  categoryId: string;
+  girlId: number;
+  resId: number;
+  //url: string;
+  refresh(categoryId: string, girlId: number, resId: number, clear = false) {
+    const girlData = DataManager.I.getDataById<GirlData>(DataId.Girl);
+    this.categoryId = categoryId;
+    this.girlId = girlId;
+    this.resId = resId;
+    const url = girlData.getGrilPhotoPic(categoryId, girlId, resId);
+    //this.url = path;
+    ResManager.I.changeBundleSpriteFrame(
+      this.image,
+      url + (clear ? "" : "_thumbnail_blur"),
+      "Girls",
+      () => {
+        let sizeTran = this.image.node.parent.getComponent(UITransform);
+        Utils.adjustBgPixelRatioToSize(
+          sizeTran.contentSize,
+          this.image.node,
+          2
+        );
+        this.popUp();
+      }
+    );
+  }
+
+  refreshSelf() {
+    this.refresh(this.categoryId, this.girlId, this.resId, true);
+  }
+
+  openImage() {
+    const girlData = DataManager.I.getDataById<GirlData>(DataId.Girl);
+    const isUnlock = girlData.isImageUnlock(
+      this.categoryId,
+      this.girlId,
+      this.resId
+    );
+
+    if (isUnlock) {
+      let data = {
+        url: girlData.getGrilPhotoPic(this.categoryId, this.girlId, this.resId),
+        isImg: true,
+      };
+      ViewManager.I.openBundlesView("ShowPanel", data);
+    } else {
+      ViewManager.I.openBundlesView("PopupGirlDetailPanel", {
+        category: this.categoryId,
+        resId: this.resId,
+        girlId: this.girlId,
+        base: this,
+        type: proto.cs.EnmResType.ERT_Image,
+      });
     }
 
-    onDestroy()
-    {
-        //this.image.node.off(Node.EventType.TOUCH_START,this.openImage);
-    }
-
-    refresh(path:string)
-    {
-        ResManager.I.changeBundleSpriteFrame(this.image,path,"Chat18x",()=>{
-            let sizeTran = this.image.node.parent.getComponent(UITransform);
-            Utils.adjustBgPixelRatioToSize(sizeTran.contentSize,this.image.node,2);
-            this.popUp();
-        });
-
-    }
-
-    openImage()
-    {
-        let data = {url:"Image/Girls/10001/DetailImg/10001_3"};
-        ViewManager.I.openBundlesView('ShowPanel',data);
-    }
-    popUp()
-    {
-        tween(this.node).to(0.5,{position:new Vec3(-559.374,493,0)},{easing:"backOut"}).start();
-        this.scheduleOnce(()=>{
-            this.popDown();
-        },5);
-    }
-    popDown()
-    {
-        tween(this.node).to(0.5,{position:new Vec3(-1500,493,0)},{easing:"backIn"}).start();
-    }
+    //
+  }
+  popUp() {
+    tween(this.node)
+      .to(0.5, { position: new Vec3(-559.374, 493, 0) }, { easing: "backOut" })
+      .start();
+    this.scheduleOnce(() => {
+      this.popDown();
+    }, 5);
+  }
+  popDown() {
+    tween(this.node)
+      .to(0.5, { position: new Vec3(-1500, 493, 0) }, { easing: "backIn" })
+      .start();
+  }
 }
-
-
diff --git a/assets/Scripts/chat18x/ui/panels/ChatPanel.ts b/assets/Scripts/chat18x/ui/panels/ChatPanel.ts
index 177acd0c..6a33fba3 100644
--- a/assets/Scripts/chat18x/ui/panels/ChatPanel.ts
+++ b/assets/Scripts/chat18x/ui/panels/ChatPanel.ts
@@ -148,7 +148,14 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback {
       this,
       this.onEmotionInitialized
     );
+
+    Utils.addInnerEL(
+      InnerMsgCode.ChatTotalCountChange,
+      this,
+      this.onChatCountChange
+    );
   }
+
   onDestroy(): void {
     Utils.removeInnerEL(
       InnerMsgCode.Chat_DialogRefresh,
@@ -160,7 +167,11 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback {
       this,
       this.onLanguageChangeCallback
     );
-
+    Utils.removeInnerEL(
+      InnerMsgCode.ChatTotalCountChange,
+      this,
+      this.onChatCountChange
+    );
     Utils.removeInnerEL(
       InnerMsgCode.Chat_EmotionInitialized,
       this,
@@ -193,8 +204,6 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback {
     //const dataDetail = roleData.detail;
     const girlData = DataManager.I.getDataById<GirlData>(DataId.Girl);
 
-    
-
     this.nameKey = girlData.getGrilName(this.categoryId, this.id);
     this.girlName.string = LanguageUtils.getText(this.nameKey);
     // ResManager.I.changeBundleSpriteFrame(
@@ -279,6 +288,14 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback {
       }, 0.1);
     }
   }
+  onChatCountChange() {
+    const girlData = DataManager.I.getDataById<GirlData>(DataId.Girl);
+    let triggerId = girlData.getTriggerGrilPhotoId(this.categoryId, this.id);
+
+    if (triggerId == 0) triggerId = 100040103;
+
+    this.popUpImage.refresh(this.categoryId, this.id, triggerId);
+  }
 
   setVideoEnable(enable: boolean) {
     if (!this.girlVideo) return;
@@ -433,7 +450,7 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback {
   }
 
   onChatLimitReached(): void {
-    this.payToTalkPanel.show(this.categoryId,this.id);
+    this.payToTalkPanel.show(this.categoryId, this.id);
   }
   /**
    * 情绪状态更新回调 (实现IChatPanelCallback接口)
diff --git a/assets/Scripts/chat18x/ui/panels/PopupGirlDetailPanel.ts b/assets/Scripts/chat18x/ui/panels/PopupGirlDetailPanel.ts
index d8e538fd..a5257809 100644
--- a/assets/Scripts/chat18x/ui/panels/PopupGirlDetailPanel.ts
+++ b/assets/Scripts/chat18x/ui/panels/PopupGirlDetailPanel.ts
@@ -9,6 +9,7 @@ import { GirlData } from "../../data/GirlData";
 import { WalletData } from "../../data/WalletData";
 import proto from "db://assets/Scripts/proto/proto.pb.js";
 import LanguageUtils from "../../../Main/Common/LanguageUtils";
+import { ImagePopup } from "../components/ImagePopup";
 const { ccclass, property } = _decorator;
 
 @ccclass("PopupGirlDetailPanel")
@@ -19,7 +20,7 @@ export class PopupGirlDetailPanel extends li_BaseView {
   private girlId: number;
   private resId: number;
   private type: proto.cs.EnmResType;
-  private base: DetailImageItem;
+  private base: DetailImageItem | ImagePopup;
 
   private desc: Label;
   openUIDataCT(data) {
@@ -96,7 +97,11 @@ export class PopupGirlDetailPanel extends li_BaseView {
       walletData.balance = Number(resData.balance);
       walletData.vipExpire = Number(resData.vipExpire);
       // 刷新界面
-      this.base.refreshVideoBuy(true);
+      if (this.base instanceof DetailImageItem) {
+        this.base.refreshVideoBuy(true);
+      } else {
+        this.base.refreshSelf();
+      }
       this.close();
     }
   }
diff --git a/assets/Scripts/chat18x/uiitems/DetailImageItem.ts b/assets/Scripts/chat18x/uiitems/DetailImageItem.ts
index 072dea96..7b004267 100644
--- a/assets/Scripts/chat18x/uiitems/DetailImageItem.ts
+++ b/assets/Scripts/chat18x/uiitems/DetailImageItem.ts
@@ -50,6 +50,7 @@ export class DetailImageItem extends Component {
   onLoad() {
     GButton.BandClick(this.node, this.onClickThis, this);
     this.uitransform = this.node.getComponent(UITransform);
+    this.test_resID.active = false;
   }
   isVisible: boolean;
   onClickThis() {
diff --git a/proto_cs b/proto_cs
index 02474af6..f055100c 160000
--- a/proto_cs
+++ b/proto_cs
@@ -1 +1 @@
-Subproject commit 02474af62a6831a909fa28fefa83afa382cc86ee
+Subproject commit f055100cf0f378ddd96d8e153655b5166c65e6e8